Merge branch 'online1' into adapay_new

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1393,8 +1393,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 Map<Integer, Integer> studentSubjectIdMap = MapUtil.convertIntegerMap(studentSubjectIdMaps);
                 truantStudent.forEach(studentAttendanceViewDto -> {
                     studentAttendanceViewDto.setSubjectName(studentSubjectNameMap.get(studentAttendanceViewDto.getStudentId().intValue()));
-                    studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()).longValue());
-
+//                    studentAttendanceViewDto.setSubjectId(studentSubjectIdMap.get(studentAttendanceViewDto.getStudentId().intValue()).longValue());
                 });
             }
         }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2707,7 +2707,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			VipGroup vipGroup = vipGroupDao.get(vipGroupCourseAdjustInfo.getVipGroupId().longValue());
 
 			CourseSchedule courseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
-			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0){
+			if(courseSchedule.getEndClassTime().compareTo(vipGroup.getCoursesExpireDate())>0&&!DateUtil.isSameDay(courseSchedule.getEndClassTime(),vipGroup.getCoursesExpireDate())){
 				throw new BizException("调整失败：课程时间超过课程有效期");
 			}
 

mec-student/src/main/java/com/ym/mec/student/config/ResourceServerConfig.java

@@ -42,7 +42,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 "/subjectChange/getChangeInfo",
                 "/subjectChange/payChange",
                 "/contracts/queryProduceContract",
-                "/repair/studentPaymentGoodsOrder").permitAll().anyRequest().authenticated().and().httpBasic();
+                "/repair/studentPaymentGoodsOrder",
+                "/studentCompetition/getWinnerList",
+                "/studentCompetition/get").permitAll().anyRequest().authenticated().and().httpBasic();
     }
 
     @Override

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -51,7 +51,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 	}
 
 	@Override
-	public void afterPropertiesSet() throws Exception {
+	public void afterPropertiesSet(){
 		ProjectConfig projectconfig = new ProjectConfig();
 		projectconfig.setProjectId(projectId);
 		projectconfig.setProjectSecret(projectSecret);