From cd510b43b1ef85202ddf9018271aaadf695f3c8d Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: 星期二, 25 一月 2022 17:17:06 +0800
Subject: [PATCH] fix 优化登录、注册校验方式,在接口通过@Validated进行数据基础校验,以及服务执行到异常后,抛出异常结束方法执行(减少if-else嵌套)。

---
 ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
index ddd5018..66b5854 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -19,7 +19,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class LoginHelper {
 
-    private static final String LOGIN_USER_KEY = "loginUser";
+    public static final String JOIN_CODE = ":";
+    public static final String LOGIN_USER_KEY = "loginUser";
+
     private static final ThreadLocal<LoginUser> LOGIN_CACHE = new ThreadLocal<>();
 
     /**
@@ -80,7 +82,9 @@
             String userId = null;
             for (UserType value : UserType.values()) {
                 if (StringUtils.contains(loginId, value.getUserType())) {
-                    userId = StringUtils.replace(loginId, value.getUserType(), StringUtils.EMPTY);
+                    String[] strs = StringUtils.split(loginId, JOIN_CODE);
+                    // 鐢ㄦ埛id鍦ㄦ�绘槸鍦ㄦ渶鍚�
+                    userId = strs[strs.length - 1];
                 }
             }
             if (StringUtils.isBlank(userId)) {

--
Gitblit v1.9.3