diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java index 73f6380..eefc8fe 100644 --- a/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/RequestCoverFilter.java @@ -80,8 +80,8 @@ public class RequestCoverFilter implements GlobalFilter, Ordered { MediaType contentType = request.getHeaders().getContentType(); if (contentType == null) { log.info("请求头中无Content-Type信息,直接继续过滤链。"); - return chain.filter(exchange); -// return handleUrlParams(exchange, chain); + // return chain.filter(exchange); + return handleUrlParams(exchange, chain); } else if (contentType.isCompatibleWith(MediaType.APPLICATION_JSON)) { return handleBodyRequest(exchange, chain); } else { diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppRecognitionController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppRecognitionController.java index 3cadc13..0a5228a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppRecognitionController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/AppRecognitionController.java @@ -9,6 +9,7 @@ import com.bonus.bmw.domain.vo.TreeVo; import com.bonus.bmw.service.AppRecognitionService; import com.bonus.bmw.service.AppService; import com.bonus.common.core.domain.R; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -79,6 +80,7 @@ public class AppRecognitionController extends BaseController { @PostMapping("/appPlayCard") @SysLog(title = "人脸识别打卡", businessType = OperaType.QUERY, logType = 0, module = "识别服务接口->人脸识别打卡", details = "人脸识别打卡") public AjaxResult appPlayCard(@RequestPart(value = "file")MultipartFile facePhoto, @RequestParam(value = "params")String params){ + params= Sm4Utils.decrypt(params); JSONObject jsonObject = FastJsonHelper.jsonStrToJsonObj(params); System.err.println(jsonObject); String idNumber = jsonObject.getString("idNumber"); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java index e2a5006..3372672 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java @@ -5,6 +5,7 @@ import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.vo.BmSubContractVo; import com.bonus.bmw.service.BmSubContractService; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -64,6 +65,8 @@ public class BmSubContractController extends BaseController { @SysLog(title = "分包商合同信息", businessType = OperaType.UPDATE, logType = 0, module = "分包商合同信息->新增和修改分包商合同信息") public AjaxResult addOrUpdateSubContract(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); BmSubContract bmSubContract = FastJsonHelper.jsonStrToBean(params, BmSubContract.class); int res = bmSubContractService.addOrUpdateSubContract(bmSubContract,new FileBasicMsgDto(listFile, files)); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java index 0ba463b..903f4ef 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerContractController.java @@ -7,6 +7,7 @@ import com.bonus.bmw.service.BmWorkerContractService; import com.bonus.bmw.service.impl.BmWorkerContractServiceImpl; import com.bonus.bmw.service.impl.FileUploadUtils; import com.bonus.common.core.utils.StringUtils; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -120,6 +121,8 @@ public class BmWorkerContractController extends BaseController { @SysLog(title = "合同管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->红绿灯管理->合同管理", details = "修改合同") public AjaxResult edit(@RequestParam(value = "files") MultipartFile[] files,@RequestParam(value = "fileMsg") String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); BmWorkerContract o = FastJsonHelper.jsonStrToBean(params, BmWorkerContract.class); //先将数据对应关系处理还 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java index 3229904..92b9241 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmWorkerWageCardController.java @@ -3,6 +3,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.vo.BmWorkerWageCard; import com.bonus.bmw.service.BmWorkerWageCardService; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -76,6 +77,8 @@ public class BmWorkerWageCardController extends BaseController { @SysLog(title = "工资卡管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->红绿灯管理->工资卡管理", details = "修改工资卡") public AjaxResult edit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); BmWorkerWageCard o = FastJsonHelper.jsonStrToBean(params, BmWorkerWageCard.class); //先将数据对应关系处理还 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java index 90e4b25..b87fdf3 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubController.java @@ -4,6 +4,7 @@ import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.po.PmSub; import com.bonus.bmw.service.PmSubService; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -62,6 +63,8 @@ public class PmSubController extends BaseController { @SysLog(title = "分包商管理", businessType = OperaType.UPDATE, logType = 0, module = "分包商管理->新增和修改分包商") public AjaxResult addOrUpdateSub(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); PmSub pmSub = FastJsonHelper.jsonStrToBean(params, PmSub.class); int res = pmSubService.addOrUpdateSub(pmSub,new FileBasicMsgDto(listFile, files)); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java index cb62cc4..ef03bbb 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java @@ -4,6 +4,7 @@ import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.po.PmSubTeamContract; import com.bonus.bmw.service.PmSubTeamContractService; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -63,6 +64,8 @@ public class PmSubTeamContractController extends BaseController { @SysLog(title = "分包班组入场信息管理", businessType = OperaType.UPDATE, logType = 0, module = "分包班组入场信息管理->新增和修改分包班组信息") public AjaxResult addOrUpdateSubTeamContract(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); PmSubTeamContract pmSubTeamContract = FastJsonHelper.jsonStrToBean(params, PmSubTeamContract.class); int res = pmSubTeamContractService.addOrUpdateSubTeamContract(pmSubTeamContract,new FileBasicMsgDto(listFile, files)); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java index 3c1925f..aedd664 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerController.java @@ -7,6 +7,7 @@ import com.bonus.bmw.domain.vo.BmWorkerWageCard; import com.bonus.bmw.domain.vo.PmWorker; import com.bonus.bmw.service.PmWorkerService; import com.bonus.bmw.service.impl.PmWorkerServiceImpl; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.face.ArcFaceHelper; import com.bonus.common.core.utils.face.FaceResult; import com.bonus.common.core.utils.json.FastJsonHelper; @@ -75,6 +76,8 @@ public class PmWorkerController extends BaseController { @SysLog(title = "新增人员入场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "新增人员入场") public AjaxResult insert(@RequestParam(value = "files") MultipartFile[] files,@RequestParam(value = "fileMsg") String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); // 验证对应关系 if (listFile.size() != files.length) { @@ -114,6 +117,8 @@ public class PmWorkerController extends BaseController { @SysLog(title = "人员入场管理", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员入场管理", details = "修改人员入场") public AjaxResult edit(@RequestParam(value = "files",required = false) MultipartFile[] files,@RequestParam(value = "fileMsg",required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = new ArrayList<>(); if(files != null && files.length > 0){ listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java index 04f79ae..2883dfb 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmWorkerExitController.java @@ -7,6 +7,7 @@ import com.bonus.bmw.domain.vo.PmWorker; import com.bonus.bmw.domain.vo.PmWorkerExitExport; import com.bonus.bmw.service.PmWorkerExitService; import com.bonus.bmw.service.impl.PmWorkerServiceImpl; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -74,6 +75,8 @@ public class PmWorkerExitController extends BaseController { @SysLog(title = "人员出场", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场") public AjaxResult exit(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); PmWorkerDto o = FastJsonHelper.jsonStrToBean(params, PmWorkerDto.class); //先将数据对应关系处理还 @@ -112,6 +115,8 @@ public class PmWorkerExitController extends BaseController { @SysLog(title = "人员出场-补文件", businessType = OperaType.UPDATE, logType = 0, module = "施工人员->出入场管理->人员出场管理", details = "人员出场-补文件") public AjaxResult exitFile(@RequestParam(value = "files",required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params")String params) { try { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); PmWorkerDto o = FastJsonHelper.jsonStrToBean(params, PmWorkerDto.class); //先将数据对应关系处理还 diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java index ffc602e..2ca7ce9 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/RepairCardApplyController.java @@ -3,6 +3,7 @@ package com.bonus.bmw.controller; import com.bonus.bmw.domain.dto.*; import com.bonus.bmw.domain.po.PmSub; import com.bonus.bmw.service.RepairCardApplyService; +import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.core.utils.json.FastJsonHelper; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; @@ -128,6 +129,8 @@ public class RepairCardApplyController extends BaseController { */ @PostMapping("/saveRepairCardApply") public AjaxResult saverepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class); AjaxResult ajaxResult = repairCardApplyMapper.saverepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files)); @@ -142,6 +145,8 @@ public class RepairCardApplyController extends BaseController { */ @PostMapping("/updateRepairCardApply") public AjaxResult updateRepairCardApply(@RequestParam(value = "file", required = false) MultipartFile[] files, @RequestParam(value = "fileMsg", required = false) String fileMsg, @RequestParam(value = "params") String params) { + params= Sm4Utils.decrypt(params); + fileMsg= Sm4Utils.decrypt(fileMsg); List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); RepairCardApplyDto cardApplyDto = FastJsonHelper.jsonStrToBean(params, RepairCardApplyDto.class); AjaxResult ajaxResult = repairCardApplyMapper.updateRepairCardApply(cardApplyDto, new FileBasicMsgDto(listFile, files)); diff --git a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml index 04ab7b9..790dc0d 100644 --- a/bonus-modules/bonus-system/src/main/resources/bootstrap.yml +++ b/bonus-modules/bonus-system/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: bonus-system profiles: # 环境配置 - active: local + active: dev task: scheduling: pool: