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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -97,7 +97,9 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		password = new BCryptPasswordEncoder().encode(password);
-		sysUserService.updatePassword(mobile, password);
+		sysUser.setPassword(password);
+		sysUser.setUpdateTime(new Date());
+		sysUserService.update(sysUser);
 		return succeed();
 	}
 
@@ -115,7 +117,10 @@ public class UserController extends BaseController {
 			return failed("用户不存在");
 		}
 		if (smsCodeService.verifyValidCode(mobile, authCode)) {
-			sysUserService.updatePassword(mobile, new BCryptPasswordEncoder().encode(newPassword));
+			String password = new BCryptPasswordEncoder().encode(newPassword);
+			sysUser.setPassword(password);
+			sysUser.setUpdateTime(new Date());
+			sysUserService.update(sysUser);
 			return succeed();
 		} else {
 			return failed("验证码错误");

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -125,6 +125,9 @@
             <if test="idCardNo != null">
                 id_card_no_ = #{idCardNo},
             </if>
+            <if test="password != null">
+                password_ = #{password},
+            </if>
             <if test="wechatId != null">
                 wechat_id_ = #{wechatId},
             </if>

mec-biz/src/main/java/com/ym/mec/biz/service/ContractService.java

@@ -7,9 +7,12 @@ public interface ContractService {
 	/**
 	 * 用户注册
 	 * @param userId
+	 * @param realName
+	 * @param idCardNo
+	 * @param mobileNo
 	 * @return
 	 */
-	SysUserTsign register(Integer userId);
+	SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo);
 
 	/**
 	 * 传递注册协议至第三方公证平台

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

@@ -87,17 +87,13 @@ public class ContractServiceImpl implements ContractService {
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 	@Override
-	public SysUserTsign register(Integer userId) {
+	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
 
-			SysUser user = sysUserFeignService.queryUserById(userId);
-			if (user == null) {
-				return null;
-			}
-			String accountId = eSealPlugin.createUserAccount(user.getRealName(), user.getIdCardNo(), user.getPhone());
+			String accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 
 			if (StringUtils.isBlank(accountId)) {
 				throw new BizException("创建电子存证账户失败");
@@ -112,7 +108,7 @@ public class ContractServiceImpl implements ContractService {
 			sysUserTsign = new SysUserTsign(userId, accountId, sealData);
 
 			sysUserTsignService.insert(sysUserTsign);
-			
+
 			return sysUserTsign;
 		}
 
@@ -125,7 +121,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -209,7 +209,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -348,7 +352,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -465,7 +473,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -485,7 +497,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -495,8 +507,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}
@@ -553,7 +565,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -563,8 +575,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}

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

@@ -88,7 +88,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		employeeDao.batchAddEmployeeRole(employee.getId(),employee.getRoleIds());
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
-		contractService.register(employee.getId());
+		contractService.register(employee.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),
 				StringUtils.isEmpty(employee.getAvatar())?sysConfigDao.findByParamName("user_default_head_url").getParanValue():employee.getAvatar()));
 		employee.setImToken(imResult.getToken());

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

@@ -165,8 +165,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             userId = sysUser.getId();
             //添加用户现金账户
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-            //添加用户电子签章账户
-            contractService.register(userId);
+			// 添加用户电子签章账户
+			contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
             //注册到融云
             ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
             sysUser.setImToken(register.getToken());
@@ -379,7 +379,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 //添加用户现金账户
                 sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
-                contractService.register(userId);
+                contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
                 //注册到融云
                 ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
                 sysUser.setImToken(register.getToken());

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

@@ -94,7 +94,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
 		//添加用户电子签章账户
-		contractService.register(teacher.getId());
+		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		teacherDao.insert(teacher);
 		ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
 		if(imResult != null){

mec-common/common-core/src/main/java/com/ym/mec/common/config/RequestAttributeHystrixConcurrencyStrategy.java

@@ -23,7 +23,7 @@ import com.netflix.hystrix.strategy.metrics.HystrixMetricsPublisher;
 import com.netflix.hystrix.strategy.properties.HystrixPropertiesStrategy;
 import com.netflix.hystrix.strategy.properties.HystrixProperty;
 
-@Component
+//@Component
 public class RequestAttributeHystrixConcurrencyStrategy extends HystrixConcurrencyStrategy {
 	private static final Logger log = LoggerFactory.getLogger(RequestAttributeHystrixConcurrencyStrategy.class);
 

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -1,32 +1,54 @@
 package com.ym.mec.student.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
-import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.enums.*;
-import com.ym.mec.biz.service.*;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
+import com.ym.mec.biz.dal.enums.GoodsType;
+import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
+import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
+import com.ym.mec.biz.service.PayService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.biz.service.StudentRegistrationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.util.string.IdWorker;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
 
 @RequestMapping("musicGroup")
 @Api(tags = "乐团服务")
@@ -59,7 +81,7 @@ public class MusicGroupController extends BaseController {
     public Object queryUserMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryUserMusicGroups(sysUser.getId()));
     }
@@ -69,7 +91,7 @@ public class MusicGroupController extends BaseController {
     public Object queryPersonalMusicGroups() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.queryPersonalMusicGroups(sysUser.getId()));
     }
@@ -79,7 +101,7 @@ public class MusicGroupController extends BaseController {
     public Object findTeachersByStuId() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if (sysUser == null) {
-            return failed("获取用户信息失败");
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
     }

mec-student/src/main/java/com/ym/mec/student/controller/SysMessageController.java

@@ -75,7 +75,7 @@ public class SysMessageController extends BaseController {
 	public Object queryCountOfUnread() {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
-			return failed("请重新登录");
+			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
 		return succeed(sysMessageService.queryCountOfUnread(sysUser.getId()));
 	}

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

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