From 28c455715cc62fe0803ba7796aa488f0a87b910c Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Wed, 3 Mar 2021 00:14:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=97=A5=E5=BF=97=E5=88=87=E9=9D=A2?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/youlai/admin/api/UserFeignService.java  |  1 +
 .../java/com/youlai/{ => auth}/AuthApplication.java  |  6 ++++--
 .../web/aspect/{OptLogAspect.java => LogAspect.java} | 12 +++++-------
 .../src/main/resources/META-INF/spring.factories     |  3 ++-
 .../common-web/src/main/resources/logback-spring.xml | 10 +++++-----
 5 files changed, 17 insertions(+), 15 deletions(-)
 rename youlai-auth/src/main/java/com/youlai/{ => auth}/AuthApplication.java (67%)
 rename youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/{OptLogAspect.java => LogAspect.java} (89%)

diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java
index c21222722..a506bb01b 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignService.java
@@ -2,6 +2,7 @@ package com.youlai.admin.api;
 
 import com.youlai.admin.pojo.dto.UserDTO;
 import com.youlai.common.result.Result;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/youlai-auth/src/main/java/com/youlai/AuthApplication.java b/youlai-auth/src/main/java/com/youlai/auth/AuthApplication.java
similarity index 67%
rename from youlai-auth/src/main/java/com/youlai/AuthApplication.java
rename to youlai-auth/src/main/java/com/youlai/auth/AuthApplication.java
index 99ef21be8..bb2e56bbc 100644
--- a/youlai-auth/src/main/java/com/youlai/AuthApplication.java
+++ b/youlai-auth/src/main/java/com/youlai/auth/AuthApplication.java
@@ -1,11 +1,13 @@
-package com.youlai;
+package com.youlai.auth;
 
+import com.youlai.admin.api.UserFeignService;
+import com.youlai.mall.ums.api.MemberFeignService;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@EnableFeignClients
+@EnableFeignClients(basePackageClasses = {UserFeignService.class, MemberFeignService.class})
 @SpringBootApplication
 @EnableDiscoveryClient
 public class AuthApplication {
diff --git a/youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/OptLogAspect.java b/youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/LogAspect.java
similarity index 89%
rename from youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/OptLogAspect.java
rename to youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/LogAspect.java
index c5bf83c49..2919d4267 100644
--- a/youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/OptLogAspect.java
+++ b/youlai-common/common-web/src/main/java/com/youlai/common/web/aspect/LogAspect.java
@@ -1,11 +1,9 @@
 package com.youlai.common.web.aspect;
 
 import cn.hutool.json.JSONUtil;
-import com.youlai.common.web.pojo.domain.LoginLog;
 import com.youlai.common.web.pojo.domain.OptLog;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import net.logstash.logback.marker.Markers;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -25,16 +23,16 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Author HXR
- * @CreateTime 2021-03-01 16:47
+ * @author HXR
+ * @date 2021-03-01 16:47
  */
 @Aspect
 @Component
 @AllArgsConstructor
-public class OptLogAspect {
+public class LogAspect {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OptLogAspect.class);
-    @Pointcut("execution(public * com.youlai..*.controller.*.*(..)) || execution(public * com.youlai.*.controller.*(..))")
+    private static final Logger LOGGER = LoggerFactory.getLogger(LogAspect.class);
+    @Pointcut("@annotation(io.swagger.annotations.ApiOperation)")
     public void Log() {
     }
 
diff --git a/youlai-common/common-web/src/main/resources/META-INF/spring.factories b/youlai-common/common-web/src/main/resources/META-INF/spring.factories
index 741887f88..112fdc735 100644
--- a/youlai-common/common-web/src/main/resources/META-INF/spring.factories
+++ b/youlai-common/common-web/src/main/resources/META-INF/spring.factories
@@ -1,3 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.youlai.common.web.config.WebMvcConfig,\
-  com.youlai.common.web.exception.GlobalExceptionHandler
+  com.youlai.common.web.exception.GlobalExceptionHandler,\
+  com.youlai.common.web.aspect.LogAspect
diff --git a/youlai-common/common-web/src/main/resources/logback-spring.xml b/youlai-common/common-web/src/main/resources/logback-spring.xml
index 47fd94397..b4d394a0c 100644
--- a/youlai-common/common-web/src/main/resources/logback-spring.xml
+++ b/youlai-common/common-web/src/main/resources/logback-spring.xml
@@ -63,7 +63,7 @@
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
             <level>DEBUG</level>
         </filter>
-        <destination>${LOG_STASH_HOST}:5044</destination>
+        <destination>${LOG_STASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
             <providers>
                 <timestamp>
@@ -101,7 +101,7 @@
             <onMatch>ACCEPT</onMatch>
             <onMismatch>DENY</onMismatch>
         </filter>
-        <destination>${LOG_STASH_HOST}:5044</destination>
+        <destination>${LOG_STASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
             <providers>
                 <timestamp>
@@ -134,7 +134,7 @@
 
     <!--业务日志输出到LogStash-->
     <appender name="LOG_STASH_BUSINESS" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${LOG_STASH_HOST}:5044</destination>
+        <destination>${LOG_STASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
             <providers>
                 <timestamp>
@@ -167,7 +167,7 @@
 
     <!--接口访问记录日志输出到LogStash-->
     <appender name="LOG_STASH_RECORD" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>${LOG_STASH_HOST}:5044</destination>
+        <destination>${LOG_STASH_HOST}:4560</destination>
         <encoder charset="UTF-8" class="net.logstash.logback.encoder.LoggingEventCompositeJsonEncoder">
             <providers>
                 <timestamp>
@@ -211,7 +211,7 @@
         <appender-ref ref="LOG_STASH_ERROR"/>
     </root>
 
-    <logger name="com.youlai.common.web.aspect.OptLogAspect" level="DEBUG">
+    <logger name="com.youlai.common.web.aspect.LogAspect" level="DEBUG">
         <appender-ref ref="LOG_STASH_RECORD"/>
     </logger>