[重大更新] 将所有通用Service接口与实体类 提炼为 ruoyi-api 模块 更通用更易扩展

pom.xml

@@ -360,6 +360,13 @@
                 <version>${revision}</version>
             </dependency>
 
+            <!--  api模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -368,6 +375,7 @@
         <module>ruoyi-common</module>
         <module>ruoyi-extend</module>
         <module>ruoyi-modules</module>
+        <module>ruoyi-api</module>
     </modules>
     <packaging>pom</packaging>
 

ruoyi-admin/pom.xml

@@ -60,6 +60,11 @@
             <artifactId>ruoyi-common-mail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-system</artifactId>

ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java

@@ -12,13 +12,9 @@ import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.utils.AuthStateUtils;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.core.domain.model.LoginBody;
-import org.dromara.common.core.domain.model.RegisterBody;
-import org.dromara.common.core.domain.model.SocialLoginBody;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
-import org.dromara.common.core.service.MessageService;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -31,6 +27,10 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.api.MessageService;
+import org.dromara.system.api.domain.PushPayloadDTO;
+import org.dromara.system.api.model.RegisterBody;
+import org.dromara.system.api.model.SocialLoginBody;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.service.ISysClientService;
 import org.dromara.system.service.ISysConfigService;

ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java

@@ -8,15 +8,15 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.Constants;
-import org.dromara.common.core.domain.dto.UserOnlineDTO;
 import org.dromara.common.core.utils.MessageUtils;
 import org.dromara.common.core.utils.ServletUtils;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
 import org.dromara.common.log.event.LoginInfoEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.domain.UserOnlineDTO;
 import org.dromara.web.service.SysLoginService;
 import org.springframework.stereotype.Component;
 

ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -12,9 +12,6 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthUser;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.Constants;
-import org.dromara.common.core.domain.dto.PostDTO;
-import org.dromara.common.core.domain.dto.RoleDTO;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
@@ -23,6 +20,9 @@ import org.dromara.common.log.event.LoginInfoEvent;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.domain.PostDTO;
+import org.dromara.system.api.domain.RoleDTO;
+import org.dromara.system.api.model.LoginUser;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysSocialBo;
 import org.dromara.system.domain.vo.*;

ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.domain.model.RegisterBody;
 import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.exception.user.CaptchaException;
 import org.dromara.common.core.exception.user.CaptchaExpireException;
@@ -17,6 +16,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.log.event.LoginInfoEvent;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.api.model.RegisterBody;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.bo.SysUserBo;
 import org.dromara.system.mapper.SysUserMapper;

ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java

@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.EmailLoginBody;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.exception.user.CaptchaExpireException;
 import org.dromara.common.core.exception.user.UserException;
@@ -20,6 +18,8 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.EmailLoginBody;
+import org.dromara.system.api.model.LoginUser;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;

ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java

@@ -10,8 +10,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.domain.model.PasswordLoginBody;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.exception.user.CaptchaException;
 import org.dromara.common.core.exception.user.CaptchaExpireException;
@@ -23,6 +21,8 @@ import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.api.model.LoginUser;
+import org.dromara.system.api.model.PasswordLoginBody;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java

@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.Constants;
 import org.dromara.common.core.constant.GlobalConstants;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.domain.model.SmsLoginBody;
 import org.dromara.common.core.enums.LoginType;
 import org.dromara.common.core.exception.user.CaptchaExpireException;
 import org.dromara.common.core.exception.user.UserException;
@@ -20,6 +18,8 @@ import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
+import org.dromara.system.api.model.SmsLoginBody;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;

ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java

@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
 import me.zhyd.oauth.model.AuthResponse;
 import me.zhyd.oauth.model.AuthUser;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.domain.model.SocialLoginBody;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.exception.user.UserException;
 import org.dromara.common.core.utils.ValidatorUtils;
@@ -18,6 +16,8 @@ import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialProperties;
 import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.api.model.LoginUser;
+import org.dromara.system.api.model.SocialLoginBody;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysSocialVo;
 import org.dromara.system.domain.vo.SysUserVo;

ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java

@@ -13,12 +13,12 @@ import me.zhyd.oauth.model.AuthUser;
 import me.zhyd.oauth.request.AuthRequest;
 import me.zhyd.oauth.request.AuthWechatMiniProgramRequest;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.XcxLoginBody;
-import org.dromara.common.core.domain.model.XcxLoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ValidatorUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.XcxLoginBody;
+import org.dromara.system.api.model.XcxLoginUser;
 import org.dromara.system.domain.vo.SysClientVo;
 import org.dromara.system.domain.vo.SysUserVo;
 import org.dromara.web.domain.vo.LoginVo;

ruoyi-api/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi-vue-plus</artifactId>
+        <groupId>org.dromara</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-api</artifactId>
+
+    <description>
+        ruoyi-api系统接口
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

ruoyi-api/src/main/java/org/dromara/system/api/ConfigService.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Dict;

ruoyi-api/src/main/java/org/dromara/system/api/DeptService.java

@@ -1,6 +1,6 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
-import org.dromara.common.core.domain.dto.DeptDTO;
+import org.dromara.system.api.domain.DeptDTO;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-api/src/main/java/org/dromara/system/api/MessageService.java

@@ -1,6 +1,6 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
+import org.dromara.system.api.domain.PushPayloadDTO;
 
 import java.util.List;
 

ruoyi-api/src/main/java/org/dromara/system/api/OssService.java

@@ -1,6 +1,6 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
-import org.dromara.common.core.domain.dto.OssDTO;
+import org.dromara.system.api.domain.OssDTO;
 
 import java.util.List;
 

ruoyi-api/src/main/java/org/dromara/system/api/PostService.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
 import java.util.Collection;
 import java.util.Map;

ruoyi-api/src/main/java/org/dromara/system/api/RoleService.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
 import java.util.Collection;
 import java.util.Map;

ruoyi-api/src/main/java/org/dromara/system/api/TaskAssigneeService.java

@@ -1,7 +1,7 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
-import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
+import org.dromara.system.api.domain.TaskAssigneeDTO;
-import org.dromara.common.core.domain.model.TaskAssigneeBody;
+import org.dromara.system.api.model.TaskAssigneeBody;
 
 /**
  * 工作流设计器获取任务执行人

ruoyi-api/src/main/java/org/dromara/system/api/UserService.java

@@ -1,6 +1,6 @@
-package org.dromara.common.core.service;
+package org.dromara.system.api;
 
-import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.system.api.domain.UserDTO;
 
 import java.util.Collection;
 import java.util.List;

ruoyi-api/src/main/java/org/dromara/system/api/domain/DeptDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/domain/OssDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/domain/PostDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/domain/PushPayloadDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import org.dromara.common.core.enums.PushSourceEnum;

ruoyi-api/src/main/java/org/dromara/system/api/domain/RoleDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/domain/TaskAssigneeDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

ruoyi-api/src/main/java/org/dromara/system/api/domain/UserDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/domain/UserOnlineDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.system.api.domain;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/model/EmailLoginBody.java

@@ -1,9 +1,10 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 
 /**
  * 邮箱验证码登录请求对象。

ruoyi-api/src/main/java/org/dromara/system/api/model/LoginUser.java

@@ -1,9 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.dromara.common.core.domain.dto.PostDTO;
+import org.dromara.system.api.domain.PostDTO;
-import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.system.api.domain.RoleDTO;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-api/src/main/java/org/dromara/system/api/model/PasswordLoginBody.java

@@ -1,8 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 import org.hibernate.validator.constraints.Length;
 
 /**

ruoyi-api/src/main/java/org/dromara/system/api/model/RegisterBody.java

@@ -1,8 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 import org.hibernate.validator.constraints.Length;
 
 /**

ruoyi-api/src/main/java/org/dromara/system/api/model/SmsLoginBody.java

@@ -1,8 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 
 /**
  * 短信验证码登录请求对象。

ruoyi-api/src/main/java/org/dromara/system/api/model/SocialLoginBody.java

@@ -1,8 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 
 /**
  * 第三方平台登录绑定请求对象。

ruoyi-api/src/main/java/org/dromara/system/api/model/TaskAssigneeBody.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

ruoyi-api/src/main/java/org/dromara/system/api/model/XcxLoginBody.java

@@ -1,8 +1,9 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.dromara.common.core.domain.model.LoginBody;
 
 /**
  * 小程序登录请求对象。

ruoyi-api/src/main/java/org/dromara/system/api/model/XcxLoginUser.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.model;
+package org.dromara.system.api.model;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

ruoyi-api/src/main/java/org/dromara/workflow/api/WorkflowService.java

@@ -1,8 +1,8 @@
-package org.dromara.common.core.service;
+package org.dromara.workflow.api;
 
-import org.dromara.common.core.domain.dto.CompleteTaskDTO;
+import org.dromara.workflow.api.domain.CompleteTaskDTO;
-import org.dromara.common.core.domain.dto.StartProcessDTO;
+import org.dromara.workflow.api.domain.StartProcessDTO;
-import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+import org.dromara.workflow.api.domain.StartProcessReturnDTO;
 
 import java.util.List;
 import java.util.Map;

ruoyi-api/src/main/java/org/dromara/workflow/api/domain/CompleteTaskDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.workflow.api.domain;
 
 import lombok.Data;
 

ruoyi-api/src/main/java/org/dromara/workflow/api/domain/FlowCopyDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.workflow.api.domain;
 
 /**
  * 抄送

ruoyi-api/src/main/java/org/dromara/workflow/api/domain/FlowInstanceBizExtDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.workflow.api.domain;
 
 import lombok.Data;
 

ruoyi-api/src/main/java/org/dromara/workflow/api/domain/StartProcessDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.workflow.api.domain;
 
 
 import cn.hutool.core.util.ObjectUtil;

ruoyi-api/src/main/java/org/dromara/workflow/api/domain/StartProcessReturnDTO.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.dto;
+package org.dromara.workflow.api.domain;
 
 /**
  * 启动流程后的返回结果对象。

ruoyi-api/src/main/java/org/dromara/workflow/api/event/ProcessDeleteEvent.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.event;
+package org.dromara.workflow.api.event;
 
 import lombok.Data;
 

ruoyi-api/src/main/java/org/dromara/workflow/api/event/ProcessEvent.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.event;
+package org.dromara.workflow.api.event;
 
 import lombok.Data;
 

ruoyi-api/src/main/java/org/dromara/workflow/api/event/ProcessTaskEvent.java

@@ -1,4 +1,4 @@
-package org.dromara.common.core.domain.event;
+package org.dromara.workflow.api.event;
 
 import lombok.Data;
 

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java

@@ -1,9 +1,5 @@
 package org.dromara.common.core.service;
 
-import org.dromara.common.core.domain.dto.RoleDTO;
-
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -29,12 +25,4 @@ public interface PermissionService {
      */
     Set<String> getMenuPermission(Long userId);
 
-    /**
-     * 根据角色列表构建数据权限角色映射
-     *
-     * @param roles 角色列表
-     * @return key 为权限码 value 为命中的角色ID列表
-     */
-    Map<String, List<Long>> getDataScopeRoleMap(List<RoleDTO> roles);
-
 }

ruoyi-common/ruoyi-common-log/pom.xml

@@ -27,6 +27,11 @@
             <artifactId>ruoyi-common-json</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java

@@ -14,7 +14,6 @@ import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -23,6 +22,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessStatus;
 import org.dromara.common.log.event.OperLogEvent;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.http.HttpMethod;
 import org.springframework.validation.BindingResult;

ruoyi-common/ruoyi-common-mybatis/pom.xml

@@ -26,6 +26,11 @@
             <artifactId>ruoyi-common-satoken</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
         <!-- dynamic-datasource 多数据源-->
         <dependency>
             <groupId>com.baomidou</groupId>

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java

@@ -2,9 +2,9 @@ package org.dromara.common.mybatis.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.system.api.model.LoginUser;
 
 /**
  * 数据权限类型枚举

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java

@@ -5,11 +5,11 @@ import cn.hutool.http.HttpStatus;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 
 import java.time.LocalDateTime;
 

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java

@@ -13,8 +13,6 @@ import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
-import org.dromara.common.core.domain.dto.RoleDTO;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.SpringUtils;
@@ -26,6 +24,8 @@ import org.dromara.common.mybatis.core.domain.DataPermissionAccess;
 import org.dromara.common.mybatis.enums.DataScopeType;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.domain.RoleDTO;
+import org.dromara.system.api.model.LoginUser;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.expression.*;
 import org.springframework.expression.common.TemplateParserContext;

ruoyi-common/ruoyi-common-push/pom.xml

@@ -32,6 +32,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-json</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-websocket</artifactId>

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/PushSessionManager.java

@@ -1,7 +1,7 @@
 package org.dromara.common.push.core;
 
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.push.dto.PushDTO;
+import org.dromara.system.api.domain.PushPayloadDTO;
 
 import java.util.function.Consumer;
 

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/SseEmitterSessionManager.java

@@ -3,12 +3,12 @@ package org.dromara.common.push.core;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
-import org.dromara.common.push.constant.MessageConstants;
-import org.dromara.common.push.dto.PushDTO;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.push.constant.MessageConstants;
+import org.dromara.common.push.dto.PushDTO;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.system.api.domain.PushPayloadDTO;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
 import java.io.IOException;

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/core/WebSocketSessionManager.java

@@ -3,16 +3,12 @@ package org.dromara.common.push.core;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.map.MapUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.push.dto.PushDTO;
 import org.dromara.common.redis.utils.RedisUtils;
-import org.springframework.web.socket.CloseStatus;
+import org.dromara.system.api.domain.PushPayloadDTO;
-import org.springframework.web.socket.PongMessage;
+import org.springframework.web.socket.*;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketMessage;
-import org.springframework.web.socket.WebSocketSession;
 
 import java.io.IOException;
 import java.util.ArrayList;

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/dto/PushDTO.java

@@ -1,7 +1,7 @@
 package org.dromara.common.push.dto;
 
 import lombok.Data;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
+import org.dromara.system.api.domain.PushPayloadDTO;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/handler/PlusWebSocketHandler.java

@@ -3,19 +3,15 @@ package org.dromara.common.push.handler;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
+import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.push.constant.MessageConstants;
 import org.dromara.common.push.core.WebSocketSessionManager;
 import org.dromara.common.push.dto.PushDTO;
-import org.springframework.web.socket.BinaryMessage;
+import org.dromara.system.api.domain.PushPayloadDTO;
-import org.springframework.web.socket.CloseStatus;
+import org.dromara.system.api.model.LoginUser;
-import org.springframework.web.socket.PongMessage;
+import org.springframework.web.socket.*;
-import org.springframework.web.socket.TextMessage;
-import org.springframework.web.socket.WebSocketSession;
 import org.springframework.web.socket.handler.AbstractWebSocketHandler;
 import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator;
 

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/helper/PushHelper.java

@@ -2,12 +2,12 @@ package org.dromara.common.push.helper;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.push.core.PushSessionManager;
 import org.dromara.common.push.dto.PushDTO;
+import org.dromara.system.api.domain.PushPayloadDTO;
 
 import java.util.List;
 

ruoyi-common/ruoyi-common-push/src/main/java/org/dromara/common/push/interceptor/PlusWebSocketInterceptor.java

@@ -3,11 +3,11 @@ package org.dromara.common.push.interceptor;
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.stp.StpUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.push.constant.MessageConstants;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.web.socket.WebSocketHandler;

ruoyi-common/ruoyi-common-satoken/pom.xml

@@ -24,11 +24,12 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
         <!-- spring-webmvc 依赖 -->
-        <!--
-            Sa-Token 1.45.0 的pom依赖项发生了变动，此处需要自行引入所需的依赖项。
-            本着最小依赖的原则，此处仅引入 spring-webmvc 的依赖，如果还是无法启动，请更改为 spring-boot-starter-web (Sa-Token 1.44.0版本中的依赖项)
-        -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java

@@ -3,13 +3,13 @@ package org.dromara.common.satoken.core.service;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.service.PermissionService;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.model.LoginUser;
 
 import java.util.ArrayList;
 import java.util.List;

ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java

@@ -4,18 +4,18 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.stp.parameter.SaLoginParameter;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.useragent.UserAgent;
 import cn.hutool.http.useragent.UserAgentUtil;
-import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.enums.UserType;
 import org.dromara.common.core.utils.ServletUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.system.api.model.LoginUser;
 
 
 /**

ruoyi-common/ruoyi-common-translation/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>ruoyi-common-json</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java

@@ -2,10 +2,10 @@ package org.dromara.common.translation.core.impl;
 
 import cn.hutool.core.convert.Convert;
 import lombok.AllArgsConstructor;
-import org.dromara.common.core.service.DeptService;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.system.api.DeptService;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java

@@ -2,10 +2,10 @@ package org.dromara.common.translation.core.impl;
 
 import cn.hutool.core.convert.Convert;
 import lombok.AllArgsConstructor;
-import org.dromara.common.core.service.UserService;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.system.api.UserService;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java

@@ -2,12 +2,12 @@ package org.dromara.common.translation.core.impl;
 
 import cn.hutool.core.convert.Convert;
 import lombok.AllArgsConstructor;
-import org.dromara.common.core.domain.dto.OssDTO;
-import org.dromara.common.core.service.OssService;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.system.api.OssService;
+import org.dromara.system.api.domain.OssDTO;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java

@@ -2,12 +2,12 @@ package org.dromara.common.translation.core.impl;
 
 import cn.hutool.core.convert.Convert;
 import lombok.AllArgsConstructor;
-import org.dromara.common.core.domain.dto.UserDTO;
-import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.translation.annotation.TranslationType;
 import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.system.api.UserService;
+import org.dromara.system.api.domain.UserDTO;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

ruoyi-modules/ruoyi-demo/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-doc</artifactId>

ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/WebSocketController.java

@@ -1,12 +1,12 @@
 package org.dromara.demo.controller;
 
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
-import org.dromara.common.core.enums.PushSourceEnum;
-import org.dromara.common.core.enums.PushTypeEnum;
-import org.dromara.common.core.service.MessageService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.enums.PushSourceEnum;
+import org.dromara.common.core.enums.PushTypeEnum;
+import org.dromara.system.api.MessageService;
+import org.dromara.system.api.domain.PushPayloadDTO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

ruoyi-modules/ruoyi-system/pom.xml

@@ -22,6 +22,11 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-doc</artifactId>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java

@@ -8,7 +8,6 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.UserOnlineDTO;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.log.annotation.Log;
@@ -16,6 +15,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.api.domain.UserOnlineDTO;
 import org.dromara.system.domain.SysUserOnline;
 import org.springframework.web.bind.annotation.*;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java

@@ -4,16 +4,16 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
 import org.dromara.common.core.service.DictService;
-import org.dromara.common.core.service.MessageService;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.api.MessageService;
+import org.dromara.system.api.domain.PushPayloadDTO;
 import org.dromara.system.domain.bo.SysNoticeBo;
 import org.dromara.system.domain.vo.SysNoticeVo;
 import org.dromara.system.service.ISysNoticeService;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -12,7 +12,6 @@ import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.encrypt.annotation.ApiEncrypt;
@@ -26,6 +25,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.api.model.LoginUser;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.bo.SysRoleBo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysMessageService.java

@@ -1,6 +1,6 @@
 package org.dromara.system.service;
 
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
+import org.dromara.system.api.domain.PushPayloadDTO;
 import org.dromara.system.domain.vo.SysMessageBoxVo;
 
 import java.util.List;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPermissionService.java

@@ -1,6 +1,6 @@
 package org.dromara.system.service;
 
-import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.system.api.domain.RoleDTO;
 
 import java.util.List;
 import java.util.Map;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java

@@ -11,7 +11,6 @@ import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.ConfigService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.SpringUtils;
@@ -19,6 +18,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.system.api.ConfigService;
 import org.dromara.system.domain.SysConfig;
 import org.dromara.system.domain.bo.SysConfigBo;
 import org.dromara.system.domain.vo.SysConfigVo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -13,14 +13,14 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.DeptDTO;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.DeptService;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.common.redis.utils.CacheUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.DeptService;
+import org.dromara.system.api.domain.DeptDTO;
 import org.dromara.system.domain.SysDept;
 import org.dromara.system.domain.SysRole;
 import org.dromara.system.domain.SysUser;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMessageServiceImpl.java

@@ -6,16 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
-import org.dromara.common.core.service.MessageService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.common.mybatis.utils.IdGeneratorUtil;
 import org.dromara.common.push.helper.PushHelper;
+import org.dromara.system.api.MessageService;
+import org.dromara.system.api.domain.PushPayloadDTO;
 import org.dromara.system.domain.SysMessage;
 import org.dromara.system.domain.vo.SysMessageBoxVo;
 import org.dromara.system.domain.vo.SysMessageVo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java

@@ -11,9 +11,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.OssDTO;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.OssService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
@@ -26,6 +24,8 @@ import org.dromara.common.oss.enums.AccessPolicy;
 import org.dromara.common.oss.factory.OssFactory;
 import org.dromara.common.oss.model.Options;
 import org.dromara.common.oss.model.PutObjectResult;
+import org.dromara.system.api.OssService;
+import org.dromara.system.api.domain.OssDTO;
 import org.dromara.system.domain.SysOss;
 import org.dromara.system.domain.SysOssExt;
 import org.dromara.system.domain.bo.SysOssBo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java

@@ -3,10 +3,10 @@ package org.dromara.system.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
-import org.dromara.common.core.domain.dto.RoleDTO;
 import org.dromara.common.core.service.PermissionService;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.domain.RoleDTO;
 import org.dromara.system.service.ISysMenuService;
 import org.dromara.system.service.ISysPermissionService;
 import org.dromara.system.service.ISysRoleService;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java

@@ -9,11 +9,11 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.PostService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.api.PostService;
 import org.dromara.system.domain.SysPost;
 import org.dromara.system.domain.SysUserPost;
 import org.dromara.system.domain.bo.SysPostBo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java

@@ -14,14 +14,14 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.RoleService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.RoleService;
+import org.dromara.system.api.model.LoginUser;
 import org.dromara.system.domain.SysRole;
 import org.dromara.system.domain.SysRoleDept;
 import org.dromara.system.domain.SysRoleMenu;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java

@@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
-import org.dromara.common.core.domain.model.TaskAssigneeBody;
-import org.dromara.common.core.service.TaskAssigneeService;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.api.TaskAssigneeService;
+import org.dromara.system.api.domain.TaskAssigneeDTO;
+import org.dromara.system.api.model.TaskAssigneeBody;
 import org.dromara.system.domain.bo.SysDeptBo;
 import org.dromara.system.domain.bo.SysPostBo;
 import org.dromara.system.domain.bo.SysRoleBo;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -15,12 +15,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.CacheNames;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.*;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.UserService;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.SysUserPost;
 import org.dromara.system.domain.SysUserRole;

ruoyi-modules/ruoyi-workflow/pom.xml

@@ -62,6 +62,10 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.dromara.warm</groupId>
             <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java

@@ -3,16 +3,16 @@ package org.dromara.workflow.controller;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.PageResult;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.redis.annotation.RepeatSubmit;
 import org.dromara.common.web.core.BaseController;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.entity.Node;
 import org.dromara.warm.flow.orm.entity.FlowNode;
+import org.dromara.workflow.api.domain.StartProcessReturnDTO;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java

@@ -1,12 +1,12 @@
 package org.dromara.workflow.handler;
 
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.event.ProcessDeleteEvent;
-import org.dromara.common.core.domain.event.ProcessEvent;
-import org.dromara.common.core.domain.event.ProcessTaskEvent;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.warm.flow.core.entity.Instance;
 import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.workflow.api.event.ProcessDeleteEvent;
+import org.dromara.workflow.api.event.ProcessEvent;
+import org.dromara.workflow.api.event.ProcessTaskEvent;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java

@@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.dto.FlowParams;
 import org.dromara.warm.flow.core.handler.PermissionHandler;
 import org.dromara.workflow.common.ConditionalOnEnable;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java

@@ -8,11 +8,11 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.enums.BusinessStatusEnum;
-import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.system.api.UserService;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.dto.FlowParams;
 import org.dromara.warm.flow.core.entity.Definition;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/rule/SpelRuleComponent.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.DeptService;
+import org.dromara.system.api.DeptService;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java

@@ -1,7 +1,7 @@
 package org.dromara.workflow.service;
 
 import org.dromara.common.core.enums.BusinessStatusEnum;
-import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.system.api.domain.UserDTO;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java

@@ -1,9 +1,9 @@
 package org.dromara.workflow.service;
 
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
-import org.dromara.common.core.domain.model.TaskAssigneeBody;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.api.domain.TaskAssigneeDTO;
+import org.dromara.system.api.model.TaskAssigneeBody;
 import org.dromara.workflow.domain.bo.FlowSpelBo;
 import org.dromara.workflow.domain.vo.FlowSpelVo;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java

@@ -1,6 +1,6 @@
 package org.dromara.workflow.service;
 
-import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.system.api.domain.UserDTO;
 
 import java.util.List;
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java

@@ -1,14 +1,14 @@
 package org.dromara.workflow.service;
 
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.entity.Node;
 import org.dromara.warm.flow.core.entity.Task;
 import org.dromara.warm.flow.orm.entity.FlowHisTask;
 import org.dromara.warm.flow.orm.entity.FlowNode;
 import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.workflow.api.domain.StartProcessReturnDTO;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.FlowHisTaskVo;
 import org.dromara.workflow.domain.vo.FlowTaskVo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java

@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.UserDTO;
-import org.dromara.common.core.service.DeptService;
 import org.dromara.common.core.service.DictService;
-import org.dromara.common.core.service.UserService;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.system.api.DeptService;
+import org.dromara.system.api.UserService;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.dto.DefJson;
 import org.dromara.warm.flow.core.dto.NodeJson;
 import org.dromara.warm.flow.core.dto.PromptContent;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java

@@ -4,17 +4,17 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.PushPayloadDTO;
-import org.dromara.common.core.domain.dto.UserDTO;
 import org.dromara.common.core.enums.BusinessStatusEnum;
 import org.dromara.common.core.enums.PushSourceEnum;
 import org.dromara.common.core.enums.PushTypeEnum;
 import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.service.MessageService;
 import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.system.api.MessageService;
+import org.dromara.system.api.domain.PushPayloadDTO;
+import org.dromara.system.api.domain.UserDTO;
 import org.dromara.warm.flow.core.FlowEngine;
 import org.dromara.warm.flow.core.entity.Node;
 import org.dromara.warm.flow.orm.entity.FlowTask;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java

@@ -9,13 +9,13 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.constant.SystemConstants;
 import org.dromara.common.core.domain.PageResult;
-import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
-import org.dromara.common.core.domain.model.TaskAssigneeBody;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.system.api.domain.TaskAssigneeDTO;
+import org.dromara.system.api.model.TaskAssigneeBody;
 import org.dromara.workflow.common.ConditionalOnEnable;
 import org.dromara.workflow.domain.FlowSpel;
 import org.dromara.workflow.domain.bo.FlowSpelBo;

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java

@@ -8,14 +8,14 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.dto.DeptDTO;
-import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
-import org.dromara.common.core.domain.dto.UserDTO;
-import org.dromara.common.core.domain.model.TaskAssigneeBody;
-import org.dromara.common.core.service.*;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.system.api.*;
+import org.dromara.system.api.domain.DeptDTO;
+import org.dromara.system.api.domain.TaskAssigneeDTO;
+import org.dromara.system.api.domain.UserDTO;
+import org.dromara.system.api.model.TaskAssigneeBody;
 import org.dromara.warm.flow.ui.dto.HandlerFunDto;
 import org.dromara.warm.flow.ui.dto.HandlerQuery;
 import org.dromara.warm.flow.ui.dto.TreeFunDto;