simon
|
b09d479140
|
Merge branch 'feature-BOX一期' into feature-shipeng
# Conflicts:
# iot-modules/iot-box-user-api/src/test/java/UserTest.java
|
2023-09-25 17:47:51 +08:00 |
|
simon
|
5366d5b41e
|
mq
|
2023-09-25 17:47:32 +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 |
|
|
|
c18f94cf40
|
自定义指令新增字段
|
2023-09-25 09:39:01 +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 |
|
zhangqy
|
e52657f754
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-22 16:52:34 +08:00 |
|
zhangqy
|
711c93e655
|
[update]修改环境变量
|
2023-09-22 16:52:25 +08:00 |
|
|
|
b4b12c0f3f
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-09-22 16:44:14 +08:00 |
|
|
|
63cc5ff8e7
|
增加读取配置文件引用
|
2023-09-22 16:44:10 +08:00 |
|
zhangqy
|
0e89f732f1
|
[update]修改环境变量
|
2023-09-22 16:27:35 +08:00 |
|
|
|
b928fc67c3
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-09-22 15:35:27 +08:00 |
|
zhangqy
|
f9345f56c6
|
[add]添加user相关的deploy
|
2023-09-22 15:34:51 +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 |
|
simon
|
9a08de16eb
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-22 10:35:37 +08:00 |
|
simon
|
9277d93ea8
|
lombok升级1.18.14修复经常无符号异常
|
2023-09-22 10:35:31 +08:00 |
|
weiyachao
|
a2de8f77f3
|
getway-2
|
2023-09-22 10:34:20 +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 |
|
weiyachao
|
2df97baa3a
|
getway
|
2023-09-22 10:17:59 +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 |
|
|
|
6f1a085a76
|
優化pom引用順序
|
2023-09-21 21:02:25 +08:00 |
|
|
|
6833bb09b8
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-09-21 20:50:09 +08:00 |
|
|
|
a01d410041
|
區分開發、測試配置
|
2023-09-21 20:50:05 +08:00 |
|
zhangqy
|
50d71309a5
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-21 19:50:51 +08:00 |
|
zhangqy
|
da2e70614b
|
[add]添加user相关的deploy
|
2023-09-21 19:50:31 +08:00 |
|
|
|
2e4a629e75
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-09-21 19:40:11 +08:00 |
|
|
|
9d4c0030fe
|
打開nacos
|
2023-09-21 19:40:05 +08:00 |
|
zhangqy
|
8f860c5007
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-21 19:29:53 +08:00 |
|
zhangqy
|
90ad098056
|
[add]添加user相关的deploy
|
2023-09-21 19:29:43 +08:00 |
|
|
|
71d9895192
|
修改admin模块的问题
|
2023-09-21 19:26:40 +08:00 |
|
|
|
edcd8fc4be
|
修改user端口未8080
|
2023-09-21 19:19:10 +08:00 |
|
|
|
c0d5b22535
|
解决冲突
|
2023-09-21 19:08:46 +08:00 |
|
|
|
29b60e672a
|
提交发布
|
2023-09-21 19:07:44 +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 |
|
