From 44732e6352dd816bc5f1c548503965cc7357680d Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Mon, 14 Jul 2025 19:11:35 +0800
Subject: [PATCH] =?UTF-8?q?:safety=5Fvest:=20=E4=BF=AE=E6=94=B9=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=A1=B5=E9=9D=A2(=E6=B7=BB=E5=8A=A0method=E5=92=8Cur?=
 =?UTF-8?q?l=E5=AD=97=E6=AE=B5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../step2/config/MyBatisPlusFieldConfig.java  |  2 +-
 .../{ => config}/context/BaseContext.java     |  2 +-
 .../web/ThreadLocalCleanupInterceptor.java    |  2 +-
 .../controller/PermissionController.java      |  2 +-
 .../domain/dto/permission/PermissionDto.java  |  6 ++++
 .../step2/domain/entity/PermissionEntity.java |  6 ++++
 .../spring/step2/domain/vo/PermissionVo.java  |  6 ++++
 .../resources/mapper/PermissionMapper.xml     | 10 +++++-
 .../src/views/permission/DialogPermission.js  | 17 +++++++++-
 .../resources/templates/permissionPage.html   | 32 ++++++++++++++++---
 .../main/resources/templates/userPage.html    |  6 ++--
 11 files changed, 77 insertions(+), 14 deletions(-)
 rename spring-security/step-2/src/main/java/com/spring/step2/{ => config}/context/BaseContext.java (93%)

diff --git a/spring-security/step-2/src/main/java/com/spring/step2/config/MyBatisPlusFieldConfig.java b/spring-security/step-2/src/main/java/com/spring/step2/config/MyBatisPlusFieldConfig.java
index d632420..ce370f5 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/config/MyBatisPlusFieldConfig.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/config/MyBatisPlusFieldConfig.java
@@ -1,7 +1,7 @@
 package com.spring.step2.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.spring.step2.context.BaseContext;
+import com.spring.step2.config.context.BaseContext;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/context/BaseContext.java b/spring-security/step-2/src/main/java/com/spring/step2/config/context/BaseContext.java
similarity index 93%
rename from spring-security/step-2/src/main/java/com/spring/step2/context/BaseContext.java
rename to spring-security/step-2/src/main/java/com/spring/step2/config/context/BaseContext.java
index 8b26744..03b89a9 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/context/BaseContext.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/config/context/BaseContext.java
@@ -1,4 +1,4 @@
-package com.spring.step2.context;
+package com.spring.step2.config.context;
 
 
 public class BaseContext {
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/config/web/ThreadLocalCleanupInterceptor.java b/spring-security/step-2/src/main/java/com/spring/step2/config/web/ThreadLocalCleanupInterceptor.java
index bd45ffd..b4ac3af 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/config/web/ThreadLocalCleanupInterceptor.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/config/web/ThreadLocalCleanupInterceptor.java
@@ -1,6 +1,6 @@
 package com.spring.step2.config.web;
 
-import com.spring.step2.context.BaseContext;
+import com.spring.step2.config.context.BaseContext;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/controller/PermissionController.java b/spring-security/step-2/src/main/java/com/spring/step2/controller/PermissionController.java
index 0353ee9..19df679 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/controller/PermissionController.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/controller/PermissionController.java
@@ -27,7 +27,7 @@ import java.util.List;
  */
 @Tag(name = "系统权限表", description = "系统权限表相关接口")
 @RestController
-@RequestMapping("/api/permission")
+@RequestMapping(value = "/api/permission", method = RequestMethod.DELETE)
 @RequiredArgsConstructor
 public class PermissionController {
 
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/permission/PermissionDto.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/permission/PermissionDto.java
index a307236..317a127 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/permission/PermissionDto.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/dto/permission/PermissionDto.java
@@ -21,6 +21,12 @@ public class PermissionDto {
     @Schema(name = "permissionCode", title = "权限编码")
     private String permissionCode;
 
+    @Schema(name = "url", description = "URL")
+    private String url;
+
+    @Schema(name = "method", description = "请求方法类型")
+    private String method;
+    
     @Schema(name = "description", title = "权限描述")
     private String description;
 
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/PermissionEntity.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/PermissionEntity.java
index 2f2a2c8..63ebe8d 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/PermissionEntity.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/entity/PermissionEntity.java
@@ -18,6 +18,12 @@ public class PermissionEntity extends BaseEntity {
     @Schema(name = "permissionCode", title = "权限编码")
     private String permissionCode;
 
+    @Schema(name = "url", description = "URL")
+    private String url;
+
+    @Schema(name = "method", description = "请求方法类型")
+    private String method;
+
     @Schema(name = "description", title = "权限描述")
     private String description;
 
diff --git a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/PermissionVo.java b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/PermissionVo.java
index d0f025e..cb58645 100644
--- a/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/PermissionVo.java
+++ b/spring-security/step-2/src/main/java/com/spring/step2/domain/vo/PermissionVo.java
@@ -25,6 +25,12 @@ public class PermissionVo extends BaseVo {
     @Schema(name = "permissionCode", title = "权限编码")
     private String permissionCode;
 
+    @Schema(name = "url", description = "URL")
+    private String url;
+
+    @Schema(name = "method", description = "请求方法类型")
+    private String method;
+
     @Schema(name = "description", title = "权限描述")
     private String description;
 
diff --git a/spring-security/step-2/src/main/resources/mapper/PermissionMapper.xml b/spring-security/step-2/src/main/resources/mapper/PermissionMapper.xml
index 599e9d4..8293afb 100644
--- a/spring-security/step-2/src/main/resources/mapper/PermissionMapper.xml
+++ b/spring-security/step-2/src/main/resources/mapper/PermissionMapper.xml
@@ -6,6 +6,8 @@
     <resultMap id="BaseResultMap" type="com.spring.step2.domain.entity.PermissionEntity">
         <id column="id" property="id"/>
         <id column="permission_code" property="permissionCode"/>
+        <id column="url" property="url"/>
+        <id column="method" property="method"/>
         <id column="description" property="description"/>
         <id column="remark" property="remark"/>
         <id column="create_time" property="createTime"/>
@@ -17,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,permission_code,description,remark,create_time,update_time,create_user,update_user,is_deleted
+        id,permission_code,url,method,description,remark,create_time,update_time,create_user,update_user,is_deleted
     </sql>
 
     <!-- 分页查询系统权限表内容 -->
@@ -30,6 +32,12 @@
             <if test="dto.permissionCode != null and dto.permissionCode != ''">
                 and permission_code like CONCAT('%',#{dto.permissionCode},'%')
             </if>
+            <if test="dto.url != null and dto.url != ''">
+                and url like CONCAT('%',#{dto.url},'%')
+            </if>
+            <if test="dto.method != null and dto.method != ''">
+                and method like CONCAT('%',#{dto.method},'%')
+            </if>
             <if test="dto.description != null and dto.description != ''">
                 and description like CONCAT('%',#{dto.description},'%')
             </if>
diff --git a/spring-security/step-2/src/main/resources/static/src/views/permission/DialogPermission.js b/spring-security/step-2/src/main/resources/static/src/views/permission/DialogPermission.js
index 1af84df..29895ac 100644
--- a/spring-security/step-2/src/main/resources/static/src/views/permission/DialogPermission.js
+++ b/spring-security/step-2/src/main/resources/static/src/views/permission/DialogPermission.js
@@ -16,11 +16,25 @@ const DialogPermission = defineComponent({
                         <!-- 内容 -->
                         <div class="modal-body">
                             <div class="mb-3">
-                                <label class="form-label" for="dialogPermissionCode"><i class="fas fa-user-alt me-1"></i>权限码</label>
+                                <label class="form-label" for="dialogPermissionCode"><i
+                                        class="fas fa-user-alt me-1"></i>权限码</label>
                                 <input autocomplete="false" class="form-control" id="dialogPermissionCode" placeholder="请输入权限码"
                                     type="text" v-model="form.permissionCode" required>
                                 <div class="form-text">在这里输入你的权限码。</div>
                             </div>
+                            <div class="mb-3">
+                                <label class="form-label" for="url"><i class="fas fa-ruler me-1"></i>URL</label>
+                                <input autocomplete="false" class="form-control" id="url" placeholder="请输入URL" type="text"
+                                    v-model="form.url">
+                            </div>
+                            <div class="mb-3">
+                                <label class="form-label" for="method"><i class="fas fa-pager me-1"></i>请求方法名称</label>
+                                <select class="form-select" aria-label="Default select example" v-model="form.method">
+                                    <option v-for="method in requestMethod" :key="method">
+                                        {{method}}
+                                    </option>
+                                </select>
+                            </div>
                             <div class="mb-3">
                                 <label class="form-label" for="dialogDescription"><i class="fas fa-user-alt me-1"></i>描述</label>
                                 <input autocomplete="false" class="form-control" id="dialogDescription" placeholder="请输入描述"
@@ -57,6 +71,7 @@ const DialogPermission = defineComponent({
         return {
             modalInstance: ref(null),
             form: ref({}),
+            requestMethod: ref(["", "GET", "HEAD", "POST", "PUT", "PATCH", "DELETE", "OPTIONS", "TRACE"])
         }
     },
     methods: {
diff --git a/spring-security/step-2/src/main/resources/templates/permissionPage.html b/spring-security/step-2/src/main/resources/templates/permissionPage.html
index 73bc2ea..6782bb7 100644
--- a/spring-security/step-2/src/main/resources/templates/permissionPage.html
+++ b/spring-security/step-2/src/main/resources/templates/permissionPage.html
@@ -51,6 +51,18 @@
                         <input autocomplete="false" class="form-control" id="permissionCode" placeholder="请输入权限码"
                                type="text" v-model="searchForm.permissionCode">
                     </div>
+                    <div class="col-md-4">
+                        <label class="form-label" for="url"><i
+                                class="fas fa-ruler me-1"></i>URL</label>
+                        <input autocomplete="false" class="form-control" id="url" placeholder="请输入URL"
+                               type="text" v-model="searchForm.url">
+                    </div>
+                    <div class="col-md-4">
+                        <label class="form-label" for="method"><i
+                                class="fas fa-pager me-1"></i>请求方法名称</label>
+                        <input autocomplete="false" class="form-control" id="method" placeholder="请输入请求方法名称"
+                               type="text" v-model="searchForm.method">
+                    </div>
                     <div class="col-md-4">
                         <label class="form-label" for="description"><i class="fas fa-text-width me-1"></i>描述</label>
                         <input autocomplete="false" class="form-control" id="description" placeholder="请输入描述"
@@ -91,9 +103,11 @@
                     <thead class="table-light">
                     <tr>
                         <th scope="col" width="5%">#</th>
-                        <th scope="col" width="15%">权限名</th>
-                        <th scope="col" width="15%">描述</th>
-                        <th scope="col" width="15%">简述</th>
+                        <th scope="col" width="10%">权限名</th>
+                        <th scope="col" width="10%">描述</th>
+                        <th scope="col" width="10%">简述</th>
+                        <th scope="col" width="10%">地址</th>
+                        <th scope="col" width="5%">方法</th>
                         <th scope="col" width="15%">创建时间</th>
                         <th scope="col" width="15%">更新时间</th>
                         <th scope="col" width="20%">操作</th>
@@ -105,6 +119,8 @@
                         <td>{{permission.permissionCode}}</td>
                         <td>{{permission.description}}</td>
                         <td>{{permission.remark}}</td>
+                        <td>{{permission.url}}</td>
+                        <td>{{permission.method}}</td>
                         <td>{{formatDate(permission.createTime)}}</td>
                         <td>{{formatDate(permission.updateTime)}}</td>
                         <td>
@@ -149,7 +165,10 @@
                 // 查询表单
                 searchForm: ref({
                     permissionCode: undefined,
-                    email: undefined,
+                    url: undefined,
+                    method: undefined,
+                    description: undefined,
+                    remark: undefined,
                     pageNo: 1,
                     pageSize: 30,
                     pages: 0
@@ -187,7 +206,10 @@
             /* 重制表单 */
             onRest() {
                 this.searchForm.permissionCode = undefined;
-                this.searchForm.email = undefined;
+                this.searchForm.url = undefined;
+                this.searchForm.method = undefined;
+                this.searchForm.description = undefined;
+                this.searchForm.remark = undefined;
                 this.onSearch();
             },
 
diff --git a/spring-security/step-2/src/main/resources/templates/userPage.html b/spring-security/step-2/src/main/resources/templates/userPage.html
index 0fbd861..bf3cc99 100644
--- a/spring-security/step-2/src/main/resources/templates/userPage.html
+++ b/spring-security/step-2/src/main/resources/templates/userPage.html
@@ -88,11 +88,11 @@
                     <thead class="table-light">
                     <tr>
                         <th scope="col" width="5%">#</th>
-                        <th scope="col" width="22%">用户名</th>
-                        <th scope="col" width="22%">邮箱</th>
+                        <th scope="col" width="20%">用户名</th>
+                        <th scope="col" width="20%">邮箱</th>
                         <th scope="col" width="17%">创建时间</th>
                         <th scope="col" width="17%">更新时间</th>
-                        <th scope="col" width="16%">操作</th>
+                        <th scope="col" width="20%">操作</th>
                     </tr>
                     </thead>
                     <tbody>