魔法值修复---第三批

src/main/java/cn/quantgroup/xyqb/Constants.java

@@ -25,7 +25,11 @@ public interface Constants {
     Long VERIFICATION_CODE_FINITE_COUNT = 3L;
 
     String X_AUTH_TOKEN = "x-auth-token";
+    int VERIFICATION_LEN = 2;
+    int SMS_CODE_LEN_4 = 4;
+    int SMS_CODE_LEN_6 = 6;
     int TOKEN_LENGTH = 36;
+    int MD5_LENGTH = 32;
     int THOUSAND_SECOND = 1000;
     int MILLIS_PER_SECOND = 1000;
     int MILLIS_OF_TEN_SECOND = 10000;

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -225,7 +225,7 @@ public class UserController implements IBaseController {
         byte[] buf = Base64.decodeBase64(credential);
         credential = new String(buf, Charset.forName("UTF-8"));
         String[] credentialArr = credential.split(Constants.SPLIT_CHAR);
-        if (credentialArr.length != 2) {
+        if (credentialArr.length != Constants.VERIFICATION_LEN) {
             result.put(Constants.CHECK_FAIL, JsonResult.buildErrorStateResult("登录失败", null));
             return result;
         }

src/main/java/cn/quantgroup/xyqb/controller/external/WeChatController.java

@@ -338,7 +338,7 @@ public class WeChatController implements IBaseController {
             LOGGER.info("微信登录:redirect不为null,创建session跳到指定前端页面.");
             AuthBean authBean = sessionService.createSession(user, loginProperties);
             LOGGER.info("微信登录:跳转地址{}", domain + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
-            Long channelId = "baitiao".equals(merchant.getName()) ? 222L : 1L;
+            Long channelId = "baitiao".equals(merchant.getName()) ? Constants.Channel.BAITIAO : 1L;
             String target = "baitiao".equals(merchant.getName()) ? "cashTarget5" : "cashTarget4";
             return domain + "/landing?token=" + authBean.getToken() + "&registerFrom=" + registerFrom +
                     "&channelId=" + channelId + "&key=" + merchant.getName() + "&target=" + target + "&isWechat=true";

src/main/java/cn/quantgroup/xyqb/controller/external/sms/SmsController.java

@@ -23,10 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -49,11 +46,20 @@ public class SmsController implements IBaseController {
     private static final String IMAGE_IP_COUNT = "image:ip";
     private static final String IMAGE_PHONE_COUNT = "image:phone";
     private static final String IMAGE_DEVICEID_COUNT = "image:deviceId:";
-
-    private static final Long IP_MAX_PER_DAY = 5000L;//ip上限
-    private static final Long PHONE_MAX_PER_DAY = 20L;//手机号短信上限
-    private static final Long PHONE_VOICE_MAX_PER_DAY = 5L;//手机号语音上限
-    private static final Long DEVICE_MAX_PER_DAY = 20L;//设备每天上限
+    /** ip上限 */
+    private static final Long IP_MAX_PER_DAY = 5000L;
+    /** 手机号短信上限 */
+    private static final Long PHONE_MAX_PER_DAY = 20L;
+    /** 手机号语音上限 */
+    private static final Long PHONE_VOICE_MAX_PER_DAY = 5L;
+    /** 设备每天上限 */
+    private static final Long DEVICE_MAX_PER_DAY = 20L;
+    /** 手机号语音上限-KEY-4 */
+    private static final String PHONE_VOICE_MAX_PER_DAY_KEY_4 = "4";
+    /** 手机号语音上限-KEY-5 */
+    private static final String PHONE_VOICE_MAX_PER_DAY_KEY_5 = "5";
+    /** 手机号语音上限-KEY-6 */
+    private static final String PHONE_VOICE_MAX_PER_DAY_KEY_6 = "6";
 
     /**
      * 短信验证码: for H5
@@ -71,7 +77,7 @@ public class SmsController implements IBaseController {
                                       @RequestParam(required = false, defaultValue = "") String appName,
                                       @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
 
@@ -91,7 +97,7 @@ public class SmsController implements IBaseController {
                                       @RequestParam(required = false, defaultValue = "") String appName,
                                       @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
 
@@ -103,12 +109,12 @@ public class SmsController implements IBaseController {
     @RequestMapping("/send_sms_verification_code_voice")
     public JsonResult verifyPhoneNoH5New(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                          String usage) {
-        if (StringUtils.isEmpty(usage) || !"4".equals(usage)) {
+        if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_4, usage)) {
             LOGGER.error("参数校验失败,用户注册语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
         LOGGER.info("注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
 
@@ -116,12 +122,12 @@ public class SmsController implements IBaseController {
     @RequestMapping("/send_reset_code_voice")
     public JsonResult resetPasswordH5New(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                          String usage) {
-        if (StringUtils.isEmpty(usage) || !"5".equals(usage)) {
+        if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_5, usage)) {
             LOGGER.error("参数校验失败,重置密码语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
         LOGGER.info("重置密码-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
 
@@ -132,12 +138,12 @@ public class SmsController implements IBaseController {
     @RequestMapping("/send_login_code_voice")
     public JsonResult sendLoginCodeNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                        String usage) {
-        if (StringUtils.isEmpty(usage) || !"6".equals(usage)) {
+        if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_6, usage)) {
             LOGGER.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
         LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2Voice(phoneNo, randomCode, usage);
     }
 
@@ -155,7 +161,7 @@ public class SmsController implements IBaseController {
                                     @RequestParam(required = false, defaultValue = "") String appName,
                                     @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
 
@@ -173,7 +179,7 @@ public class SmsController implements IBaseController {
                                      @RequestParam(required = false, defaultValue = "") String appName,
                                      @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("快速注册-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2(phoneNo, randomCode, appName, smsMerchant);
     }
 
@@ -226,7 +232,7 @@ public class SmsController implements IBaseController {
         String verificationCountKey = Constants.REDIS_VOICE_CODE_COUNT + phoneNo;
         Long getVerificationCount = redisTemplate.opsForHash().increment(verificationCountKey, usage, 1);
         redisTemplate.expire(verificationCountKey, DateUtils.getSeconds(), TimeUnit.SECONDS);
-        if (getVerificationCount > 5) {
+        if (getVerificationCount > PHONE_VOICE_MAX_PER_DAY) {
             return JsonResult.buildErrorStateResult("今天已获取5次语音验证码，请使用短信验证码或明天再试", null);
         }
 
@@ -258,12 +264,12 @@ public class SmsController implements IBaseController {
     @RequestMapping("/send_login_code_voice_new")
     public JsonResult sendLoginCodeVoiceNew(@RequestParam String phoneNo, @RequestParam(required = false) String registerFrom,
                                             String usage, @RequestParam(required = false) String deviceId) {
-        if (StringUtils.isEmpty(usage) || !"6".equals(usage)) {
+        if (!Objects.equals(PHONE_VOICE_MAX_PER_DAY_KEY_6, usage)) {
             LOGGER.error("参数校验失败,用户登录语音验证码usage参数为{}", usage);
             return JsonResult.buildErrorStateResult("参数校验失败.", null);
         }
         LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2VoiceNew(phoneNo, randomCode, usage, deviceId);
     }
 
@@ -284,7 +290,7 @@ public class SmsController implements IBaseController {
                                           @RequestParam(required = false, defaultValue = "") String appName,
                                           @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
     }
 
@@ -305,7 +311,7 @@ public class SmsController implements IBaseController {
                                                @RequestParam(required = false, defaultValue = "") String appName,
                                                @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("快速登陆-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(4);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_4);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, false, appName, smsMerchant);
     }
 
@@ -326,7 +332,7 @@ public class SmsController implements IBaseController {
                                           @RequestParam(required = false, defaultValue = "") String appName,
                                           @RequestParam(required = false) String smsMerchant) {
         LOGGER.info("VCC-发送验证码, phoneNo:{}, registerFrom:{}", phoneNo, registerFrom);
-        String randomCode = getRandomCode(6);
+        String randomCode = getRandomCode(Constants.SMS_CODE_LEN_6);
         return sendVerificationCode2New(phoneNo, randomCode, deviceId, true, appName, smsMerchant);
     }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -147,7 +147,7 @@ public class InnerController implements IBaseController {
         if (md5Value == null) {
             return JsonResult.buildErrorStateResult("参数错误", null);
         }
-        if (md5Value.length() != 32) {
+        if (md5Value.length() != Constants.MD5_LENGTH) {
             return JsonResult.buildErrorStateResult("参数长度有误", null);
         }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserApiController.java

@@ -41,15 +41,15 @@ public class UserApiController {
     private ISmsService smsService;
 
     @RequestMapping("/user/is_passwd_set")
-    public JsonResult isPasswordSet(String key, String phoneNo) {
-        if (!"abc1234".equals(key) || StringUtils.isEmpty(phoneNo)) {
+    public JsonResult isPasswordSet(String phoneNo) {
+        if (StringUtils.isEmpty(phoneNo)) {
             return JsonResult.buildErrorStateResult(null, null);
         }
         User user = userService.findByPhoneWithCache(phoneNo);
         if (null == user) {
             return JsonResult.buildErrorStateResult(null, null);
         }
-        if (StringUtils.length(user.getPassword()) == 32) {
+        if (StringUtils.length(user.getPassword()) == Constants.MD5_LENGTH) {
             return JsonResult.buildSuccessResult(null, null);
         }
         return JsonResult.buildErrorStateResult(null, null, 2L);

src/main/java/cn/quantgroup/xyqb/model/UserInfo.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.model;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import lombok.Data;
+import org.springframework.util.Assert;
 
 import java.io.Serializable;
 
@@ -25,7 +26,7 @@ public class UserInfo implements Serializable {
     private String IdNo;
 
     public UserInfo(User user, UserDetail userDetail) {
-        assert user != null;
+        Assert.notNull(user, "User信息无效");
         this.id = user.getId();
         this.phoneNo = user.getPhoneNo();
         this.registerFrom = user.getRegisteredFrom();

src/main/java/cn/quantgroup/xyqb/model/UserModel.java

@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.model;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.UserDetail;
 import lombok.Data;
+import org.springframework.util.Assert;
 
 import java.io.Serializable;
 import java.util.Optional;
@@ -35,7 +36,7 @@ public class UserModel implements Serializable {
     }
 
     public UserModel(User user, UserDetail userDetail) {
-        assert user != null;
+        Assert.notNull(user, "User信息无效");
         this.id = user.getId();
         this.phoneNo = user.getPhoneNo();
         this.registerFrom = user.getRegisteredFrom();

src/main/java/cn/quantgroup/xyqb/repository/IWeChatUserRepository.java

@@ -54,7 +54,7 @@ public interface IWeChatUserRepository extends JpaRepository<WechatUserInfo, Lon
      * @param userId - 用户标识
      * @return 记录更新行数
      */
-    @Transactional(propagation = MANDATORY)
+    @Transactional(propagation = MANDATORY, rollbackFor = Exception.class)
     @Modifying
     @Query(value = "update wechat_userinfo set user_id=null,phone_no='*' where open_id=?1 or user_id=?2", nativeQuery = true)
     int dissociateUser(String openId, Long userId);

src/main/java/cn/quantgroup/xyqb/service/captcha/GeetestLib.java

@@ -23,8 +23,6 @@ import java.util.Objects;
  */
 @Slf4j
 public class GeetestLib {
-    protected static final int SUCCESS_CHALLENGE_LENGTH = 32;
-
     protected final String verName = "4.0";
 
     private String apiUrl;
@@ -162,7 +160,7 @@ public class GeetestLib {
 
             gtlog("return_challenge:" + return_challenge);
 
-            if (return_challenge.length() == SUCCESS_CHALLENGE_LENGTH) {
+            if (return_challenge.length() == Constants.MD5_LENGTH) {
 
                 this.responseStr = this.getSuccessPreProcessRes(this.md5Encode(return_challenge + this.privateKey));
 

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -69,7 +69,7 @@ public class UserRegisterServiceImpl implements IUserRegisterService {
             registerFrom = 1L;
         }
         Long channelId = userRegisterParam.getChannelId();
-        if (Objects.equals(channelId, 222L)) {
+        if (Objects.equals(channelId, Constants.Channel.BAITIAO)) {
             user.setRegisteredFrom(channelId);
         } else {
             user.setRegisteredFrom(registerFrom);

src/main/java/cn/quantgroup/xyqb/service/sms/impl/SmsServiceImpl.java

@@ -8,8 +8,6 @@ import cn.quantgroup.xyqb.service.sms.ISmsService;
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,11 +24,6 @@ import java.util.Collections;
 @Service
 @Slf4j
 public class SmsServiceImpl implements ISmsService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SmsServiceImpl.class);
-
-
-    private static final int SMS_VERIFICATION_MAXLEN = 4;
-    private static final String SMS_VERIFY_PREFIX = "sms:verify:";
 
     private static SmsSender smsSender = null;
     @Value("${sms.is.debug}")
@@ -98,7 +91,7 @@ public class SmsServiceImpl implements ISmsService {
             return false;
         }
         String[] arr = randomCode.split(":");
-        if (arr.length != 2) {
+        if (arr.length != Constants.VERIFICATION_LEN) {
             return false;
         }
         String uniqueId = arr[0];

src/test/java/common/Jdk8Test.java

@@ -50,7 +50,8 @@ public class Jdk8Test {
 
     @Test
     public void random() {
-        for(int i=0; i<10; i++){
+        int count = 10;
+        for(int i=0; i<count; i++){
             log.info("{}-random:{}", i, RandomStringUtils.random(6, RANDOM_CHARS));
         }
     }