diff --git a/pom.xml b/pom.xml index ac833783b..f2edcf3fd 100644 --- a/pom.xml +++ b/pom.xml @@ -445,7 +445,6 @@ - ruoyi-admin ruoyi-common ruoyi-extend ruoyi-modules diff --git a/ruoyi-admin/Dockerfile b/ruoyi-site/ruoyi-admin/Dockerfile similarity index 100% rename from ruoyi-admin/Dockerfile rename to ruoyi-site/ruoyi-admin/Dockerfile diff --git a/ruoyi-admin/pom.xml b/ruoyi-site/ruoyi-admin/pom.xml similarity index 100% rename from ruoyi-admin/pom.xml rename to ruoyi-site/ruoyi-admin/pom.xml diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/DromaraServletInitializer.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/MybatisPlusAutoConfigTenant.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/PlusTenantLineHandler.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/PlusTenantLineHandler.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/config/PlusTenantLineHandler.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/PlusTenantLineHandler.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java similarity index 93% rename from ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java index b94a7c46d..112fbffb0 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java +++ b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java @@ -16,7 +16,7 @@ import org.springframework.context.annotation.PropertySource; * @author Lion Li */ @Configuration -@PropertySource(value = "classpath:common-satoken.yml", factory = YmlPropertySourceFactory.class) +@PropertySource(value = "common-satoken.yml", factory = YmlPropertySourceFactory.class) public class SaTokenConfig { @Bean diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/controller/IndexController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginTenantVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/LoginVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/domain/vo/TenantListVo.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/listener/UserActionListener.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/IAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java b/ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java similarity index 100% rename from ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java rename to ruoyi-site/ruoyi-admin/src/main/java/org/dromara/web/service/impl/XcxAuthStrategy.java diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-local.yml rename to ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application-prod.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to ruoyi-site/ruoyi-admin/src/main/resources/application-prod.yml diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application.yml similarity index 100% rename from ruoyi-admin/src/main/resources/application.yml rename to ruoyi-site/ruoyi-admin/src/main/resources/application.yml diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-site/ruoyi-admin/src/main/resources/banner.txt similarity index 100% rename from ruoyi-admin/src/main/resources/banner.txt rename to ruoyi-site/ruoyi-admin/src/main/resources/banner.txt diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to ruoyi-site/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/ruoyi-site/ruoyi-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to ruoyi-site/ruoyi-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/ruoyi-site/ruoyi-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to ruoyi-site/ruoyi-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java b/ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java rename to ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/AssertUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java b/ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java rename to ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/DemoUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java b/ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java rename to ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/ParamUnitTest.java diff --git a/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java b/ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java similarity index 100% rename from ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java rename to ruoyi-site/ruoyi-admin/src/test/java/org/dromara/test/TagUnitTest.java