Merge remote-tracking branch 'origin/dev' into dev

jeecg-module-system/pom.xml

@@ -71,11 +71,11 @@
             </activation>
         </profile>
 
-        <!-- 测试环境 -->
+        <!-- 预计生产环境 -->
         <profile>
-            <id>test</id>
+            <id>uat</id>
             <properties>
-                <package.environment>test</package.environment>
+                <package.environment>uat</package.environment>
             </properties>
         </profile>
 

jeecg-module-system/src/main/resources/application-dev.yml

@@ -137,7 +137,7 @@ spring:
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 9
+    database: 0
     host: 47.94.207.62
     lettuce:
       pool:

jeecg-module-system/src/main/resources/application-test.yml → jeecg-module-system/src/main/resources/application-uat.yml

@@ -131,13 +131,13 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://192.168.81.83:3306/hzgw?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://47.94.207.62:3306/hzgw_uat?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
-          password: ABCD@abcd+1234
+          password: superAdmin&321
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 9
+    database: 2
     host: 47.94.207.62
     lettuce:
       pool:

jeecg-module-system/src/main/resources/logback-spring.xml

@@ -21,7 +21,7 @@
     <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名 -->
-            <FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/hzgw-pc-%d{yyyy-MM-dd}.%i.log</FileNamePattern>
             <!--日志文件保留天数 -->
             <MaxHistory>30</MaxHistory>
             <maxFileSize>10MB</maxFileSize>
@@ -51,7 +51,7 @@
     <appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <!--日志文件输出的文件名 -->
-            <FileNamePattern>${LOG_HOME}/jeecgboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/hzgw-pc-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
             <!--日志文件保留天数 -->
             <MaxHistory>30</MaxHistory>
             <MaxFileSize>10MB</MaxFileSize>