--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -366,10 +366,10 @@ public class FgPermissionsController {
 			}
 			if(m != null ){
 				// 手机号已存在，判断是否已经绑定微信、qq
-				if(StringUtils.isBlank(m.getQqKey()) && StringUtils.isNotBlank(form.getQqKey())) {
+				if(StringUtils.isNotBlank(form.getQqKey())) {
 					m.setQqKey(form.getQqKey());
 				}
-				if(StringUtils.isBlank(m.getWechatKey()) && StringUtils.isNotBlank(form.getWechatKey())) {
+				if(StringUtils.isNotBlank(form.getWechatKey())) {
 					m.setWechatKey(form.getWechatKey());
 				}
 				if(!mService.updateByPrimaryKeySelective(m)) {
@@ -632,7 +632,7 @@ public class FgPermissionsController {
 		}else{
 			throw new BaseException(18,"短信验证码发送失败");
 		}
-        return CallBack.success("发送成功"+code,sendPhoneCount);
+        return CallBack.success("发送成功",sendPhoneCount);
 	} 
 	@ApiOperation(value = "发送手机短信 登录时使用", notes = "0：成功；16：60s内不能再次发送；；18:短信验证码发送失败；")
 	@GetMapping(value = MemberRequestPath.LOGIN + MemberRequestPath.CODE)
@@ -656,7 +656,7 @@ public class FgPermissionsController {
 		}else{
 			throw new BaseException(18,"短信验证码发送失败");
 		}
-        return CallBack.success("发送成功"+code);
+        return CallBack.success("发送成功");
 	} 
 	@ApiOperation(value = "重置密码-1 发送手机短信", notes = "0：成功；16：60s内不能再次发送；18:短信验证码发送失败；")
 	@GetMapping(value = MemberRequestPath.PASSWORD+1)
@@ -679,7 +679,7 @@ public class FgPermissionsController {
 		}else{
 			throw new BaseException(18,"短信验证码发送失败");
 		}
-        return CallBack.success("发送成功"+code);
+        return CallBack.success("发送成功");
 	} 
 	@ApiOperation(value = "重置密码-2 验证手机短信", notes = "0：成功；3：验证码不能为空；11：验证码已失效，请重新发送；20：验证码不能为空；21：手机号不能为空；")
 	@GetMapping(value = MemberRequestPath.PASSWORD+2)

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

@@ -229,7 +229,7 @@ public class PersonalCenterConteroller {
 		} else {
 			throw new BaseException(18, "短信验证码发送失败");
 		}
-		return CallBack.success("发送成功" + code);
+		return CallBack.success("发送成功");
 	}
 
 	@ApiOperation(value = "账户安全-解除绑定  1:qq;2:微信", notes = "0：成功；channel:登录渠道 0 PC，1 WAP，2 Android，3 iOS")