From 2a1e2ebb3ce800fc6aa8067db0cc3b0ab9253604 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 24 五月 2024 10:32:36 +0800
Subject: [PATCH] feat: 代码提交

---
 ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java |  113 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
index 34d153e..47f0533 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthUtil.java
@@ -7,11 +7,10 @@
 
 /**
  * Token 权限验证工具类
- * 
+ *
  * @author ruoyi
  */
-public class AuthUtil
-{
+public class AuthUtil {
     /**
      * 底层的 AuthLogic 对象
      */
@@ -20,177 +19,181 @@
     /**
      * 会话注销
      */
-    public static void logout()
-    {
+    public static void logout() {
         authLogic.logout();
     }
 
     /**
      * 会话注销,根据指定Token
-     * 
+     *
      * @param token 指定token
      */
-    public static void logoutByToken(String token)
-    {
+    public static void logoutByToken(String token) {
         authLogic.logoutByToken(token);
     }
+
     /**
      * 家长端会话注销,根据指定Token
      *
      * @param token 指定token
      */
-    public static void logoutByToken1(String token)
-    {
+    public static void logoutByToken1(String token) {
         authLogic.logoutByToken1(token);
     }
 
     /**
      * 检验当前会话是否已经登录,如未登录,则抛出异常
      */
-    public static void checkLogin()
-    {
+    public static void checkLogin() {
         authLogic.checkLogin();
     }
 
     /**
      * 获取当前登录用户信息
-     * 
+     *
      * @param token 指定token
      * @return 用户信息
      */
-    public static LoginUser getLoginUser(String token)
-    {
+    public static LoginUser getLoginUser(String token) {
         return authLogic.getLoginUser(token);
     }
+
     /**
      * 获取当前登录用户信息
      *
      * @param token 指定token
      * @return 用户信息
      */
-    public static LoginUserParent getLoginUser1(String token)
-    {
+    public static LoginUserParent getLoginUser1(String token) {
         return authLogic.getLoginUser1(token);
     }
 
     /**
-     * 验证当前用户有效期
-     * 
-     * @param loginUser 用户信息
+     * 获取当前登录用户信息-学习端
+     *
+     * @param token 指定token
+     * @return 用户信息
      */
-    public static void verifyLoginUserExpire(LoginUser loginUser)
-    {
-        authLogic.verifyLoginUserExpire(loginUser);
+    public static LoginUserParent getLoginUserStudy(String token) {
+        return authLogic.getLoginUserStudy(token);
     }
+
     /**
      * 验证当前用户有效期
      *
      * @param loginUser 用户信息
      */
-    public static void verifyLoginUserExpire1(LoginUserParent loginUser)
-    {
+    public static void verifyLoginUserExpire(LoginUser loginUser) {
+        authLogic.verifyLoginUserExpire(loginUser);
+    }
+
+    /**
+     * 验证当前用户有效期
+     *
+     * @param loginUser 用户信息
+     */
+    public static void verifyLoginUserExpire1(LoginUserParent loginUser) {
         authLogic.verifyLoginUserExpire1(loginUser);
     }
 
     /**
+     * 验证当前用户有效期 -学习端
+     *
+     * @param loginUser 用户信息
+     */
+    public static void verifyLoginUserStudyExpire(LoginUserParent loginUser) {
+        authLogic.verifyLoginUserStudyExpire(loginUser);
+    }
+
+    /**
      * 当前账号是否含有指定角色标识, 返回true或false
-     * 
+     *
      * @param role 角色标识
      * @return 是否含有指定角色标识
      */
-    public static boolean hasRole(String role)
-    {
+    public static boolean hasRole(String role) {
         return authLogic.hasRole(role);
     }
 
     /**
      * 当前账号是否含有指定角色标识, 如果验证未通过,则抛出异常: NotRoleException
-     * 
+     *
      * @param role 角色标识
      */
-    public static void checkRole(String role)
-    {
+    public static void checkRole(String role) {
         authLogic.checkRole(role);
     }
 
     /**
      * 根据注解传入参数鉴权, 如果验证未通过,则抛出异常: NotRoleException
-     * 
+     *
      * @param requiresRoles 角色权限注解
      */
-    public static void checkRole(RequiresRoles requiresRoles)
-    {
+    public static void checkRole(RequiresRoles requiresRoles) {
         authLogic.checkRole(requiresRoles);
     }
 
     /**
      * 当前账号是否含有指定角色标识 [指定多个,必须全部验证通过]
-     * 
+     *
      * @param roles 角色标识数组
      */
-    public static void checkRoleAnd(String... roles)
-    {
+    public static void checkRoleAnd(String... roles) {
         authLogic.checkRoleAnd(roles);
     }
 
     /**
      * 当前账号是否含有指定角色标识 [指定多个,只要其一验证通过即可]
-     * 
+     *
      * @param roles 角色标识数组
      */
-    public static void checkRoleOr(String... roles)
-    {
+    public static void checkRoleOr(String... roles) {
         authLogic.checkRoleOr(roles);
     }
 
     /**
      * 当前账号是否含有指定权限, 返回true或false
-     * 
+     *
      * @param permission 权限码
      * @return 是否含有指定权限
      */
-    public static boolean hasPermi(String permission)
-    {
+    public static boolean hasPermi(String permission) {
         return authLogic.hasPermi(permission);
     }
 
     /**
      * 当前账号是否含有指定权限, 如果验证未通过,则抛出异常: NotPermissionException
-     * 
+     *
      * @param permission 权限码
      */
-    public static void checkPermi(String permission)
-    {
+    public static void checkPermi(String permission) {
         authLogic.checkPermi(permission);
     }
 
     /**
      * 根据注解传入参数鉴权, 如果验证未通过,则抛出异常: NotPermissionException
-     * 
+     *
      * @param requiresPermissions 权限注解
      */
-    public static void checkPermi(RequiresPermissions requiresPermissions)
-    {
+    public static void checkPermi(RequiresPermissions requiresPermissions) {
         authLogic.checkPermi(requiresPermissions);
     }
 
     /**
      * 当前账号是否含有指定权限 [指定多个,必须全部验证通过]
-     * 
+     *
      * @param permissions 权限码数组
      */
-    public static void checkPermiAnd(String... permissions)
-    {
+    public static void checkPermiAnd(String... permissions) {
         authLogic.checkPermiAnd(permissions);
     }
 
     /**
      * 当前账号是否含有指定权限 [指定多个,只要其一验证通过即可]
-     * 
+     *
      * @param permissions 权限码数组
      */
-    public static void checkPermiOr(String... permissions)
-    {
+    public static void checkPermiOr(String... permissions) {
         authLogic.checkPermiOr(permissions);
     }
 }

--
Gitblit v1.7.1