From 210fd924c8d94151e995ed3848540ff0d3b559fa Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Sat, 9 Nov 2024 23:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=90=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/captcha/UnsignedMathGenerator.java | 2 +- .../ruoyi/sso/server/config/CaptchaConfig.java | 2 +- .../ruoyi/sso/server/config/CorsConfig.java | 2 +- .../server/config/GlobalExceptionHandler.java | 2 +- .../sso/server/config/SaTokenSsoConfig.java | 8 ++++---- .../server/config/satoken/LoginSaasHelper.java | 2 +- .../config/satoken/SaPermissionImpl.java | 2 +- .../satoken/SaTokenExceptionHandler.java | 2 +- .../server/controller/CaptchaController.java | 8 ++++---- .../sso/server/controller/HomeController.java | 2 +- .../server/controller/SsoServerController.java | 10 +++++----- .../sso/server/controller/TokenController.java | 18 +++++++++--------- .../server/domain/convert/TenantVoConvert.java | 4 ++-- .../ruoyi/sso/server/domain/vo/CaptchaVo.java | 2 +- .../sso/server/domain/vo/LoginTenantVo.java | 2 +- .../ruoyi/sso/server/domain/vo/LoginVo.java | 2 +- .../sso/server/domain/vo/TenantListVo.java | 2 +- .../sso/server/enums/CaptchaCategory.java | 2 +- .../ruoyi/sso/server/enums/CaptchaType.java | 4 ++-- .../ruoyi/sso/server/form/EmailLoginBody.java | 2 +- .../sso/server/form/PasswordLoginBody.java | 2 +- .../ruoyi/sso/server/form/RegisterBody.java | 2 +- .../ruoyi/sso/server/form/SmsLoginBody.java | 2 +- .../ruoyi/sso/server/form/SocialLoginBody.java | 2 +- .../ruoyi/sso/server/form/XcxLoginBody.java | 2 +- .../server/listener/UserActionListener.java | 4 ++-- .../server/properties/CaptchaProperties.java | 6 +++--- .../properties/UserPasswordProperties.java | 2 +- .../sso/server/service/IAuthStrategy.java | 4 ++-- .../sso/server/service/SysLoginService.java | 10 +++++----- .../server/service/impl/EmailAuthStrategy.java | 12 ++++++------ .../service/impl/PasswordAuthStrategy.java | 14 +++++++------- .../server/service/impl/SmsAuthStrategy.java | 12 ++++++------ .../service/impl/SocialAuthStrategy.java | 10 +++++----- .../server/service/impl/XcxAuthStrategy.java | 12 ++++++------ 35 files changed, 88 insertions(+), 88 deletions(-) diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java index 3765a4963..0c2f2992d 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java @@ -1,4 +1,4 @@ -package com.pj.auth.captcha; +package org.ruoyi.sso.server.captcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java index ae2f40666..368bb52ef 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.pj.auth.config; +package org.ruoyi.sso.server.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java index c3236810b..2d429ab56 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java @@ -1,4 +1,4 @@ -package com.pj.auth.config; +package org.ruoyi.sso.server.config; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java index 537dbe91b..c70642c00 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.pj.auth.config; +package org.ruoyi.sso.server.config; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java index c7e2c814b..2c22aa96f 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java @@ -1,11 +1,11 @@ -package com.pj.auth.config; +package org.ruoyi.sso.server.config; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; -import com.pj.auth.config.satoken.SaPermissionImpl; -import com.pj.auth.config.satoken.SaTokenExceptionHandler; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.config.satoken.SaPermissionImpl; +import org.ruoyi.sso.server.config.satoken.SaTokenExceptionHandler; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import org.dromara.common.log.aspect.CommonLogTenantIntercept; import org.dromara.system.api.model.LoginUser; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java index d7ae5be0e..c383ad499 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java @@ -1,4 +1,4 @@ -package com.pj.auth.config.satoken; +package org.ruoyi.sso.server.config.satoken; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.SaLoginModel; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java index ef68adaa5..26a58710d 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java @@ -1,4 +1,4 @@ -package com.pj.auth.config.satoken; +package org.ruoyi.sso.server.config.satoken; import cn.dev33.satoken.stp.StpInterface; import org.dromara.common.core.enums.UserType; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java index 23915f9f7..c9711be7a 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java @@ -1,4 +1,4 @@ -package com.pj.auth.config.satoken; +package org.ruoyi.sso.server.config.satoken; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/CaptchaController.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/CaptchaController.java index fb01de4f0..6620ae65c 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/CaptchaController.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/CaptchaController.java @@ -1,11 +1,11 @@ -package com.pj.auth.controller; +package org.ruoyi.sso.server.controller; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; -import com.pj.auth.domain.vo.CaptchaVo; -import com.pj.auth.enums.CaptchaType; -import com.pj.auth.properties.CaptchaProperties; +import org.ruoyi.sso.server.domain.vo.CaptchaVo; +import org.ruoyi.sso.server.enums.CaptchaType; +import org.ruoyi.sso.server.properties.CaptchaProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.Constants; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java index b0c49dd3f..fbce6eb6d 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java @@ -1,4 +1,4 @@ -package com.pj.auth.controller; +package org.ruoyi.sso.server.controller; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.stp.StpUtil; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java index 19f897134..e30cf0a1c 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java @@ -1,4 +1,4 @@ -package com.pj.auth.controller; +package org.ruoyi.sso.server.controller; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaRequest; @@ -6,10 +6,10 @@ import cn.dev33.satoken.sso.config.SaSsoServerConfig; import cn.dev33.satoken.sso.processor.SaSsoServerProcessor; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.ObjectUtil; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java index e1eaeca6b..f7cb8b3fc 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java @@ -1,17 +1,17 @@ -package com.pj.auth.controller; +package org.ruoyi.sso.server.controller; import cn.dev33.satoken.exception.NotLoginException; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.pj.auth.domain.vo.LoginTenantVo; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.domain.vo.TenantListVo; -import com.pj.auth.form.RegisterBody; -import com.pj.auth.form.SocialLoginBody; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginTenantVo; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.domain.vo.TenantListVo; +import org.ruoyi.sso.server.form.RegisterBody; +import org.ruoyi.sso.server.form.SocialLoginBody; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import jakarta.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java index 368ccd99a..e3dc963f4 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java @@ -1,7 +1,7 @@ -package com.pj.auth.domain.convert; +package org.ruoyi.sso.server.domain.convert; import io.github.linpeilie.BaseMapper; -import com.pj.auth.domain.vo.TenantListVo; +import org.ruoyi.sso.server.domain.vo.TenantListVo; import org.dromara.system.api.domain.vo.RemoteTenantVo; import org.mapstruct.Mapper; import org.mapstruct.MappingConstants; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java index b528a779e..e239fe93a 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java @@ -1,4 +1,4 @@ -package com.pj.auth.domain.vo; +package org.ruoyi.sso.server.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java index 9fe6791df..d00a91447 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java @@ -1,4 +1,4 @@ -package com.pj.auth.domain.vo; +package org.ruoyi.sso.server.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java index af05e5790..b5808f176 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java @@ -1,4 +1,4 @@ -package com.pj.auth.domain.vo; +package org.ruoyi.sso.server.domain.vo; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java index 49144741e..a54bd123b 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java @@ -1,4 +1,4 @@ -package com.pj.auth.domain.vo; +package org.ruoyi.sso.server.domain.vo; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java index 8c19c73ee..589e0b37b 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package com.pj.auth.enums; +package org.ruoyi.sso.server.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java index 96dbd851a..b205b012a 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package com.pj.auth.enums; +package org.ruoyi.sso.server.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.pj.auth.captcha.UnsignedMathGenerator; +import org.ruoyi.sso.server.captcha.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java index 8811f34d5..df05f1d98 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java index 85d9edc89..eca4b6c5e 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java index 275651174..71dd90528 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java index 393f96dfb..ae305cf2b 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java index 325cc83b7..9646dfe2f 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java index 56d85d2f2..9a34f155e 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java @@ -1,4 +1,4 @@ -package com.pj.auth.form; +package org.ruoyi.sso.server.form; import jakarta.validation.constraints.NotBlank; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java index 981fa8b18..03d4aff26 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java @@ -1,4 +1,4 @@ -package com.pj.auth.listener; +package org.ruoyi.sso.server.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; @@ -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 com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java index 5d188e9d8..126a679be 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java @@ -1,8 +1,8 @@ -package com.pj.auth.properties; +package org.ruoyi.sso.server.properties; import lombok.Data; -import com.pj.auth.enums.CaptchaCategory; -import com.pj.auth.enums.CaptchaType; +import org.ruoyi.sso.server.enums.CaptchaCategory; +import org.ruoyi.sso.server.enums.CaptchaType; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java index 3a56d48a6..0f5e33279 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java @@ -1,4 +1,4 @@ -package com.pj.auth.properties; +package org.ruoyi.sso.server.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java index 38b5e3046..6ecb1f826 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java @@ -1,6 +1,6 @@ -package com.pj.auth.service; +package org.ruoyi.sso.server.service; -import com.pj.auth.domain.vo.LoginVo; +import org.ruoyi.sso.server.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; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java index 65b887fc3..1fa73a9ad 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.pj.auth.service; +package org.ruoyi.sso.server.service; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.secure.BCrypt; @@ -7,10 +7,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.lock.annotation.Lock4j; -import com.pj.auth.form.RegisterBody; -import com.pj.auth.properties.CaptchaProperties; -import com.pj.auth.properties.UserPasswordProperties; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.form.RegisterBody; +import org.ruoyi.sso.server.properties.CaptchaProperties; +import org.ruoyi.sso.server.properties.UserPasswordProperties; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthUser; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java index f48259f59..11e73a243 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java @@ -1,12 +1,12 @@ -package com.pj.auth.service.impl; +package org.ruoyi.sso.server.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.form.EmailLoginBody; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.form.EmailLoginBody; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java index 50b26cfbf..5d2bb6796 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java @@ -1,14 +1,14 @@ -package com.pj.auth.service.impl; +package org.ruoyi.sso.server.service.impl; import cn.dev33.satoken.secure.BCrypt; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.form.PasswordLoginBody; -import com.pj.auth.properties.CaptchaProperties; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.form.PasswordLoginBody; +import org.ruoyi.sso.server.properties.CaptchaProperties; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java index 626a9e024..505de7e14 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java @@ -1,12 +1,12 @@ -package com.pj.auth.service.impl; +package org.ruoyi.sso.server.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.form.SmsLoginBody; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.form.SmsLoginBody; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java index 53b8972bf..4a10a357b 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java @@ -1,4 +1,4 @@ -package com.pj.auth.service.impl; +package org.ruoyi.sso.server.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; @@ -6,15 +6,15 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.http.HttpUtil; import cn.hutool.http.Method; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthUser; import org.apache.dubbo.config.annotation.DubboReference; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.form.SocialLoginBody; -import com.pj.auth.service.IAuthStrategy; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.form.SocialLoginBody; +import org.ruoyi.sso.server.service.IAuthStrategy; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.ValidatorUtils; diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java index 5705a9d1e..a82e125f4 100644 --- a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java +++ b/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java @@ -1,12 +1,12 @@ -package com.pj.auth.service.impl; +package org.ruoyi.sso.server.service.impl; import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; -import com.pj.auth.domain.vo.LoginVo; -import com.pj.auth.form.XcxLoginBody; -import com.pj.auth.service.IAuthStrategy; -import com.pj.auth.service.SysLoginService; -import com.pj.auth.config.satoken.LoginSaasHelper; +import org.ruoyi.sso.server.domain.vo.LoginVo; +import org.ruoyi.sso.server.form.XcxLoginBody; +import org.ruoyi.sso.server.service.IAuthStrategy; +import org.ruoyi.sso.server.service.SysLoginService; +import org.ruoyi.sso.server.config.satoken.LoginSaasHelper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboReference;