Commit 6913034d authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/develop' into develop

parents 4b3305c7 6662ab68
...@@ -69,4 +69,6 @@ public class ValidityConstants { ...@@ -69,4 +69,6 @@ public class ValidityConstants {
/** 不超过两位小数的正数 */ /** 不超过两位小数的正数 */
public static final String POSITIVE_INTEGER_PATTERN_TWO_FLOAT = "^[+]?([0-9]+(.[0-9]{1,2})?)$"; 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}$)" ;
} }
...@@ -12,6 +12,6 @@ dapr.check.appId=yifu-check ...@@ -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.appUrl=http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.archives.appId=yifu-archives 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 dapr.insurances.appId=yifu-insurances
...@@ -190,9 +190,9 @@ public class InsurancesConstants { ...@@ -190,9 +190,9 @@ public class InsurancesConstants {
*/ */
public static final String REPLACE_EMP_INFO_SAME = "替换信息和被替换信息一致,无法替换"; 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 = "替换员工身份证号格式误";
/** /**
* 项目编码不能为空 * 项目编码不能为空
*/ */
......
...@@ -150,7 +150,7 @@ public class ValidityUtil { ...@@ -150,7 +150,7 @@ public class ValidityUtil {
if(Common.isEmpty(idCard)){ if(Common.isEmpty(idCard)){
return Boolean.FALSE ; return Boolean.FALSE ;
} }
return idCard.matches(ValidityConstants.IDCARD_PATTERN) ; return idCard.matches(ValidityConstants.IDCARD_UPPERCASE_PATTERN) ;
} }
/** /**
......
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