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/utils/SecurityUtils.java |   77 ++++----------------------------------
 1 files changed, 9 insertions(+), 68 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index 1500975..72c9453 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -1,72 +1,16 @@
 package com.ruoyi.common.utils;
 
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.IUserService;
-import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.spring.SpringUtils;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
  * 瀹夊叏鏈嶅姟宸ュ叿绫�
  *
- * @author ruoyi
+ * @author Long Li
  */
-public class SecurityUtils
-{
-    /**
-     * 鐢ㄦ埛ID
-     **/
-    public static Long getUserId()
-    {
-        return StpUtil.getLoginIdAsLong();
-    }
-
-    /**
-     * 鑾峰彇閮ㄩ棬ID
-     **/
-    public static Long getDeptId()
-    {
-        try
-        {
-            return getUser().getDeptId();
-        }
-        catch (Exception e)
-        {
-            throw new ServiceException("鑾峰彇閮ㄩ棬ID寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 鑾峰彇鐢ㄦ埛璐︽埛
-     **/
-    public static String getUsername()
-    {
-        try
-        {
-            return getUser().getUserName();
-        }
-        catch (Exception e)
-        {
-            throw new ServiceException("鑾峰彇鐢ㄦ埛璐︽埛寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 鑾峰彇鐢ㄦ埛
-     **/
-    public static SysUser getUser()
-    {
-        try
-        {
-            return SpringUtils.getBean(IUserService.class).selectUserById(getUserId());
-        }
-        catch (Exception e)
-        {
-            throw new ServiceException("鑾峰彇鐢ㄦ埛淇℃伅寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SecurityUtils {
 
     /**
      * 鐢熸垚BCryptPasswordEncoder瀵嗙爜
@@ -74,8 +18,7 @@
      * @param password 瀵嗙爜
      * @return 鍔犲瘑瀛楃涓�
      */
-    public static String encryptPassword(String password)
-    {
+    public static String encryptPassword(String password) {
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.encode(password);
     }
@@ -83,12 +26,11 @@
     /**
      * 鍒ゆ柇瀵嗙爜鏄惁鐩稿悓
      *
-     * @param rawPassword 鐪熷疄瀵嗙爜
+     * @param rawPassword     鐪熷疄瀵嗙爜
      * @param encodedPassword 鍔犲瘑鍚庡瓧绗�
      * @return 缁撴灉
      */
-    public static boolean matchesPassword(String rawPassword, String encodedPassword)
-    {
+    public static boolean matchesPassword(String rawPassword, String encodedPassword) {
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         return passwordEncoder.matches(rawPassword, encodedPassword);
     }
@@ -99,8 +41,7 @@
      * @param userId 鐢ㄦ埛ID
      * @return 缁撴灉
      */
-    public static boolean isAdmin(Long userId)
-    {
+    public static boolean isAdmin(Long userId) {
         return userId != null && 1L == userId;
     }
 }

--
Gitblit v1.9.3