--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/personalcenter/PersonalCenterConteroller.java

@@ -24,6 +24,7 @@ import com.zrqx.core.form.member.fg.personalcenter.UpdateMemberForm;
 import com.zrqx.core.form.member.fg.personalcenter.UpdatePasswordForm;
 import com.zrqx.core.form.member.fg.personalcenter.UpdatePhoneForm;
 import com.zrqx.core.form.third.sdksms.SdkSmsForm;
+import com.zrqx.core.form.third.sms.SmsForm;
 import com.zrqx.core.model.member.ExpertMember;
 import com.zrqx.core.model.member.Member;
 import com.zrqx.core.model.member.Organ;
@@ -33,9 +34,11 @@ import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.core.util.datatype.DateUtils;
 import com.zrqx.core.util.datatype.PasswordUtil;
 import com.zrqx.core.util.response.CallBack;
+import com.zrqx.core.vo.member.RedisMember;
 import com.zrqx.core.vo.member.fg.personalcenter.MemberInfo;
 import com.zrqx.member.commons.redis.Redis;
 import com.zrqx.member.fg.client.third.SdkSmsClient;
+import com.zrqx.member.fg.client.third.SmsClient;
 import com.zrqx.member.fg.emember.service.FgExpertMemberService;
 import com.zrqx.member.fg.member.service.FgMemberService;
 import com.zrqx.member.fg.omember.service.FgOrganMemberService;
@@ -63,6 +66,8 @@ public class PersonalCenterConteroller {
 	@Autowired
 	private SdkSmsClient sdkSmsClient;
 	@Autowired
+	private SmsClient smsClient;
+	@Autowired
 	private Redis redis;
 	@Autowired
 	private FgOrganMemberService omService;
@@ -94,23 +99,13 @@ public class PersonalCenterConteroller {
 		Member member = new Member();
 		member.setId(memberInfo.getId());
 		BeanUtils.copyProperties(form, member);
-		if(memberInfo.getLevel().equals(LevelEnum.EXPERT.getCode())) {
-			ExpertMember em = new ExpertMember();
-			BeanUtils.copyProperties(form, em);
-			em.setId(memberInfo.getId());
-			mService.updateByPrimaryKeySelective(member);
-			emService.updateByPrimaryKeySelective(em);
-		}
-		//判断是否是普通用户
-		if(memberInfo.getLevel().equals(LevelEnum.PERSONAL.getCode())) {
-			PersonalMember pm = new PersonalMember();
-			BeanUtils.copyProperties(form, pm);
-			pm.setId(memberInfo.getId());
-			mService.updateByPrimaryKeySelective(member);
-			pmService.updateByPrimaryKeySelective(pm);
-			BeanUtils.copyPropertiesIgnoreNull(form, memberInfo, form);
-			redis.set(memberInfo.getToken(), memberInfo);
-		}
+		PersonalMember pm = new PersonalMember();
+		BeanUtils.copyProperties(form, pm);
+		pm.setId(memberInfo.getId());
+		mService.updateByPrimaryKeySelective(member);
+		pmService.updateByPrimaryKeySelective(pm);
+		BeanUtils.copyPropertiesIgnoreNull(form, memberInfo, form);
+		//redis.set(memberInfo.getToken(), memberInfo);
 		return CallBack.success("");
 	}
 
@@ -174,7 +169,9 @@ public class PersonalCenterConteroller {
 		mService.updateByPrimaryKeySelective(m);
 		// 更新redis
 		memberInfo.setPhone(form.getPhone());
-		redis.set(memberInfo.getToken(), memberInfo);
+		RedisMember redisMember = new RedisMember();
+		redisMember.setMember(memberInfo);
+		redis.setRedisMember(redisMember);
 		return CallBack.success("成功");
 	}
 
@@ -201,12 +198,13 @@ public class PersonalCenterConteroller {
 		if (StringUtils.isNotBlank(sendPhoneCount) && sendPhoneCount.equals("10")) {
 			throw new BaseException(17, "当天注册发送验证码超过10次");
 		}
-		SdkSmsForm ssf = new SdkSmsForm();
-		ssf.setMobile(phone);
+		SmsForm ssf = new SmsForm();
+		ssf.setPhone(phone);
 		String code = PasswordUtil.createPassword(6, 1);
-		ssf.setContent("您的验证码是：" + code + "，在5分钟内有效。如非本人操作请忽略本短信。");
-		CallBack<String> sms = sdkSmsClient.send(ssf);
-		if (sms != null && sms.isStatus()) {
+		ssf.setCode(code);
+		ssf.setType(1); 
+		String sms = smsClient.sendSms(ssf);
+		if (sms != null) {
 			redis.set(phone, code, 60 * 5, TimeUnit.SECONDS);
 			sendPhoneCount = StringUtils.isBlank(sendPhoneCount) ? "1" : Integer.parseInt(sendPhoneCount) + 1 + "";
 			redis.set(key, sendPhoneCount, 60 * 5);