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 @@
+
+
+
+
+
+
diff --git a/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java b/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
index e3b8278bf..6ec2f798f 100644
--- a/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
+++ b/src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java
@@ -123,32 +123,31 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
// 一堆自定义的 Spring Security 处理器
.exceptionHandling().authenticationEntryPoint(unauthorizedHandler)
.accessDeniedHandler(accessDeniedHandler).and()
- // TODO 过滤请求
+ // 设置每个请求的权限
.authorizeRequests()
- // 登陆的接口,可匿名访问
- .antMatchers(webProperties.getApiPrefix() + "/login").anonymous()
- // 通用的接口,可匿名访问
- .antMatchers( webProperties.getApiPrefix() + "/system/captcha/**").anonymous()
- // TODO
- .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
- .antMatchers("/profile/**").anonymous()
- // 文件的获取接口,可匿名访问
- .antMatchers(webProperties.getApiPrefix() + "/system/file/get/**").anonymous()
- // TODO
- .antMatchers("/swagger-ui.html").anonymous()
- .antMatchers("/swagger-resources/**").anonymous()
- .antMatchers("/webjars/**").anonymous()
- .antMatchers("/*/api-docs").anonymous()
- // Spring Boot Admin Server 的安全配置
- .antMatchers(adminServerProperties.getContextPath()).anonymous()
- .antMatchers(adminServerProperties.getContextPath() + "/**").anonymous()
- // Spring Boot Actuator 的安全配置
- .antMatchers("/actuator").anonymous()
- .antMatchers("/actuator/**").anonymous()
- // TODO
- .antMatchers("/druid/**").hasAnyAuthority("druid") // TODO 芋艿,未来需要在拓展下
- // 除上面外的所有请求全部需要鉴权认证
- .anyRequest().authenticated()
+ // 登陆的接口,可匿名访问
+ .antMatchers(webProperties.getApiPrefix() + "/login").anonymous()
+ // 通用的接口,可匿名访问
+ .antMatchers( webProperties.getApiPrefix() + "/system/captcha/**").anonymous()
+ // 静态资源,可匿名访问
+ .antMatchers(HttpMethod.GET, "/*.html", "/**/*.html", "/**/*.css", "/**/*.js").permitAll()
+ // 文件的获取接口,可匿名访问
+ .antMatchers(webProperties.getApiPrefix() + "/system/file/get/**").anonymous()
+ // Swagger 接口文档
+ .antMatchers("/swagger-ui.html").anonymous()
+ .antMatchers("/swagger-resources/**").anonymous()
+ .antMatchers("/webjars/**").anonymous()
+ .antMatchers("/*/api-docs").anonymous()
+ // Spring Boot Admin Server 的安全配置
+ .antMatchers(adminServerProperties.getContextPath()).anonymous()
+ .antMatchers(adminServerProperties.getContextPath() + "/**").anonymous()
+ // Spring Boot Actuator 的安全配置
+ .antMatchers("/actuator").anonymous()
+ .antMatchers("/actuator/**").anonymous()
+ // Druid 监控
+ .antMatchers("/druid/**").anonymous()
+ // 除上面外的所有请求全部需要鉴权认证
+ .anyRequest().authenticated()
.and()
.headers().frameOptions().disable();
httpSecurity.logout().logoutUrl("/logout").logoutSuccessHandler(logoutSuccessHandler);
diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml
index 2d62e37da..3947db18d 100644
--- a/src/main/resources/application-local.yaml
+++ b/src/main/resources/application-local.yaml
@@ -11,6 +11,27 @@ spring:
driver-class-name: com.mysql.jdbc.Driver
username: root
password: 123456
+ druid:
+ web-stat-filter:
+ enabled: true
+ stat-view-servlet:
+ enabled: true
+ # 设置白名单,不填则允许所有访问
+ allow:
+ url-pattern: /druid/*
+ # 控制台管理用户名和密码
+ login-username:
+ login-password:
+ filter:
+ stat:
+ enabled: true
+ # 慢 SQL 记录
+ log-slow-sql: true
+ slow-sql-millis: 100
+ merge-sql: true
+ wall:
+ config:
+ multi-statement-allow: true
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis: