若依 3.0

ruoyi/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java

-package com.ruoyi.project.system.service;
+package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.system.domain.SysNotice;
 
 /**
  * 公告 服务层

ruoyi/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java

-package com.ruoyi.project.monitor.service;
+package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.ruoyi.system.domain.SysOperLog;
 
 /**
  * 操作日志 服务层

ruoyi/src/main/java/com/ruoyi/project/system/service/ISysPostService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

-package com.ruoyi.project.system.service;
+package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.system.domain.SysPost;
 
 /**
  * 岗位信息 服务层

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

-package com.ruoyi.project.system.service;
+package com.ruoyi.system.service;
 
 import java.util.List;
 import java.util.Set;
-import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.common.core.domain.entity.SysRole;
 
 /**
  * 角色业务层

ruoyi/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java → ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java

-package com.ruoyi.project.system.service;
+package com.ruoyi.system.service;
 
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.project.monitor.domain.SysUserOnline;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.system.domain.SysUserOnline;
 
 /**
  * 在线用户 服务层

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

-package com.ruoyi.project.system.service;
+package com.ruoyi.system.service;
 
 import java.util.List;
-import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.common.core.domain.entity.SysUser;
 
 /**
  * 用户 业务层

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.Collection;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.annotation.DataSource;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.enums.DataSourceType;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.project.system.domain.SysConfig;
-import com.ruoyi.project.system.mapper.SysConfigMapper;
-import com.ruoyi.project.system.service.ISysConfigService;
+import com.ruoyi.system.domain.SysConfig;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.system.service.ISysConfigService;
 
 /**
  * 参数配置 服务层实现
@@ -48,6 +50,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数配置信息
      */
     @Override
+    @DataSource(DataSourceType.MASTER)
     public SysConfig selectConfigById(Long configId)
     {
         SysConfig config = new SysConfig();

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -6,14 +6,14 @@ import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.framework.web.domain.TreeSelect;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.project.system.service.ISysDeptService;
+import com.ruoyi.system.mapper.SysDeptMapper;
+import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门管理 服务实现

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DictUtils;
-import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.mapper.SysDictDataMapper;
-import com.ruoyi.project.system.service.ISysDictDataService;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.system.service.ISysDictDataService;
 
 /**
  * 字典 业务层处理

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import javax.annotation.PostConstruct;
@@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.common.core.domain.entity.SysDictType;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.domain.SysDictType;
-import com.ruoyi.project.system.mapper.SysDictDataMapper;
-import com.ruoyi.project.system.mapper.SysDictTypeMapper;
-import com.ruoyi.project.system.service.ISysDictTypeService;
+import com.ruoyi.system.mapper.SysDictDataMapper;
+import com.ruoyi.system.mapper.SysDictTypeMapper;
+import com.ruoyi.system.service.ISysDictTypeService;
 
 /**
  * 字典 业务层处理

ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java

-package com.ruoyi.project.monitor.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.mapper.SysLogininforMapper;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
+import com.ruoyi.system.domain.SysLogininfor;
+import com.ruoyi.system.mapper.SysLogininforMapper;
+import com.ruoyi.system.service.ISysLogininforService;
 
 /**
  * 系统访问日志情况信息 服务层处理

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -11,16 +11,16 @@ import java.util.stream.Collectors;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.TreeSelect;
+import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.TreeSelect;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.vo.MetaVo;
-import com.ruoyi.project.system.domain.vo.RouterVo;
-import com.ruoyi.project.system.mapper.SysMenuMapper;
-import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
-import com.ruoyi.project.system.service.ISysMenuService;
+import com.ruoyi.system.domain.vo.MetaVo;
+import com.ruoyi.system.domain.vo.RouterVo;
+import com.ruoyi.system.mapper.SysMenuMapper;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.system.service.ISysMenuService;
 
 /**
  * 菜单 业务层处理

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.mapper.SysNoticeMapper;
-import com.ruoyi.project.system.service.ISysNoticeService;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.mapper.SysNoticeMapper;
+import com.ruoyi.system.service.ISysNoticeService;
 
 /**
  * 公告 服务层实现

ruoyi/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java

-package com.ruoyi.project.monitor.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.mapper.SysOperLogMapper;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
+import com.ruoyi.system.domain.SysOperLog;
+import com.ruoyi.system.mapper.SysOperLogMapper;
+import com.ruoyi.system.service.ISysOperLogService;
 
 /**
  * 操作日志 服务层处理

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,10 +6,10 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.project.system.domain.SysPost;
-import com.ruoyi.project.system.mapper.SysPostMapper;
-import com.ruoyi.project.system.mapper.SysUserPostMapper;
-import com.ruoyi.project.system.service.ISysPostService;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.service.ISysPostService;
 
 /**
  * 岗位信息 服务层处理

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,19 +8,19 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysRoleDept;
-import com.ruoyi.project.system.domain.SysRoleMenu;
-import com.ruoyi.project.system.mapper.SysRoleDeptMapper;
-import com.ruoyi.project.system.mapper.SysRoleMapper;
-import com.ruoyi.project.system.mapper.SysRoleMenuMapper;
-import com.ruoyi.project.system.mapper.SysUserRoleMapper;
-import com.ruoyi.project.system.service.ISysRoleService;
+import com.ruoyi.system.domain.SysRoleDept;
+import com.ruoyi.system.domain.SysRoleMenu;
+import com.ruoyi.system.mapper.SysRoleDeptMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysRoleMenuMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysRoleService;
 
 /**
  * 角色 业务层处理

ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.project.monitor.domain.SysUserOnline;
-import com.ruoyi.project.system.service.ISysUserOnlineService;
+import com.ruoyi.system.domain.SysUserOnline;
+import com.ruoyi.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户 服务层处理

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

-package com.ruoyi.project.system.service.impl;
+package com.ruoyi.system.service.impl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -7,23 +7,23 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.CustomException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
-import com.ruoyi.project.system.domain.SysPost;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserPost;
-import com.ruoyi.project.system.domain.SysUserRole;
-import com.ruoyi.project.system.mapper.SysPostMapper;
-import com.ruoyi.project.system.mapper.SysRoleMapper;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.project.system.mapper.SysUserPostMapper;
-import com.ruoyi.project.system.mapper.SysUserRoleMapper;
-import com.ruoyi.project.system.service.ISysConfigService;
-import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.SysUserPost;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysPostMapper;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.mapper.SysUserPostMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户 业务层处理

ruoyi/src/main/resources/mybatis/system/SysConfigMapper.xml → ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysConfigMapper">
+<mapper namespace="com.ruoyi.system.mapper.SysConfigMapper">
     
     <resultMap type="SysConfig" id="SysConfigResult">
     	<id     property="configId"      column="config_id"      />

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.project.system.mapper.SysDeptMapper">
+<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
 
 	<resultMap type="SysDept" id="SysDeptResult">
 		<id     property="deptId"     column="dept_id"     />