|
|
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 |
|
|
|
d3b95ebfde
|
優化代碼生成器，歷史分頁查詢修改
|
2023-09-20 11:11:42 +08:00 |
|
|
|
00a2026daf
|
优化分页查询，增加页码返回前端
|
2023-09-20 09:28:47 +08:00 |
|
|
|
2d48d4bb63
|
解决分页问题
|
2023-09-19 23:06:58 +08:00 |
|
|
|
398d78daf4
|
解决分页问题
|
2023-09-19 22:02:33 +08:00 |
|
weiyachao
|
efd0002795
|
删除多余包
|
2023-09-19 21:47:00 +08:00 |
|
weiyachao
|
63fa785800
|
固定版本号-2
|
2023-09-19 20:57:28 +08:00 |
|
|
|
0c90675666
|
修改boot版本
|
2023-09-19 20:45:55 +08:00 |
|
wangyao
|
bfd44709d9
|
[select]房间管理-列表查询
|
2023-09-19 20:07:17 +08:00 |
|
weiyachao
|
dcb85f5a2d
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-19 17:36:09 +08:00 |
|
|
|
bf98fa2a40
|
修复设备注册数据落库问题
|
2023-09-19 16:43:55 +08:00 |
|
weiyachao
|
7432fafb85
|
新增空间id
|
2023-09-19 15:26:35 +08:00 |
|
|
|
40b6ebf79c
|
增加执行动作失败的回答文本、动作字段
|
2023-09-19 09:43:06 +08:00 |
|
weiyachao
|
16dbd0a1d4
|
修改表实体
|
2023-09-18 19:30:26 +08:00 |
|
