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 |
|
zhangqy
|
425a251f2d
|
[update]修改环境变量
|
2023-09-22 17:17:35 +08:00 |
|
zhangqy
|
ab4cbd9330
|
[update]修改环境变量
|
2023-09-22 16:59:57 +08:00 |
|
weiyachao
|
fe1a976732
|
设置路由
|
2023-09-22 13:46:50 +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 |
|
|
|
b754f49c52
|
設備初始化時增加redis緩存
|
2023-09-22 09:42:36 +08:00 |
|
|
|
6f1a085a76
|
優化pom引用順序
|
2023-09-21 21:02:25 +08:00 |
|
|
|
a01d410041
|
區分開發、測試配置
|
2023-09-21 20:50:05 +08:00 |
|
|
|
9d4c0030fe
|
打開nacos
|
2023-09-21 19:40:05 +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
|
962ea083f0
|
添加登录拦截器
|
2023-09-21 18:24:27 +08:00 |
|
|
|
8309b6d8ce
|
去掉user中重复引用
|
2023-09-21 16:52:19 +08:00 |
|
|
|
0d440a4fa7
|
优化pom文件
|
2023-09-21 16:32:44 +08:00 |
|
|
|
ffcd5a66ce
|
提交修改
|
2023-09-21 16:12:47 +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 |
|
|
|
623c300adc
|
完善webscoket redis问题
|
2023-09-21 10:19:33 +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 |
|
|
|
01b48b4459
|
去掉日子filter中无效代码
|
2023-09-20 17:31:01 +08:00 |
|
simon
|
9eeeeea273
|
*
|
2023-09-20 17:22:56 +08:00 |
|
|
|
42191260f4
|
提交websocket相关代码
|
2023-09-20 15:49:30 +08:00 |
|
|
|
6c41ec2cb2
|
代碼生成器增加controller的生成
|
2023-09-20 13:49:26 +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
|
d5d2367b67
|
1
|
2023-09-19 21:49:49 +08:00 |
|
|
|
0c90675666
|
修改boot版本
|
2023-09-19 20:45:55 +08:00 |
|
wangyao
|
bfd44709d9
|
[select]房间管理-列表查询
|
2023-09-19 20:07:17 +08:00 |
|
weiyachao
|
04ce300add
|
修改参数-1
|
2023-09-19 17:49:21 +08:00 |
|
weiyachao
|
dcb85f5a2d
|
Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
|
2023-09-19 17:36:09 +08:00 |
|
weiyachao
|
a4fd0fb15a
|
修改相应
|
2023-09-19 17:35:59 +08:00 |
|
|
|
b22d115273
|
合并
|
2023-09-19 16:49:33 +08:00 |
|
|
|
bf98fa2a40
|
修复设备注册数据落库问题
|
2023-09-19 16:43:55 +08:00 |
|
weiyachao
|
3ee5ef1071
|
测试涂鸦
|
2023-09-19 15:20:01 +08:00 |
|
|
|
9921429c26
|
去除设备注册接口非必要代码
|
2023-09-18 20:24:10 +08:00 |
|
|
|
59e73613a7
|
Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期
|
2023-09-18 20:08:28 +08:00 |
|
|
|
36523de816
|
优化设备注册接口代码结构
|
2023-09-18 20:08:23 +08:00 |
|
