diff --git a/mms-admin/src/main/java/com/sxpcwlkj/GeneratePassword.java b/mms-admin/src/main/java/com/sxpcwlkj/GeneratePassword.java index 394884a..2fb8f5b 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/GeneratePassword.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/GeneratePassword.java @@ -21,7 +21,7 @@ public class GeneratePassword { //加密内容 System.out.println("url: " + CryptoUtils.encrypt(arr[0], "jdbc:mysql://localhost:3306/mms")); System.out.println("username: " + CryptoUtils.encrypt(arr[0], "root")); - System.out.println("password: " + CryptoUtils.encrypt(arr[0], "123456")); + System.out.println("password: " + CryptoUtils.encrypt(arr[0], "ieHsBpEdmKcDfMtm")); //备注: 生成的密文 要和 publicKey 一起更新到配置文件中，否则会造成解密失败。 } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/bo/SysUserBo.java b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/bo/SysUserBo.java index 1130d68..242c0fa 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/bo/SysUserBo.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/bo/SysUserBo.java @@ -53,7 +53,7 @@ public class SysUserBo extends BaseEntity { * 用户账号 */ @NotBlank(message = "账号不能为空", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class}) - @Size(min = 4, max = 20, message = "账号长度在5到20之间", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class}) + @Size(min = 3, max = 20, message = "账号长度在3到20之间", groups = {ValidatedGroupConfig.insert.class, ValidatedGroupConfig.update.class}) private String userName; /** diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictDataVo.java b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictDataVo.java index 1f7e05a..3d4c3cc 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictDataVo.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictDataVo.java @@ -25,7 +25,7 @@ public class SysDictDataVo { private Integer sort; - private String status; + private Integer status; private String colorType; diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictVo.java b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictVo.java index 8507b29..9d36afc 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictVo.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysDictVo.java @@ -29,9 +29,9 @@ public class SysDictVo { */ private Integer type; /** - * 状态;0正常 1停用 + * 状态;1正常 0停用 */ - private String status; + private Integer status; /** * 排序 */ diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysFunctionVo.java b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysFunctionVo.java index b0b2f45..8c35e4e 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysFunctionVo.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/entity/vo/SysFunctionVo.java @@ -63,7 +63,7 @@ public class SysFunctionVo { */ private String componentName; /** - * 状态;0正常 1停用 + * 状态;1正常 0停用 */ private Integer status; /** diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysConfigServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysConfigServiceImpl.java index 2eee5d1..0954a3e 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysConfigServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysConfigServiceImpl.java @@ -179,7 +179,7 @@ public class SysConfigServiceImpl extends BaseServiceImpl(); SysDictDataVo sysDictDataVo = new SysDictDataVo(); sysDictDataVo.setDictType("0"); - sysDictDataVo.setStatus("0"); + sysDictDataVo.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); vos.add(sysDictDataVo); } sysDictVo.setList(vos); @@ -124,7 +124,7 @@ public class SysDictServiceImpl implements SysDictService { @Override public Integer initSysDict(String code) { - List dicts = baseMapper.selectList(new LambdaQueryWrapper().eq(SysDict::getStatus, 0).orderByAsc(SysDict::getSort)); + List dicts = baseMapper.selectList(new LambdaQueryWrapper().eq(SysDict::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).orderByAsc(SysDict::getSort)); int i = 0; for (SysDict d : dicts) { List data = sysDictDataMapper.selectList(new LambdaQueryWrapper() @@ -151,7 +151,9 @@ public class SysDictServiceImpl implements SysDictService { @Override public List> selectAll() { - List dataVos = baseMapper.selectVoList(new LambdaQueryWrapper().eq(SysDict::getStatus, 0).orderByAsc(SysDict::getSort)); + List dataVos = baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(SysDict::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()) + .orderByAsc(SysDict::getSort)); List> end = new ArrayList<>(); for (SysDictVo dict : dataVos) { diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java index 12b5cde..d3c02c6 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysLoginServiceImpl.java @@ -99,20 +99,20 @@ public class SysLoginServiceImpl implements SysLoginService { if(sysConfigService.getIsOpenCaptcha()){ if(StringUtil.isEmpty(code)){ - throw new MmsException("The verification code cannot be empty"); + throw new MmsException("验证码不能为空"); } Map data = RedisUtil.getCacheObject(uuid); if (ObjectUtils.isEmpty(data)) { log.info("登录：验证码失效！"); - throw new LoginException("Verification code failure"); + throw new LoginException("验证码失效"); } if (!codeKey.equals(data.get(CaptchaEntity.CODE.CAPTCHA_KEY.getValue()))) { log.info("登录：验证码与验证对象不匹配！"); - throw new LoginException("Verification code does not match the verification object"); + throw new LoginException("验证码与验证对象不匹配"); } if (!code.equalsIgnoreCase((String) data.get(CaptchaEntity.CODE.CAPTCHA_VALUE.getValue()))) { log.info("登录：验证码不匹配！"); - throw new LoginException("Verification code does not match"); + throw new LoginException("验证码不匹配"); } } return; @@ -130,11 +130,11 @@ public class SysLoginServiceImpl implements SysLoginService { SysTenant sysTenant = sysTenantService.selectById(sysUser.getTenantId()); if (ObjectUtils.isEmpty(sysTenant)) { log.info("登录用户ID：{} 租户不存在.", sysUser.getUserId()); - throw new TenantException("tenant.not.exists"); + throw new TenantException("租户不存在"); } if (!sysTenant.getStatus().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())) { log.info("登录用户ID：{} 租户状态为禁用.", sysUser.getUserId()); - throw new TenantException("tenant off state"); + throw new TenantException("租户状态为禁用"); } } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java index 09c0362..87d43c0 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysUserServiceImpl.java @@ -195,7 +195,7 @@ public class SysUserServiceImpl implements SysUserService { // 账号查询 .like(StringUtil.isNotEmpty(bo.getUserName()), "u.user_name", bo.getUserName()) // 账号状态 - .eq(StringUtil.isNotEmpty(bo.getStatus()), "u.status", bo.getStatus()) +// .eq(StringUtil.isNotEmpty(bo.getStatus()), "u.status", bo.getStatus()) // 手机号 .like(StringUtil.isNotEmpty(bo.getPhoneNumber()), "u.phonenumber", bo.getPhoneNumber()) .and(ObjectUtil.isNotNull(bo.getDeptId()), w -> { @@ -259,7 +259,10 @@ public class SysUserServiceImpl implements SysUserService { userVo.setButCodes(list.toArray(String[]::new)); //===================超级管理员拥有所有========================== if (userVo.getUserId().equals(SystemCommonEnum.SUPER_ADMIN.getValue().toString())) { - sysRoles = sysRoleMapper.selectList(new LambdaQueryWrapper().eq(SysRole::getCode, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).like(SysRole::getCode, SystemCommonEnum.SUPER_ADMIN.getCode()).orderByAsc(SysRole::getSort).last("LIMIT 1")); + sysRoles = sysRoleMapper.selectList(new LambdaQueryWrapper() + .eq(SysRole::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()) + .like(SysRole::getCode, SystemCommonEnum.SUPER_ADMIN.getCode()) + .orderByAsc(SysRole::getSort).last("LIMIT 1")); sysRoleVos = BeanCopyUtil.convert(sysRoles, SysRoleVo.class); List functionList = sysFunctionMapper.selectList(new LambdaQueryWrapper().eq(SysFunction::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).orderByAsc(SysFunction::getSort)); diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/SystemCommonEnum.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/SystemCommonEnum.java index d3868cc..8d69469 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/SystemCommonEnum.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/SystemCommonEnum.java @@ -20,12 +20,12 @@ public enum SystemCommonEnum implements IEnum { /** * 系统状态：启用 */ - SYS_COMMON_STATE_OPEN(0, "common_state","系统状态-启用/有效"), + SYS_COMMON_STATE_OPEN(1, "common_state","系统状态-启用/有效"), /** * 系统状态：禁用 */ - SYS_COMMON_STATE_CLOSE(1, "common_state","系统状态-关闭/失效"), + SYS_COMMON_STATE_CLOSE(0, "common_state","系统状态-关闭/失效"), /** * 系统默认头像 diff --git a/mms-modules/mms-datasource/src/main/java/com/sxpcwlkj/datasource/handler/MybatisPlusMetaObjectHandler.java b/mms-modules/mms-datasource/src/main/java/com/sxpcwlkj/datasource/handler/MybatisPlusMetaObjectHandler.java index c700c3d..abd9e60 100644 --- a/mms-modules/mms-datasource/src/main/java/com/sxpcwlkj/datasource/handler/MybatisPlusMetaObjectHandler.java +++ b/mms-modules/mms-datasource/src/main/java/com/sxpcwlkj/datasource/handler/MybatisPlusMetaObjectHandler.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.sxpcwlkj.authority.LoginObject; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.exception.MmsException; import com.sxpcwlkj.datasource.entity.BaseEntity; import lombok.RequiredArgsConstructor; @@ -35,7 +36,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { baseEntity.setCreatedTime(current); baseEntity.setUpdatedTime(current); if(baseEntity.getStatus()==null){ - baseEntity.setStatus(0); + baseEntity.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); } if(baseEntity.getSort()==null){ baseEntity.setSort(0);