From ad12201c3ffe767b8a4a60ff4ffd3762471bd8d2 Mon Sep 17 00:00:00 2001 From: ljl <> Date: Fri, 9 Jun 2023 17:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=AF=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 - ruoyi-admin/pom.xml | 8 +- .../controller/common/CaptchaController.java | 1 - .../controller/common/SysFileController.java | 2 - .../controller/house/BuyHousesController.java | 9 - .../house/HousesReviewController.java | 12 -- .../material/MaterialModuleController.java | 7 - .../material/MaterialTalentsController.java | 6 - .../system/RsaSecurityController.java | 1 - .../system/SubscribeExportController.java | 4 - .../system/SysConfigController.java | 9 - .../controller/system/SysDeptController.java | 5 - .../system/SysDictDataController.java | 7 - .../system/SysDictTypeController.java | 8 - .../controller/system/SysLoginController.java | 12 -- .../controller/system/SysMenuController.java | 1 - .../system/SysNoticeController.java | 1 - .../system/SysOssConfigController.java | 1 - .../controller/system/SysOssController.java | 1 - .../controller/system/SysPostController.java | 1 - .../system/SysProfileController.java | 1 - .../system/SysRegisterController.java | 1 - .../controller/system/SysRoleController.java | 1 - .../controller/system/SysUserController.java | 1 - .../web/controller/user/HouseController.java | 23 +-- .../web/controller/user/UserController.java | 9 +- .../src/main/resources/application-prod.yml | 7 +- ruoyi-admin/src/main/resources/spy.properties | 2 +- .../java/com/ruoyi/test/DemoUnitTest.java | 85 ++++++---- ruoyi-common/pom.xml | 7 + .../advice/DecodeRequestBodyAdvice.java | 9 +- .../advice/EncodeResponseBodyAdvice.java | 8 +- .../core}/service/IRsaSecurityService2.java | 3 +- .../java/com/ruoyi/common/utils}/RSAUtil.java | 4 +- ruoyi-generator/pom.xml | 4 - .../generator/controller/GenController.java | 2 - ruoyi-rsaencrypt/pom.xml | 31 ---- .../annotation/RsaSecurityParameter.java | 40 ----- .../main/resources/META-INF/spring.factories | 3 - .../ruoyi/system/common/WorkBusinessRule.java | 6 +- .../ruoyi/system/domain/BuyHouseCheck.java | 2 + .../com/ruoyi/system/domain/BuyHouses.java | 1 + .../com/ruoyi/system/domain/HousesReview.java | 2 + .../ruoyi/system/domain/bo/BuyHousesBo.java | 7 +- .../system/domain/bo/HousesReviewBo.java | 2 + .../system/domain/vo/BuyHouseCheckVo.java | 2 + .../ruoyi/system/domain/vo/BuyHousesVo.java | 2 + .../system/domain/vo/HousesReviewVo.java | 1 + .../system/service/IBuyHousesService.java | 2 +- .../service/impl/BuyHousesServiceImpl.java | 159 +++++++++++------- .../service/impl/HousesReviewServiceImpl.java | 18 +- .../service/impl/RsaSecurityServiceImpl.java | 4 +- .../system/service/impl/UserServiceImpl.java | 2 + .../mapper/system/BuyHouseCheckMapper.xml | 1 + .../mapper/system/BuyHousesMapper.xml | 1 + .../mapper/system/HousesReviewMapper.xml | 1 + ruoyi-work/pom.xml | 4 - .../ruoyi/work/controller/WorkController.java | 72 ++++---- .../com/ruoyi/work/domain/vo/ProcessVo.java | 4 + .../com/ruoyi/work/mapper/ProcessMapper.java | 2 +- .../work/service/impl/ProcessServiceImpl.java | 2 + .../com/ruoyi/work/utils/WorkComplyUtils.java | 78 +++++---- .../mapper/work/ActProcessMapper.xml | 2 +- .../resources/mapper/work/ProcessMapper.xml | 8 +- 64 files changed, 316 insertions(+), 412 deletions(-) rename {ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt => ruoyi-common/src/main/java/com/ruoyi/common}/advice/DecodeRequestBodyAdvice.java (97%) rename {ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt => ruoyi-common/src/main/java/com/ruoyi/common}/advice/EncodeResponseBodyAdvice.java (95%) rename {ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt => ruoyi-common/src/main/java/com/ruoyi/common/core}/service/IRsaSecurityService2.java (78%) rename {ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt/utls => ruoyi-common/src/main/java/com/ruoyi/common/utils}/RSAUtil.java (91%) delete mode 100644 ruoyi-rsaencrypt/pom.xml delete mode 100644 ruoyi-rsaencrypt/src/main/java/com/ruoyi/rsaencrypt/annotation/RsaSecurityParameter.java delete mode 100644 ruoyi-rsaencrypt/src/main/resources/META-INF/spring.factories diff --git a/pom.xml b/pom.xml index bac3280b1..246259daf 100644 --- a/pom.xml +++ b/pom.xml @@ -364,11 +364,6 @@ ${ruoyi-vue-plus.version} - - com.ruoyi - ruoyi-rsaencrypt - ${ruoyi-vue-plus.version} - com.ruoyi @@ -428,7 +423,6 @@ ruoyi-sms ruoyi-work ruoyi-file - ruoyi-rsaencrypt ruoyi-rabbitmq diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index d1fa747de..849adef76 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -94,14 +94,10 @@ ruoyi-file - - com.ruoyi - ruoyi-rsaencrypt - - + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java index 83abdb363..f5a603a43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java @@ -15,7 +15,6 @@ import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.common.utils.reflect.ReflectUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.framework.config.properties.MailProperties; import com.ruoyi.sms.config.properties.SmsProperties; import com.ruoyi.sms.core.SmsTemplate; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SysFileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SysFileController.java index 2f8f097c8..f0cb8cf2d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SysFileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/SysFileController.java @@ -3,7 +3,6 @@ package com.ruoyi.web.controller.common; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.file.service.ISysFileService; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +30,6 @@ public class SysFileController /*文件上传请求*/ - @RsaSecurityParameter @PostMapping("upload") public R upload(MultipartFile file) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/BuyHousesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/BuyHousesController.java index 3a9b43abe..170b64736 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/BuyHousesController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/BuyHousesController.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Arrays; import com.ruoyi.common.constant.Constants; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.BuyHouses; import com.ruoyi.system.domain.dto.BuyHousesEvent; import lombok.RequiredArgsConstructor; @@ -44,7 +43,6 @@ public class BuyHousesController extends BaseController { */ @SaCheckPermission("system:houses:list") @GetMapping("/list") - @RsaSecurityParameter public TableDataInfo list(BuyHousesBo bo, PageQuery pageQuery) { return iBuyHousesService.queryPageList(bo, pageQuery); } @@ -57,7 +55,6 @@ public class BuyHousesController extends BaseController { */ @SaCheckPermission("system:houses:subscribeExport") @PostMapping("/subscribeExport") - @RsaSecurityParameter(inDecode = true) public R subscribeExport(@RequestBody BuyHousesEvent bo) throws IOException { return iBuyHousesService.subscribeExport(bo); } @@ -66,7 +63,6 @@ public class BuyHousesController extends BaseController { */ @SaCheckPermission("system:houses:exportExcel") @PostMapping("/exportExcel") - @RsaSecurityParameter(outEncode = false) public void exportExcel(BuyHousesBo bo,HttpServletResponse response){ iBuyHousesService.exportExcel(bo,response); } @@ -77,7 +73,6 @@ public class BuyHousesController extends BaseController { @SaCheckPermission("system:houses:export") @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT) @PostMapping("一期导出列表") - @RsaSecurityParameter(inDecode = true,outEncode = false) public void export(BuyHousesBo bo, HttpServletResponse response) { List list = iBuyHousesService.queryList(bo); ExcelUtil.exportExcel(list, "一期导出列表", BuyHousesVo.class, response); @@ -90,7 +85,6 @@ public class BuyHousesController extends BaseController { */ @SaCheckPermission("system:houses:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long id) { return R.ok(iBuyHousesService.queryById(id)); } @@ -104,7 +98,6 @@ public class BuyHousesController extends BaseController { @SaCheckPermission("system:houses:remove") @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(@NotEmpty(message = "主键不能为空")Long[] ids) { return toAjax(iBuyHousesService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -114,7 +107,6 @@ public class BuyHousesController extends BaseController { */ @Log(title = "获取申报材料",businessType = BusinessType.OTHER) @PostMapping("/review/material") - @RsaSecurityParameter(inDecode = true) public R getMaterialInfo(@RequestBody BuyHousesBo bo){ return iBuyHousesService.getMaterialInfo(bo); } @@ -127,7 +119,6 @@ public class BuyHousesController extends BaseController { */ @SaCheckPermission("system:houses:edit") @PutMapping - @RsaSecurityParameter(inDecode = true) public RupdateBuyHouses(@RequestBody BuyHouses buyHouses){ return iBuyHousesService.updateBuyHouses(buyHouses); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java index 41c492bf2..6fdc407f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HousesReviewController.java @@ -16,7 +16,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.BuyHouses; import com.ruoyi.system.domain.HousesReview; import com.ruoyi.system.domain.bo.HousesReviewBo; @@ -62,7 +61,6 @@ public class HousesReviewController extends BaseController { */ @SaCheckPermission("system:review:reviewList") @GetMapping("/review/list") - @RsaSecurityParameter public TableDataInfo reviewList(HousesReviewBo bo, PageQuery pageQuery) { return iHousesReviewService.queryPageList(bo, pageQuery); } @@ -76,7 +74,6 @@ public class HousesReviewController extends BaseController { */ @SaCheckPermission("system:manager:reviewList") @GetMapping("/manager/list") - @RsaSecurityParameter public TableDataInfo managerReviewList(HousesReviewBo bo, PageQuery pageQuery) { return iHousesReviewService.managerQueryPageList(bo, pageQuery); } @@ -98,7 +95,6 @@ public class HousesReviewController extends BaseController { */ @SaCheckPermission("system:houses:exportExcel") @PostMapping("/exportExcel") - @RsaSecurityParameter(inDecode = true,outEncode = false) public void exportExcel(HousesReviewBo bo,HttpServletResponse response){ iHousesReviewService.exportExcel(bo,response); } @@ -108,7 +104,6 @@ public class HousesReviewController extends BaseController { */ @SaCheckPermission("system:review:list") @GetMapping("/registrationManagement/list") - @RsaSecurityParameter public TableDataInfo list(HousesReviewBo bo, PageQuery pageQuery) { boolean admin = LoginHelper.isAdmin(); if (!admin){ @@ -123,7 +118,6 @@ public class HousesReviewController extends BaseController { @SaCheckPermission("system:review:export") @Log(title = "购房复审登记", businessType = BusinessType.EXPORT) @PostMapping("/registrationManagement/export") - @RsaSecurityParameter(inDecode = true,outEncode = false) public void export(HousesReviewBo bo, HttpServletResponse response) { List list = iHousesReviewService.queryList(bo); ExcelUtil.exportExcel(list, "购房复审登记", HousesReviewVo.class, response); @@ -136,7 +130,6 @@ public class HousesReviewController extends BaseController { */ @SaCheckPermission("system:review:edit") @GetMapping("/registrationManagement") - @RsaSecurityParameter public R getInfo(Long id) { return R.ok(iHousesReviewService.queryById(id)); } @@ -148,7 +141,6 @@ public class HousesReviewController extends BaseController { @Log(title = "购房复审登记", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/registrationManagement") - @RsaSecurityParameter(inDecode = true) public R add(@Validated(AddGroup.class) @RequestBody HousesReviewBo bo) { return toAjax(iHousesReviewService.insertByBo(bo)); } @@ -171,7 +163,6 @@ public class HousesReviewController extends BaseController { @SaCheckPermission("system:review:remove") @Log(title = "购房复审登记", businessType = BusinessType.DELETE) @DeleteMapping("/review") - @RsaSecurityParameter public R remove(Long[] ids) { return toAjax(iHousesReviewService.deleteWithValidByIds(Arrays.asList(ids), true)); } @@ -184,7 +175,6 @@ public class HousesReviewController extends BaseController { */ @Log(title = "购房复审导入", businessType = BusinessType.IMPORT) @SaCheckPermission("system:review:import") - @RsaSecurityParameter @PostMapping(value = "/review/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R importData(@RequestPart("file") MultipartFile file) throws Exception { ExcelResult result = ExcelUtil.importExcel(file.getInputStream(), HousesReviewVo.class, true); @@ -225,7 +215,6 @@ public class HousesReviewController extends BaseController { */ @Log(title = "获取申报材料",businessType = BusinessType.OTHER) @PostMapping("/review/material") - @RsaSecurityParameter(inDecode = true) public R getMaterialInfo(@RequestBody HousesReviewBo bo){ return iHousesReviewService.getMaterialInfo(bo); } @@ -235,7 +224,6 @@ public class HousesReviewController extends BaseController { */ @Log(title = "审核时返回当前人材料",businessType = BusinessType.OTHER) @GetMapping("/getMaterial") - @RsaSecurityParameter public R getMaterialByBusinessId(Long id){ return iHousesReviewService.getMaterialByBusinessId(id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java index 35ab711e0..7470e3e62 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialModuleController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.bo.MaterialModuleBo; import com.ruoyi.system.domain.vo.MaterialModuleVo; import com.ruoyi.system.service.IMaterialModuleService; @@ -44,14 +43,12 @@ public class MaterialModuleController extends BaseController { */ @SaCheckPermission("material:module:list") @GetMapping("/list") - @RsaSecurityParameter public TableDataInfo list(MaterialModuleBo bo, PageQuery pageQuery) { return iMaterialModuleService.queryPageList(bo, pageQuery); } @SaCheckPermission("material:materialList:list") @GetMapping("/materialList") - @RsaSecurityParameter public R materialList(MaterialModuleBo bo) { return iMaterialModuleService.selectMaterialList(bo); } @@ -74,7 +71,6 @@ public class MaterialModuleController extends BaseController { */ @SaCheckPermission("material:module:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long id) { return R.ok(iMaterialModuleService.queryById(id)); } @@ -86,7 +82,6 @@ public class MaterialModuleController extends BaseController { @Log(title = "材料模块", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - @RsaSecurityParameter(inDecode = true) public R add(@Validated(AddGroup.class) @RequestBody MaterialModuleBo bo) { return toAjax(iMaterialModuleService.insertByBo(bo)); } @@ -97,7 +92,6 @@ public class MaterialModuleController extends BaseController { @SaCheckPermission("material:module:edit") @Log(title = "材料模块", businessType = BusinessType.UPDATE) @RepeatSubmit() - @RsaSecurityParameter(inDecode = true) @PutMapping() public R edit(@Validated(EditGroup.class) @RequestBody MaterialModuleBo bo) { return toAjax(iMaterialModuleService.updateByBo(bo)); @@ -111,7 +105,6 @@ public class MaterialModuleController extends BaseController { @SaCheckPermission("material:module:remove") @Log(title = "材料模块", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(Long[] ids) { return toAjax(iMaterialModuleService.deleteWithValidByIds(Arrays.asList(ids), true)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java index 30fa5f285..486cabe24 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/material/MaterialTalentsController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.bo.MaterialTalentsBo; import com.ruoyi.system.domain.vo.MaterialTalentsVo; import com.ruoyi.system.service.IMaterialTalentsService; @@ -42,7 +41,6 @@ public class MaterialTalentsController extends BaseController { */ @SaCheckPermission("material:talents:list") @GetMapping("/list") - @RsaSecurityParameter public R> list(MaterialTalentsBo bo) { List list = iMaterialTalentsService.queryList(bo); return R.ok(list); @@ -66,7 +64,6 @@ public class MaterialTalentsController extends BaseController { */ @SaCheckPermission("material:talents:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long id) { return R.ok(iMaterialTalentsService.queryById(id)); } @@ -78,7 +75,6 @@ public class MaterialTalentsController extends BaseController { @Log(title = "材料关系", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - @RsaSecurityParameter(inDecode = true) public R add(@Validated(AddGroup.class) @RequestBody MaterialTalentsBo bo) { return toAjax(iMaterialTalentsService.insertByBo(bo)); } @@ -90,7 +86,6 @@ public class MaterialTalentsController extends BaseController { @Log(title = "材料关系", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - @RsaSecurityParameter(inDecode = true) public R edit(@Validated(EditGroup.class) @RequestBody MaterialTalentsBo bo) { return toAjax(iMaterialTalentsService.updateByBo(bo)); } @@ -103,7 +98,6 @@ public class MaterialTalentsController extends BaseController { @SaCheckPermission("material:talents:remove") @Log(title = "材料关系", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(Long[] ids) { return toAjax(iMaterialTalentsService.deleteWithValidByIds(Arrays.asList(ids), true)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RsaSecurityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RsaSecurityController.java index 95d8ca581..3b61924ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RsaSecurityController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RsaSecurityController.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SubscribeExportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SubscribeExportController.java index e19061f66..5ee97cc7e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SubscribeExportController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SubscribeExportController.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.Arrays; import java.util.concurrent.TimeUnit; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.*; @@ -45,7 +44,6 @@ public class SubscribeExportController extends BaseController { */ @SaCheckPermission("system:export:list") @GetMapping("/list") - @RsaSecurityParameter public TableDataInfo list(SubscribeExportBo bo, PageQuery pageQuery) { return iSubscribeExportService.queryPageList(bo, pageQuery); } @@ -79,7 +77,6 @@ public class SubscribeExportController extends BaseController { @Log(title = "预约导出", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - @RsaSecurityParameter(inDecode = true) public R add(@Validated(AddGroup.class) @RequestBody SubscribeExportBo bo) { return toAjax(iSubscribeExportService.insertByBo(bo)); } @@ -91,7 +88,6 @@ public class SubscribeExportController extends BaseController { @Log(title = "预约导出", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() - @RsaSecurityParameter(inDecode = true) public R edit(@Validated(EditGroup.class) @RequestBody SubscribeExportBo bo) { return toAjax(iSubscribeExportService.updateByBo(bo)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index e5340eff5..76f0ca914 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; @@ -35,7 +34,6 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:list") @GetMapping("/list") - @RsaSecurityParameter public TableDataInfo list(SysConfig config, PageQuery pageQuery) { return configService.selectPageConfigList(config, pageQuery); } @@ -58,7 +56,6 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long configId) { return R.ok(configService.selectConfigById(configId)); } @@ -69,7 +66,6 @@ public class SysConfigController extends BaseController { * @param configKey 参数Key */ @GetMapping(value = "/configKey") - @RsaSecurityParameter public R getConfigKey(String configKey) { return R.ok(configService.selectConfigByKey(configKey)); } @@ -80,7 +76,6 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - @RsaSecurityParameter(inDecode = true) public R add(@Validated @RequestBody SysConfig config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); @@ -95,7 +90,6 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping - @RsaSecurityParameter(inDecode = true) public R edit(@Validated @RequestBody SysConfig config) { if (!configService.checkConfigKeyUnique(config)) { return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); @@ -110,7 +104,6 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) @PutMapping("/updateByKey") - @RsaSecurityParameter(inDecode = true) public R updateByKey(@RequestBody SysConfig config) { configService.updateConfig(config); return R.ok(); @@ -124,7 +117,6 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(Long[] configIds) { configService.deleteConfigByIds(configIds); return R.ok(); @@ -136,7 +128,6 @@ public class SysConfigController extends BaseController { @SaCheckPermission("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - @RsaSecurityParameter public R refreshCache() { configService.resetConfigCache(); return R.ok(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 5259903f3..fa72b9fdb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.service.ISysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -47,7 +46,6 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:list") @GetMapping("/list/exclude") - @RsaSecurityParameter public R> excludeChild(Long deptId) { List depts = deptService.selectDeptList(new SysDept()); depts.removeIf(d -> d.getDeptId().equals(deptId) @@ -62,7 +60,6 @@ public class SysDeptController extends BaseController { */ @SaCheckPermission("system:dept:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); @@ -74,7 +71,6 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:add") @Log(title = "部门管理", businessType = BusinessType.INSERT) @PostMapping - @RsaSecurityParameter(inDecode = true) public R add(@Validated @RequestBody SysDept dept) { if (!deptService.checkDeptNameUnique(dept)) { return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); @@ -88,7 +84,6 @@ public class SysDeptController extends BaseController { @SaCheckPermission("system:dept:edit") @Log(title = "部门管理", businessType = BusinessType.UPDATE) @PutMapping - @RsaSecurityParameter(inDecode = true) public R edit(@Validated @RequestBody SysDept dept) { Long deptId = dept.getDeptId(); deptService.checkDeptDataScope(deptId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index c7a0710f9..8bddd2c7e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -10,7 +10,6 @@ import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; @@ -40,7 +39,6 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - @RsaSecurityParameter public TableDataInfo list(SysDictData dictData, PageQuery pageQuery) { return dictDataService.selectPageDictDataList(dictData, pageQuery); } @@ -63,7 +61,6 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long dictCode) { return R.ok(dictDataService.selectDictDataById(dictCode)); } @@ -74,7 +71,6 @@ public class SysDictDataController extends BaseController { * @param dictType 字典类型 */ @GetMapping(value = "/type") -// @RsaSecurityParameter public R> dictType(String dictType) { List data = dictTypeService.selectDictDataByType(dictType); if (ObjectUtil.isNull(data)) { @@ -89,7 +85,6 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping - @RsaSecurityParameter(inDecode = true) public R add(@Validated @RequestBody SysDictData dict) { dictDataService.insertDictData(dict); return R.ok(); @@ -101,7 +96,6 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping - @RsaSecurityParameter(inDecode = true) public R edit(@Validated @RequestBody SysDictData dict) { dictDataService.updateDictData(dict); return R.ok(); @@ -115,7 +109,6 @@ public class SysDictDataController extends BaseController { @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return R.ok(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index 375db797f..350c06980 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -45,7 +44,6 @@ public class SysDictTypeController extends BaseController { @Log(title = "字典类型", businessType = BusinessType.EXPORT) @SaCheckPermission("system:dict:export") @PostMapping("/export") - @RsaSecurityParameter(inDecode = true) public void export(SysDictType dictType, HttpServletResponse response) { List list = dictTypeService.selectDictTypeList(dictType); ExcelUtil.exportExcel(list, "字典类型", SysDictType.class, response); @@ -58,7 +56,6 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:query") @GetMapping - @RsaSecurityParameter public R getInfo(Long dictId) { return R.ok(dictTypeService.selectDictTypeById(dictId)); } @@ -69,7 +66,6 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:add") @Log(title = "字典类型", businessType = BusinessType.INSERT) @PostMapping - @RsaSecurityParameter(inDecode = true) public R add(@Validated @RequestBody SysDictType dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在"); @@ -84,7 +80,6 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:edit") @Log(title = "字典类型", businessType = BusinessType.UPDATE) @PutMapping - @RsaSecurityParameter(inDecode = true) public R edit(@Validated @RequestBody SysDictType dict) { if (!dictTypeService.checkDictTypeUnique(dict)) { return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在"); @@ -101,7 +96,6 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping - @RsaSecurityParameter public R remove(Long[] dictIds) { dictTypeService.deleteDictTypeByIds(dictIds); return R.ok(); @@ -113,7 +107,6 @@ public class SysDictTypeController extends BaseController { @SaCheckPermission("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - @RsaSecurityParameter public R refreshCache() { dictTypeService.resetDictCache(); return R.ok(); @@ -123,7 +116,6 @@ public class SysDictTypeController extends BaseController { * 获取字典选择框列表 */ @GetMapping("/optionselect") - @RsaSecurityParameter public R> optionselect() { List dictTypes = dictTypeService.selectDictTypeAll(); return R.ok(dictTypes); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 307dd739f..f2e475ddc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -15,7 +15,6 @@ import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StrUtils; import com.ruoyi.common.utils.redis.RedisUtils; import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.sms.core.SmsTemplate; import com.ruoyi.sms.entity.SmsResult; import com.ruoyi.system.domain.vo.RouterVo; @@ -53,7 +52,6 @@ public class SysLoginController { */ @SaIgnore @PostMapping("/login") - @RsaSecurityParameter(inDecode = true) public R> login( // @Validated({LoginBody.passwordLogin.class}) @RequestBody LoginBody loginBody) { @@ -74,7 +72,6 @@ public class SysLoginController { */ @SaIgnore @PostMapping("/smsLogin") - @RsaSecurityParameter(inDecode = true) public R> smsLogin( @Validated({LoginBody.smgLogin.class}) @RequestBody SmsLoginBody smsLoginBody) { @@ -120,7 +117,6 @@ public class SysLoginController { * 退出登录 */ @SaIgnore - @RsaSecurityParameter @PostMapping("/logout") public R logout() { loginService.logout(); @@ -132,7 +128,6 @@ public class SysLoginController { * @return 用户信息 */ @GetMapping("getInfo") - @RsaSecurityParameter public R> getInfo() { LoginUser loginUser = LoginHelper.getLoginUser(); SysUser user = userService.selectUserById(loginUser.getUserId()); @@ -163,7 +158,6 @@ public class SysLoginController { */ @SaIgnore @RateLimiter(count = 2, time = 10) - @RsaSecurityParameter(inDecode = true) @PostMapping("/userLogin") public R userLogin( // @Validated({LoginBody.passwordLogin.class}) @@ -180,7 +174,6 @@ public class SysLoginController { */ @SaIgnore // @RateLimiter(count = 2, time = 10) - @RsaSecurityParameter(inDecode = true) @PostMapping("/userSmsLogin") public R> userSmsLogin(@Validated(LoginBody.smgLogin.class) @RequestBody LoginBody loginBody) { Map ajax = new HashMap<>(); @@ -197,7 +190,6 @@ public class SysLoginController { */ @SaIgnore @RateLimiter(count = 1, time = 10) - @RsaSecurityParameter(inDecode = true) @PostMapping("/userUpdatePwd") public R userUpdatePwd(@Validated(LoginBody.forgetPasswordLogin.class) @RequestBody LoginBody loginBody) { return loginService.userUpdatePwd(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode()); @@ -211,7 +203,6 @@ public class SysLoginController { @SaIgnore @RateLimiter(count = 1, time = 10) @PostMapping("/userRegister") - @RsaSecurityParameter(inDecode = true) public R userRegister(@Validated(LoginBody.registerUser.class) @RequestBody LoginBody loginBody) { return loginService.userRegister(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode()); } @@ -223,7 +214,6 @@ public class SysLoginController { */ // @RateLimiter(count = 1) @SaIgnore - @RsaSecurityParameter() @GetMapping("/forgotSendAliYun") public R forgotSendAliYun(String phones) { boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$"); @@ -240,7 +230,6 @@ public class SysLoginController { */ // @RateLimiter(count = 1,time = 20) @SaIgnore - @RsaSecurityParameter @GetMapping("/registerSendAliYun") public R registerSendAliYun(String phones) { boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$"); @@ -258,7 +247,6 @@ public class SysLoginController { // @RateLimiter(count = 1,time = 20) @SaIgnore @GetMapping("/smsLoginSendAliYun") - @RsaSecurityParameter public R smsLoginSendAliYun(String phones) { boolean matches = phones.matches("^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$"); if (!matches) { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 6af4e062c..caa931a52 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -9,7 +9,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.service.ISysMenuService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index a0a5c2082..95fb52c9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java index 328af0bc0..4139cc869 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.ruoyi.system.domain.vo.SysOssConfigVo; import com.ruoyi.system.service.ISysOssConfigService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index bbaa69824..97fad849a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -11,7 +11,6 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index a9ed3f840..548bffec7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -8,7 +8,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 6f00bf9da..cbf0822fb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -10,7 +10,6 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysUserService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index 85e514507..26445820e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaIgnore; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.SysRegisterService; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 55eb48dbc..3ecca0509 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -16,7 +16,6 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysRoleService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index db92c116e..b181353b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -20,7 +20,6 @@ import com.ruoyi.common.helper.LoginHelper; import com.ruoyi.common.utils.StreamUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.vo.SysUserExportVo; import com.ruoyi.system.domain.vo.SysUserImportVo; import com.ruoyi.system.listener.SysUserImportListener; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java index 852ab1fcf..5392497a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/HouseController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.user; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONObject; @@ -14,7 +15,6 @@ import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.DownloadGroup; import com.ruoyi.common.core.validate.EditGroup; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.system.domain.BuyHouses; import com.ruoyi.system.domain.bo.BuyHousesBo; import com.ruoyi.system.service.IBuyHousesService; @@ -95,7 +95,6 @@ public class HouseController extends BaseController { * 通过调用高新人才判断该身份证是否具备人才资格 */ @PostMapping("/CandidatesInfo") - @RsaSecurityParameter(inDecode = true) public R getGaoXinCandidateInfoByCardId(@RequestBody BuyHouses buyHouses){ String cardId = buyHouses.getCardId(); if (ObjectUtil.isNull(cardId) || ObjectUtil.isEmpty(cardId)){ @@ -103,8 +102,9 @@ public class HouseController extends BaseController { } return iBuyHousesService.getGaoXinCandidateInfoByCardId(cardId); } + + @GetMapping("/checkStatus") - @RsaSecurityParameter public R checkStatus(){ return iBuyHousesService.checkStatus(); } @@ -114,30 +114,21 @@ public class HouseController extends BaseController { * @return */ @GetMapping("/buyHouseLogs") - @RsaSecurityParameter public R getBuyHouseLog(){ return iBuyHousesService.getBuyHousesLogsByUserId(); } /** * 外部推送接口 - * @param buyHouse + * @param bo * @return * @throws InterruptedException */ @Log(title = "【外部推送接口】", businessType = BusinessType.OTHER) @RepeatSubmit() @PostMapping("/insertOpenBuyHouses") - public R insertOpenBuyHouses(@RequestBody BuyHouses buyHouse){ - /*CCSMessageDigest wxDigest = CCSMessageDigest.getInstance(); - R r = wxDigest.checkSign(httpRequestBody); - if (r.getCode()==200){ - BuyHouses buyHouses = (BuyHouses)r.getData(); - buyHouses.setApiKey(httpRequestBody.getApiKey()); - return iBuyHousesService.insertOpenBuyHouses(buyHouses); - } - return R.fail(r.getMsg());*/ - buyHouse.setApiKey("gxgycsj"); - return iBuyHousesService.insertOpenBuyHouses(buyHouse); + public R insertOpenBuyHouses(@Validated(EditGroup.class)@RequestBody BuyHousesBo bo){ + bo.setApiKey("gaoxingongyuanchengshiju"); + return iBuyHousesService.insertOpenBuyHouses(bo); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java index 8dfeabe3f..1189458ca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java @@ -9,11 +9,8 @@ import java.util.concurrent.TimeUnit; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.Constants; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.rsaencrypt.annotation.RsaSecurityParameter; import com.ruoyi.work.domain.ActProcess; -import com.ruoyi.work.domain.HisProcess; import com.ruoyi.work.domain.TProcess; import com.ruoyi.work.domain.vo.ProcessVo; import com.ruoyi.work.dto.ProcessVoResultDto; @@ -131,7 +128,6 @@ public class UserController extends BaseController { @SaIgnore @Log(title = "获取当前业务运行到那一步",businessType = BusinessType.OTHER) @PostMapping("/processPlan") - @RsaSecurityParameter(inDecode = true,outEncode = false) public R processPlan(@RequestBody ActProcess actProcess){ List tProcesses = processMapper.selectList(new LambdaQueryWrapper() .eq(TProcess::getProcessKey, actProcess.getProcessKey())); @@ -151,14 +147,11 @@ public class UserController extends BaseController { @Log(title = "对外提供步骤接口",businessType = BusinessType.OTHER) @PostMapping("/stepProcessPlan") - @RsaSecurityParameter(inDecode = true,outEncode = false) public R stepProcessPlan(@RequestBody ActProcess actProcess){ + actProcess.setProcessKey("apply_house"); if (ObjectUtil.isNull(actProcess.getBusinessId())){ return R.fail("必要参数不可为空"); } - if (ObjectUtil.isNull(actProcess.getProcessKey())){ - return R.fail("必要参数不可为空"); - } if (ObjectUtil.isNull(actProcess.getApiKey())){ return R.fail("必要参数不可为空"); } diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index a065d13dc..0cba3b940 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -106,7 +106,8 @@ spring: spring: redis: # 地址 - host: 182.42.81.18 +# host: 182.42.81.18 + host: 172.12.9.2 # host: 127.0.0.1 # 端口，默认为6379 port: 6379 @@ -188,8 +189,8 @@ sms: #Linux dev file: - domain: https://mihuatang.xyz - path: /home/taxi/images + domain: https://rcaj.cdhtgycs.cn + path: /usr/local/images prefix: /images size: 10 template: /usr/local/template/ diff --git a/ruoyi-admin/src/main/resources/spy.properties b/ruoyi-admin/src/main/resources/spy.properties index abbd8931d..3490d78b2 100644 --- a/ruoyi-admin/src/main/resources/spy.properties +++ b/ruoyi-admin/src/main/resources/spy.properties @@ -7,7 +7,7 @@ appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger # 使用日志系统记录 sql #appender=com.p6spy.engine.spy.appender.Slf4JLogger # 设置 p6spy driver 代理 -#deregisterdrivers=true +deregisterdrivers=true # 取消JDBC URL前缀 useprefix=true # 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset. diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java index 9b9cdc3af..8b9dec7b7 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java @@ -2,8 +2,8 @@ package com.ruoyi.test; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.resource.ClassPathResource; +import cn.hutool.core.util.IdcardUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; @@ -29,8 +29,6 @@ import com.ruoyi.common.utils.AesUtil; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.demo.domain.ImageDemoData; -import com.ruoyi.mq.service.OrderService; -import com.ruoyi.mq.service.Produceras; import com.ruoyi.system.domain.*; import com.ruoyi.system.domain.vo.HousesReviewVo; import com.ruoyi.system.domain.vo.MaterialTalentsVo; @@ -53,9 +51,6 @@ import com.ruoyi.work.utils.WorkComplyUtils; import org.apache.commons.text.CaseUtils; import org.bouncycastle.crypto.engines.SM2Engine; import org.junit.jupiter.api.*; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.core.MessageProperties; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.util.ReflectionUtils; @@ -125,14 +120,14 @@ public class DemoUnitTest { @Autowired private HousingConstructionBureauPushDto housingConstructionBureauPushDto; - @Autowired + /*@Autowired private Produceras providerCustomer; @Autowired private OrderService orderService; @Autowired - private RabbitTemplate amqpTemplate; + private RabbitTemplate amqpTemplate;*/ @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") @@ -206,15 +201,16 @@ public class DemoUnitTest { @Test public void test002(){ ProcessVo processVo = new ProcessVo(); - processVo.setProcessKey("apply_jn"); + processVo.setProcessKey("apply_house"); processVo.setStep("1"); - BuyHouses buyHouses = buyHousesMapper.selectById("10"); + BuyHouses buyHouses = buyHousesMapper.selectById("12"); buyHouses.setUpdateTime(DateUtils.getNowDate()); - buyHouses.setCompanyId("100"); Map map = BeanUtil.beanToMap(buyHouses); processVo.setParams(map); - processVo.setBusinessId("10"); + processVo.setBusinessId(buyHouses.getId().toString()); processVo.setStartUser(buyHouses.getUserName()); + processVo.setCardId(buyHouses.getCardId()); + processVo.setCompanyName(buyHouses.getCompanyName()); WorkComplyUtils.comply(processVo); } @@ -228,19 +224,22 @@ public class DemoUnitTest { hisProcess.setParams(map); hisProcess.setProcessKey(buyHouses.getProcessKey()); hisProcess.setStartUser(buyHouses.getUserName()); - String s = WorkComplyUtils.batchDeleted(hisProcess,null); - System.out.println("s = " + s); + Map map1 = WorkComplyUtils.batchDeleted(hisProcess, null); + System.out.println("s = " + map1); } @Test public void test004(){ - BusinessDTO businessDTO = new BusinessDTO(); + /*BusinessDTO businessDTO = new BusinessDTO(); // BuyHouses buyHouses = buyHousesMapper.selectById("1011"); HousesReview housesReview = housesReviewMapper.selectById("1633344911078064130"); Map map = BeanUtil.beanToMap(housesReview); businessDTO.setParams(map); businessDTO.setBusinessId(housesReview.getId().toString()); - WorkComplyUtils.getStep(businessDTO); + WorkComplyUtils.getStep(businessDTO);*/ + + boolean validCard = IdcardUtil.isValidCard("51050319960221405X"); + System.out.println("validCard = " + validCard); } @Test @@ -362,10 +361,10 @@ public class DemoUnitTest { // System.out.println("processPlan = " +processPlan) ; } - @Test - public void test00000(){ - processMapper.updateCommonByBusinessId("buy_houses", Constants.FAILD,"2"); - } +// @Test +// public void test00000(){ +// processMapper.updateCommonByBusinessId("buy_houses", Constants.FAILD,"2"); +// } @Test public void tests1245545(){ @@ -464,6 +463,8 @@ public class DemoUnitTest { @Test public void test4454545() throws Exception { Keypair keypair = Sm2.generateKeyPairHex(); + String publicKey1 = keypair.getPublicKey(); + String privateKey = "9cefdfcb925a32e10206d3a693ba204632c59e5f9a171faebb814885191dd35e"; System.out.println("privateKey = " + privateKey); String publicKey = "0435661bb2d13bba88f47af0bbe243fcded8f27ac298932661787f88ea283c2b31fe427e1aa8410826a963e9114fe5ffab4ad278aeeb7f1f161e735d1f50570e78"; @@ -579,7 +580,7 @@ public class DemoUnitTest { .header("Referer","http://192.168.0.54:8084") .header("path","/user/house/insertOpenBuyHouses") .header("method","POST") - .body(doDecrypt,"application/json") + .body(doEncrypt,"application/json") .execute().body(); System.out.println("result2 = " + result2); } @@ -604,25 +605,27 @@ public class DemoUnitTest { } /** - * 登录接口 + * 查看日志接口 */ @Test public void test0002(){ String publicKey="0435661bb2d13bba88f47af0bbe243fcded8f27ac298932661787f88ea283c2b31fe427e1aa8410826a963e9114fe5ffab4ad278aeeb7f1f161e735d1f50570e78"; +// String publicKey="04eea960591fff39b445b289faf56f755a1c895de57dfa3ca6ab2c84d2b5429cad1444809d941e4a0ed168bd226d0bf28a016389f26ea8506039da5db6a93a79f6"; HashMap map = new HashMap<>(); - map.put("businessId","15808234569");//用户标识符 - map.put("processKey","apply_house");//使用方唯一key + map.put("businessId","2819");//用户标识符 map.put("apiKey","gaoxingongyuanchengshiju");//使用方唯一key String s = JSONUtil.toJsonPrettyStr(map); String doEncrypt = Sm2.doEncrypt(s, publicKey); - String result2 = HttpRequest.post("http://192.168.0.54:8084/user/house/stepProcessPlan") - .header("Referer","http://192.168.0.54:8084") - .header("path","/user/house/stepProcessPlan") +// String result2 = HttpRequest.post("https://dbxqtalents.cn/gx-api/user/stepProcessPlan") + String result2 = HttpRequest.post("http://127.0.0.1:8084/user/stepProcessPlan") + .header("Referer","https://dbxqtalents.cn/gx-api") + .header("path","/user/stepProcessPlan") .header("targe","weixin") - .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjo0Mzc4OSIsInJuU3RyIjoiV05XZFFnaHpHYlRRRU5ObVpwbmhaaFp6MmtKaWtSR0MiLCJ1c2VySWQiOjQzNzg5fQ.QCsN3iIFk38dzTvXITGx2wV5c9kdPdvWZs7gjf6dFzc") + .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoxIiwicm5TdHIiOiJUNjZNSjBIckwzcjF1YkFsQlFTem4yNTdjdDhTc2l2cyIsInVzZXJJZCI6MX0.qbEbSQ7ZElegj_1-BKs3xzDfBuZHBItQzJkNaMv0Lrs") .header("method","POST") .body(doEncrypt,"application/json") .execute().body(); + System.out.println("result2 = " + result2); } /** @@ -634,17 +637,19 @@ public class DemoUnitTest { HashMap map = new HashMap<>(); map.put("username","15808234569"); map.put("apiKey","gaoxingongyuanchengshiju"); - BuyHouses buyHouses = buyHousesMapper.selectById("3"); String s = JSONUtil.toJsonPrettyStr(map); String doEncrypt = Sm2.doEncrypt(s, publicKey); - String result2 = HttpRequest.post("http://192.168.0.54:8084/userOpenLogin") - .header("Referer","http://192.168.0.54:8084") +// String result2 = HttpRequest.post("https://dbxqtalents.cn/gx-api/userOpenLogin") +// String result2 = HttpRequest.post("http://192.168.0.54:8084/userOpenLogin") + String result2 = HttpRequest.post("http://ljlcom.gnway.cc/userOpenLogin") + .header("Referer","https://dbxqtalents.cn/gx-api") .header("path","/userOpenLogin") .header("targe","weixin") .header("Authorization","Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJhcHBfdXNlcjo0Mzc4OSIsInJuU3RyIjoiV05XZFFnaHpHYlRRRU5ObVpwbmhaaFp6MmtKaWtSR0MiLCJ1c2VySWQiOjQzNzg5fQ.QCsN3iIFk38dzTvXITGx2wV5c9kdPdvWZs7gjf6dFzc") .header("method","POST") .body(doEncrypt,"application/json") .execute().body(); + System.out.println("result2 = " + result2); } /** @@ -741,12 +746,12 @@ public class DemoUnitTest { public void test15234523(){ // providerCustomer.sendDelayMsg("延迟队列测试",3); String msg ="我来了"; - MessageProperties messageProperties = new MessageProperties(); + /* MessageProperties messageProperties = new MessageProperties(); messageProperties.setHeader("x-delay",5000);//延迟5秒被删除 Message message = new Message(msg.getBytes(), messageProperties); amqpTemplate.convertAndSend("PLUGIN_DELAY_EXCHANGE","delay","123132");//交换机和路由键必须和配置文件类中保持一致 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - System.out.println("消息发送成功【" + sdf.format(new Date()) + "】"); + System.out.println("消息发送成功【" + sdf.format(new Date()) + "】");*/ // orderService.makeOrder(); } @@ -772,4 +777,18 @@ public class DemoUnitTest { // List collect = housesReviewList.stream().filter(h -> h.getPassTime().getMonth() == month).collect(Collectors.toList()); // System.out.println("collect = " + collect); } + + /** + * 获取公钥和私钥 + */ + @Test + public void test0004(){ + Keypair keypair = Sm2.generateKeyPairHex(); + String publicKey = keypair.getPublicKey(); + System.out.println("publicKey = " + publicKey); + + String privateKey = keypair.getPrivateKey(); + System.out.println("privateKey = " + privateKey); + } } + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index ef67ad3c6..24e998c09 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -182,6 +182,13 @@ poi-tl 1.12.1 + + + + com.antherd + sm-crypto + 0.3.2 +