test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-12-10 17:19:43 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
1,808 Commits 20 Branches 56 Tags 119 MiB
628170fe8f
Commit Graph

1091 Commits

Author SHA1 Message Date
lsxredrain
3e8e98b0e0 refactor: 2021-09-11 14:37:00 +08:00
AvantLiu
896089dc94 fix:parse.config 2021-09-11 12:05:37 +08:00
AvantLiu
50914b4bbe fix: device_card 2021-09-10 18:32:33 +08:00
AvantLiu
fbb2e5b81a feat:thing_gps 2021-09-09 19:44:40 +08:00
lsxredrain
fbcc3dbc01 add pushgateway swich 2021-09-09 17:50:17 +08:00
lsxredrain
b8f618ebe6 fix:install postgres failed 2021-09-09 16:42:17 +08:00
lsxredrain
afe583ec00 fix: 2021-09-09 16:07:06 +08:00
lsxredrain
580e939ff9 feat: 2021-09-09 11:28:04 +08:00
AvantLiu
e1feae3f5d trace 2021-09-07 20:56:50 +08:00
AvantLiu
2e7e7b5969 save td 2021-09-04 17:47:55 +08:00
AvantLiu
488c12e793 fix: parse.conf 2021-09-04 16:53:32 +08:00
AvantLiu
313fcbb526 td 2021-09-04 16:49:20 +08:00
AvantLiu
0fb3b32949 devicelog 2021-09-03 12:01:38 +08:00
AvantLiu
c2d4778551 log 2021-09-02 17:22:39 +08:00
lsxredrain
2533081a08 feat: add acl to log 2021-09-01 15:32:02 +08:00
lsxredrain
3b163bfc66 refactor: delete node_modules 2021-09-01 10:22:18 +08:00
AvantLiu
e747cee225 fix: devicelog 2021-08-31 19:16:56 +08:00
AvantLiu
c91a1993cd fix: addtd files 2021-08-31 15:38:20 +08:00
AvantLiu
f4c9d75653 feat: xiufubug 2021-08-31 11:01:58 +08:00
lsxredrain
59b9906bd1 feat: add dgiot log 2021-08-31 10:19:23 +08:00
lsxredrain
e8ce9d0f40 add domain 2021-08-30 12:38:31 +08:00
lsxredrain
3e6623ec39 add parse api log 2021-08-30 11:49:06 +08:00
AvantLiu
43e962ba6e parse_api 2021-08-28 19:36:05 +08:00
lsxredrain
6f8edfc13f rm log 2021-08-28 17:45:40 +08:00
lsxredrain
2f4fb45f40 add save parse log 2021-08-28 15:29:31 +08:00
AvantLiu
ddd246f055 logtopic 2021-08-27 18:48:15 +08:00
lsxredrain
6b4a362a87 fix log bug 2021-08-27 18:29:59 +08:00
AvantLiu
50d6fb5406 写多个寄存器 2021-08-27 16:58:39 +08:00
lsxredrain
6d3442bdff commit log hook 2021-08-27 10:10:19 +08:00
AvantLiu
da20c4500f setloglevel 2021-08-27 10:05:53 +08:00
lsxredrain
75d7b0b9f9 add setloglevel 2021-08-26 20:38:20 +08:00
lsxredrain
347272fd2d Merge branch 'master' of github.com:dgiot/dgiot 2021-08-26 20:24:54 +08:00
lsxredrain
d17f49adfd mov send log to dgiot_logger 2021-08-26 20:24:29 +08:00
AvantLiu
1fb0466a9b dgiot_parse 冲突 2021-08-26 17:38:32 +08:00
AvantLiu
6aedca2362 router 2021-08-26 16:59:20 +08:00
AvantLiu
d707f8401b 更新日志级别 2021-08-26 16:42:51 +08:00
AvantLiu
fe8eab6184 log,traces 2021-08-26 16:29:25 +08:00
lsxredrain
ed0371a713 add dgiot log save to parse 2021-08-26 15:09:28 +08:00
AvantLiu
adcf6dab0c td 2021-08-25 11:26:07 +08:00
AvantLiu
3ba7d2e03f td 2021-08-25 11:25:15 +08:00
AvantLiu
2d3458c461 td,http 2021-08-24 18:42:17 +08:00
lsxredrain
3f0de65394 add dgiot_grpc 2021-08-23 19:36:50 +08:00
lsxredrain
367c081eaf change to json log 2021-08-22 01:44:54 +08:00
lsxredrain
ac004c395a Merge branch 'master' of github.com:dgiot/dgiot 2021-08-21 19:41:03 +08:00
lsxredrain
efa6c7d285 fix pull grpc failed 2021-08-21 19:40:38 +08:00
AvantLiu
bab21bc261 物模型接口修改 2021-08-21 13:40:48 +08:00
lsxredrain
a27b5c7960 Merge branch 'master' of github.com:dgiot/dgiot 2021-08-20 19:21:49 +08:00
lsxredrain
2f896bdf51 add dgiot_grpc 2021-08-20 19:20:20 +08:00
AvantLiu
1dbd4617fe 物模型接口 2021-08-20 19:04:00 +08:00
lsxredrain
bebf3ebac6 fix grpc disconnect 2021-08-20 16:05:42 +08:00
AvantLiu
92159bfb74 prod 同步 2021-08-18 14:34:19 +08:00
lsxredrain
45fdecea67 change to dgiot_task:get_pnque(DtuId) 2021-08-18 09:11:40 +08:00
AvantLiu
31d7712fb8 设备卡片 2021-08-17 18:51:40 +08:00
lsxredrain
e1443422b7 add dgiot_gprc 2021-08-17 18:48:30 +08:00
lsxredrain
589951c637 sysnc 4.3.7 2021-08-16 15:07:42 +08:00
lsxredrain
c7a3dfb92f add ibrower 2021-08-13 17:59:01 +08:00
AvantLiu
cea466649b jpg 2021-08-13 17:44:29 +08:00
lsxredrain
516904b077 add ibrowse 2021-08-13 17:31:38 +08:00
lsxredrain
d0702c9d81 add dgiot_ffmpeg 2021-08-12 13:30:48 +08:00
AvantLiu
3d74b10208
Update dgiot_http.conf 2021-08-11 19:19:02 +08:00
lsxredrain
18c0b5f80d rm dgiot—_jieshun 2021-08-11 18:20:01 +08:00
AvantLiu
254e1f969a 忽略文件 2021-08-11 18:16:50 +08:00
lsxredrain
52ce4d6ae3 modify dgiot_parse and dgiot_parse_handler 2021-08-11 11:44:01 +08:00
lsxredrain
1baf349f0b add mqtt rule 2021-08-10 18:07:43 +08:00
AvantLiu
e23c7e860b gaojing 2021-08-06 18:22:26 +08:00
lsxredrain
f8260a398b rm dgiot_xinchuangwei 2021-08-06 17:32:00 +08:00
h7ml
3bdb162d0a
feat: swagger description 2021-08-06 11:35:49 +08:00
AvantLiu
3aefee0d5d xinchuangwei 2021-08-03 19:52:28 +08:00
AvantLiu
2b77a8673e
Update dgiot_parse.conf 2021-08-02 11:28:29 +08:00
AvantLiu
a1a4239895 aa 2021-07-30 14:26:03 +08:00
lsxredrain
1e8d75720c add dgiot 4.3 2021-07-30 11:44:37 +08:00
lsxredrain
e86c7e0d12 add system swagger 2021-07-30 11:33:03 +08:00
AvantLiu
a9482611ca system 2021-07-30 11:14:13 +08:00
lsxredrain
62e57f8ad2 add profie 2021-07-30 09:23:21 +08:00
AvantLiu
bbf11483cd gaojing 2021-07-29 19:50:38 +08:00
AvantLiu
a25bf25036 zancun 2021-07-29 18:46:25 +08:00
lsxredrain
4c1ccc57e7 add profile hex 2021-07-29 17:26:41 +08:00
lsxredrain
7c41f5a8ea fix meter bug 2021-07-29 16:21:14 +08:00
lsxredrain
eadad1d95e add parse 2021-07-29 11:16:48 +08:00
lsxredrain
b1266a7890 add dgiot_matlab 2021-07-29 10:49:44 +08:00
h7ml
810bfe5fce
feat: scripts 2021-07-28 16:36:06 +08:00
lsxredrain
d539d10a44 add attrs type 2021-07-28 12:00:14 +08:00
lsxredrain
b2adb1b424 add wechat topo 2021-07-28 11:30:03 +08:00
lsxredrain
ce737ac458 add wechat topo 2021-07-28 11:28:55 +08:00
lsxredrain
6120985756 add wechat topo 2021-07-28 09:28:31 +08:00
lsxredrain
18f525e107 add wechat topo 2021-07-27 20:04:13 +08:00
lsxredrain
1e906ebbdd add device sync 2021-07-27 19:44:59 +08:00
lsxredrain
99d5fca702 change ets init to hook 2021-07-27 10:15:10 +08:00
lsxredrain
a951941f00 change parse to prod.iotn2n.com 2021-07-26 17:25:01 +08:00
lsxredrain
0be3e48a33 Merge branch 'master' of https://github.com.cnpmjs.org/dgiot/dgiot 2021-07-26 17:23:50 +08:00
lsxredrain
14eeff2ca4 fix device synchronizing 2021-07-26 17:22:51 +08:00
AvantLiu
a100a25b9d profile 2021-07-26 12:21:26 +08:00
stoneliu
006a046c82 Merge branch 'master' of https://github.com.cnpmjs.org/dgiot/dgiot 
# Conflicts:
#	apps/dgiot_task/src/dgiot_profile_channel.erl
 2021-07-26 09:07:47 +08:00
stoneliu
4391fbb561 profile 2021-07-23 20:24:50 +08:00
lsxredrain
0cf02467e4 change deps lib to gitee 2021-07-22 11:28:47 +08:00
lsxredrain
ec2e4d3ac3 fix compile error 2021-07-22 09:01:07 +08:00
h7ml
1d69ba76fa
feat: 迁移脚本 && 字段修å值重复 2021-07-21 21:54:19 +08:00
lsxredrain
558816b962 rm dgiot_parse_load 
”
 2021-07-21 19:50:22 +08:00
AvantLiu
0ee8751aa3 告警 2021-07-21 19:43:46 +08:00
lsxredrain
2818b8872d add device cache 2021-07-21 16:53:54 +08:00
h7ml
2a3606dd8d
feat: api get_table 2021-07-21 10:49:07 +08:00
lsxredrain
4608c8d353 add td cache 2021-07-20 19:15:19 +08:00
lsxredrain
adb46f3af6 Merge branch 'master' of https://github.com.cnpmjs.org/dgiot/dgiot 2021-07-20 18:06:37 +08:00
lsxredrain
b487fa5af1 add device cache 2021-07-20 18:01:37 +08:00
AvantLiu
d1ca020167 parse 2021-07-20 16:53:56 +08:00
lsxredrain
a1bdeecd1f add device cache 2021-07-20 16:39:49 +08:00
lsxredrain
73cf1f919a add device cache 2021-07-20 16:34:57 +08:00
lsxredrain
f7d021d20f fix save device errror 2021-07-19 19:02:44 +08:00
lsxredrain
e4bf39eaaf Merge branch 'master' of https://github.com.cnpmjs.org/dgiot/dgiot 2021-07-19 17:03:24 +08:00
lsxredrain
1157419ea8 add device cache 2021-07-19 17:00:24 +08:00
AvantLiu
5f9c2d9b80 modbus,device 2021-07-19 16:21:40 +08:00
lsxredrain
114a2a5e73 Remove redundant code 2021-07-19 10:59:37 +08:00
AvantLiu
ff42f530bc add user 2021-07-16 18:16:45 +08:00
lsxredrain
a8492586a2 fix Maintenance bug 2021-07-10 16:05:18 +08:00
lsxredrain
7f120b13a7 add device_channel 2021-07-09 19:26:47 +08:00
lsxredrain
3144c2ee8d add search 2021-07-09 14:34:23 +08:00
lsxredrain
5fe3a9062f add device cache 2021-07-09 12:40:15 +08:00
h7ml
195e43ccf2
feat: get_maintenanceid 2021-07-09 12:37:48 +08:00
AvantLiu
d386899775 user_role 2021-07-09 11:35:47 +08:00
lsxredrain
9de476d1fb sync meter 2021-07-08 11:33:31 +08:00
lsxredrain
74ab67cc04 change parse 2021-07-07 19:40:13 +08:00
lsxredrain
a09c0c81f0 add rule save to dict 2021-07-07 19:06:24 +08:00
AvantLiu
9e00d7dc53 小程序订阅 2021-07-07 16:06:58 +08:00
AvantLiu
94a065edb0 lookup 2021-07-05 20:02:27 +08:00
lsxredrain
5435a74f1a change 2021-07-05 19:29:30 +08:00
AvantLiu
485f645337 wechat http 2021-07-05 17:40:30 +08:00
lsxredrain
c6c8e9e738 add dgiot_meter 2021-07-05 17:29:05 +08:00
lsxredrain
4098ca75e8 rm dgiot_meter 2021-07-05 17:28:24 +08:00
lsxredrain
52d9c15872 rm dgiot_modbus_tcp 2021-07-05 17:20:37 +08:00
lsxredrain
7682428a22 add dgiot_meter 2021-07-05 16:36:24 +08:00
lsxredrain
470832f8de add mqtt 2021-07-05 15:11:12 +08:00
AvantLiu
d0dbb593c3 lookup 2021-07-02 17:16:49 +08:00
lsxredrain
1717187e74 rm shuwa 2021-07-02 13:38:51 +08:00
lsxredrain
9b86974d7d add channel Start up sequence 2021-07-02 12:26:20 +08:00
AvantLiu
5cabba8da6 http_handler 2021-07-02 11:23:57 +08:00
AvantLiu
5951bbe63d proxy 2021-07-02 11:15:56 +08:00
AvantLiu
d34e385a98 proxy 2021-07-02 10:58:49 +08:00
AvantLiu
0e9ee9f869 ico,postdevice 2021-07-02 10:18:38 +08:00
lsxredrain
0eda6e68a4 add dgiot_modbus_tcp schema 2021-07-01 19:52:25 +08:00
AvantLiu
aa524fbea7 task 2021-07-01 19:30:59 +08:00
AvantLiu
b85dda753d task 2021-07-01 10:45:53 +08:00
lsxredrain
88cd638e61 change bag to set 2021-06-30 19:48:42 +08:00
h7ml
b2d575793f
feat :get_deviceacl 2021-06-30 11:54:30 +08:00
AvantLiu
e394422f2d bridge 2021-06-30 09:57:07 +08:00
h7ml
6159414e8e
â€feat: get_devicedict 2021-06-29 18:06:19 +08:00
AvantLiu
2a3c26e02f rm mqtt 2021-06-29 11:59:47 +08:00
AvantLiu
3635267c2e delete sin 2021-06-29 11:52:15 +08:00
AvantLiu
d4bf9f0ea6 bridge 2021-06-29 11:49:58 +08:00
h7ml
9222d9c1d4
Channel parameter de duplication 2021-06-25 17:04:54 +08:00
h7ml
062276c073
Merge branch 'master' of github.com:dgiot/dgiot 2021-06-25 16:52:21 +08:00
AvantLiu
f2fa171857 put role 2021-06-25 15:03:02 +08:00
h7ml
405072fa81
Merge branch 'master' of github.com:dgiot/dgiot 2021-06-24 19:46:42 +08:00
lsxredrain
3225ffc700 add dgiot_node 2021-06-24 19:45:50 +08:00
AvantLiu
925494c130 task,bridge 2021-06-24 18:34:53 +08:00
lsxredrain
db4154ffc4 rm log 2021-06-24 18:18:33 +09:00
lsxredrain
1aefc33bf9 fix swagger 2021-06-24 16:51:13 +09:00
h7ml
2712e7bc99
Merge branch 'master' of github.com:dgiot/dgiot 2021-06-24 14:02:55 +08:00
lsxredrain
9fd4d89959 add put_rule_id 2021-06-24 14:44:57 +09:00
h7ml
9420101d10
. 2021-06-24 11:31:30 +08:00
h7ml
ebb5c571c4
feat: get_provider 2021-06-23 17:37:21 +08:00
h7ml
be0409b11b
fix: get_channel params 2021-06-22 15:57:34 +08:00
lsxredrain
20c40a06f3 fix channel failed 2021-06-21 22:06:49 +09:00
h7ml
2e218edd97
fix: get_resources 2021-06-21 18:58:50 +08:00
h7ml
cb81e42a6a
fix: get_actions 2021-06-21 17:41:05 +08:00
h7ml
c9727b861d
delete test_rules 2021-06-21 16:44:27 +08:00
h7ml
b983f474d7
post_rules 2021-06-21 15:56:02 +08:00
lsxredrain
b32e56089f add rule action and resource 2021-06-21 15:30:00 +09:00
lsxredrain
b917314929 add make run 2021-06-21 14:44:46 +09:00
lsxredrain
24e0fb0c2a add resourse config 2021-06-21 12:10:23 +09:00
lsxredrain
e72d3daa04 add resourse config 2021-06-21 11:57:17 +09:00
lsxredrain
87fec687b0 add rule handle 2021-06-21 10:21:14 +09:00
lsxredrain
88f0aaa63f change poolboy default lifo to fifo 2021-06-19 10:08:57 +09:00
lsxredrain
a1be961a8d fix dgiot_mnsia 2021-06-17 17:01:55 +09:00
lsxredrain
3bd4d1da2d change git 2021-06-17 12:48:44 +09:00
lsxredrain
7202bc4986 fix dgiot_license 2021-06-16 20:53:21 +09:00
lsxredrain
b5d090dee9 add dgiot_license dgiot_opc 2021-06-16 20:24:55 +09:00
lsxredrain
9abf0668fb add dgiot bridge 2021-06-16 15:54:03 +09:00
lsxredrain
fa25f6387a add dgiot_opc and dgiot_license 2021-06-11 11:01:36 +09:00
lsxredrain
d3d8dea0ad rm dgiot_opc 2021-06-11 11:00:21 +09:00
lsxredrain
f6fad903ec add dgiot_license 2021-06-11 10:52:41 +09:00
lsxredrain
46c1b163ef fix rest_api decode 2021-05-31 16:13:31 +09:00
lsxredrain
170411b4aa add dgiot_device 2021-05-30 14:36:53 +09:00
lsxredrain
7fcedbba86 dgiot_http dgiot_task dgiot_tdengine 2021-05-30 14:11:43 +09:00
U-JOHNLIU\jonhl
79af61c6f5 Merge branch 'master' of https://github.com.cnpmjs.org/dgiot/dgiot_server 2021-05-28 11:01:23 +08:00
U-JOHNLIU\jonhl
b6264c0b96 fix windows compile gpb failed 2021-05-28 11:01:03 +08:00
lsxredrain
6dbbefe998 rm _build 2021-05-27 20:19:37 +09:00
lsxredrain
28c756d419 rm _build 2021-05-27 09:07:23 +09:00
lsxredrain
9306ffba3f rm _build 2021-05-27 09:07:01 +09:00
johnliu
ae67a69ee6 add dgiot dgiot_api dgiot_parse dgiot_bridge 2021-05-26 18:34:24 +08:00
lsxredrain
789fe8333a add new project 2021-05-22 03:06:00 +09:00
U-JOHNLIU\jonhl
f83db4a345 add linux_4.3.1 2021-05-18 14:54:48 +08:00