Commit Graph

707 Commits (08761f6349847d79554e6df2d2865657ce69230e)

Author SHA1 Message Date
七步才子 7f3d1fb4da 恢复默认配置 2022-05-21 18:28:43 +08:00
七步才子 459bad335a emqx: auth、acl集成 2022-05-21 18:26:59 +08:00
七步才子 f025375497 Merge branch 'dev' into feature-emqx
# Conflicts:
#	manager/src/main/resources/application.yml
2022-05-21 18:15:21 +08:00
七步才子 cc5df8b486 emqx: auth、acl集成 2022-05-21 18:12:53 +08:00
xiwa 68bae76a8c 认证和权限相关内容调整 2022-05-21 15:35:48 +08:00
七步才子 09d8be5dbb emqx集成 2022-05-21 02:08:50 +08:00
七步才子 e8befc091f emqx集成 2022-05-20 22:42:39 +08:00
xiwa 26049a96fd Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent 2022-05-19 15:08:24 +08:00
xiwa 728dea25f7 配置修改 2022-05-19 15:08:00 +08:00
xiwa 9c2e6980fe
update README.md. 2022-05-19 07:06:25 +00:00
xiwa 3ad6ad2751 配置调整 2022-05-19 13:36:24 +08:00
xiwa 2f5a2fc82b
update README.md. 2022-05-19 05:34:59 +00:00
xiwa 6f6dce17ad
update README.md. 2022-05-19 05:15:00 +00:00
xiwa 5bc279bb7e Merge branch 'dev' of https://gitee.com/iotkit-open-source/iotkit-parent 2022-05-19 11:38:51 +08:00
xiwa 32d35c2db0 授权认证重构集成sa-token 2022-05-19 11:38:15 +08:00
xiwa c82039a66f
update README.md. 2022-05-16 06:27:56 +00:00
七步才子 e956fa4a6a Merge remote-tracking branch 'origin/dev' into dev 2022-05-15 19:45:32 +08:00
七步才子 f9294514cc 配置文件增加阿里云bucketId 2022-05-15 19:40:57 +08:00
xiwa 68535fbc65 jdk版本调整为11 2022-05-15 12:45:57 +08:00
xiwa 3c837bd6ea Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent 2022-05-15 11:01:02 +08:00
xiwa 52daf45a69 第三方接入接口完善 2022-05-15 11:00:56 +08:00
xiwa 53ad81d040
update README.md. 2022-05-14 16:04:31 +00:00
xiwa 51a38d1f18 app端设备状态和属性实时推送实现 2022-05-14 00:20:47 +08:00
xiwa ca29546db5
update README.md. 2022-05-11 09:08:13 +00:00
xiwa 0fd2e06ccc
update README.md. 2022-05-11 09:05:56 +00:00
xiwa a201aed29f 空间设备管理修改 2022-05-11 16:38:31 +08:00
xiwa c981e5a77a 添加设备修改 2022-05-11 01:59:02 +08:00
xiwa 7189336cd1 APP搜索和添加设备 2022-05-10 19:04:27 +08:00
xiwa af3408bfe6 权限配置/搜索设备接口 2022-05-10 02:23:18 +08:00
xiwa 43ce99103c
update README.md. 2022-05-09 10:14:38 +00:00
xiwa 640262e9e5 权限/空间管理调整 2022-05-09 17:53:28 +08:00
xiwa 228a2fdd27 Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent 2022-05-09 10:24:53 +08:00
xiwa 477421031f 添加客户端接口 2022-05-09 10:24:45 +08:00
xiwa fd3055c8b3
update README.md. 2022-05-07 05:43:17 +00:00
xiwa e675bcf2d6 Merge branch 'master' of https://gitee.com/iotkit-open-source/iotkit-parent 2022-05-06 02:34:09 +08:00
xiwa 34f071cfe2 通讯组件接口调整 2022-05-06 02:34:03 +08:00
xiwa 51c8926345
update README.md. 2022-05-02 05:10:43 +00:00
xiwa 5af991f401 实现基于云端lua低代码设备开发 2022-05-02 13:05:29 +08:00
xiwa 1249649ba4
update README.md. 2022-04-24 02:38:38 +00:00
xiwa a0e23dea2b 增加http业务组件 2022-04-24 04:59:23 +08:00
xiwa b9d6054198 组件调整、增加httpbiz组件、删除第三方接入模块 2022-04-22 18:43:42 +08:00
xiwa 447e481111 常量调整 2022-04-22 06:54:48 +08:00
xiwa c90bfbc685 设备控制补充日志 2022-04-22 05:35:14 +08:00
xiwa aa7be02b37 权限问题修复 2022-04-21 09:04:07 +08:00
xiwa 35bdd1b7fc 规则监听/设备注册bug修复 2022-04-19 15:43:02 +08:00
xiwa c1a5cff36d
update README.md. 2022-04-19 02:01:25 +00:00
xiwa ecc37b996a 规则引擎日志修改/增加告警 2022-04-18 18:26:55 +08:00
xiwa edde8b16a6 规则监听问题修复 2022-04-18 03:20:48 +08:00
xiwa 4dbed12ac1
删除文件 doc/ma.jpeg 2022-04-14 17:34:27 +00:00
xiwa 9faf818700
update README.md. 2022-04-14 17:33:44 +00:00