opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 01:25:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

代码整理

Browse Source
This commit is contained in:
lizhengwei 2026-04-03 16:24:49 +08:00
parent 3b11d144de
commit bac662cca3
56 changed files with 142 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/pom.xml
View File

@ -16,7 +16,7 @@
<module>ruoyi-generator</module> <module>ruoyi-generator</module>
<module>ruoyi-job</module> <module>ruoyi-job</module>
<module>ruoyi-md-system</module> <module>ruoyi-md-system</module>
<!-- <module>ruoyi-md-system-saas</module>--> <module>ruoyi-md-system-saas</module>
<module>ruoyi-workflow</module> <module>ruoyi-workflow</module>
<module>ruoyi-md-form</module> <module>ruoyi-md-form</module>
<module>ruoyi-md-h5</module> <module>ruoyi-md-h5</module>

7
ruoyi-modules/ruoyi-md-bom/pom.xml
View File

@ -42,7 +42,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas</artifactId> <artifactId>ruoyi-md-system-saas-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas-service</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>

24
ruoyi-modules/ruoyi-md-system-saas/pom.xml Normal file
View File

@ -0,0 +1,24 @@
<?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>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-md-system-saas</artifactId>
<packaging>pom</packaging>
<description>
系统模块 saas
</description>
<modules>
<module>ruoyi-md-system-saas-api</module>
<module>ruoyi-md-system-saas-service</module>
</modules>
</project>

21
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/pom.xml Normal file
View File

@ -0,0 +1,21 @@
<?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>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-md-system-saas-api</artifactId>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
</dependencies>
</project>

4
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteClientService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteClientService.java
View File

@ -1,6 +1,6 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
/** /**
* 客户端服务 * 客户端服务

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteConfigService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteConfigService.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
/** /**
* 配置服务 * 配置服务

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDataScopeService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDataScopeService.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
/** /**
* 数据权限服务 * 数据权限服务

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDeptService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDeptService.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
/** /**
* 部门服务 * 部门服务

4
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDictService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDictService.java
View File

@ -1,6 +1,6 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.system.api.domain.vo.RemoteDictDataVo; import org.dromara.system.saas.api.domain.vo.RemoteDictDataVo;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteLogService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteLogService.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.saas.api.domain.bo.RemoteLogininforBo;
import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.saas.api.domain.bo.RemoteOperLogBo;
/** /**
* 日志服务 * 日志服务

6
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteSocialService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteSocialService.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.system.api.domain.bo.RemoteSocialBo; import org.dromara.system.saas.api.domain.bo.RemoteSocialBo;
import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.api.domain.vo.RemoteSocialVo;
import java.util.List; import java.util.List;

4
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteTenantService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteTenantService.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteUserService.java
View File

@ -1,10 +1,10 @@
package org.dromara.system.api; package org.dromara.system.saas.api;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException; import org.dromara.common.core.exception.user.UserException;
import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.saas.api.domain.bo.RemoteUserBo;
import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.saas.api.domain.vo.RemoteUserVo;
import org.dromara.common.core.domain.model.XcxLoginUser; import org.dromara.common.core.domain.model.XcxLoginUser;
import java.util.List; import java.util.List;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteLogininforBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.bo; package org.dromara.system.saas.api.domain.bo;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteOperLogBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.bo; package org.dromara.system.saas.api.domain.bo;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteSocialBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.bo; package org.dromara.system.saas.api.domain.bo;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteUserBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.bo; package org.dromara.system.saas.api.domain.bo;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteClientVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.vo; package org.dromara.system.saas.api.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteDictDataVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.vo; package org.dromara.system.saas.api.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteSocialVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.vo; package org.dromara.system.saas.api.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteTenantVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.vo; package org.dromara.system.saas.api.domain.vo;
import lombok.Data; import lombok.Data;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteUserVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.system.api.domain.vo; package org.dromara.system.saas.api.domain.vo;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

2
ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java → ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/model/SysSaasUserOnlineDTO.java
View File

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

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml
View File

@ -108,7 +108,7 @@
<!-- dubbo 远程调用接口 --> <!-- dubbo 远程调用接口 -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-api</artifactId> <artifactId>ruoyi-md-system-saas-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasClientVoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.system.saas.domain.vo.SysSaasClientVo; import org.dromara.system.saas.domain.vo.SysSaasClientVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasDictDataVoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.vo.RemoteDictDataVo; import org.dromara.system.saas.api.domain.vo.RemoteDictDataVo;
import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; import org.dromara.system.saas.domain.vo.SysSaasDictDataVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasLogininforBoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.saas.api.domain.bo.RemoteLogininforBo;
import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; import org.dromara.system.saas.domain.bo.SysSaasLogininforBo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasOperLogBoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.saas.api.domain.bo.RemoteOperLogBo;
import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; import org.dromara.system.saas.domain.bo.SysSaasOperLogBo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialBoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.bo.RemoteSocialBo; import org.dromara.system.saas.api.domain.bo.RemoteSocialBo;
import org.dromara.system.saas.domain.bo.SysSaasSocialBo; import org.dromara.system.saas.domain.bo.SysSaasSocialBo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialVoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.api.domain.vo.RemoteSocialVo;
import org.dromara.system.saas.domain.vo.SysSaasSocialVo; import org.dromara.system.saas.domain.vo.SysSaasSocialVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo; import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserBoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.saas.api.domain.bo.RemoteUserBo;
import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.bo.SysSaasUserBo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.Mapping; import org.mapstruct.Mapping;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserVoConvert.java
View File

@ -1,7 +1,7 @@
package org.dromara.system.saas.domain.convert; package org.dromara.system.saas.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.saas.api.domain.vo.RemoteUserVo;
import org.dromara.system.saas.domain.vo.SysSaasUserVo; import org.dromara.system.saas.domain.vo.SysSaasUserVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

4
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java
View File

@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteClientService; import org.dromara.system.saas.api.RemoteClientService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.system.saas.domain.vo.SysSaasClientVo; import org.dromara.system.saas.domain.vo.SysSaasClientVo;
import org.dromara.system.saas.service.ISysSaasClientService; import org.dromara.system.saas.service.ISysSaasClientService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java
View File

@ -2,7 +2,7 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.system.api.RemoteConfigService; import org.dromara.system.saas.api.RemoteConfigService;
import org.dromara.system.saas.service.ISysSaasConfigService; import org.dromara.system.saas.service.ISysSaasConfigService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDataScopeServiceImpl.java
View File

@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.system.api.RemoteDataScopeService; import org.dromara.system.saas.api.RemoteDataScopeService;
import org.dromara.system.saas.domain.SysSaasDept; import org.dromara.system.saas.domain.SysSaasDept;
import org.dromara.system.saas.domain.SysSaasRoleDept; import org.dromara.system.saas.domain.SysSaasRoleDept;
import org.dromara.system.saas.mapper.SysSaasDeptMapper; import org.dromara.system.saas.mapper.SysSaasDeptMapper;

2
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDeptServiceImpl.java
View File

@ -3,7 +3,7 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.service.SaasDeptService; import org.dromara.common.core.service.SaasDeptService;
import org.dromara.system.api.RemoteDeptService; import org.dromara.system.saas.api.RemoteDeptService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

4
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDictServiceImpl.java
View File

@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteDictService; import org.dromara.system.saas.api.RemoteDictService;
import org.dromara.system.api.domain.vo.RemoteDictDataVo; import org.dromara.system.saas.api.domain.vo.RemoteDictDataVo;
import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; import org.dromara.system.saas.domain.vo.SysSaasDictDataVo;
import org.dromara.system.saas.service.ISysSaasDictTypeService; import org.dromara.system.saas.service.ISysSaasDictTypeService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteLogServiceImpl.java
View File

@ -3,9 +3,9 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteLogService; import org.dromara.system.saas.api.RemoteLogService;
import org.dromara.system.api.domain.bo.RemoteLogininforBo; import org.dromara.system.saas.api.domain.bo.RemoteLogininforBo;
import org.dromara.system.api.domain.bo.RemoteOperLogBo; import org.dromara.system.saas.api.domain.bo.RemoteOperLogBo;
import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; import org.dromara.system.saas.domain.bo.SysSaasLogininforBo;
import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; import org.dromara.system.saas.domain.bo.SysSaasOperLogBo;
import org.dromara.system.saas.service.ISysSaasLogininforService; import org.dromara.system.saas.service.ISysSaasLogininforService;

6
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteSocialServiceImpl.java
View File

@ -3,9 +3,9 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteSocialService; import org.dromara.system.saas.api.RemoteSocialService;
import org.dromara.system.api.domain.bo.RemoteSocialBo; import org.dromara.system.saas.api.domain.bo.RemoteSocialBo;
import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.api.domain.vo.RemoteSocialVo;
import org.dromara.system.saas.domain.bo.SysSaasSocialBo; import org.dromara.system.saas.domain.bo.SysSaasSocialBo;
import org.dromara.system.saas.domain.vo.SysSaasSocialVo; import org.dromara.system.saas.domain.vo.SysSaasSocialVo;
import org.dromara.system.saas.service.ISysSaasSocialService; import org.dromara.system.saas.service.ISysSaasSocialService;

4
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java
View File

@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.dubbo.config.annotation.DubboService; import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.system.api.RemoteTenantService; import org.dromara.system.saas.api.RemoteTenantService;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.dromara.system.saas.domain.bo.SysSaasTenantBo; import org.dromara.system.saas.domain.bo.SysSaasTenantBo;
import org.dromara.system.saas.domain.vo.SysSaasTenantVo; import org.dromara.system.saas.domain.vo.SysSaasTenantVo;
import org.dromara.system.saas.service.ISysSaasTenantService; import org.dromara.system.saas.service.ISysSaasTenantService;

6
ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java
View File

@ -16,9 +16,9 @@ import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.mybatis.helper.DataPermissionHelper;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.saas.api.domain.bo.RemoteUserBo;
import org.dromara.system.api.domain.vo.RemoteUserVo; import org.dromara.system.saas.api.domain.vo.RemoteUserVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.domain.model.XcxLoginUser; import org.dromara.common.core.domain.model.XcxLoginUser;
import org.dromara.system.saas.domain.SysSaasUser; import org.dromara.system.saas.domain.SysSaasUser;

2
ruoyi-site/ruoyi-admin/pom.xml
View File

@ -77,7 +77,7 @@
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas</artifactId> <artifactId>ruoyi-md-system-saas-service</artifactId>
</dependency> </dependency>
<dependency> <dependency>

2
ruoyi-site/ruoyi-h5/pom.xml
View File

@ -61,7 +61,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-saas</artifactId> <artifactId>ruoyi-md-system-saas-service</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>

2
ruoyi-site/ruoyi-sso-server/pom.xml
View File

@ -40,7 +40,7 @@
<!-- 远程调用模块 TODO rename --> <!-- 远程调用模块 TODO rename -->
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-md-system-api</artifactId> <artifactId>ruoyi-md-system-saas-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/SsoServerController.java
View File

@ -35,8 +35,8 @@ import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.sso.properties.CaptchaProperties; import org.dromara.sso.properties.CaptchaProperties;
import org.dromara.sso.service.IAuthStrategy; import org.dromara.sso.service.IAuthStrategy;
import org.dromara.sso.service.SysLoginService; import org.dromara.sso.service.SysLoginService;
import org.dromara.system.api.RemoteClientService; import org.dromara.system.saas.api.RemoteClientService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.sso.config.satoken.LoginSaasHelper; import org.dromara.sso.config.satoken.LoginSaasHelper;
import org.dromara.sso.domain.vo.CaptchaVo; import org.dromara.sso.domain.vo.CaptchaVo;
import org.dromara.sso.domain.vo.LoginVo; import org.dromara.sso.domain.vo.LoginVo;

12
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/TokenController.java
View File

@ -30,12 +30,12 @@ import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
import org.dromara.common.social.config.properties.SocialProperties; import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils; import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteClientService; import org.dromara.system.saas.api.RemoteClientService;
import org.dromara.system.api.RemoteConfigService; import org.dromara.system.saas.api.RemoteConfigService;
import org.dromara.system.api.RemoteSocialService; import org.dromara.system.saas.api.RemoteSocialService;
import org.dromara.system.api.RemoteTenantService; import org.dromara.system.saas.api.RemoteTenantService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.net.URL; import java.net.URL;

2
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/domain/convert/TenantVoConvert.java
View File

@ -2,7 +2,7 @@ package org.dromara.sso.domain.convert;
import io.github.linpeilie.BaseMapper; import io.github.linpeilie.BaseMapper;
import org.dromara.sso.domain.vo.TenantListVo; import org.dromara.sso.domain.vo.TenantListVo;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/listener/UserActionListener.java
View File

@ -7,7 +7,7 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.http.useragent.UserAgentUtil;
import org.dromara.system.api.model.SysSaasUserOnlineDTO; import org.dromara.system.saas.api.model.SysSaasUserOnlineDTO;
import org.dromara.sso.config.satoken.LoginSaasHelper; import org.dromara.sso.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -21,7 +21,7 @@ import org.dromara.common.core.utils.ip.AddressUtils;
import org.dromara.common.log.event.LogininforEvent; import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.time.Duration; import java.time.Duration;

2
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/IAuthStrategy.java
View File

@ -3,7 +3,7 @@ package org.dromara.sso.service;
import org.dromara.sso.domain.vo.LoginVo; import org.dromara.sso.domain.vo.LoginVo;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
/** /**
* 授权策略 * 授权策略

14
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/SysLoginService.java
View File

@ -33,13 +33,13 @@ import org.dromara.common.log.event.LogininforEvent;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.exception.TenantException; import org.dromara.common.tenant.exception.TenantException;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteSocialService; import org.dromara.system.saas.api.RemoteSocialService;
import org.dromara.system.api.RemoteTenantService; import org.dromara.system.saas.api.RemoteTenantService;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.bo.RemoteSocialBo; import org.dromara.system.saas.api.domain.bo.RemoteSocialBo;
import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.saas.api.domain.bo.RemoteUserBo;
import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.api.domain.vo.RemoteSocialVo;
import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/EmailAuthStrategy.java
View File

@ -20,8 +20,8 @@ import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/PasswordAuthStrategy.java
View File

@ -23,8 +23,8 @@ import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SmsAuthStrategy.java
View File

@ -20,8 +20,8 @@ import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

8
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SocialAuthStrategy.java
View File

@ -22,10 +22,10 @@ import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.social.config.properties.SocialProperties; import org.dromara.common.social.config.properties.SocialProperties;
import org.dromara.common.social.utils.SocialUtils; import org.dromara.common.social.utils.SocialUtils;
import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteSocialService; import org.dromara.system.saas.api.RemoteSocialService;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.system.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.api.domain.vo.RemoteSocialVo;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/XcxAuthStrategy.java
View File

@ -12,8 +12,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;
import org.dromara.system.api.RemoteUserService; import org.dromara.system.saas.api.RemoteUserService;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.api.domain.vo.RemoteClientVo;
import org.dromara.common.core.domain.model.XcxLoginUser; import org.dromara.common.core.domain.model.XcxLoginUser;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;