Bladeren bron

1、token使用redis持久化集成
2、菜单和部门列表展示所有信息

machaoyi 1 jaar geleden
bovenliggende
commit
b90d816a64

+ 48 - 38
.idea/workspace.xml

@@ -5,15 +5,17 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1dc46973-e6f5-473b-a131-bf2bbc2dca15" name="更改" comment="1、部门列表树型结构构建">
-      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/entity/SysMenuSearchPO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/controller/SysRoleController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/entity/SysRole.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/mapper/SysRoleMapper.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/SysRoleService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysRole/service/impl/SysRoleServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/application/pom.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/mapper/SysMenuMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/SysMenuService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysMenu/service/impl/SysMenuServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrg.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/entity/SysOrgSearchPO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/service/impl/SysOrgServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/application/src/main/resources/application.yml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -51,40 +53,43 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
-    &quot;Maven.application [clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.application [package].executor&quot;: &quot;Run&quot;,
-    &quot;Maven.my-spring-boot-app [clean].executor&quot;: &quot;Run&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;Spring Boot.Application.executor&quot;: &quot;Debug&quot;,
-    &quot;jdk.selected.JAVA_MODULE&quot;: &quot;1.8&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&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;nodejs_package_manager_path&quot;: &quot;npm&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;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "Maven.application [clean].executor": "Run",
+    "Maven.application [org.apache.maven.plugins:maven-clean-plugin:3.1.0:clean].executor": "Run",
+    "Maven.application [package].executor": "Run",
+    "Maven.my-spring-boot-app [clean].executor": "Run",
+    "RequestMappingsPanelOrder0": "0",
+    "RequestMappingsPanelOrder1": "1",
+    "RequestMappingsPanelWidth0": "75",
+    "RequestMappingsPanelWidth1": "75",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "Spring Boot.Application.executor": "Debug",
+    "jdk.selected.JAVA_MODULE": "1.8",
+    "kotlin-language-version-configured": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "reactor",
+    "vue.rearranger.settings.migration": "true"
   },
-  &quot;keyToStringList&quot;: {
-    &quot;DatabaseDriversLRU&quot;: [
-      &quot;mongo&quot;,
-      &quot;mysql&quot;
+  "keyToStringList": {
+    "DatabaseDriversLRU": [
+      "mongo",
+      "mysql"
     ]
   }
-}</component>
+}]]></component>
+  <component name="ReactorSettings">
+    <option name="notificationShown" value="true" />
+  </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="C:\Users\setin\IdeaProjects\GeneralFrame\application\src\main\resources" />
@@ -123,6 +128,7 @@
       <updated>1704693898384</updated>
       <workItem from="1704693899463" duration="56714000" />
       <workItem from="1704875622703" duration="2299000" />
+      <workItem from="1704932572547" duration="3081000" />
     </task>
     <task id="LOCAL-00001" summary="基础框架配置">
       <option name="closed" value="true" />
@@ -179,4 +185,8 @@
     <MESSAGE value="1、部门列表树型结构构建" />
     <option name="LAST_COMMIT_MESSAGE" value="1、部门列表树型结构构建" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>

+ 11 - 0
application/pom.xml

@@ -86,6 +86,17 @@
             <artifactId>jbcrypt</artifactId>
             <version>0.4</version>
         </dependency>
+        <!-- Sa-Token 整合 Redis (使用 jdk 默认序列化方式) -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-redis</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <!-- 提供Redis连接池 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

+ 1 - 1
application/src/main/java/com/ctsi/SysMenu/controller/SysMenuController.java

@@ -54,7 +54,7 @@ public class SysMenuController{
     @GetMapping
     public ApiResult<Page<SysMenuSearchPO>> paginQuery(SysMenu sysMenu, FramePage framePage){
         try {
-            return ApiResult.success(sysMenuService.paginQuery(sysMenu, framePage.getPageNum(), framePage.getPageSize()));
+            return ApiResult.success(sysMenuService.paginQuery(sysMenu, framePage.getPageNum(), -1));
         } catch (Exception e) {
             log.error(e.getMessage());
             return ApiResult.failure("分页查询失败",null);

+ 1 - 1
application/src/main/java/com/ctsi/SysOrg/controller/SysOrgController.java

@@ -54,7 +54,7 @@ public class SysOrgController{
     @GetMapping
     public ApiResult<Page<SysOrgSearchPO>> paginQuery(SysOrg sysOrg, FramePage framePage){
         try {
-            return ApiResult.success(sysOrgService.paginQuery(sysOrg, framePage.getPageNum(), framePage.getPageSize()));
+            return ApiResult.success(sysOrgService.paginQuery(sysOrg, framePage.getPageNum(), -1));
         } catch (Exception e) {
             log.error(e.getMessage());
             return ApiResult.failure("分页查询失败",null);

+ 23 - 0
application/src/main/resources/application.yml

@@ -8,6 +8,29 @@ spring:
     username: root
     password: 9a41012499f38251
     driver-class-name: com.mysql.cj.jdbc.Driver
+  # redis
+  redis:
+    database: 1
+    # Redis服务器地址
+    host: 222.186.144.74
+    password: Geek@135#
+    # Redis服务器连接端口
+    port: 60101
+    # Redis服务器连接密码(默认为空)
+    # password:
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池最大连接数
+        max-active: 200
+        # 连接池最大阻塞等待时间(使用负值表示没有限制)
+        max-wait: -1ms
+        # 连接池中的最大空闲连接
+        max-idle: 10
+        # 连接池中的最小空闲连接
+        min-idle: 0
+
 mybatis-plus:
   global-config:
     db-config: