Przeglądaj źródła

Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

bgy 2 lat temu
rodzic
commit
08b6413634

+ 3
- 1
ruoyi-admin/src/main/resources/application.yml Wyświetl plik

@@ -32,7 +32,6 @@ server:
32 32
       max: 800
33 33
       # Tomcat启动初始化的线程数,默认值10
34 34
       min-spare: 100
35
-
36 35
 # 日志配置
37 36
 logging:
38 37
   level:
@@ -89,6 +88,9 @@ spring:
89 88
         max-active: 8
90 89
         # #连接池最大阻塞等待时间(使用负值表示没有限制)
91 90
         max-wait: -1ms
91
+  web:
92
+    resources:
93
+      static-locations:  file:/home/ruoyi/
92 94
 
93 95
 # token配置
94 96
 token:

+ 1
- 1
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java Wyświetl plik

@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
111 111
                 // 过滤请求
112 112
                 .authorizeRequests()
113 113
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
114
-                .antMatchers("/login", "/register", "/captchaImage","/home/**").permitAll()
114
+                .antMatchers("/login", "/register", "/captchaImage","/uploadPath/**").permitAll()
115 115
                 // 静态资源,可匿名访问
116 116
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
117 117
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()