From 726b056fc2d3b51acdeb0b5fbaf74c8886acc2ac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 23 Apr 2021 14:49:40 +0800
Subject: [PATCH] screen-manage 更新时间格式
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
index e11731f..08b8cf9 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
@@ -43,46 +43,57 @@
public boolean valid() {
if (
- ObjectUtils.isEmpty(account) ||
- ObjectUtils.isEmpty(password) ||
- ObjectUtils.isEmpty(userName)
- )
+ ObjectUtils.isEmpty(account) ||
+ ObjectUtils.isEmpty(password) ||
+ ObjectUtils.isEmpty(userName)
+ )
return false;
return true;
}
- public AccountDTO paramValid(){
+ public AccountDTO paramValid() {
AccountDTO dto = new AccountDTO();
- //���������������������������������
- if(!RegexUtils.checkAccount(account)){
+ //������������������������������
+ if (!RegexUtils.checkAccount(account)) {
dto.setCode(ResponseCodeEnum.ACCOUNT_INVALID.getCode());
dto.setMsg(ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
return dto;
}
+ //���������������������������������
+ if(!RegexUtils.checkChinese(userName)||userName.contains(" ")){
+ dto.setCode(ResponseCodeEnum.USERNAME_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.USERNAME_INVALID.getMsg());
+ return dto;
+ }
//������������������������������
- if(!RegexUtils.checkPassword(AESUtils.decrypt(password))){
+ if (!RegexUtils.checkPassword(AESUtils.decrypt(password))) {
dto.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode());
dto.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg());
return dto;
}
//���������������������������������
- if(!RegexUtils.checkMobile(mobile)){
- dto.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
- return dto;
+ if (!ObjectUtils.isEmpty(mobile)) {
+ if (!RegexUtils.checkMobile(mobile)) {
+ dto.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
+ return dto;
+ }
}
//������������������������������
- if(!RegexUtils.checkEmail(email)){
- dto.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
- dto.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
- return dto;
+ if (!ObjectUtils.isEmpty(email)) {
+ if (!RegexUtils.checkEmail(email)) {
+ dto.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return dto;
+ }
}
dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
+
}
- public ManageAccount formConvertEntity(){
+ public ManageAccount formConvertEntity() {
ManageAccount manageAccount = new ManageAccount();
manageAccount.setAccount(account);
manageAccount.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
--
Gitblit v1.8.0