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

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

@@ -1004,9 +1004,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			throw new BizException("指定课程不存在");
 		}
 
-		int courseNum = courseScheduleDao.countVipGroupCourses(vipGroup.getId().intValue());
-		if(courseNum==0){
-			throw new BizException("未排课的课程不能进行调整");
+		if(vipGroup.getStatus().equals(VipGroupStatusEnum.APPLYING)){
+			throw new BizException("报名中的课程不能加课");
 		}
 
 		ClassGroup classGroup=classGroupDao.findByGroupAndType(vipGroupCourseAdjustInfo.getVipGroupId().toString(),GroupType.VIP.getCode());

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

@@ -77,7 +77,10 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }
 
         //获取活动信息
-        VipGroupActivity vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
+        VipGroupActivity vipGroupActivity = null;
+        if(vipGroup.getVipGroupActivityId() != null){
+        	vipGroupActivity = vipGroupActivityDao.get(vipGroup.getVipGroupActivityId().intValue());
+        }
 
         List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaries = new ArrayList<>();
         Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroupByTeachMode = vipCourseSchedules.stream().collect(Collectors.groupingBy(CourseSchedule::getTeachMode));

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

@@ -99,6 +99,13 @@ 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-teacher/src/main/resources/application.yml

@@ -96,6 +96,13 @@ 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-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -21,10 +21,10 @@ import com.ym.mec.util.http.HttpUtil;
 @Service
 public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean {
 
-	@Value("${push.jiguang.appKey:1}")
+	@Value("${push.jiguang.appKey:0e7422e1d6e73637e678716a}")
 	private String appKey;
 
-	@Value("${push.jiguang.masterSecret:1}")
+	@Value("${push.jiguang.masterSecret:c2361016604eab56ab2db2ac}")
 	private String masterSecret;
 
 	@Value("${push.jiguang.apns_production:false}")
@@ -33,7 +33,7 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	@Value("${push.jiguang.time_to_live:86400}")
 	private int time_to_live; // 离线保留时长 秒为单位 默认1天 最大10天
 
-	@Value("${push.jiguang.reqURL:1}")
+	@Value("${push.jiguang.reqURL:https://api.jpush.cn/v3/push}")
 	private String reqURL;// 请求极光地址
 
 	public static String getName() {