rename some method, clear the semantic

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

@@ -63,40 +63,44 @@ public class UserController implements IBaseController {
             'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 
     @RequestMapping("/login")
-    public JsonResult login2(HttpServletRequest request) {
-        String credential = request.getHeader("authorization");
-        if(!credential.startsWith("Basic ")){
-            return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
-        }
-        credential = credential.substring("Basic ".length(), credential.length());
-        byte[] buf = Base64.decodeBase64(credential);
-        String bufStr = "";
-        try {
-            bufStr = new String(buf, "UTF-8");
-        } catch (UnsupportedEncodingException e){
-            LOGGER.error("不支持的编码: ", e);
-        }
-        String[] credentialArr = bufStr.split(":");
-        if(credentialArr.length != 2){
-            return JsonResult.buildErrorStateResult("用户名或密码不正确.", null);
-        }
-        String userName = credentialArr[0];
-        String pass = credentialArr[1];
-        User user = userService.findByPhoneWithCache(userName);
-        if(user == null){
-            return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
-        }
-        //验证密码
-        if (!validatePassword(pass, user.getPassword())) {
-            return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
+    public JsonResult login2(@RequestParam(required = false, defaultValue = "") String userId, HttpServletRequest request) {
+        if (userId != null && userId.length() > 10) {
+            userService.findByUuidInDb()
+        } else {
+            String credential = request.getHeader("authorization");
+            if (!credential.startsWith("Basic ")) {
+                return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
+            }
+            credential = credential.substring("Basic ".length(), credential.length());
+            byte[] buf = Base64.decodeBase64(credential);
+            String bufStr = "";
+            try {
+                bufStr = new String(buf, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                LOGGER.error("不支持的编码: ", e);
+            }
+            String[] credentialArr = bufStr.split(":");
+            if (credentialArr.length != 2) {
+                return JsonResult.buildErrorStateResult("用户名或密码不正确.", null);
+            }
+            String userName = credentialArr[0];
+            String pass = credentialArr[1];
+            User user = userService.findByPhoneWithCache(userName);
+            if (user == null) {
+                return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
+            }
+            //验证密码
+            if (!validatePassword(pass, user.getPassword())) {
+                return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
+            }
+            //找到用户
+            SessionStruct sessionStruct = sessionService.createSessionAndPersistInCache(user);
+            LOGGER.info("用户登录成功, loginFrom:{}, phoneNo:{},appChannel:{}", getCreatedFrom(), user.getPhoneNo(), getAppChannel());
+            AuthBean authBean = new AuthBean();
+            authBean.setPhoneNo(user.getPhoneNo());
+            authBean.setToken(sessionStruct.getSid());
+            return new JsonResult(authBean);
         }
-        //找到用户
-        SessionStruct sessionStruct = sessionService.createSessionAndPersistInCache(user);
-        LOGGER.info("用户登录成功, loginFrom:{}, phoneNo:{},appChannel:{}", getCreatedFrom(), user.getPhoneNo(), getAppChannel());
-        AuthBean authBean = new AuthBean();
-        authBean.setPhoneNo(user.getPhoneNo());
-        authBean.setToken(sessionStruct.getSid());
-        return new JsonResult(authBean);
     }
 
     @RequestMapping("/test")
@@ -364,7 +368,7 @@ public class UserController implements IBaseController {
        return JsonResult.buildSuccessResult("token校验成功", userModel);
     }
 
-    public User registerFastWhenLogin(String phoneNo, Long channelId, Long registerFrom, String appChannel) {
+    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)) {