2 Commity 893be0287c ... 98f27b1c39

Autor SHA1 Wiadomość Data
  liweimin 98f27b1c39 1、日志打印修改为log.info 3 dni temu
  liweimin c3db26dd81 1、修改配置项 所属配置文件 3 dni temu
20 zmienionych plików z 78 dodań i 78 usunięć
  1. 23 0
      ruoyi-admin/src/main/resources/application-druid.yml
  2. 0 23
      ruoyi-admin/src/main/resources/application.yml
  3. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/client/EmqClient.java
  4. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/DeviceOnlineManager.java
  5. 3 3
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/MessageHandler.java
  6. 6 6
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/JsonBodyDecoder.java
  7. 7 7
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/DeviceLoginService.java
  8. 5 5
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/DevicePtService.java
  9. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwMainDataUpService.java
  10. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwPassthroughDataUpService.java
  11. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/OpwQueryDataUpService.java
  12. 2 2
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/decoder/json/service/TaxDataUpService.java
  13. 1 1
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwMainDataDownService.java
  14. 1 1
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwPassthroughDataDownService.java
  15. 1 1
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/OpwQueryDataDownService.java
  16. 1 1
      ruoyi-device/src/main/java/com/ruoyi/device/mqtt/handler/encoder/json/service/TaxDataDownService.java
  17. 1 1
      ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketServer.java
  18. 13 13
      ruoyi-device/src/main/java/com/ruoyi/device/websocket/TsbWebSocketService.java
  19. 1 1
      ruoyi-framework/src/main/java/com/ruoyi/framework/websocket/WebSocketUtils.java
  20. 3 3
      ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

+ 23 - 0
ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,5 +1,28 @@
 # 数据源配置
 spring:
+    data:
+        # redis 配置
+        redis:
+            # 地址
+            host: 192.168.0.101
+            # 端口,默认为6379
+            port: 6379
+            # 数据库索引
+            database: 8
+            # 密码
+            password: weibaojinwang
+            # 连接超时时间
+            timeout: 10s
+            lettuce:
+                pool:
+                    # 连接池中的最小空闲连接
+                    min-idle: 0
+                    # 连接池中的最大空闲连接
+                    max-idle: 8
+                    # 连接池的最大数据库连接数
+                    max-active: 8
+                    # #连接池最大阻塞等待时间(使用负值表示没有限制)
+                    max-wait: -1ms
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver

+ 0 - 23
ruoyi-admin/src/main/resources/application.yml

@@ -68,29 +68,6 @@ spring:
     restart:
       # 热部署开关
       enabled: false
-  data:
-    # redis 配置
-    redis:
-      # 地址
-      host: 192.168.0.101
-      # 端口,默认为6379
-      port: 6379
-      # 数据库索引
-      database: 8
-      # 密码
-      password: weibaojinwang
-      # 连接超时时间
-      timeout: 10s
-      lettuce:
-        pool:
-          # 连接池中的最小空闲连接
-          min-idle: 0
-          # 连接池中的最大空闲连接
-          max-idle: 8
-          # 连接池的最大数据库连接数
-          max-active: 8
-          # #连接池最大阻塞等待时间(使用负值表示没有限制)
-          max-wait: -1ms
 
 # token配置