Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
schbrain-parent
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
framework
schbrain-parent
Commits
af14ee63
Commit
af14ee63
authored
Jun 29, 2023
by
liaozan
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update CorsFilterConfiguration to make sure corsFilter has the HIGHEST_PRECEDENCE
parent
d2d6c448
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
commons/web-common/src/main/java/com/schbrain/common/web/CorsFilterConfiguration.java
...java/com/schbrain/common/web/CorsFilterConfiguration.java
+12
-5
commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java
...a/com/schbrain/common/web/WebCommonAutoConfiguration.java
+1
-1
No files found.
commons/web-common/src/main/java/com/schbrain/common/web/
DefaultCors
Configuration.java
→
commons/web-common/src/main/java/com/schbrain/common/web/
CorsFilter
Configuration.java
View file @
af14ee63
package
com.schbrain.common.web
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.web.servlet.ConditionalOnMissingFilterBean
;
import
org.springframework.boot.web.servlet.FilterRegistrationBean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.cors.*
;
import
org.springframework.core.Ordered
;
import
org.springframework.web.cors.CorsConfiguration
;
import
org.springframework.web.cors.UrlBasedCorsConfigurationSource
;
import
org.springframework.web.filter.CorsFilter
;
import
java.time.Duration
;
...
...
@@ -13,7 +17,7 @@ import java.time.Duration;
* @since 2023-06-26
*/
@Configuration
(
proxyBeanMethods
=
false
)
public
class
DefaultCors
Configuration
{
public
class
CorsFilter
Configuration
{
@Bean
@ConditionalOnMissingBean
...
...
@@ -37,9 +41,12 @@ public class DefaultCorsConfiguration {
}
@Bean
@ConditionalOnMissingBean
public
CorsFilter
defaultCorsFilter
(
UrlBasedCorsConfigurationSource
corsConfigurationSource
)
{
return
new
CorsFilter
(
corsConfigurationSource
);
@ConditionalOnMissingFilterBean
public
FilterRegistrationBean
<
CorsFilter
>
defaultCorsFilter
(
UrlBasedCorsConfigurationSource
configurationSource
)
{
FilterRegistrationBean
<
CorsFilter
>
registrationBean
=
new
FilterRegistrationBean
<>();
registrationBean
.
setFilter
(
new
CorsFilter
(
configurationSource
));
registrationBean
.
setOrder
(
Ordered
.
HIGHEST_PRECEDENCE
);
return
registrationBean
;
}
}
\ No newline at end of file
commons/web-common/src/main/java/com/schbrain/common/web/WebCommonAutoConfiguration.java
View file @
af14ee63
...
...
@@ -23,7 +23,7 @@ import java.util.List;
@AutoConfiguration
@ConditionalOnWebApplication
(
type
=
Type
.
SERVLET
)
@EnableConfigurationProperties
(
WebProperties
.
class
)
@Import
({
AuthenticationConfiguration
.
class
,
ExceptionHandingConfiguration
.
class
,
ServletComponentConfiguration
.
class
,
DefaultCors
Configuration
.
class
})
@Import
({
AuthenticationConfiguration
.
class
,
ExceptionHandingConfiguration
.
class
,
ServletComponentConfiguration
.
class
,
CorsFilter
Configuration
.
class
})
public
class
WebCommonAutoConfiguration
{
@Bean
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment