Browse Source

去除@LogOperation,去除epmet-monitor-server

dev_shibei_match
yinzuomei 6 years ago
parent
commit
4f93a09803
  1. 9
      epmet-gateway/pom.xml
  2. 8
      epmet-gateway/src/main/resources/bootstrap.yml
  3. 3
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java
  4. 10
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java
  5. 6
      epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java
  6. 4
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

9
epmet-gateway/pom.xml

@ -113,12 +113,9 @@
<!-- 2、Admin服务 --> <!-- 2、Admin服务 -->
<!-- <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>--> <!-- <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>-->
<gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri> <gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri>
<!-- 3、监控服务 -->
<gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
<!-- <gateway.routes.epmet-monitor-server.uri>http://127.0.0.1:8100</gateway.routes.epmet-monitor-server.uri>-->
<!-- 4、OSS服务 --> <!-- 4、OSS服务 -->
<gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri> <!-- <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>-->
<!-- <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>--> <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>
<!-- 5、消息服务 --> <!-- 5、消息服务 -->
<!-- <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>--> <!-- <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>-->
<gateway.routes.epmet-message-server.uri>http://127.0.0.1:8085</gateway.routes.epmet-message-server.uri> <gateway.routes.epmet-message-server.uri>http://127.0.0.1:8085</gateway.routes.epmet-message-server.uri>
@ -183,8 +180,6 @@
<gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri> <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
<!-- 2、Admin服务 --> <!-- 2、Admin服务 -->
<gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri> <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
<!-- 3、监控服务 -->
<gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
<!-- 4、OSS服务 --> <!-- 4、OSS服务 -->
<gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri> <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
<!-- 5、消息服务 --> <!-- 5、消息服务 -->

8
epmet-gateway/src/main/resources/bootstrap.yml

@ -44,14 +44,6 @@ spring:
filters: filters:
- StripPrefix=1 - StripPrefix=1
- CpAuth=true - 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服务 #OSS服务
- id: epmet-oss-server - id: epmet-oss-server
uri: @gateway.routes.epmet-oss-server.uri@ uri: @gateway.routes.epmet-oss-server.uri@

3
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java

@ -8,7 +8,6 @@
package com.epmet.controller; package com.epmet.controller;
import com.epmet.commons.tools.annotation.LogOperation;
import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
@ -57,7 +56,7 @@ public class MailLogController {
@DeleteMapping @DeleteMapping
@ApiOperation("删除") @ApiOperation("删除")
@LogOperation("删除") // @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){ public Result delete(@RequestBody Long[] ids){
sysMailLogService.deleteBatchIds(Arrays.asList(ids)); sysMailLogService.deleteBatchIds(Arrays.asList(ids));

10
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java

@ -75,7 +75,7 @@ public class MailTemplateController {
@PostMapping("saveConfig") @PostMapping("saveConfig")
@ApiOperation("保存配置信息") @ApiOperation("保存配置信息")
@LogOperation("保存配置信息") // @LogOperation("保存配置信息")
public Result saveConfig(@RequestBody EmailConfig config){ public Result saveConfig(@RequestBody EmailConfig config){
//校验数据 //校验数据
ValidatorUtils.validateEntity(config); ValidatorUtils.validateEntity(config);
@ -95,7 +95,7 @@ public class MailTemplateController {
@PostMapping @PostMapping
@ApiOperation("保存") @ApiOperation("保存")
@LogOperation("保存") // @LogOperation("保存")
public Result save(SysMailTemplateDTO dto){ public Result save(SysMailTemplateDTO dto){
//校验类型 //校验类型
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@ -107,7 +107,7 @@ public class MailTemplateController {
@PutMapping @PutMapping
@ApiOperation("修改") @ApiOperation("修改")
@LogOperation("修改") // @LogOperation("修改")
public Result update(SysMailTemplateDTO dto){ public Result update(SysMailTemplateDTO dto){
//校验类型 //校验类型
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@ -119,7 +119,7 @@ public class MailTemplateController {
@DeleteMapping @DeleteMapping
@ApiOperation("删除") @ApiOperation("删除")
@LogOperation("删除") // @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){ public Result delete(@RequestBody Long[] ids){
sysMailTemplateService.deleteBatchIds(Arrays.asList(ids)); sysMailTemplateService.deleteBatchIds(Arrays.asList(ids));
@ -128,7 +128,7 @@ public class MailTemplateController {
@PostMapping("send") @PostMapping("send")
@ApiOperation("发送邮件") @ApiOperation("发送邮件")
@LogOperation("发送邮件") // @LogOperation("发送邮件")
public Result send(Long id, String mailTo, String mailCc, String params) throws Exception{ public Result send(Long id, String mailTo, String mailCc, String params) throws Exception{
boolean flag = sysMailTemplateService.sendMail(id, mailTo, mailCc, params); boolean flag = sysMailTemplateService.sendMail(id, mailTo, mailCc, params);
if(flag){ if(flag){

6
epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java

@ -75,7 +75,7 @@ public class SmsController {
@PostMapping("saveConfig") @PostMapping("saveConfig")
@ApiOperation("保存配置短信") @ApiOperation("保存配置短信")
@LogOperation("保存配置短信") // @LogOperation("保存配置短信")
public Result saveConfig(@RequestBody SmsConfig config){ public Result saveConfig(@RequestBody SmsConfig config){
//校验类型 //校验类型
ValidatorUtils.validateEntity(config); ValidatorUtils.validateEntity(config);
@ -95,7 +95,7 @@ public class SmsController {
@PostMapping("send") @PostMapping("send")
@ApiOperation("发送短信") @ApiOperation("发送短信")
@LogOperation("发送短信") // @LogOperation("发送短信")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"), @ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"),
@ApiImplicitParam(name = "params", 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 @DeleteMapping
@ApiOperation("删除") @ApiOperation("删除")
@LogOperation("删除") // @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){ public Result delete(@RequestBody Long[] ids){
sysSmsService.deleteBatchIds(Arrays.asList(ids)); sysSmsService.deleteBatchIds(Arrays.asList(ids));

4
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -71,7 +71,7 @@ public class OssController {
@PostMapping @PostMapping
@ApiOperation(value = "保存云存储配置信息") @ApiOperation(value = "保存云存储配置信息")
@LogOperation("保存云存储配置信息") // @LogOperation("保存云存储配置信息")
public Result saveConfig(@RequestBody CloudStorageConfig config){ public Result saveConfig(@RequestBody CloudStorageConfig config){
//校验类型 //校验类型
ValidatorUtils.validateEntity(config); ValidatorUtils.validateEntity(config);
@ -119,7 +119,7 @@ public class OssController {
@DeleteMapping @DeleteMapping
@ApiOperation(value = "删除") @ApiOperation(value = "删除")
@LogOperation("删除") // @LogOperation("删除")
public Result delete(@RequestBody Long[] ids){ public Result delete(@RequestBody Long[] ids){
ossService.deleteBatchIds(Arrays.asList(ids)); ossService.deleteBatchIds(Arrays.asList(ids));

Loading…
Cancel
Save