From e65488265d744522cc58f73756188fe8275aaf1f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 26 Apr 2021 23:18:13 +0800
Subject: [PATCH] =?UTF-8?q?UI=20=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20skywalking=20=E4=BD=9C=E4=B8=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/deploy.sh                                 |  1 +
 ruoyi-ui/src/views/infra/skywalking/index.vue |  2 +-
 ruoyi-ui/src/views/infra/skywalking/log.vue   | 26 +++++++++++++++++++
 .../tracer/core/annotation/BizTrace.java      |  3 +++
 .../framework/tracer/package-info.java        |  4 +--
 .../controller/auth/SysAuthController.java    |  1 -
 .../test/ToolTestDemoController.java          |  8 +++---
 7 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 ruoyi-ui/src/views/infra/skywalking/log.vue

diff --git a/bin/deploy.sh b/bin/deploy.sh
index 935d4606b..3a156c9b0 100644
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@ -27,6 +27,7 @@ JAVA_OPS="-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$HE
 export SW_AGENT_NAME=$SERVER_NAME
 export SW_AGENT_COLLECTOR_BACKEND_SERVICES=192.168.0.84:11800
 export SW_GRPC_LOG_SERVER_HOST=192.168.0.84
+export SW_AGENT_TRACE_IGNORE_PATH="Redisson/PING,/actuator/**,/admin/**"
 export JAVA_AGENT=-javaagent:/work/skywalking/apache-skywalking-apm-bin/agent/skywalking-agent.jar
 
 # 备份
diff --git a/ruoyi-ui/src/views/infra/skywalking/index.vue b/ruoyi-ui/src/views/infra/skywalking/index.vue
index 00411d64e..843830464 100644
--- a/ruoyi-ui/src/views/infra/skywalking/index.vue
+++ b/ruoyi-ui/src/views/infra/skywalking/index.vue
@@ -8,7 +8,7 @@ export default {
   name: "SkyWalking",
   data() {
     return {
-      src: "http://skywalking.shop.iocoder.cn", // TODO 芋艿，后续改成配置读取
+      src: "http://skywalking.shop.iocoder.cn/trace", // TODO 芋艿，后续改成配置读取
       height: document.documentElement.clientHeight - 94.5 + "px;",
       loading: true
     };
diff --git a/ruoyi-ui/src/views/infra/skywalking/log.vue b/ruoyi-ui/src/views/infra/skywalking/log.vue
new file mode 100644
index 000000000..06cab5d56
--- /dev/null
+++ b/ruoyi-ui/src/views/infra/skywalking/log.vue
@@ -0,0 +1,26 @@
+<template>
+  <div v-loading="loading" :style="'height:'+ height">
+    <iframe :src="src" frameborder="no" style="width: 100%;height: 100%" scrolling="auto" />
+  </div>
+</template>
+<script>
+export default {
+  name: "SkyWalking-Log",
+  data() {
+    return {
+      src: "http://skywalking.shop.iocoder.cn/log", // TODO 芋艿，后续改成配置读取
+      height: document.documentElement.clientHeight - 94.5 + "px;",
+      loading: true
+    };
+  },
+  mounted: function() {
+    setTimeout(() => {
+      this.loading = false;
+    }, 230);
+    const that = this;
+    window.onresize = function temp() {
+      that.height = document.documentElement.clientHeight - 94.5 + "px;";
+    };
+  }
+};
+</script>
diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java b/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java
index c371cabc1..3907cac3e 100644
--- a/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java
+++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/core/annotation/BizTrace.java
@@ -5,6 +5,9 @@ import java.lang.annotation.*;
 /**
  * 打印业务编号 / 业务类型注解
  *
+ * 使用时，需要设置 SkyWalking OAP Server 的 application.yaml 配置文件，修改 SW_SEARCHABLE_TAG_KEYS 配置项，
+ * 增加 biz.type 和 biz.id 两值，然后重启 SkyWalking OAP Server 服务器。
+ *
  * @author 麻薯
  */
 @Target({ElementType.METHOD})
diff --git a/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java b/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java
index 54d505760..c0c3df419 100644
--- a/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java
+++ b/src/main/java/cn/iocoder/dashboard/framework/tracer/package-info.java
@@ -1,6 +1,6 @@
 /**
- * 链路追踪
+ * 使用 SkyWalking 组件，作为链路追踪、日志中心。
  *
- * 主要目的，是生成全局的链路追踪编号
+ * @author 芋道源码
  */
 package cn.iocoder.dashboard.framework.tracer;
diff --git a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java b/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
index 16612f2f6..e3a100073 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
@@ -59,7 +59,6 @@ public class SysAuthController {
 
     @GetMapping("/get-permission-info")
     @ApiOperation("获取登陆用户的权限信息")
-    @BizTrace(id = "1", type = "'user'")
     public CommonResult<SysAuthPermissionInfoRespVO> getPermissionInfo() {
         // 获得用户信息
         SysUserDO user = userService.getUser(getLoginUserId());
diff --git a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
index 13f70ec0d..383b434cb 100644
--- a/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
+++ b/src/main/java/cn/iocoder/dashboard/modules/tool/controller/test/ToolTestDemoController.java
@@ -5,12 +5,11 @@ import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
+import cn.iocoder.dashboard.framework.tracer.core.annotation.BizTrace;
 import cn.iocoder.dashboard.modules.tool.controller.test.vo.*;
 import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert;
 import cn.iocoder.dashboard.modules.tool.dal.dataobject.test.ToolTestDemoDO;
 import cn.iocoder.dashboard.modules.tool.service.test.ToolTestDemoService;
-import com.baomidou.lock.annotation.Lock4j;
-import io.github.resilience4j.ratelimiter.annotation.RateLimiter;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -66,7 +65,7 @@ public class ToolTestDemoController {
     @ApiOperation("获得测试示例")
     @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
     @PreAuthorize("@ss.hasPermission('tool:test-demo:query')")
-    @Lock4j // 分布式锁
+//    @Lock4j // 分布式锁
     public CommonResult<ToolTestDemoRespVO> getTestDemo(@RequestParam("id") Long id) {
         if (true) { // 测试分布式锁
             ThreadUtil.sleep(5, TimeUnit.SECONDS);
@@ -79,7 +78,8 @@ public class ToolTestDemoController {
     @ApiOperation("获得测试示例列表")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, dataTypeClass = List.class)
     @PreAuthorize("@ss.hasPermission('tool:test-demo:query')")
-    @RateLimiter(name = "backendA")
+//    @RateLimiter(name = "backendA")
+    @BizTrace(id = "1", type = "'user'")
     public CommonResult<List<ToolTestDemoRespVO>> getTestDemoList(@RequestParam("ids") Collection<Long> ids) {
         List<ToolTestDemoDO> list = testDemoService.getTestDemoList(ids);
         return success(ToolTestDemoConvert.INSTANCE.convertList(list));