Skip to content

Commit c5092aa

Browse files
committed
fix: 修复升级遗漏的 CrudApi 替换(单个删除和批量删除已拆分为两个API,由于项目前端之前已经统一改造为批量删除,所以需要调整)
1 parent fcc31ec commit c5092aa

File tree

16 files changed

+22
-23
lines changed

16 files changed

+22
-23
lines changed

continew-common/src/main/java/top/continew/admin/common/base/controller/BaseController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class
6767
CrudRequestMapping crudRequestMapping = targetClass.getDeclaredAnnotation(CrudRequestMapping.class);
6868
String path = crudRequestMapping.value();
6969
String prefix = String.join(StringConstants.COLON, CharSequenceUtil.splitTrim(path, StringConstants.SLASH));
70-
String apiName = this.getApiName(crudApi.value());
70+
String apiName = getApiName(crudApi.value());
7171
StpUtil.checkPermission("%s:%s".formatted(prefix, apiName.toLowerCase()));
7272
}
7373

@@ -77,7 +77,7 @@ public void preHandle(CrudApi crudApi, Object[] args, Method targetMethod, Class
7777
* @param api API
7878
* @return API 名称
7979
*/
80-
private String getApiName(Api api) {
80+
public static String getApiName(Api api) {
8181
return switch (api) {
8282
case PAGE, TREE, LIST -> Api.LIST.name();
8383
case DELETE, BATCH_DELETE -> Api.DELETE.name();

continew-common/src/main/java/top/continew/admin/common/config/doc/OperationDescriptionCustomizer.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import cn.dev33.satoken.annotation.SaMode;
2222
import cn.hutool.core.text.CharSequenceUtil;
2323
import org.springframework.web.method.HandlerMethod;
24+
import top.continew.admin.common.base.controller.BaseController;
2425
import top.continew.starter.core.constant.StringConstants;
2526
import top.continew.starter.extension.crud.annotation.CrudApi;
2627
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
27-
import top.continew.starter.extension.crud.enums.Api;
2828

2929
import java.lang.annotation.Annotation;
3030
import java.util.ArrayList;
@@ -164,17 +164,14 @@ private String getAnnotationNote(String[] values, SaMode mode) {
164164
private String getCrudPermissionInfo(HandlerMethod handlerMethod) {
165165
CrudRequestMapping crudRequestMapping = handlerMethod.getBeanType().getAnnotation(CrudRequestMapping.class);
166166
CrudApi crudApi = handlerMethod.getMethodAnnotation(CrudApi.class);
167-
168167
if (crudRequestMapping == null || crudApi == null) {
169-
return "";
168+
return StringConstants.EMPTY;
170169
}
171170

172171
String path = crudRequestMapping.value();
173172
String prefix = String.join(StringConstants.COLON, CharSequenceUtil.splitTrim(path, StringConstants.SLASH));
174-
Api api = crudApi.value();
175-
String apiName = Api.PAGE.equals(api) || Api.TREE.equals(api) ? Api.LIST.name() : api.name();
173+
String apiName = BaseController.getApiName(crudApi.value());
176174
String permission = "%s:%s".formatted(prefix, apiName.toLowerCase());
177-
178175
return "<font style=\"color:red\" class=\"light-red\">CRUD 权限校验:</font></br><font style=\"color:red\" class=\"light-red\">方法:</font><font style=\"color:red\" class=\"light-red\">" + permission + "</font>";
179176
}
180177
}

continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ import ${packageName}.service.${classNamePrefix}Service;
2222
*/
2323
@Tag(name = "${businessName}管理 API")
2424
@RestController
25-
@CrudRequestMapping(value = "/${apiModuleName}/${apiName}", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.EXPORT})
25+
@CrudRequestMapping(value = "/${apiModuleName}/${apiName}", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE, Api.EXPORT})
2626
public class ${className} extends BaseController<${classNamePrefix}Service, ${classNamePrefix}Resp, ${classNamePrefix}DetailResp, ${classNamePrefix}Query, ${classNamePrefix}Req> {}

continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/controller/AppController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646
@Tag(name = "应用管理 API")
4747
@RestController
4848
@RequiredArgsConstructor
49-
@CrudRequestMapping(value = "/open/app", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.EXPORT})
49+
@CrudRequestMapping(value = "/open/app", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
50+
Api.EXPORT})
5051
public class AppController extends BaseController<AppService, AppResp, AppDetailResp, AppQuery, AppReq> {
5152

5253
@Operation(summary = "获取密钥", description = "获取应用密钥")

continew-system/src/main/java/top/continew/admin/system/controller/ClientController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
*/
3535
@Tag(name = "客户端管理 API")
3636
@RestController
37-
@CrudRequestMapping(value = "/system/client", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE})
37+
@CrudRequestMapping(value = "/system/client", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE})
3838
public class ClientController extends BaseController<ClientService, ClientResp, ClientResp, ClientQuery, ClientReq> {
3939
}

continew-system/src/main/java/top/continew/admin/system/controller/DeptController.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
*/
3535
@Tag(name = "部门管理 API")
3636
@RestController
37-
@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE, Api.EXPORT})
37+
@CrudRequestMapping(value = "/system/dept", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE,
38+
Api.EXPORT})
3839
public class DeptController extends BaseController<DeptService, DeptResp, DeptResp, DeptQuery, DeptReq> {
3940
}

continew-system/src/main/java/top/continew/admin/system/controller/DictController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
*/
4141
@Tag(name = "字典管理 API")
4242
@RestController
43-
@CrudRequestMapping(value = "/system/dict", api = {Api.LIST, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE})
43+
@CrudRequestMapping(value = "/system/dict", api = {Api.LIST, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE})
4444
public class DictController extends BaseController<DictService, DictResp, DictResp, DictQuery, DictReq> {
4545

4646
@Operation(summary = "清除缓存", description = "清除缓存")

continew-system/src/main/java/top/continew/admin/system/controller/DictItemController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@
3636
@Log(module = "字典管理")
3737
@Tag(name = "字典项管理 API")
3838
@RestController
39-
@CrudRequestMapping(value = "/system/dict/item", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE})
39+
@CrudRequestMapping(value = "/system/dict/item", api = {Api.PAGE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE})
4040
public class DictItemController extends BaseController<DictItemService, DictItemResp, DictItemResp, DictItemQuery, DictItemReq> {
4141
}

continew-system/src/main/java/top/continew/admin/system/controller/FileController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@Validated
5555
@RestController
5656
@RequiredArgsConstructor
57-
@CrudRequestMapping(value = "/system/file", api = {Api.PAGE, Api.UPDATE, Api.DELETE})
57+
@CrudRequestMapping(value = "/system/file", api = {Api.PAGE, Api.UPDATE, Api.BATCH_DELETE})
5858
public class FileController extends BaseController<FileService, FileResp, FileResp, FileQuery, FileReq> {
5959

6060
/**

continew-system/src/main/java/top/continew/admin/system/controller/MenuController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/
4848
@Tag(name = "菜单管理 API")
4949
@RestController
50-
@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.DELETE})
50+
@CrudRequestMapping(value = "/system/menu", api = {Api.TREE, Api.GET, Api.CREATE, Api.UPDATE, Api.BATCH_DELETE})
5151
public class MenuController extends BaseController<MenuService, MenuResp, MenuResp, MenuQuery, MenuReq> {
5252

5353
@Operation(summary = "清除缓存", description = "清除缓存")

0 commit comments

Comments
 (0)