From 4f93a09803efe4a60eff35089b86429d4032c8c1 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Wed, 1 Apr 2020 16:09:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4@LogOperation,=E5=8E=BB?= =?UTF-8?q?=E9=99=A4epmet-monitor-server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 9 ++------- epmet-gateway/src/main/resources/bootstrap.yml | 8 -------- .../java/com/epmet/controller/MailLogController.java | 3 +-- .../com/epmet/controller/MailTemplateController.java | 10 +++++----- .../main/java/com/epmet/controller/SmsController.java | 6 +++--- .../main/java/com/epmet/controller/OssController.java | 4 ++-- 6 files changed, 13 insertions(+), 27 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 5560c499bb..9bdc3d080e 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -113,12 +113,9 @@ http://127.0.0.1:8082 - - lb://epmet-monitor-server - - lb://epmet-oss-server - + + http://127.0.0.1:8083 http://127.0.0.1:8085 @@ -183,8 +180,6 @@ lb://epmet-auth-server lb://epmet-admin-server - - lb://epmet-monitor-server lb://epmet-oss-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index 0e40375e3a..a5c57a6531 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -44,14 +44,6 @@ spring: filters: - StripPrefix=1 - CpAuth=true - #监控服务 - - id: epmet-monitor-server - uri: @gateway.routes.epmet-monitor-server.uri@ - order: 3 - predicates: - - Path=${server.servlet.context-path}/monitor/** - filters: - - StripPrefix=1 #OSS服务 - id: epmet-oss-server uri: @gateway.routes.epmet-oss-server.uri@ diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java index e21c97e1d4..427a0898aa 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java @@ -8,7 +8,6 @@ package com.epmet.controller; -import com.epmet.commons.tools.annotation.LogOperation; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; @@ -57,7 +56,7 @@ public class MailLogController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") +// @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ sysMailLogService.deleteBatchIds(Arrays.asList(ids)); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java index 6d81b3f99b..a1d46b26c2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java @@ -75,7 +75,7 @@ public class MailTemplateController { @PostMapping("saveConfig") @ApiOperation("保存配置信息") - @LogOperation("保存配置信息") +// @LogOperation("保存配置信息") public Result saveConfig(@RequestBody EmailConfig config){ //校验数据 ValidatorUtils.validateEntity(config); @@ -95,7 +95,7 @@ public class MailTemplateController { @PostMapping @ApiOperation("保存") - @LogOperation("保存") +// @LogOperation("保存") public Result save(SysMailTemplateDTO dto){ //校验类型 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -107,7 +107,7 @@ public class MailTemplateController { @PutMapping @ApiOperation("修改") - @LogOperation("修改") +// @LogOperation("修改") public Result update(SysMailTemplateDTO dto){ //校验类型 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -119,7 +119,7 @@ public class MailTemplateController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") +// @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ sysMailTemplateService.deleteBatchIds(Arrays.asList(ids)); @@ -128,7 +128,7 @@ public class MailTemplateController { @PostMapping("send") @ApiOperation("发送邮件") - @LogOperation("发送邮件") +// @LogOperation("发送邮件") public Result send(Long id, String mailTo, String mailCc, String params) throws Exception{ boolean flag = sysMailTemplateService.sendMail(id, mailTo, mailCc, params); if(flag){ diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index e0f9da4e7a..4a109c5482 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -75,7 +75,7 @@ public class SmsController { @PostMapping("saveConfig") @ApiOperation("保存配置短信") - @LogOperation("保存配置短信") +// @LogOperation("保存配置短信") public Result saveConfig(@RequestBody SmsConfig config){ //校验类型 ValidatorUtils.validateEntity(config); @@ -95,7 +95,7 @@ public class SmsController { @PostMapping("send") @ApiOperation("发送短信") - @LogOperation("发送短信") +// @LogOperation("发送短信") @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"), @ApiImplicitParam(name = "params", value = "参数", paramType = "query", required = true, dataType="String") @@ -108,7 +108,7 @@ public class SmsController { @DeleteMapping @ApiOperation("删除") - @LogOperation("删除") +// @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ sysSmsService.deleteBatchIds(Arrays.asList(ids)); diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java index acd2706226..1630b63225 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java @@ -71,7 +71,7 @@ public class OssController { @PostMapping @ApiOperation(value = "保存云存储配置信息") - @LogOperation("保存云存储配置信息") +// @LogOperation("保存云存储配置信息") public Result saveConfig(@RequestBody CloudStorageConfig config){ //校验类型 ValidatorUtils.validateEntity(config); @@ -119,7 +119,7 @@ public class OssController { @DeleteMapping @ApiOperation(value = "删除") - @LogOperation("删除") +// @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ ossService.deleteBatchIds(Arrays.asList(ids));