211 Commits

Author SHA1 Message Date
wulin
94f972d12a 排除日志 2023-10-07 11:24:09 +08:00
191ec0b293 推送打印日志 2023-10-07 11:19:47 +08:00
cc1db88bd7 排除logs 2023-10-07 11:06:40 +08:00
wulin
a0534ce2f1 提交音乐其他指令 2023-10-07 11:05:08 +08:00
7be000b942 冲突 2023-10-07 10:59:46 +08:00
2871e6bab5 排除日志 2023-10-07 10:57:46 +08:00
wulin
a0a0ce78c0 完成音乐其他指令 2023-10-07 10:54:57 +08:00
wulin
b47c49df82 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
# Conflicts:
#	logs/iot-box-websocket-api/error.log
#	logs/iot-box-websocket-api/info.log
#	logs/iot-box-websocket-api/warn.log
2023-10-07 09:08:29 +08:00
wulin
739e604c88 增加音乐部分 2023-10-07 09:04:27 +08:00
bf3bbb2950 shi jian chuli 2023-10-07 09:01:33 +08:00
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
wulin
8649c74ae2 音乐播放 2023-09-28 17:05:51 +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
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
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
3ea74a8c44 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-25 18:02:31 +08:00
weiyachao
2f015efa83 修改开关 2023-09-25 18:02:25 +08:00