配置还原

mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -26,9 +26,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    url: jdbc:mysql://120.26.238.168:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -47,9 +47,9 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: localhost
+    host: 120.26.238.168
     port: 6379
-    password: 123456
+    password: ehjinrong
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -64,7 +64,6 @@ spring:
         #连接池中的最小空闲连接
         min-idle: 1
 
-
 mybatis:
   mapperLocations: classpath:config/mybatis/*.xml
 
@@ -84,26 +83,4 @@ management:
 
 ribbon:
   ReadTimeout: 60000
-  ConnectTimeout: 60000
-
-message:
-  debugMode: true
-  autoRegister: true
-  lesseeOrganId: 43
-
-push:
-  jiguang:
-    reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
-    apns_production: false
-
-auth:
-  sysconfig:
-    tenantId: 43
+  ConnectTimeout: 60000

mec-im/src/main/resources/application.yml

@@ -23,8 +23,6 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance:
-      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
@@ -32,9 +30,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -53,15 +51,15 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 127.0.0.1
+    host: 47.99.212.176
     port: 6379
-    password: 123456
+    password:
     database: 0
     #连接超时时间（毫秒）
-    timeout: 60000
+    timeout: 10000
     pool:
       #连接池最大连接数（使用负值表示没有限制）
-      max-active: 20
+      max-active: 10
       #连接池最大阻塞等待时间（使用负值表示没有限制）
       max-wait: -1
       #连接池中的最大空闲连接
@@ -69,8 +67,8 @@ spring:
       #连接池中的最小空闲连接
       min-idle: 0
 
-mybatis:
-  mapperLocations: classpath:config/mybatis/*.xml
+swagger:
+  base-package: com.ym.controller
 
 ##认证
 security:
@@ -93,6 +91,9 @@ management:
 
 cn:
   rongcloud:
+    jwt:
+      secret: ay9pL#$Ws8Lpapo
+      ttlInMilliSec: -1
     im:
       appkey: c9kqb3rdc451j
       secret: gnskN9VRnbm
@@ -108,40 +109,4 @@ cn:
       maxCount: 16
       taskTtl: 30000
       roomTtl: 7200000
-      userIMOfflineKickTtl: 300000
-
-
-ribbon:
-  ReadTimeout: 60000
-  ConnectTimeout: 60000
-
-logging:
-  level:
-    com.ym.mec.auth.api.client.SysUserFeignService: INFO
-
-message:
-  debugMode: true
-
-
-
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
-push:
-  jiguang:
-    reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
-    apns_production: false
-auth:
-  sysconfig:
-    tenantId: 43
+      userIMOfflineKickTtl: 300000

mec-im/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/im-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -12,12 +12,12 @@
 	</appender>
 
 	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -28,10 +28,21 @@
 	</appender>
 
 	<logger name="com.ym.mec" level="INFO" />
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
+
+	<!--开发环境:打印控制台 -->
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

mec-student/src/main/resources/application.yml

@@ -27,19 +27,17 @@ spring:
   servlet:
     multipart:
       # 最大支持文件大小
-      max-file-size: 150MB
+      max-file-size: 50MB
       # 最大支持请求大小
-      max-request-size: 150MB
+      max-request-size: 50MB
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      connection-init-sqls: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
     driver-class-name: com.mysql.cj.jdbc.Driver
     filters: stat
     maxActive: 20
@@ -56,9 +54,9 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 127.0.0.1
+    host: 47.99.212.176
     port: 6379
-    password: 123456
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -74,8 +72,8 @@ spring:
 
 mybatis:
   mapperLocations: classpath:config/mybatis/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  #   configuration:
+  #      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 swagger:
   base-package: com.ym.mec.student.controller
@@ -99,43 +97,18 @@ management:
     health:
       show-details: ALWAYS
 
+
 ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000
 
-logging:
-  level:
-    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
-    com.ym.mec.thirdparty.yqpay.YqPayFeignService: DEBUG
-
-message:
-  debugMode: true
-
-
-wechat:
-  mpAppId: wxcf8e8b33a9477845
-  mpAppSecret: 1286452b9c68b13325dece7cdf892645
-
-
-
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
 push:
   jiguang:
     reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
+    appKey: 0e7422e1d6e73637e678716a
+    masterSecret: c2361016604eab56ab2db2ac
     apns_production: false
-auth:
-  sysconfig:
-    tenantId: 43
+
+logging:
+  level:
+    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG

mec-student/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/student-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -12,12 +12,12 @@
 	</appender>
 
 	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -28,12 +28,12 @@
 	</appender>
 
 	<appender name="messagefile"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>/mdata/logs/student-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -46,15 +46,24 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
 
 	<!--开发环境:打印控制台 -->
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

mec-task/src/main/resources/application.yml

@@ -26,9 +26,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -47,9 +47,9 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 127.0.0.1
+    host: 47.99.212.176
     port: 6379
-    password: 123456
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -71,9 +71,6 @@ task:
   autoStartup: true
   startupDelay: 30
 
-logging:
-  config: classpath:logback-spring.xml
-  path: d:/var/logs
 
 security:
   oauth2:
@@ -83,30 +80,10 @@ security:
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
 
+swagger:
+  base-package: com.ym.mec.task.controller
+
 
 ribbon:
   ReadTimeout: 60000
-  ConnectTimeout: 60000
-
-message:
-  debugMode: true
-
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
-
-push:
-  jiguang:
-    reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
-    apns_production: false
+  ConnectTimeout: 60000

mec-task/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/task-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -12,12 +12,12 @@
 	</appender>
 
 	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -30,10 +30,19 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<!--开发环境:打印控制台 -->
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

mec-teacher/src/main/resources/application.yml

@@ -26,17 +26,15 @@ spring:
 
   servlet:
     multipart:
-      max-file-size: 150MB
+      max-file-size: 10MB
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      connection-init-sqls: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
     driver-class-name: com.mysql.cj.jdbc.Driver
     filters: stat
     maxActive: 20
@@ -53,9 +51,9 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 127.0.0.1
+    host: 47.99.212.176
     port: 6379
-    password: 123456
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -71,8 +69,6 @@ spring:
 
 mybatis:
   mapperLocations: classpath:config/mybatis/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 swagger:
   base-package: com.ym.mec.teacher.controller
@@ -100,27 +96,13 @@ ribbon:
   ReadTimeout: 60000
   ConnectTimeout: 60000
 
-message:
-  debugMode: true
-
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
 push:
   jiguang:
     reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
+    appKey: 7e0282ca92c12c8c45a93bb3
+    masterSecret: d47430e2f4755ef5dc050ac5
     apns_production: false
-auth:
-  sysconfig:
-    tenantId: 43
+
+logging:
+  level:
+    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG

mec-teacher/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/teacher-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -12,12 +12,12 @@
 	</appender>
 
 	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -28,12 +28,12 @@
 	</appender>
 
 	<appender name="messagefile"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>/mdata/logs/teacher-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -46,15 +46,24 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
 
 	<!--开发环境:打印控制台 -->
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

mec-web/src/main/resources/application.yml

@@ -1,6 +1,5 @@
 server:
   port: 8005
-  connection-timeout: 60000
   tomcat:
     accesslog:
       enabled: true
@@ -31,13 +30,14 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: dayaData
-    password: dayaDataOnline2019
+    #    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    #    username: dayaData
+    #    password: dayaDataOnline2019
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      connection-init-sqls: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
     driver-class-name: com.mysql.cj.jdbc.Driver
     filters: stat
     maxActive: 20
@@ -54,9 +54,9 @@ spring:
     maxOpenPreparedStatements: 20
 
   redis:
-    host: 127.0.0.1
+    host: 47.99.212.176
     port: 6379
-    password: 123456
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -72,8 +72,8 @@ spring:
 
 mybatis:
   mapperLocations: classpath:config/mybatis/*.xml
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  #configuration:
+  #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 swagger:
   base-package: com.ym.mec.web.controller
@@ -107,29 +107,10 @@ logging:
     com.ym.mec.auth.api.client.SysUserFeignService: INFO
 
 message:
-  debugMode: false
+  debugMode: true
 
 ##支付流水隐藏
 payment:
-  hiddenMode: false
+  hiddenMode: true
   #隐藏的支付方式
-  channel: YQPAY
-
-eseal:
-  tsign:
-    projectid: 4438776254
-    projectSecret: a94cf63d6361084d232f345d71321691
-    apisUrl: http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2
-
-push:
-  jiguang:
-    reqURL: https://api.jpush.cn/v3/push
-    appKey:
-      student: 0e7422e1d6e73637e678716a
-      teacher: 7e0282ca92c12c8c45a93bb3
-      system: a003c997b1add94aa8d6caf9
-    masterSecret:
-      student: c2361016604eab56ab2db2ac
-      teacher: d47430e2f4755ef5dc050ac5
-      system: c281fe6a21acf2e8a9f9d628
-    apns_production: false
+  channel: YQPAY,

mec-web/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 	<property name="LOG_HOME" value="/mdata/logs/web-%d{yyyy-MM-dd_HH}-%i.log" />
 	<property name="CONSOLE_LOG_PATTERN"
-		value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
+			  value="[%X{username} %X{ip} %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}] : %msg%n" />
 
 	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder charset="UTF-8">
@@ -12,12 +12,12 @@
 	</appender>
 
 	<appender name="file"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>${LOG_HOME}</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -28,12 +28,12 @@
 	</appender>
 
 	<appender name="messagefile"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<FileNamePattern>/mdata/logs/web-message-%d{yyyy-MM-dd_HH}-%i.log</FileNamePattern>
 			<MaxHistory>90</MaxHistory>
 			<TimeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<MaxFileSize>20MB</MaxFileSize>
 			</TimeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
@@ -46,13 +46,24 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
-	<root level="INFO">
-		<appender-ref ref="stdout" />
-		<appender-ref ref="file" />
-	</root>
+
+	<!--开发环境:打印控制台 -->
+	<springProfile name="dev">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
+
+	<springProfile name="test">
+		<root level="INFO">
+			<appender-ref ref="stdout" />
+			<appender-ref ref="file" />
+		</root>
+	</springProfile>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">