!6 同步develop分支

* sync -- 同步develop分支

ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

@@ -1,84 +1,17 @@
 package com.ruoyi.common.utils;
 
-import cn.hutool.http.HttpStatus;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.exception.ServiceException;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 /**
  * 安全服务工具类
  *
- * @author ruoyi
+ * @author Long Li
  */
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class SecurityUtils {
 
-    /**
-     * 用户ID
-     **/
-    public static Long getUserId() {
-        try {
-            return getLoginUser().getUserId();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取部门ID
-     **/
-    public static Long getDeptId() {
-        try {
-            return getLoginUser().getDeptId();
-        } catch (Exception e) {
-            throw new ServiceException("获取部门ID异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户昵称
-     **/
-    public static String getNickName() {
-        try {
-            return getLoginUser().getNickName();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户账户
-     **/
-    public static String getUsername() {
-        try {
-            return getLoginUser().getUsername();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取用户
-     **/
-    public static LoginUser getLoginUser() {
-        try {
-            return (LoginUser) getAuthentication().getPrincipal();
-        } catch (Exception e) {
-            throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED);
-        }
-    }
-
-    /**
-     * 获取Authentication
-     */
-    public static Authentication getAuthentication() {
-        return SecurityContextHolder.getContext().getAuthentication();
-    }
-
     /**
      * 生成BCryptPasswordEncoder密码
      *