diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 16bf909b0..d1ba488d8 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -16,7 +16,7 @@ ruoyi-generator ruoyi-job ruoyi-md-system - + ruoyi-md-system-saas ruoyi-workflow ruoyi-md-form ruoyi-md-h5 diff --git a/ruoyi-modules/ruoyi-md-bom/pom.xml b/ruoyi-modules/ruoyi-md-bom/pom.xml index e5a01a662..a5f19e06a 100644 --- a/ruoyi-modules/ruoyi-md-bom/pom.xml +++ b/ruoyi-modules/ruoyi-md-bom/pom.xml @@ -42,7 +42,12 @@ org.dromara - ruoyi-md-system-saas + ruoyi-md-system-saas-api + ${revision} + + + org.dromara + ruoyi-md-system-saas-service ${revision} diff --git a/ruoyi-modules/ruoyi-md-system-saas/pom.xml b/ruoyi-modules/ruoyi-md-system-saas/pom.xml new file mode 100644 index 000000000..617340e05 --- /dev/null +++ b/ruoyi-modules/ruoyi-md-system-saas/pom.xml @@ -0,0 +1,24 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + ruoyi-md-system-saas + + pom + + 系统模块 saas + + + + ruoyi-md-system-saas-api + ruoyi-md-system-saas-service + + + diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/pom.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/pom.xml new file mode 100644 index 000000000..bfb07ac14 --- /dev/null +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/pom.xml @@ -0,0 +1,21 @@ + + + + org.dromara + ruoyi-md-system-saas + ${revision} + + 4.0.0 + + ruoyi-md-system-saas-api + + + + org.dromara + ruoyi-common-core + + + + diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteClientService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteClientService.java similarity index 74% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteClientService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteClientService.java index 89c30687a..61243eba8 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteClientService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteClientService.java @@ -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; /** * 客户端服务 diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteConfigService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteConfigService.java similarity index 87% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteConfigService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteConfigService.java index 4c4502ee1..a3e3a168a 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteConfigService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteConfigService.java @@ -1,4 +1,4 @@ -package org.dromara.system.api; +package org.dromara.system.saas.api; /** * 配置服务 diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDataScopeService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDataScopeService.java similarity index 93% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDataScopeService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDataScopeService.java index d6a400568..f7d96cd06 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDataScopeService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDataScopeService.java @@ -1,4 +1,4 @@ -package org.dromara.system.api; +package org.dromara.system.saas.api; /** * 数据权限服务 diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDeptService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDeptService.java similarity index 88% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDeptService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDeptService.java index 095fd7c8e..0e3b04db6 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDeptService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDeptService.java @@ -1,4 +1,4 @@ -package org.dromara.system.api; +package org.dromara.system.saas.api; /** * 部门服务 diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDictService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDictService.java similarity index 76% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDictService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDictService.java index 69fc30c89..ffd42ebe5 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteDictService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteDictService.java @@ -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; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteLogService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteLogService.java similarity index 69% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteLogService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteLogService.java index 6b35118d6..7b1aea7a6 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteLogService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteLogService.java @@ -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.api.domain.bo.RemoteOperLogBo; +import org.dromara.system.saas.api.domain.bo.RemoteLogininforBo; +import org.dromara.system.saas.api.domain.bo.RemoteOperLogBo; /** * 日志服务 diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteSocialService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteSocialService.java similarity index 84% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteSocialService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteSocialService.java index 0a54df569..185d925a2 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteSocialService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteSocialService.java @@ -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.api.domain.vo.RemoteSocialVo; +import org.dromara.system.saas.api.domain.bo.RemoteSocialBo; +import org.dromara.system.saas.api.domain.vo.RemoteSocialVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteTenantService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteTenantService.java similarity index 79% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteTenantService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteTenantService.java index 2626abed2..7915c03ba 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteTenantService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteTenantService.java @@ -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; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteUserService.java similarity index 95% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteUserService.java index a6c86e302..3618b0390 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/RemoteUserService.java @@ -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.exception.ServiceException; import org.dromara.common.core.exception.user.UserException; -import org.dromara.system.api.domain.bo.RemoteUserBo; -import org.dromara.system.api.domain.vo.RemoteUserVo; +import org.dromara.system.saas.api.domain.bo.RemoteUserBo; +import org.dromara.system.saas.api.domain.vo.RemoteUserVo; import org.dromara.common.core.domain.model.XcxLoginUser; import java.util.List; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteLogininforBo.java similarity index 96% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteLogininforBo.java index d8c48a924..58de95f0c 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteLogininforBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteLogininforBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.bo; +package org.dromara.system.saas.api.domain.bo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteOperLogBo.java similarity index 97% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteOperLogBo.java index 5ed441b82..7eb8fe438 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteOperLogBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteOperLogBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.bo; +package org.dromara.system.saas.api.domain.bo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteSocialBo.java similarity index 97% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteSocialBo.java index 78daf2f50..3dd95378e 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteSocialBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteSocialBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.bo; +package org.dromara.system.saas.api.domain.bo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteUserBo.java similarity index 98% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteUserBo.java index 5628ee548..307fb41d5 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/bo/RemoteUserBo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/bo/RemoteUserBo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.bo; +package org.dromara.system.saas.api.domain.bo; import jakarta.validation.constraints.Email; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteClientVo.java similarity index 95% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteClientVo.java index 6fe12479e..8f653913e 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteClientVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteClientVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.vo; +package org.dromara.system.saas.api.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteDictDataVo.java similarity index 95% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteDictDataVo.java index 294d3e327..7c90815b6 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteDictDataVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteDictDataVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.vo; +package org.dromara.system.saas.api.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteSocialVo.java similarity index 97% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteSocialVo.java index 87f09b474..5f6033c49 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteSocialVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteSocialVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.vo; +package org.dromara.system.saas.api.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteTenantVo.java similarity index 96% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteTenantVo.java index b9387f9da..cba348d57 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteTenantVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteTenantVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.vo; +package org.dromara.system.saas.api.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteUserVo.java similarity index 95% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteUserVo.java index fb7f589ce..10f359554 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/domain/vo/RemoteUserVo.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/domain/vo/RemoteUserVo.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.domain.vo; +package org.dromara.system.saas.api.domain.vo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/model/SysSaasUserOnlineDTO.java similarity index 95% rename from ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java rename to ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/model/SysSaasUserOnlineDTO.java index 376a3d003..59849f076 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/SysSaasUserOnlineDTO.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-api/src/main/java/org/dromara/system/saas/api/model/SysSaasUserOnlineDTO.java @@ -1,4 +1,4 @@ -package org.dromara.system.api.model; +package org.dromara.system.saas.api.model; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml index cda3106de..2bb3e1ad5 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml @@ -108,7 +108,7 @@ org.dromara - ruoyi-md-system-api + ruoyi-md-system-saas-api diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasClientVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasClientVoConvert.java index c7f5cbecf..e6d3d20dc 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasClientVoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasClientVoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasDictDataVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasDictDataVoConvert.java index cf5955282..b1d63cbf8 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasDictDataVoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasDictDataVoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasLogininforBoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasLogininforBoConvert.java index ae0a50558..77407e2fe 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasLogininforBoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasLogininforBoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasOperLogBoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasOperLogBoConvert.java index f30a2fc89..ea5b677ca 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasOperLogBoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasOperLogBoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialBoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialBoConvert.java index 7b5c62ada..f467afe9a 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialBoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialBoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialVoConvert.java index f76d54f1d..d2619a716 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialVoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasSocialVoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java index 344930c03..dfde7d1de 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserBoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserBoConvert.java index 16a87d98b..94ea126cd 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserBoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserBoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserVoConvert.java index 433012973..2334305cd 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserVoConvert.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasUserVoConvert.java @@ -1,7 +1,7 @@ package org.dromara.system.saas.domain.convert; 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.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java index b9646c7b4..d1c1904c0 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteClientServiceImpl.java @@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.RemoteClientService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteClientService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.system.saas.domain.vo.SysSaasClientVo; import org.dromara.system.saas.service.ISysSaasClientService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java index 137d85bb3..7cab62eaf 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java @@ -2,7 +2,7 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; 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.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDataScopeServiceImpl.java index 521c32ac5..9be6cfa5f 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDataScopeServiceImpl.java @@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.StreamUtils; 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.SysSaasRoleDept; import org.dromara.system.saas.mapper.SysSaasDeptMapper; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDeptServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDeptServiceImpl.java index f3d9d0d92..565a1afc4 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDeptServiceImpl.java @@ -3,7 +3,7 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; 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; /** diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDictServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDictServiceImpl.java index 942aa2a0b..2546135e0 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDictServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteDictServiceImpl.java @@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.RemoteDictService; -import org.dromara.system.api.domain.vo.RemoteDictDataVo; +import org.dromara.system.saas.api.RemoteDictService; +import org.dromara.system.saas.api.domain.vo.RemoteDictDataVo; import org.dromara.system.saas.domain.vo.SysSaasDictDataVo; import org.dromara.system.saas.service.ISysSaasDictTypeService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteLogServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteLogServiceImpl.java index 4fe75268c..50a87bc3e 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteLogServiceImpl.java @@ -3,9 +3,9 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.RemoteLogService; -import org.dromara.system.api.domain.bo.RemoteLogininforBo; -import org.dromara.system.api.domain.bo.RemoteOperLogBo; +import org.dromara.system.saas.api.RemoteLogService; +import org.dromara.system.saas.api.domain.bo.RemoteLogininforBo; +import org.dromara.system.saas.api.domain.bo.RemoteOperLogBo; import org.dromara.system.saas.domain.bo.SysSaasLogininforBo; import org.dromara.system.saas.domain.bo.SysSaasOperLogBo; import org.dromara.system.saas.service.ISysSaasLogininforService; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteSocialServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteSocialServiceImpl.java index ff8a20268..7fbdc1257 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteSocialServiceImpl.java @@ -3,9 +3,9 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.RemoteSocialService; -import org.dromara.system.api.domain.bo.RemoteSocialBo; -import org.dromara.system.api.domain.vo.RemoteSocialVo; +import org.dromara.system.saas.api.RemoteSocialService; +import org.dromara.system.saas.api.domain.bo.RemoteSocialBo; +import org.dromara.system.saas.api.domain.vo.RemoteSocialVo; import org.dromara.system.saas.domain.bo.SysSaasSocialBo; import org.dromara.system.saas.domain.vo.SysSaasSocialVo; import org.dromara.system.saas.service.ISysSaasSocialService; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java index 2224f18b4..d238799b7 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java @@ -3,8 +3,8 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.system.api.RemoteTenantService; -import org.dromara.system.api.domain.vo.RemoteTenantVo; +import org.dromara.system.saas.api.RemoteTenantService; +import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; import org.dromara.system.saas.domain.bo.SysSaasTenantBo; import org.dromara.system.saas.domain.vo.SysSaasTenantVo; import org.dromara.system.saas.service.ISysSaasTenantService; diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java index 442da0534..4473ef5f6 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java @@ -16,9 +16,9 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.bo.RemoteUserBo; -import org.dromara.system.api.domain.vo.RemoteUserVo; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.bo.RemoteUserBo; +import org.dromara.system.saas.api.domain.vo.RemoteUserVo; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.XcxLoginUser; import org.dromara.system.saas.domain.SysSaasUser; diff --git a/ruoyi-site/ruoyi-admin/pom.xml b/ruoyi-site/ruoyi-admin/pom.xml index 441eb537c..0623002d5 100644 --- a/ruoyi-site/ruoyi-admin/pom.xml +++ b/ruoyi-site/ruoyi-admin/pom.xml @@ -77,7 +77,7 @@ org.dromara - ruoyi-md-system-saas + ruoyi-md-system-saas-service diff --git a/ruoyi-site/ruoyi-h5/pom.xml b/ruoyi-site/ruoyi-h5/pom.xml index cc2a4c1ac..69749fee2 100644 --- a/ruoyi-site/ruoyi-h5/pom.xml +++ b/ruoyi-site/ruoyi-h5/pom.xml @@ -61,7 +61,7 @@ org.dromara - ruoyi-md-system-saas + ruoyi-md-system-saas-service org.dromara diff --git a/ruoyi-site/ruoyi-sso-server/pom.xml b/ruoyi-site/ruoyi-sso-server/pom.xml index 1391f9df9..57e51aa02 100644 --- a/ruoyi-site/ruoyi-sso-server/pom.xml +++ b/ruoyi-site/ruoyi-sso-server/pom.xml @@ -40,7 +40,7 @@ org.dromara - ruoyi-md-system-api + ruoyi-md-system-saas-api org.dromara diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/SsoServerController.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/SsoServerController.java index eb98bb2e0..34ae8962b 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/SsoServerController.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/SsoServerController.java @@ -35,8 +35,8 @@ import org.dromara.common.redis.utils.RedisUtils; import org.dromara.sso.properties.CaptchaProperties; import org.dromara.sso.service.IAuthStrategy; import org.dromara.sso.service.SysLoginService; -import org.dromara.system.api.RemoteClientService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteClientService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.sso.config.satoken.LoginSaasHelper; import org.dromara.sso.domain.vo.CaptchaVo; import org.dromara.sso.domain.vo.LoginVo; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/TokenController.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/TokenController.java index 8b1df92f4..f062ff47a 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/TokenController.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/controller/TokenController.java @@ -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.utils.SocialUtils; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteClientService; -import org.dromara.system.api.RemoteConfigService; -import org.dromara.system.api.RemoteSocialService; -import org.dromara.system.api.RemoteTenantService; -import org.dromara.system.api.domain.vo.RemoteClientVo; -import org.dromara.system.api.domain.vo.RemoteTenantVo; +import org.dromara.system.saas.api.RemoteClientService; +import org.dromara.system.saas.api.RemoteConfigService; +import org.dromara.system.saas.api.RemoteSocialService; +import org.dromara.system.saas.api.RemoteTenantService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; import org.springframework.web.bind.annotation.*; import java.net.URL; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/domain/convert/TenantVoConvert.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/domain/convert/TenantVoConvert.java index 137af54ca..7103c64c4 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/domain/convert/TenantVoConvert.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/domain/convert/TenantVoConvert.java @@ -2,7 +2,7 @@ package org.dromara.sso.domain.convert; import io.github.linpeilie.BaseMapper; 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.MappingConstants; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/listener/UserActionListener.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/listener/UserActionListener.java index ee648a03d..bffa2be6b 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/listener/UserActionListener.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/listener/UserActionListener.java @@ -7,7 +7,7 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.http.useragent.UserAgent; 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 lombok.RequiredArgsConstructor; 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.redis.utils.RedisUtils; 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 java.time.Duration; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/IAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/IAuthStrategy.java index 263a85412..326143255 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/IAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/IAuthStrategy.java @@ -3,7 +3,7 @@ package org.dromara.sso.service; import org.dromara.sso.domain.vo.LoginVo; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; /** * 授权策略 diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/SysLoginService.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/SysLoginService.java index 1c7fb8903..d9bafabde 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/SysLoginService.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/SysLoginService.java @@ -33,13 +33,13 @@ import org.dromara.common.log.event.LogininforEvent; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.tenant.exception.TenantException; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteSocialService; -import org.dromara.system.api.RemoteTenantService; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.bo.RemoteSocialBo; -import org.dromara.system.api.domain.bo.RemoteUserBo; -import org.dromara.system.api.domain.vo.RemoteSocialVo; -import org.dromara.system.api.domain.vo.RemoteTenantVo; +import org.dromara.system.saas.api.RemoteSocialService; +import org.dromara.system.saas.api.RemoteTenantService; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.bo.RemoteSocialBo; +import org.dromara.system.saas.api.domain.bo.RemoteUserBo; +import org.dromara.system.saas.api.domain.vo.RemoteSocialVo; +import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; import org.dromara.common.core.domain.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/EmailAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/EmailAuthStrategy.java index 62c2d60d7..1d88856d6 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/EmailAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/EmailAuthStrategy.java @@ -20,8 +20,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.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.common.core.domain.model.LoginUser; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/PasswordAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/PasswordAuthStrategy.java index 50b04c41d..d3c306ec4 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/PasswordAuthStrategy.java @@ -23,8 +23,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.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.common.core.domain.model.LoginUser; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SmsAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SmsAuthStrategy.java index 0e7226d98..6bc04458a 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SmsAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SmsAuthStrategy.java @@ -20,8 +20,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.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.common.core.domain.model.LoginUser; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SocialAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SocialAuthStrategy.java index 44c7aa2e8..c845bca3b 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SocialAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/SocialAuthStrategy.java @@ -22,10 +22,10 @@ import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.social.config.properties.SocialProperties; import org.dromara.common.social.utils.SocialUtils; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.api.RemoteSocialService; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.vo.RemoteClientVo; -import org.dromara.system.api.domain.vo.RemoteSocialVo; +import org.dromara.system.saas.api.RemoteSocialService; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.domain.vo.RemoteSocialVo; import org.dromara.common.core.domain.model.LoginUser; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/XcxAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/XcxAuthStrategy.java index 30d7c1c2c..c17e98684 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/XcxAuthStrategy.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/service/impl/XcxAuthStrategy.java @@ -12,8 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.json.utils.JsonUtils; -import org.dromara.system.api.RemoteUserService; -import org.dromara.system.api.domain.vo.RemoteClientVo; +import org.dromara.system.saas.api.RemoteUserService; +import org.dromara.system.saas.api.domain.vo.RemoteClientVo; import org.dromara.common.core.domain.model.XcxLoginUser; import org.springframework.stereotype.Service;