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-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 7 ++-
screen-common/src/main/java/com/moral/util/AESUtils.java | 2
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 2 +
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java | 45 ++++++++++++++--------
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java | 10 +++++
screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java | 2
screen-common/src/main/java/com/moral/util/RegexUtils.java | 13 ++++++
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java | 3 +
8 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index e972972..0241eb0 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -22,9 +22,9 @@
PASSWORD_ERROR(-8,"������������"),
MOBILE_INVALID(-9,"���������������"),
EMAIL_INVALID(-10,"������������"),
- ACCOUNT_INVALID(-11,"���������������"),
+ ACCOUNT_INVALID(-11,"������������"),
PASSWORD_INVALID(-12,"������������"),
- ACCOUNT_IS_EXPIRE(-13,"���������������"),
+ ACCOUNT_IS_EXPIRE(-13,"���������������"),
ORGANIZATION_NOT_EXIST(-14,"���������������"),
ORGANIZATION_EXIST(-15,"������������������"),
ORGANIZATION_PARENT_NOT_EXIST(-16,"������������������"),
@@ -40,7 +40,8 @@
DICTTYPE_NOT_EXIST(-26,"���������������������"),
DICTTYPE_EXIST(-27,"������������������������"),
DICTDATA_KEY_EXIST(-28,"������������Key������������"),
- DICTDATA_KEY_NOT_EXIST(-29,"������������Key���������")
+ DICTDATA_KEY_NOT_EXIST(-29,"������������Key���������"),
+ USERNAME_INVALID(-30,"������������������")
;
private final Integer code;
private final String msg;
diff --git a/screen-common/src/main/java/com/moral/util/AESUtils.java b/screen-common/src/main/java/com/moral/util/AESUtils.java
index 7f77b15..34f760b 100644
--- a/screen-common/src/main/java/com/moral/util/AESUtils.java
+++ b/screen-common/src/main/java/com/moral/util/AESUtils.java
@@ -81,7 +81,7 @@
}
public static void main(String[] args) {
- System.out.println(encrypt("123456","AD42F7787B035B7580000EF93BE20BAD"));
+ System.out.println(encrypt("chenkaiyu111","AD42F7787B035B7580000EF93BE20BAD"));
}
}
diff --git a/screen-common/src/main/java/com/moral/util/RegexUtils.java b/screen-common/src/main/java/com/moral/util/RegexUtils.java
index 62aafc1..3845848 100644
--- a/screen-common/src/main/java/com/moral/util/RegexUtils.java
+++ b/screen-common/src/main/java/com/moral/util/RegexUtils.java
@@ -195,4 +195,17 @@
return Pattern.matches(regex, ipAddress);
}
+ /**
+ * @Description: ���������������������������������
+ * @Param: [str]
+ * @return: boolean
+ * @Author: ���������
+ * @Date: 2021/4/21
+ */
+ public static boolean checkContainChinese(String str){
+ Pattern p = Pattern.compile("[\u4e00-\u9fa5]");
+ Matcher matcher = p.matcher(str);
+ return matcher.find();
+ }
+
}
\ No newline at end of file
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)));
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
index 5d1882a..ae3cfe8 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java
@@ -52,6 +52,14 @@
public AccountDTO paramValid() {
AccountDTO dto = new AccountDTO();
+ //���������������������������
+ if(!ObjectUtils.isEmpty(userName)){
+ if(!RegexUtils.checkChinese(userName)||userName.contains(" ")){
+ dto.setCode(ResponseCodeEnum.USERNAME_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.USERNAME_INVALID.getMsg());
+ return dto;
+ }
+ }
//���������������������������������
if (!ObjectUtils.isEmpty(mobile)) {
if (!RegexUtils.checkMobile(mobile)) {
@@ -92,4 +100,6 @@
manageAccount.setWechat(wechat);
return manageAccount;
}
+
+
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 501c78f..11ad7c3 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -63,7 +63,7 @@
public static AccountVO convertToQueryPage(AccountDTO dto) {
if (dto.getAccount() == null)
return null;
- AccountInsertVO vo = new AccountInsertVO();
+ AccountVO vo = new AccountVO();
ManageAccount account = dto.getAccount();
List<ManageRole> roles = dto.getRoles();
if(!ObjectUtils.isEmpty(roles)){
@@ -75,6 +75,7 @@
});
}
vo.setId(account.getId());
+ vo.setAccount(account.getAccount());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
vo.setMobile(account.getMobile());
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index 479beb2..3cdf8ef 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -27,6 +27,8 @@
private String userName;
+ private String account;
+
private String email;
private String mobile;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
index 2a7885b..8e429a4 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/manageLog/ManageLogQueryVO.java
@@ -72,7 +72,7 @@
//������������������content
String[] contentArray = content.split(";");
List<String> contentList = Arrays.asList(contentArray);
- String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd");
+ String createTimeStr = DateUtils.dateToDateString(createTime, "yyyy-MM-dd HH:mm:ss");
vo.setAccount(account);
vo.setContent(contentList);
--
Gitblit v1.8.0