Merge branch 'master' of http://git.dayaedu.com/yonge/mec

cms/src/main/resources/application.yml

@@ -59,4 +59,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -66,4 +66,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -1457,7 +1457,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
         for (ClassGroup classGroup : classGroupList) {
             for (Subject subject : subjectList) {
-                if (classGroup.getSubjectIdList().equals(subject.getId())) {
+                if (classGroup.getSubjectIdList().equals(subject.getId().toString())) {
                     classGroup.setSubjectName(subject.getName());
                 }
             }

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

@@ -172,6 +172,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             sysUser.setImToken(register.getToken());
             teacherDao.updateUser(sysUser);
         }
+        studentRegistration.setActualSubjectId(studentRegistration.getSubjectId());
         studentRegistration.setCreateTime(date);
         studentRegistration.setUpdateTime(date);
         studentRegistration.setUserId(sysUser.getId());

mec-biz/src/main/resources/config/mybatis/ClassGroupMapper.xml

@@ -642,8 +642,8 @@
 
     <select id="findClassGroupByMusicGroupIdAndType" resultMap="ClassGroup">
         SELECT * FROM class_group  WHERE music_group_id_=#{musicGroupId}
-        <if test="type !=null and type!=''">
-           AND type_=#{type}
+        <if test="type !=null ">
+           AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
          AND del_flag_='0'
     </select>

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -367,10 +367,10 @@
     <!-- 获取乐团未分班的学生 -->
     <select id="findMusicGroupNoClassGroupStudent" resultMap="StudentRegistration">
         SELECT * FROM student_registration WHERE music_group_id_ = #{musicGroupId}
-        <if test="actualSubjectId != null and actualSubjectId !=''">
+        <if test="actualSubjectId != null">
             AND actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 2 AND class_group_id_ IS NULL
+        AND payment_status_ = 2 AND class_group_id_ =0
     </select>
 
 
@@ -379,10 +379,10 @@
         SELECT sr.*,cg.name_ class_group_name_ FROM student_registration sr
         LEFT JOIN class_group cg ON cg.id_ = sr.class_group_id_
         WHERE sr.music_group_id_ = #{musicGroupId}
-        <if test="actualSubjectId != null and actualSubjectId !=''">
+        <if test="actualSubjectId != null">
             AND sr.actual_subject_id_ = #{actualSubjectId}
         </if>
-        AND payment_status_ = 1;
+        AND payment_status_ = 2;
     </select>
 
     <!-- 根据注册id list查询报名学生的信息 -->

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

@@ -77,6 +77,7 @@ management:
     health:
       show-details: ALWAYS
 
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -71,6 +71,7 @@ security:
 swagger:
   base-package: com.ym.mec.task.controller
   
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.teacher.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dto.ClassDateAdjustDto;
@@ -59,6 +60,7 @@ public class TeacherCourseScheduleController extends BaseController {
         if(null==user){
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
+        System.out.println(JSON.toJSONString(user));
         List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherCourseSchedulesWithDate(user.getId(),date,type);
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);

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

@@ -76,6 +76,10 @@ management:
     health:
       show-details: ALWAYS
   
-feign:
-  hystrix:
-    enabled: true
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000
+    
+logging:
+  level:
+    com.ym.mec.auth.api.client.SysUserFeignService: DEBUG

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

@@ -54,12 +54,12 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		projectconfig.setItsmApiUrl(apisUrl);
 		Result result = ServiceClientManager.registClient(projectconfig, null, null);
 		if (result.getErrCode() != 0) {
-//			throw new ThirdpartyException("e签宝客户端注册失败");
+			throw new ThirdpartyException("e签宝客户端注册失败");
 		}
 
 		serviceClient = ServiceClientManager.get(projectId);
 		if (serviceClient == null) {
-//			throw new ThirdpartyException("获取e签宝客户端失败");
+			throw new ThirdpartyException("获取e签宝客户端失败");
 		}
 	}
 

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -229,7 +229,7 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "小班报名详情")
-    @PostMapping("/highClassGroups")
+    @GetMapping("/highClassGroups")
     @PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public HttpResponseResult highClassGroups(String musicGroupId) throws Exception {
@@ -237,7 +237,7 @@ public class ClassGroupController extends BaseController {
     }
 
     @ApiOperation(value = "合奏子班列表（班级调整）")
-    @PostMapping("/classGroupAndTeacher")
+    @GetMapping("/classGroupAndTeacher")
     @PreAuthorize("@pcs.hasPermissions('classGroup/classGroupAndTeacher')")
     @ApiImplicitParams({@ApiImplicitParam(name = "classGroupId", value = "班级id", required = true, dataType = "int")})
     public HttpResponseResult classGroupAndTeacher(int classGroupId) throws Exception {

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

@@ -81,6 +81,7 @@ management:
     health:
       show-details: ALWAYS
   
-feign:
-  hystrix:
-    enabled: true
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000

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

@@ -77,4 +77,9 @@ management:
         include: "*"
   endpoint:
     health:
-      show-details: ALWAYS
+      show-details: ALWAYS
+      
+
+ribbon:  
+    ReadTimeout: 60000  
+    ConnectTimeout: 60000