diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/SaTokenSsoConfig.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/SaTokenSsoConfig.java index 1dfff4c28..d85866197 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/SaTokenSsoConfig.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/SaTokenSsoConfig.java @@ -6,7 +6,7 @@ import cn.dev33.satoken.stp.StpLogic; import org.dromara.common.log.aspect.CommonLogTenantIntercept; import org.dromara.sso.config.satoken.LoginSaasHelper; import org.dromara.sso.config.satoken.SaPermissionImpl; -import org.dromara.system.api.model.LoginUser; +import org.dromara.common.core.domain.model.LoginUser; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/LoginSaasHelper.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/LoginSaasHelper.java index ca2cbe9f8..481a44374 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/LoginSaasHelper.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/LoginSaasHelper.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; import org.dromara.common.core.constant.TenantConstants; import org.dromara.common.core.constant.UserConstants; import org.dromara.common.core.enums.UserType; -import org.dromara.system.api.model.LoginUser; +import org.dromara.common.core.domain.model.LoginUser; import java.util.Set; diff --git a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/SaPermissionImpl.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/SaPermissionImpl.java index a8fca300f..adb3acfa3 100644 --- a/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/SaPermissionImpl.java +++ b/ruoyi-site/ruoyi-sso-server/src/main/java/org/dromara/sso/config/satoken/SaPermissionImpl.java @@ -2,7 +2,7 @@ package org.dromara.sso.config.satoken; import cn.dev33.satoken.stp.StpInterface; import org.dromara.common.core.enums.UserType; -import org.dromara.system.api.model.LoginUser; +import org.dromara.common.core.domain.model.LoginUser; import java.util.ArrayList; import java.util.List; 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 054f1128b..1c7fb8903 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 @@ -40,7 +40,7 @@ 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.api.model.LoginUser; +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 6b7f9a0fe..62c2d60d7 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 @@ -22,7 +22,7 @@ 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.api.model.LoginUser; +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 bd91eaf4b..50b04c41d 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 @@ -25,7 +25,7 @@ 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.api.model.LoginUser; +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 5583c5720..0e7226d98 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 @@ -22,7 +22,7 @@ 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.api.model.LoginUser; +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 7c37c433e..44c7aa2e8 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 @@ -26,7 +26,7 @@ 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.api.model.LoginUser; +import org.dromara.common.core.domain.model.LoginUser; import org.springframework.stereotype.Service; import java.util.List; 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 628f114ac..30d7c1c2c 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 @@ -14,7 +14,7 @@ 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.api.model.XcxLoginUser; +import org.dromara.common.core.domain.model.XcxLoginUser; import org.springframework.stereotype.Service; /**