From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 359 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 187 insertions(+), 172 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 a78cd9b..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
@@ -1,6 +1,7 @@
package com.moral.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.ManageAccount;
import com.moral.api.entity.ManageAccountRole;
@@ -10,18 +11,18 @@
import com.moral.api.mapper.ManageAccountRoleMapper;
import com.moral.api.mapper.ManageMenuMapper;
import com.moral.api.mapper.ManageRoleMapper;
-import com.moral.api.pojo.dto.account.AccountDTO;
-import com.moral.api.pojo.dto.account.AccountInsertDTO;
-import com.moral.api.pojo.dto.account.AccountQueryDTO;
-import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.request.*;
+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;
import com.moral.util.TokenUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,69 +44,67 @@
@Service
public class ManageAccountServiceImpl extends ServiceImpl<ManageAccountMapper, ManageAccount> implements ManageAccountService {
- @Value("${AES.KEY}")
- private String AESKey;
- @Resource
+
+ @Autowired
ManageAccountMapper manageAccountMapper;
- @Resource
+ @Autowired
ManageRoleMapper manageRoleMapper;
- @Resource
+ @Autowired
ManageMenuMapper manageMenuMapper;
- @Resource
+ @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: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public LoginDTO login(LoginRequest loginRequest) {
+ public LoginDTO login(LoginForm loginForm) {
LoginDTO loginDTO = new LoginDTO();
//������
- String AESAccount = loginRequest.getAccount();
- String AESPassword = loginRequest.getPassword();
+ String account = loginForm.getAccount();
+ String AESPassword = loginForm.getPassword();
//������
- String account = AESUtils.decrypt(AESAccount, AESKey);
- String password = AESUtils.decrypt(AESPassword, AESKey);
+ String password = AESUtils.decrypt(AESPassword);
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
- ManageAccount manageAccount = manageAccountMapper.selectOne(wrapper);
- if (ObjectUtils.isEmpty(manageAccount)) {
- loginDTO.setCode(LoginDTO.NOT_EXIST);
+ List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������������������
- if (manageAccount.getIsDelete().equals("1")) {
- loginDTO.setCode(LoginDTO.IS_DELETE);
+ ManageAccount manageAccount = null;
+ for (ManageAccount value : manageAccounts) {
+ if (Constants.NOT_DELETE.equals(value.getIsDelete()))
+ manageAccount = value;
+ }
+
+ if (ObjectUtils.isEmpty(manageAccount)) {
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������
if (!MD5Utils.saltMD5Verify(password, manageAccount.getPassword())) {
- loginDTO.setCode(LoginDTO.PASSWORD_ERROR);
+ loginDTO.setCode(ResponseCodeEnum.PASSWORD_ERROR.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.PASSWORD_ERROR.getMsg());
return loginDTO;
}
//������������
List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- if (ObjectUtils.isEmpty(roles)) {//������������������������������
- loginDTO.setCode(LoginDTO.ROLE_EMPTY);
- return loginDTO;
- }
+
//������������
- List<ManageMenu> menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
- if (ObjectUtils.isEmpty(menus)) {//������������������������������
- loginDTO.setCode(LoginDTO.MENU_EMPTY);
- return loginDTO;
+ List<ManageMenu> menus = null;
+ if (!ObjectUtils.isEmpty(roles)) {
+ menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
}
//������������������
@@ -118,7 +117,8 @@
String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);
//������������������
- loginDTO.setCode(LoginDTO.SUCCESS);
+ loginDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
@@ -128,14 +128,14 @@
/**
* @Description: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public boolean logout(LogoutRequest logoutRequest) {
- String accountId = logoutRequest.getAccountId();
- String token = logoutRequest.getToken();
+ public boolean logout(LogoutForm logoutForm) {
+ String accountId = logoutForm.getAccountId();
+ String token = logoutForm.getToken();
TokenUtils.destoryToken(accountId, token);
return true;
}
@@ -149,65 +149,30 @@
*/
@Override
@Transactional
- public AccountInsertDTO insertAccount(AccountInsertRequest accountInsertRequest) {
+ public AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm) {
AccountInsertDTO accountInsertDTO = new AccountInsertDTO();
//������
- String AESAccount = accountInsertRequest.getAccount();
- String AESPassword = accountInsertRequest.getPassword();
- String account = AESUtils.decrypt(AESAccount, AESKey);
- String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword, AESKey));
- String userName = accountInsertRequest.getUserName();
- String email = accountInsertRequest.getEmail();
- String mobile = accountInsertRequest.getMobile();
- String wechat = accountInsertRequest.getWechat();
- String isDelete = accountInsertRequest.getIsDelete();
- List<String> roleIdsStr = accountInsertRequest.getRoleIds();
- //������������������������������������
- /*���������������������������������������*/
- if (isSpecialChar(account)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST_SPECIAL_CHAR);
- return accountInsertDTO;
- }
- /*������������������������������������*/
- if (isSpecialChar(password)) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_EXIST_SPECIAL_CHAR);
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (account.length() >= 20||account.length()<=6) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_LENGTH_INVALID);
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20||AESUtils.decrypt(AESPassword, AESKey).length() <= 6) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_LENGTH_INVALID);
- return accountInsertDTO;
- }
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountInsertDTO.setCode(AccountInsertDTO.MOBILE_INVALID);
- return accountInsertDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountInsertDTO.setCode(AccountInsertDTO.EMAIL_INVALID);
- return accountInsertDTO;
- }
- /*���������������������������*/
+ String account = accountInsertForm.getAccount();
+ String AESPassword = accountInsertForm.getPassword();
+ 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();
+
+ /*������������������������*/
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);
if (!ObjectUtils.isEmpty(exitAccounts)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST);
+ accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
return accountInsertDTO;
}
-
- //String to Integer
- List<Integer> roleIds = new ArrayList<>();
- roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
//������account
ManageAccount manageAccount = new ManageAccount();
@@ -217,23 +182,31 @@
manageAccount.setEmail(email);
manageAccount.setMobile(mobile);
manageAccount.setWechat(wechat);
- manageAccount.setIsDelete(isDelete);
manageAccountMapper.insert(manageAccount);
//������account_role
- Integer accountId = manageAccount.getId();
- roleIdsStr.forEach(
- value -> {
- ManageAccountRole manageAccountRole = new ManageAccountRole();
- manageAccountRole.setAccountId(accountId);
- manageAccountRole.setRoleId(Integer.parseInt(value));
- manageAccountRoleMapper.insert(manageAccountRole);
- }
- );
+ /*String to Integer*/
+ List<ManageRole> roles = null;
+ //������������������������������������������������������
+ if (!ObjectUtils.isEmpty(roleIdsStr)) {
+ List<Integer> roleIds = new ArrayList<>();
+ roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
+
+ Integer accountId = manageAccount.getId();
+ roleIdsStr.forEach(
+ value -> {
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setAccountId(accountId);
+ manageAccountRole.setRoleId(Integer.parseInt(value));
+ manageAccountRoleMapper.insert(manageAccountRole);
+ }
+ );
+ roles = manageRoleMapper.selectBatchIds(roleIds);
+ }
//������������������
- List<ManageRole> roles = manageRoleMapper.selectBatchIds(roleIds);
accountInsertDTO.setAccount(manageAccount);
accountInsertDTO.setRoles(roles);
- accountInsertDTO.setCode(AccountInsertDTO.SUCCESS);
+ accountInsertDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountInsertDTO;
}
@@ -245,42 +218,63 @@
* @Date: 2021/3/15
*/
@Override
- public AccountQueryDTO queryAccount(AccountQueryRequest accountQueryRequest) {
+ public AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm) {
AccountQueryDTO accountQueryDTO = new AccountQueryDTO();
//������
- Integer pageCount = accountQueryRequest.getPage();
- Integer size = accountQueryRequest.getSize();
- Integer accountId = accountQueryRequest.getAccountId();
- String account = accountQueryRequest.getAccount();
- String userName = accountQueryRequest.getUserName();
- String email = accountQueryRequest.getEmail();
- String mobile = accountQueryRequest.getMobile();
- String wechat = accountQueryRequest.getWechat();
- String isDelete = accountQueryRequest.getIsDelete();
- //������������������
- Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("id", accountId);
- queryParams.put("account", account);
- queryParams.put("user_name", userName);
- queryParams.put("email", email);
- queryParams.put("mobile", mobile);
- queryParams.put("wechat", wechat);
- queryParams.put("is_delete", isDelete);
- queryParams.values().removeIf(value -> ObjectUtils.isEmpty(value));
+ Integer pageCount = accountQueryForm.getPage();
+ Integer size = accountQueryForm.getSize();
+ Integer accountId = accountQueryForm.getAccountId();
+ String account = accountQueryForm.getAccount();
+ String userName = accountQueryForm.getUserName();
+ String email = accountQueryForm.getEmail();
+ String mobile = accountQueryForm.getMobile();
+ String wechat = accountQueryForm.getWechat();
+ String isDelete = accountQueryForm.getIsDelete();
+
//������������
Page<ManageAccount> page = new Page<>(pageCount, size);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
- wrapper.allEq(queryParams);
+ if(!ObjectUtils.isEmpty(accountId)){
+ wrapper.eq("id",accountId);
+ }
+
+ if(!ObjectUtils.isEmpty(userName)){
+ wrapper.like("user_name",userName);
+ }
+
+ if(!ObjectUtils.isEmpty(account)){
+ wrapper.like("account",account);
+ }
+
+ if(!ObjectUtils.isEmpty(email)){
+ wrapper.like("email",email);
+ }
+
+ if(!ObjectUtils.isEmpty(mobile)){
+ wrapper.like("mobile",mobile);
+ }
+
+ if(!ObjectUtils.isEmpty(wechat)){
+ wrapper.like("wechat",wechat);
+ }
+
+ if (!ObjectUtils.isEmpty(isDelete))
+ wrapper.eq("is_delete", isDelete);
+ else
+ wrapper.eq("is_delete", Constants.NOT_DELETE);
+
Page resultPage = manageAccountMapper.selectPage(page, wrapper);
//���������������������������
List<ManageAccount> accounts = resultPage.getRecords();
List<AccountDTO> accountDTOS = new ArrayList<>();
- for (ManageAccount manageAccount : accounts) {
- AccountDTO accountDTO = new AccountDTO();
- List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- accountDTO.setRoles(roles);
- accountDTO.setAccount(manageAccount);
- accountDTOS.add(accountDTO);
+ if (!ObjectUtils.isEmpty(accounts)) {
+ for (ManageAccount manageAccount : accounts) {
+ AccountDTO accountDTO = new AccountDTO();
+ List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
+ accountDTO.setRoles(roles);
+ accountDTO.setAccount(manageAccount);
+ accountDTOS.add(accountDTO);
+ }
}
//������������������
accountQueryDTO.setAccountDTOS(accountDTOS);
@@ -288,42 +282,41 @@
accountQueryDTO.setPages(resultPage.getPages());
accountQueryDTO.setSize(resultPage.getSize());
accountQueryDTO.setTotal(resultPage.getTotal());
+ accountQueryDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountQueryDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountQueryDTO;
}
+ /**
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
@Override
@Transactional
- public AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest) {
+ public AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm) {
AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
//������
- Integer accountId = accountUpdateRequest.getAccountId();
- String email = accountUpdateRequest.getEmail();
- String mobile = accountUpdateRequest.getMobile();
- String wechat = accountUpdateRequest.getWechat();
- String isDelete = accountUpdateRequest.getIsDelete();
- String userName = accountUpdateRequest.getUserName();
- List<Integer> roleIds = accountUpdateRequest.getRoleIds();
+ Integer accountId = accountUpdateForm.getAccountId();
+ String email = accountUpdateForm.getEmail();
+ String mobile = accountUpdateForm.getMobile();
+ String wechat = accountUpdateForm.getWechat();
+ String userName = accountUpdateForm.getUserName();
+ List<Integer> roleIds = accountUpdateForm.getRoleIds();
//������������������������������
/*������������������������������������*/
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(AccountUpdateDTO.ACCOUNT_NOT_EXIST);
- return accountUpdateDTO;
- }
- /*���������������������������������*/
- if (!isValidMobile(mobile)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.MOBILE_INVALID);
- return accountUpdateDTO;
- }
- /*������������������������������*/
- if (!isValidEmail(email)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.EMAIL_INVALID);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
+ accountUpdateDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return accountUpdateDTO;
}
//������ManageAccount���
@@ -331,15 +324,14 @@
manageAccount.setEmail(email);
manageAccount.setMobile(mobile);
manageAccount.setWechat(wechat);
- manageAccount.setIsDelete(isDelete);
manageAccount.setUserName(userName);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
- wrapper.eq("id",accountId);
- manageAccountMapper.update(manageAccount,wrapper);
+ wrapper.eq("id", accountId);
+ manageAccountMapper.update(manageAccount, wrapper);
//������ManageAccountRole���
/*������������������������������*/
QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
- deleteWrapper.eq("account_id",accountId);
+ deleteWrapper.eq("account_id", accountId);
manageAccountRoleMapper.delete(deleteWrapper);
/*������������������*/
for (Integer roleId : roleIds) {
@@ -351,33 +343,56 @@
//������������������������
List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
//������������������
- accountUpdateDTO.setCode(AccountUpdateDTO.SUCCESS);
+ accountUpdateDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
accountUpdateDTO.setRoles(manageRoles);
accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
return accountUpdateDTO;
}
-
-
-
- private static boolean isSpecialChar(String str) {
- Pattern pattern = Pattern.compile(specialCharRegEx);
- Matcher matcher = pattern.matcher(str);
- return matcher.find();
+ /**
+ * @Description: ������������������
+ * @Param: [accountDeleteRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
+ @Override
+ @Transactional
+ public AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
+ AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO();
+ //������
+ Integer accountId = accountDeleteForm.getAccountId();
+ //������������������
+ ManageAccount manageAccount = new ManageAccount();
+ manageAccount.setIsDelete(Constants.NOT_DELETE);
+ manageAccount.setId(accountId);
+ QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
+ queryWrapper.setEntity(manageAccount);
+ ManageAccount existManageAccount = manageAccount.selectOne(queryWrapper);
+ if (ObjectUtils.isEmpty(existManageAccount)) {
+ accountDeleteDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
+ return accountDeleteDTO;
+ }
+ //������������������
+ existManageAccount.setIsDelete(Constants.DELETE);
+ UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
+ deleteAccountWrapper.set("is_delete", Constants.DELETE).eq("id", manageAccount.getId());
+ manageAccountMapper.update(null, deleteAccountWrapper);
+ //������������������������������
+ UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
+ deleteManageAccountRoleWrapper.set("is_delete", Constants.DELETE).eq("account_id", manageAccount.getId());
+ manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
+ //������������������
+ accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ accountDeleteDTO.setAccount(existManageAccount);
+ return accountDeleteDTO;
}
- 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