diff --git a/pom.xml b/pom.xml index 89e1dc9178..e85946ce91 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,9 @@ 3.2.2 3.14.0 1.6.0 + + 1.18.38 + 3.4.5 1.6.3 UTF-8 @@ -77,10 +80,12 @@ org.springframework.boot spring-boot-configuration-processor + ${spring.boot.version} org.projectlombok lombok + ${lombok.version} org.mapstruct diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index f7f615b492..94c3e31aa8 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -50,7 +50,7 @@ 1.4.0 1.18.3 - 1.18.36 + 1.18.38 1.6.3 5.8.35 6.0.0-M19 diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java index d4b8efd78c..af3973fd34 100644 --- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java +++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java @@ -101,7 +101,7 @@ public class ConfigController { return success(ConfigConvert.INSTANCE.convertPage(page)); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "导出参数配置") @PreAuthorize("@ss.hasPermission('infra:config:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java index 076170138e..8e5ea71efe 100755 --- a/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java +++ b/yudao-module-mall/yudao-module-product/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/ProductSpuController.java @@ -124,7 +124,7 @@ public class ProductSpuController { return success(productSpuService.getTabsCount()); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "导出商品") @PreAuthorize("@ss.hasPermission('product:spu:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java index 897cea267c..0f1b957f18 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java @@ -91,7 +91,7 @@ public class PostController { return success(BeanUtils.toBean(pageResult, PostRespVO.class)); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "岗位管理") @PreAuthorize("@ss.hasPermission('system:post:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java index ac44bc1e54..c49d078060 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java @@ -98,7 +98,7 @@ public class DictDataController { return success(BeanUtils.toBean(dictData, DictDataRespVO.class)); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "导出字典数据") @PreAuthorize("@ss.hasPermission('system:dict:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java index 8247f13253..3bb279dc02 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictTypeController.java @@ -97,7 +97,7 @@ public class DictTypeController { } @Operation(summary = "导出数据类型") - @GetMapping("/export") + @GetMapping("/export-excel") @PreAuthorize("@ss.hasPermission('system:dict:query')") @ApiAccessLog(operateType = EXPORT) public void export(HttpServletResponse response, @Valid DictTypePageReqVO exportReqVO) throws IOException { diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java index f2ff3a4f0f..b55d0643a7 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java @@ -44,7 +44,7 @@ public class LoginLogController { return success(BeanUtils.toBean(pageResult, LoginLogRespVO.class)); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "导出登录日志 Excel") @PreAuthorize("@ss.hasPermission('system:login-log:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java index 57b9b619bd..71b45d346e 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java @@ -46,7 +46,7 @@ public class OperateLogController { } @Operation(summary = "导出操作日志") - @GetMapping("/export") + @GetMapping("/export-excel") @PreAuthorize("@ss.hasPermission('system:operate-log:export')") @ApiAccessLog(operateType = EXPORT) public void exportOperateLog(HttpServletResponse response, @Valid OperateLogPageReqVO exportReqVO) throws IOException { diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index a562ab4387..9a90117cf4 100644 --- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -136,7 +136,7 @@ public class UserController { return success(UserConvert.INSTANCE.convert(user, dept)); } - @GetMapping("/export") + @GetMapping("/export-excel") @Operation(summary = "导出用户") @PreAuthorize("@ss.hasPermission('system:user:export')") @ApiAccessLog(operateType = EXPORT) diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index cdc009917e..576454dce8 100644 --- a/yudao-server/pom.xml +++ b/yudao-server/pom.xml @@ -138,6 +138,7 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version}