From dd6d76d921fcaf4722d3985ea1c69c0d9f5a23ea Mon Sep 17 00:00:00 2001 From: lsxredrain <34489690@qq.com> Date: Sat, 18 Sep 2021 17:40:06 +0800 Subject: [PATCH] feat: add dgiot wechat --- CHANGELOG.md | 62 +++++++++++++++++++ README-CN.md | 17 ++--- apps/dgiot/src/channel/dgiot_channelx.erl | 3 +- .../src/handler/dgiot_bridge_handler.erl | 1 - 4 files changed, 73 insertions(+), 10 deletions(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000..8b7bfd3331 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,62 @@ +## [4.3.3](https://github.com/dgiot/dgiot/compare/v4.3.2...v4.3.3) (2021-09-18) + + +### Bug Fixes + +* shouyinchengchannel cType ([442bee6](https://github.com/dgiot/dgiot/commit/442bee6c8a104ea9e5c588de549899436a0c99bd)) +* test ([cf09d38](https://github.com/dgiot/dgiot/commit/cf09d384cbae75e22a7332145bf6173c9de6d397)) +* test change log ([1d03322](https://github.com/dgiot/dgiot/commit/1d033226a84d78d1d250b22c05907cfb5444c228)) + + +### Features + +* ... ([d285393](https://github.com/dgiot/dgiot/commit/d2853938f1a13c45ecebb3a38142e2207ea802cf)) + + + +## [4.3.2](https://github.com/dgiot/dgiot/compare/v4.3.1...v4.3.2) (2021-09-13) + + +### Bug Fixes + +* addtd files ([c91a199](https://github.com/dgiot/dgiot/commit/c91a1993cd06777eb9304a07068ef1000f20aa00)) +* device_card ([50914b4](https://github.com/dgiot/dgiot/commit/50914b4bbefb9fcdf5049d5c4a36cac21819786f)) +* devicelog ([e747cee](https://github.com/dgiot/dgiot/commit/e747cee225e37f1050026781fe89418b19dadc7e)) +* igore rebar.config ([5e61214](https://github.com/dgiot/dgiot/commit/5e61214789aa382f6a8be126830b14c3c834a1cc)) +* parse.conf ([488c12e](https://github.com/dgiot/dgiot/commit/488c12e793fa2b94acfa01d0585072ca3a47d275)) + + +### Features + +* add acl to log ([2533081](https://github.com/dgiot/dgiot/commit/2533081a08a64203d1a3b17090bd3dc53497d8b2)) +* add dgiot log ([59b9906](https://github.com/dgiot/dgiot/commit/59b9906bd10ebb42c0439967c3989d1cdd6b9d29)) +* ssl ([f673266](https://github.com/dgiot/dgiot/commit/f6732665fd737a34147d06998f5328e605933906)) +* xiufubug ([f4c9d75](https://github.com/dgiot/dgiot/commit/f4c9d75653f789a07e700574deadaddd645b6f36)) + + + +## [4.3.1](https://github.com/dgiot/dgiot/compare/v4.3.0...v4.3.1) (2021-08-30) + + +### Bug Fixes + +* get_actions ([cb81e42](https://github.com/dgiot/dgiot/commit/cb81e42a6a94e18fe5e2e74a243240a4a23fd0bc)) +* get_channel params ([be0409b](https://github.com/dgiot/dgiot/commit/be0409b11b8c27e55d56f1a70a38b2a452e550e9)) +* get_resources ([2e218ed](https://github.com/dgiot/dgiot/commit/2e218edd97efe5621bd0463b4a4c7652535686de)) + + +### Features + +* 迁移脚本 && 字段修å值重复 ([1d69ba7](https://github.com/dgiot/dgiot/commit/1d69ba76facb9a4caab218c240eef750258bc4f1)) +* api get_table ([2a3606d](https://github.com/dgiot/dgiot/commit/2a3606dd8ded698c3003e7cef0a839f1807b543a)) +* get_maintenanceid ([195e43c](https://github.com/dgiot/dgiot/commit/195e43ccf2482af799d80362b88a23c581f2eaed)) +* get_provider ([ebb5c57](https://github.com/dgiot/dgiot/commit/ebb5c571c4a20c916fcafb091b90aa546d7954d4)) +* scripts ([810bfe5](https://github.com/dgiot/dgiot/commit/810bfe5fce8f39a536f56d1952649973af810012)) +* swagger description ([3bdb162](https://github.com/dgiot/dgiot/commit/3bdb162d0a4057a78a1e45e47ba04dbb91473ae2)) + + + +# 4.3.0 (2021-05-27) + + + diff --git a/README-CN.md b/README-CN.md index 8ae1c2c969..c58a1b6281 100644 --- a/README-CN.md +++ b/README-CN.md @@ -8,6 +8,15 @@ [English](./README.md) | [简体中文](./README-CN.md) | [日本語](./README-JP.md) | [русский](./README-RU.md) +## 快速体验 +| | | +| -------------- | ----------------------------------------------------------------------------------------- | +| 账号 | dgiot_admin | +| 密码 | dgiot_admin | +|小程序 | ![dgiot小程序](http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/dgiot_wechat.jpg) | +|管理后台|![dgiot_dashboard.png](http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/dgiot_release/dgiot_dashboard.png)| + + *DGIOT* 是国内首款轻量级开源工业物联网持续集成平台 DG-IoT团队2016年之前，在互联网和移动互联网爬坑多年，2016年开始进入物联网爬坑，希望通过这个开源平台把多年爬坑经验共享出来，让多学科交叉的工业互联网项目变得更简单。 @@ -110,13 +119,5 @@ wget -q https://gitee.com/dgiiot/dgiot/raw/master/dgiot_install.sh && sh dgiot_ - [Reddit](https://www.reddit.com/) - [Weibo](https://weibo.com) - -## 预览地址 -[腾讯云预览地址](https://dgiotdashboard-8gb17b3673ff6cdd-1253666439.ap-shanghai.app.tcloudbase.com?ftom=git) - -## 扫码预览 -![dgiot_dashboard.png](http://dgiot-1253666439.cos.ap-shanghai-fsi.myqcloud.com/wechat/dgiot_dashboard.png) - - ## 开源许可 Apache License 2.0, 详见 [LICENSE](./LICENSE)。 diff --git a/apps/dgiot/src/channel/dgiot_channelx.erl b/apps/dgiot/src/channel/dgiot_channelx.erl index 86a8006cac..f37766dd21 100644 --- a/apps/dgiot/src/channel/dgiot_channelx.erl +++ b/apps/dgiot/src/channel/dgiot_channelx.erl @@ -75,7 +75,8 @@ spec() -> spec(SerName) -> - {dgiot_channelx_mgr, {dgiot_channelx_mgr, start_link, [SerName]}, permanent, 5000, supervisor, [dgiot_channelx_mgr]}. + dgiot_pool_sup:spec(SerName). +%% {dgiot_channelx_mgr, {dgiot_channelx_mgr, start_link, [SerName]}, permanent, 5000, supervisor, [dgiot_channelx_mgr]}. status(Pid) when is_pid(Pid) -> gen_statem:call(Pid, status); diff --git a/apps/dgiot_bridge/src/handler/dgiot_bridge_handler.erl b/apps/dgiot_bridge/src/handler/dgiot_bridge_handler.erl index 9fa790d4d7..c0f49c2031 100644 --- a/apps/dgiot_bridge/src/handler/dgiot_bridge_handler.erl +++ b/apps/dgiot_bridge/src/handler/dgiot_bridge_handler.erl @@ -78,7 +78,6 @@ handle(OperationID, Args, Context, Req) -> %%%=================================================================== %%% 内部函数 Version:API版本 %%%=================================================================== - do_request(post_control_channel, #{<<"id">> := ChannelId, <<"action">> := Action}, _Context, _Req) when Action == <<"enable">>; Action == <<"disable">>; Action == <<"update">> -> dgiot_bridge:control_channel(ChannelId, Action);