包名调整

This commit is contained in:
Github_lizhw 2024-11-09 23:31:36 +08:00
parent a904b3ef87
commit 210fd924c8
35 changed files with 88 additions and 88 deletions

View File

@ -1,4 +1,4 @@
package com.pj.auth.captcha; package org.ruoyi.sso.server.captcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.math.Calculator; import cn.hutool.core.math.Calculator;

View File

@ -1,4 +1,4 @@
package com.pj.auth.config; package org.ruoyi.sso.server.config;
import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CaptchaUtil;
import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.CircleCaptcha;

View File

@ -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.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

View File

@ -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.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.bind.annotation.RestControllerAdvice;

View File

@ -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.jwt.StpLogicJwtForSimple;
import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpInterface;
import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpLogic;
import com.pj.auth.config.satoken.SaPermissionImpl; import org.ruoyi.sso.server.config.satoken.SaPermissionImpl;
import com.pj.auth.config.satoken.SaTokenExceptionHandler; import org.ruoyi.sso.server.config.satoken.SaTokenExceptionHandler;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import org.dromara.common.log.aspect.CommonLogTenantIntercept; import org.dromara.common.log.aspect.CommonLogTenantIntercept;
import org.dromara.system.api.model.LoginUser; import org.dromara.system.api.model.LoginUser;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

View File

@ -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.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.SaLoginModel;

View File

@ -1,4 +1,4 @@
package com.pj.auth.config.satoken; package org.ruoyi.sso.server.config.satoken;
import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpInterface;
import org.dromara.common.core.enums.UserType; import org.dromara.common.core.enums.UserType;

View File

@ -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.NotLoginException;
import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.exception.NotPermissionException;

View File

@ -1,11 +1,11 @@
package com.pj.auth.controller; package org.ruoyi.sso.server.controller;
import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.pj.auth.domain.vo.CaptchaVo; import org.ruoyi.sso.server.domain.vo.CaptchaVo;
import com.pj.auth.enums.CaptchaType; import org.ruoyi.sso.server.enums.CaptchaType;
import com.pj.auth.properties.CaptchaProperties; import org.ruoyi.sso.server.properties.CaptchaProperties;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;

View File

@ -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.SaHolder;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;

View File

@ -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.SaHolder;
import cn.dev33.satoken.context.model.SaRequest; 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.sso.processor.SaSsoServerProcessor;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;

View File

@ -1,17 +1,17 @@
package com.pj.auth.controller; package org.ruoyi.sso.server.controller;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.pj.auth.domain.vo.LoginTenantVo; import org.ruoyi.sso.server.domain.vo.LoginTenantVo;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.domain.vo.TenantListVo; import org.ruoyi.sso.server.domain.vo.TenantListVo;
import com.pj.auth.form.RegisterBody; import org.ruoyi.sso.server.form.RegisterBody;
import com.pj.auth.form.SocialLoginBody; import org.ruoyi.sso.server.form.SocialLoginBody;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@ -1,7 +1,7 @@
package com.pj.auth.domain.convert; package org.ruoyi.sso.server.domain.convert;
import io.github.linpeilie.BaseMapper; 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.dromara.system.api.domain.vo.RemoteTenantVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
import org.mapstruct.MappingConstants; import org.mapstruct.MappingConstants;

View File

@ -1,4 +1,4 @@
package com.pj.auth.domain.vo; package org.ruoyi.sso.server.domain.vo;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.domain.vo; package org.ruoyi.sso.server.domain.vo;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.domain.vo; package org.ruoyi.sso.server.domain.vo;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.domain.vo; package org.ruoyi.sso.server.domain.vo;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.enums; package org.ruoyi.sso.server.enums;
import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.CircleCaptcha;

View File

@ -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.CodeGenerator;
import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.captcha.generator.RandomGenerator;
import com.pj.auth.captcha.UnsignedMathGenerator; import org.ruoyi.sso.server.captcha.UnsignedMathGenerator;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.Email; import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pj.auth.form; package org.ruoyi.sso.server.form;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data; import lombok.Data;

View File

@ -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.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener; 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.core.convert.Convert;
import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil; import cn.hutool.http.useragent.UserAgentUtil;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;

View File

@ -1,8 +1,8 @@
package com.pj.auth.properties; package org.ruoyi.sso.server.properties;
import lombok.Data; import lombok.Data;
import com.pj.auth.enums.CaptchaCategory; import org.ruoyi.sso.server.enums.CaptchaCategory;
import com.pj.auth.enums.CaptchaType; import org.ruoyi.sso.server.enums.CaptchaType;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;

View File

@ -1,4 +1,4 @@
package com.pj.auth.properties; package org.ruoyi.sso.server.properties;
import lombok.Data; import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;

View File

@ -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.exception.ServiceException;
import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.SpringUtils;
import org.dromara.system.api.domain.vo.RemoteClientVo; import org.dromara.system.api.domain.vo.RemoteClientVo;

View File

@ -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.exception.NotLoginException;
import cn.dev33.satoken.secure.BCrypt; 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.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.annotation.Lock4j;
import com.pj.auth.form.RegisterBody; import org.ruoyi.sso.server.form.RegisterBody;
import com.pj.auth.properties.CaptchaProperties; import org.ruoyi.sso.server.properties.CaptchaProperties;
import com.pj.auth.properties.UserPasswordProperties; import org.ruoyi.sso.server.properties.UserPasswordProperties;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;

View File

@ -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.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.form.EmailLoginBody; import org.ruoyi.sso.server.form.EmailLoginBody;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;

View File

@ -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.secure.BCrypt;
import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.form.PasswordLoginBody; import org.ruoyi.sso.server.form.PasswordLoginBody;
import com.pj.auth.properties.CaptchaProperties; import org.ruoyi.sso.server.properties.CaptchaProperties;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;

View File

@ -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.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.form.SmsLoginBody; import org.ruoyi.sso.server.form.SmsLoginBody;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;

View File

@ -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.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; 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.core.map.MapUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import cn.hutool.http.Method; 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.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.form.SocialLoginBody; import org.ruoyi.sso.server.form.SocialLoginBody;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.core.utils.ValidatorUtils;

View File

@ -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.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import com.pj.auth.domain.vo.LoginVo; import org.ruoyi.sso.server.domain.vo.LoginVo;
import com.pj.auth.form.XcxLoginBody; import org.ruoyi.sso.server.form.XcxLoginBody;
import com.pj.auth.service.IAuthStrategy; import org.ruoyi.sso.server.service.IAuthStrategy;
import com.pj.auth.service.SysLoginService; import org.ruoyi.sso.server.service.SysLoginService;
import com.pj.auth.config.satoken.LoginSaasHelper; import org.ruoyi.sso.server.config.satoken.LoginSaasHelper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboReference;