Merge remote-tracking branch 'origin/dev/mix20191225_security' into dev/mix20191225_security

aipt-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -1,41 +1,41 @@
-package com.diagbot.aop;
-
-import com.diagbot.biz.log.entity.SysLog;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.AopUtil;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 日志拦截切面
- * @author: gaodm
- * @time: 2018/8/2 13:36
- */
-@Aspect
-@Component
-@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
-public class SysLoggerAspect {
-    @Autowired
-    private MySender mySender;
-
-    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
-    public void loggerPointCut() {
-
-    }
-
-    @Before("loggerPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) {
-        //入参设置
-        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.AIPT_SERVICE.getKey());
-        //保存系统日志
-        mySender.outputLogSend(sysLog);
-    }
-
-}
-
+//package com.diagbot.aop;
+//
+//import com.diagbot.biz.log.entity.SysLog;
+//import com.diagbot.enums.SysTypeEnum;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.AopUtil;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @Description: 日志拦截切面
+// * @author: gaodm
+// * @time: 2018/8/2 13:36
+// */
+//@Aspect
+//@Component
+//@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
+//public class SysLoggerAspect {
+//    @Autowired
+//    private MySender mySender;
+//
+//    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
+//    public void loggerPointCut() {
+//
+//    }
+//
+//    @Before("loggerPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) {
+//        //入参设置
+//        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.AIPT_SERVICE.getKey());
+//        //保存系统日志
+//        mySender.outputLogSend(sysLog);
+//    }
+//
+//}
+//

aipt-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -1,11 +1,14 @@
 package com.diagbot.facade;
 
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.entity.wrapper.LisMappingWrapper;
 import com.diagbot.service.impl.LisMappingServiceImpl;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetLisMappingVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.LinkedHashMap;
@@ -18,10 +21,13 @@ import java.util.Map;
  * @time: 2019/9/20 13:14
  */
 @Component
-public class LisMappingFacade  extends LisMappingServiceImpl {
+public class LisMappingFacade extends LisMappingServiceImpl {
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 获取化验公表映射关系 Map<mealName,Map<itemName,uniqueName>> itemName 不为空
+     *
      * @param mealName
      * @return
      */
@@ -30,6 +36,18 @@ public class LisMappingFacade  extends LisMappingServiceImpl {
         LisMappingWrapper lisMappingWrapper = new LisMappingWrapper();
         lisMappingWrapper.setMealName(mealName);
         List<LisMappingWrapper> lisMappingWrapperList = this.getLisMappingByName(lisMappingWrapper);
+        if (ListUtil.isEmpty(lisMappingWrapperList)) {
+            return retMap;
+        }
+
+        //解密
+        if (cryptConfiguer.cryptFlag) {
+            for (LisMappingWrapper lisMap : lisMappingWrapperList) {
+                lisMap.setItemName(CryptUtil.decrypt_char(lisMap.getItemName()));
+                lisMap.setMealName(CryptUtil.decrypt_char(lisMap.getMealName()));
+                lisMap.setUniqueName(CryptUtil.decrypt_char(lisMap.getUniqueName()));
+            }
+        }
 
         Map<String, List<LisMappingWrapper>> lisMappingMap
                 = EntityUtil.makeEntityListMap(lisMappingWrapperList, "mealName");
@@ -47,18 +65,23 @@ public class LisMappingFacade  extends LisMappingServiceImpl {
 
     /**
      * 获取化验标签公表项
+     *
      * @param getLisMappingVO
      * @return
      */
     public Map<String, Map<String, String>> getLisMappingByQuestion(GetLisMappingVO getLisMappingVO) {
-        String project=getLisMappingVO.getProject();
-        List<String> details=getLisMappingVO.getDetails();
+        String project = getLisMappingVO.getProject();
+        List<String> details = getLisMappingVO.getDetails();
         if (StringUtil.isBlank(project)) {
             return null;
         }
 
         Map<String, Map<String, String>> lisMappingMap = getLisMappingByMealName(project);
 
+        //解密
+        if (cryptConfiguer.cryptFlag){
+            project = CryptUtil.decrypt_char(project);
+        }
         Map<String, Map<String, String>> retMap = new LinkedHashMap<>();
         if (lisMappingMap != null && lisMappingMap.get(project) != null) {
             Map<String, String> projectMap = new LinkedHashMap<>();

aipt-service/src/main/java/com/diagbot/facade/PatientInfoFacade.java

@@ -9,6 +9,7 @@ import com.diagbot.entity.Concept;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.util.CryptUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.GetTopPatientInfoDjVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
@@ -45,7 +46,7 @@ public class PatientInfoFacade {
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        if (null != getTopPatientInfoDTO.getSelfDeptName()){
+        if (StringUtil.isNotBlank(getTopPatientInfoDTO.getSelfDeptName())){
             if (cryptConfiguer.cryptFlag) {
                 conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDTO.getSelfDeptName()));
             } else {
@@ -73,7 +74,7 @@ public class PatientInfoFacade {
 
         ConceptBaseVO conceptBaseVO = new ConceptBaseVO();
         conceptBaseVO.setLibType(LexiconTypeEnum.DEPARTMENT.getKey());
-        if (null != getTopPatientInfoDjDTO.getSelfDeptName()){
+        if (StringUtil.isNotBlank(getTopPatientInfoDjDTO.getSelfDeptName())){
             if (cryptConfiguer.cryptFlag) {
                 conceptBaseVO.setName(CryptUtil.encrypt_char(getTopPatientInfoDjDTO.getSelfDeptName()));
             } else {

aipt-service/src/main/java/com/diagbot/vo/ConnectIntroduceVO.java

@@ -26,6 +26,7 @@ public class ConnectIntroduceVO {
     private Integer type;
     @NotBlank(message = "请输入医院编码")
     private String hosCode;
+    @CryptField
     @ApiModelProperty(hidden = true)
     private String uniqueName;
     @ApiModelProperty(hidden = true)

aipt-service/src/main/java/com/diagbot/vo/GetLisMappingVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -14,6 +15,7 @@ import java.util.List;
 @Getter
 @Setter
 public class GetLisMappingVO {
+    @CryptField
     @NotBlank(message = "请输入化验套餐项")
     private String project;
     private List<String> details;

aipt-service/src/main/java/com/diagbot/web/ConceptDetailTestController.java

@@ -1,97 +1,97 @@
-package com.diagbot.web;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.config.CryptConfiguer;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.entity.ConceptDetail;
-import com.diagbot.facade.ConceptDetailTestFacade;
-import com.diagbot.vo.ConceptDetailPageVO;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.validation.Valid;
-import java.util.List;
-
-/**
- * @Description:
- * @Author:zhaops
- * @time: 2019/12/30 20:22
- */
-@RestController
-@RequestMapping("/conceptDetailTest")
-@Api(value = "提示信息加密测试", tags = { "知识库标准化-提示信息加密测试相关API" })
-@SuppressWarnings("unchecked")
-@Deprecated
-@ApiIgnore
-public class ConceptDetailTestController {
-    @Autowired
-    private CryptConfiguer cryptConfiguer;
-
-    @Autowired
-    private ConceptDetailTestFacade conceptDetailTestFacade;
-
-    @PostMapping("/saveRecord")
-    @SysLogger("saveRecord")
-    public RespDTO<ConceptDetail> saveRecord(@Valid @RequestBody ConceptDetail conceptDetail) {
-        ConceptDetail data = conceptDetailTestFacade.saveRecord(conceptDetail);
-        return RespDTO.onSuc(data);
-    }
-
-    @PostMapping("/getById")
-    @SysLogger("getById")
-    public RespDTO<ConceptDetail> getById(@RequestParam Long id) {
-        ConceptDetail data = conceptDetailTestFacade.getByIds(id);
-        System.out.println(cryptConfiguer.cryptFlag);
-        return RespDTO.onSuc(data);
-    }
-
-    @PostMapping("/getByParam")
-    @SysLogger("getByParam")
-    public RespDTO<ConceptDetail> getByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
-        List<ConceptDetail> data = conceptDetailTestFacade.getByParam(conceptDetail);
-        return RespDTO.onSuc(data);
-    }
-
-    @PostMapping("/selectByParam")
-    @SysLogger("selectByParam")
-    public RespDTO<ConceptDetail> selectByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
-        List<ConceptDetail> data = conceptDetailTestFacade.selectByParam(conceptDetail);
-        return RespDTO.onSuc(data);
-    }
-
-
-    @PostMapping("/getOneByParam")
-    @SysLogger("getOneByParam")
-    public RespDTO<ConceptDetail> getOneByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
-        List<ConceptDetail> data = conceptDetailTestFacade.getByParam(conceptDetail);
-        return RespDTO.onSuc(data.size() > 0 ? data.get(0) : null);
-    }
-
-
-    @PostMapping("/selectOneByParam")
-    @SysLogger("selectOneByParam")
-    public RespDTO<ConceptDetail> selectOneByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
-        List<ConceptDetail> data = conceptDetailTestFacade.selectByParam(conceptDetail);
-        return RespDTO.onSuc(data.size() > 0 ? data.get(0) : null);
-    }
-
-    /**
-     * 分页查询静态知识，可带过滤条件
-     *
-     * @param conceptDetailPageVO
-     * @return
-     */
-    @PostMapping("/getConceptDetailPage")
-    @SysLogger("getConceptDetailPage")
-    public RespDTO getConceptDetailPage(@RequestBody ConceptDetailPageVO conceptDetailPageVO) {
-        IPage<ConceptDetail> conceptDetailIPage = conceptDetailTestFacade.selectiveTestPage(conceptDetailPageVO);
-        return RespDTO.onSuc(conceptDetailIPage);
-    }
-}
+//package com.diagbot.web;
+//
+//import com.baomidou.mybatisplus.core.metadata.IPage;
+//import com.diagbot.annotation.SysLogger;
+//import com.diagbot.config.CryptConfiguer;
+//import com.diagbot.dto.RespDTO;
+//import com.diagbot.entity.ConceptDetail;
+//import com.diagbot.facade.ConceptDetailTestFacade;
+//import com.diagbot.vo.ConceptDetailPageVO;
+//import io.swagger.annotations.Api;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.web.bind.annotation.PostMapping;
+//import org.springframework.web.bind.annotation.RequestBody;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//import springfox.documentation.annotations.ApiIgnore;
+//
+//import javax.validation.Valid;
+//import java.util.List;
+//
+///**
+// * @Description:
+// * @Author:zhaops
+// * @time: 2019/12/30 20:22
+// */
+//@RestController
+//@RequestMapping("/conceptDetailTest")
+//@Api(value = "提示信息加密测试", tags = { "知识库标准化-提示信息加密测试相关API" })
+//@SuppressWarnings("unchecked")
+//@Deprecated
+//@ApiIgnore
+//public class ConceptDetailTestController {
+//    @Autowired
+//    private CryptConfiguer cryptConfiguer;
+//
+//    @Autowired
+//    private ConceptDetailTestFacade conceptDetailTestFacade;
+//
+//    @PostMapping("/saveRecord")
+//    @SysLogger("saveRecord")
+//    public RespDTO<ConceptDetail> saveRecord(@Valid @RequestBody ConceptDetail conceptDetail) {
+//        ConceptDetail data = conceptDetailTestFacade.saveRecord(conceptDetail);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//    @PostMapping("/getById")
+//    @SysLogger("getById")
+//    public RespDTO<ConceptDetail> getById(@RequestParam Long id) {
+//        ConceptDetail data = conceptDetailTestFacade.getByIds(id);
+//        System.out.println(cryptConfiguer.cryptFlag);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//    @PostMapping("/getByParam")
+//    @SysLogger("getByParam")
+//    public RespDTO<ConceptDetail> getByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
+//        List<ConceptDetail> data = conceptDetailTestFacade.getByParam(conceptDetail);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//    @PostMapping("/selectByParam")
+//    @SysLogger("selectByParam")
+//    public RespDTO<ConceptDetail> selectByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
+//        List<ConceptDetail> data = conceptDetailTestFacade.selectByParam(conceptDetail);
+//        return RespDTO.onSuc(data);
+//    }
+//
+//
+//    @PostMapping("/getOneByParam")
+//    @SysLogger("getOneByParam")
+//    public RespDTO<ConceptDetail> getOneByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
+//        List<ConceptDetail> data = conceptDetailTestFacade.getByParam(conceptDetail);
+//        return RespDTO.onSuc(data.size() > 0 ? data.get(0) : null);
+//    }
+//
+//
+//    @PostMapping("/selectOneByParam")
+//    @SysLogger("selectOneByParam")
+//    public RespDTO<ConceptDetail> selectOneByParam(@Valid @RequestBody ConceptDetail conceptDetail) {
+//        List<ConceptDetail> data = conceptDetailTestFacade.selectByParam(conceptDetail);
+//        return RespDTO.onSuc(data.size() > 0 ? data.get(0) : null);
+//    }
+//
+//    /**
+//     * 分页查询静态知识，可带过滤条件
+//     *
+//     * @param conceptDetailPageVO
+//     * @return
+//     */
+//    @PostMapping("/getConceptDetailPage")
+//    @SysLogger("getConceptDetailPage")
+//    public RespDTO getConceptDetailPage(@RequestBody ConceptDetailPageVO conceptDetailPageVO) {
+//        IPage<ConceptDetail> conceptDetailIPage = conceptDetailTestFacade.selectiveTestPage(conceptDetailPageVO);
+//        return RespDTO.onSuc(conceptDetailIPage);
+//    }
+//}

common/src/main/java/com/diagbot/util/HttpUtils.java

@@ -66,6 +66,9 @@ public class HttpUtils {
             if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
                 ip = request.getHeader("HTTP_X_FORWARDED_FOR");
             }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getHeader("X-Real-IP");
+            }
             if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
                 ip = request.getRemoteAddr();
             }

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -19,7 +19,7 @@ spring:
     database:
       cache: 0 # Redis限流缓存索引
     host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

config-server/src/main/resources/shared/gateway-service-pre.yml

@@ -19,7 +19,7 @@ spring:
     database:
       cache: 0 # Redis限流缓存索引
     host: 192.168.2.121  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

config-server/src/main/resources/shared/gateway-service-pro.yml

@@ -19,7 +19,7 @@ spring:
     database:
       cache: 0 # Redis限流缓存索引
     host: 192.168.2.122  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

config-server/src/main/resources/shared/gateway-service-test.yml

@@ -19,7 +19,7 @@ spring:
     database:
       cache: 0 # Redis限流缓存索引
     host: 192.168.2.241  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

gateway-service/src/main/java/com/diagbot/config/redislimiter/SysKeyResolver.java

@@ -2,6 +2,7 @@ package com.diagbot.config.redislimiter;
 
 import org.springframework.cloud.gateway.filter.ratelimit.KeyResolver;
 import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
@@ -33,7 +34,7 @@ public class SysKeyResolver implements KeyResolver {
             }
         }
 
-        String myKeyResolver = exchange.getRequest().getRemoteAddress().getAddress().getHostAddress()
+        String myKeyResolver = getIpAddress(exchange.getRequest())
                 + "_" + fullUrl;
         ServerHttpRequest.Builder builder = exchange.getRequest().mutate();
         builder.header("myKeyResolver", myKeyResolver);
@@ -41,4 +42,39 @@ public class SysKeyResolver implements KeyResolver {
 
         return Mono.just(exchange.getRequest().getHeaders().getFirst("myKeyResolver"));
     }
+
+    public static String getIpAddress(ServerHttpRequest request) {
+        HttpHeaders headers = request.getHeaders();
+        String ip = headers.getFirst("x-forwarded-for");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = headers.getFirst("Proxy-Client-IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = headers.getFirst("WL-Proxy-Client-IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = headers.getFirst("HTTP_CLIENT_IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = headers.getFirst("HTTP_X_FORWARDED_FOR");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = headers.getFirst("X-Real-IP");
+            }
+            if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+                ip = request.getRemoteAddress().getAddress().getHostAddress();
+            }
+        } else if (ip.length() > 15) {
+            String[] ips = ip.split(",");
+            for (int index = 0; index < ips.length; index++) {
+                String strIp = (String) ips[index];
+                if (!("unknown".equalsIgnoreCase(strIp))) {
+                    ip = strIp;
+                    break;
+                }
+            }
+        }
+        return ip;
+    }
 }

log-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -1,41 +1,41 @@
-package com.diagbot.aop;
-
-import com.diagbot.biz.log.entity.SysLog;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.AopUtil;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 日志拦截切面
- * @author: gaodm
- * @time: 2018/8/2 13:36
- */
-@Aspect
-@Component
-@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
-public class SysLoggerAspect {
-    @Autowired
-    private MySender mySender;
-
-    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
-    public void loggerPointCut() {
-
-    }
-
-    @Before("loggerPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) {
-        //入参设置
-        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.LOG_SERVICE.getKey());
-        //保存系统日志
-        mySender.outputLogSend(sysLog);
-    }
-
-}
-
+//package com.diagbot.aop;
+//
+//import com.diagbot.biz.log.entity.SysLog;
+//import com.diagbot.enums.SysTypeEnum;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.AopUtil;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @Description: 日志拦截切面
+// * @author: gaodm
+// * @time: 2018/8/2 13:36
+// */
+//@Aspect
+//@Component
+//@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
+//public class SysLoggerAspect {
+//    @Autowired
+//    private MySender mySender;
+//
+//    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
+//    public void loggerPointCut() {
+//
+//    }
+//
+//    @Before("loggerPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) {
+//        //入参设置
+//        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.LOG_SERVICE.getKey());
+//        //保存系统日志
+//        mySender.outputLogSend(sysLog);
+//    }
+//
+//}
+//

tran-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -1,41 +1,41 @@
-package com.diagbot.aop;
-
-import com.diagbot.biz.log.entity.SysLog;
-import com.diagbot.enums.SysTypeEnum;
-import com.diagbot.rabbit.MySender;
-import com.diagbot.util.AopUtil;
-import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description: 日志拦截切面
- * @author: gaodm
- * @time: 2018/8/2 13:36
- */
-@Aspect
-@Component
-@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
-public class SysLoggerAspect {
-    @Autowired
-    private MySender mySender;
-
-    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
-    public void loggerPointCut() {
-
-    }
-
-    @Before("loggerPointCut()")
-    public void saveSysLog(JoinPoint joinPoint) {
-        //入参设置
-        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.TRAN_SERVICE.getKey());
-        //保存系统日志
-        mySender.outputLogSend(sysLog);
-    }
-
-}
-
+//package com.diagbot.aop;
+//
+//import com.diagbot.biz.log.entity.SysLog;
+//import com.diagbot.enums.SysTypeEnum;
+//import com.diagbot.rabbit.MySender;
+//import com.diagbot.util.AopUtil;
+//import org.aspectj.lang.JoinPoint;
+//import org.aspectj.lang.annotation.Aspect;
+//import org.aspectj.lang.annotation.Before;
+//import org.aspectj.lang.annotation.Pointcut;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @Description: 日志拦截切面
+// * @author: gaodm
+// * @time: 2018/8/2 13:36
+// */
+//@Aspect
+//@Component
+//@ConditionalOnProperty(prefix = "syslog", value = { "enable" }, havingValue = "true")
+//public class SysLoggerAspect {
+//    @Autowired
+//    private MySender mySender;
+//
+//    @Pointcut("@annotation(com.diagbot.annotation.SysLogger)")
+//    public void loggerPointCut() {
+//
+//    }
+//
+//    @Before("loggerPointCut()")
+//    public void saveSysLog(JoinPoint joinPoint) {
+//        //入参设置
+//        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.TRAN_SERVICE.getKey());
+//        //保存系统日志
+//        mySender.outputLogSend(sysLog);
+//    }
+//
+//}
+//