Commit Graph

1039 Commits (9b1d0b696afae07022a33fd973c8e780533221b0)

Author SHA1 Message Date
xiwa f1347fb6e8 Merge branch 'dev' 2022-06-13 19:14:03 +08:00
xiwa 2f4a451a0a 增加内置消息总线实现 2022-06-13 19:12:56 +08:00
xiwa 011176dc87
update README.md. 2022-06-10 01:52:44 +00:00
xiwa 78545e47bd Merge branch 'dev' 2022-06-09 10:13:34 +08:00
xiwa 2c34be2257 增加第三方openUid存储 2022-06-08 17:39:16 +08:00
xiwa fc8945224e
update README.md. 2022-06-07 14:10:10 +00:00
xiwa 63710ca21d 补充电信sdk包 2022-06-07 22:08:44 +08:00
xiwa 63a01b6df7
update README.md. 2022-06-07 07:06:51 +00:00
xiwa 5b6e9ed581
update README.md. 2022-06-07 03:16:23 +00:00
xiwa 364535dc0a Merge branch 'dev' 2022-06-07 00:02:58 +08:00
xiwa 77fa74a6db 创建c端用户添加默认家庭和房间 2022-06-07 00:02:11 +08:00
xiwa 7bcab6a319 角色名修正 2022-06-06 16:41:38 +08:00
xiwa 7b7749810f 增加电信对接组件 2022-06-04 11:45:48 +08:00
xiwa fcc1fea9fc
删除文件 doc/WechatIMG538.png 2022-05-31 14:11:49 +00:00
xiwa f58d129d6e
删除文件 doc/WX20220519-131333@2x.png 2022-05-31 14:11:34 +00:00
xiwa 19ff9cd6c3
删除文件 doc/ma.jpeg 2022-05-31 14:11:19 +00:00
xiwa fdd80591a3
update README.md. 2022-05-31 05:13:39 +00:00
xiwa b314f7abb3 Merge branch 'dev' 2022-05-30 17:58:44 +08:00
xiwa 1f833e2784 上传和权限问题处理 2022-05-30 17:57:57 +08:00
xiwa da983feeff
update README.md. 2022-05-30 02:03:17 +00:00
xiwa 0c3482148d Merge branch 'dev' 2022-05-29 23:39:18 +08:00
xiwa aad06fcea6 增加虚拟设备功能和数据统计 2022-05-29 23:15:14 +08:00
xiwa c405251b82
add default pipeline template yaml 2022-05-26 11:05:57 +00:00
xiwa 69e7983e90 Merge branch 'dev' 2022-05-24 16:40:04 +08:00
xiwa a9234f6773
update README.md. 2022-05-24 08:27:14 +00:00
xiwa 518288b3f9 增加设备路由及对应组件修改 2022-05-24 16:25:32 +08:00
xiwa 09c3a0dfc8
update README.md. 2022-05-23 09:06:11 +00:00
xiwa 4b8c442ceb 客户端角色路由认证规则修改 2022-05-22 13:31:13 +08:00
xiwa 4768358395 登录返回信息补充 2022-05-22 10:24:00 +08:00
七步才子 5683cf183e EmqxDeviceComponent 判断设备是否存在,从数据库读取。 2022-05-21 20:45:24 +08:00
七步才子 0d60b00235 EmqxDeviceComponent 判断设备是否存在,从数据库读取。 2022-05-21 20:43:56 +08:00
七步才子 beeb1014a9 codeLogin输出token 2022-05-21 19:31:02 +08:00
七步才子 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