wulin
|
e799988ba2
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
# Conflicts:
# iot-common/iot-data/src/main/java/com/qiuguo/iot/data/request/QGResponse.java
|
2023-10-09 21:02:58 +08:00 |
|
wulin
|
1a9f514291
|
通义千问
|
2023-10-09 20:52:25 +08:00 |
|
W.Y
|
fc2e12b51c
|
[optimization] 通义千问代码优化01
|
2023-10-09 20:51:37 +08:00 |
|
wulin
|
020532e72d
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-10-09 20:35:20 +08:00 |
|
W.Y
|
2a3714dadc
|
[optimization] 通义千问代码优化
|
2023-10-09 20:34:15 +08:00 |
|
W.Y
|
bbbddff6ab
|
[optimization] 通义千问代码优化
|
2023-10-09 20:33:58 +08:00 |
|
wulin
|
a2fc9f1006
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-10-09 20:24:33 +08:00 |
|
wulin
|
3be3cd8461
|
增加香薰机、等待指令
|
2023-10-09 20:24:30 +08:00 |
|
W.Y
|
cda40fadcc
|
[select] 通义千问回调成功
|
2023-10-09 20:22:45 +08:00 |
|
weiyachao
|
f5f7b0a526
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-10-09 15:26:33 +08:00 |
|
weiyachao
|
1d226cd89b
|
修改风扇
|
2023-10-09 15:26:28 +08:00 |
|
wulin
|
ee0973628e
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-10-09 15:07:24 +08:00 |
|
wulin
|
5f3ef6ca93
|
box上线离线增加推送通知
|
2023-10-09 15:07:21 +08:00 |
|
weiyachao
|
c1339fc599
|
修改香薰机-2
|
2023-10-09 15:00:36 +08:00 |
|
weiyachao
|
9c76284402
|
修改香薰机
|
2023-10-09 14:50:08 +08:00 |
|
weiyachao
|
d625195755
|
添加请求头
|
2023-10-09 14:08:30 +08:00 |
|
wulin
|
f3120c2f81
|
聊天记录顺序调整
|
2023-10-09 10:32:56 +08:00 |
|
wulin
|
a0dbc5f6cb
|
绑定推送定义改成联网定义
|
2023-10-09 10:13:36 +08:00 |
|
wulin
|
9b9401f93f
|
websocket增加设备绑定推送用户
|
2023-10-09 10:04:24 +08:00 |
|
wulin
|
1fb7296fa7
|
完成NLP第一版优化
|
2023-10-08 21:23:57 +08:00 |
|
wulin
|
7bf3121c3b
|
备份NLP代码
|
2023-10-08 21:05:09 +08:00 |
|
wulin
|
175b5490ac
|
解绑Box修改为解绑设备
|
2023-10-08 13:35:22 +08:00 |
|
wulin
|
0310faf5e5
|
提交Box绑定列表,解绑,设置主设备接口联调
|
2023-10-08 13:33:11 +08:00 |
|
wulin
|
eb2054b6dc
|
批量查询增加排序支持
|
2023-10-07 18:00:11 +08:00 |
|
wulin
|
5c2a3ca78f
|
批量查询增加排序支持
|
2023-10-07 17:59:54 +08:00 |
|
wulin
|
30e746eb00
|
优化
|
2023-10-07 13:38:23 +08:00 |
|
wulin
|
64131edffb
|
第一条指令
|
2023-10-07 13:25:52 +08:00 |
|
wulin
|
c05ca62df8
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-10-07 13:18:31 +08:00 |
|
wulin
|
644dd8e43a
|
解析词条优化
|
2023-10-07 13:18:29 +08:00 |
|
weiyachao
|
6d7653bc02
|
添加校验-2
|
2023-10-07 13:10:53 +08:00 |
|
weiyachao
|
9d5b471b73
|
添加校验
|
2023-10-07 13:06:54 +08:00 |
|
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
|
509f9d5cc8
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-10-07 11:25:23 +08:00 |
|
wulin
|
4d39995e68
|
音乐操作增加音乐名称
|
2023-10-07 11:25:21 +08:00 |
|
weiyachao
|
a05df74aba
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-10-07 11:24:23 +08:00 |
|
weiyachao
|
78983997bc
|
添加延迟-2
|
2023-10-07 11:24:15 +08:00 |
|
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 |
|
weiyachao
|
0cd03acb9d
|
添加延迟
|
2023-10-06 16:56:53 +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 |
|