274 Commits

Author SHA1 Message Date
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
47feddd481 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-21 16:12:52 +08:00
ffcd5a66ce 提交修改 2023-09-21 16:12:47 +08:00
zhangqy
a6c5478044 [add]添加nacos相关 2023-09-21 16:11:55 +08:00
cf3470d839 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-21 16:11:43 +08:00
38994ead2f nacos引入放置在modules 2023-09-21 16:09:19 +08:00
zhangqy
ceda1dbc3a [add]websocket部署 2023-09-21 15:09:51 +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
17a2dc2999 优化websocket 2023-09-20 20:27:29 +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
42191260f4 提交websocket相关代码 2023-09-20 15:49:30 +08:00
6c41ec2cb2 代碼生成器增加controller的生成 2023-09-20 13:49:26 +08:00
43caf30d10 刪除臨時生成的代碼 2023-09-20 11:28:54 +08:00
9618596092 優化代碼生成器,搜索文本時使用% 2023-09-20 11:28:21 +08:00
7fe84888e0 刪除臨時代碼 2023-09-20 11:12:27 +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
weiyachao
d6d0aaf2fe 固定版本号-3 2023-09-19 21:06:28 +08:00
weiyachao
63fa785800 固定版本号-2 2023-09-19 20:57:28 +08:00
weiyachao
a937a9d6bf Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-19 20:55:00 +08:00
weiyachao
02915c3598 固定版本号 2023-09-19 20:54:54 +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
weiyachao
d3b914f259 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-18 18:57:26 +08:00
weiyachao
08251256bc 涂鸦接口定义 2023-09-18 18:57:17 +08:00
501205c445 完成设备注册接口测试 2023-09-18 18:08:22 +08:00
c6a0713fb0 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-18 17:38:08 +08:00
c054e221ea 修改设备初始化接口 2023-09-18 17:38:04 +08:00
weiyachao
3195c40b6a 测试涂鸦 2023-09-18 17:27:43 +08:00
c4a45a8aec Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-18 16:30:14 +08:00