修改数据库地址为预发

iot-modules/iot-admin-http-api/src/main/resources/bootstrap.yml

@@ -22,13 +22,13 @@ spring:
   r2dbc:
     #注意下面修改 easyorm相关也需要修改
     #url: r2dbc:postgresql://localhost:5432/postgres #postgresql请使用此配置
-    url: r2dbc:mysql://localhost:3306/myproject?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
+    url: r2dbc:mysql://172.24.218.235:3306/qiuguo_iot?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
     #url: r2dbc:h2:file:///./data/h2db/jetlinks
     username: root
-    password: 123456
+    password: '!pHuRvGKIsbiqcX1'
 easyorm:
   auto-ddl: true
-  default-schema: myproject  # 默认使用的schema. mysql时则为数据库名
+  default-schema: qiuguo_iot  # 默认使用的schema. mysql时则为数据库名
   dialect: mysql # 方言: h2,mysql,postgresql
 logging:
   level:

iot-modules/iot-box-websocket/src/main/java/com/qiuguo/iot/box/websocket/handler/BoxWebSocketHandler.java

@@ -11,7 +11,9 @@ import io.netty.buffer.PooledByteBufAllocator;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jetty.util.MultiMap;
 import org.eclipse.jetty.util.UrlEncoded;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.buffer.*;
+import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 import org.springframework.web.reactive.socket.*;
 import reactor.core.publisher.*;
@@ -24,6 +26,8 @@ import java.util.concurrent.CountDownLatch;
 @WebSocketMapping("/box")
 @Slf4j
 public class BoxWebSocketHandler implements WebSocketHandler {
+    @Value("${device.tokenkey}")
+    private String devceTokenKey;
     public static ConcurrentHashMap<Long, UserInfo> group = new ConcurrentHashMap<>();
     /**
      *  所有websocket连接管理容器
@@ -52,6 +56,8 @@ public class BoxWebSocketHandler implements WebSocketHandler {
     public Mono<Void> handle(WebSocketSession session) {
         // 在生产环境中，需对url中的参数进行检验，如token，不符合要求的连接的直接关闭
         HandshakeInfo handshakeInfo = session.getHandshakeInfo();
+        HttpHeaders headers = handshakeInfo.getHeaders();
+        String token = headers.get("token").get(0);
         if (handshakeInfo.getUri().getQuery() == null) {
             return session.close(CloseStatus.REQUIRED_EXTENSION);
         } MultiMap<String> values = new MultiMap<String>();

iot-modules/iot-box-websocket/src/main/resources/bootstrap.yml

@@ -22,7 +22,9 @@ spring:
   r2dbc:
     #注意下面修改 easyorm相关也需要修改
     #url: r2dbc:postgresql://localhost:5432/postgres #postgresql请使用此配置
-    url: r2dbc:mysql://localhost:3306/myproject?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
+    url: r2dbc:mysql://172.24.218.235:3306/qiuguo_iot?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
     #url: r2dbc:h2:file:///./data/h2db/jetlinks
     username: root
-    password: 123456
+    password: !pHuRvGKIsbiqcX1
+device:
+  tokenkey: ZGV2aWNlX2luZm9fdG9rZW5fbWQ1LTNfb2Zpa19xaXVndW8taW90LWJveCY2Mis=

iot-modules/iot-customer-http-api/src/main/resources/bootstrap.yml

@@ -22,13 +22,13 @@ spring:
   r2dbc:
     #注意下面修改 easyorm相关也需要修改
     #url: r2dbc:postgresql://localhost:5432/postgres #postgresql请使用此配置
-    url: r2dbc:mysql://localhost:3306/myproject?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
+    url: r2dbc:mysql://172.24.218.235:3306/qiuguo_iot?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置
     #url: r2dbc:h2:file:///./data/h2db/jetlinks
     username: root
-    password: 123456
+    password: !pHuRvGKIsbiqcX1
 easyorm:
   auto-ddl: true
-  default-schema: myproject  # 默认使用的schema. mysql时则为数据库名
+  default-schema: qiuguo_iot  # 默认使用的schema. mysql时则为数据库名
   dialect: mysql # 方言: h2,mysql,postgresql
 logging:
   level: