zhengpengju
|
79f838e11e
|
增加功率显示
Former-commit-id: a2f62aeb845e7788c62d461d470c1686cb293535
|
5 years ago |
wanggang
|
b0ad7a47b4
|
update
Former-commit-id: eee7a0bb43eb867c23bb7087a9ba4937d42a159e
|
5 years ago |
wanggang
|
e276be8e48
|
1.0.0-beta.422
Former-commit-id: 933b329a4b941668a4ff3960ac1f91372d3e1140
|
5 years ago |
wanggang
|
2085ebae62
|
update
Former-commit-id: 22aca066961a9331ab5e6784d7615ba9dcf57a31
|
5 years ago |
wanggang
|
a23d5cc947
|
update
Former-commit-id: 0db9fb092b28553efe7de8e8c100e0584d877d04
|
5 years ago |
wanggang
|
5b8386ee4a
|
update
Former-commit-id: 6d818dd16546c8e39cfa58f85bc6d22148b13218
|
5 years ago |
wanggang
|
c0498b4448
|
1.0.0-beta.417
Former-commit-id: a40dab15ef15aaf97ba375a74c672a367bcf2e4e
|
5 years ago |
wanggang
|
a3ac37d06d
|
update
Former-commit-id: bb24c4a8232025066f56ebe17a3dd278d25affb6
|
5 years ago |
wanggang
|
daf16e8bbc
|
1.0.0-beta.416
Former-commit-id: c1194f94a487c0a0a2fdb5673d486d1631738483
|
5 years ago |
wanggang
|
bd98523b51
|
update
Former-commit-id: 1bfe6ada490aa2867fed617f76a8041755186072
|
5 years ago |
wanggang
|
71a2e0c83e
|
update
Former-commit-id: 1754ad155e5b9013371b6b62df74898ae781454d
|
5 years ago |
wanggang
|
605fdf5ad6
|
update
Former-commit-id: 5acc4862d9a7d8b4c645c38d097b2d2f8ebe737c
|
5 years ago |
wanggang
|
c12d77bd59
|
1.0.0-beta.415
Former-commit-id: 05c2599dd9ed18e7b525b2c5548233f8af4bbcd5
|
5 years ago |
wanggang
|
8d683a79ee
|
update
Former-commit-id: 8ab9d41f109fe21120378d6e8970a196b327bb64
|
5 years ago |
wanggang
|
cb28a8225f
|
1.0.0-beta.414.3
Former-commit-id: d73fe4a1c3e6b29bbd0d4968e974b46a6083c859
|
5 years ago |
wanggang
|
8c2c01e71f
|
1.0.0-beta.414.1
Former-commit-id: db5716604343df2afb405cac03f474a82f335c1d
|
5 years ago |
wanggang
|
8298ea4e54
|
update
Former-commit-id: f1b55a1eea3002b52a4091e0c637515910fa118a
|
5 years ago |
wanggang
|
3e898f5be0
|
update
Former-commit-id: c8eec48db76dbe8949cb9c055209b04468eb617e
|
5 years ago |
wanggang
|
9e441fa71a
|
add jobserver
Former-commit-id: 58f8f8a2c3e502f44a44714821dca2f0cd4378da
|
5 years ago |
wanggang
|
9cccc7b374
|
1.0.0-beta.410
Former-commit-id: 26075178845bec01154b354637260a830c04b45a
|
5 years ago |
wanggang
|
c1b65786dc
|
update
Former-commit-id: d092a5aea0057cb58573b3e3d6f11de978f664d6
|
5 years ago |
wanggang
|
af723eed68
|
1.0.0-beta.408
Former-commit-id: 9351510c2f675ac4be34739de73f99ef27d219aa
|
5 years ago |
wanggang
|
993142a71a
|
1.0.0-beta.407
Former-commit-id: 49ccd326d625e4d2ecbce3daf80f85e8125bc13b
|
5 years ago |
wanggang
|
00211f91d0
|
添加用户中心缺少的登录相关的配置
Former-commit-id: 32f94e7606955d1aac74c66b6ed572dc9c248c29
|
5 years ago |
wanggang
|
0cf9d35fce
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 710cc89fcc0365454ede201961beb60fd0ae4845
|
5 years ago |
wanggang
|
d4f8824bab
|
避免飞比设备返回值处理出现异常时导致接受上传数据线程退出
Former-commit-id: 296679a5354a8be0dd61e7275c1fab911cf96bfb
|
5 years ago |
zhengpengju
|
f35d782a70
|
摄像头详情判断显示
Former-commit-id: 34dc0754de7b9ade1e7224cffc21bfd41866ca25
|
5 years ago |
wanggang
|
c084c54f02
|
移除调试代码
Former-commit-id: 5f52cd36bf160504086a752ff1174feab3d05b1e
|
5 years ago |
wanggang
|
88acbe8dcd
|
添加智能插座即时功率,修复电量除数
Former-commit-id: 5674684a569d060fd6eff54638cf33261b170942
|
5 years ago |
wanggang
|
cf418de57e
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 4d5bf4adb0fb95207270c26bf14a7143812600b9
|
5 years ago |
wanggang
|
6fbc825406
|
update
Former-commit-id: b77128a1da66774a8cfe677fed6b46cfc48a9d40
|
5 years ago |
zhengpengju
|
0978d7748a
|
红外转发器详情页,按键列表水平居中,垂直高度保持和摄像头一致
Former-commit-id: e9ef6655ced6b3aae60652a685c7045147bf2ceb
|
5 years ago |
wanggang
|
514fde0456
|
还原RegisterModel
Former-commit-id: 298a8da093178e361f251de99e7c582da85b6308
|
5 years ago |
wanggang
|
c5867327d2
|
添加Controller获取ModelMetadata的扩展方法,XamarinApp升级程序包并使用Application.Current.Properties进行配置读写
Former-commit-id: 55ff3bd01cd455cba1a57ae46c248d1b6e7164e2
|
5 years ago |
wanggang
|
4964991626
|
解决_Layout.cshtml中标题显示错误的问题
添加IoTCenter可以直接删除Node的功能
Former-commit-id: b265fb07db5e8ffef19e1e919a90f3351a7d72c3
|
5 years ago |
wanggang
|
eb74be5777
|
1.0.0-beta.330
Former-commit-id: 778c0ff04691fe58652e1f166f92a9f3a97eb0a9
|
5 years ago |
wanggang
|
7d32661160
|
update
Former-commit-id: 9b13deb3d4a62694052c65ae7d3f2be445e16f9d
|
5 years ago |
wanggang
|
2a4fc17b06
|
1.0.0-alpha.327
Former-commit-id: dfa7f3033526220674d896b39e3d4c32ceecbf41
|
5 years ago |
wanggang
|
59f0f0f3b5
|
update
Former-commit-id: cfdde56ed7a85b0c1e305f5ea77968e269c61fda
|
5 years ago |
wanggang
|
ead3412687
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: b4abb946b12a8bd927b5dabbcd6a003669526be6
|
5 years ago |
wanggang
|
aaf31966ed
|
单点登录部分,将物联网中心配置为本地服务,本地服务统一使用相同的加密解密方式来使用usercenter发送的cookie中包含的jwt信息,不再单独发放cookie,学习中心配置为外部集成
Former-commit-id: abe957bfb5c8e247be7192314cad899023f21aea
|
5 years ago |
zhengpengju
|
f261d026ce
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: c535c7d1b4e61825d82f85fd23f980aa55aef0a8
|
5 years ago |
zhengpengju
|
52d315621c
|
修改WebSPA页面部分排版及问题修复
Former-commit-id: 3aa40b99046e1bbdc24bc964081710ea7dbb326f
|
5 years ago |
wanggang
|
4cc5b5ee9b
|
重构目录
Former-commit-id: 633d8269b953be184e2af6b94d0561bc25758989
|
5 years ago |
wanggang
|
902734d2db
|
update
Former-commit-id: 85e61c6e274146379a9d91ff452e2d5d926fed71
|
5 years ago |
wanggang
|
4752918af7
|
1.0.0-alpha.325
Former-commit-id: 7d8cfa2f7e3763da0ee1a9469b9c274082062360
|
5 years ago |
wanggang
|
fac3fe100e
|
update
Former-commit-id: 068a0d9a11392aa04d68d5c7441402bb35e09625
|
5 years ago |
wanggang
|
7fb9fdaf86
|
update
Former-commit-id: 12a0bab2e4c8397532204d4cc9b1987f33dd10a8
|
5 years ago |
zhengpengju
|
404e728331
|
合并原有代码
Former-commit-id: 8b80718b0a377ce8dd9a4fe9fba08b30de9757a6
|
5 years ago |
zhengpengju
|
21913954f4
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 7cfda52ca999256ccfe3aeb3fc07d285a9a97c8c
|
5 years ago |
wanggang
|
ddb95a79f9
|
update
Former-commit-id: 9bc3bd0e2c8646792ba28be6d3cb8fc21d34036e
|
5 years ago |
wanggang
|
01bcf422b9
|
update
Former-commit-id: 98e04bc3ffeb3f5f8ac8750b0fe6106024e986ba
|
5 years ago |
wanggang
|
e6a1b4e49e
|
Revert "开始修改使select兼容json和html两种方式"
This reverts commit c0ed737c44 [formerly 8dc4e1562b84d7ba68848af46508440ca9bb7d2a].
Former-commit-id: ca0ae74875ed3bbddb22eafe38961594cb03563f
|
5 years ago |
wanggang
|
c0ed737c44
|
开始修改使select兼容json和html两种方式
Former-commit-id: 8dc4e1562b84d7ba68848af46508440ca9bb7d2a
|
5 years ago |
wanggang
|
d7f544da5c
|
update
Former-commit-id: d3c853a157c7c757353eb78af0675f68e6af6e39
|
5 years ago |
wanggang
|
904537ad07
|
update
Former-commit-id: 9a2b045f24158bad6f1ba7ce4a7ba79d17a70bc4
|
5 years ago |
wanggang
|
01a3c85e37
|
1.0.0-alpha.317
Former-commit-id: de9ef01f3cbbd32cf37d45c38decb072f6f84c21
|
5 years ago |
wanggang
|
7772d934ef
|
1.0.0-alpha.315
Former-commit-id: e440c1284650e8fe7a5f299cc758e65bfb722abb
|
5 years ago |
wanggang
|
3265ae92b1
|
update
Former-commit-id: e4e8950bfb6d7177acfee59f1e67d66cde7778a4
|
5 years ago |
wanggang
|
d0fb1e85fb
|
update
Former-commit-id: 3e9a760c0c5283ffe358016dc707917ee3b8ba06
|
5 years ago |
wanggang
|
895d4271b3
|
update
Former-commit-id: cabd2bd6a25ee3eb0843556adf976e703ab63f6c
|
5 years ago |
wanggang
|
8c7f0c6e73
|
update
Former-commit-id: 71ca9dbf3059f2a3583593cf0fe0785f218ed5c7
|
5 years ago |
wanggang
|
42a1e59974
|
update
Former-commit-id: a485052447a1b9815bab03a79ad4965d6fa341d8
|
5 years ago |
wanggang
|
712be18b43
|
1.0.0-alpha.313
Former-commit-id: a696f99636ca1a8f4c8549e4accf06c75ba67dc5
|
5 years ago |
wanggang
|
52d90038d8
|
1.0.0-alpha.321
Former-commit-id: f8ab055ab29c18ba95d1bd4b80464d01894b5a7c
|
5 years ago |
wanggang
|
5a4f9bf2cd
|
update
Former-commit-id: f69de0fed74984668fe99750f2e93416e0bdef39
|
5 years ago |
wanggang
|
b25ca76bd5
|
update
Former-commit-id: a96ffc8587ba4d39a7fdc515389681ca76103e7e
|
5 years ago |
wanggang
|
7ab8d1ad08
|
update
Former-commit-id: 9427f50189b771723e1e89525609009d938f1eb8
|
5 years ago |
wanggang
|
a58eae7e12
|
update
Former-commit-id: 900d87b584b0ef52f72cd291d53922b28951f4f6
|
5 years ago |
wanggang
|
72518e2078
|
update
Former-commit-id: 24e874e083f704153ca6245a61f8093dca28c024
|
5 years ago |
wanggang
|
48a109be79
|
update
Former-commit-id: 2fbee2cf9bbce8c6d8c9ac6ad0639aee696b6253
|
5 years ago |
zhengpengju
|
b57ffba62c
|
优化代码增加websocket事件处理
Former-commit-id: b7404c714792073f62c7412c7687486220f3d18b
|
5 years ago |
wanggang
|
5a545e925f
|
update
Former-commit-id: 25b0340db0330735d7e2ec75a8f6ff728152bb8b
|
5 years ago |
wanggang
|
4353abdb5d
|
go-fastdfs
Former-commit-id: d18b4291b7c290cec9edd2600cc985fed8aa17dc
|
5 years ago |
wanggang
|
f9b140b050
|
物联网平台CockroachDB子查询统计设备数量点相关代码修改,将内部子查询替换为外部循环统计
Former-commit-id: 1bd43fc08f23bd4d4d08a10cdaa1a347982bbac6
|
5 years ago |
wanggang
|
f94828d150
|
1.分布式数据库使用CockroachDB,当前版本2.0.5需要修改代码支持子查询
2.SignalR分布式使用Redis实现
Former-commit-id: aeb589e6ccee1e5779bec6095b2283ea5b2bec44
|
5 years ago |
wanggang
|
f7452a023d
|
开始测试切换到PostgreSQL
Former-commit-id: 794af6d1d3b422ce5093ac850a015c0321b668fd
|
5 years ago |
zhengpengju
|
8c5339e2ea
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 7764266dc33689cf111491ac35520159c8a996e9
|
5 years ago |
wanggang
|
568d9680d3
|
update
Former-commit-id: 908f3eaf93170fa364dc1fa11badee14fa1754e2
|
6 years ago |
wanggang
|
e4fb4c91ea
|
1.0.0-alpha.219
1.使用初始化config数据库的mac地址作为节点编号
2.更换网卡时需要根据新网卡生成序列号
Former-commit-id: f9f3d908b7332831c2d7dc1e7d2b66f84d0c6bf2
|
6 years ago |
wanggang
|
cdec4603de
|
update
Former-commit-id: b50c7b1a213c5eadf00dadce68e73234fb5ecede
|
6 years ago |
zhengpengju
|
cadebda45b
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: c82f66914e83de712708c2ab98e22152d8eb98c9
|
6 years ago |
wanggang
|
ad800eb13d
|
update
Former-commit-id: de2ffe8ca0e29fb69097a671f67488737a994860
|
6 years ago |
wanggang
|
530b494328
|
update
Former-commit-id: 700319900bdac5cb88439e5290f33e8778b0ce42
|
6 years ago |
zhengpengju
|
131ff0c199
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 9dc5b1c93f4f60042a0b5ee5201c231d9fd71db0
|
6 years ago |
wanggang
|
b3332970a2
|
update
Former-commit-id: c61b79124302881884de172489cfc39be666e580
|
6 years ago |
wanggang
|
afb1834d8e
|
update
Former-commit-id: 41d4224acc0e15c1199043f565fad44b5161a767
|
6 years ago |
wanggang
|
946c1f05cb
|
1.0.0-alpha.217
Former-commit-id: 936fda2fb14600b7a4917c00933673bfae2523b6
|
6 years ago |
wanggang
|
9eb7170270
|
update
Former-commit-id: 551dfde10a895ade048204bf16cceb248fa22b60
|
6 years ago |
wanggang
|
16cf409720
|
update
Former-commit-id: 9d5a0221e8a6c4db6a9370a0b7851512c4777dfc
|
6 years ago |
wanggang
|
a780f98c10
|
1.0.0-alpha.214
Former-commit-id: 774c30e1a4277afbb95a325367619ba5fe4ca762
|
6 years ago |
zhengpengju
|
f39f037fb1
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 0b905b4af476374c094b1fbcd34fbb9e218911ef
|
6 years ago |
wanggang
|
443a7c65ff
|
update
Former-commit-id: 3a80454fe920bb637f1e149466027001d873585e
|
6 years ago |
wanggang
|
1b019064f6
|
1.标记当前版本为:1.0.0-alpha.213
2.开始重构:
(1)将定时器和触发器作为场景下级添加
(2)将定时器和触发器与命令的关联删除
(3)触发器条件修改为只能取数据值匹配,删除数据描述匹配部分
Former-commit-id: d373ec0ce4222572557e2d2a25f9cc6baeab511a
|
6 years ago |
zhengpengju
|
56067072e4
|
调整样式
Former-commit-id: 48acba1d77180652642f43e41f24979215cd7a4a
|
6 years ago |
zhengpengju
|
f8e81fa81f
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: 4e4c3383a97ef92651afc5d247253ebb6fff2f1c
|
6 years ago |
wanggang
|
7e28327c19
|
update
Former-commit-id: 814afb43a06f7e337f6e5f79f102eca529c34993
|
6 years ago |
zhengpengju
|
c1354bb34b
|
完成大部分页面的合并
Former-commit-id: 7b2c826f5083d273944f0f4befae7fbf0b9018df
|
6 years ago |
zhengpengju
|
3226e69e8b
|
Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0
Former-commit-id: c1a6e2a57f9cef51ebe30015fa0f7c71d6562577
|
6 years ago |
wanggang
|
7f9ab1c65c
|
update
Former-commit-id: d8d7a836404917b116d8f7ba2f3f083aeb60eb97
|
6 years ago |