Merge branch 'master' into dev

admin/src/main/resources/application-prod.yaml

@@ -3,3 +3,6 @@ spring:
   profiles:
     include:
       - common-prod
+
+logging:
+  config: classpath:logback-spring-prod.xml
\ No newline at end of file

admin/src/main/resources/logback-spring-prod.xml

+<configuration>
+    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+
+    <appender name="fileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>/logs/prod/logFile.%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+            <!-- keep 30 days' worth of history capped at 3GB total size -->
+            <maxHistory>10</maxHistory>
+            <maxFileSize>100MB</maxFileSize>
+            <totalSizeCap>3GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder
+            by default -->
+        <encoder>
+            <pattern>%d %-5level [%thread] %logger{0}: %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <root>
+        <level value="INFO"/>
+        <appender-ref ref="fileAppender"/>
+    </root>
+
+</configuration>

constant/src/main/resources/application-common-prod.yaml

@@ -24,7 +24,7 @@ spring:
     # Redis服务器连接端口
     port: 6379
     # Redis服务器连接密码（默认为空）
-    password: antaikeji2019
+    password: antaikeji2020
     # 连接超时时间（毫秒）
     timeout: 10000
     # 配置连接池属性 jedis与lettuce
@@ -42,10 +42,8 @@ spring:
   rabbitmq:
     host: 172.27.134.198
     port: 5672
-    username: rabbit
-    password: antaikeji666
-    # 需要手动去rabbitmq上创建 VirtualHost是相对独立的RabbitMQ服务器 VirtualHost之间是相互隔离的。exchange、queue、message不能互通。相当于mysql的db
-    virtual-host: /wellnessunblocked/${spring.profiles.active}
+    username: root
+    password: antaikeji2020
     listener:
       simple:
         concurrency: 5

mini-app/src/main/resources/logback-spring-prod.xml

+<configuration>
+    <!--为了防止进程退出时，内存中的数据丢失，请加上此选项-->
+    <shutdownHook class="ch.qos.logback.core.hook.DelayingShutdownHook"/>
+
+    <appender name="fileAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!-- daily rollover -->
+            <fileNamePattern>/logs/prod/logFile.%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+            <!-- keep 30 days' worth of history capped at 3GB total size -->
+            <maxHistory>10</maxHistory>
+            <maxFileSize>100MB</maxFileSize>
+            <totalSizeCap>3GB</totalSizeCap>
+        </rollingPolicy>
+        <!-- encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder
+            by default -->
+        <encoder>
+            <pattern>%d %-5level [%thread] %logger{0}: %msg %n</pattern>
+        </encoder>
+    </appender>
+
+    <root>
+        <level value="INFO"/>
+        <appender-ref ref="fileAppender"/>
+    </root>
+
+</configuration>