zouxuan 5 éve
szülő
commit
1480c7a744

+ 38 - 15
mec-auth/mec-auth-server/src/main/resources/application.yml

@@ -17,18 +17,18 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
     name: auth-server
-    
+
   datasource:
     name: test
-    url: jdbc:mysql://120.26.238.168:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,11 +45,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
-    host: 120.26.238.168
+    host: localhost
     port: 6379
-    password: ehjinrong
+    password: 123456
     database: 0
     #连接超时时间(毫秒)
     timeout: 10000
@@ -64,12 +64,13 @@ spring:
         #连接池中的最小空闲连接
         min-idle: 1
 
+
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    
+  mapperLocations: classpath:config/mybatis/*.xml
+
 swagger:
   base-package: com.ym.mec.auth.web.controller
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -79,8 +80,30 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-      
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+
+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

+ 3 - 3
mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -753,16 +753,16 @@ public class RoomServiceImpl implements RoomService {
             taskInfo.setRoomId(roomId);
             taskInfo.setTypeEnum(typeEnum);
             taskInfo.setOnOff(true);
-            taskInfo.setApplyUserId(authUser.getId().toString());
+            taskInfo.setApplyUserId(userId);
             taskInfo.setTargetUserId(userId);
             taskInfo.setTicket(ticket);
             scheduleManager.addTask(taskInfo);
             ControlDeviceNotifyMessage msg = new ControlDeviceNotifyMessage(ActionEnum.Invite.ordinal());
             msg.setTicket(ticket);
             msg.setType(taskInfo.getTypeEnum().ordinal());
-            msg.setOpUserId(authUser.getId().toString());
+            msg.setOpUserId(userId);
             msg.setOpUserName(authUser.getUsername());
-            imHelper.publishMessage(authUser.getId().toString(), userId, roomId, msg);
+            imHelper.publishMessage(userId, userId, roomId, msg);
         } else {
             if (typeEnum.equals(DeviceTypeEnum.Camera)) {
                 roomMemberDao.updateCameraByRidAndUid(roomId, userId, false);

+ 54 - 19
mec-im/src/main/resources/application.yml

@@ -23,16 +23,18 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
+    instance:
+      lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
     name: im-server
-    
+
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -49,28 +51,28 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
-    host: 47.99.212.176
+    host: 127.0.0.1
     port: 6379
-    password: 
+    password: 123456
     database: 0
     #连接超时时间(毫秒)
-    timeout: 10000
+    timeout: 60000
     pool:
       #连接池最大连接数(使用负值表示没有限制)
-      max-active: 10
+      max-active: 20
       #连接池最大阻塞等待时间(使用负值表示没有限制)
       max-wait: -1
       #连接池中的最大空闲连接
       max-idle: 10
       #连接池中的最小空闲连接
       min-idle: 0
-    
-swagger:
-  base-package: com.ym.controller
- 
-##认证 
+
+mybatis:
+  mapperLocations: classpath:config/mybatis/*.xml
+
+##认证
 security:
   oauth2:
     client:
@@ -78,7 +80,7 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -91,9 +93,6 @@ management:
 
 cn:
   rongcloud:
-    jwt:
-      secret: ay9pL#$Ws8Lpapo
-      ttlInMilliSec: -1
     im:
       appkey: c9kqb3rdc451j
       secret: gnskN9VRnbm
@@ -109,4 +108,40 @@ cn:
       maxCount: 16
       taskTtl: 30000
       roomTtl: 7200000
-      userIMOfflineKickTtl: 300000
+      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

+ 4 - 15
mec-im/src/main/resources/logback-spring.xml

@@ -28,21 +28,10 @@
 	</appender>
 
 	<logger name="com.ym.mec" level="INFO" />
-
-	<!--开发环境:打印控制台 -->
-	<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>
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

+ 55 - 29
mec-student/src/main/resources/application.yml

@@ -17,27 +17,29 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
     name: student-server
-    
+
   servlet:
     multipart:
       # 最大支持文件大小
-      max-file-size: 50MB
+      max-file-size: 150MB
       # 最大支持请求大小
-      max-request-size: 50MB
-    
+      max-request-size: 150MB
+
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用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
@@ -52,11 +54,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
-    host: 47.99.212.176
+    host: 127.0.0.1
     port: 6379
-    password: 
+    password: 123456
     database: 0
     #连接超时时间(毫秒)
     timeout: 10000
@@ -71,14 +73,14 @@ spring:
       min-idle: 0
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-  #   configuration:
-  #      log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapperLocations: classpath:config/mybatis/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 swagger:
   base-package: com.ym.mec.student.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -86,7 +88,7 @@ security:
       client-secret: student
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -96,20 +98,44 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
-    
+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: 0e7422e1d6e73637e678716a
-    masterSecret: c2361016604eab56ab2db2ac
+    appKey:
+      student: 0e7422e1d6e73637e678716a
+      teacher: 7e0282ca92c12c8c45a93bb3
+      system: a003c997b1add94aa8d6caf9
+    masterSecret:
+      student: c2361016604eab56ab2db2ac
+      teacher: d47430e2f4755ef5dc050ac5
+      system: c281fe6a21acf2e8a9f9d628
     apns_production: false
-    
-logging:
-  level:
-    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
-    
+auth:
+  sysconfig:
+    tenantId: 43

+ 4 - 13
mec-student/src/main/resources/logback-spring.xml

@@ -51,19 +51,10 @@
 	</logger>
 
 	<!--开发环境:打印控制台 -->
-	<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>
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

+ 41 - 18
mec-task/src/main/resources/application.yml

@@ -17,7 +17,7 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 spring:
@@ -26,9 +26,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -45,11 +45,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
-    host: 47.99.212.176
+    host: 127.0.0.1
     port: 6379
-    password: 
+    password: 123456
     database: 0
     #连接超时时间(毫秒)
     timeout: 10000
@@ -64,14 +64,17 @@ spring:
       min-idle: 0
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    
+  mapperLocations: classpath:config/mybatis/*.xml
+
 task:
   configLocation: classpath:config/properties/quartz.properties
   autoStartup: true
   startupDelay: 30
-  
-      
+
+logging:
+  config: classpath:logback-spring.xml
+  path: d:/var/logs
+
 security:
   oauth2:
     client:
@@ -79,11 +82,31 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-      
-swagger:
-  base-package: com.ym.mec.task.controller
-  
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+
+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

+ 4 - 13
mec-task/src/main/resources/logback-spring.xml

@@ -30,19 +30,10 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<!--开发环境:打印控制台 -->
-	<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>
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

+ 44 - 26
mec-teacher/src/main/resources/application.yml

@@ -17,24 +17,26 @@ eureka:
   client:
     serviceUrl:
       defaultZone: http://admin:admin123@localhost:8761/eureka/eureka/
-    instance: 
+    instance:
       lease-renewal-interval-in-seconds: 5
 
 spring:
   application:
     name: teacher-server
-    
+
   servlet:
     multipart:
-      max-file-size: 10MB
-    
+      max-file-size: 150MB
+
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用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
@@ -49,11 +51,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
-    host: 47.99.212.176
+    host: 127.0.0.1
     port: 6379
-    password: 
+    password: 123456
     database: 0
     #连接超时时间(毫秒)
     timeout: 10000
@@ -68,12 +70,14 @@ spring:
       min-idle: 0
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    
+  mapperLocations: classpath:config/mybatis/*.xml
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
 swagger:
   base-package: com.ym.mec.teacher.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -81,7 +85,7 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -91,18 +95,32 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
-    
+
+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: 7e0282ca92c12c8c45a93bb3
-    masterSecret: d47430e2f4755ef5dc050ac5
+    appKey:
+      student: 0e7422e1d6e73637e678716a
+      teacher: 7e0282ca92c12c8c45a93bb3
+      system: a003c997b1add94aa8d6caf9
+    masterSecret:
+      student: c2361016604eab56ab2db2ac
+      teacher: d47430e2f4755ef5dc050ac5
+      system: c281fe6a21acf2e8a9f9d628
     apns_production: false
-    
-logging:
-  level:
-    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG
+auth:
+  sysconfig:
+    tenantId: 43

+ 4 - 13
mec-teacher/src/main/resources/logback-spring.xml

@@ -51,19 +51,10 @@
 	</logger>
 
 	<!--开发环境:打印控制台 -->
-	<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>
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">

+ 32 - 13
mec-web/src/main/resources/application.yml

@@ -1,5 +1,6 @@
 server:
   port: 8005
+  connection-timeout: 60000
   tomcat:
     accesslog:
       enabled: true
@@ -30,14 +31,13 @@ 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&allowMultiQueries=true
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+    username: dayaData
+    password: dayaDataOnline2019
     # 使用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: 47.99.212.176
+    host: 127.0.0.1
     port: 6379
-    password:
+    password: 123456
     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,10 +107,29 @@ logging:
     com.ym.mec.auth.api.client.SysUserFeignService: INFO
 
 message:
-  debugMode: true
+  debugMode: false
 
 ##支付流水隐藏
 payment:
-  hiddenMode: true
+  hiddenMode: false
   #隐藏的支付方式
-  channel: YQPAY,
+  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

+ 4 - 15
mec-web/src/main/resources/logback-spring.xml

@@ -49,21 +49,10 @@
 		additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
-
-	<!--开发环境:打印控制台 -->
-	<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>
+	<root level="INFO">
+		<appender-ref ref="stdout" />
+		<appender-ref ref="file" />
+	</root>
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">