633 Commits (master)

Author SHA1 Message Date
wanggang a23d5cc947 update
5 years ago
wanggang 5b8386ee4a update
5 years ago
wanggang c0498b4448 1.0.0-beta.417
5 years ago
wanggang a3ac37d06d update
5 years ago
wanggang daf16e8bbc 1.0.0-beta.416
5 years ago
wanggang bd98523b51 update
5 years ago
wanggang 71a2e0c83e update
5 years ago
wanggang 605fdf5ad6 update
5 years ago
wanggang c12d77bd59 1.0.0-beta.415
5 years ago
wanggang 8d683a79ee update
5 years ago
wanggang cb28a8225f 1.0.0-beta.414.3
5 years ago
wanggang 8c2c01e71f 1.0.0-beta.414.1
5 years ago
wanggang 8298ea4e54 update
5 years ago
wanggang 3e898f5be0 update
5 years ago
wanggang 9e441fa71a add jobserver
5 years ago
wanggang 9cccc7b374 1.0.0-beta.410
5 years ago
wanggang c1b65786dc update
5 years ago
wanggang af723eed68 1.0.0-beta.408
5 years ago
wanggang 993142a71a 1.0.0-beta.407
5 years ago
wanggang 00211f91d0 添加用户中心缺少的登录相关的配置
5 years ago
wanggang 0cf9d35fce Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang d4f8824bab 避免飞比设备返回值处理出现异常时导致接受上传数据线程退出
5 years ago
zhengpengju f35d782a70 摄像头详情判断显示
5 years ago
wanggang c084c54f02 移除调试代码
5 years ago
wanggang 88acbe8dcd 添加智能插座即时功率,修复电量除数
5 years ago
wanggang cf418de57e Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang 6fbc825406 update
5 years ago
zhengpengju 0978d7748a 红外转发器详情页,按键列表水平居中,垂直高度保持和摄像头一致
5 years ago
wanggang 514fde0456 还原RegisterModel
5 years ago
wanggang c5867327d2 添加Controller获取ModelMetadata的扩展方法,XamarinApp升级程序包并使用Application.Current.Properties进行配置读写
5 years ago
wanggang 4964991626 解决_Layout.cshtml中标题显示错误的问题
5 years ago
wanggang eb74be5777 1.0.0-beta.330
5 years ago
wanggang 7d32661160 update
5 years ago
wanggang 2a4fc17b06 1.0.0-alpha.327
5 years ago
wanggang 59f0f0f3b5 update
5 years ago
wanggang ead3412687 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang aaf31966ed 单点登录部分,将物联网中心配置为本地服务,本地服务统一使用相同的加密解密方式来使用usercenter发送的cookie中包含的jwt信息,不再单独发放cookie,学习中心配置为外部集成
5 years ago
zhengpengju f261d026ce Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju 52d315621c 修改WebSPA页面部分排版及问题修复
5 years ago
wanggang 4cc5b5ee9b 重构目录
5 years ago
wanggang 902734d2db update
5 years ago
wanggang 4752918af7 1.0.0-alpha.325
5 years ago
wanggang fac3fe100e update
5 years ago
wanggang 7fb9fdaf86 update
5 years ago
zhengpengju 404e728331 合并原有代码
5 years ago
zhengpengju 21913954f4 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang ddb95a79f9 update
5 years ago
wanggang 01bcf422b9 update
5 years ago
wanggang e6a1b4e49e Revert "开始修改使select兼容json和html两种方式"
5 years ago
wanggang c0ed737c44 开始修改使select兼容json和html两种方式
5 years ago
wanggang d7f544da5c update
5 years ago
wanggang 904537ad07 update
5 years ago
wanggang 01a3c85e37 1.0.0-alpha.317
5 years ago
wanggang 7772d934ef 1.0.0-alpha.315
5 years ago
wanggang 3265ae92b1 update
5 years ago
wanggang d0fb1e85fb update
5 years ago
wanggang 895d4271b3 update
5 years ago
wanggang 8c7f0c6e73 update
5 years ago
wanggang 42a1e59974 update
5 years ago
wanggang 712be18b43 1.0.0-alpha.313
5 years ago
wanggang 52d90038d8 1.0.0-alpha.321
5 years ago
wanggang 5a4f9bf2cd update
5 years ago
wanggang b25ca76bd5 update
5 years ago
wanggang 7ab8d1ad08 update
5 years ago
wanggang a58eae7e12 update
5 years ago
wanggang 72518e2078 update
5 years ago
wanggang 48a109be79 update
5 years ago
zhengpengju b57ffba62c 优化代码增加websocket事件处理
5 years ago
wanggang 5a545e925f update
5 years ago
wanggang 4353abdb5d go-fastdfs
5 years ago
wanggang f9b140b050 物联网平台CockroachDB子查询统计设备数量点相关代码修改,将内部子查询替换为外部循环统计
5 years ago
wanggang f94828d150 1.分布式数据库使用CockroachDB,当前版本2.0.5需要修改代码支持子查询
5 years ago
wanggang f7452a023d 开始测试切换到PostgreSQL
5 years ago
zhengpengju 8c5339e2ea Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang 568d9680d3 update
6 years ago
wanggang e4fb4c91ea 1.0.0-alpha.219
6 years ago
wanggang cdec4603de update
6 years ago
zhengpengju cadebda45b Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
wanggang ad800eb13d update
6 years ago
wanggang 530b494328 update
6 years ago
zhengpengju 131ff0c199 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
wanggang b3332970a2 update
6 years ago
wanggang afb1834d8e update
6 years ago
wanggang 946c1f05cb 1.0.0-alpha.217
6 years ago
wanggang 9eb7170270 update
6 years ago
wanggang 16cf409720 update
6 years ago
wanggang a780f98c10 1.0.0-alpha.214
6 years ago
zhengpengju f39f037fb1 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
wanggang 443a7c65ff update
6 years ago
wanggang 1b019064f6 1.标记当前版本为:1.0.0-alpha.213
6 years ago
zhengpengju 56067072e4 调整样式
6 years ago
zhengpengju f8e81fa81f Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
wanggang 7e28327c19 update
6 years ago
zhengpengju c1354bb34b 完成大部分页面的合并
6 years ago
zhengpengju 3226e69e8b Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
wanggang 7f9ab1c65c update
6 years ago
wanggang ea260a4b17 update
6 years ago
zhengpengju b1f385caec Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
6 years ago
zhengpengju c8ef6accdc 合并了页面部分代码
6 years ago
wanggang d4b3513b57 update
6 years ago
wanggang eaddb73dbd update
6 years ago
wanggang 2fb1172e32 update
6 years ago
wanggang 8416e15862 update
6 years ago
wanggang 3ee73d7e8a update
6 years ago
wanggang 4f280ba71c update
6 years ago
wanggang 857f32bfb0 update
6 years ago
wanggang 75f08d8023 update
6 years ago
wanggang 361bed687a update
6 years ago
wanggang 009d715035 update
6 years ago
wanggang 708e3cd306 update
6 years ago
wanggang 24d05fb183 update
6 years ago
wanggang 8db6e8cf52 update
6 years ago
wanggang 47eea34449 update
6 years ago
wanggang a1112bb4d9 update
6 years ago
wanggang c7a53774a1 update
6 years ago
wanggang ed455a622f update
6 years ago
wanggang f4dcc0eb2b update
6 years ago
wanggang b3f9604d1f update
6 years ago
wanggang dcfcba32a4 update
6 years ago
wanggang c2a2602ed5 update
6 years ago
wanggang b4295675a2 update
6 years ago
wanggang e196877aa1 update
6 years ago
wanggang 10d69bdae8 update
6 years ago
wanggang 27dc638c34 update
6 years ago
wanggang bd5c7f0ab4 update
6 years ago
wanggang 1889f6cf42 update
6 years ago
wanggang d1b050e840 update
6 years ago
wanggang 8f7399d532 update
6 years ago
wanggang 0c88afb051 update
6 years ago
wanggang ca9e059cf2 update
6 years ago
wanggang 8c0186279a update
6 years ago
wanggang 2566932874 update
6 years ago
wanggang 623f3babaa update
6 years ago
wanggang a8d40bbf7c update
6 years ago
wanggang a280e9f9a0 update
6 years ago
wanggang ace0c341b7 update
6 years ago
wanggang d1f515cc08 update
6 years ago
wanggang 8170d71e18 update
6 years ago
wanggang 2ea0af7dba update
6 years ago
wanggang 737a34c132 update
6 years ago
wanggang 40504b9aa5 update
6 years ago
wanggang dcbeb71a26 update
6 years ago
wanggang adca295259 update
6 years ago
wanggang 63e56000aa update
6 years ago
wanggang 2174ee8329 update
6 years ago
wanggang 51f2b56807 update
6 years ago
wanggang 7722d8a818 update
6 years ago
wanggang 517728c6e4 update
6 years ago
wanggang cb88bdb378 update
6 years ago
wanggang 288551c6e2 update
6 years ago