Commit 898a9615 authored by zhangjianqian's avatar zhangjianqian

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	danger-manage-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java
parents 0894b5d6 0c361964
...@@ -106,7 +106,7 @@ zehong: ...@@ -106,7 +106,7 @@ zehong:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath) # 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath)
profile: D:/zehong/uploadPath profile: /home/zehong/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
......
...@@ -106,7 +106,7 @@ zehong: ...@@ -106,7 +106,7 @@ zehong:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath) # 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath)
profile: D:/zehong/uploadPath profile: /home/zehong/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
......
...@@ -114,7 +114,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter ...@@ -114,7 +114,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
.antMatchers( .antMatchers(
HttpMethod.POST, HttpMethod.POST,
"/subscription/**", "/subscription/**",
"/system/result/**","/arcFace/compare" "/system/result/**",
"/arcFace/**"
).permitAll() ).permitAll()
.antMatchers("/profile/**").anonymous() .antMatchers("/profile/**").anonymous()
.antMatchers("/common/download**").anonymous() .antMatchers("/common/download**").anonymous()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment