diff --git a/ruoyi-common/src/main/resources/application-druid.yml b/ruoyi-common/src/main/resources/application-druid.yml index 13e1a5c36..6057ce24f 100644 --- a/ruoyi-common/src/main/resources/application-druid.yml +++ b/ruoyi-common/src/main/resources/application-druid.yml @@ -13,9 +13,9 @@ spring: slave: # 从数据源开关/默认关闭 enabled: false - url: - username: - password: + url: + username: + password: # 初始连接数 initialSize: 5 # 最小连接池数量 @@ -35,23 +35,3 @@ spring: testWhileIdle: true testOnBorrow: false testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单,不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: - login-password: - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-ui/src/components/RuoYi/Git/index.vue b/ruoyi-ui/src/components/RuoYi/Git/index.vue index 350fd9291..1d1cdfa75 100644 --- a/ruoyi-ui/src/components/RuoYi/Git/index.vue +++ b/ruoyi-ui/src/components/RuoYi/Git/index.vue @@ -9,7 +9,7 @@ export default { name: 'YudaoGit', data() { return { - url: 'https://github.com/YunaiV/ruoyi-vue-proe' + url: 'https://github.com/YunaiV/ruoyi-vue-pro' } }, methods: { diff --git a/ruoyi-ui/src/views/infra/server/index.vue b/ruoyi-ui/src/views/infra/server/index.vue index 6aab163ff..0ebd12744 100644 --- a/ruoyi-ui/src/views/infra/server/index.vue +++ b/ruoyi-ui/src/views/infra/server/index.vue @@ -18,7 +18,7 @@ export default { setTimeout(() => { // 模拟点击【应用】菜单 - that.$refs["iframe"].contentWindow.document.getElementsByClassName('navbar-item')[2].click(); + // that.$refs["iframe"].contentWindow.document.getElementsByClassName('navbar-item')[2].click(); // TODO 暂时去掉,存在跨域问题 // 取消加载中 this.loading = false; }, 230); diff --git a/ruoyi-ui/src/views/infra/skywalking/index.vue b/ruoyi-ui/src/views/infra/skywalking/index.vue new file mode 100644 index 000000000..00411d64e --- /dev/null +++ b/ruoyi-ui/src/views/infra/skywalking/index.vue @@ -0,0 +1,26 @@ +