确认密码

src/main/java/com/caimei365/user/model/dto/PasswordDto.java

@@ -33,7 +33,7 @@ public class PasswordDto implements Serializable {
      */
     @NotNull
     @ApiModelProperty("用户确认密码(旧：confirmPwd)")
-    private String passWordConfirm;
+    private String passwordConfirm;
     /**
      * 短信验证码
      */

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -125,7 +125,8 @@ public class BaseServiceImpl implements BaseService {
         boolean sendFlag = false;
         // 生成六位验证码
         String randomCode = CodeUtil.generateCodeInt(6);
-        if ("dev".equals(profile) || "beta".equals(profile)){
+        boolean isBeta = "dev".equals(profile) || "beta".equals(profile);
+        if (isBeta){
             // 开发 和 测试环境 固定短信验证码 666666
             randomCode = "666666";
         }
@@ -137,7 +138,7 @@ public class BaseServiceImpl implements BaseService {
                 return ResponseJson.error("该手机号尚未注册");
             }
             // 找回密码
-            sendFlag = AliyunSmsUtil.sendSms(mobile, 1, "{code:" + randomCode + "}");
+            sendFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 1, "{code:" + randomCode + "}");
             codeTypeTxt = "找回密码";
         } else if (2 == activateCodeType || 3 == activateCodeType){
             if (null != userId && userId > 0) {
@@ -145,25 +146,25 @@ public class BaseServiceImpl implements BaseService {
             }
             if (2 == activateCodeType) {
                 // 机构用户(自主)注册
-                sendFlag = AliyunSmsUtil.sendSms(mobile, 8, "{code:"+ randomCode +"}");
+                sendFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 8, "{code:" + randomCode + "}");
                 codeTypeTxt = "机构(自主)注册";
             } else if (3 == activateCodeType) {
                 // 供应商(自主)注册
-                sendFlag = AliyunSmsUtil.sendSms(mobile, 9, "{code:"+ randomCode +"}");
+                sendFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 9, "{code:"+ randomCode +"}");
                 codeTypeTxt = "供应商(自主)注册";
             } else {
                 return ResponseJson.error("参数错误：activateCodeType");
             }
         } else if (4 == activateCodeType) {
             // 您正在更换联系人手机号，您的验证码为：${code}。
-            sendFlag = AliyunSmsUtil.sendSms(mobile, 13, "{code:"+ randomCode +"}");
+            sendFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 13, "{code:"+ randomCode +"}");
             codeTypeTxt = "更换联系人(旧手机号验证码)";
         } else if (5 == activateCodeType) {
             if (null != userId && userId > 0) {
                 return ResponseJson.error("该手机号已被使用");
             }
             // 您正在更换联系人手机号，您的验证码为：${code}。
-            sendFlag = AliyunSmsUtil.sendSms(mobile, 13, "{code:"+ randomCode +"}");
+            sendFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 13, "{code:"+ randomCode +"}");
             codeTypeTxt = "更换联系人(新手机号验证码)";
         } else {
             return ResponseJson.error("参数错误：activateCodeType");
@@ -227,13 +228,14 @@ public class BaseServiceImpl implements BaseService {
         }
         // 生成六位验证码
         String randomCode = CodeUtil.generateCodeInt(6);
-        if ("dev".equals(profile) || "beta".equals(profile)){
+        boolean isBeta = "dev".equals(profile) || "beta".equals(profile);
+        if (isBeta){
             // 开发 和 测试环境 固定短信验证码 666666
             randomCode = "666666";
         }
         String userName = baseMapper.getUserNameByUserId(userId);
         // 欢迎成为${name}的运营人员，您的邀请码为${code}。
-        boolean smsFlag = AliyunSmsUtil.sendSms(mobile, 11, "{name:"+ userName +",code:"+ randomCode +"}");
+        boolean smsFlag = isBeta || AliyunSmsUtil.sendSms(mobile, 11, "{name:"+ userName +",code:"+ randomCode +"}");
         if (!smsFlag) {
             // 短信发送失败重试一次
             smsFlag = AliyunSmsUtil.sendSms(mobile, 11, "{name:\""+ userName +"\",code:"+ randomCode +"}");
@@ -263,7 +265,8 @@ public class BaseServiceImpl implements BaseService {
         try {
             // 生成六位验证码
             String randomCode = CodeUtil.generateCodeInt(6);
-            if ("dev".equals(profile) || "beta".equals(profile)){
+            boolean isBeta = "dev".equals(profile) || "beta".equals(profile);
+            if (isBeta){
                 // 开发 和 测试环境 固定短信验证码 666666
                 randomCode = "666666";
             }
@@ -311,7 +314,7 @@ public class BaseServiceImpl implements BaseService {
         String mobileOrEmail = passwordDto.getMobileOrEmail();
         String smsCode = passwordDto.getSmsCode();
         String passWord = passwordDto.getPassword();
-        String confirmPwd = passwordDto.getPassWordConfirm();
+        String confirmPwd = passwordDto.getPasswordConfirm();
         Integer status = passwordDto.getStatus();
         if (status == 1) {
             // 验证手机号