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();
    }
}