Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
89fcbc77
Commit
89fcbc77
authored
Jan 15, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
f41489a2
04a35429
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
15 deletions
+18
-15
CorsConfig.java
...m/yifu/cloud/plus/v1/yifu/archives/config/CorsConfig.java
+1
-1
CorsConfig.java
...a/com/yifu/cloud/plus/v1/yifu/auth/config/CorsConfig.java
+1
-1
CorsConfig.java
...com/yifu/cloud/plus/v1/yifu/salary/config/CorsConfig.java
+1
-1
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+13
-10
CorsConfig.java
...com/yifu/cloud/plus/v1/yifu/social/config/CorsConfig.java
+1
-1
CorsConfig.java
.../com/yifu/cloud/plus/v1/yifu/admin/config/CorsConfig.java
+1
-1
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/config/CorsConfig.java
View file @
89fcbc77
...
...
@@ -33,7 +33,7 @@ public class CorsConfig {
CorsFilter
corsFilter
=
new
CorsFilter
(
source
);
FilterRegistrationBean
<
CorsFilter
>
filterRegistrationBean
=
new
FilterRegistrationBean
<>(
corsFilter
);
//
order 需要再 securityFilter 前
//
前Spring Security 过滤器是通过 SecurityFilterAutoConfiguration 的 DelegatingFilterProxyRegistrationBean 注册到 servletContext上下文,其中过滤器的顺序属性 Order 读取的 是 SecurityProperties 的默认配置也就是 -100;
filterRegistrationBean
.
setOrder
(-
101
);
// 小于 SpringSecurity Filter的 Order(-100) 即可
return
filterRegistrationBean
;
...
...
yifu-auth/src/main/java/com/yifu/cloud/plus/v1/yifu/auth/config/CorsConfig.java
View file @
89fcbc77
...
...
@@ -33,7 +33,7 @@ public class CorsConfig {
CorsFilter
corsFilter
=
new
CorsFilter
(
source
);
FilterRegistrationBean
<
CorsFilter
>
filterRegistrationBean
=
new
FilterRegistrationBean
<>(
corsFilter
);
//
order 需要再 securityFilter 前
//
前Spring Security 过滤器是通过 SecurityFilterAutoConfiguration 的 DelegatingFilterProxyRegistrationBean 注册到 servletContext上下文,其中过滤器的顺序属性 Order 读取的 是 SecurityProperties 的默认配置也就是 -100;
filterRegistrationBean
.
setOrder
(-
101
);
// 小于 SpringSecurity Filter的 Order(-100) 即可
return
filterRegistrationBean
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/config/CorsConfig.java
View file @
89fcbc77
...
...
@@ -33,7 +33,7 @@ public class CorsConfig {
CorsFilter
corsFilter
=
new
CorsFilter
(
source
);
FilterRegistrationBean
<
CorsFilter
>
filterRegistrationBean
=
new
FilterRegistrationBean
<>(
corsFilter
);
//
order 需要再 securityFilter 前
//
前Spring Security 过滤器是通过 SecurityFilterAutoConfiguration 的 DelegatingFilterProxyRegistrationBean 注册到 servletContext上下文,其中过滤器的顺序属性 Order 读取的 是 SecurityProperties 的默认配置也就是 -100;
filterRegistrationBean
.
setOrder
(-
101
);
// 小于 SpringSecurity Filter的 Order(-100) 即可
return
filterRegistrationBean
;
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
89fcbc77
...
...
@@ -1119,7 +1119,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
,
"/insuranceDetail/inner/getRiskByIdCard"
,
accountList
,
SalaryRiskListVo
.
class
,
SecurityConstants
.
FROM_IN
);
if
(
riskListVoR
==
null
||
riskListVoR
.
getCode
()
==
CommonConstants
.
FAIL
)
{
return
R
.
failed
(
"
校验商险
返回为空,请稍后重试,多次失败请联系管理员"
);
return
R
.
failed
(
"
商险服务
返回为空,请稍后重试,多次失败请联系管理员"
);
}
else
{
SalaryRiskListVo
vo
=
riskListVoR
.
getData
();
// 未购买商险列表
...
...
@@ -1159,26 +1159,29 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
isTrue
=
true
;
setUpdateRiskInfo
(
s
,
buyPerson
,
updatePerSonSalaryList
,
updatePerSonList
);
}
else
{
a
.
setMsg
(
"
未购买商险列表 有 不购买申请 但 未购买社
保"
);
a
.
setMsg
(
"
“不购买申请”原因为“社保已购买”,但社保不在
保"
);
}
}
}
else
{
a
.
setMsg
(
"未购买商险列表 有
不购买申请 但 不购买原因
为空"
);
a
.
setMsg
(
"未购买商险列表 有
“不购买申请”但“不购买原因”
为空"
);
}
}
else
{
a
.
setMsg
(
"
未购买商险列表 且无 不购买申请
"
);
a
.
setMsg
(
"
无在途/在保的“商险”且无“不购买申请”
"
);
}
if
(!
isTrue
)
{
returnList
.
add
(
a
);
}
}
if
(!
updatePerSonList
.
isEmpty
())
{
tInsuranceUnpurchasePersonService
.
updateBatchById
(
updatePerSonList
);
}
if
(!
updatePerSonSalaryList
.
isEmpty
())
{
tInsuranceUnpurchasePersonSalaryService
.
saveBatch
(
updatePerSonSalaryList
);
}
// 无错误信息返回
if
(
returnList
.
isEmpty
())
{
if
(!
updatePerSonList
.
isEmpty
())
{
tInsuranceUnpurchasePersonService
.
updateBatchById
(
updatePerSonList
);
}
if
(!
updatePerSonSalaryList
.
isEmpty
())
{
tInsuranceUnpurchasePersonSalaryService
.
saveBatch
(
updatePerSonSalaryList
);
}
s
.
setIsCheckRisk
(
CommonConstants
.
ONE_INT
);
this
.
updateById
(
s
);
return
R
.
ok
();
}
else
{
return
new
R
<>(
CommonConstants
.
TWO_INT
,
"校验商险不通过!"
,
returnList
);
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/config/CorsConfig.java
View file @
89fcbc77
...
...
@@ -33,7 +33,7 @@ public class CorsConfig {
CorsFilter
corsFilter
=
new
CorsFilter
(
source
);
FilterRegistrationBean
<
CorsFilter
>
filterRegistrationBean
=
new
FilterRegistrationBean
<>(
corsFilter
);
//
order 需要再 securityFilter 前
//
前Spring Security 过滤器是通过 SecurityFilterAutoConfiguration 的 DelegatingFilterProxyRegistrationBean 注册到 servletContext上下文,其中过滤器的顺序属性 Order 读取的 是 SecurityProperties 的默认配置也就是 -100;
filterRegistrationBean
.
setOrder
(-
101
);
// 小于 SpringSecurity Filter的 Order(-100) 即可
return
filterRegistrationBean
;
...
...
yifu-upms/yifu-upms-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/admin/config/CorsConfig.java
View file @
89fcbc77
...
...
@@ -33,7 +33,7 @@ public class CorsConfig {
CorsFilter
corsFilter
=
new
CorsFilter
(
source
);
FilterRegistrationBean
<
CorsFilter
>
filterRegistrationBean
=
new
FilterRegistrationBean
<>(
corsFilter
);
//
order 需要再 securityFilter 前
//
前Spring Security 过滤器是通过 SecurityFilterAutoConfiguration 的 DelegatingFilterProxyRegistrationBean 注册到 servletContext上下文,其中过滤器的顺序属性 Order 读取的 是 SecurityProperties 的默认配置也就是 -100;
filterRegistrationBean
.
setOrder
(-
101
);
// 小于 SpringSecurity Filter的 Order(-100) 即可
return
filterRegistrationBean
;
...
...
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