Commit Graph

1363 Commits

Author SHA1 Message Date
jhonliu
e5375b8974 Merge branch 'master' of github.com:dgiot/dgiot 2022-05-14 10:35:33 +08:00
h7ml
ad2e7b3684 fix: 恢复插件 2022-05-14 10:08:35 +08:00
h7ml
a1c0e32901 .gitignore 2022-05-13 23:29:47 +08:00
jhonliu
a64d1eee73 Merge branch 'master' of github.com:dgiot/dgiot 2022-05-13 23:23:35 +08:00
h7ml
5a395a7d62 fix: delete other setting 2022-05-13 22:33:32 +08:00
unknown
ed5b00e2bb
fix: parse 2022-05-13 22:27:38 +08:00
unknown
ab0959053d
fix: device update body 2022-05-13 22:18:14 +08:00
unknown
eef0b21832
Merge branch 'master' of github.com:dgiot/dgiot 2022-05-13 17:45:07 +08:00
h7ml
355f4512bd fix: api 2022-05-13 17:39:52 +08:00
unknown
07d03a80a9
Merge branch 'master' of github.com:dgiot/dgiot 2022-05-13 17:21:42 +08:00
h7ml
ab4329c389 feat(do_put): do_put hook 2022-05-13 15:50:13 +08:00
unknown
6c60dbdea5
Merge branch 'master' of github.com:dgiot/dgiot 2022-05-13 15:21:36 +08:00
h7ml
7e1f4de43a feat: get usertree 2022-05-13 15:19:55 +08:00
h7ml
274629e5e6 feat: get_protocol(cache) 2022-05-13 13:05:29 +08:00
dawnwinterLiu
ad1c7aeffc feat: modbus_tcp 2022-05-13 12:39:19 +08:00
dawnwinterLiu
75b00d0764 feat: dgiot_system_handler 2022-05-13 12:25:38 +08:00
h7ml
48b438d7b4 ignore 2022-05-13 12:21:38 +08:00
h7ml
e06df42036 Merge branch 'master' of github.com:dgiot/dgiot 2022-05-13 12:19:12 +08:00
h7ml
adfe000131 feat(dgiot_utils): to_map 2022-05-13 12:10:54 +08:00
dawnwinterLiu
47862f58e5 feat: dgiot_system_handler 2022-05-13 12:09:01 +08:00
unknown
c5f527c22f
Merge branch 'master' of github.com:dgiot/dgiot 2022-05-12 19:37:49 +08:00
dawnwinterLiu
0fe14e0c99 feat: mqtt 2022-05-11 19:37:14 +08:00
dawnwinterLiu
64ea1c8633 feat: profile 2022-05-11 17:37:35 +08:00
dawnwinterLiu
98f308e44f fix: devicecard 2022-05-11 17:26:25 +08:00
h7ml
05bbd01e2b fix: delete .gitignore config 2022-05-11 16:36:05 +08:00
h7ml
96d3b8c284 fix: delete .gitignore config 2022-05-11 16:34:10 +08:00
h7ml
8ed9ba3f07 fix(parse): parse config 2022-05-11 16:24:25 +08:00
h7ml
bf5e980500 feat(iotapi): query relation 2022-05-11 16:22:04 +08:00
dawnwinterLiu
e435472a14 feat: wget dashbosrd 2022-05-11 14:28:22 +08:00
jhonliu
e76508b08a Merge branch 'master' of github.com:dgiot/dgiot 2022-05-11 14:26:09 +08:00
jhonliu
a3cebac79a feat: add dgiot_dashboard 2022-05-11 14:25:53 +08:00
dawnwinterLiu
d458db740f feat: rebar 2022-05-11 14:20:09 +08:00
dawnwinterLiu
f8d0341b21 faet: tcp 2022-05-11 14:19:15 +08:00
h7ml
93c05be749 fix(ignore): *.log 2022-05-10 18:00:49 +08:00
h7ml
dd811d690e fix: chartType.json 2022-05-10 17:59:32 +08:00
h7ml
d0ebc9355c feat: sql(template) 2022-05-10 17:46:39 +08:00
h7ml
d82a80e524 fix: fix sql tpl 2022-05-10 17:03:26 +08:00
h7ml
8573afc448 fix: fix sql tpl 2022-05-10 17:02:47 +08:00
h7ml
def71ffb90 feat: ThingUnit 2022-05-10 16:24:10 +08:00
h7ml
4c46b15f01 feat: ThingUnit 2022-05-10 16:20:58 +08:00
h7ml
4f815d4e66 fix: 修复生成sql错误 2022-05-10 14:56:31 +08:00
h7ml
eaf881f048 fix: 2022-05-10 09:47:40 +08:00
dawnwinterLiu
7230733bf6 feat: update dgiot_n139 2022-05-09 21:15:23 +08:00
h7ml
7e2ef47caa default 2022-05-09 20:29:59 +08:00
dawnwinterLiu
3568200cac feat: sync_parse sleep 2022-05-09 20:25:35 +08:00
dawnwinterLiu
881d46e130 feat: sync_product 2022-05-09 20:23:05 +08:00
jhonliu
fe165c1064 fix: rm log 2022-05-09 19:52:47 +08:00
jhonliu
493d7bdb97 fix: get_roleuser 2022-05-09 15:51:50 +08:00
dawnwinterLiu
06f447c673
Update rebar.config.erl 2022-05-09 15:23:42 +08:00
dawnwinterLiu
c17c7806cd
Update loaded_plugins.tmpl 2022-05-09 15:22:41 +08:00