111 Commits

Author SHA1 Message Date
29b60e672a 提交发布 2023-09-21 19:07:44 +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
7e7ab82338 [add]websocket部署 2023-09-21 15:32:59 +08:00
zhangqy
62749eb225 [add]websocket部署 2023-09-21 15:23:51 +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
a30f7b5ea8 去掉gateway中rabitt引用 2023-09-21 10:45:15 +08:00
64cccb5127 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-21 10:19:38 +08:00
623c300adc 完善webscoket redis问题 2023-09-21 10:19:33 +08:00
zhangqy
ef950d5f4e [add]添加监控 2023-09-21 10:14:20 +08:00
zhangqy
322fd50b6f [update]端口和nacos地址 2023-09-20 20:57:12 +08:00
zhangqy
4e1bae5abb [update]端口和nacos地址 2023-09-20 20:50:33 +08:00
zhangqy
23c605e670 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-20 20:43:06 +08:00
zhangqy
08584eb263 [update]端口和nacos地址 2023-09-20 20:42:57 +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
simon
2c50fb54d6 update .gitignore 2023-09-20 17:46:26 +08:00
simon
3cfa382c80 日志忽略提交 2023-09-20 17:44:25 +08:00
simon
ca169e043d 日志忽略提交 2023-09-20 17:41:48 +08:00
simon
2e4a17a2e2 日志忽略提交 2023-09-20 17:38:29 +08:00
69c81cd8f5 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-20 17:31:10 +08:00
01b48b4459 去掉日子filter中无效代码 2023-09-20 17:31:01 +08:00
zhangqy
ce8865e343 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-20 17:16:48 +08:00
zhangqy
61b15f1eb9 [update]端口和nacos地址 2023-09-20 17:16:34 +08:00
zhangqy
4ddfb4b956 [update]端口和nacos地址 2023-09-20 16:18:57 +08:00
32e045e664 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-20 15:49:33 +08:00
42191260f4 提交websocket相关代码 2023-09-20 15:49:30 +08:00
zhangqy
742fa17df9 [update]端口和nacos地址 2023-09-20 15:26:09 +08:00
027506df44 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-20 13:49:30 +08:00
6c41ec2cb2 代碼生成器增加controller的生成 2023-09-20 13:49:26 +08:00
zhangqy
6bc4726ca2 Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期 2023-09-20 11:59:40 +08:00
zhangqy
dbfe1c728e [add]添加deploy 2023-09-20 11:59:29 +08:00
43caf30d10 刪除臨時生成的代碼 2023-09-20 11:28:54 +08:00
9618596092 優化代碼生成器,搜索文本時使用% 2023-09-20 11:28:21 +08:00
63b9406c95 Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期 2023-09-20 11:12:31 +08:00
7fe84888e0 刪除臨時代碼 2023-09-20 11:12:27 +08:00
d3b95ebfde 優化代碼生成器,歷史分頁查詢修改 2023-09-20 11:11:42 +08:00
zhangqy
3d94bb3a31 [add]添加dockerfile 2023-09-20 10:42:22 +08:00
zhangqy
02142d4d14 [add]添加dockerfile 2023-09-20 10:40:20 +08:00
zhangqy
e4db34ec49 [add]添加dockerfile 2023-09-20 10:38:45 +08:00