From 95644e9b9aaa01d9f8e8c7c0bd3ea08b2b064699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com> Date: Sat, 20 Jul 2024 22:43:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor(all):=20@PreAuthorize=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=20=20@HasPermisson=20=E6=B3=A8=E8=A7=A3=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 19b5ec57ad000e6a3ae767626ae8deaad28c901f) --- .../pigx/app/api/entity/AppPageEntity.java | 1 + .../pigx/app/api/vo/AppUserExcelVO.java | 2 +- .../AppArticleCategoryController.java | 14 ++-- .../AppArticleCollectController.java | 4 +- .../app/controller/AppArticleController.java | 10 +-- .../app/controller/AppRoleController.java | 12 +-- .../AppSocialDetailsController.java | 10 +-- .../app/controller/AppUserController.java | 14 ++-- .../app/controller/AppUserRoleController.java | 14 ++-- .../impl/AbstractEngineConfiguration.java | 84 ++++--------------- .../admin/controller/ConnectController.java | 10 +-- .../admin/controller/SysAreaController.java | 16 ++-- .../controller/SysAuditLogController.java | 6 +- .../admin/controller/SysClientController.java | 10 +-- .../admin/controller/SysDeptController.java | 8 +- .../admin/controller/SysDictController.java | 8 +- .../admin/controller/SysFileController.java | 4 +- .../admin/controller/SysI18nController.java | 12 +-- .../admin/controller/SysLogController.java | 6 +- .../admin/controller/SysMenuController.java | 8 +- .../controller/SysMessageController.java | 16 ++-- .../admin/controller/SysPostController.java | 18 ++-- .../controller/SysPublicParamController.java | 12 +-- .../admin/controller/SysRoleController.java | 14 ++-- .../controller/SysRouteConfController.java | 8 +- .../SysSensitiveWordController.java | 18 ++-- .../SysSocialDetailsController.java | 8 +- .../controller/SysSystemConfigController.java | 14 ++-- .../admin/controller/SysTenantController.java | 10 +-- .../admin/controller/SysTokenController.java | 4 +- .../admin/controller/SysUserController.java | 12 +-- .../controller/GenCreateTableController.java | 10 +-- .../controller/GenGroupController.java | 14 ++-- .../controller/GenTemplateController.java | 20 ++--- .../GenTemplateGroupController.java | 14 ++-- .../quartz/controller/SysJobController.java | 20 ++--- .../mp/controller/WxAccountController.java | 12 +-- .../controller/WxAccountFansController.java | 8 +- .../mp/controller/WxAccountTagController.java | 12 +-- .../mp/controller/WxAutoReplyController.java | 8 +- .../mp/controller/WxFansMsgController.java | 8 +- .../mp/controller/WxMaterialController.java | 12 +-- .../pigx/mp/controller/WxMenuController.java | 8 +- .../pay/controller/PayChannelController.java | 14 ++-- .../controller/PayGoodsOrderController.java | 4 +- .../controller/PayNotifyRecordController.java | 16 ++-- .../controller/PayRefundOrderController.java | 14 ++-- .../controller/PayTradeOrderController.java | 14 ++-- 48 files changed, 270 insertions(+), 325 deletions(-) diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java index 6859d75d3..12c7eeffb 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/entity/AppPageEntity.java @@ -6,6 +6,7 @@ import com.pig4cloud.pigx.common.core.util.TenantTable; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; + import java.time.LocalDateTime; /** diff --git a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserExcelVO.java b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserExcelVO.java index b330b3d34..2c03270b7 100644 --- a/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserExcelVO.java +++ b/pigx-app-server/pigx-app-server-api/src/main/java/com/pig4cloud/pigx/app/api/vo/AppUserExcelVO.java @@ -4,9 +4,9 @@ import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.pig4cloud.pigx.common.excel.annotation.ExcelLine; +import jakarta.validation.constraints.NotBlank; import lombok.Data; -import jakarta.validation.constraints.NotBlank; import java.time.LocalDateTime; @Data diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCategoryController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCategoryController.java index d9c780477..ec17bd560 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCategoryController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCategoryController.java @@ -10,6 +10,7 @@ import com.pig4cloud.pigx.app.service.AppArticleCategoryService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -17,7 +18,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -45,7 +45,7 @@ public class AppArticleCategoryController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_view')") + @HasPermission("app_appArticleCategory_view") public R getAppArticleCategoryPage(@ParameterObject Page page, @ParameterObject AppArticleCategoryEntity appArticleCategory) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); @@ -61,7 +61,7 @@ public class AppArticleCategoryController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_view')") + @HasPermission("app_appArticleCategory_view") public R getById(@PathVariable("id") Long id) { return R.ok(appArticleCategoryService.getById(id)); } @@ -85,7 +85,7 @@ public class AppArticleCategoryController { @Operation(summary = "新增文章分类表", description = "新增文章分类表") @SysLog("新增文章分类表") @PostMapping - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_add')") + @HasPermission("app_appArticleCategory_add") public R save(@RequestBody AppArticleCategoryEntity appArticleCategory) { return R.ok(appArticleCategoryService.save(appArticleCategory)); } @@ -98,7 +98,7 @@ public class AppArticleCategoryController { @Operation(summary = "修改文章分类表", description = "修改文章分类表") @SysLog("修改文章分类表") @PutMapping - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_edit')") + @HasPermission("app_appArticleCategory_edit") public R updateById(@RequestBody AppArticleCategoryEntity appArticleCategory) { return R.ok(appArticleCategoryService.updateById(appArticleCategory)); } @@ -111,7 +111,7 @@ public class AppArticleCategoryController { @Operation(summary = "通过id删除文章分类表", description = "通过id删除文章分类表") @SysLog("通过id删除文章分类表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_del')") + @HasPermission("app_appArticleCategory_del") public R removeById(@RequestBody Long[] ids) { return R.ok(appArticleCategoryService.removeBatchByIds(CollUtil.toList(ids))); } @@ -123,7 +123,7 @@ public class AppArticleCategoryController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_appArticleCategory_export')") + @HasPermission("app_appArticleCategory_export") public List export(AppArticleCategoryEntity appArticleCategory) { return appArticleCategoryService.list(Wrappers.query(appArticleCategory)); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java index 702a16387..334831cc3 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleCollectController.java @@ -10,6 +10,7 @@ import com.pig4cloud.pigx.app.service.AppArticleCollectService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -17,7 +18,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -118,7 +118,7 @@ public class AppArticleCollectController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_collect_export')") + @HasPermission("app_collect_export") public List export(AppArticleCollectEntity appArticleCollect) { return appArticleCollectService.list(Wrappers.query(appArticleCollect)); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleController.java index ec2dd0a95..975182b00 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppArticleController.java @@ -8,6 +8,7 @@ import com.pig4cloud.pigx.app.service.AppArticleService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -15,7 +16,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -68,7 +68,7 @@ public class AppArticleController { @Operation(summary = "新增文章资讯", description = "新增文章资讯") @SysLog("新增文章资讯") @PostMapping - @PreAuthorize("@pms.hasPermission('app_appArticle_add')") + @HasPermission("app_appArticle_add") public R save(@RequestBody AppArticleEntity appArticle) { return R.ok(appArticleService.save(appArticle)); } @@ -81,7 +81,7 @@ public class AppArticleController { @Operation(summary = "修改文章资讯", description = "修改文章资讯") @SysLog("修改文章资讯") @PutMapping - @PreAuthorize("@pms.hasPermission('app_appArticle_edit')") + @HasPermission("app_appArticle_edit") public R updateById(@RequestBody AppArticleEntity appArticle) { return R.ok(appArticleService.updateById(appArticle)); } @@ -94,7 +94,7 @@ public class AppArticleController { @Operation(summary = "通过id删除文章资讯", description = "通过id删除文章资讯") @SysLog("通过id删除文章资讯") @DeleteMapping - @PreAuthorize("@pms.hasPermission('app_appArticle_del')") + @HasPermission("app_appArticle_del") public R removeById(@RequestBody Long[] ids) { return R.ok(appArticleService.removeBatchByIds(CollUtil.toList(ids))); } @@ -106,7 +106,7 @@ public class AppArticleController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_appArticle_export')") + @HasPermission("app_appArticle_export") public List export(AppArticleEntity appArticle) { return appArticleService.list(Wrappers.query(appArticle)); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java index ed9d1f327..38fd7bf35 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppRoleController.java @@ -27,12 +27,12 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -117,7 +117,7 @@ public class AppRoleController { @Operation(summary = "新增app角色表", description = "新增app角色表") @SysLog("新增app角色表") @PostMapping - @PreAuthorize("@pms.hasPermission('app_approle_add')") + @HasPermission("app_approle_add") public R save(@RequestBody AppRole appRole) { return R.ok(appRoleService.save(appRole)); } @@ -130,7 +130,7 @@ public class AppRoleController { @Operation(summary = "修改app角色表", description = "修改app角色表") @SysLog("修改app角色表") @PutMapping - @PreAuthorize("@pms.hasPermission('app_approle_edit')") + @HasPermission("app_approle_edit") public R updateById(@RequestBody AppRole appRole) { return R.ok(appRoleService.updateById(appRole)); } @@ -143,7 +143,7 @@ public class AppRoleController { @Operation(summary = "通过ids批量删除app角色表", description = "通过ids批量删除app角色表") @SysLog("通过ids批量删除app角色表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('app_approle_del')") + @HasPermission("app_approle_del") public R removeById(@RequestBody Long[] ids) { return R.ok(appRoleService.deleteRoleByIds(ids)); } @@ -155,7 +155,7 @@ public class AppRoleController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_approle_export')") + @HasPermission("app_approle_export") public List export(AppRole appRole) { return appRoleService.list(Wrappers.query(appRole)); } @@ -167,7 +167,7 @@ public class AppRoleController { * @return ok fail */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('app_approle_export')") + @HasPermission("app_approle_export") public R importRole(@RequestExcel List excelVOList, BindingResult bindingResult) { return appRoleService.importRole(excelVOList, bindingResult); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java index 884db4715..dc8d6c5ea 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppSocialDetailsController.java @@ -26,16 +26,16 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.ValidGroup; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import java.util.List; @RestController @@ -75,7 +75,7 @@ public class AppSocialDetailsController { */ @SysLog("保存三方信息") @PostMapping - @PreAuthorize("@pms.hasPermission('app_social_details_add')") + @HasPermission("app_social_details_add") public R save(@Valid @RequestBody AppSocialDetails appSocialDetails) { return R.ok(appSocialDetailsService.save(appSocialDetails)); } @@ -87,7 +87,7 @@ public class AppSocialDetailsController { */ @SysLog("修改三方信息") @PutMapping - @PreAuthorize("@pms.hasPermission('app_social_details_edit')") + @HasPermission("app_social_details_edit") public R updateById(@Validated({ ValidGroup.Update.class }) @RequestBody AppSocialDetails appSocialDetails) { appSocialDetailsService.updateById(appSocialDetails); return R.ok(Boolean.TRUE); @@ -100,7 +100,7 @@ public class AppSocialDetailsController { */ @SysLog("删除三方信息") @DeleteMapping - @PreAuthorize("@pms.hasPermission('app_social_details_del')") + @HasPermission("app_social_details_del") public R removeById(@RequestBody Long[] ids) { return R.ok(appSocialDetailsService.removeBatchByIds(CollUtil.toList(ids))); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java index f7126edac..9ccb5162f 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserController.java @@ -31,18 +31,18 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import java.util.List; /** @@ -129,7 +129,7 @@ public class AppUserController { @Operation(summary = "新增app用户表", description = "新增app用户表") @SysLog("新增app用户表") @PostMapping - @PreAuthorize("@pms.hasPermission('app_appuser_add')") + @HasPermission("app_appuser_add") public R save(@RequestBody AppUserDTO appUser) { appUserService.saveUser(appUser); return R.ok(); @@ -143,7 +143,7 @@ public class AppUserController { @Operation(summary = "修改app用户表", description = "修改app用户表") @SysLog("修改app用户表") @PutMapping - @PreAuthorize("@pms.hasPermission('app_appuser_edit')") + @HasPermission("app_appuser_edit") public R updateById(@RequestBody AppUserDTO appUser) { return R.ok(appUserService.updateUser(appUser)); } @@ -156,7 +156,7 @@ public class AppUserController { @Operation(summary = "通过ids删除app用户表", description = "通过ids删除app用户表") @SysLog("通过id删除app用户表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('app_appuser_del')") + @HasPermission("app_appuser_del") public R removeById(@RequestBody Long[] ids) { return R.ok(appUserService.deleteAppUserByIds(ids)); } @@ -168,7 +168,7 @@ public class AppUserController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_appuser_export')") + @HasPermission("app_appuser_export") public List export(AppUserDTO appUser) { return appUserService.listUser(appUser); } @@ -191,7 +191,7 @@ public class AppUserController { * @return R */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('app_appuser_export')") + @HasPermission("app_appuser_export") public R importUser(@RequestExcel List excelVOList, BindingResult bindingResult) { return appUserService.importUser(excelVOList, bindingResult); } diff --git a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java index c66837bd2..de1945868 100644 --- a/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java +++ b/pigx-app-server/pigx-app-server-biz/src/main/java/com/pig4cloud/pigx/app/controller/AppUserRoleController.java @@ -24,12 +24,12 @@ import com.pig4cloud.pigx.app.service.AppUserRoleService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -57,7 +57,7 @@ public class AppUserRoleController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('app_appuserrole_view')") + @HasPermission("app_appuserrole_view") public R getAppUserRolePage(Page page, AppUserRole appUserRole) { return R.ok(appUserRoleService.page(page, Wrappers.query(appUserRole))); } @@ -69,7 +69,7 @@ public class AppUserRoleController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{userId}") - @PreAuthorize("@pms.hasPermission('app_appuserrole_view')") + @HasPermission("app_appuserrole_view") public R getById(@PathVariable("userId") Long userId) { return R.ok(appUserRoleService.getById(userId)); } @@ -82,7 +82,7 @@ public class AppUserRoleController { @Operation(summary = "新增用户角色表", description = "新增用户角色表") @SysLog("新增用户角色表") @PostMapping - @PreAuthorize("@pms.hasPermission('app_appuserrole_add')") + @HasPermission("app_appuserrole_add") public R save(@RequestBody AppUserRole appUserRole) { return R.ok(appUserRoleService.save(appUserRole)); } @@ -95,7 +95,7 @@ public class AppUserRoleController { @Operation(summary = "修改用户角色表", description = "修改用户角色表") @SysLog("修改用户角色表") @PutMapping - @PreAuthorize("@pms.hasPermission('app_appuserrole_edit')") + @HasPermission("app_appuserrole_edit") public R updateById(@RequestBody AppUserRole appUserRole) { return R.ok(appUserRoleService.updateById(appUserRole)); } @@ -108,7 +108,7 @@ public class AppUserRoleController { @Operation(summary = "通过id删除用户角色表", description = "通过id删除用户角色表") @SysLog("通过id删除用户角色表") @DeleteMapping("/{userId}") - @PreAuthorize("@pms.hasPermission('app_appuserrole_del')") + @HasPermission("app_appuserrole_del") public R removeById(@PathVariable Long userId) { return R.ok(appUserRoleService.removeById(userId)); } @@ -120,7 +120,7 @@ public class AppUserRoleController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('app_appuserrole_export')") + @HasPermission("app_appuserrole_export") public List export(AppUserRole appUserRole) { return appUserRoleService.list(Wrappers.query(appUserRole)); } diff --git a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java index 4139a5908..5ccce7389 100644 --- a/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java +++ b/pigx-flow/pigx-flow-engine/pigx-flow-engine-biz/src/main/java/org/flowable/common/engine/impl/AbstractEngineConfiguration.java @@ -12,29 +12,8 @@ */ package org.flowable.common.engine.impl; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.ServiceLoader; -import java.util.Set; - -import javax.naming.InitialContext; -import javax.sql.DataSource; - +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.builder.xml.XMLConfigBuilder; import org.apache.ibatis.builder.xml.XMLMapperBuilder; @@ -47,27 +26,7 @@ import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory; import org.apache.ibatis.transaction.TransactionFactory; import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory; import org.apache.ibatis.transaction.managed.ManagedTransactionFactory; -import org.apache.ibatis.type.ArrayTypeHandler; -import org.apache.ibatis.type.BigDecimalTypeHandler; -import org.apache.ibatis.type.BlobInputStreamTypeHandler; -import org.apache.ibatis.type.BlobTypeHandler; -import org.apache.ibatis.type.BooleanTypeHandler; -import org.apache.ibatis.type.ByteTypeHandler; -import org.apache.ibatis.type.ClobTypeHandler; -import org.apache.ibatis.type.DateOnlyTypeHandler; -import org.apache.ibatis.type.DateTypeHandler; -import org.apache.ibatis.type.DoubleTypeHandler; -import org.apache.ibatis.type.FloatTypeHandler; -import org.apache.ibatis.type.IntegerTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.LongTypeHandler; -import org.apache.ibatis.type.NClobTypeHandler; -import org.apache.ibatis.type.NStringTypeHandler; -import org.apache.ibatis.type.ShortTypeHandler; -import org.apache.ibatis.type.SqlxmlTypeHandler; -import org.apache.ibatis.type.StringTypeHandler; -import org.apache.ibatis.type.TimeOnlyTypeHandler; -import org.apache.ibatis.type.TypeHandlerRegistry; +import org.apache.ibatis.type.*; import org.flowable.common.engine.api.FlowableException; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; import org.flowable.common.engine.api.delegate.event.FlowableEventDispatcher; @@ -78,25 +37,10 @@ import org.flowable.common.engine.impl.cfg.CommandExecutorImpl; import org.flowable.common.engine.impl.cfg.IdGenerator; import org.flowable.common.engine.impl.cfg.TransactionContextFactory; import org.flowable.common.engine.impl.cfg.standalone.StandaloneMybatisTransactionContextFactory; -import org.flowable.common.engine.impl.db.CommonDbSchemaManager; -import org.flowable.common.engine.impl.db.DbSqlSessionFactory; -import org.flowable.common.engine.impl.db.LogSqlExecutionTimePlugin; -import org.flowable.common.engine.impl.db.MybatisTypeAliasConfigurator; -import org.flowable.common.engine.impl.db.MybatisTypeHandlerConfigurator; -import org.flowable.common.engine.impl.db.SchemaManager; +import org.flowable.common.engine.impl.db.*; import org.flowable.common.engine.impl.event.EventDispatchAction; import org.flowable.common.engine.impl.event.FlowableEventDispatcherImpl; -import org.flowable.common.engine.impl.interceptor.Command; -import org.flowable.common.engine.impl.interceptor.CommandConfig; -import org.flowable.common.engine.impl.interceptor.CommandContextFactory; -import org.flowable.common.engine.impl.interceptor.CommandContextInterceptor; -import org.flowable.common.engine.impl.interceptor.CommandExecutor; -import org.flowable.common.engine.impl.interceptor.CommandInterceptor; -import org.flowable.common.engine.impl.interceptor.CrDbRetryInterceptor; -import org.flowable.common.engine.impl.interceptor.DefaultCommandInvoker; -import org.flowable.common.engine.impl.interceptor.LogInterceptor; -import org.flowable.common.engine.impl.interceptor.SessionFactory; -import org.flowable.common.engine.impl.interceptor.TransactionContextInterceptor; +import org.flowable.common.engine.impl.interceptor.*; import org.flowable.common.engine.impl.lock.LockManager; import org.flowable.common.engine.impl.lock.LockManagerImpl; import org.flowable.common.engine.impl.logging.LoggingListener; @@ -106,13 +50,7 @@ import org.flowable.common.engine.impl.persistence.GenericManagerFactory; import org.flowable.common.engine.impl.persistence.StrongUuidGenerator; import org.flowable.common.engine.impl.persistence.cache.EntityCache; import org.flowable.common.engine.impl.persistence.cache.EntityCacheImpl; -import org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityManager; -import org.flowable.common.engine.impl.persistence.entity.ByteArrayEntityManagerImpl; -import org.flowable.common.engine.impl.persistence.entity.Entity; -import org.flowable.common.engine.impl.persistence.entity.PropertyEntityManager; -import org.flowable.common.engine.impl.persistence.entity.PropertyEntityManagerImpl; -import org.flowable.common.engine.impl.persistence.entity.TableDataManager; -import org.flowable.common.engine.impl.persistence.entity.TableDataManagerImpl; +import org.flowable.common.engine.impl.persistence.entity.*; import org.flowable.common.engine.impl.persistence.entity.data.ByteArrayDataManager; import org.flowable.common.engine.impl.persistence.entity.data.PropertyDataManager; import org.flowable.common.engine.impl.persistence.entity.data.impl.MybatisByteArrayDataManager; @@ -126,8 +64,14 @@ import org.flowable.eventregistry.api.EventRegistryEventConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import javax.naming.InitialContext; +import javax.sql.DataSource; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.sql.*; +import java.time.Duration; +import java.util.*; /** * 覆盖原有配置支持国产化数据库 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java index 922e11707..3f8645f4b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/ConnectController.java @@ -4,11 +4,11 @@ import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.service.ConnectService; import com.pig4cloud.pigx.admin.service.SysDeptService; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -35,7 +35,7 @@ public class ConnectController { * @return */ @PostMapping("/sync/ding/user") - @PreAuthorize("@pms.hasPermission('sys_connect_sync')") + @HasPermission("sys_connect_sync") public R syncUser() { for (SysDept sysDept : deptService.list()) { connectService.syncDingUser(sysDept.getDeptId()); @@ -48,7 +48,7 @@ public class ConnectController { * @return */ @PostMapping("/sync/ding/dept") - @PreAuthorize("@pms.hasPermission('sys_connect_sync')") + @HasPermission("sys_connect_sync") public R syncDept() { return R.ok(connectService.syncDingDept()); } @@ -58,7 +58,7 @@ public class ConnectController { * @return */ @PostMapping("/sync/cp/user") - @PreAuthorize("@pms.hasPermission('sys_connect_sync')") + @HasPermission("sys_connect_sync") public R syncCpUser() { return connectService.syncCpUser(); } @@ -68,7 +68,7 @@ public class ConnectController { * @return */ @PostMapping("/sync/cp/dept") - @PreAuthorize("@pms.hasPermission('sys_connect_sync')") + @HasPermission("sys_connect_sync") public R syncCpDept() { return connectService.syncCpDept(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java index 1633d48f1..626eda697 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAreaController.java @@ -9,13 +9,13 @@ import com.pig4cloud.pigx.admin.service.SysAreaService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -44,7 +44,7 @@ public class SysAreaController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('sys_sysArea_view')") + @HasPermission("sys_sysArea_view") public R getSysAreaPage(@ParameterObject Page page, @ParameterObject SysAreaEntity sysArea) { return R.ok(sysAreaService.selectPage(page, sysArea)); } @@ -57,7 +57,7 @@ public class SysAreaController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/tree") - @PreAuthorize("@pms.hasPermission('sys_sysArea_view')") + @HasPermission("sys_sysArea_view") public R getSysAreaTree(@ParameterObject SysAreaEntity sysArea) { return R.ok(sysAreaService.selectTree(sysArea)); } @@ -70,7 +70,7 @@ public class SysAreaController { */ @Operation(summary = "获取详细信息", description = "获取详细信息") @GetMapping("/details") - @PreAuthorize("@pms.hasPermission('sys_sysArea_view')") + @HasPermission("sys_sysArea_view") public R getDetails(@ParameterObject SysAreaEntity sysArea) { return R.ok(sysAreaService.getOne(Wrappers.query(sysArea))); } @@ -84,7 +84,7 @@ public class SysAreaController { @Operation(summary = "新增行政区划", description = "新增行政区划") @SysLog("新增行政区划") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_sysArea_add')") + @HasPermission("sys_sysArea_add") public R save(@RequestBody SysAreaEntity sysArea) { return R.ok(sysAreaService.save(sysArea)); } @@ -98,7 +98,7 @@ public class SysAreaController { @Operation(summary = "修改行政区划", description = "修改行政区划") @SysLog("修改行政区划") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_sysArea_edit')") + @HasPermission("sys_sysArea_edit") public R updateById(@RequestBody SysAreaEntity sysArea) { return R.ok(sysAreaService.updateById(sysArea)); } @@ -112,7 +112,7 @@ public class SysAreaController { @Operation(summary = "通过id删除行政区划", description = "通过id删除行政区划") @SysLog("通过id删除行政区划") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_sysArea_del')") + @HasPermission("sys_sysArea_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysAreaService.removeBatchByIds(CollUtil.toList(ids))); } @@ -126,7 +126,7 @@ public class SysAreaController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_sysArea_export')") + @HasPermission("sys_sysArea_export") public List export(SysAreaEntity sysArea, Long[] ids) { return sysAreaService .list(Wrappers.lambdaQuery(sysArea).in(ArrayUtil.isNotEmpty(ids), SysAreaEntity::getId, ids)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAuditLogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAuditLogController.java index edea8f9cd..73fd7f5df 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAuditLogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysAuditLogController.java @@ -26,6 +26,7 @@ import com.pig4cloud.pigx.admin.service.SysAuditLogService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -33,7 +34,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -96,7 +96,7 @@ public class SysAuditLogController { @Operation(summary = "通过id删除审计记录表", description = "通过id删除审计记录表") @SysLog("通过id删除审计记录表") @DeleteMapping("/delete") - @PreAuthorize("@pms.hasPermission('sys_audit_del')") + @HasPermission("sys_audit_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysAuditLogService.removeBatchByIds(CollUtil.toList(ids))); } @@ -108,7 +108,7 @@ public class SysAuditLogController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_audit_export')") + @HasPermission("sys_audit_export") public List export(SysAuditLog sysAuditLog, Long[] ids) { return sysAuditLogService .list(Wrappers.lambdaQuery(sysAuditLog).in(ArrayUtil.isNotEmpty(ids), SysAuditLog::getId, ids)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java index 3116fd275..e91dc08ce 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysClientController.java @@ -34,17 +34,17 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.beans.BeanUtils; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import java.util.List; /** @@ -109,7 +109,7 @@ public class SysClientController { */ @SysLog("添加终端") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_client_add')") + @HasPermission("sys_client_add") public R add(@Valid @RequestBody SysOauthClientDetailsDTO clientDetailsDTO) { return R.ok(clientDetailsService.saveClient(clientDetailsDTO)); } @@ -121,7 +121,7 @@ public class SysClientController { */ @SysLog("删除终端") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_client_del')") + @HasPermission("sys_client_del") public R removeById(@RequestBody Long[] ids) { clientDetailsService.removeBatchByIds(CollUtil.toList(ids)); SpringContextHolder.publishEvent(new ClientDetailsInitRunner.ClientDetailsInitEvent(ids)); @@ -135,7 +135,7 @@ public class SysClientController { */ @SysLog("编辑终端") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_client_edit')") + @HasPermission("sys_client_edit") public R update(@Valid @RequestBody SysOauthClientDetailsDTO clientDetailsDTO) { return R.ok(clientDetailsService.updateClientById(clientDetailsDTO)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java index 17e3922d2..af946e889 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDeptController.java @@ -26,12 +26,12 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -90,7 +90,7 @@ public class SysDeptController { */ @SysLog("添加部门") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_dept_add')") + @HasPermission("sys_dept_add") public R save(@Valid @RequestBody SysDept sysDept) { return R.ok(sysDeptService.save(sysDept)); } @@ -102,7 +102,7 @@ public class SysDeptController { */ @SysLog("删除部门") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('sys_dept_del')") + @HasPermission("sys_dept_del") public R removeById(@PathVariable Long id) { return R.ok(sysDeptService.removeDeptById(id)); } @@ -114,7 +114,7 @@ public class SysDeptController { */ @SysLog("编辑部门") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_dept_edit')") + @HasPermission("sys_dept_edit") public R update(@Valid @RequestBody SysDept sysDept) { sysDept.setUpdateTime(LocalDateTime.now()); return R.ok(sysDeptService.updateById(sysDept)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java index 53a899e63..5ce95b63a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysDictController.java @@ -31,6 +31,7 @@ import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -39,7 +40,6 @@ import org.springdoc.core.annotations.ParameterObject; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -122,7 +122,7 @@ public class SysDictController { */ @SysLog("添加字典") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_dict_add')") + @HasPermission("sys_dict_add") public R save(@Valid @RequestBody SysDict sysDict) { sysDictService.save(sysDict); return R.ok(sysDict); @@ -136,7 +136,7 @@ public class SysDictController { */ @SysLog("删除字典") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_dict_del')") + @HasPermission("sys_dict_del") @CacheEvict(value = CacheConstants.DICT_DETAILS, allEntries = true) public R removeById(@RequestBody Long[] ids) { return R.ok(sysDictService.removeDictByIds(ids)); @@ -150,7 +150,7 @@ public class SysDictController { */ @PutMapping @SysLog("修改字典") - @PreAuthorize("@pms.hasPermission('sys_dict_edit')") + @HasPermission("sys_dict_edit") public R updateById(@Valid @RequestBody SysDict sysDict) { return sysDictService.updateDict(sysDict); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java index 9986d3b9f..6a255455f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysFileController.java @@ -28,6 +28,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysFileGroup; import com.pig4cloud.pigx.admin.service.SysFileService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -38,7 +39,6 @@ import lombok.SneakyThrows; import org.springdoc.core.annotations.ParameterObject; import org.springframework.core.io.ClassPathResource; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -83,7 +83,7 @@ public class SysFileController { @Operation(summary = "通过id删除文件管理", description = "通过id删除文件管理") @SysLog("删除文件管理") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_file_del')") + @HasPermission("sys_file_del") public R removeById(@RequestBody Long[] ids) { for (Long id : ids) { sysFileService.deleteFile(id); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysI18nController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysI18nController.java index cf2251a3e..8aef78d5d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysI18nController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysI18nController.java @@ -29,6 +29,7 @@ import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -37,7 +38,6 @@ import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.cache.annotation.CacheEvict; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -65,7 +65,7 @@ public class SysI18nController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('sys_i18n_view')") + @HasPermission("sys_i18n_view") public R getsysI18nPage(@ParameterObject Page page, @ParameterObject SysI18nEntity sysI18n) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(sysI18n.getName()), SysI18nEntity::getName, sysI18n.getName()); @@ -99,7 +99,7 @@ public class SysI18nController { @SysLog("新增系统表-国际化") @PostMapping @CacheEvict(value = CacheConstants.I18N_DETAILS, allEntries = true) - @PreAuthorize("@pms.hasPermission('sys_i18n_add')") + @HasPermission("sys_i18n_add") public R save(@RequestBody SysI18nEntity sysI18n) { return R.ok(sysI18nService.save(sysI18n)); } @@ -113,7 +113,7 @@ public class SysI18nController { @SysLog("修改系统表-国际化") @PutMapping @CacheEvict(value = CacheConstants.I18N_DETAILS, allEntries = true) - @PreAuthorize("@pms.hasPermission('sys_i18n_edit')") + @HasPermission("sys_i18n_edit") public R updateById(@RequestBody SysI18nEntity sysI18n) { return R.ok(sysI18nService.updateById(sysI18n)); } @@ -127,7 +127,7 @@ public class SysI18nController { @SysLog("通过id删除系统表-国际化") @DeleteMapping @CacheEvict(value = CacheConstants.I18N_DETAILS, allEntries = true) - @PreAuthorize("@pms.hasPermission('sys_i18n_del')") + @HasPermission("sys_i18n_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysI18nService.removeBatchByIds(CollUtil.toList(ids))); } @@ -139,7 +139,7 @@ public class SysI18nController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_i18n_export')") + @HasPermission("sys_i18n_export") public List export(SysI18nEntity sysI18n, Long[] ids) { return sysI18nService .list(Wrappers.lambdaQuery(sysI18n).in(ArrayUtil.isNotEmpty(ids), SysI18nEntity::getId, ids)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java index dbbf2d1b7..433ec30b8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysLogController.java @@ -28,6 +28,7 @@ import com.pig4cloud.pigx.admin.api.vo.PreLogVO; import com.pig4cloud.pigx.admin.service.SysLogService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -35,7 +36,6 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -84,7 +84,7 @@ public class SysLogController { * @return success/false */ @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_log_del')") + @HasPermission("sys_log_del") public R removeByIds(@RequestBody Long[] ids) { return R.ok(sysLogService.removeBatchByIds(CollUtil.toList(ids))); } @@ -117,7 +117,7 @@ public class SysLogController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_log_export')") + @HasPermission("sys_log_export") public List export(SysLog sysLog, Long[] ids) { return sysLogService.list(Wrappers.lambdaQuery(sysLog).in(Objects.nonNull(ids), SysLog::getId, ids)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index ceba5885e..188097409 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -24,6 +24,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.service.SysMenuService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -31,7 +32,6 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.HashSet; @@ -109,7 +109,7 @@ public class SysMenuController { */ @SysLog("新增菜单") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_menu_add')") + @HasPermission("sys_menu_add") public R save(@Valid @RequestBody SysMenu sysMenu) { sysMenuService.save(sysMenu); return R.ok(sysMenu); @@ -123,7 +123,7 @@ public class SysMenuController { */ @SysLog("删除菜单") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('sys_menu_del')") + @HasPermission("sys_menu_del") public R removeById(@PathVariable Long id) { return sysMenuService.removeMenuById(id); } @@ -136,7 +136,7 @@ public class SysMenuController { */ @SysLog("更新菜单") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_menu_edit')") + @HasPermission("sys_menu_edit") public R update(@Valid @RequestBody SysMenu sysMenu) { return R.ok(sysMenuService.updateMenuById(sysMenu)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMessageController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMessageController.java index 844f2810a..3144e6b9c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMessageController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMessageController.java @@ -15,6 +15,7 @@ import com.pig4cloud.pigx.admin.service.SysMessageService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -23,7 +24,6 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -52,7 +52,7 @@ public class SysMessageController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('sys_message_view')") + @HasPermission("sys_message_view") public R getSysMessagePage(@ParameterObject Page page, @ParameterObject SysMessageEntity sysMessage) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(sysMessage.getTitle()), SysMessageEntity::getTitle, sysMessage.getTitle()); @@ -67,7 +67,7 @@ public class SysMessageController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('sys_message_view')") + @HasPermission("sys_message_view") public R getById(@PathVariable("id") Long id) { return R.ok(sysMessageService.getMessage(id)); } @@ -81,7 +81,7 @@ public class SysMessageController { @Operation(summary = "新增站内信息", description = "新增站内信息") @SysLog("新增站内信息") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_message_add')") + @HasPermission("sys_message_add") public R save(@RequestBody SysMessageVO sysMessage) { return R.ok(sysMessageService.saveOrUpdateMessage(sysMessage)); } @@ -95,7 +95,7 @@ public class SysMessageController { @Operation(summary = "修改站内信息", description = "修改站内信息") @SysLog("修改站内信息") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_message_edit')") + @HasPermission("sys_message_edit") public R updateById(@RequestBody SysMessageVO sysMessage) { return R.ok(sysMessageService.saveOrUpdateMessage(sysMessage)); } @@ -109,7 +109,7 @@ public class SysMessageController { @Operation(summary = "通过id删除站内信息", description = "通过id删除站内信息") @SysLog("通过id删除站内信息") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_message_del')") + @HasPermission("sys_message_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysMessageService.removeBatchByIds(CollUtil.toList(ids))); } @@ -123,7 +123,7 @@ public class SysMessageController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_message_export')") + @HasPermission("sys_message_export") public List export(SysMessageEntity sysMessage, Long[] ids) { return sysMessageService .list(Wrappers.lambdaQuery(sysMessage).in(ArrayUtil.isNotEmpty(ids), SysMessageEntity::getId, ids)); @@ -138,7 +138,7 @@ public class SysMessageController { @Operation(summary = "发送站内信息", description = "发送站内信息") @SysLog("发送站内信息") @PostMapping("/send") - @PreAuthorize("@pms.hasPermission('sys_message_add')") + @HasPermission("sys_message_add") public R send(Long id) { return R.ok(sysMessageService.sendMessage(id)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java index de70c4e90..37b58ff9d 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPostController.java @@ -28,13 +28,13 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -72,7 +72,7 @@ public class SysPostController { */ @Operation(description = "分页查询", summary = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('sys_post_view')") + @HasPermission("sys_post_view") public R getSysPostPage(@ParameterObject Page page, @ParameterObject SysPost sysPost) { return R.ok(sysPostService.page(page, Wrappers.lambdaQuery() .like(StrUtil.isNotBlank(sysPost.getPostName()), SysPost::getPostName, sysPost.getPostName()))); @@ -85,7 +85,7 @@ public class SysPostController { */ @Operation(description = "通过id查询", summary = "通过id查询") @GetMapping("/details/{postId}") - @PreAuthorize("@pms.hasPermission('sys_post_view')") + @HasPermission("sys_post_view") public R getById(@PathVariable("postId") Long postId) { return R.ok(sysPostService.getById(postId)); } @@ -97,7 +97,7 @@ public class SysPostController { */ @Operation(description = "查询角色信息", summary = "查询角色信息") @GetMapping("/details") - @PreAuthorize("@pms.hasPermission('sys_post_view')") + @HasPermission("sys_post_view") public R getDetails(@ParameterObject SysPost query) { return R.ok(sysPostService.getOne(Wrappers.query(query), false)); } @@ -110,7 +110,7 @@ public class SysPostController { @Operation(description = "新增岗位信息表", summary = "新增岗位信息表") @SysLog("新增岗位信息表") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_post_add')") + @HasPermission("sys_post_add") public R save(@RequestBody SysPost sysPost) { return R.ok(sysPostService.save(sysPost)); } @@ -123,7 +123,7 @@ public class SysPostController { @Operation(description = "修改岗位信息表", summary = "修改岗位信息表") @SysLog("修改岗位信息表") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_post_edit')") + @HasPermission("sys_post_edit") public R updateById(@RequestBody SysPost sysPost) { return R.ok(sysPostService.updateById(sysPost)); } @@ -136,7 +136,7 @@ public class SysPostController { @Operation(description = "通过id删除岗位信息表", summary = "通过id删除岗位信息表") @SysLog("通过id删除岗位信息表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_post_del')") + @HasPermission("sys_post_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysPostService.removeBatchByIds(CollUtil.toList(ids))); } @@ -147,7 +147,7 @@ public class SysPostController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_post_export')") + @HasPermission("sys_post_export") public List export(SysPost post, Long[] ids) { return sysPostService.listPost(post, ids); } @@ -159,7 +159,7 @@ public class SysPostController { * @return ok fail */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('sys_post_export')") + @HasPermission("sys_post_export") public R importRole(@RequestExcel List excelVOList, BindingResult bindingResult) { return sysPostService.importPost(excelVOList, bindingResult); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java index 6198e9685..1e4acaf2c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysPublicParamController.java @@ -27,6 +27,7 @@ import com.pig4cloud.pigx.admin.service.SysPublicParamService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -34,7 +35,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -122,7 +122,7 @@ public class SysPublicParamController { @Operation(description = "新增公共参数", summary = "新增公共参数") @SysLog("新增公共参数") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_syspublicparam_add')") + @HasPermission("sys_syspublicparam_add") public R save(@RequestBody SysPublicParam sysPublicParam) { return R.ok(sysPublicParamService.save(sysPublicParam)); } @@ -135,7 +135,7 @@ public class SysPublicParamController { @Operation(description = "修改公共参数", summary = "修改公共参数") @SysLog("修改公共参数") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_syspublicparam_edit')") + @HasPermission("sys_syspublicparam_edit") public R updateById(@RequestBody SysPublicParam sysPublicParam) { return sysPublicParamService.updateParam(sysPublicParam); } @@ -148,7 +148,7 @@ public class SysPublicParamController { @Operation(description = "删除公共参数", summary = "删除公共参数") @SysLog("删除公共参数") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_syspublicparam_del')") + @HasPermission("sys_syspublicparam_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysPublicParamService.removeParamByIds(ids)); } @@ -159,7 +159,7 @@ public class SysPublicParamController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_syspublicparam_edit')") + @HasPermission("sys_syspublicparam_edit") public List export(SysPublicParam param, Long[] ids) { return sysPublicParamService .list(Wrappers.lambdaQuery(param).in(ArrayUtil.isNotEmpty(ids), SysPublicParam::getPublicId, ids)); @@ -171,7 +171,7 @@ public class SysPublicParamController { */ @SysLog("同步参数") @PutMapping("/sync") - @PreAuthorize("@pms.hasPermission('sys_syspublicparam_edit')") + @HasPermission("sys_syspublicparam_edit") public R sync() { return sysPublicParamService.syncParamCache(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java index 2ec9d9abb..f49c845ba 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRoleController.java @@ -32,6 +32,7 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -39,7 +40,6 @@ import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.cache.annotation.CacheEvict; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -85,7 +85,7 @@ public class SysRoleController { */ @SysLog("添加角色") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_role_add')") + @HasPermission("sys_role_add") @CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true) public R save(@Valid @RequestBody SysRole sysRole) { return R.ok(sysRoleService.save(sysRole)); @@ -98,7 +98,7 @@ public class SysRoleController { */ @SysLog("修改角色") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_role_edit')") + @HasPermission("sys_role_edit") @CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true) public R update(@Valid @RequestBody SysRole sysRole) { return R.ok(sysRoleService.updateById(sysRole)); @@ -111,7 +111,7 @@ public class SysRoleController { */ @SysLog("删除角色") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_role_del')") + @HasPermission("sys_role_del") @CacheEvict(value = CacheConstants.ROLE_DETAILS, allEntries = true) public R removeById(@RequestBody Long[] ids) { return R.ok(sysRoleService.removeRoleByIds(ids)); @@ -145,7 +145,7 @@ public class SysRoleController { */ @SysLog("更新角色菜单") @PutMapping("/menu") - @PreAuthorize("@pms.hasPermission('sys_role_perm')") + @HasPermission("sys_role_perm") public R saveRoleMenus(@RequestBody RoleMenuVO roleVo) { return R.ok(sysRoleService.updateRoleMenus(roleVo)); } @@ -168,7 +168,7 @@ public class SysRoleController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_role_export')") + @HasPermission("sys_role_export") public List export(SysRole sysRole, Long[] ids) { return sysRoleService.listRole(sysRole, ids); } @@ -180,7 +180,7 @@ public class SysRoleController { * @return ok fail */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('sys_role_export')") + @HasPermission("sys_role_export") public R importRole(@RequestExcel List excelVOList, BindingResult bindingResult) { return sysRoleService.importRole(excelVOList, bindingResult); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java index 471d65397..224ccfbda 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysRouteConfController.java @@ -24,11 +24,11 @@ import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import com.pig4cloud.pigx.admin.service.SysRouteConfService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -58,7 +58,7 @@ public class SysRouteConfController { } @DeleteMapping("/{routeId}") - @PreAuthorize("@pms.hasPermission('sys_route_manage')") + @HasPermission("sys_route_manage") public R deleteRoute(@PathVariable String routeId) { return R .ok(sysRouteConfService.remove(Wrappers.lambdaQuery().eq(SysRouteConf::getRouteId, routeId))); @@ -72,14 +72,14 @@ public class SysRouteConfController { */ @SysLog("新增修改路由") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_route_manage')") + @HasPermission("sys_route_manage") public R addOrUpdateRoute(@RequestBody JSONObject route) { return R.ok(sysRouteConfService.addOrUpdateRoute(route)); } @SysLog("新增路由") @PostMapping("/save") - @PreAuthorize("@pms.hasPermission('sys_route_manage')") + @HasPermission("sys_route_manage") public R saveRoute(@RequestBody SysRouteConf routeConf) { return R.ok(sysRouteConfService.saveRoute(routeConf)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSensitiveWordController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSensitiveWordController.java index 679cc1294..4a878dbe1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSensitiveWordController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSensitiveWordController.java @@ -12,6 +12,7 @@ import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -20,7 +21,6 @@ import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -52,7 +52,7 @@ public class SysSensitiveWordController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_view')") + @HasPermission("admin_sysSensitiveWord_view") public R getSysSensitiveWordPage(@ParameterObject Page page, @ParameterObject SysSensitiveWordEntity sysSensitiveWord) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(sysSensitiveWord.getSensitiveWord()) @@ -77,7 +77,7 @@ public class SysSensitiveWordController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/details") - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_view')") + @HasPermission("admin_sysSensitiveWord_view") public R getById(@ParameterObject SysSensitiveWordEntity sysSensitiveWord) { return R.ok(sysSensitiveWordService.getOne(Wrappers.lambdaQuery(sysSensitiveWord), false)); } @@ -91,7 +91,7 @@ public class SysSensitiveWordController { @Operation(summary = "新增敏感词", description = "新增敏感词") @SysLog("新增敏感词") @PostMapping - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_add')") + @HasPermission("admin_sysSensitiveWord_add") public R save(@RequestBody SysSensitiveWordEntity sysSensitiveWord) { return R.ok(sysSensitiveWordService.saveSensitive(sysSensitiveWord)); } @@ -105,7 +105,7 @@ public class SysSensitiveWordController { @Operation(summary = "修改敏感词", description = "修改敏感词") @SysLog("修改敏感词") @PutMapping - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_edit')") + @HasPermission("admin_sysSensitiveWord_edit") public R updateById(@RequestBody SysSensitiveWordEntity sysSensitiveWord) { sysSensitiveWordService.updateById(sysSensitiveWord); redisTemplate.convertAndSend(CacheConstants.SENSITIVE_REDIS_RELOAD_TOPIC, "刷新敏感词缓存"); @@ -121,7 +121,7 @@ public class SysSensitiveWordController { @Operation(summary = "查询敏感词", description = "查询敏感词") @SysLog("查询敏感词") @PostMapping("/match") - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_del')") + @HasPermission("admin_sysSensitiveWord_del") public R match(@RequestBody SysSensitiveWordEntity sysSensitiveWord) { return R.ok(sysSensitiveWordService.matchSensitiveWord(sysSensitiveWord)); } @@ -135,7 +135,7 @@ public class SysSensitiveWordController { @Operation(summary = "通过id删除敏感词", description = "通过id删除敏感词") @SysLog("通过id删除敏感词") @DeleteMapping - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_del')") + @HasPermission("admin_sysSensitiveWord_del") public R removeById(@RequestBody Long[] ids) { sysSensitiveWordService.removeBatchByIds(CollUtil.toList(ids)); redisTemplate.convertAndSend(CacheConstants.SENSITIVE_REDIS_RELOAD_TOPIC, "刷新敏感词缓存"); @@ -152,7 +152,7 @@ public class SysSensitiveWordController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_export')") + @HasPermission("admin_sysSensitiveWord_export") public List export(SysSensitiveWordEntity sysSensitiveWord, Long[] ids) { return sysSensitiveWordService.list(Wrappers.lambdaQuery(sysSensitiveWord).in(ArrayUtil.isNotEmpty(ids), SysSensitiveWordEntity::getSensitiveId, ids)); } @@ -164,7 +164,7 @@ public class SysSensitiveWordController { */ @Operation(summary = "刷新敏感词缓存", description = "刷新敏感词缓存") @GetMapping("/refresh") - @PreAuthorize("@pms.hasPermission('admin_sysSensitiveWord_del')") + @HasPermission("admin_sysSensitiveWord_del") public R refresh() { redisTemplate.convertAndSend(CacheConstants.SENSITIVE_REDIS_RELOAD_TOPIC, "刷新敏感词缓存"); return R.ok(); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index acd685242..fd07af431 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -26,6 +26,7 @@ import com.pig4cloud.pigx.admin.service.SysSocialDetailsService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.ValidGroup; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,7 +34,6 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -98,7 +98,7 @@ public class SysSocialDetailsController { */ @SysLog("保存三方信息") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_social_details_add')") + @HasPermission("sys_social_details_add") public R save(@Valid @RequestBody SysSocialDetails sysSocialDetails) { return R.ok(sysSocialDetailsService.save(sysSocialDetails)); } @@ -110,7 +110,7 @@ public class SysSocialDetailsController { */ @SysLog("修改三方信息") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_social_details_edit')") + @HasPermission("sys_social_details_edit") public R updateById(@Validated({ ValidGroup.Update.class }) @RequestBody SysSocialDetails sysSocialDetails) { sysSocialDetailsService.updateById(sysSocialDetails); return R.ok(Boolean.TRUE); @@ -123,7 +123,7 @@ public class SysSocialDetailsController { */ @SysLog("删除三方信息") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_social_details_del')") + @HasPermission("sys_social_details_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysSocialDetailsService.removeBatchByIds(CollUtil.toList(ids))); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemConfigController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemConfigController.java index 312b2e8d1..9b9c7d2a3 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemConfigController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSystemConfigController.java @@ -9,13 +9,13 @@ import com.pig4cloud.pigx.admin.service.SysSystemConfigService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -44,7 +44,7 @@ public class SysSystemConfigController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('sys_message_view')") + @HasPermission("sys_message_view") public R getSysSystemConfigPage(@ParameterObject Page page, @ParameterObject SysSystemConfigEntity sysSystemConfig) { return sysSystemConfigService.pageSystemConfig(page, sysSystemConfig); } @@ -58,7 +58,7 @@ public class SysSystemConfigController { */ @Operation(summary = "通过条件查询", description = "通过条件查询对象") @GetMapping("/details") - @PreAuthorize("@pms.hasPermission('sys_message_view')") + @HasPermission("sys_message_view") public R getDetails(@ParameterObject SysSystemConfigEntity sysSystemConfig) { return sysSystemConfigService.listSystemConfig(sysSystemConfig); } @@ -72,7 +72,7 @@ public class SysSystemConfigController { @Operation(summary = "新增系统配置", description = "新增系统配置") @SysLog("新增系统配置") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_message_add')") + @HasPermission("sys_message_add") public R save(@RequestBody SysSystemConfigEntity sysSystemConfig) { return R.ok(sysSystemConfigService.save(sysSystemConfig)); } @@ -86,7 +86,7 @@ public class SysSystemConfigController { @Operation(summary = "修改系统配置", description = "修改系统配置") @SysLog("修改系统配置") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_message_edit')") + @HasPermission("sys_message_edit") public R updateById(@RequestBody SysSystemConfigEntity sysSystemConfig) { return sysSystemConfigService.updateSystemConfig(sysSystemConfig); } @@ -100,7 +100,7 @@ public class SysSystemConfigController { @Operation(summary = "通过id删除系统配置", description = "通过id删除系统配置") @SysLog("通过id删除系统配置") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_message_del')") + @HasPermission("sys_message_del") public R removeById(@RequestBody Long[] ids) { return R.ok(sysSystemConfigService.removeBatchByIds(CollUtil.toList(ids))); } @@ -115,7 +115,7 @@ public class SysSystemConfigController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_message_export')") + @HasPermission("sys_message_export") public List export(SysSystemConfigEntity sysSystemConfig, Long[] ids) { return sysSystemConfigService.list(Wrappers.lambdaQuery(sysSystemConfig).in(ArrayUtil.isNotEmpty(ids), SysSystemConfigEntity::getId, ids)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java index c8ff59cf2..b829e5509 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTenantController.java @@ -32,6 +32,7 @@ import com.pig4cloud.pigx.common.data.resolver.ParamResolver; import com.pig4cloud.pigx.common.data.tenant.TenantBroker; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -39,7 +40,6 @@ import lombok.RequiredArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.cache.annotation.CacheEvict; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.time.LocalDateTime; @@ -103,7 +103,7 @@ public class SysTenantController { */ @SysLog("新增租户") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_systenant_add')") + @HasPermission("sys_systenant_add") @CacheEvict(value = CacheConstants.TENANT_DETAILS, allEntries = true) public R save(@RequestBody SysTenant sysTenant) { return R.ok(sysTenantService.saveTenant(sysTenant)); @@ -116,7 +116,7 @@ public class SysTenantController { */ @SysLog("修改租户") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_systenant_edit')") + @HasPermission("sys_systenant_edit") public R updateById(@RequestBody SysTenant sysTenant) { return R.ok(sysTenantService.updateTenant(sysTenant)); } @@ -130,7 +130,7 @@ public class SysTenantController { */ @SysLog("删除租户") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_systenant_del')") + @HasPermission("sys_systenant_del") @CacheEvict(value = CacheConstants.TENANT_DETAILS, allEntries = true) public R removeById(@RequestBody Long[] ids) { return R.ok(sysTenantService.removeBatchByIds(CollUtil.toList(ids))); @@ -157,7 +157,7 @@ public class SysTenantController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_systenant_export')") + @HasPermission("sys_systenant_export") public List export(SysTenant sysTenant, Long[] ids) { return sysTenantService .list(Wrappers.lambdaQuery(sysTenant).in(ArrayUtil.isNotEmpty(ids), SysTenant::getId, ids)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java index 57e934bad..dce96a81a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysTokenController.java @@ -20,11 +20,11 @@ package com.pig4cloud.pigx.admin.controller; import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -62,7 +62,7 @@ public class SysTokenController { */ @SysLog("删除用户token") @DeleteMapping("/delete") - @PreAuthorize("@pms.hasPermission('sys_token_del')") + @HasPermission("sys_token_del") public R removeById(@RequestBody String[] tokens) { for (String token : tokens) { remoteTokenService.removeTokenById(token); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java index 0947f318b..d5e489798 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysUserController.java @@ -34,6 +34,7 @@ import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.RequestExcel; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; @@ -43,7 +44,6 @@ import jakarta.validation.Valid; import lombok.AllArgsConstructor; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -128,7 +128,7 @@ public class SysUserController { */ @SysLog("删除用户信息") @DeleteMapping - @PreAuthorize("@pms.hasPermission('sys_user_del')") + @HasPermission("sys_user_del") @Operation(summary = "删除用户", description = "根据ID删除用户") public R userDel(@RequestBody Long[] ids) { return R.ok(userService.deleteUserByIds(ids)); @@ -142,7 +142,7 @@ public class SysUserController { */ @SysLog("添加用户") @PostMapping - @PreAuthorize("@pms.hasPermission('sys_user_add')") + @HasPermission("sys_user_add") public R user(@RequestBody UserDTO userDto) { return R.ok(userService.saveUser(userDto)); } @@ -167,7 +167,7 @@ public class SysUserController { */ @SysLog("更新用户信息") @PutMapping - @PreAuthorize("@pms.hasPermission('sys_user_edit')") + @HasPermission("sys_user_edit") public R updateUser(@Valid @RequestBody UserDTO userDto) { return R.ok(userService.updateUser(userDto)); } @@ -214,7 +214,7 @@ public class SysUserController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('sys_user_export')") + @HasPermission("sys_user_export") public List export(UserDTO userDTO, Long[] ids) { return userService.listUser(userDTO, ids); } @@ -227,7 +227,7 @@ public class SysUserController { * @return R */ @PostMapping("/import") - @PreAuthorize("@pms.hasPermission('sys_user_export')") + @HasPermission("sys_user_export") public R importUser(@RequestExcel List excelVOList, BindingResult bindingResult) { return userService.importUser(excelVOList, bindingResult); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java index 1a06d9cef..168423b6d 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenCreateTableController.java @@ -25,12 +25,12 @@ import com.pig4cloud.pigx.codegen.entity.GenCreateTable; import com.pig4cloud.pigx.codegen.service.GenCreateTableService; import com.pig4cloud.pigx.codegen.util.vo.GenCreateTableVO; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -82,7 +82,7 @@ public class GenCreateTableController { */ @Operation(summary = "新增自动创建表管理", description = "新增自动创建表管理") @PostMapping - @PreAuthorize("@pms.hasPermission('codegen_table_add')") + @HasPermission("codegen_table_add") public R save(@RequestBody GenCreateTableVO createTableVO) { // 切换目标数据源 DynamicDataSourceContextHolder.push(createTableVO.getDsName()); @@ -100,7 +100,7 @@ public class GenCreateTableController { */ @Operation(summary = "修改自动创建表管理", description = "修改自动创建表管理") @PutMapping - @PreAuthorize("@pms.hasPermission('codegen_table_add')") + @HasPermission("codegen_table_add") public R updateById(@RequestBody GenCreateTable createTable) { return R.ok(createTableService.updateById(createTable)); } @@ -112,7 +112,7 @@ public class GenCreateTableController { */ @Operation(summary = "通过id删除自动创建表管理", description = "通过id删除自动创建表管理") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('codegen_table_add')") + @HasPermission("codegen_table_add") public R removeById(@PathVariable Long id) { return R.ok(createTableService.removeById(id)); } @@ -133,7 +133,7 @@ public class GenCreateTableController { */ @Operation(summary = "通过ids删除", description = "通过ids删除") @DeleteMapping - @PreAuthorize("@pms.hasPermission('codegen_table_add')") + @HasPermission("codegen_table_add") public R removeById(@RequestBody List ids) { return R.ok(createTableService.removeByIds(ids)); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenGroupController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenGroupController.java index 27dcdfd18..e5959c60e 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenGroupController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenGroupController.java @@ -28,12 +28,12 @@ import com.pig4cloud.pigx.codegen.util.vo.TemplateGroupDTO; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -62,7 +62,7 @@ public class GenGroupController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('codegen_group_view')") + @HasPermission("codegen_group_view") public R getgenGroupPage(Page page, GenGroupEntity genGroup) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .like(genGroup.getId() != null, GenGroupEntity::getId, genGroup.getId()) @@ -78,7 +78,7 @@ public class GenGroupController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('codegen_group_view')") + @HasPermission("codegen_group_view") public R getById(@PathVariable("id") Long id) { return R.ok(genGroupService.getGroupVoById(id)); } @@ -92,7 +92,7 @@ public class GenGroupController { @Operation(summary = "新增模板分组", description = "新增模板分组") @SysLog("新增模板分组") @PostMapping - @PreAuthorize("@pms.hasPermission('codegen_group_add')") + @HasPermission("codegen_group_add") public R save(@RequestBody TemplateGroupDTO genTemplateGroup) { genGroupService.saveGenGroup(genTemplateGroup); return R.ok(); @@ -107,7 +107,7 @@ public class GenGroupController { @Operation(summary = "修改模板分组", description = "修改模板分组") @SysLog("修改模板分组") @PutMapping - @PreAuthorize("@pms.hasPermission('codegen_group_edit')") + @HasPermission("codegen_group_edit") public R updateById(@RequestBody GroupVO groupVo) { genGroupService.updateGroupAndTemplateById(groupVo); return R.ok(); @@ -122,7 +122,7 @@ public class GenGroupController { @Operation(summary = "通过id删除模板分组", description = "通过id删除模板分组") @SysLog("通过id删除模板分组") @DeleteMapping - @PreAuthorize("@pms.hasPermission('codegen_group_del')") + @HasPermission("codegen_group_del") public R removeById(@RequestBody Long[] ids) { genGroupService.delGroupAndTemplate(ids); return R.ok(); @@ -136,7 +136,7 @@ public class GenGroupController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('codegen_group_export')") + @HasPermission("codegen_group_export") public List export(GenGroupEntity genGroup) { return genGroupService.list(Wrappers.query(genGroup)); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateController.java index e8bffec57..d6818b35d 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateController.java @@ -27,13 +27,13 @@ import com.pig4cloud.pigx.codegen.service.GenTemplateService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -62,7 +62,7 @@ public class GenTemplateController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('codegen_template_view')") + @HasPermission("codegen_template_view") public R getGenTemplatePage(Page page, GenTemplateEntity genTemplate) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() .like(genTemplate.getId() != null, GenTemplateEntity::getId, genTemplate.getId()) @@ -78,7 +78,7 @@ public class GenTemplateController { */ @Operation(summary = "查询全部", description = "查询全部") @GetMapping("/list") - @PreAuthorize("@pms.hasPermission('codegen_template_view')") + @HasPermission("codegen_template_view") public R list() { return R.ok(genTemplateService.list(Wrappers.lambdaQuery() .orderByDesc(GenTemplateEntity::getCreateTime))); @@ -92,7 +92,7 @@ public class GenTemplateController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('codegen_template_view')") + @HasPermission("codegen_template_view") public R getById(@PathVariable("id") Long id) { return R.ok(genTemplateService.getById(id)); } @@ -107,7 +107,7 @@ public class GenTemplateController { @Operation(summary = "新增模板", description = "新增模板") @SysLog("新增模板") @PostMapping - @PreAuthorize("@pms.hasPermission('codegen_template_add')") + @HasPermission("codegen_template_add") public R save(@RequestBody GenTemplateEntity genTemplate) { return R.ok(genTemplateService.save(genTemplate)); } @@ -122,7 +122,7 @@ public class GenTemplateController { @Operation(summary = "修改模板", description = "修改模板") @SysLog("修改模板") @PutMapping - @PreAuthorize("@pms.hasPermission('codegen_template_edit')") + @HasPermission("codegen_template_edit") public R updateById(@RequestBody GenTemplateEntity genTemplate) { return R.ok(genTemplateService.updateById(genTemplate)); } @@ -136,7 +136,7 @@ public class GenTemplateController { @Operation(summary = "通过id删除模板", description = "通过id删除模板") @SysLog("通过id删除模板") @DeleteMapping - @PreAuthorize("@pms.hasPermission('codegen_template_del')") + @HasPermission("codegen_template_del") public R removeById(@RequestBody Long[] ids) { return R.ok(genTemplateService.removeBatchByIds(CollUtil.toList(ids))); } @@ -149,7 +149,7 @@ public class GenTemplateController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('codegen_template_export')") + @HasPermission("codegen_template_export") public List export(GenTemplateEntity genTemplate) { return genTemplateService.list(Wrappers.query(genTemplate)); } @@ -162,7 +162,7 @@ public class GenTemplateController { */ @Operation(summary = "在线更新模板", description = "在线更新模板") @GetMapping("/online") - @PreAuthorize("@pms.hasPermission('codegen_template_view')") + @HasPermission("codegen_template_view") public R online() { return genTemplateService.onlineUpdate(); } @@ -173,7 +173,7 @@ public class GenTemplateController { */ @Operation(summary = "在线检查模板", description = "在线检查模板") @GetMapping("/checkVersion") - @PreAuthorize("@pms.hasPermission('codegen_template_view')") + @HasPermission("codegen_template_view") public R checkVersion() { return genTemplateService.checkVersion(); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateGroupController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateGroupController.java index 5e1eab475..0862c255b 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateGroupController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenTemplateGroupController.java @@ -26,12 +26,12 @@ import com.pig4cloud.pigx.codegen.service.GenTemplateGroupService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -59,7 +59,7 @@ public class GenTemplateGroupController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_view')") + @HasPermission("codegen_templateGroup_view") public R getgenTemplateGroupPage(Page page, GenTemplateGroupEntity genTemplateGroup) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); return R.ok(genTemplateGroupService.page(page, wrapper)); @@ -72,7 +72,7 @@ public class GenTemplateGroupController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{groupId}") - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_view')") + @HasPermission("codegen_templateGroup_view") public R getById(@PathVariable("groupId") Long groupId) { return R.ok(genTemplateGroupService.getById(groupId)); } @@ -85,7 +85,7 @@ public class GenTemplateGroupController { @Operation(summary = "新增模板分组关联表", description = "新增模板分组关联表") @SysLog("新增模板分组关联表") @PostMapping - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_add')") + @HasPermission("codegen_templateGroup_add") public R save(@RequestBody GenTemplateGroupEntity genTemplateGroup) { return R.ok(genTemplateGroupService.save(genTemplateGroup)); } @@ -98,7 +98,7 @@ public class GenTemplateGroupController { @Operation(summary = "修改模板分组关联表", description = "修改模板分组关联表") @SysLog("修改模板分组关联表") @PutMapping - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_edit')") + @HasPermission("codegen_templateGroup_edit") public R updateById(@RequestBody GenTemplateGroupEntity genTemplateGroup) { return R.ok(genTemplateGroupService.updateById(genTemplateGroup)); } @@ -111,7 +111,7 @@ public class GenTemplateGroupController { @Operation(summary = "通过id删除模板分组关联表", description = "通过id删除模板分组关联表") @SysLog("通过id删除模板分组关联表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_del')") + @HasPermission("codegen_templateGroup_del") public R removeById(@RequestBody Long[] ids) { return R.ok(genTemplateGroupService.removeBatchByIds(CollUtil.toList(ids))); } @@ -123,7 +123,7 @@ public class GenTemplateGroupController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('codegen_templateGroup_export')") + @HasPermission("codegen_templateGroup_export") public List export(GenTemplateGroupEntity genTemplateGroup) { return genTemplateGroupService.list(Wrappers.query(genTemplateGroup)); } diff --git a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java index fab21b2c5..46d9689e0 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java +++ b/pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import com.pig4cloud.pigx.daemon.quartz.constants.PigxQuartzEnum; import com.pig4cloud.pigx.daemon.quartz.entity.SysJob; @@ -38,7 +39,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.quartz.Scheduler; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -100,7 +100,7 @@ public class SysJobController { */ @SysLog("新增定时任务") @PostMapping - @PreAuthorize("@pms.hasPermission('job_sys_job_add')") + @HasPermission("job_sys_job_add") @Operation(description = "新增定时任务") public R save(@RequestBody SysJob sysJob) { // 初始化任务 @@ -117,7 +117,7 @@ public class SysJobController { */ @SysLog("修改定时任务") @PutMapping - @PreAuthorize("@pms.hasPermission('job_sys_job_edit')") + @HasPermission("job_sys_job_edit") @Operation(description = "修改定时任务") public R updateById(@RequestBody SysJob sysJob) { sysJob.setUpdateBy(SecurityUtils.getUser().getUsername()); @@ -139,7 +139,7 @@ public class SysJobController { */ @SysLog("删除定时任务") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('job_sys_job_del')") + @HasPermission("job_sys_job_del") @Operation(description = "唯一标识查询定时任务，暂停任务才能删除") public R removeById(@PathVariable Long id) { SysJob querySysJob = this.sysJobService.getById(id); @@ -159,7 +159,7 @@ public class SysJobController { */ @SysLog("暂停全部定时任务") @PostMapping("/shutdown-jobs") - @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") + @HasPermission("job_sys_job_shutdown_job") @Operation(description = "暂停全部定时任务") public R shutdownJobs() { taskUtil.pauseJobs(scheduler); @@ -184,7 +184,7 @@ public class SysJobController { */ @SysLog("启动全部定时任务") @PostMapping("/start-jobs") - @PreAuthorize("@pms.hasPermission('job_sys_job_start_job')") + @HasPermission("job_sys_job_start_job") @Operation(description = "启动全部定时任务") public R startJobs() { // 更新定时任务状态条件，暂停状态3更新为运行状态2 @@ -201,7 +201,7 @@ public class SysJobController { */ @SysLog("刷新全部定时任务") @PostMapping("/refresh-jobs") - @PreAuthorize("@pms.hasPermission('job_sys_job_refresh_job')") + @HasPermission("job_sys_job_refresh_job") @Operation(description = "刷新全部定时任务") public R refreshJobs() { sysJobService.list().forEach((sysjob) -> { @@ -227,7 +227,7 @@ public class SysJobController { */ @SysLog("启动定时任务") @PostMapping("/start-job/{id}") - @PreAuthorize("@pms.hasPermission('job_sys_job_start_job')") + @HasPermission("job_sys_job_start_job") @Operation(description = "启动定时任务") public R startJob(@PathVariable("id") Long jobId) { SysJob querySysJob = this.sysJobService.getById(jobId); @@ -250,7 +250,7 @@ public class SysJobController { */ @SysLog("立刻执行定时任务") @PostMapping("/run-job/{id}") - @PreAuthorize("@pms.hasPermission('job_sys_job_run_job')") + @HasPermission("job_sys_job_run_job") @Operation(description = "立刻执行定时任务") public R runJob(@PathVariable("id") Long jobId) { SysJob querySysJob = this.sysJobService.getById(jobId); @@ -263,7 +263,7 @@ public class SysJobController { */ @SysLog("暂停定时任务") @PostMapping("/shutdown-job/{id}") - @PreAuthorize("@pms.hasPermission('job_sys_job_shutdown_job')") + @HasPermission("job_sys_job_shutdown_job") @Operation(description = "暂停定时任务") public R shutdownJob(@PathVariable("id") Long id) { SysJob querySysJob = this.sysJobService.getById(id); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java index 03f07ad5b..0d557a6b3 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountController.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.config.WxMpInitConfigRunner; import com.pig4cloud.pigx.mp.entity.WxAccount; import com.pig4cloud.pigx.mp.service.WxAccountService; @@ -30,7 +31,6 @@ import lombok.AllArgsConstructor; import lombok.SneakyThrows; import me.chanjar.weixin.mp.api.WxMpService; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -79,7 +79,7 @@ public class WxAccountController { */ @SysLog("新增公众号账户") @PostMapping - @PreAuthorize("@pms.hasPermission('mp_wxaccount_add')") + @HasPermission("mp_wxaccount_add") public R save(@RequestBody WxAccount wxAccount) { wxAccountService.save(wxAccount); redisTemplate.convertAndSend(CacheConstants.MP_REDIS_RELOAD_TOPIC, "重新加载公众号配置"); @@ -93,7 +93,7 @@ public class WxAccountController { */ @SysLog("修改公众号账户") @PutMapping - @PreAuthorize("@pms.hasPermission('mp_wxaccount_edit')") + @HasPermission("mp_wxaccount_edit") public R updateById(@RequestBody WxAccount wxAccount) { wxAccountService.updateById(wxAccount); redisTemplate.convertAndSend(CacheConstants.MP_REDIS_RELOAD_TOPIC, "重新加载公众号配置"); @@ -107,7 +107,7 @@ public class WxAccountController { */ @SysLog("删除公众号账户") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('mp_wxaccount_del')") + @HasPermission("mp_wxaccount_del") public R removeById(@PathVariable Long id) { wxAccountService.removeById(id); redisTemplate.convertAndSend(CacheConstants.MP_REDIS_RELOAD_TOPIC, "重新加载公众号配置"); @@ -121,7 +121,7 @@ public class WxAccountController { */ @SysLog("生成公众号二维码") @PostMapping("/qr/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxaccount_add')") + @HasPermission("mp_wxaccount_add") public R qr(@PathVariable String appId) { return wxAccountService.generateQr(appId); } @@ -150,7 +150,7 @@ public class WxAccountController { @SneakyThrows @PostMapping("/clear-quota/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxaccount_del')") + @HasPermission("mp_wxaccount_del") public R clearQuota(@PathVariable String appId) { WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId); wxMpService.clearQuota(appId); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java index e931b262c..e0126f0fe 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountFansController.java @@ -19,10 +19,10 @@ package com.pig4cloud.pigx.mp.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.entity.WxAccountFans; import com.pig4cloud.pigx.mp.service.WxAccountFansService; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -66,7 +66,7 @@ public class WxAccountFansController { */ @SysLog("修改微信公众号粉丝") @PutMapping - @PreAuthorize("@pms.hasPermission('mp_wxaccountfans_edit')") + @HasPermission("mp_wxaccountfans_edit") public R updateById(@RequestBody WxAccountFans wxAccountFans) { return R.ok(wxAccountFansService.updateFans(wxAccountFans)); } @@ -78,7 +78,7 @@ public class WxAccountFansController { */ @SysLog("删除微信公众号粉丝") @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('mp_wxaccountfans_del')") + @HasPermission("mp_wxaccountfans_del") public R removeById(@PathVariable Long id) { return R.ok(wxAccountFansService.removeById(id)); } @@ -89,7 +89,7 @@ public class WxAccountFansController { * @return */ @PostMapping("/sync/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxaccountfans_sync')") + @HasPermission("mp_wxaccountfans_sync") public R sync(@PathVariable String appId) { wxAccountFansService.syncAccountFans(appId); return R.ok(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java index 67d4cff78..db2d2081a 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAccountTagController.java @@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.entity.WxAccountTag; import com.pig4cloud.pigx.mp.entity.dto.WxAccountTagDeleteDTO; import com.pig4cloud.pigx.mp.service.WxAccountTagService; +import jakarta.validation.Valid; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import jakarta.validation.Valid; import java.util.List; /** @@ -59,7 +59,7 @@ public class WxAccountTagController { * @return 包含保存成功后的账户标签的API调用结果 */ @PostMapping - @PreAuthorize("@pms.hasPermission('mp_wx_account_tag_add')") + @HasPermission("mp_wx_account_tag_add") public R saveAccountTag(@RequestBody @Valid WxAccountTag wxAccountTag) { return R.ok(wxAccountTagService.saveAccountTag(wxAccountTag)); } @@ -70,7 +70,7 @@ public class WxAccountTagController { * @return 包含修改成功后的账户标签的API调用结果 */ @PutMapping - @PreAuthorize("@pms.hasPermission('mp_wx_account_tag_edit')") + @HasPermission("mp_wx_account_tag_edit") public R updateAccountTag(@RequestBody @Valid WxAccountTag wxAccountTag) { return R.ok(wxAccountTagService.updateAccountTag(wxAccountTag)); } @@ -81,7 +81,7 @@ public class WxAccountTagController { * @return R */ @DeleteMapping - @PreAuthorize("@pms.hasPermission('mp_wx_account_tag_del')") + @HasPermission("mp_wx_account_tag_del") public R removeAccountTagById(@RequestBody WxAccountTagDeleteDTO deleteDTO) { deleteDTO.getIds().forEach(item -> { @@ -99,7 +99,7 @@ public class WxAccountTagController { * @return */ @PostMapping("/sync/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wx_account_tag_sync')") + @HasPermission("mp_wx_account_tag_sync") public R sync(@PathVariable String appId) { return R.ok(wxAccountTagService.syncAccountTags(appId)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java index e6e25ce85..90818859b 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxAutoReplyController.java @@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.constant.ReplyTypeEnum; import com.pig4cloud.pigx.mp.entity.WxAutoReply; import com.pig4cloud.pigx.mp.service.WxAutoReplyService; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -53,7 +53,7 @@ public class WxAutoReplyController { * @return R */ @PostMapping - @PreAuthorize("@pms.hasPermission('mp_wxautoreply_add')") + @HasPermission("mp_wxautoreply_add") public R save(@RequestBody WxAutoReply wxAutoReply) { this.jude(wxAutoReply); return R.ok(wxAutoReplyService.save(wxAutoReply)); @@ -65,7 +65,7 @@ public class WxAutoReplyController { * @return R */ @PutMapping - @PreAuthorize("@pms.hasPermission('mp_wxautoreply_edit')") + @HasPermission("mp_wxautoreply_edit") public R updateById(@RequestBody WxAutoReply wxAutoReply) { return R.ok(wxAutoReplyService.updateById(wxAutoReply)); } @@ -76,7 +76,7 @@ public class WxAutoReplyController { * @return R */ @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('mp_wxautoreply_del')") + @HasPermission("mp_wxautoreply_del") public R removeById(@PathVariable Long id) { return R.ok(wxAutoReplyService.removeById(id)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java index 8898e7181..2839eb61d 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxFansMsgController.java @@ -21,11 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.entity.WxMsg; import com.pig4cloud.pigx.mp.service.WxMsgService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -72,7 +72,7 @@ public class WxFansMsgController { * @return R */ @PostMapping - @PreAuthorize("@pms.hasPermission('mp_wxmsg_add')") + @HasPermission("mp_wxmsg_add") public R save(@RequestBody WxMsg wxMsg) { return wxMsgService.saveAndPushMsg(wxMsg); } @@ -83,7 +83,7 @@ public class WxFansMsgController { * @return R */ @PutMapping - @PreAuthorize("@pms.hasPermission('mp_wxmsg_edit')") + @HasPermission("mp_wxmsg_edit") public R updateById(@RequestBody WxMsg wxMsg) { return R.ok(wxMsgService.updateById(wxMsg)); } @@ -94,7 +94,7 @@ public class WxFansMsgController { * @return R */ @DeleteMapping("/{id}") - @PreAuthorize("@pms.hasPermission('mp_wxmsg_del')") + @HasPermission("mp_wxmsg_del") public R removeById(@PathVariable String id) { return R.ok(wxMsgService.removeById(id)); } diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java index 04e1f99fd..fbc49978f 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMaterialController.java @@ -6,6 +6,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.config.WxMpInitConfigRunner; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -24,7 +25,6 @@ import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -57,7 +57,7 @@ public class WxMaterialController { * @return */ @PostMapping("/materialFileUpload") - @PreAuthorize("@pms.hasPermission('mp_wxmaterial_add')") + @HasPermission("mp_wxmaterial_add") public R materialFileUpload(@RequestPart("file") MultipartFile mulFile, @RequestParam String appId, @RequestParam("title") String title, @RequestParam("introduction") String introduction, @RequestParam("mediaType") String mediaType) { @@ -103,7 +103,7 @@ public class WxMaterialController { * @return */ @PostMapping("/materialNews") - @PreAuthorize("@pms.hasPermission('mp_wxmaterial_add')") + @HasPermission("mp_wxmaterial_add") public R materialNewsUpload(@RequestBody JSONObject data) { try { JSONArray jSONArray = data.getJSONArray("articles"); @@ -132,7 +132,7 @@ public class WxMaterialController { * @return */ @PutMapping("/materialNews") - @PreAuthorize("@pms.hasPermission('mp_wxmaterial_add')") + @HasPermission("mp_wxmaterial_add") public R materialNewsUpdate(@RequestBody JSONObject data) { try { String mediaId = data.getStr("mediaId"); @@ -169,7 +169,7 @@ public class WxMaterialController { * @return */ @PostMapping("/newsImgUpload") - @PreAuthorize("@pms.hasPermission('mp_wxmaterial_add')") + @HasPermission("mp_wxmaterial_add") public String newsImgUpload(@RequestParam("file") MultipartFile mulFile, @RequestParam String appId) throws Exception { File file = FileUtil.createTempFile(FileUtil.getTmpDir()); @@ -189,7 +189,7 @@ public class WxMaterialController { * @return R */ @DeleteMapping - @PreAuthorize("@pms.hasPermission('mp_wxmaterial_del')") + @HasPermission("mp_wxmaterial_del") public R materialDel(String appId, String id) { WxMpService wxMpService = WxMpInitConfigRunner.getMpServices().get(appId); WxMpMaterialService wxMpMaterialService = wxMpService.getMaterialService(); diff --git a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java index 3fd23bc0c..1207bd699 100644 --- a/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java +++ b/pigx-visual/pigx-mp-platform/src/main/java/com/pig4cloud/pigx/mp/controller/WxMenuController.java @@ -19,9 +19,9 @@ package com.pig4cloud.pigx.mp.controller; import cn.hutool.json.JSONObject; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.mp.service.WxMenuService; import lombok.AllArgsConstructor; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -54,7 +54,7 @@ public class WxMenuController { */ @SysLog("新增微信菜单") @PostMapping("/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxmenu_add')") + @HasPermission("mp_wxmenu_add") public R save(@RequestBody JSONObject wxMenu, @PathVariable String appId) { return R.ok(wxMenuService.save(wxMenu, appId)); } @@ -66,13 +66,13 @@ public class WxMenuController { */ @SysLog("发布微信菜单") @PutMapping("/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxmenu_push')") + @HasPermission("mp_wxmenu_push") public R updateById(@PathVariable String appId) { return wxMenuService.push(appId); } @DeleteMapping("/{appId}") - @PreAuthorize("@pms.hasPermission('mp_wxmenu_del')") + @HasPermission("mp_wxmenu_del") public R delete(@PathVariable("appId") String appId) { return wxMenuService.delete(appId); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java index 895777b5c..303438ce0 100644 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayChannelController.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.pay.entity.PayChannel; import com.pig4cloud.pigx.pay.service.PayChannelService; import io.swagger.v3.oas.annotations.Operation; @@ -32,7 +33,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -60,7 +60,7 @@ public class PayChannelController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('pay_channel_view')") + @HasPermission("pay_channel_view") public R getpayChannelPage(Page page, PayChannel payChannel) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(StrUtil.isNotBlank(payChannel.getChannelName()), PayChannel::getChannelName, @@ -76,7 +76,7 @@ public class PayChannelController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('pay_channel_view')") + @HasPermission("pay_channel_view") public R getById(@PathVariable("id") Long id) { return R.ok(payChannelService.getById(id)); } @@ -89,7 +89,7 @@ public class PayChannelController { @Operation(summary = "新增支付渠道表", description = "新增支付渠道表") @SysLog("新增支付渠道表") @PostMapping - @PreAuthorize("@pms.hasPermission('pay_channel_add')") + @HasPermission("pay_channel_add") public R save(@RequestBody PayChannel payChannel) { return R.ok(payChannelService.save(payChannel)); } @@ -102,7 +102,7 @@ public class PayChannelController { @Operation(summary = "修改支付渠道表", description = "修改支付渠道表") @SysLog("修改支付渠道表") @PutMapping - @PreAuthorize("@pms.hasPermission('pay_channel_edit')") + @HasPermission("pay_channel_edit") public R updateById(@RequestBody PayChannel payChannel) { return R.ok(payChannelService.updateById(payChannel)); } @@ -115,7 +115,7 @@ public class PayChannelController { @Operation(summary = "通过id删除支付渠道表", description = "通过id删除支付渠道表") @SysLog("通过id删除支付渠道表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('pay_channel_del')") + @HasPermission("pay_channel_del") public R removeById(@RequestBody Long[] ids) { return R.ok(payChannelService.removeBatchByIds(CollUtil.toList(ids))); } @@ -127,7 +127,7 @@ public class PayChannelController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('pay_channel_export')") + @HasPermission("pay_channel_export") public List export(PayChannel payChannel) { return payChannelService.list(Wrappers.query(payChannel)); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java index 8b9b31f49..0126f11e6 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayGoodsOrderController.java @@ -41,6 +41,8 @@ import com.pig4cloud.pigx.pay.utils.PayConstants; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; @@ -53,8 +55,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java index d48ab7f21..f78238b34 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayNotifyRecordController.java @@ -28,6 +28,7 @@ import com.ijpay.core.kit.WxPayKit; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.common.security.annotation.Inner; import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore; import com.pig4cloud.pigx.pay.entity.PayNotifyRecord; @@ -36,15 +37,14 @@ import com.pig4cloud.pigx.pay.service.PayNotifyRecordService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; @@ -78,7 +78,7 @@ public class PayNotifyRecordController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('pay_record_view')") + @HasPermission("pay_record_view") public R getpayNotifyRecordPage(Page page, PayNotifyRecord payNotifyRecord) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(StrUtil.isNotBlank(payNotifyRecord.getNotifyId()), PayNotifyRecord::getNotifyId, @@ -95,7 +95,7 @@ public class PayNotifyRecordController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{id}") - @PreAuthorize("@pms.hasPermission('pay_record_view')") + @HasPermission("pay_record_view") public R getById(@PathVariable("id") Long id) { return R.ok(payNotifyRecordService.getById(id)); } @@ -120,7 +120,7 @@ public class PayNotifyRecordController { @Operation(summary = "修改通知记录日志表", description = "修改通知记录日志表") @SysLog("修改通知记录日志表") @PutMapping - @PreAuthorize("@pms.hasPermission('pay_record_edit')") + @HasPermission("pay_record_edit") public R updateById(@RequestBody PayNotifyRecord payNotifyRecord) { return R.ok(payNotifyRecordService.updateById(payNotifyRecord)); } @@ -133,7 +133,7 @@ public class PayNotifyRecordController { @Operation(summary = "通过id删除通知记录日志表", description = "通过id删除通知记录日志表") @SysLog("通过id删除通知记录日志表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('pay_record_del')") + @HasPermission("pay_record_del") public R removeById(@RequestBody Long[] ids) { return R.ok(payNotifyRecordService.removeBatchByIds(CollUtil.toList(ids))); } @@ -194,7 +194,7 @@ public class PayNotifyRecordController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('pay_record_export')") + @HasPermission("pay_record_export") public List export(PayNotifyRecord payNotifyRecord) { return payNotifyRecordService.list(Wrappers.query(payNotifyRecord)); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java index 2098fe002..285317be2 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayRefundOrderController.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.pay.entity.PayRefundOrder; import com.pig4cloud.pigx.pay.service.PayRefundOrderService; import io.swagger.v3.oas.annotations.Operation; @@ -32,7 +33,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -60,7 +60,7 @@ public class PayRefundOrderController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('pay_refund_view')") + @HasPermission("pay_refund_view") public R getpayRefundOrderPage(Page page, PayRefundOrder payRefundOrder) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(payRefundOrder.getRefundOrderId() != null, PayRefundOrder::getRefundOrderId, @@ -78,7 +78,7 @@ public class PayRefundOrderController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{refundOrderId}") - @PreAuthorize("@pms.hasPermission('pay_refund_view')") + @HasPermission("pay_refund_view") public R getById(@PathVariable("refundOrderId") Long refundOrderId) { return R.ok(payRefundOrderService.getById(refundOrderId)); } @@ -91,7 +91,7 @@ public class PayRefundOrderController { @Operation(summary = "新增退款订单表", description = "新增退款订单表") @SysLog("新增退款订单表") @PostMapping - @PreAuthorize("@pms.hasPermission('pay_refund_add')") + @HasPermission("pay_refund_add") public R save(@RequestBody PayRefundOrder payRefundOrder) { return R.ok(payRefundOrderService.refund(payRefundOrder)); } @@ -104,7 +104,7 @@ public class PayRefundOrderController { @Operation(summary = "修改退款订单表", description = "修改退款订单表") @SysLog("修改退款订单表") @PutMapping - @PreAuthorize("@pms.hasPermission('pay_refund_edit')") + @HasPermission("pay_refund_edit") public R updateById(@RequestBody PayRefundOrder payRefundOrder) { return R.ok(payRefundOrderService.updateById(payRefundOrder)); } @@ -117,7 +117,7 @@ public class PayRefundOrderController { @Operation(summary = "通过id删除退款订单表", description = "通过id删除退款订单表") @SysLog("通过id删除退款订单表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('pay_refund_del')") + @HasPermission("pay_refund_del") public R removeById(@RequestBody Long[] ids) { return R.ok(payRefundOrderService.removeBatchByIds(CollUtil.toList(ids))); } @@ -129,7 +129,7 @@ public class PayRefundOrderController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('pay_refund_export')") + @HasPermission("pay_refund_export") public List export(PayRefundOrder payRefundOrder) { return payRefundOrderService.list(Wrappers.query(payRefundOrder)); } diff --git a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java index 36fe92e87..bea9ca441 100755 --- a/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java +++ b/pigx-visual/pigx-pay-platform/src/main/java/com/pig4cloud/pigx/pay/controller/PayTradeOrderController.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.excel.annotation.ResponseExcel; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.security.annotation.HasPermission; import com.pig4cloud.pigx.pay.entity.PayTradeOrder; import com.pig4cloud.pigx.pay.service.PayTradeOrderService; import io.swagger.v3.oas.annotations.Operation; @@ -32,7 +33,6 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -60,7 +60,7 @@ public class PayTradeOrderController { */ @Operation(summary = "分页查询", description = "分页查询") @GetMapping("/page") - @PreAuthorize("@pms.hasPermission('pay_trade_view')") + @HasPermission("pay_trade_view") public R getpayTradeOrderPage(Page page, PayTradeOrder payTradeOrder) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.like(payTradeOrder.getOrderId() != null, PayTradeOrder::getOrderId, payTradeOrder.getOrderId()); @@ -75,7 +75,7 @@ public class PayTradeOrderController { */ @Operation(summary = "通过id查询", description = "通过id查询") @GetMapping("/{orderId}") - @PreAuthorize("@pms.hasPermission('pay_trade_view')") + @HasPermission("pay_trade_view") public R getById(@PathVariable("orderId") Long orderId) { return R.ok(payTradeOrderService.getById(orderId)); } @@ -88,7 +88,7 @@ public class PayTradeOrderController { @Operation(summary = "新增支付订单表", description = "新增支付订单表") @SysLog("新增支付订单表") @PostMapping - @PreAuthorize("@pms.hasPermission('pay_trade_add')") + @HasPermission("pay_trade_add") public R save(@RequestBody PayTradeOrder payTradeOrder) { return R.ok(payTradeOrderService.save(payTradeOrder)); } @@ -101,7 +101,7 @@ public class PayTradeOrderController { @Operation(summary = "修改支付订单表", description = "修改支付订单表") @SysLog("修改支付订单表") @PutMapping - @PreAuthorize("@pms.hasPermission('pay_trade_edit')") + @HasPermission("pay_trade_edit") public R updateById(@RequestBody PayTradeOrder payTradeOrder) { return R.ok(payTradeOrderService.updateById(payTradeOrder)); } @@ -114,7 +114,7 @@ public class PayTradeOrderController { @Operation(summary = "通过id删除支付订单表", description = "通过id删除支付订单表") @SysLog("通过id删除支付订单表") @DeleteMapping - @PreAuthorize("@pms.hasPermission('pay_trade_del')") + @HasPermission("pay_trade_del") public R removeById(@RequestBody Long[] ids) { return R.ok(payTradeOrderService.removeBatchByIds(CollUtil.toList(ids))); } @@ -126,7 +126,7 @@ public class PayTradeOrderController { */ @ResponseExcel @GetMapping("/export") - @PreAuthorize("@pms.hasPermission('pay_trade_export')") + @HasPermission("pay_trade_export") public List export(PayTradeOrder payTradeOrder) { return payTradeOrderService.list(Wrappers.query(payTradeOrder)); }