fixed 登录优化

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -811,7 +811,7 @@ public class WeixinServiceImpl implements WeixinService {
             }
         } catch (Exception e) {
             logger.error("开通微信卡券出错啦：{}", e.getMessage());
-            throw new BusinessCheckException("开通微信卡券出错啦");
+            throw new BusinessCheckException("开通微信卡券出错啦：" + e.getMessage());
         }
 
         return cardId;

fuint-application/src/main/java/com/fuint/common/util/TokenUtil.java

@@ -41,8 +41,13 @@ public class TokenUtil {
         token.append(userId);
         token.append(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()) + "_");
         token.append(new Random().nextInt((999999 - 111111 + 1)) + 111111);
-
         String tokenStr = MD5Util.getMD5(token.toString()).replace("+", "1").replaceAll("&", "8");
+
+        UserInfo userLoginInfo = new UserInfo();
+        userLoginInfo.setId(userId);
+        userLoginInfo.setToken(tokenStr);
+        saveToken(userLoginInfo);
+
         return tokenStr;
     }
 

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java

@@ -119,11 +119,6 @@ public class ClientSignController extends BaseController {
 
         String userAgent = request.getHeader("user-agent");
         String token = TokenUtil.generateToken(userAgent, mtUser.getId());
-        UserInfo userLoginInfo = new UserInfo();
-        userLoginInfo.setId(mtUser.getId());
-        userLoginInfo.setToken(token);
-        TokenUtil.saveToken(userLoginInfo);
-
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         result.put("userId", mtUser.getId());
@@ -223,10 +218,6 @@ public class ClientSignController extends BaseController {
 
         if (userInfo != null) {
             String token = TokenUtil.generateToken(userAgent, userInfo.getId());
-            UserInfo loginInfo = new UserInfo();
-            loginInfo.setId(userInfo.getId());
-            loginInfo.setToken(token);
-            TokenUtil.saveToken(loginInfo);
             Map<String, Object> outParams = new HashMap<>();
             outParams.put("userId", userInfo.getId());
             outParams.put("userName", userInfo.getName());
@@ -264,16 +255,16 @@ public class ClientSignController extends BaseController {
         String password = param.get("password") == null ? "" : param.get("password").toString();
         String captchaCode = param.get("captchaCode") == null ? "" : param.get("captchaCode").toString();
         String uuid = param.get("uuid") == null ? "" : param.get("uuid").toString();
-        TokenDto dto = new TokenDto();
+        TokenDto tokenDto = new TokenDto();
         MtUser mtUser = null;
         Integer merchantId = merchantService.getMerchantId(merchantNo);
         // 方式1：通过短信验证码登录
         if (StringUtil.isNotEmpty(mobile) && StringUtil.isNotEmpty(verifyCode)) {
             // 如果已经登录，免输入验证码
             if (StringUtil.isNotEmpty(token) && TokenUtil.checkTokenLogin(token)) {
-                dto.setIsLogin(YesOrNoEnum.TRUE.getKey());
-                dto.setToken(token);
-                return getSuccessResult(JSONObject.toJSONString(dto));
+                tokenDto.setIsLogin(YesOrNoEnum.TRUE.getKey());
+                tokenDto.setToken(token);
+                return getSuccessResult(JSONObject.toJSONString(tokenDto));
             }
 
             // 1、验证码验证
@@ -299,16 +290,12 @@ public class ClientSignController extends BaseController {
                 // 更新验证码
                 verifyCodeService.updateValidFlag(mtVerifyCode.getId(), "1");
                 String userToken = TokenUtil.generateToken(userAgent, mtUser.getId());
-                UserInfo loginInfo = new UserInfo();
-                loginInfo.setId(mtUser.getId());
-                loginInfo.setToken(userToken);
-                TokenUtil.saveToken(loginInfo);
-
-                dto.setIsLogin(YesOrNoEnum.TRUE.getKey());
-                dto.setToken(userToken);
-                dto.setTokenCreatedTime(System.currentTimeMillis());
+
+                tokenDto.setIsLogin(YesOrNoEnum.TRUE.getKey());
+                tokenDto.setToken(userToken);
+                tokenDto.setTokenCreatedTime(System.currentTimeMillis());
             } else {
-                dto.setIsLogin(YesOrNoEnum.FALSE.getKey());
+                tokenDto.setIsLogin(YesOrNoEnum.FALSE.getKey());
                 return getFailureResult(201, "验证码错误或已过期，登录失败");
             }
         }
@@ -325,11 +312,7 @@ public class ClientSignController extends BaseController {
                 String myPassword = userInfo.getPassword();
                 String inputPassword = memberService.deCodePassword(password, userInfo.getSalt());
                 if (myPassword.equals(inputPassword)) {
-                    UserInfo loginInfo = new UserInfo();
-                    loginInfo.setToken(TokenUtil.generateToken(userAgent, userInfo.getId()));
-                    loginInfo.setId(userInfo.getId());
-                    TokenUtil.saveToken(loginInfo);
-                    dto.setToken(loginInfo.getToken());
+                    tokenDto.setToken(TokenUtil.generateToken(userAgent, userInfo.getId()));
                     mtUser = userInfo;
                 } else {
                     return getFailureResult(201, "账号或密码有误");
@@ -341,7 +324,7 @@ public class ClientSignController extends BaseController {
 
         if (mtUser != null) {
             Map<String, Object> outParams = new HashMap<>();
-            outParams.put("token", dto.getToken());
+            outParams.put("token", tokenDto.getToken());
             outParams.put("userId", mtUser.getId());
             outParams.put("userName", mtUser.getName());
             outParams.put("openId", mtUser.getOpenId());