From 8815264f2036d2f7aa239854156d9203e9516d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CFiboAI=E2=80=9D?= <“[git@fiboai.cn]”> Date: Fri, 24 Dec 2021 12:09:00 +0800 Subject: [PATCH] update some small bug --- .../riskmanage/common/basefactory/ServiceFactory.java | 2 -- .../datamanage/controller/v2/FieldController.java | 2 +- .../datamanage/service/imp/FieldTypeServiceImp.java | 4 +--- .../datasource/controller/DataSourceController.java | 6 +++--- .../interfacemanage/controller/InterfaceController.java | 8 ++++---- .../riskmanage/rule/controller/RuleInfoController.java | 2 +- .../riskmanage/rule/controller/RuleVersionController.java | 8 ++++---- .../system/controller/v2/SysMenuController.java | 2 +- .../src/main/resources/application-dev.properties | 8 ++++---- 9 files changed, 19 insertions(+), 23 deletions(-) diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/common/basefactory/ServiceFactory.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/common/basefactory/ServiceFactory.java index 071195c..cfcbdfc 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/common/basefactory/ServiceFactory.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/common/basefactory/ServiceFactory.java @@ -18,8 +18,6 @@ import javax.annotation.Resource; public class ServiceFactory { - - /** * 后台用户管理Service. */ diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/controller/v2/FieldController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/controller/v2/FieldController.java index c7fb92d..2257061 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/controller/v2/FieldController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/controller/v2/FieldController.java @@ -858,7 +858,7 @@ public class FieldController extends BaseController { } @PostMapping(value = "/updateFieldFolder") - @ArchivesLog(operationType = OpTypeConst.UPDATE_FIELD_FOLDER) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_FIELD_FOLDER) public ResponseEntityDto updateFieldFolder(@RequestBody UpdateFolderParam param){ UpdateFolderParam.checkNotNull(param); int result = s.fieldService.updateFieldFolder(param); diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/service/imp/FieldTypeServiceImp.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/service/imp/FieldTypeServiceImp.java index 1a301e6..b4d8b37 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/service/imp/FieldTypeServiceImp.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datamanage/service/imp/FieldTypeServiceImp.java @@ -1,7 +1,6 @@ package com.risk.riskmanage.datamanage.service.imp; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -17,8 +16,7 @@ import com.risk.riskmanage.datamanage.service.FieldTypeService; import javax.annotation.Resource; @Service -public class FieldTypeServiceImp extends BaseService implements - FieldTypeService { +public class FieldTypeServiceImp extends BaseService implements FieldTypeService { @Resource @Override diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datasource/controller/DataSourceController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datasource/controller/DataSourceController.java index ebfe65f..6dbc744 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/datasource/controller/DataSourceController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/datasource/controller/DataSourceController.java @@ -24,14 +24,14 @@ public class DataSourceController { DataSourceService dataSourceService; @RequestMapping(value = "save", method = RequestMethod.POST) - @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_SAVE) +// @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_SAVE) public ResponseEntityDto save(@RequestBody DataSourceVo dataSourceVo) { Integer result = dataSourceService.saveDataSource(dataSourceVo); return ResponseEntityBuilder.buildNormalResponse(result); } @RequestMapping(value = "update", method = RequestMethod.POST) - @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_MODIFY) +// @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_MODIFY) public ResponseEntityDto update(@RequestBody DataSourceVo dataSourceVo) { Integer result = dataSourceService.updateDataSource(dataSourceVo); return ResponseEntityBuilder.buildNormalResponse(result); @@ -50,7 +50,7 @@ public class DataSourceController { } @RequestMapping(value = "/{id}", method = RequestMethod.DELETE) - @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_DELETE) +// @ArchivesLog(operationType = OpTypeConst.DATA_SOURCE_DELETE) public ResponseEntityDto deleteDataSourceById(@PathVariable Integer id) { Integer result = dataSourceService.deleteDataSourceById(id); return ResponseEntityBuilder.buildNormalResponse(result); diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/interfacemanage/controller/InterfaceController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/interfacemanage/controller/InterfaceController.java index ce597cc..8ec04e3 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/interfacemanage/controller/InterfaceController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/interfacemanage/controller/InterfaceController.java @@ -91,7 +91,7 @@ public class InterfaceController { //添加接口 @PostMapping("addInterface") - @ArchivesLog(operationType = OpTypeConst.ADD_INTERFACE) +// @ArchivesLog(operationType = OpTypeConst.ADD_INTERFACE) public ResponseEntityDto addInterface(@RequestBody InterfaceVo interfaceVo ) { InterfaceVo insert = interfaceService.inserInterfaceInfo(interfaceVo); ResponseEntityDto ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert); @@ -100,7 +100,7 @@ public class InterfaceController { //删除接口 @PostMapping("deleteInterface") - @ArchivesLog(operationType = OpTypeConst.DELETE_INTERFACE) +// @ArchivesLog(operationType = OpTypeConst.DELETE_INTERFACE) public ResponseEntityDto deleteInterface(@RequestBody InterfaceVo interfaceVo ) { Boolean bool = interfaceService.deleteInterfaceInfo(interfaceVo); ResponseEntityDto ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(bool); @@ -109,7 +109,7 @@ public class InterfaceController { //编辑接口 @PostMapping("updateInterface") - @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE) public ResponseEntityDto updateInterface(@RequestBody InterfaceVo interfaceVo ) { InterfaceVo insert = interfaceService.updateInterfaceInfo(interfaceVo); ResponseEntityDto ruleResponseEntityDto = ResponseEntityBuilder.buildNormalResponse(insert); @@ -118,7 +118,7 @@ public class InterfaceController { //批量更新接口状态 @PostMapping("updateInterfaceStatus") - @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE_STATUS) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_INTERFACE_STATUS) public ResponseEntityDto updateStatus(@RequestBody InterfaceUpdateStatusParam param) { Long[] ids = param.getIds(); Integer status = param.getStatus(); diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleInfoController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleInfoController.java index e066cae..b6e4aa2 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleInfoController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleInfoController.java @@ -233,7 +233,7 @@ public class RuleInfoController { // 查询简单规则 @ResponseBody @RequestMapping(value = "getSimpleRule/{id}", method = RequestMethod.POST) - @ArchivesLog(operationType = OpTypeConst.SELECT_SAMPLE_RULE) +// @ArchivesLog(operationType = OpTypeConst.SELECT_SAMPLE_RULE) public ResponseEntityDto getSimpleRule(@PathVariable Long id) { if (id == null) { throw new ApiException(ErrorCodeEnum.PARAMS_EXCEPTION.getCode(), ErrorCodeEnum.PARAMS_EXCEPTION.getMessage()); diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleVersionController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleVersionController.java index 44a5bc8..0b3c691 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleVersionController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/rule/controller/RuleVersionController.java @@ -38,7 +38,7 @@ public class RuleVersionController { * @return */ @PostMapping("/addRuleVersion") - @ArchivesLog(operationType = OpTypeConst.SAVE_RULE_VERSION) +// @ArchivesLog(operationType = OpTypeConst.SAVE_RULE_VERSION) public ResponseEntityDto addRuleVersion(@RequestBody RuleVersionVo version){ boolean b = versionService.addVersion(version); if (!b){ @@ -54,7 +54,7 @@ public class RuleVersionController { * @return */ @PostMapping("/copyRuleVersion") - @ArchivesLog(operationType = OpTypeConst.COPY_RULE_VERSION) +// @ArchivesLog(operationType = OpTypeConst.COPY_RULE_VERSION) public ResponseEntityDto copyRuleVersion(@RequestBody RuleVersionVo version){ boolean b = versionService.copyVersion(version); List< RuleVersionVo> ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId()); @@ -67,7 +67,7 @@ public class RuleVersionController { * @return */ @PostMapping("/updateRuleVersion") - @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION) public ResponseEntityDto updateRuleVersion(@RequestBody RuleVersionVo version){ boolean b = versionService.updateVersion(version); List ruleVersionList = versionService.queryVersionListByRuleId(version.getRuleId()); @@ -80,7 +80,7 @@ public class RuleVersionController { * @return */ @RequestMapping(value = "/updateRuleVersionStatus", method = RequestMethod.POST) - @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION_STATUS) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_RULE_VERSION_STATUS) public ResponseEntityDto updateStatus(@RequestBody StatusParam statusParam) { versionService.updateStatus(statusParam); List ruleVersionList = versionService.queryVersionListByRuleId(statusParam.getTacticsId()); diff --git a/jar-enginex-manager/src/main/java/com/risk/riskmanage/system/controller/v2/SysMenuController.java b/jar-enginex-manager/src/main/java/com/risk/riskmanage/system/controller/v2/SysMenuController.java index 3f14787..5166dcc 100644 --- a/jar-enginex-manager/src/main/java/com/risk/riskmanage/system/controller/v2/SysMenuController.java +++ b/jar-enginex-manager/src/main/java/com/risk/riskmanage/system/controller/v2/SysMenuController.java @@ -161,7 +161,7 @@ public class SysMenuController extends CcpBaseController { * {"status":"1","error":"00000000","msg":null,"data":1} */ @RequestMapping(value = "updateStatus", method = RequestMethod.POST) - @ArchivesLog(operationType = OpTypeConst.UPDATE_SYS_MENU_STATUS) +// @ArchivesLog(operationType = OpTypeConst.UPDATE_SYS_MENU_STATUS) public ResponseEntityDto updateStatus(@RequestBody Map param) { int status = (Integer) param.get("status"); String ids = (String)param.get("ids"); diff --git a/jar-enginex-manager/src/main/resources/application-dev.properties b/jar-enginex-manager/src/main/resources/application-dev.properties index d6d5ba4..20810bd 100644 --- a/jar-enginex-manager/src/main/resources/application-dev.properties +++ b/jar-enginex-manager/src/main/resources/application-dev.properties @@ -4,16 +4,16 @@ server.servlet.context-path=/Riskmanage logging.config=classpath:logging-config.xml # mysql -spring.datasource.default.url = jdbc:mysql://localhost:3306/zsxntest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true +spring.datasource.default.url = jdbc:mysql://47.102.125.25:3306/zsxntest?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true spring.datasource.default.username = root -spring.datasource.default.password = localhost +spring.datasource.default.password = enginex513 spring.datasource.default.driver-class-name = com.mysql.cj.jdbc.Driver # redis -redis.host=localhost +redis.host=47.102.125.25 redis.port=6379 redis.db=0 -redis.password=localhost +redis.password=enginex123 redis.pool.maxTotal=3000 redis.pool.maxIdle=100 redis.pool.maxWait=1000