diff --git a/pom.xml b/pom.xml index 4c6729338..ce30077ea 100644 --- a/pom.xml +++ b/pom.xml @@ -459,6 +459,7 @@ ruoyi-extend ruoyi-modules ruoyi-api + ruoyi-site pom diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 056104521..e899c446f 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -16,7 +16,6 @@ ruoyi-system ruoyi-system-saas - ruoyi-sso-server ruoyi-modules diff --git a/ruoyi-site/README.md b/ruoyi-site/README.md new file mode 100644 index 000000000..47f8aad84 --- /dev/null +++ b/ruoyi-site/README.md @@ -0,0 +1 @@ +所有站点 diff --git a/ruoyi-site/pom.xml b/ruoyi-site/pom.xml new file mode 100644 index 000000000..d9878264d --- /dev/null +++ b/ruoyi-site/pom.xml @@ -0,0 +1,23 @@ + + + + ruoyi-vue-plus + org.dromara + ${revision} + + 4.0.0 + + + ruoyi-sso-server + + + ruoyi-site + pom + + + ruoyi-site 所有站点 + + + diff --git a/ruoyi-modules/ruoyi-sso-server/Dockerfile b/ruoyi-site/ruoyi-sso-server/Dockerfile similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/Dockerfile rename to ruoyi-site/ruoyi-sso-server/Dockerfile diff --git a/ruoyi-modules/ruoyi-sso-server/pom.xml b/ruoyi-site/ruoyi-sso-server/pom.xml similarity index 99% rename from ruoyi-modules/ruoyi-sso-server/pom.xml rename to ruoyi-site/ruoyi-sso-server/pom.xml index 9dce97c94..48a1c39cd 100644 --- a/ruoyi-modules/ruoyi-sso-server/pom.xml +++ b/ruoyi-site/ruoyi-sso-server/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> org.dromara - ruoyi-modules + ruoyi-site ${revision} 4.0.0 diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/SaSsoServerApplication.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/SaSsoServerApplication.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/SaSsoServerApplication.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/SaSsoServerApplication.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/captcha/UnsignedMathGenerator.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CaptchaConfig.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/CorsConfig.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/GlobalExceptionHandler.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/SaTokenSsoConfig.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/LoginSaasHelper.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaPermissionImpl.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/config/satoken/SaTokenExceptionHandler.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/HomeController.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/SsoServerController.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/controller/TokenController.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/convert/TenantVoConvert.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/CaptchaVo.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginTenantVo.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/LoginVo.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/domain/vo/TenantListVo.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaCategory.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/enums/CaptchaType.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/EmailLoginBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/PasswordLoginBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/RegisterBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SmsLoginBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/SocialLoginBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/form/XcxLoginBody.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/listener/UserActionListener.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/CaptchaProperties.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/properties/UserPasswordProperties.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/IAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/SysLoginService.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/EmailAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/PasswordAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SmsAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/SocialAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java b/ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java rename to ruoyi-site/ruoyi-sso-server/src/main/java/org/ruoyi/sso/server/service/impl/XcxAuthStrategy.java diff --git a/ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml b/ruoyi-site/ruoyi-sso-server/src/main/resources/application.yml similarity index 100% rename from ruoyi-modules/ruoyi-sso-server/src/main/resources/application.yml rename to ruoyi-site/ruoyi-sso-server/src/main/resources/application.yml