From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 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..89c43fd 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
@@ -39,50 +39,61 @@
private String wechat;
- private List<String> roleIds;
+ private List<Integer> roleIds;
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