修改实例化关系

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/MqAspect.java

 package com.yanzuoguang.cloud.aop;
 
 import com.yanzuoguang.mq.plan.YzgMqConsumer;
+import com.yanzuoguang.mq.service.MessageLogService;
 import com.yanzuoguang.util.exception.ExceptionHelper;
 import com.yanzuoguang.util.vo.LogVo;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -10,6 +11,7 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
@@ -26,6 +28,9 @@ public class MqAspect extends BaseRequestAspect {
 
     private static final String TAG = MqAspect.class.getSimpleName();
 
+    @Autowired
+    private MessageLogService logService;
+
     /**
      * exec aop point aspect
      */
@@ -63,6 +68,7 @@ public class MqAspect extends BaseRequestAspect {
             ex = e;
             throw e;
         } finally {
+            logService.logCurrentRemove();
             responseLog(declaringType, TAG, url, clear, start, getRequestBody(joinPoint), result, ex, log);
         }
     }
@@ -74,19 +80,17 @@ public class MqAspect extends BaseRequestAspect {
         }
         MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         Method targetMethod = methodSignature.getMethod();
+        Message message = getMessage(joinPoint.getArgs());
+        if (message != null) {
+            logService.logCurrent(message);
+        }
         if (YzgMqConsumer.class.equals(targetMethod.getDeclaringClass())) {
             ret = false;
         } else {
             RabbitListener annotation = targetMethod.getAnnotation(RabbitListener.class);
-            if (annotation != null) {
+            if (annotation != null || message != null) {
                 ret = true;
             }
-            if (!ret) {
-                Message message = getMessage(joinPoint.getArgs());
-                if (message != null) {
-                    ret = true;
-                }
-            }
         }
         return ret;
     }