From 243d960e1bc266a3ec0f15469ce76a7cb2ee05ac Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Mon, 25 Mar 2024 22:49:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: bunny <1319900154@qq.com>
---
 .idea/compiler.xml                            |   1 +
 .idea/misc.xml                                |   2 +-
 .../spzx/manger/MangerApplication.java        |  44 ++++----
 .../manger/controller/IndexController.java    | 104 +++++++++---------
 .../manger/controller/SysMenuController.java  |   2 +-
 .../module/SysMenuServiceImplModule.java      |   3 +-
 6 files changed, 77 insertions(+), 79 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ed9663d..e67f790 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9dc782b..0abcc97 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,5 +8,5 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/MangerApplication.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/MangerApplication.java
index 8ae567f..dfd7c12 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/MangerApplication.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/MangerApplication.java
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
+package com.atguigu.spzx.manger;
 
-    <contextName>logback</contextName>
+import lombok.extern.slf4j.Slf4j;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-    <!-- 日志的输出目录 -->
-    <property name="log.path" value="D://logs//spzx-manager//logs" />
-
-    <!--控制台日志格式：彩色日志-->
-    <!-- magenta:洋红 -->
-    <!-- boldMagenta:粗红-->
-    <!-- cyan:青色 -->
-    <!-- white:白色 -->
-    <!-- magenta:洋红 -->
-    <property name="CONSOLE_LOG_PATTERN" value="%yellow(%date{yyyy-MM-dd HH:mm:ss}) %highlight([%-5level]) %green(%logger) %msg%n"/>
-
-    <!--文件日志格式-->
-    <property name="FILE_LOG_PATTERN" value="%date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n" />
-
-    <!--编码-->
-    <property name="ENCODING" value="UTF-8" />
-
-    <!-- 控制台日志 -->
-    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-        <!-- 临界值过滤器 -
\ No newline at end of file
+@SpringBootApplication
+@EnableTransactionManagement // 开启注解方式的事务管理
+@EnableCaching// 开启缓存注解
+@EnableScheduling
+@ComponentScan("com.atguigu")
+@MapperScan("com.atguigu.spzx.manger.mapper")
+@Slf4j
+public class MangerApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(MangerApplication.class, args);
+    }
+}
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
index f1d0e61..e0aa5ab 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java
@@ -1,52 +1,52 @@
-package com.atguigu.spzx.manger.controller;
-
-import com.atguigu.context.BaseContext;
-import com.atguigu.spzx.manger.service.SysMenuService;
-import com.atguigu.spzx.manger.service.SysUserService;
-import com.atguigu.spzx.manger.service.ValidateCodeService;
-import com.atguigu.spzx.model.dto.system.LoginDto;
-import com.atguigu.spzx.model.entity.system.SysUser;
-import com.atguigu.spzx.model.vo.result.Result;
-import com.atguigu.spzx.model.vo.system.LoginVo;
-import com.atguigu.spzx.model.vo.system.SysMenuVo;
-import com.atguigu.spzx.model.vo.system.ValidateCodeVo;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-@Tag(name = "用户相关接口")
-@RestController
-@RequestMapping("/admin/system/index")
-public class IndexController {
-    @Autowired
-    private SysUserService sysUserService;
-    @Autowired
-    private SysMenuService sysMenuService;
-    @Autowired
-    private ValidateCodeService validateCodeService;
-
-    @Operation(summary = "生成验证码", description = "生成验证码信息")
-    @GetMapping("generateValidateCode")
-    public Result<ValidateCodeVo> generateValidateCode() {
-        ValidateCodeVo vo = validateCodeService.generateValidateCode();
-        return Result.success(vo);
-    }
-
-    @Operation(summary = "登录请求", description = "登录请求实现")
-    @PostMapping("login")
-    public Result<LoginVo> login(@RequestBody LoginDto loginDto) {
-        LoginVo vo = sysUserService.login(loginDto);
-        return Result.success(vo);
-    }
-
-    @Operation(summary = "获取登录用户信息", description = "获取当前登录用户信息")
-    @GetMapping("getUserInfo")
-    public Result<SysUser> getUserInfo() {
-        SysUser sysUser = BaseContext.getSysUser();
-        return Result.success(sysUser);
-    }
-
-    @Operation(summary = "用户退出", description = "用户退出接口")
\ No newline at end of file
+package com.atguigu.spzx.manger.controller;
+
+import com.atguigu.context.BaseContext;
+import com.atguigu.spzx.manger.service.SysUserService;
+import com.atguigu.spzx.manger.service.ValidateCodeService;
+import com.atguigu.spzx.model.dto.system.LoginDto;
+import com.atguigu.spzx.model.entity.system.SysUser;
+import com.atguigu.spzx.model.vo.result.Result;
+import com.atguigu.spzx.model.vo.system.LoginVo;
+import com.atguigu.spzx.model.vo.system.ValidateCodeVo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Tag(name = "用户相关接口")
+@RestController
+@RequestMapping("/admin/system/index")
+public class IndexController {
+    @Autowired
+    private SysUserService sysUserService;
+    @Autowired
+    private ValidateCodeService validateCodeService;
+
+    @Operation(summary = "生成验证码", description = "生成验证码信息")
+    @GetMapping("generateValidateCode")
+    public Result<ValidateCodeVo> generateValidateCode() {
+        ValidateCodeVo vo = validateCodeService.generateValidateCode();
+        return Result.success(vo);
+    }
+
+    @Operation(summary = "登录请求", description = "登录请求实现")
+    @PostMapping("login")
+    public Result<LoginVo> login(@RequestBody LoginDto loginDto) {
+        LoginVo vo = sysUserService.login(loginDto);
+        return Result.success(vo);
+    }
+
+    @Operation(summary = "获取登录用户信息", description = "获取当前登录用户信息")
+    @GetMapping("getUserInfo")
+    public Result<SysUser> getUserInfo() {
+        SysUser sysUser = BaseContext.getSysUser();
+        return Result.success(sysUser);
+    }
+
+    @Operation(summary = "用户退出", description = "用户退出接口")
+    @GetMapping("logout")
+    public Result<String> logout(@RequestHeader(name = "token") String token) {
+        sysUserService.logout(token);
+        return Result.success();
+    }
+}
\ No newline at end of file
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java
index d91f727..0363d12 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysMenuController.java
@@ -42,7 +42,7 @@ public class SysMenuController {
 
     @Operation(summary = "删除菜单", description = "删除菜单")
     @PutMapping("removeById/{id}")
-    public Result removeById(@PathVariable Long id) {
+    public Result<Long> removeById(@PathVariable Long id) {
         sysMenuService.removeById(id);
         return Result.success();
     }
diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/module/SysMenuServiceImplModule.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/module/SysMenuServiceImplModule.java
index d30dd19..9b52845 100644
--- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/module/SysMenuServiceImplModule.java
+++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/module/SysMenuServiceImplModule.java
@@ -2,13 +2,12 @@ package com.atguigu.spzx.manger.service.module;
 
 import com.atguigu.spzx.manger.mapper.SysMenuMapper;
 import com.atguigu.spzx.manger.mapper.SysRoleMenuMapper;
-import com.atguigu.spzx.manger.service.impl.SysMenuServiceImpl;
 import com.atguigu.spzx.model.entity.system.SysMenu;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
-public class SysMenuServiceImplModule extends SysMenuServiceImpl {
+public class SysMenuServiceImplModule {
     @Autowired
     private SysMenuMapper sysMenuMapper;
     @Autowired