wanggang
/
iot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
940 Commits
4 Branches
0 Tags
4.3 GiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'de70074e33'
${ noResults }
Commit Graph

824 Commits (de70074e33cfbfb7672399f0455c401e1e2fdb17)

Author SHA1 Message Date
wanggang a9f06980bd 1.0.0.514
5 years ago
wanggang 49a209a836 1.0.0.513
5 years ago
wanggang a4b5708b0e update
5 years ago
zhengpengju 44289827e4 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju 310911122d jump app
5 years ago
wanggang 40cc170bf2 1.0.0.512
5 years ago
wanggang 1b9b9d6499 1.0.0.512
5 years ago
zhengpengju 74cd73520e fix message
5 years ago
zhengpengju 4b1aaa16f3 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju c49c249452 fix bug
5 years ago
wanggang 1c0e835914 1.0.0.510
5 years ago
wanggang 83ae7421cd update
5 years ago
wanggang 750a53ba2a 1.0.0.508
5 years ago
wanggang 3862807320 1.0.0.507-1
5 years ago
wanggang 035f1143e9 1.0.0.507
5 years ago
wanggang 6a32fac057 1.0.0.506
5 years ago
zhengpengju 55a86be560 修复自测发现的页面显示问题及部分BUG
5 years ago
zhengpengju 7771513eb5 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang 087a70cf96 1.0.0.430
5 years ago
wanggang a5aeb50131 1.0.0.4293
5 years ago
zhengpengju 89d8467596 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju 04ece5d482 修复已知BUG，优化页面，PNG 转 为 SVG
5 years ago
wanggang baad2fa7d5 1.0.0.4292
5 years ago
wanggang d8683d5703 1.0.0.4291
5 years ago
wanggang cf623bf0af 1.0.0.429
5 years ago
wanggang f562618e7b 1.0.0.428.3
5 years ago
wanggang 1ea43917ef 1.0.0.428.2
5 years ago
wanggang ba42dc6b8f 1.0.0.428.1
5 years ago
wanggang 407cfcb261 1.0.0.428.1
5 years ago
wanggang cc25a7b041 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
wanggang e8044e71c9 1.0.0.428
5 years ago
zhengpengju 9d14f1391d 美化界面，动态加载html增加version参数清除浏览器自身缓存
5 years ago
zhengpengju f2eb456dd0 Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju 524d88b9af 增加导航及人人通关闭窗口方法
5 years ago
wanggang 2493c3929b 1.0.0.427
5 years ago
zhengpengju 974330abed Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
5 years ago
zhengpengju 67da07a665 fix bug
5 years ago
zhengpengju 79f838e11e 增加功率显示
5 years ago
wanggang b0ad7a47b4 update
5 years ago
wanggang e276be8e48 1.0.0-beta.422
5 years ago
wanggang 2085ebae62 update
5 years ago
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
6 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
wanggang 56d56bec7b update
6 years ago
wanggang 75766fa831 update
6 years ago
wanggang c10c1559e4 update
6 years ago
wanggang 52d8c7b753 update
6 years ago
wanggang 59e7bba3cd update
6 years ago
wanggang 66f8c3e313 update
6 years ago
wanggang 711fdead4b update
6 years ago
wanggang 5b157bf2f8 update
6 years ago
wanggang 2ac5268f3a update
6 years ago
wanggang 2ea9c70cfd update
6 years ago
wanggang dd79d5e6f8 update
6 years ago
wanggang 619f2cd5cb 恢复cookie登录中的自动登录功能
6 years ago
wanggang 9e8c161029 update
6 years ago
wanggang 28f26eceed update
6 years ago
wanggang a027cc08e0 update
6 years ago
wanggang 77c091dbe8 update
6 years ago
wanggang 36916c5db1 update
6 years ago
wanggang 267170c068 update
6 years ago
wanggang 32bc9c3ca7 1.nginx对gateway进行负载均衡
6 years ago
wanggang 3ce6de64e1 update
6 years ago
wanggang c42c5b86c5 update
6 years ago
wanggang f0d47913c1 update
6 years ago
wanggang 4c2aab9094 update
6 years ago
wanggang 2b0188aebd update
6 years ago
wanggang 8d380b9189 动态路由配置
6 years ago
wanggang 34d57f63c6 update
6 years ago
wanggang f745aba4f7 update
6 years ago
wanggang 074a68452d update
6 years ago
wanggang 5da9049459 update
6 years ago
wanggang 4f1a38ad34 Vue.component ajax load template
6 years ago
wanggang 1aa43eab9f update
6 years ago
wanggang 84447fe342 update
6 years ago
wanggang 8f6ecec93b update
6 years ago
wanggang a801f98523 1.0.0-beta.1227
6 years ago
wanggang 943fd85f74 1.精简APP项目
6 years ago
wanggang 0920079244 update
6 years ago
wanggang 63aea10ccc update
6 years ago
wanggang 72b5f5b036 update
6 years ago
wanggang 8d798c3a7e update
6 years ago
wanggang 8545f81111 内测版本，重新规范版本号为：1.0.0-alpha.1220
6 years ago
wanggang ab5bb04585 1.0.0-rc.1219
6 years ago
wanggang 09ce615c94 1.0.0-rc.1218
6 years ago
wanggang 3ea2243964 update
6 years ago
wanggang 4eb34a28f6 1.0.0-rc.1217
6 years ago
wanggang 9a62ff092a 1.0.0-rc.1216
6 years ago
wanggang 67156e54bf update
6 years ago
wanggang dcc0eaa3a5 update
6 years ago
wanggang 54f3951e85 update
6 years ago
wanggang ea50c0f9a1 1.0.0-rc.112
6 years ago
wanggang f4c06ff73e 1.升级到.net core 3.1
6 years ago
wanggang d6c76ef6f5 树莓派部署更新
6 years ago
wanggang 31e0bbb4ca 串口服务更新
6 years ago
wanggang 9d3dbbdc04 串口服务更新
6 years ago
zhengpengju b85a56119e modify UI
6 years ago
wanggang d790591bc3 1.0.0-rc.108
6 years ago
wanggang c6e7e75b57 update
6 years ago
wanggang 0b22a69457 1.0.0-rc.107
6 years ago
wanggang 70f95c06a3 1.0.0-rc.106
6 years ago
wanggang bb2db44782 1.0.0-rc.105
6 years ago
wanggang 1699ff4c94 1.0.0-rc.104
6 years ago
wanggang 622a5f321f update
6 years ago
wanggang 77438e6f7d 1.0.0-rc.103
6 years ago
wanggang 754b468358 update
6 years ago
wanggang 527fcc1b3d 1.0.0-rc.102
6 years ago
wanggang fea02b9974 1.0.0-rc.101
6 years ago
wanggang 06600c9cce update
6 years ago
wanggang 9478ddcab2 update
6 years ago
wanggang 589cff6a56 update
6 years ago
wanggang af669f195d update
6 years ago
wanggang 6c06b7867b update
6 years ago
wanggang 511706a9c3 pc端设备详情页自定义红外指令
6 years ago
wanggang 7036fbc94a update
6 years ago
wanggang e7ac760dab update
6 years ago
wanggang 14fe0d9711 update
6 years ago
wanggang f861b38146 update
6 years ago
wanggang 63a0f4e093 重构设备接入服务
6 years ago
wanggang 767d365539 update
6 years ago
wanggang 93d624160f update
6 years ago
wanggang 2d7a6dfec2 update
6 years ago
wanggang 95446d4bc8 update
6 years ago
wanggang 6267a7204d update
6 years ago
wanggang cfbd5ce918 update
6 years ago
wanggang 2e5b6f70ae 添加简易定时器编辑器jqcron
6 years ago
wanggang dbfa1fe4d7 1.0.0-rc.40
6 years ago
wanggang 8550345f8e update
6 years ago
wanggang 3a116f3499 update
6 years ago
wanggang a7293757c1 update
6 years ago
wanggang 8cb7fa7956 update
6 years ago
wanggang 266a65385b update
6 years ago
wanggang 19daada856 update
6 years ago
wanggang 2357bcb052 update
6 years ago
wanggang 27b9954491 update
6 years ago
wanggang fc5c98bb1f update
6 years ago
wanggang 43b82827d4 update
6 years ago
wanggang 79e6837571 update
6 years ago
wanggang de19cccb06 update
6 years ago
wanggang 00a86984a9 update
6 years ago
wanggang 92be8b0af2 update
6 years ago
wanggang b66ea0dc3e update
6 years ago
wanggang 98ad44ed32 update
6 years ago
wanggang b77deed31c update
6 years ago
wanggang 7b6a3eaa4f update
6 years ago
wanggang 339e120a35 update
6 years ago
wanggang 2a03743f95 update
6 years ago
wanggang ac7450c3c3 update
6 years ago
wanggang da7557ed1e update
6 years ago
wanggang d22e69ecdf update
6 years ago
wanggang b0c96f5aa4 update
6 years ago
wanggang 95e4803bcc update
6 years ago