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
6913034d
Commit
6913034d
authored
Aug 04, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
4b3305c7
6662ab68
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
ValidityConstants.java
....plus.v1/yifu/common/core/constant/ValidityConstants.java
+2
-0
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+1
-1
InsurancesConstants.java
...lus/v1/yifu/insurances/constants/InsurancesConstants.java
+2
-2
ValidityUtil.java
...yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
+1
-1
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/ValidityConstants.java
View file @
6913034d
...
...
@@ -69,4 +69,6 @@ public class ValidityConstants {
/** 不超过两位小数的正数 */
public
static
final
String
POSITIVE_INTEGER_PATTERN_TWO_FLOAT
=
"^[+]?([0-9]+(.[0-9]{1,2})?)$"
;
/** 身份证规则(x只能大写) */
public
static
final
String
IDCARD_UPPERCASE_PATTERN
=
"(^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9X]$)|(^[1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)"
;
}
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
6913034d
...
...
@@ -12,6 +12,6 @@ dapr.check.appId=yifu-check
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.insurances.appUrl
=
http://yifu-
insurances
.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appUrl
=
http://yifu-
auth
.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java
View file @
6913034d
...
...
@@ -190,9 +190,9 @@ public class InsurancesConstants {
*/
public
static
final
String
REPLACE_EMP_INFO_SAME
=
"替换信息和被替换信息一致,无法替换"
;
/**
* 替换员工身份证号格式
有
误
* 替换员工身份证号格式
错
误
*/
public
static
final
String
REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE
=
"替换员工身份证号格式
有
误"
;
public
static
final
String
REPLACE_EMP_IDCARD_NO_NOT_LEGITIMATE
=
"替换员工身份证号格式
错
误"
;
/**
* 项目编码不能为空
*/
...
...
yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/ValidityUtil.java
View file @
6913034d
...
...
@@ -150,7 +150,7 @@ public class ValidityUtil {
if
(
Common
.
isEmpty
(
idCard
)){
return
Boolean
.
FALSE
;
}
return
idCard
.
matches
(
ValidityConstants
.
IDCARD_PATTERN
)
;
return
idCard
.
matches
(
ValidityConstants
.
IDCARD_
UPPERCASE_
PATTERN
)
;
}
/**
...
...
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