diff --git a/docker/modules/websocket/dockerfile b/docker/modules/websocket/dockerfile index 68a8ac7..083e5ef 100644 --- a/docker/modules/websocket/dockerfile +++ b/docker/modules/websocket/dockerfile @@ -13,4 +13,4 @@ WORKDIR /home/qiuguo COPY ./jar/iot-box-websocket-api.jar /home/qiuguo/iot-box-websocket-api.jar # 启动网关服务 #ENTRYPOINT ["java","-jar","iot-box-websocket-api.jar"] -CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=prod"] +CMD ["sh","-c", "java -jar iot-box-websocket-api.jar --spring.profiles.active=test"] diff --git a/iot-modules/iot-admin-http-api/src/main/java/com/qiuguo/iot/admin/http/api/filter/LogMdcConfiguration.java b/iot-modules/iot-admin-http-api/src/main/java/com/qiuguo/iot/admin/http/api/filter/LogMdcConfiguration.java index cf8eda4..1f7f13c 100644 --- a/iot-modules/iot-admin-http-api/src/main/java/com/qiuguo/iot/admin/http/api/filter/LogMdcConfiguration.java +++ b/iot-modules/iot-admin-http-api/src/main/java/com/qiuguo/iot/admin/http/api/filter/LogMdcConfiguration.java @@ -1,6 +1,7 @@ package com.qiuguo.iot.admin.http.api.filter; import com.qiuguo.iot.base.constans.Log4Constans; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.reactivestreams.Subscription; import org.slf4j.MDC; @@ -37,6 +38,7 @@ public class LogMdcConfiguration { Hooks.resetOnEachOperator(Log4Constans.PRINT_LOG_ID); } + @Data class MdcContextSubscriber implements CoreSubscriber { private CoreSubscriber coreSubscriber; public MdcContextSubscriber(CoreSubscriber c){ diff --git a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml index e32187f..dd2b075 100644 --- a/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml +++ b/iot-modules/iot-box-websocket-api/src/main/resources/bootstrap-dev.yml @@ -24,22 +24,6 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - r2dbc: - #注意下面修改 easyorm相关也需要修改 - #url: r2dbc:postgresql://localhost:5432/postgres #postgresql请使用此配置 - url: r2dbc:mysql://192.168.8.146:30416/qiuguo_iot?ssl=false&serverZoneId=Asia/Shanghai # mysql请使用此配置 - #url: r2dbc:h2:file:///./data/h2db/jetlinks - username: root - password: 123456 - redis: - # cluster: - # nodes: - # - 127.0.0.1:7001 - # - 127.0.0.1:7002 - host: 192.168.8.146 - port: 32030 - password: 123456 - timeout: 5000 tianqiapi: url: https://v0.yiketianqi.com/api?unescape=1&version=v91&appid=23293151&appsecret=Lj6ZMcqn&ext=life qiuguo: @@ -58,4 +42,4 @@ lac: Ali: qianwen: 'sk-8d64677afaf6404cb83ce1910b5b2558' accesskeId: 'LTAI5t7d1iZb18SvGQhtDnyN' - accesskeySecret: 'j2Cp3uCDGuiA7xZIJmYOCmDhJl9HuJ' \ No newline at end of file + accesskeySecret: 'j2Cp3uCDGuiA7xZIJmYOCmDhJl9HuJ'