update 优化 调整 system entity 实体与 controller 包结构

疯狂的狮子li

2023-01-16 f3aff3460203eef795e9b5a5b3dd41368cc5ec39

update 优化 调整 system entity 实体与 controller 包结构

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.common;
package com.ruoyi.web.controller;

import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysIndexController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;

import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.config.RuoYiConfig;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysLoginController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java ÐÞ¸Ä
@@ -1,10 +1,10 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;

import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.SmsLoginBody;

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/SysRegisterController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.web.controller;

import cn.dev33.satoken.annotation.SaIgnore;
import com.ruoyi.common.core.controller.BaseController;

 ruoyi-admin/src/main/resources/application.yml

@@ -212,9 +212,11 @@
  group-configs:
    - group: 1.演示模块
      packages-to-scan: com.ruoyi.demo
    - group: 2.系统模块
    - group: 2.通用模块
      packages-to-scan: com.ruoyi.web
    - group: 3.代码生成模块
    - group: 3.系统模块
      packages-to-scan: com.ruoyi.system
    - group: 4.代码生成模块
      packages-to-scan: com.ruoyi.generator

# é˜²æ­¢XSS攻击

 ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.monitor;
package com.ruoyi.system.controller.monitor;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.exception.NotLoginException;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ArrayUtil;
@@ -6,7 +6,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
@@ -6,7 +6,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
@@ -6,7 +6,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.tree.Tree;
@@ -6,7 +6,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;


import cn.dev33.satoken.annotation.SaCheckPermission;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.io.FileUtil;
@@ -6,12 +6,11 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.file.MimeTypeUtils;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
@@ -7,9 +7,9 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;

 ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java

ÎļþÃû´Ó ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.ruoyi.system.controller.system;

import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.secure.BCrypt;
@@ -11,9 +11,9 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.excel.ExcelResult;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java

ÎļþÃû´Ó ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.entity;
package com.ruoyi.system.domain;

import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.common.annotation.Sensitive;

 ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java

@@ -5,7 +5,7 @@
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.excel.ExcelListener;
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.exception.ServiceException;

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.mapper.BaseMapperPlus;

import java.util.List;

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

@@ -1,6 +1,6 @@
package com.ruoyi.system.mapper;

import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.mapper.BaseMapperPlus;

/**

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;

import java.util.List;


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;

import java.util.List;

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -1,8 +1,8 @@
package com.ruoyi.system.service;

import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;

import java.util.List;

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.vo.RouterVo;

import java.util.List;

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.domain.SysUserRole;


 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;

import java.util.List;

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -10,7 +10,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.event.LogininforEvent;
import com.ruoyi.common.core.domain.dto.RoleDTO;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.domain.model.XcxLoginUser;
import com.ruoyi.common.enums.DeviceType;

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;


 ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java

@@ -5,7 +5,7 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.event.LogininforEvent;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.domain.model.RegisterBody;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.user.CaptchaException;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java

@@ -3,7 +3,7 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.system.domain.SysRoleDept;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -7,9 +7,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataBaseHelper;
import com.ruoyi.common.helper.LoginHelper;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -10,8 +10,8 @@
import com.ruoyi.common.constant.CacheNames;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.system.domain.SysDictData;
import com.ruoyi.system.domain.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.DictService;
import com.ruoyi.common.exception.ServiceException;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -8,8 +8,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysMenu;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.StreamUtils;
import com.ruoyi.common.utils.StringUtils;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -10,7 +10,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -11,9 +11,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.system.domain.SysDept;
import com.ruoyi.system.domain.SysRole;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataBaseHelper;

 ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">

    <resultMap type="com.ruoyi.common.core.domain.entity.SysDept" id="SysDeptResult">
    <resultMap type="com.ruoyi.system.domain.SysDept" id="SysDeptResult">
    </resultMap>

    <select id="selectDeptList" resultMap="SysDeptResult">

 ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysMenuMapper">

    <resultMap type="com.ruoyi.common.core.domain.entity.SysMenu" id="SysMenuResult">
    <resultMap type="com.ruoyi.system.domain.SysMenu" id="SysMenuResult">
    </resultMap>

    <select id="selectMenuListByUserId" resultMap="SysMenuResult">

 ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysRoleMapper">

    <resultMap type="com.ruoyi.common.core.domain.entity.SysRole" id="SysRoleResult">
    <resultMap type="com.ruoyi.system.domain.SysRole" id="SysRoleResult">
    </resultMap>

    <sql id="selectRoleVo">

 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -5,17 +5,17 @@
<mapper namespace="com.ruoyi.system.mapper.SysUserMapper">

    <!-- å¤šç»“构嵌套自动映射需带上每个实体的主键id å¦åˆ™æ˜ å°„会失败 -->
    <resultMap type="com.ruoyi.common.core.domain.entity.SysUser" id="SysUserResult">
    <resultMap type="com.ruoyi.system.domain.SysUser" id="SysUserResult">
        <id property="userId" column="user_id"/>
        <association property="dept" column="dept_id" resultMap="deptResult"/>
        <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
    </resultMap>

    <resultMap id="deptResult" type="com.ruoyi.common.core.domain.entity.SysDept">
    <resultMap id="deptResult" type="com.ruoyi.system.domain.SysDept">
        <id property="deptId" column="dept_id"/>
    </resultMap>

    <resultMap id="RoleResult" type="com.ruoyi.common.core.domain.entity.SysRole">
    <resultMap id="RoleResult" type="com.ruoyi.system.domain.SysRole">
        <id property="roleId" column="role_id"/>
    </resultMap>