77 Commits

Author SHA1 Message Date
wulin
c62c38f5ad Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-28 17:05:54 +08:00
weiyachao
0f3fbe20e1 歌曲B方案编码-3 2023-09-28 17:05:28 +08:00
wulin
13fe2e56a7 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-28 16:53:04 +08:00
wulin
d1aa9a6b54 播放音乐 2023-09-28 16:51:00 +08:00
weiyachao
af6d04fe6a 歌曲B方案编码-2 2023-09-28 16:50:43 +08:00
weiyachao
e542f711e6 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-28 15:04:18 +08:00
weiyachao
3d675cfa1b 歌曲B方案编码 2023-09-28 15:04:08 +08:00
wulin
6a0e082e2b 设备登录增加redis缓存 2023-09-28 13:58:11 +08:00
c2f19ee805 完成部分时间词的解析 2023-09-27 21:16:10 +08:00
679532bcba Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-27 19:53:12 +08:00
8d613e2f6e 优化NLP 2023-09-27 19:53:02 +08:00
weiyachao
fe050a5f4c Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-27 18:10:49 +08:00
weiyachao
e50debd590 等光控制 2023-09-27 18:10:41 +08:00
7aef742387 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-27 16:23:10 +08:00
6e939eb801 增加设备聊天记录接口,设备聊天内容推送到秋果数字空间app 2023-09-27 16:23:02 +08:00
weiyachao
bcecf37822 设置异常 2023-09-27 15:36:06 +08:00
weiyachao
ca36ce883d 修改响应模型 2023-09-27 11:03:19 +08:00
e9ac89e0da Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-26 21:22:26 +08:00
8004a63b80 完成天气部分继承 2023-09-26 21:22:21 +08:00
weiyachao
8f0ce6d36b Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
# Conflicts:
#	iot-modules/iot-box-user-api/pom.xml
2023-09-26 20:08:10 +08:00
weiyachao
4808589cad 修改响应 2023-09-26 20:07:52 +08:00
simon
b691b889e8 天气响应结构增加描述 2023-09-26 18:36:24 +08:00
simon
979f85f055 MQ整合 2023-09-26 13:23:08 +08:00
simon
d68d9e76c5 mq调试 2023-09-26 11:51:41 +08:00
3a04ff6c11 涂鸦控制代码 2023-09-26 11:03:49 +08:00
7cb59079b0 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-26 10:01:54 +08:00
54afedabfc 注解读取改成代码读取 2023-09-26 10:01:51 +08:00
simon
6f8ee2a807 mq对接 2023-09-25 21:13:34 +08:00
69205be463 修改pom引用 2023-09-25 20:59:33 +08:00
8b35c9b3f3 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-25 19:58:54 +08:00
weiyachao
2f015efa83 修改开关 2023-09-25 18:02:25 +08:00
01eaf091e2 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-25 17:42:31 +08:00
a27062040a 分装部分nlp 2023-09-25 17:42:25 +08:00
weiyachao
958f2956e2 涂鸦service 2023-09-25 16:52:42 +08:00
c18f94cf40 自定义指令新增字段 2023-09-25 09:39:01 +08:00
7a4301fc31 xiugai zidingyi zhiling 2023-09-25 09:01:52 +08:00
df8d909190 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-22 10:09:31 +08:00
ed1ddb0e3a 推送客戶端消息封裝 2023-09-22 10:09:28 +08:00
simon
49c25a5247 三方模块maven层级修复 2023-09-22 10:07:49 +08:00
b754f49c52 設備初始化時增加redis緩存 2023-09-22 09:42:36 +08:00
weiyachao
83aca711ef Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-21 18:24:33 +08:00
weiyachao
962ea083f0 添加登录拦截器 2023-09-21 18:24:27 +08:00
simon
3aecd37d4b 天气、ip三方服务对接 2023-09-21 18:24:02 +08:00
weiyachao
778b9fc376 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
# Conflicts:
#	iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java
#	iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/filter/AuthFilter.java
2023-09-21 13:38:38 +08:00
weiyachao
a39378d266 修改依赖 2023-09-21 13:38:12 +08:00
921c67baf0 websocket打包问题 2023-09-21 13:29:39 +08:00
e7dbc6e9c3 去掉无用引用包 2023-09-21 11:37:43 +08:00
weiyachao
6ab572c789 切面 2023-09-20 20:26:12 +08:00
wy
da921b81c1 [select] 设备-根据设备sn获取涂鸦中sn信息 2023-09-20 17:51:29 +08:00
9618596092 優化代碼生成器,搜索文本時使用% 2023-09-20 11:28:21 +08:00