137 Commits

Author SHA1 Message Date
weiyachao
57b43d3ce7 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-10-07 11:34:07 +08:00
weiyachao
edf0842dcf 删除空格 2023-10-07 11:34:02 +08:00
wulin
4d39995e68 音乐操作增加音乐名称 2023-10-07 11:25:21 +08:00
wulin
94f972d12a 排除日志 2023-10-07 11:24:09 +08:00
191ec0b293 推送打印日志 2023-10-07 11:19:47 +08:00
wulin
a0534ce2f1 提交音乐其他指令 2023-10-07 11:05:08 +08:00
wulin
739e604c88 增加音乐部分 2023-10-07 09:04:27 +08:00
wulin
8649c74ae2 音乐播放 2023-09-28 17:05:51 +08:00
wulin
d1aa9a6b54 播放音乐 2023-09-28 16:51:00 +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
8d613e2f6e 优化NLP 2023-09-27 19:53:02 +08:00
6e939eb801 增加设备聊天记录接口,设备聊天内容推送到秋果数字空间app 2023-09-27 16:23:02 +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
642713daeb MQ配置调试 2023-09-26 16:18:26 +08:00
simon
2782eb2cdc MQ配置调试 2023-09-26 14:34:16 +08:00
simon
e22724b07f MQ整合 配置 2023-09-26 14:03:38 +08:00
simon
46382e9160 MQ整合 2023-09-26 13:54:32 +08:00
simon
1c7c41ccdf MQ整合 2023-09-26 13:50:46 +08:00
simon
979f85f055 MQ整合 2023-09-26 13:23:08 +08:00
simon
d68d9e76c5 mq调试 2023-09-26 11:51:41 +08:00
c3105b125f Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-26 11:04:51 +08:00
weiyachao
408cf58743 测试涂鸦 2023-09-26 11:04:36 +08:00
3a04ff6c11 涂鸦控制代码 2023-09-26 11:03:49 +08:00
54afedabfc 注解读取改成代码读取 2023-09-26 10:01:51 +08:00
69205be463 修改pom引用 2023-09-25 20:59:33 +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
W.Y
49bdc382a8 [config] 新增RabbitMQ配置 2023-09-25 17:41:30 +08:00
weiyachao
7a18f92d6e Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
# Conflicts:
#	iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/RoomAdminController.java
2023-09-25 16:53:24 +08:00
weiyachao
958f2956e2 涂鸦service 2023-09-25 16:52:42 +08:00
W.Y
b2a3663fd0 [select] 房间管理代码优化 2023-09-25 16:46:53 +08:00
9a78fb6483 da kai nac os 2023-09-25 09:02:37 +08:00
7a4301fc31 xiugai zidingyi zhiling 2023-09-25 09:01:52 +08:00
zhangqy
33b12472a8 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-22 17:17:45 +08:00
zhangqy
425a251f2d [update]修改环境变量 2023-09-22 17:17:35 +08:00
9281ec5fb7 恢复nacos原来引用 2023-09-22 17:17:08 +08:00
zhangqy
ab4cbd9330 [update]修改环境变量 2023-09-22 16:59:57 +08:00
63cc5ff8e7 增加读取配置文件引用 2023-09-22 16:44:10 +08:00
ec0bfa5c1c 合并代码 2023-09-22 15:14:48 +08:00
d9c696e0bb 修改gateway配置 2023-09-22 15:06:03 +08:00
weiyachao
fe1a976732 设置路由 2023-09-22 13:46:50 +08:00
cfcc9caf0f 解決衝突 2023-09-22 10:22:11 +08:00
edbce2bacc 網關增加其他配置 2023-09-22 10:20:06 +08:00
weiyachao
c91daba0d4 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-22 10:18:05 +08:00