Merge remote-tracking branch 'origin/master'

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -99,10 +99,10 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 				info.setOrder(1);
 				if (isNewer) {
 					info.setLinkUrl(serverContextPath + "/#/auditionActive");
-					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_1.jpg");
+					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_1.png");
 				} else {
 					info.setLinkUrl(serverContextPath + "/#/auditionActive");
-					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_2.jpg");
+					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_2.png");
 				}
 				pageInfos.getRows().add(info);
 			}
@@ -131,10 +131,10 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
 			if (isNewer) {
 				info.setLinkUrl(serverContextPath + "/#/auditionActive/1");
-				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_1.jpg");
+				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_1.png");
 			} else {
 				info.setLinkUrl(serverContextPath + "/#/auditionActive/1");
-				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_2.jpg");
+				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_2.png");
 			}
 			pageInfos.getRows().add(info);
 		} else {

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

@@ -17,13 +17,13 @@ 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
@@ -45,7 +45,7 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 120.26.238.168
     port: 6379
@@ -65,11 +65,11 @@ 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 +79,8 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-      
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
+
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000

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);

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

@@ -27,7 +27,7 @@ eureka:
 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
@@ -49,11 +49,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 47.99.212.176
     port: 6379
-    password: 
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -66,11 +66,11 @@ spring:
       max-idle: 10
       #连接池中的最小空闲连接
       min-idle: 0
-    
+
 swagger:
   base-package: com.ym.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -78,7 +78,7 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:

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>

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

@@ -17,20 +17,20 @@ 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-request-size: 50MB
-    
+
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
@@ -52,11 +52,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 47.99.212.176
     port: 6379
-    password: 
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -71,14 +71,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.student.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -86,7 +86,7 @@ security:
       client-secret: student
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -96,20 +96,19 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  
 
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
-    
+
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
 push:
   jiguang:
     reqURL: https://api.jpush.cn/v3/push
     appKey: 0e7422e1d6e73637e678716a
     masterSecret: c2361016604eab56ab2db2ac
     apns_production: false
-    
+
 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,7 +46,7 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
 

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:
@@ -45,11 +45,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 47.99.212.176
     port: 6379
-    password: 
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -64,14 +64,14 @@ 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
-  
-      
+
+
 security:
   oauth2:
     client:
@@ -79,11 +79,11 @@ 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

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>

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

@@ -17,17 +17,17 @@ 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
-    
+
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
@@ -49,11 +49,11 @@ spring:
     testOnReturn: false
     poolPreparedStatements: true
     maxOpenPreparedStatements: 20
-    
+
   redis:
     host: 47.99.212.176
     port: 6379
-    password: 
+    password:
     database: 0
     #连接超时时间（毫秒）
     timeout: 10000
@@ -68,12 +68,12 @@ spring:
       min-idle: 0
 
 mybatis:
-    mapperLocations: classpath:config/mybatis/*.xml
-    
+  mapperLocations: classpath:config/mybatis/*.xml
+
 swagger:
   base-package: com.ym.mec.teacher.controller
- 
-##认证 
+
+##认证
 security:
   oauth2:
     client:
@@ -81,7 +81,7 @@ security:
       client-secret: app
     resource:
       token-info-uri: http://localhost:8001/oauth/check_token
-  
+
 #spring boot admin 相关配置
 management:
   endpoints:
@@ -91,18 +91,18 @@ management:
   endpoint:
     health:
       show-details: ALWAYS
-  
-ribbon:  
-    ReadTimeout: 60000  
-    ConnectTimeout: 60000
-    
+
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
 push:
   jiguang:
     reqURL: https://api.jpush.cn/v3/push
     appKey: 7e0282ca92c12c8c45a93bb3
     masterSecret: d47430e2f4755ef5dc050ac5
     apns_production: false
-    
+
 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,7 +46,7 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>
 

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

@@ -30,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_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

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,7 +46,7 @@
 	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
-		additivity="false">
+			additivity="false">
 		<appender-ref ref="messagefile" />
 	</logger>