ソースを参照

Merge branch 'dev/20210917_v3.2_老版本功能迁移' into dev/20220105_2.2.0_通用版_申诉驳回

# Conflicts:
#	document/docker/docker-compose-debug.yml
rengb 3 年 前
コミット
7204c8fa79

+ 5 - 1
bus-interceptor/pom.xml

@@ -23,4 +23,8 @@
         </dependency>
     </dependencies>
 
-</project>
+    <build>
+        <finalName>bus-interceptor</finalName>
+    </build>
+
+</project>

+ 4 - 0
common/pom.xml

@@ -117,4 +117,8 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>common</finalName>
+    </build>
+
 </project>

+ 4 - 4
config-center/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 0
dblayer-mbg/pom.xml

@@ -41,4 +41,8 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <finalName>dblayer-mbg</finalName>
+    </build>
+
 </project>

+ 16 - 16
document/docker/docker-compose-debug.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   register-center:
     image: 192.168.2.125:4490/emrais.debug/register-center:latest
-    container_name: register-center
+    container_name: emrais.register-center
     ports:
       - 6751:6751
     environment:
@@ -16,10 +16,10 @@ services:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
     restart: always
-    command: ["java", "-jar", "/app.jar"]
+    command: ["java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   config-center:
     image: 192.168.2.125:4490/emrais.debug/config-center:latest
-    container_name: config-center
+    container_name: emrais.config-center
     ports:
       - 7751:7751
     environment:
@@ -33,10 +33,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   monitor-service:
     image: 192.168.2.125:4490/emrais.debug/monitor-service:latest
-    container_name: monitor-service
+    container_name: emrais.monitor-service
     ports:
       - 9985:9985
     environment:
@@ -50,10 +50,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   security-center:
     image: 192.168.2.125:4490/emrais.debug/security-center:latest
-    container_name: security-center
+    container_name: emrais.security-center
     ports:
       - 8849:8849
     environment:
@@ -69,10 +69,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   user-auth:
     image: 192.168.2.125:4490/emrais.debug/user-auth:latest
-    container_name: user-auth
+    container_name: emrais.user-auth
     ports:
       - 8869:8869
     environment:
@@ -86,10 +86,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   message-service:
     image: 192.168.2.125:4490/emrais.debug/message-service:latest
-    container_name: message-service
+    container_name: emrais.message-service
     ports:
       - 8879:8879
     environment:
@@ -105,7 +105,7 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   report-service:
     image: 192.168.2.125:4490/emrais.debug/report-service:latest
     container_name: report-service
@@ -127,7 +127,7 @@ services:
     command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
   structure-center:
     image: 192.168.2.125:4490/emrais.debug/structure-center:latest
-    container_name: structure-center
+    container_name: emrais.structure-center
     ports:
       - 8859:8859
     environment:
@@ -143,10 +143,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   gateway-service:
     image: 192.168.2.125:4490/emrais.debug/gateway-service:latest
-    container_name: gateway-service
+    container_name: emrais.gateway-service
     ports:
       - 8871:8871
     environment:
@@ -164,4 +164,4 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]

+ 16 - 16
document/docker/docker-compose-inner.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   register-center:
     image: 192.168.2.125:4490/emrais.inner/register-center:latest
-    container_name: register-center
+    container_name: emrais.register-center
     ports:
       - 6751:6751
     environment:
@@ -16,10 +16,10 @@ services:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
     restart: always
-    command: ["java", "-jar", "/app.jar"]
+    command: ["java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   config-center:
     image: 192.168.2.125:4490/emrais.inner/config-center:latest
-    container_name: config-center
+    container_name: emrais.config-center
     ports:
       - 7751:7751
     environment:
@@ -33,10 +33,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   monitor-service:
     image: 192.168.2.125:4490/emrais.inner/monitor-service:latest
-    container_name: monitor-service
+    container_name: emrais.monitor-service
     ports:
       - 9985:9985
     environment:
@@ -50,10 +50,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   security-center:
     image: 192.168.2.125:4490/emrais.inner/security-center:latest
-    container_name: security-center
+    container_name: emrais.security-center
     ports:
       - 8849:8849
     environment:
@@ -69,10 +69,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   user-auth:
     image: 192.168.2.125:4490/emrais.inner/user-auth:latest
-    container_name: user-auth
+    container_name: emrais.user-auth
     ports:
       - 8869:8869
     environment:
@@ -86,10 +86,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   message-service:
     image: 192.168.2.125:4490/emrais.inner/message-service:latest
-    container_name: message-service
+    container_name: emrais.message-service
     ports:
       - 8879:8879
     environment:
@@ -105,10 +105,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   structure-center:
     image: 192.168.2.125:4490/emrais.inner/structure-center:latest
-    container_name: structure-center
+    container_name: emrais.structure-center
     ports:
       - 8859:8859
     environment:
@@ -124,10 +124,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   gateway-service:
     image: 192.168.2.125:4490/emrais.inner/gateway-service:latest
-    container_name: gateway-service
+    container_name: emrais.gateway-service
     ports:
       - 8871:8871
     environment:
@@ -145,4 +145,4 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]

+ 16 - 16
document/docker/docker-compose-outer.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   register-center:
     image: 192.168.2.125:4490/emrais.outer/register-center:latest
-    container_name: register-center
+    container_name: emrais.register-center
     ports:
       - 6751:6751
     environment:
@@ -16,10 +16,10 @@ services:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
     restart: always
-    command: ["java", "-jar", "/app.jar"]
+    command: ["java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   config-center:
     image: 192.168.2.125:4490/emrais.outer/config-center:latest
-    container_name: config-center
+    container_name: emrais.config-center
     ports:
       - 7751:7751
     environment:
@@ -33,10 +33,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   monitor-service:
     image: 192.168.2.125:4490/emrais.outer/monitor-service:latest
-    container_name: monitor-service
+    container_name: emrais.monitor-service
     ports:
       - 9985:9985
     environment:
@@ -50,10 +50,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   security-center:
     image: 192.168.2.125:4490/emrais.outer/security-center:latest
-    container_name: security-center
+    container_name: emrais.security-center
     ports:
       - 8849:8849
     environment:
@@ -69,10 +69,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   user-auth:
     image: 192.168.2.125:4490/emrais.outer/user-auth:latest
-    container_name: user-auth
+    container_name: emrais.user-auth
     ports:
       - 8869:8869
     environment:
@@ -86,10 +86,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   message-service:
     image: 192.168.2.125:4490/emrais.outer/message-service:latest
-    container_name: message-service
+    container_name: emrais.message-service
     ports:
       - 8879:8879
     environment:
@@ -105,10 +105,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   structure-center:
     image: 192.168.2.125:4490/emrais.outer/structure-center:latest
-    container_name: structure-center
+    container_name: emrais.structure-center
     ports:
       - 8859:8859
     environment:
@@ -124,10 +124,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   gateway-service:
     image: 192.168.2.125:4490/emrais.outer/gateway-service:latest
-    container_name: gateway-service
+    container_name: emrais.gateway-service
     ports:
       - 8871:8871
     environment:
@@ -145,4 +145,4 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]

+ 16 - 16
document/docker/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: '3'
 services:
   register-center:
     image: 192.168.2.125:4490/emrais.test/register-center:latest
-    container_name: register-center
+    container_name: emrais.register-center
     ports:
       - 6751:6751
     environment:
@@ -16,10 +16,10 @@ services:
       - /logs:/logs
       - /etc/localtime:/etc/localtime
     restart: always
-    command: ["java", "-jar", "/app.jar"]
+    command: ["java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   config-center:
     image: 192.168.2.125:4490/emrais.test/config-center:latest
-    container_name: config-center
+    container_name: emrais.config-center
     ports:
       - 7751:7751
     environment:
@@ -33,10 +33,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   monitor-service:
     image: 192.168.2.125:4490/emrais.test/monitor-service:latest
-    container_name: monitor-service
+    container_name: emrais.monitor-service
     ports:
       - 9985:9985
     environment:
@@ -50,10 +50,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   security-center:
     image: 192.168.2.125:4490/emrais.test/security-center:latest
-    container_name: security-center
+    container_name: emrais.security-center
     ports:
       - 8849:8849
     environment:
@@ -69,10 +69,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   user-auth:
     image: 192.168.2.125:4490/emrais.test/user-auth:latest
-    container_name: user-auth
+    container_name: emrais.user-auth
     ports:
       - 8869:8869
     environment:
@@ -86,10 +86,10 @@ services:
     restart: always
     depends_on:
       - register-center
-    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "register-center:6751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   message-service:
     image: 192.168.2.125:4490/emrais.test/message-service:latest
-    container_name: message-service
+    container_name: emrais.message-service
     ports:
       - 8879:8879
     environment:
@@ -105,10 +105,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   structure-center:
     image: 192.168.2.125:4490/emrais.test/structure-center:latest
-    container_name: structure-center
+    container_name: emrais.structure-center
     ports:
       - 8859:8859
     environment:
@@ -124,10 +124,10 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]
   gateway-service:
     image: 192.168.2.125:4490/emrais.test/gateway-service:latest
-    container_name: gateway-service
+    container_name: emrais.gateway-service
     ports:
       - 8871:8871
     environment:
@@ -145,4 +145,4 @@ services:
     depends_on:
       - register-center
       - config-center
-    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "/app.jar"]
+    command: ["/wait-for-it.sh", "-t", "6000", "config-center:7751", "--", "java", "-jar", "-Xms256m", "-Xmx1024m", "/app.jar"]

+ 4 - 4
gateway-service/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 4
message-service/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 4
monitor-service/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 1 - 1
pom.xml

@@ -309,7 +309,7 @@
                             <run>chmod -R 777 /wait-for-it.sh</run>
                         </runs>
                         <cmd>["java", "-version"]</cmd>
-                        <useGitCommitId>true</useGitCommitId>
+                        <useGitCommitId>false</useGitCommitId>
                         <resources>
                             <resource>
                                 <targetPath>/</targetPath>

+ 4 - 4
register-center/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 4
security-center/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 4
structure-center/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>

+ 4 - 4
user-auth/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@
     </appender>
 
     <appender name="DEBUG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_debug.log</file>
+        <file>${LOG_FILE_PATH}/debug.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -47,7 +47,7 @@
     </appender>
 
     <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_info.log</file>
+        <file>${LOG_FILE_PATH}/info.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -67,7 +67,7 @@
     </appender>
 
     <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_warn.log</file>
+        <file>${LOG_FILE_PATH}/warn.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>
@@ -87,7 +87,7 @@
     </appender>
 
     <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE_PATH}/log_error.log</file>
+        <file>${LOG_FILE_PATH}/error.log</file>
         <encoder>
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
             <charset>UTF-8</charset>