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 @@ + + @@ -17,7 +19,7 @@ - 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 @@ -30,6 +32,12 @@ and permission_code like CONCAT('%',#{dto.permissionCode},'%') + + and url like CONCAT('%',#{dto.url},'%') + + + and method like CONCAT('%',#{dto.method},'%') + and description like CONCAT('%',#{dto.description},'%') 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({