From db4acf4c8a81435d77a97f0aed4efc58d7799e8d Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 18 Mar 2021 17:17:05 +0800
Subject: [PATCH] sys_config实体类生成
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 100 +++++++------------------------------------------
1 files changed, 15 insertions(+), 85 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..641d362 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
@@ -17,6 +17,7 @@
import com.moral.api.pojo.form.*;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
@@ -43,8 +44,7 @@
@Service
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
- @Value("${AES.KEY}")
- private String AESKey;
+
@Autowired
ManageAccountMapper manageAccountMapper;
@Autowired
@@ -54,11 +54,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 +69,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);
@@ -87,7 +82,7 @@
//������������������������
ManageAccount manageAccount = null;
for (ManageAccount value : manageAccounts) {
- if ("0".equals(value.getIsDelete()))
+ if (Constants.NOT_DELETE.equals(value.getIsDelete()))
manageAccount = value;
}
@@ -98,8 +93,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,53 +154,17 @@
//������
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);
- exitAccount.setIsDelete("0");
+ exitAccount.setIsDelete(Constants.NOT_DELETE);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.setEntity(exitAccount);
List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
@@ -302,7 +261,7 @@
if (!ObjectUtils.isEmpty(isDelete))
wrapper.eq("is_delete", isDelete);
else
- wrapper.eq("is_delete", "0");
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
Page resultPage = manageAccountMapper.selectPage(page, wrapper);
//���������������������������
@@ -352,24 +311,12 @@
QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
ManageAccount exitManageAccount = new ManageAccount();
exitManageAccount.setId(accountId);
- exitManageAccount.setIsDelete("0");
+ exitManageAccount.setIsDelete(Constants.NOT_DELETE);
exitWrapper.setEntity(exitManageAccount);
List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
if (ObjectUtils.isEmpty(manageAccounts)) {
accountUpdateDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
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���
@@ -419,7 +366,7 @@
Integer accountId = accountDeleteForm.getAccountId();
//������������������
ManageAccount manageAccount = new ManageAccount();
- manageAccount.setIsDelete("0");
+ manageAccount.setIsDelete(Constants.NOT_DELETE);
manageAccount.setId(accountId);
QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(manageAccount);
@@ -430,13 +377,13 @@
return accountDeleteDTO;
}
//������������������
- existManageAccount.setIsDelete("1");
+ existManageAccount.setIsDelete(Constants.DELETE);
UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
- deleteAccountWrapper.set("is_delete", "1").eq("id", manageAccount.getId());
+ deleteAccountWrapper.set("is_delete", Constants.DELETE).eq("id", manageAccount.getId());
manageAccountMapper.update(null, deleteAccountWrapper);
//������������������������������
UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
- deleteManageAccountRoleWrapper.set("is_delete", "1").eq("account_id", manageAccount.getId());
+ deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
//������������������
accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
@@ -446,23 +393,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