From 912bea0c53bf05e4407bec3e5d053285032cd052 Mon Sep 17 00:00:00 2001
From: dark <189192663@qq.com>
Date: Sun, 21 Mar 2021 21:30:11 +0800
Subject: [PATCH] 迁移包位置,将注解从common移到对应的tracer包

---
 src/main/java/cn/iocoder/dashboard/common/annotation/BizTracing.java              | 29 -----------------------------
 src/main/java/cn/iocoder/dashboard/common/annotation/BizTracingAop.java           | 34 ----------------------------------
 src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracing.java    | 29 +++++++++++++++++++++++++++++
 src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracingAop.java | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 src/main/java/cn/iocoder/dashboard/common/annotation/BizTracing.java
 delete mode 100644 src/main/java/cn/iocoder/dashboard/common/annotation/BizTracingAop.java
 create mode 100644 src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracing.java
 create mode 100644 src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracingAop.java

diff --git a/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracing.java b/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracing.java
deleted file mode 100644
index c974d84..0000000
--- a/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracing.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.iocoder.dashboard.common.annotation;
-
-import java.lang.annotation.*;
-
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-
-/**
- * 打印业务流水号/业务类型注解
- *
- * @author 麻薯
- */
-public @interface BizTracing {
-
-    /**
-     * 交易流水tag名
-     */
-    String BIZ_ID_TAG = "bizId";
-    /**
-     * 交易类型tag名
-     */
-    String BIZ_TYPE_TAG = "bizType";
-
-    String bizId();
-
-    String bizType();
-
-}
diff --git a/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracingAop.java b/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracingAop.java
deleted file mode 100644
index 3f8b890..0000000
--- a/src/main/java/cn/iocoder/dashboard/common/annotation/BizTracingAop.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package cn.iocoder.dashboard.common.annotation;
-
-import cn.hutool.core.util.StrUtil;
-import cn.iocoder.dashboard.util.sping.SpElUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.skywalking.apm.toolkit.trace.ActiveSpan;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * 业务链路AOP切面
- *
- * @author mashu
- */
-@Aspect
-@Slf4j
-@Configuration
-public class BizTracingAop {
-
-    @Around(value = "@annotation(bizTracing)")
-    public void tagBizInfo(ProceedingJoinPoint joinPoint, BizTracing bizTracing) {
-        String bizId = (String) SpElUtil.analysisSpEl(bizTracing.bizId(), joinPoint);
-        String bizType = (String) SpElUtil.analysisSpEl(bizTracing.bizType(), joinPoint);
-        if (StrUtil.isBlankIfStr(bizId)) {
-            log.error("empty biz: bizId[{}], bizType[{}].", bizId, bizType);
-            return;
-        }
-        log.info("accept biz: bizId[{}], bizType[{}].", bizId, bizType);
-        ActiveSpan.tag(BizTracing.BIZ_ID_TAG, bizId);
-        ActiveSpan.tag(BizTracing.BIZ_TYPE_TAG, bizType);
-    }
-}
diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracing.java b/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracing.java
new file mode 100644
index 0000000..646f527
--- /dev/null
+++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracing.java
@@ -0,0 +1,29 @@
+package cn.iocoder.dashboard.framework.tracer.annotation;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+
+/**
+ * 打印业务流水号/业务类型注解
+ *
+ * @author 麻薯
+ */
+public @interface BizTracing {
+
+    /**
+     * 交易流水tag名
+     */
+    String BIZ_ID_TAG = "bizId";
+    /**
+     * 交易类型tag名
+     */
+    String BIZ_TYPE_TAG = "bizType";
+
+    String bizId();
+
+    String bizType();
+
+}
diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracingAop.java b/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracingAop.java
new file mode 100644
index 0000000..3b5bb5f
--- /dev/null
+++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/annotation/BizTracingAop.java
@@ -0,0 +1,34 @@
+package cn.iocoder.dashboard.framework.tracer.annotation;
+
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.dashboard.util.sping.SpElUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.skywalking.apm.toolkit.trace.ActiveSpan;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 业务链路AOP切面
+ *
+ * @author mashu
+ */
+@Aspect
+@Slf4j
+@Configuration
+public class BizTracingAop {
+
+    @Around(value = "@annotation(bizTracing)")
+    public void tagBizInfo(ProceedingJoinPoint joinPoint, BizTracing bizTracing) {
+        String bizId = (String) SpElUtil.analysisSpEl(bizTracing.bizId(), joinPoint);
+        String bizType = (String) SpElUtil.analysisSpEl(bizTracing.bizType(), joinPoint);
+        if (StrUtil.isBlankIfStr(bizId)) {
+            log.error("empty biz: bizId[{}], bizType[{}].", bizId, bizType);
+            return;
+        }
+        log.info("accept biz: bizId[{}], bizType[{}].", bizId, bizType);
+        ActiveSpan.tag(BizTracing.BIZ_ID_TAG, bizId);
+        ActiveSpan.tag(BizTracing.BIZ_TYPE_TAG, bizType);
+    }
+}
--
libgit2 0.21.4