mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-26 17:21:53 +08:00
UI 界面,增加 skywalking 作为日志中心
This commit is contained in:
parent
33412466bb
commit
e65488265d
@ -27,6 +27,7 @@ JAVA_OPS="-Xms512m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$HE
|
|||||||
export SW_AGENT_NAME=$SERVER_NAME
|
export SW_AGENT_NAME=$SERVER_NAME
|
||||||
export SW_AGENT_COLLECTOR_BACKEND_SERVICES=192.168.0.84:11800
|
export SW_AGENT_COLLECTOR_BACKEND_SERVICES=192.168.0.84:11800
|
||||||
export SW_GRPC_LOG_SERVER_HOST=192.168.0.84
|
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
|
export JAVA_AGENT=-javaagent:/work/skywalking/apache-skywalking-apm-bin/agent/skywalking-agent.jar
|
||||||
|
|
||||||
# 备份
|
# 备份
|
||||||
|
@ -8,7 +8,7 @@ export default {
|
|||||||
name: "SkyWalking",
|
name: "SkyWalking",
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
src: "http://skywalking.shop.iocoder.cn", // TODO 芋艿,后续改成配置读取
|
src: "http://skywalking.shop.iocoder.cn/trace", // TODO 芋艿,后续改成配置读取
|
||||||
height: document.documentElement.clientHeight - 94.5 + "px;",
|
height: document.documentElement.clientHeight - 94.5 + "px;",
|
||||||
loading: true
|
loading: true
|
||||||
};
|
};
|
||||||
|
26
ruoyi-ui/src/views/infra/skywalking/log.vue
Normal file
26
ruoyi-ui/src/views/infra/skywalking/log.vue
Normal file
@ -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>
|
@ -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 麻薯
|
* @author 麻薯
|
||||||
*/
|
*/
|
||||||
@Target({ElementType.METHOD})
|
@Target({ElementType.METHOD})
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* 链路追踪
|
* 使用 SkyWalking 组件,作为链路追踪、日志中心。
|
||||||
*
|
*
|
||||||
* 主要目的,是生成全局的链路追踪编号
|
* @author 芋道源码
|
||||||
*/
|
*/
|
||||||
package cn.iocoder.dashboard.framework.tracer;
|
package cn.iocoder.dashboard.framework.tracer;
|
||||||
|
@ -59,7 +59,6 @@ public class SysAuthController {
|
|||||||
|
|
||||||
@GetMapping("/get-permission-info")
|
@GetMapping("/get-permission-info")
|
||||||
@ApiOperation("获取登陆用户的权限信息")
|
@ApiOperation("获取登陆用户的权限信息")
|
||||||
@BizTrace(id = "1", type = "'user'")
|
|
||||||
public CommonResult<SysAuthPermissionInfoRespVO> getPermissionInfo() {
|
public CommonResult<SysAuthPermissionInfoRespVO> getPermissionInfo() {
|
||||||
// 获得用户信息
|
// 获得用户信息
|
||||||
SysUserDO user = userService.getUser(getLoginUserId());
|
SysUserDO user = userService.getUser(getLoginUserId());
|
||||||
|
@ -5,12 +5,11 @@ import cn.iocoder.dashboard.common.pojo.CommonResult;
|
|||||||
import cn.iocoder.dashboard.common.pojo.PageResult;
|
import cn.iocoder.dashboard.common.pojo.PageResult;
|
||||||
import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
|
import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
|
||||||
import cn.iocoder.dashboard.framework.logger.operatelog.core.annotations.OperateLog;
|
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.controller.test.vo.*;
|
||||||
import cn.iocoder.dashboard.modules.tool.convert.test.ToolTestDemoConvert;
|
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.dal.dataobject.test.ToolTestDemoDO;
|
||||||
import cn.iocoder.dashboard.modules.tool.service.test.ToolTestDemoService;
|
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.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
@ -66,7 +65,7 @@ public class ToolTestDemoController {
|
|||||||
@ApiOperation("获得测试示例")
|
@ApiOperation("获得测试示例")
|
||||||
@ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
|
@ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class)
|
||||||
@PreAuthorize("@ss.hasPermission('tool:test-demo:query')")
|
@PreAuthorize("@ss.hasPermission('tool:test-demo:query')")
|
||||||
@Lock4j // 分布式锁
|
// @Lock4j // 分布式锁
|
||||||
public CommonResult<ToolTestDemoRespVO> getTestDemo(@RequestParam("id") Long id) {
|
public CommonResult<ToolTestDemoRespVO> getTestDemo(@RequestParam("id") Long id) {
|
||||||
if (true) { // 测试分布式锁
|
if (true) { // 测试分布式锁
|
||||||
ThreadUtil.sleep(5, TimeUnit.SECONDS);
|
ThreadUtil.sleep(5, TimeUnit.SECONDS);
|
||||||
@ -79,7 +78,8 @@ public class ToolTestDemoController {
|
|||||||
@ApiOperation("获得测试示例列表")
|
@ApiOperation("获得测试示例列表")
|
||||||
@ApiImplicitParam(name = "ids", value = "编号列表", required = true, dataTypeClass = List.class)
|
@ApiImplicitParam(name = "ids", value = "编号列表", required = true, dataTypeClass = List.class)
|
||||||
@PreAuthorize("@ss.hasPermission('tool:test-demo:query')")
|
@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) {
|
public CommonResult<List<ToolTestDemoRespVO>> getTestDemoList(@RequestParam("ids") Collection<Long> ids) {
|
||||||
List<ToolTestDemoDO> list = testDemoService.getTestDemoList(ids);
|
List<ToolTestDemoDO> list = testDemoService.getTestDemoList(ids);
|
||||||
return success(ToolTestDemoConvert.INSTANCE.convertList(list));
|
return success(ToolTestDemoConvert.INSTANCE.convertList(list));
|
||||||
|
Loading…
Reference in New Issue
Block a user