diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ec02d75ab1419ec43b629deaa288a5eeac65d70..c6eb6f4fc3dda606131494b9bedfa720dc6e9b76 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,86 +4,84 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="47f98af6-3136-48e9-9e83-99bf7aba26b3" name="Changes" comment="数据库改为OpenTenbase">
-      <change afterPath="$PROJECT_DIR$/project/osc-back/sql/optenbaseTables.sql" afterDir="false" />
+    <list default="true" id="2fcb4764-ca43-4352-a4c0-a12a926a8043" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/osc-back/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/enums/RoleEnum.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/enums/RoleEnum.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/dto/QueryDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/dto/QueryDTO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/dto/UserAddDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/dto/UserAddDTO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/entity/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/model/entity/User.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/resources/application-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/resources/application-dev.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/resources/application-prod.yml" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/resources/application-prod.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/resources/mapper/UserMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/resources/mapper/UserMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/utils/StpInterfaceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/project/osc-back/src/main/java/com/example/utils/StpInterfaceImpl.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Enum" />
+      </list>
     </option>
+  </component>
+  <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
   <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
   &quot;associatedIndex&quot;: 0
 }</component>
-  <component name="ProjectId" id="2g8oRI5ApZ1k10VRy7oRdfGhgBc" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectId" id="2vdV5wf2SZ6mhjCjJqHBUb3OcFq" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RequestMappingsPanelOrder0": "0",
-    "RequestMappingsPanelOrder1": "1",
-    "RequestMappingsPanelWidth0": "75",
-    "RequestMappingsPanelWidth1": "75",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "database.data.extractors.current.export.id": "SQL Inserts",
-    "git-widget-placeholder": "develop",
-    "last_opened_file_path": "D:/git/shetuan-manager-system/project/osc-back",
-    "node.js.detected.package.eslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "nodejs_package_manager_path": "npm",
-    "project.structure.last.edited": "SDKs",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.2",
-    "settings.editor.selected.configurable": "reference.projectsettings.compiler.javacompiler",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
+    &quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
+    &quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
+    &quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/czc/IdeaProjects/management-system1/project/osc-back/src/main/java/com/example/service&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;项目&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;spring.configuration.checksum&quot;: &quot;0e0ec5752ef20d94dc6fbb13507f5e5e&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   },
-  "keyToStringList": {
-    "DatabaseDriversLRU": [
-      "postgresql",
-      "mysql"
+  &quot;keyToStringList&quot;: {
+    &quot;DatabaseDriversLRU&quot;: [
+      &quot;mysql&quot;
+    ],
+    &quot;com.intellij.ide.scratch.LRUPopupBuilder$1/SQL 方言&quot;: [
+      &quot;MySQL&quot;
     ]
   }
-}]]></component>
-  <component name="ReactorSettings">
-    <option name="notificationShown" value="true" />
+}</component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\czc\IdeaProjects\management-system1\project\osc-back\src\main\java\com\example\service" />
+      <recent name="C:\Users\czc\IdeaProjects\management-system1\project\osc-back\src\main\java\com\example\service\impl" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.example.utils" />
+    </key>
   </component>
   <component name="RunManager">
-    <configuration default="true" type="JetRunConfigurationType">
-      <module name="shetuan-manager-system" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
-      <module name="shetuan-manager-system" />
-      <option name="filePath" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="OSCApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <option name="FRAME_DEACTIVATION_UPDATE_POLICY" value="UpdateClassesAndResources" />
       <module name="OSC" />
@@ -93,34 +91,47 @@
       </method>
     </configuration>
   </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="47f98af6-3136-48e9-9e83-99bf7aba26b3" name="Changes" comment="" />
-      <created>1715088555808</created>
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="2fcb4764-ca43-4352-a4c0-a12a926a8043" name="更改" comment="" />
+      <created>1744474759084</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1715088555808</updated>
-      <workItem from="1715088557037" duration="31000" />
-      <workItem from="1731578668302" duration="1727000" />
-      <workItem from="1731821553898" duration="3523000" />
+      <updated>1744474759084</updated>
+      <workItem from="1744474760871" duration="1922000" />
+      <workItem from="1744650006270" duration="34000" />
+      <workItem from="1744650082037" duration="553000" />
+      <workItem from="1744787919154" duration="32000" />
+      <workItem from="1744793361112" duration="15000" />
+      <workItem from="1744874086243" duration="6691000" />
+      <workItem from="1745039467034" duration="4080000" />
     </task>
-    <task id="LOCAL-00001" summary="数据库改为OpenTenbase">
+    <task id="LOCAL-00001" summary="更新鉴权功能">
       <option name="closed" value="true" />
-      <created>1731504215194</created>
+      <created>1744476040693</created>
       <option name="number" value="00001" />
       <option name="presentableId" value="LOCAL-00001" />
       <option name="project" value="LOCAL" />
-      <updated>1731504215194</updated>
+      <updated>1744476040693</updated>
+    </task>
+    <task id="LOCAL-00002" summary="更新鉴权功能第二次修订版">
+      <option name="closed" value="true" />
+      <created>1744879315838</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1744879315838</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="数据库改为OpenTenbase" />
-    <option name="LAST_COMMIT_MESSAGE" value="数据库改为OpenTenbase" />
+    <MESSAGE value="更新鉴权功能" />
+    <MESSAGE value="更新鉴权功能第二次修订版" />
+    <option name="LAST_COMMIT_MESSAGE" value="更新鉴权功能第二次修订版" />
   </component>
 </project>
\ No newline at end of file
diff --git a/project/osc-back/pom.xml b/project/osc-back/pom.xml
index 8be434819400b8ee41966c8a1490e446524be486..db27476ca73d7d9d55538ddc7931bb00df9bbc21 100644
--- a/project/osc-back/pom.xml
+++ b/project/osc-back/pom.xml
@@ -155,6 +155,11 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.4.6</version>
         </dependency>
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>1.37.0</version>
+        </dependency>
 
     </dependencies>
 
diff --git a/project/osc-back/sql/create_user.sql b/project/osc-back/sql/create_user.sql
index 004f1cb773213d44579add2cc3401499678e5076..1fcc4089156cf963517f1028c10b5dd5e2b59f25 100644
--- a/project/osc-back/sql/create_user.sql
+++ b/project/osc-back/sql/create_user.sql
@@ -19,6 +19,6 @@ CREATE TABLE `new_user` (
                             `update_time` datetime NOT NULL COMMENT '更新时间',
                             `create_user` int NOT NULL COMMENT '创建者',
                             `update_user` int NOT NULL COMMENT '更新者',
-                            `role` tinyint NOT NULL COMMENT '角色（0普通成员，1管理员，2超管）',
+                            `role` varchar(10)default 'ROLE_MEMBER'NOT NULL COMMENT '角色（0普通成员，1管理员，2超管）',
                             PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
\ No newline at end of file
diff --git a/project/osc-back/sql/optenbaseTables.sql b/project/osc-back/sql/optenbaseTables.sql
index 00421be77f05d574fe41031efbbc92a6106001b0..0ae47bb58a46f09de6448147e2e03da444ffb80e 100644
--- a/project/osc-back/sql/optenbaseTables.sql
+++ b/project/osc-back/sql/optenbaseTables.sql
@@ -59,7 +59,7 @@ create table if not exists public."user"
     update_time  timestamp              not null,
     create_user  integer                not null,
     update_user  integer                not null,
-    role         tinyint     default 0 not null,
+    role         varchar(10)     default 'ROLE_MEMBER' not null,
     gender       tinyint     default 1 not null,
     constraint user_code_unique
         unique (id, code)
diff --git a/project/osc-back/sql/user.sql b/project/osc-back/sql/user.sql
index 99aeb223bdb8798950a6583226fcdadeac92c464..a709124cf90e8c43be3bf000cb37f8824aab2828 100644
--- a/project/osc-back/sql/user.sql
+++ b/project/osc-back/sql/user.sql
@@ -21,6 +21,6 @@ create table user
     update_time  datetime                                                                            not null comment '更新时间',
     create_user  int                                                                                 not null comment '创建者',
     update_user  int                                                                                 not null comment '更新者',
-    role         tinyint                                                                             not null comment '角色（0普通成员，1管理员，2超管）',
+    role         varchar(10)  DEFAULT 'ROLE_ADMIN'                                                                      not null comment '角色（0普通成员，1管理员，2超管）',
     gender       tinyint      default 1                                                              not null comment '性别(1-男 0-女)'
 );
diff --git a/project/osc-back/src/main/java/com/example/controller/LoginController.java b/project/osc-back/src/main/java/com/example/controller/LoginController.java
index 230f88068fb8a8aaca377736090e6ac4335b2745..a592e57c77853857846df4c843ebb1a3979fdf62 100644
--- a/project/osc-back/src/main/java/com/example/controller/LoginController.java
+++ b/project/osc-back/src/main/java/com/example/controller/LoginController.java
@@ -16,6 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -44,8 +45,8 @@ public class LoginController {
      */
     @PostMapping("/login")
     @Operation(description = "用户登录")  // 接口信息描述
-    public ResponseVO<User> login(@RequestBody @Validated UserLoginDTO userLoginDTO, HttpServletRequest request) {
-        User user = loginService.userLogin(userLoginDTO, request);
+    public ResponseVO<User> login(@RequestBody @Validated UserLoginDTO userLoginDTO, HttpServletResponse response) {
+        User user = loginService.userLogin(userLoginDTO,response);
         return ResultUtils.success(user);
     }
 
@@ -55,7 +56,7 @@ public class LoginController {
     @PostMapping("/logout")
     @Operation(description = "用户退出")  // 接口信息描述
     public ResponseVO<String> logout(HttpServletRequest request) {
-        loginService.userLogout(request);
+        loginService.userLogout();
         return ResultUtils.success("登出成功");
     }
 
diff --git a/project/osc-back/src/main/java/com/example/enums/RoleEnum.java b/project/osc-back/src/main/java/com/example/enums/RoleEnum.java
new file mode 100644
index 0000000000000000000000000000000000000000..f72f1284fd62cab97c0c5d5438106319991ce3e9
--- /dev/null
+++ b/project/osc-back/src/main/java/com/example/enums/RoleEnum.java
@@ -0,0 +1,42 @@
+package com.example.enums;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum RoleEnum {
+    ROLE_MEMBER(0,"ROLE_MEMBER"),
+    ROLE_ADMIN(1,"ROLE_ADMIN"),
+    ROLE_SUPER_ADMIN(2,"ROLE_SUPER_ADMIN");
+
+    private final Integer num;
+    @Getter
+    private final String msg;
+
+    private static final Map<Integer, RoleEnum> NAME_MAP = new HashMap<>();
+
+    static {
+        for (RoleEnum role : RoleEnum.values()) {
+
+            NAME_MAP.put(role.num, role);
+        }
+    }
+
+    RoleEnum(Integer i,String s){
+        this.msg = s;
+        this.num = i;
+
+    }
+    public Integer getRoleNum(){
+        return num;
+    }
+
+    public static String getMsgByNum(Integer num){
+
+        RoleEnum roleEnum = NAME_MAP.get(num);
+        return roleEnum.msg;
+
+    }
+
+}
diff --git a/project/osc-back/src/main/java/com/example/exception/GlobalExceptionHandler.java b/project/osc-back/src/main/java/com/example/exception/GlobalExceptionHandler.java
index ecb031461986fa9298ac5bbf7162c644b6f48185..b194408a27b7b2c8e9572432b3f11853253ab48b 100644
--- a/project/osc-back/src/main/java/com/example/exception/GlobalExceptionHandler.java
+++ b/project/osc-back/src/main/java/com/example/exception/GlobalExceptionHandler.java
@@ -1,9 +1,11 @@
 package com.example.exception;
 
+import cn.dev33.satoken.exception.SaTokenException;
 import com.example.common.ResultUtils;
 import com.example.enums.ErrorCodeEnum;
 import com.example.model.vo.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -50,4 +52,16 @@ public class GlobalExceptionHandler {
         log.error("MaxUploadSizeExceededException: ", e);
         return ResultUtils.error(ErrorCodeEnum.SYSTEM_ERROR, e.getMessage(), "文件太大");
     }
+
+    /**
+     *
+     * sa-token框架鉴权失败异常处理
+     *
+     */
+    @ExceptionHandler(SaTokenException.class)
+    public ResponseVO<Object> SaTokenExceptionHandler(SaTokenException e){
+        log.error("SaTokenException",e);
+        return ResultUtils.error(HttpStatus.FORBIDDEN.value(), e.getMessage(), "权限不足");
+
+    }
 }
diff --git a/project/osc-back/src/main/java/com/example/service/LoginService.java b/project/osc-back/src/main/java/com/example/service/LoginService.java
index 8ba867cce4dbf0e147b685db38f23fb1186feb60..943d28f575eb41aeb6db86d2e29b5bcb41f12a9d 100644
--- a/project/osc-back/src/main/java/com/example/service/LoginService.java
+++ b/project/osc-back/src/main/java/com/example/service/LoginService.java
@@ -6,6 +6,7 @@ import com.example.model.dto.UserLoginDTO;
 import com.example.model.dto.VerifyCodeDTO;
 import com.example.model.entity.User;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 用户登录服务类
@@ -18,12 +19,12 @@ public interface LoginService extends IService<User> {
      *
      * @return 脱敏后的用户信息
      */
-    User userLogin(UserLoginDTO userLoginDTO, HttpServletRequest request);
+    User userLogin(UserLoginDTO userLoginDTO, HttpServletResponse response);
 
     /**
      * 用户登出
      */
-    void userLogout(HttpServletRequest request);
+    void userLogout();
 
     /**
      * 获取验证码
diff --git a/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java b/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java
index 3ab17e17370527f57a89831a9008eebc35d09dd3..1423e6f451a3fa5f8a6ad610a0f9038d724df8d0 100644
--- a/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java
+++ b/project/osc-back/src/main/java/com/example/service/impl/AnnouncementServiceImpl.java
@@ -1,14 +1,13 @@
 package com.example.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.example.common.BaseContext;
 import com.example.enums.ErrorCodeEnum;
 import com.example.exception.BusinessException;
 import com.example.mapper.AnnouncementMapper;
 import com.example.model.dto.AnnouncementAddDTO;
 import com.example.model.entity.Announcement;
-import com.example.model.entity.User;
 import com.example.service.AnnouncementService;
 import com.example.service.UserService;
 import com.github.pagehelper.PageHelper;
@@ -19,8 +18,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 
-import static com.example.constant.UserConstant.DEFAULT_USER;
-
 /**
  * 针对表【announcement】的数据库操作Service实现
  *
@@ -42,10 +39,10 @@ public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementMapper, Ann
     @Override
     public Long addAnnouncement(AnnouncementAddDTO announcementAddDTO) {
         // 获取当前线程用户
-        Long currentId = BaseContext.getCurrentId();
-        User currentUser = userService.getById(currentId);
+//        Long currentId = BaseContext.getCurrentId();
+//        User currentUser = userService.getById(currentId);
         // 鉴权
-        if (currentUser.getRole() <= DEFAULT_USER) {
+        if (StpUtil.hasRole("ROLE_MEMBER")) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
         }
         Announcement announcement = new Announcement();
@@ -64,10 +61,10 @@ public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementMapper, Ann
     @Override
     public void deleteAnnouncement(Long id) {
         // 获取当前登录用户
-        Long currentId = BaseContext.getCurrentId();
-        User user = userService.getById(currentId);
+//        Long currentId = BaseContext.getCurrentId();
+//        User user = userService.getById(currentId);
         // 鉴权
-        if (user.getRole() <= DEFAULT_USER) {
+        if (StpUtil.hasRole("ROLE_MEMBER")) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "用户权限不足");
         }
         // 删除公告
@@ -82,11 +79,11 @@ public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementMapper, Ann
     @Override
     public void updateAnnouncement(Announcement announcement) {
         // 获取当前登录用户
-        Long currentUserId = BaseContext.getCurrentId();
-        User currentUser = userService.getById(currentUserId);
+//        Long currentUserId = BaseContext.getCurrentId();
+//        User currentUser = userService.getById(currentUserId);
 
         // 鉴权
-        if (currentUser.getRole() <= DEFAULT_USER) {
+        if (StpUtil.hasRole("ROLE_MEMBER")) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
         }
         // 权限足够，可以修改
diff --git a/project/osc-back/src/main/java/com/example/service/impl/ExcelServiceImpl.java b/project/osc-back/src/main/java/com/example/service/impl/ExcelServiceImpl.java
index 6ae812ca37f2e442ca0b0b010ce8fddf7e9d3500..fca573a1d66858eacd36d593de355197a413c6ff 100644
--- a/project/osc-back/src/main/java/com/example/service/impl/ExcelServiceImpl.java
+++ b/project/osc-back/src/main/java/com/example/service/impl/ExcelServiceImpl.java
@@ -1,9 +1,9 @@
 package com.example.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.example.common.BaseContext;
 import com.example.enums.ErrorCodeEnum;
 import com.example.exception.BusinessException;
 import com.example.mapper.UserMapper;
@@ -24,8 +24,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import static com.example.constant.UserConstant.DEFAULT_USER;
-
 
 /**
  * Excel服务实现类
@@ -40,9 +38,9 @@ public class ExcelServiceImpl extends ServiceImpl<UserMapper, User> implements E
     UserService userService;
     public void excelInput(@NotNull List<ExcelInput> cachedDataList) {
 // 鉴权
-        Long currentId = BaseContext.getCurrentId();
-        User currentUser = userService.getById(currentId);
-        if (currentUser.getRole() <= DEFAULT_USER) {
+//        Long currentId = BaseContext.getCurrentId();
+//        User currentUser = userService.getById(currentId);
+        if (StpUtil.hasRole("ROLE_ADMIN")) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
         }
         List<User> users = new ArrayList<>();
@@ -85,9 +83,9 @@ public class ExcelServiceImpl extends ServiceImpl<UserMapper, User> implements E
     @Override
     public void excelOutput(HttpServletResponse response) {
         // 鉴权
-        Long currentId = BaseContext.getCurrentId();
-        User currentUser = userService.getById(currentId);
-        if(currentUser.getRole()<=DEFAULT_USER){
+//        Long currentId = BaseContext.getCurrentId();
+//        User currentUser = userService.getById(currentId);
+        if(StpUtil.hasRole("ROLE_MEMBER")){
             throw new BusinessException(ErrorCodeEnum.NO_AUTH,"权限不足");
         }
         try {
@@ -101,7 +99,7 @@ public class ExcelServiceImpl extends ServiceImpl<UserMapper, User> implements E
                     .excludeColumnFiledNames(excludeColumnFiledNames).sheet("用户信息").doWrite(() -> {
                         List<User> userList = this.list();
                         // 如果用户权限低，对查询到的用户进行脱敏
-                        if (currentUser.getRole() == DEFAULT_USER) {
+                        if (StpUtil.hasRole("ROLE_MEMBER")) {
                             userList = userList.stream().map(userService::getSafetyUser).toList();
                         }
                         return userList;
diff --git a/project/osc-back/src/main/java/com/example/service/impl/FileServiceImpl.java b/project/osc-back/src/main/java/com/example/service/impl/FileServiceImpl.java
index f840b57adcfd709b29cd089ba9d7b4bdac33c7ad..e4ea01ac58dfe43aa8790b8896a23f17309bb363 100644
--- a/project/osc-back/src/main/java/com/example/service/impl/FileServiceImpl.java
+++ b/project/osc-back/src/main/java/com/example/service/impl/FileServiceImpl.java
@@ -13,8 +13,6 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.InputStream;
-
 /**
  * 文件服务实现类
  *
diff --git a/project/osc-back/src/main/java/com/example/service/impl/LoginServiceImpl.java b/project/osc-back/src/main/java/com/example/service/impl/LoginServiceImpl.java
index 8ea871b07f8a3752ff5c8123468ba60d74bd24d2..32d2b089e3920b9bb17c3cdf8b1ae825b9eedb3f 100644
--- a/project/osc-back/src/main/java/com/example/service/impl/LoginServiceImpl.java
+++ b/project/osc-back/src/main/java/com/example/service/impl/LoginServiceImpl.java
@@ -1,5 +1,6 @@
 package com.example.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.constant.UserConstant;
@@ -16,10 +17,10 @@ import com.example.utils.RedisCache;
 import com.wf.captcha.ArithmeticCaptcha;
 import com.wf.captcha.base.Captcha;
 import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
-import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.UUID;
@@ -52,7 +53,7 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
      * @return 脱敏后的用户信息
      */
     @Override
-    public User userLogin(UserLoginDTO userLoginDTO, HttpServletRequest request) {
+    public User userLogin(UserLoginDTO userLoginDTO, HttpServletResponse response) {
         // 校验验证码
         this.verifyVerifyCode(userLoginDTO);
         // 对密码加密
@@ -79,7 +80,16 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
         //用户脱敏
 //        User safetyUser = userService.getSafetyUser(user);
         // 设置当前登录用户
-        request.getSession().setAttribute("USER_LOGIN_STATE", user.getId());
+//        request.getSession().setAttribute("USER_LOGIN_STATE", user.getId());
+
+        //调用.login方法隐式的创建一个token并存入用户id
+        StpUtil.login(user.getId());
+        //获取到token
+        String token = StpUtil.getTokenValue();
+        //将token写入cookie并将cookie放进响应体中
+        Cookie cookie = new Cookie("token", token);
+        response.addCookie(cookie);
+
 
         return user;
     }
@@ -88,9 +98,12 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
      * 用户登出
      */
     @Override
-    public void userLogout(HttpServletRequest request) {
-        // 注销session
-        request.getSession().invalidate();
+    public void userLogout() {
+//        // 注销session
+//        request.getSession().invalidate();
+        //调用登出api删除token信息实现登出效果
+        StpUtil.logout();
+
     }
 
     /**
diff --git a/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java b/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java
index 932d0c4fc45c5d2ac1ff0ea4a20e26799994b6c2..de48256eac22fc6704a508e9980dcf9229d11a6c 100644
--- a/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java
+++ b/project/osc-back/src/main/java/com/example/service/impl/UserServiceImpl.java
@@ -1,11 +1,13 @@
 package com.example.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.common.BaseContext;
 import com.example.config.MinIOProperty;
 import com.example.enums.ErrorCodeEnum;
+import com.example.enums.RoleEnum;
 import com.example.exception.BusinessException;
 import com.example.mapper.UserMapper;
 import com.example.model.dto.QueryDTO;
@@ -27,8 +29,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static com.example.constant.UserConstant.*;
-
 /**
  * 用户服务实现类
  *
@@ -53,12 +53,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public long addUser(@NotNull UserAddDTO userAddDTO) {
         // 获取当前线程用户
-        Long currentId = BaseContext.getCurrentId();
-        User currentUser = this.getById(currentId);
+//        Long currentId = BaseContext.getCurrentId();
+//        User currentUser = this.getById(currentId);
         // 权限需要高于被创建用户的权限
-        if (currentUser.getRole() <= userAddDTO.getRole()) {
-            throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
-        }
+//        if (currentUser.getRole() <= userAddDTO.getRole()) {
+//            throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
+//        }
+        StpUtil.checkRoleOr("ROLE_ADMIN","ROLE_SUPER_ADMIN");
+
+
+
         // 学号不可重复
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("code", userAddDTO.getCode());
@@ -143,8 +147,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         // 获取当前登录用户
         Long currentUserId = BaseContext.getCurrentId();
         User currentUser = this.getById(currentUserId);
-        // 平级用户不能修改平级用户信息
-        if (currentUser.getRole() <= user.getRole() && currentUser.getRole() != SUPER_ADMIN_USER && !Objects.equals(currentUser.getId(), user.getId())) {
+//         平级用户不能修改平级用户信息
+//        if (currentUser.getRole() <= user.getRole() && currentUser.getRole() != SUPER_ADMIN_USER && !Objects.equals(currentUser.getId(), user.getId())) {
+//            throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
+////        }
+        if (StpUtil.hasRole(RoleEnum.getMsgByNum(user.getRole())) && !StpUtil.hasRole("ROLE_SUPER_ADMIN") && !Objects.equals(currentUser.getId(), user.getId())) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
         }
         // 学号不能为空
@@ -166,7 +173,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         // 如果是修改自己的信息
         if (currentUserId.equals(user.getId())) {
             // 超级管理员才能修改自己的 role status duty department
-            if (currentUser.getRole() != SUPER_ADMIN_USER &&
+            if (!StpUtil.hasRole("ROLE_SUPER_ADMIN") &&
                     (!currentUser.getRole().equals(user.getRole()) ||
                             !currentUser.getStatus().equals(user.getStatus()) ||
                             !currentUser.getDuty().equals(user.getDuty()) ||
@@ -174,9 +181,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 throw new BusinessException(ErrorCodeEnum.NO_AUTH, "只有超级管理员才可以修改此信息");
             }
         } else {  // 如果不是修改自己的信息
-            // 超管才能修改他人的 role status duty department ，除非修改者的权限高于被修改者，
+            // 超管才能修改他人的 role status duty department ，除非修改者的权限高于被修改者，Integer.parseInt(this.getById(user.getId()).getRole())))
             // 并且修改者不能将被修改者的权限改至高于等于修改者的权限
-            if (currentUser.getRole() != SUPER_ADMIN_USER &&
+            if (!StpUtil.hasRole("ROLE_SUPER_ADMIN") &&
                     currentUser.getRole() <=
                             (Math.max(user.getRole(), this.getById(user.getId()).getRole()))) {
                 throw new BusinessException(ErrorCodeEnum.NO_AUTH, "权限不足");
@@ -202,6 +209,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         Long currentId = BaseContext.getCurrentId();
         User currentUser = this.getById(currentId);
         // 只能删除权限低于自己的用户
+//        if (Integer.parseInt(currentUser.getRole()) <= Integer.parseInt(user.getRole())) {
+//            throw new BusinessException(ErrorCodeEnum.NO_AUTH, "用户权限不足");
+//        }
         if (currentUser.getRole() <= user.getRole()) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "用户权限不足");
         }
@@ -227,7 +237,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         Long currentId = BaseContext.getCurrentId();
         User currentUser = this.getById(currentId);
 
-        if (currentUser.getRole() <= originUser.getRole() && currentUser.getRole() != SUPER_ADMIN_USER && currentUser.getRole() != ADMIN_USER) {
+        if (currentUser.getRole() <= originUser.getRole() && !StpUtil.hasRole("ROLE_SUPER_ADMIN") && !StpUtil.hasRole("ROLE_ADMIN")) {
             safetyUser.setAvator(originUser.getAvator());
             safetyUser.setName(originUser.getName());
             safetyUser.setGender(originUser.getGender());
@@ -297,7 +307,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public PageInfo<User> countAudit(QueryDTO queryDTO, Integer pageNumber, Integer pageSize) {
         // 如果用户权限低 报错
         Long currentId = BaseContext.getCurrentId();
-        if (this.getById(currentId).getRole() == DEFAULT_USER) {
+        if (StpUtil.hasRole("ROLE_MEMBER")) {
             throw new BusinessException(ErrorCodeEnum.NO_AUTH, "普通用户无法查询待通过用户");
         }
         // 开始分页查询
diff --git a/project/osc-back/src/main/java/com/example/utils/StpInterfaceImpl.java b/project/osc-back/src/main/java/com/example/utils/StpInterfaceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..fcdd3c582405361010a27323efd176a29be180a1
--- /dev/null
+++ b/project/osc-back/src/main/java/com/example/utils/StpInterfaceImpl.java
@@ -0,0 +1,40 @@
+package com.example.utils;
+
+import cn.dev33.satoken.stp.StpInterface;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.common.BaseContext;
+import com.example.mapper.UserMapper;
+import com.example.model.entity.User;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+public class StpInterfaceImpl extends ServiceImpl<UserMapper, User> implements StpInterface {
+    @Override
+    public List<String> getPermissionList(Object o, String s) {
+        return null;
+    }
+
+    @Override
+    public List<String> getRoleList(Object userid,String type) {
+
+//        Long currentId = BaseContext.getCurrentId();
+        User currentUser = this.getById((Serializable) userid);
+        ArrayList<String> list = new ArrayList<>();
+        Integer role = currentUser.getRole();
+        switch (role){
+            case 0:
+                list.add("ROLE_MEMBER");
+                break;
+            case 1:
+                list.add("ROLE_ADMIN");
+                break;
+            case 2:
+                list.add("ROLE_SUPER_ADMIN");
+                break;
+        }
+        return list;
+
+    }
+}
diff --git a/project/osc-back/src/main/resources/application-dev.yml b/project/osc-back/src/main/resources/application-dev.yml
index cfda83ef392befc724428df015fba86c3038f07d..282feb5d5b29af964e25cfb5d92ed30f08aaebd7 100644
--- a/project/osc-back/src/main/resources/application-dev.yml
+++ b/project/osc-back/src/main/resources/application-dev.yml
@@ -75,3 +75,18 @@ knife4j:
     enable-footer-custom: true     # 开启自定义Footer
     footer-custom-content: 版权所有   # 自定义Footer内容
   production: false # 是否为生产环境（生产环境会屏蔽接口文档）
+sa-token:
+  # token 名称（同时也是 cookie 名称）
+  token-name: token
+  # token 有效期（单位：秒） 默认30天，-1 代表永久有效
+  timeout: 2592000
+  # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+  active-timeout: -1
+  # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
+  is-share: true
+  # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+  token-style: uuid
+  # 是否输出操作日志
+  is-log: true
diff --git a/project/osc-back/src/main/resources/application-prod.yml b/project/osc-back/src/main/resources/application-prod.yml
index 7e805ec401120184d282636d9d50c0efaea38c51..35a0f517adf8fd33d1edc14a2a223462a6cb52ab 100644
--- a/project/osc-back/src/main/resources/application-prod.yml
+++ b/project/osc-back/src/main/resources/application-prod.yml
@@ -76,4 +76,19 @@ knife4j:
     enable-footer: false    # 关闭原始Footer
     enable-footer-custom: true     # 开启自定义Footer
     footer-custom-content: 版权所有   # 自定义Footer内容
-  production: true # 是否为生产环境（生产环境会屏蔽接口文档）
\ No newline at end of file
+  production: true # 是否为生产环境（生产环境会屏蔽接口文档）
+sa-token:
+  # token 名称（同时也是 cookie 名称）
+  token-name: token
+  # token 有效期（单位：秒） 默认30天，-1 代表永久有效
+  timeout: 2592000
+  # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+  active-timeout: -1
+  # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
+  is-share: true
+  # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+  token-style: uuid
+  # 是否输出操作日志
+  is-log: true