Merge branch 'master' of http://git.xt.wenhq.top:8083/huangcheng/ad_server

king-boot-module-system/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 28080
   tomcat: 
     max-swallow-size: -1
   servlet:
@@ -127,16 +127,16 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/king-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          username: root
-          password: root
+          url: jdbc:mysql://127.0.0.1:3306/xt_ad?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: huihai
+          password: huihai2021
+          driver-class-name: com.mysql.cj.jdbc.Driver
+        # 多数据源配置
+        multi-datasource1:
+          url: jdbc:mysql://127.0.0.1:3306/hhad?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          username: huihai
+          password: huihai2021
           driver-class-name: com.mysql.cj.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/king-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0
@@ -148,7 +148,7 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: ''
+    password: 'hhad_redis!'
     port: 6379
 #mybatis plus 设置
 mybatis-plus:

king-boot-module-system/src/main/resources/logback-spring.xml

@@ -44,11 +44,11 @@
 	<!-- 生成 error html格式日志结束 -->
 
 	<!-- 每天生成一个html格式的日志开始 -->
-	<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	<!--<appender name="FILE_HTML" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-			<!--日志文件输出的文件名 -->
+			&lt;!&ndash;日志文件输出的文件名 &ndash;&gt;
 			<FileNamePattern>${LOG_HOME}/kingboot-%d{yyyy-MM-dd}.%i.html</FileNamePattern>
-			<!--日志文件保留天数 -->
+			&lt;!&ndash;日志文件保留天数 &ndash;&gt;
 			<MaxHistory>30</MaxHistory>
 			<MaxFileSize>10MB</MaxFileSize>
 		</rollingPolicy>
@@ -57,7 +57,7 @@
 				<pattern>%p%d%msg%M%F{32}%L</pattern>
 			</layout>
 		</encoder>
-	</appender>
+	</appender>-->
 	<!-- 每天生成一个html格式的日志结束 -->
 
 	<!--myibatis log configure -->
@@ -71,7 +71,7 @@
 		<appender-ref ref="STDOUT" />
 		<appender-ref ref="FILE" />
 		<appender-ref ref="HTML" />
-		<appender-ref ref="FILE_HTML" />
+<!--		<appender-ref ref="FILE_HTML" />-->
 	</root>
 
 </configuration>