Merge remote-tracking branch 'chengyang_origin/national' into national_dev

code/smart-community/epmet-gateway/src/main/resources/bootstrap.yml

@@ -1,3 +1,9 @@
+logging:
+  level:
+    org.springframework: DEBUG
+    org.springframework.cloud.gateway: DEBUG
+    reactor.tongweb.http.client: DEBUG
+
 server:
   tongweb:
     license:
@@ -38,7 +44,7 @@ spring:
   cloud:
     gateway:
       locator:
-        enabled: true
+        enabled: false
       routes:
         #认证服务
         - id: epmet-auth-server

code/smart-community/epmet-gateway/src/main/resources/logback-spring.xml

@@ -21,7 +21,7 @@
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>debug</level>
+            <level>INFO</level>
         </filter>
         <encoder>
             <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
@@ -150,7 +150,7 @@
     <springProfile name="local,dev,test">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet" level="DEBUG"/>
+        <logger name="com.epmet" level="INFO"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>

code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -186,8 +186,8 @@
                 <spring.redis.host>172.16.3.87</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>rEdIs@yAntAI_666</spring.redis.password>
-                <spring.redis.cluster.nodes>10.1.26.45:6379</spring.redis.cluster.nodes>
+                <spring.redis.nodes>10.1.26.45:6379</spring.redis.nodes>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <srping.redis.max-redirects>3</srping.redis.max-redirects>
                 <!-- nacos -->
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>172.16.3.87:8848</nacos.server-addr>

code/smart-community/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@@ -22,19 +22,9 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   redis:
-    # 烟台使用cluster模式下使用cluster:配置段
-    #    database: @spring.redis.index@
-    #    host: @spring.redis.host@
-    #    port: @spring.redis.port@
-    #    password: @spring.redis.password@
-    #    timeout: 30s
-
     database: @spring.redis.index@
     password: @spring.redis.password@
     timeout: 30s
-    cluster:
-      nodes: @spring.redis.cluster.nodes@
-      max-redirects: @spring.redis.cluster.max-redirects@
   datasource:
     druid:
       #MySQL

code/smart-community/epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -233,7 +233,7 @@
                     <![CDATA[jdbc:dm://172.16.20.13:5236?schema=epmet_common_service]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <datasource.druid.password>epmet12345</datasource.druid.password>
+                <spring.datasource.druid.password>epmet12345</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>172.16.3.87</spring.redis.host>

code/smart-community/epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -315,7 +315,7 @@
                     <![CDATA[jdbc:dm://172.16.20.13:5236?schema=epmet_third]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <datasource.druid.password>epmet12345</datasource.druid.password>
+                <spring.datasource.druid.password>epmet12345</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>172.16.3.87</spring.redis.host>

code/smart-community/epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -245,7 +245,7 @@
                     <![CDATA[jdbc:dm://172.16.20.13:5236?schema=epmet_job]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <datasource.druid.password>epmet12345</datasource.druid.password>
+                <spring.datasource.druid.password>epmet12345</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>172.16.3.87</spring.redis.host>

code/smart-community/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@@ -88,9 +88,9 @@ spring:
   flyway:
     enabled: @spring.flyway.enabled@
     locations: classpath:db/migration
-    url: @datasource.druid.url@
+    url: @spring.datasource.druid.url@
-    user: @datasource.druid.username@
+    user: @spring.datasource.druid.username@
-    password: @datasource.druid.password@
+    password: @spring.datasource.druid.password@
     baseline-on-migrate: true
     baseline-version: 0