|
@@ -416,7 +416,7 @@ public class FactoryServiceImpl implements FactoryService {
|
|
if (StringUtils.isBlank(factoryProperty.getEmail())) {
|
|
if (StringUtils.isBlank(factoryProperty.getEmail())) {
|
|
errorMessage.append("邮箱").append("为空,");
|
|
errorMessage.append("邮箱").append("为空,");
|
|
}else {
|
|
}else {
|
|
- String emailFormatString = "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$";
|
|
|
|
|
|
+ String emailFormatString = "^([a-zA-Z0-9_-]+(\\.?)[a-zA-Z0-9_-]+)+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]{1,10}+)+$";
|
|
Pattern emailFormat = Pattern.compile(emailFormatString);
|
|
Pattern emailFormat = Pattern.compile(emailFormatString);
|
|
if (!emailFormat.matcher(factoryProperty.getEmail()).matches()) {
|
|
if (!emailFormat.matcher(factoryProperty.getEmail()).matches()) {
|
|
errorMessage.append("邮箱").append("格式不正确,");
|
|
errorMessage.append("邮箱").append("格式不正确,");
|