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/controller/AuthController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java index 8fcf19b..3316aa7 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/AuthController.java @@ -35,7 +35,7 @@ import java.util.Map; * @author mmsAdmin * @Doc MMS文档 */ -@Tag(name = "系统登录",description = "系统登录,鉴权") +@Tag(name = "系统管理模块-登录,鉴权",description = "系统管理模块-登录,鉴权") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java index a22702b..efcf364 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CaptchaController.java @@ -8,6 +8,7 @@ import com.sxpcwlkj.common.utils.DataUtil; import com.sxpcwlkj.common.utils.R; import com.sxpcwlkj.system.service.CaptchaService; import com.sxpcwlkj.system.service.SysTenantService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -26,7 +27,7 @@ import java.util.Map; * @author mmsAdmin * @Doc MMS文档 */ - +@Tag(name = "系统管理模块-验证码处理",description = "系统管理模块-验证码处理") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java index 087d3a4..42aeaf4 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/CommonController.java @@ -33,6 +33,7 @@ import com.sxpcwlkj.system.service.SysDictService; import com.sxpcwlkj.system.service.SysLoginService; import com.sxpcwlkj.system.service.SysUserService; import com.sxpcwlkj.wx.service.WxCodeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -50,6 +51,7 @@ import java.util.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-公共接口",description = "系统管理模块-公共接口") @RestController @RequiredArgsConstructor @Slf4j @@ -97,7 +99,7 @@ public class CommonController extends BaseController { map.put("loginType", DataUtil.getStringToList(smsConfigEntity.getConfigValue())); } if("sys_base_tenant_state".equals(smsConfigEntity.getConfigKey())){ - map.put("tenantState", Convert.toInt(smsConfigEntity.getConfigValue()) == 1); + map.put("tenantState", Convert.toInt(smsConfigEntity.getConfigValue()).equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())); } if("sys_base_login_bg".equals(smsConfigEntity.getConfigKey())){ map.put("loginBg",smsConfigEntity.getConfigValue()); diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java index 0cfd6fd..3db3d83 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/HomeController.java @@ -15,6 +15,7 @@ import com.sxpcwlkj.system.service.SysConfigService; import com.sxpcwlkj.system.service.SysFunctionService; import com.sxpcwlkj.system.service.SysNoticeService; import com.sxpcwlkj.system.service.SysUserService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -29,6 +30,7 @@ import java.util.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-首页控制台",description = "系统管理模块-首页控制台") @RestController @RequiredArgsConstructor @RequestMapping("system/home") diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java index 049f66d..10ec220 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysConfigController.java @@ -12,6 +12,7 @@ import com.sxpcwlkj.sms.service.SmsService; import com.sxpcwlkj.system.entity.bo.SysConfigBo; import com.sxpcwlkj.system.entity.vo.SysConfigVo; import com.sxpcwlkj.system.service.SysConfigService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -26,6 +27,7 @@ import java.util.List; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统配置",description = "系统管理模块-系统配置") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java index 80602b7..f5b2814 100755 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDeptController.java @@ -13,6 +13,7 @@ import com.sxpcwlkj.system.entity.bo.SysDeptBo; import com.sxpcwlkj.system.entity.export.SysDeptExport; import com.sxpcwlkj.system.entity.vo.SysDeptVo; import com.sxpcwlkj.system.service.SysDeptService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,6 +32,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统部门",description = "系统管理模块-系统部门") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java index 42df3e5..553c2af 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysDictController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.framework.config.ValidatedGroupConfig; import com.sxpcwlkj.system.entity.bo.SysDictBo; import com.sxpcwlkj.system.entity.vo.SysDictVo; import com.sxpcwlkj.system.service.SysDictService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统字典",description = "系统管理模块-系统字典") @RequestMapping("system/dict") @RestController @RequiredArgsConstructor @@ -30,7 +32,6 @@ public class SysDictController extends BaseController { * 分页查询字典列表 * * @param bo 查询条件 - * @param pageQuery 分页条件 * @return 分页结果 */ @MssSafety diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java index 4eb1049..c16a080 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysFunctionController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.system.entity.AdminMenuTree; import com.sxpcwlkj.system.entity.bo.SysFunctionBo; import com.sxpcwlkj.system.entity.vo.SysFunctionVo; import com.sxpcwlkj.system.service.SysFunctionService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -22,6 +23,7 @@ import java.util.List; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统资源",description = "系统管理模块-系统资源") @RequestMapping("system/function") @RestController @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java index 6f38122..406eee0 100755 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysNoticeController.java @@ -13,6 +13,7 @@ import com.sxpcwlkj.system.entity.bo.SysNoticeBo; import com.sxpcwlkj.system.entity.export.SysNoticeExport; import com.sxpcwlkj.system.entity.vo.SysNoticeVo; import com.sxpcwlkj.system.service.SysNoticeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -31,6 +32,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统公告",description = "系统管理模块-系统公告") @Slf4j @Validated @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java index a277c9d..7f15109 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysOssController.java @@ -5,6 +5,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import com.sxpcwlkj.common.annotation.MssSafety; import com.sxpcwlkj.common.code.controller.BaseController; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.utils.R; import com.sxpcwlkj.datasource.entity.page.TableDataInfo; import com.sxpcwlkj.framework.config.ValidatedGroupConfig; @@ -15,6 +16,7 @@ import com.sxpcwlkj.system.entity.vo.SysOssConfigVo; import com.sxpcwlkj.system.entity.vo.SysOssVo; import com.sxpcwlkj.system.service.SysOssConfigService; import com.sxpcwlkj.system.service.SysOssService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.dromara.x.file.storage.core.FileInfo; import org.dromara.x.file.storage.core.FileStorageService; @@ -28,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-对象存储",description = "系统管理模块-对象存储") @RequestMapping("system/oss") @RestController @RequiredArgsConstructor @@ -87,7 +90,7 @@ public class SysOssController extends BaseController { sysOssBo.setPlatform(fileInfo.getPlatform()); sysOssBo.setContentType(fileInfo.getContentType()); sysOssBo.setBasePath(fileInfo.getBasePath()); - sysOssBo.setStatus(0); + sysOssBo.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysOssBo.setSort(0); return success(baseService.insert(sysOssBo)); } diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java index 97e3f33..4befc7e 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysRoleController.java @@ -9,6 +9,7 @@ import com.sxpcwlkj.framework.config.ValidatedGroupConfig; import com.sxpcwlkj.system.entity.bo.SysRoleBo; import com.sxpcwlkj.system.entity.vo.SysRoleVo; import com.sxpcwlkj.system.service.SysRoleService; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; @@ -20,6 +21,7 @@ import org.springframework.web.bind.annotation.*; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统角色",description = "系统管理模块-系统角色") @RequestMapping("system/role") @RestController @RequiredArgsConstructor diff --git a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java index cfde104..c28218a 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/controller/SysUserController.java @@ -21,6 +21,7 @@ import com.sxpcwlkj.system.entity.export.SysUserExportVo; import com.sxpcwlkj.system.entity.vo.SysUserVo; import com.sxpcwlkj.system.service.SysUserService; import com.sxpcwlkj.wx.service.WxCodeService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; @@ -42,6 +43,7 @@ import java.util.Set; * @author mmsAdmin * @Doc MMS文档 */ +@Tag(name = "系统管理模块-系统用户",description = "系统管理模块-系统用户") @Slf4j @Validated @RequiredArgsConstructor 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/CaptchaServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java index f59aebc..48c0b57 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/CaptchaServiceImpl.java @@ -41,7 +41,7 @@ public class CaptchaServiceImpl implements CaptchaService { // msg：验证码未开启 List convert = RedisUtil.getCacheList(ConfigKeyNum.config_base.getKey()); AtomicBoolean isOpen= new AtomicBoolean(false); - Map map = new HashMap<>(); + if(convert.isEmpty()){ return data; } @@ -72,7 +72,7 @@ public class CaptchaServiceImpl implements CaptchaService { //初始化验证码背景 - if (!code.equals("000000")) { + if (!"000000".equals(code)) { switch (captchaProperties.getType()) { case "LINE": 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); @@ -123,12 +124,12 @@ 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() .eq(SysDictData::getFieldName, d.getFieldName()) - .eq(SysDictData::getStatus, 0) + .eq(SysDictData::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()) .orderByAsc(SysDictData::getSort) ); RedisUtil.deleteObject(CacheConstants.SYS_DICT_KEY + d.getFieldName()); @@ -145,12 +146,14 @@ public class SysDictServiceImpl implements SysDictService { @Override public List getSysDictByCode(String code) { return sysDictDataMapper.selectVoList(new LambdaQueryWrapper().eq(SysDictData::getFieldName, code) - .eq(SysDictData::getStatus, 0).orderByAsc(SysDictData::getSort)); + .eq(SysDictData::getStatus, SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()).orderByAsc(SysDictData::getSort)); } @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 ae4fc20..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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.sxpcwlkj.authority.LoginObject; import com.sxpcwlkj.common.code.entity.CaptchaEntity; import com.sxpcwlkj.common.enums.DeviceEnum; +import com.sxpcwlkj.common.enums.SystemCommonEnum; import com.sxpcwlkj.common.exception.LoginException; import com.sxpcwlkj.common.exception.MmsException; import com.sxpcwlkj.common.exception.TenantException; @@ -30,8 +31,7 @@ import java.util.Date; import java.util.Map; /** - * @ClassName SysLoginServiceImpl - * @Description TODO + * 系统登录 * @Author mmsAdmin * @Date 2022/12/25 12:06 */ @@ -62,7 +62,7 @@ public class SysLoginServiceImpl implements SysLoginService { throw new LoginException("账号不存在!"); } // 账号是否禁用 - if (sysUser.getStatus() != 0) { + if (!sysUser.getStatus().equals(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue())) { throw new LoginException("账号已禁用!"); } //解密数据库的密码 @@ -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; @@ -121,7 +121,7 @@ public class SysLoginServiceImpl implements SysLoginService { /** * 验证租户 * - * @param sysUser + * @param sysUser 用户 */ @Override public void verfyTenement(SysUser sysUser) { @@ -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() != 0) { + 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/SysRoleServiceImpl.java b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java index e2b72ba..2c73aca 100644 --- a/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java +++ b/mms-admin/src/main/java/com/sxpcwlkj/system/service/impl/SysRoleServiceImpl.java @@ -103,7 +103,7 @@ public class SysRoleServiceImpl implements SysRoleService { SysRoleFunction roleFunction = new SysRoleFunction(); roleFunction.setRoleId(bo.getId()); roleFunction.setFunctionId(aLong); - roleFunction.setStatus(1); + roleFunction.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysRoleFunctionMapper.insert(roleFunction); } } @@ -129,7 +129,7 @@ public class SysRoleServiceImpl implements SysRoleService { SysRoleFunction role = new SysRoleFunction(); role.setRoleId(roleId); role.setFunctionId(sysRoleFunction.getParentId()); - role.setStatus(0); + role.setStatus(SystemCommonEnum.SYS_COMMON_STATE_OPEN.getValue()); sysRoleFunctionMapper.insert(role); checkFunction(sysRoleFunction.getParentId(), roleId); } 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 3326293..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 -> { @@ -258,8 +258,11 @@ public class SysUserServiceImpl implements SysUserService { //资源集 userVo.setButCodes(list.toArray(String[]::new)); //===================超级管理员拥有所有========================== - if (userVo.getUserId().toString().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")); + if (userVo.getUserId().equals(SystemCommonEnum.SUPER_ADMIN.getValue().toString())) { + 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-admin/src/main/resources/template/gen/vue/api.ts.ftl b/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl index 3a4b9ca..232c2d8 100644 --- a/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl +++ b/mms-admin/src/main/resources/template/gen/vue/api.ts.ftl @@ -3,14 +3,14 @@ import {getEnv} from "/@/utils/mms"; import {AxiosPromise} from "axios"; import {SysEnum} from "/@/enums/SysEnum"; import {EncryptTypeEnum} from "/@/enums/EncryptTypeEnum"; -import {${FunctionName}Bo,${FunctionName}Vo,${FunctionName}Table } from '/@/views/${moduleName}/${functionName}/type'; +import {${FunctionName}Bo,${FunctionName}Vo} from '/@/views/${moduleName}/${functionName}/type'; /** * ${tableComment}-Api * ${FunctionName} */ export function ${functionName}Api() { return { - list: (params?: object): AxiosPromise<${FunctionName}Vo[]> => { + list: (params?: object): AxiosPromise> => { return request({ url: getEnv()+'/${moduleName}/${functionName}/list', method: 'post', diff --git a/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl b/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl index 5d1962b..4c715f0 100644 --- a/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl +++ b/mms-admin/src/main/resources/template/gen/vue/dialog.vue.ftl @@ -135,17 +135,23 @@