From 2c953876eab1622e2598a3d1ab92ae29e1d88fe5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 11:24:33 +0800
Subject: [PATCH] API项目： 更改全局异常处理器中的返回码常量 COMMON： 更改常量类和response枚举
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 83 +++--------------------------------------
1 files changed, 6 insertions(+), 77 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index d5f40cb..043690a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -43,8 +43,7 @@
@Service
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
- @Value("${AES.KEY}")
- private String AESKey;
+
@Autowired
ManageAccountMapper manageAccountMapper;
@Autowired
@@ -54,11 +53,6 @@
@Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
- public final static String specialCharRegEx = "[ _`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~���@#���%������&*������������+|{}������������������������������������]|\n|\r|\t";
-
- public final static String mobileRegEx = "^((13[0-9])|(14[0,1,4-9])|(15[0-3,5-9])|(16[2,5,6,7])|(17[0-8])|(18[0-9])|(19[0-3,5-9]))\\d{8}$";
-
- public final static String emailRegEx = "^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$";
/**
* @Description: ������
@@ -74,7 +68,7 @@
String account = loginForm.getAccount();
String AESPassword = loginForm.getPassword();
//������
- String password = AESUtils.decrypt(AESPassword, AESKey);
+ String password = AESUtils.decrypt(AESPassword);
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
@@ -98,8 +92,8 @@
}
//������������
if (!MD5Utils.saltMD5Verify(password, manageAccount.getPassword())) {
- loginDTO.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode());
- loginDTO.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ loginDTO.setCode(ResponseCodeEnum.PASSWORD_ERROR.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.PASSWORD_ERROR.getMsg());
return loginDTO;
}
@@ -159,49 +153,13 @@
//������
String account = accountInsertForm.getAccount();
String AESPassword = accountInsertForm.getPassword();
- String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword, AESKey));
+ String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword));
String userName = accountInsertForm.getUserName();
String email = accountInsertForm.getEmail();
String mobile = accountInsertForm.getMobile();
String wechat = accountInsertForm.getWechat();
List<String> roleIdsStr = accountInsertForm.getRoleIds();
- //������������������������������������
- /*���������������������������������������*/
- if (isSpecialChar(account)) {
- accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getMsg());
- return accountInsertDTO;
- }
- /*������������������������������������*/
- if (isSpecialChar(password)) {
- accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getMsg());
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (account.length() >= 20 || account.length() <= 6) {
- accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getMsg());
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20 || AESUtils.decrypt(AESPassword, AESKey).length() <= 6) {
- accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getMsg());
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountInsertDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountInsertDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
- accountInsertDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
- return accountInsertDTO;
- }
+
/*������������������������*/
ManageAccount exitAccount = new ManageAccount();
exitAccount.setAccount(account);
@@ -360,18 +318,6 @@
accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return accountUpdateDTO;
}
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountUpdateDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
- accountUpdateDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
- return accountUpdateDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountUpdateDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
- accountUpdateDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
- return accountUpdateDTO;
- }
//������ManageAccount���
ManageAccount manageAccount = new ManageAccount();
manageAccount.setEmail(email);
@@ -446,23 +392,6 @@
}
- private static boolean isSpecialChar(String str) {
- Pattern pattern = Pattern.compile(specialCharRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
- }
-
- private static boolean isValidMobile(String str) {
- Pattern pattern = Pattern.compile(mobileRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
- }
-
- private static boolean isValidEmail(String str) {
- Pattern pattern = Pattern.compile(emailRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
- }
}
--
Gitblit v1.8.0