From 645ebec83e7a20edadf217a6008675a9181fef0d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 18 五月 2024 18:33:09 +0800
Subject: [PATCH] feat: ruoyi-admin改名为hs-service
---
hs-service/src/main/resources/application-prod.yml | 0
hs-service/src/main/java/com/sunsail/web/domain/vo/TenantListVo.java | 0
ruoyi-common/ruoyi-common-web/.flattened-pom.xml | 2 +-
hs-service/src/main/java/com/sunsail/web/service/impl/SmsAuthStrategy.java | 0
hs-service/src/main/resources/logback-plus.xml | 0
pom.xml | 2 +-
hs-service/src/main/java/com/sunsail/web/listener/UserActionListener.java | 0
ruoyi-common/ruoyi-common-job/.flattened-pom.xml | 2 +-
.flattened-pom.xml | 6 +++---
hs-service/src/main/java/com/sunsail/web/service/impl/EmailAuthStrategy.java | 0
hs-service/pom.xml | 3 ++-
hs-service/src/main/resources/application.yml | 0
hs-service/src/main/java/com/sunsail/web/domain/vo/CaptchaVo.java | 0
hs-service/src/main/resources/application-dev.yml | 0
hs-service/src/main/java/com/sunsail/SunSailApplication.java | 0
hs-service/src/main/resources/i18n/messages_zh_CN.properties | 0
hs-service/src/main/resources/i18n/messages_en_US.properties | 0
hs-service/src/main/resources/spy.properties | 0
hs-service/src/main/resources/i18n/messages.properties | 0
hs-service/src/main/java/com/sunsail/web/service/IAuthStrategy.java | 0
hs-service/src/main/java/com/sunsail/web/domain/vo/LoginTenantVo.java | 0
hs-service/Dockerfile | 0
hs-service/src/main/java/com/sunsail/web/service/impl/PasswordAuthStrategy.java | 0
hs-service/src/main/java/com/sunsail/web/service/SysLoginService.java | 0
hs-service/src/main/java/com/sunsail/SunSailServletInitializer.java | 0
hs-service/src/main/java/com/sunsail/web/service/impl/SocialAuthStrategy.java | 0
hs-service/src/main/java/com/sunsail/web/service/impl/XcxAuthStrategy.java | 0
hs-service/src/main/resources/ip2region.xdb | 0
hs-service/.flattened-pom.xml | 2 +-
ruoyi-common/ruoyi-common-sms/.flattened-pom.xml | 2 +-
hs-service/src/main/java/com/sunsail/web/controller/AuthController.java | 0
hs-service/src/main/java/com/sunsail/web/controller/CaptchaController.java | 0
hs-service/src/main/java/com/sunsail/web/service/SysRegisterService.java | 0
hs-service/src/main/java/com/sunsail/web/domain/vo/LoginVo.java | 0
hs-service/src/main/resources/banner.txt | 0
ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml | 2 +-
hs-service/src/main/java/com/sunsail/web/controller/IndexController.java | 0
37 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/.flattened-pom.xml b/.flattened-pom.xml
index 9017d2d..9ad1f35 100644
--- a/.flattened-pom.xml
+++ b/.flattened-pom.xml
@@ -10,7 +10,7 @@
<description>RuoYi-Vue-Plus多租户管理系统</description>
<url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
<modules>
- <module>ruoyi-admin</module>
+ <module>hs-service</module>
<module>ruoyi-common</module>
<module>ruoyi-extend</module>
<module>ruoyi-modules</module>
@@ -112,8 +112,8 @@
<version>${easyexcel.version}</version>
<exclusions>
<exclusion>
- <artifactId>poi-ooxml-schemas</artifactId>
<groupId>org.apache.poi</groupId>
+ <artifactId>poi-ooxml-schemas</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -133,8 +133,8 @@
<version>${satoken.version}</version>
<exclusions>
<exclusion>
- <artifactId>hutool-all</artifactId>
<groupId>cn.hutool</groupId>
+ <artifactId>hutool-all</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/ruoyi-admin/.flattened-pom.xml b/hs-service/.flattened-pom.xml
similarity index 98%
rename from ruoyi-admin/.flattened-pom.xml
rename to hs-service/.flattened-pom.xml
index 92e0128..1971e8a 100644
--- a/ruoyi-admin/.flattened-pom.xml
+++ b/hs-service/.flattened-pom.xml
@@ -8,7 +8,7 @@
<version>5.1.2</version>
</parent>
<groupId>com.sunsail</groupId>
- <artifactId>ruoyi-admin</artifactId>
+ <artifactId>hs-service</artifactId>
<version>5.1.2</version>
<description>web服务入口</description>
<dependencies>
diff --git a/ruoyi-admin/Dockerfile b/hs-service/Dockerfile
similarity index 100%
rename from ruoyi-admin/Dockerfile
rename to hs-service/Dockerfile
diff --git a/ruoyi-admin/pom.xml b/hs-service/pom.xml
similarity index 98%
rename from ruoyi-admin/pom.xml
rename to hs-service/pom.xml
index 23cdf96..b648189 100644
--- a/ruoyi-admin/pom.xml
+++ b/hs-service/pom.xml
@@ -7,9 +7,10 @@
<groupId>com.sunsail</groupId>
<version>${revision}</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <artifactId>ruoyi-admin</artifactId>
+ <artifactId>hs-service</artifactId>
<description>
web服务入口
diff --git a/ruoyi-admin/src/main/java/com/sunsail/SunSailApplication.java b/hs-service/src/main/java/com/sunsail/SunSailApplication.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/SunSailApplication.java
rename to hs-service/src/main/java/com/sunsail/SunSailApplication.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/SunSailServletInitializer.java b/hs-service/src/main/java/com/sunsail/SunSailServletInitializer.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/SunSailServletInitializer.java
rename to hs-service/src/main/java/com/sunsail/SunSailServletInitializer.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/controller/AuthController.java b/hs-service/src/main/java/com/sunsail/web/controller/AuthController.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/controller/AuthController.java
rename to hs-service/src/main/java/com/sunsail/web/controller/AuthController.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/controller/CaptchaController.java b/hs-service/src/main/java/com/sunsail/web/controller/CaptchaController.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/controller/CaptchaController.java
rename to hs-service/src/main/java/com/sunsail/web/controller/CaptchaController.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/controller/IndexController.java b/hs-service/src/main/java/com/sunsail/web/controller/IndexController.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/controller/IndexController.java
rename to hs-service/src/main/java/com/sunsail/web/controller/IndexController.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/CaptchaVo.java b/hs-service/src/main/java/com/sunsail/web/domain/vo/CaptchaVo.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/CaptchaVo.java
rename to hs-service/src/main/java/com/sunsail/web/domain/vo/CaptchaVo.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/LoginTenantVo.java b/hs-service/src/main/java/com/sunsail/web/domain/vo/LoginTenantVo.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/LoginTenantVo.java
rename to hs-service/src/main/java/com/sunsail/web/domain/vo/LoginTenantVo.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/LoginVo.java b/hs-service/src/main/java/com/sunsail/web/domain/vo/LoginVo.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/LoginVo.java
rename to hs-service/src/main/java/com/sunsail/web/domain/vo/LoginVo.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/TenantListVo.java b/hs-service/src/main/java/com/sunsail/web/domain/vo/TenantListVo.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/domain/vo/TenantListVo.java
rename to hs-service/src/main/java/com/sunsail/web/domain/vo/TenantListVo.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/listener/UserActionListener.java b/hs-service/src/main/java/com/sunsail/web/listener/UserActionListener.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/listener/UserActionListener.java
rename to hs-service/src/main/java/com/sunsail/web/listener/UserActionListener.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/IAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/IAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/IAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/IAuthStrategy.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/SysLoginService.java b/hs-service/src/main/java/com/sunsail/web/service/SysLoginService.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/SysLoginService.java
rename to hs-service/src/main/java/com/sunsail/web/service/SysLoginService.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/SysRegisterService.java b/hs-service/src/main/java/com/sunsail/web/service/SysRegisterService.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/SysRegisterService.java
rename to hs-service/src/main/java/com/sunsail/web/service/SysRegisterService.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/impl/EmailAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/impl/EmailAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/impl/EmailAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/impl/EmailAuthStrategy.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/impl/PasswordAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/impl/PasswordAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/impl/PasswordAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/impl/PasswordAuthStrategy.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/impl/SmsAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/impl/SmsAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/impl/SmsAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/impl/SmsAuthStrategy.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/impl/SocialAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/impl/SocialAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/impl/SocialAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/impl/SocialAuthStrategy.java
diff --git a/ruoyi-admin/src/main/java/com/sunsail/web/service/impl/XcxAuthStrategy.java b/hs-service/src/main/java/com/sunsail/web/service/impl/XcxAuthStrategy.java
similarity index 100%
rename from ruoyi-admin/src/main/java/com/sunsail/web/service/impl/XcxAuthStrategy.java
rename to hs-service/src/main/java/com/sunsail/web/service/impl/XcxAuthStrategy.java
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/hs-service/src/main/resources/application-dev.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application-dev.yml
rename to hs-service/src/main/resources/application-dev.yml
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/hs-service/src/main/resources/application-prod.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application-prod.yml
rename to hs-service/src/main/resources/application-prod.yml
diff --git a/ruoyi-admin/src/main/resources/application.yml b/hs-service/src/main/resources/application.yml
similarity index 100%
rename from ruoyi-admin/src/main/resources/application.yml
rename to hs-service/src/main/resources/application.yml
diff --git a/ruoyi-admin/src/main/resources/banner.txt b/hs-service/src/main/resources/banner.txt
similarity index 100%
rename from ruoyi-admin/src/main/resources/banner.txt
rename to hs-service/src/main/resources/banner.txt
diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/hs-service/src/main/resources/i18n/messages.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/i18n/messages.properties
rename to hs-service/src/main/resources/i18n/messages.properties
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/hs-service/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 hs-service/src/main/resources/i18n/messages_en_US.properties
diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/hs-service/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 hs-service/src/main/resources/i18n/messages_zh_CN.properties
diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/hs-service/src/main/resources/ip2region.xdb
similarity index 100%
rename from ruoyi-admin/src/main/resources/ip2region.xdb
rename to hs-service/src/main/resources/ip2region.xdb
Binary files differ
diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/hs-service/src/main/resources/logback-plus.xml
similarity index 100%
rename from ruoyi-admin/src/main/resources/logback-plus.xml
rename to hs-service/src/main/resources/logback-plus.xml
diff --git a/ruoyi-admin/src/main/resources/spy.properties b/hs-service/src/main/resources/spy.properties
similarity index 100%
rename from ruoyi-admin/src/main/resources/spy.properties
rename to hs-service/src/main/resources/spy.properties
diff --git a/pom.xml b/pom.xml
index e9c204b..17ab832 100644
--- a/pom.xml
+++ b/pom.xml
@@ -343,7 +343,7 @@
</dependencyManagement>
<modules>
- <module>ruoyi-admin</module>
+ <module>hs-service</module>
<module>ruoyi-common</module>
<module>ruoyi-extend</module>
<module>ruoyi-modules</module>
diff --git a/ruoyi-common/ruoyi-common-job/.flattened-pom.xml b/ruoyi-common/ruoyi-common-job/.flattened-pom.xml
index 2afcb37..b3e89c6 100644
--- a/ruoyi-common/ruoyi-common-job/.flattened-pom.xml
+++ b/ruoyi-common/ruoyi-common-job/.flattened-pom.xml
@@ -21,8 +21,8 @@
<artifactId>powerjob-worker-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>powerjob-remote-impl-akka</artifactId>
<groupId>tech.powerjob</groupId>
+ <artifactId>powerjob-remote-impl-akka</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml b/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
index 735e03e..e962490 100644
--- a/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
@@ -33,8 +33,8 @@
<artifactId>mybatis-plus-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>mybatis-spring</artifactId>
<groupId>org.mybatis</groupId>
+ <artifactId>mybatis-spring</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml b/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
index 4c403ce..186161b 100644
--- a/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
+++ b/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
@@ -17,8 +17,8 @@
<artifactId>sms4j-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
- <artifactId>fastjson</artifactId>
<groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git a/ruoyi-common/ruoyi-common-web/.flattened-pom.xml b/ruoyi-common/ruoyi-common-web/.flattened-pom.xml
index cd22a30..387629d 100644
--- a/ruoyi-common/ruoyi-common-web/.flattened-pom.xml
+++ b/ruoyi-common/ruoyi-common-web/.flattened-pom.xml
@@ -25,8 +25,8 @@
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
- <artifactId>spring-boot-starter-tomcat</artifactId>
<groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-tomcat</artifactId>
</exclusion>
</exclusions>
</dependency>
--
Gitblit v1.8.0