From 0fbffdc1d38e820f220127eba23ee56d810cdf43 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 16 Jun 2025 08:30:00 +0800 Subject: [PATCH 1/5] =?UTF-8?q?reactor=EF=BC=9A=E7=BB=9F=E4=B8=80=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=20url=20=E9=83=BD=E6=98=AF=20export-excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/infra/controller/admin/config/ConfigController.java | 2 +- .../product/controller/admin/spu/ProductSpuController.java | 2 +- .../module/system/controller/admin/dept/PostController.java | 2 +- .../module/system/controller/admin/dict/DictDataController.java | 2 +- .../module/system/controller/admin/dict/DictTypeController.java | 2 +- .../system/controller/admin/logger/LoginLogController.java | 2 +- .../system/controller/admin/logger/OperateLogController.java | 2 +- .../module/system/controller/admin/user/UserController.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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) From 47f450fcf9c1cac2e16aff2f328f9a73bf629610 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 17 Jun 2025 19:41:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bugfix=EF=BC=9Alombok=20=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E6=9A=82=E6=97=B6=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=9A=E8=BF=87=20bom=20=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 ++ yudao-dependencies/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e624027bcb..902d6f956e 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,7 @@ 3.2.2 3.14.0 1.6.0 + 1.18.38 1.6.3 UTF-8 @@ -81,6 +82,7 @@ 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 From 141bd22df6e237ea069e89d4d007a36bae847359 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 17 Jun 2025 19:48:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bugfix=EF=BC=9Amaven-surefire-plugin=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=20bom=20?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E8=AF=BB=E5=8F=96=EF=BC=88=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E7=89=88=E6=9C=AC=20IDEA=202024=20=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E5=89=8D=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 902d6f956e..adfbc70ed9 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,9 @@ 3.2.2 3.14.0 1.6.0 + 1.18.38 + 3.4.5 1.6.3 UTF-8 From f781b29f3d718e13d66b71827969786c046807d9 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 17 Jun 2025 19:53:24 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bugfix=EF=BC=9Amaven-surefire-plugin=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=20bom=20?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E8=AF=BB=E5=8F=96=EF=BC=88=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E7=89=88=E6=9C=AC=20IDEA=202024=20=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E5=89=8D=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index adfbc70ed9..f5f0a32e36 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,7 @@ org.springframework.boot spring-boot-configuration-processor + ${spring.boot.version} org.projectlombok From af2a0c22cb6a2df156d91d046b550d057ec110bd Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 17 Jun 2025 20:07:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?bugfix=EF=BC=9Amaven-surefire-plugin=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87=20bom=20?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E8=AF=BB=E5=8F=96=EF=BC=88=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=80=81=E7=89=88=E6=9C=AC=20IDEA=202024=20=E5=8F=8A?= =?UTF-8?q?=E4=BB=A5=E5=89=8D=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml index 4e14f9a044..97ee0daf38 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}