修改随机密码获取方式

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

@@ -14,7 +14,6 @@ import cn.quantgroup.xyqb.exception.UserNotExistException;
 import cn.quantgroup.xyqb.exception.VerificationCodeErrorException;
 import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.UserModel;
-import cn.quantgroup.xyqb.model.UserRegisterMqMessage;
 import cn.quantgroup.xyqb.model.UserStatistics;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
@@ -23,7 +22,6 @@ import cn.quantgroup.xyqb.service.user.IUserDetailService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
 import cn.quantgroup.xyqb.util.*;
-import cn.quantgroup.xyqb.util.encrypt.MD5Util;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -38,7 +36,10 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
-import java.util.*;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -73,12 +74,6 @@ public class UserController implements IBaseController {
   @Autowired
   private IWechatService wechatService;
 
-  private static final char[] PWD_BASE = {
-          'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
-          'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
-          'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
-  };
-
   @RequestMapping("/test")
   public JsonResult test() {
     HttpServletRequest request = getRequest();
@@ -250,7 +245,7 @@ public class UserController implements IBaseController {
   }
 
   private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel, Long btRegisterChannelId,String dimension) {
-    String password = genRandomPwd();
+    String password = PasswordUtil.generateRandomPwd();
     LOGGER.info("用户快速注册, phoneNo:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId", phoneNo, channelId, registerFrom, appChannel,btRegisterChannelId);
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
       LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
@@ -318,7 +313,7 @@ public class UserController implements IBaseController {
   public JsonResult registerFast(@RequestParam String phoneNo, @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,
                                  @RequestParam(required = false) Long registerFrom, @RequestParam(required = false, defaultValue = "") String appChannel,
                                  @RequestParam(required = false)Long btRegisterChannelId,@RequestParam(required = false)String dimension) {
-    String password = genRandomPwd();
+    String password = PasswordUtil.generateRandomPwd();
     LOGGER.info("用户快速注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{},btRegisterChannelId:{},dimension:{}", phoneNo, verificationCode, channelId, registerFrom, appChannel,btRegisterChannelId,dimension);
     if (!ValidationUtil.validatePhoneNo(phoneNo)) {
       LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
@@ -477,24 +472,6 @@ public class UserController implements IBaseController {
     return JsonResult.buildSuccessResult(null, stringRedisTemplate.hasKey(tokenKey)||stringRedisTemplate.hasKey(tokenKey2));
   }
 
-
-  private String genRandomPwd() {
-    int pwdMax = PWD_BASE.length;
-    int i; // 生成的随机数
-    int count = 0; // 生成的密码的长度
-    StringBuffer pwd = new StringBuffer();
-    Random r = new Random();
-    while (count < 15) {
-      i = Math.abs(r.nextInt(pwdMax)); // 生成的数最大为36-1
-      if (i >= 0 && i < PWD_BASE.length) {
-        pwd.append(PWD_BASE[i]);
-        count++;
-      }
-    }
-    return pwd.toString();
-  }
-
-
   @RequestMapping("/syncUserInfo")
   public JsonResult syncUserInfo() {
     User user = getCurrentUserFromRedis();
@@ -507,23 +484,6 @@ public class UserController implements IBaseController {
     return JsonResult.buildSuccessResult("token校验成功", userModel);
   }
 
-  private User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel) {
-    String password = genRandomPwd();
-    LOGGER.info("用户快速注册, phoneNo:{}, verificationCode:{}, channelId:{}, registerFrom:{},appChannel:{}", phoneNo, channelId, registerFrom, appChannel);
-    if (!ValidationUtil.validatePhoneNo(phoneNo)) {
-      LOGGER.info("用户快速注册失败，手机号错误, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-      throw new UserNotExistException("手机号错误");
-    }
-    if (null == registerFrom) {
-      registerFrom = 1L;
-    }
-    User newUser = userService.registerAndReturn(phoneNo, password, registerFrom);
-    if(newUser != null && newUser.getId() != null && newUser.getId() > 0){
-      LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
-    }
-    return newUser;
-  }
-
   private JsonResult loginWithHttpBasic(Long channelId, String appChannel, Long createdFrom, Merchant merchant, HttpServletRequest request, String openId,String dimension) {
     User user = verificateUserNameAndPassword(request, openId);
     if (user == null) {

src/main/java/cn/quantgroup/xyqb/util/PasswordUtil.java

 package cn.quantgroup.xyqb.util;
 
 import java.security.MessageDigest;
+import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * Created by Miraculous on 15/7/5.
  */
 public class PasswordUtil {
 
-  private static final char[] HEX_DIGITS = {
-      '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-  };
+    private static final char[] HEX_DIGITS = {
+            '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
+    };
 
-  public final static String MD5(String s) {
-    try {
-      byte[] strTemp = s.getBytes("utf-8");
-      MessageDigest mdTemp = MessageDigest.getInstance("MD5");
-      mdTemp.update(strTemp);
-      byte[] md = mdTemp.digest();
-      int j = md.length;
-      char[] str = new char[j << 1];
-      int k = 0;
-      for (int i = 0; i < j; i++) {
-        byte byte0 = md[i];
-        str[k++] = HEX_DIGITS[byte0 >>> 4 & 0xf];
-        str[k++] = HEX_DIGITS[byte0 & 0xf];
-      }
-      return new String(str);
-    } catch (Exception e) {
-      return null;
+    private static final char[] PWD_BASE = {
+            'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k',
+            'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
+            'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
+    };
+
+    public final static String MD5(String s) {
+        try {
+            byte[] strTemp = s.getBytes("utf-8");
+            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+            mdTemp.update(strTemp);
+            byte[] md = mdTemp.digest();
+            int j = md.length;
+            char[] str = new char[j << 1];
+            int k = 0;
+            for (int i = 0; i < j; i++) {
+                byte byte0 = md[i];
+                str[k++] = HEX_DIGITS[byte0 >>> 4 & 0xf];
+                str[k++] = HEX_DIGITS[byte0 & 0xf];
+            }
+            return new String(str);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 生成随机密码
+     * @return
+     */
+    public static String generateRandomPwd() {
+        int pwdMax = PWD_BASE.length;
+        int i; // 生成的随机数
+        int count = 0; // 生成的密码的长度
+        StringBuffer pwd = new StringBuffer();
+        while (count < 15) {
+            i = Math.abs(ThreadLocalRandom.current().nextInt(pwdMax)); // 生成的数最大为36-1
+            if (i >= 0 && i < PWD_BASE.length) {
+                pwd.append(PWD_BASE[i]);
+                count++;
+            }
+        }
+        return pwd.toString();
     }
-  }
 
 }