From 5fcea0109e9852760b3451d061ae2dedb0f41052 Mon Sep 17 00:00:00 2001
From: leojames <leojames.googol@gmail.com>
Date: Tue, 23 Apr 2024 14:47:47 +0800
Subject: [PATCH] using koupleless

---
 eladmin-base/pom.xml                          | 13 ++++++--
 .../src/main/java/me/zhengjie/BaseAppRun.java |  9 +++++-
 modules/eladmin-biz-mng/pom.xml               |  6 ++--
 .../me/zhengjie/config/DatasourceConfig.java  |  2 +-
 modules/eladmin-biz-quartz/pom.xml            |  6 ++--
 .../me/zhengjie/config/DatasourceConfig.java  |  2 +-
 modules/eladmin-biz-system/pom.xml            |  6 ++--
 .../me/zhengjie/config/DatasourceConfig.java  |  2 +-
 pom.xml                                       | 31 +++++++++++++++++--
 9 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/eladmin-base/pom.xml b/eladmin-base/pom.xml
index f80ac6f9..f0b0ec7e 100644
--- a/eladmin-base/pom.xml
+++ b/eladmin-base/pom.xml
@@ -11,6 +11,7 @@
 
     <artifactId>eladmin-base</artifactId>
     <name>核心模块</name>
+    <packaging>war</packaging>
 
     <properties>
         <jjwt.version>0.11.5</jjwt.version>
@@ -20,9 +21,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.alipay.sofa.serverless</groupId>
-            <artifactId>sofa-serverless-base-starter</artifactId>
-            <version>${sofa.serverless.version}</version>
+            <groupId>com.alipay.sofa.koupleless</groupId>
+            <artifactId>koupleless-base-starter</artifactId>
+            <version>${koupleless.runtime.version}</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>com.alipay.sofa</groupId>-->
@@ -102,6 +103,12 @@
             <artifactId>oshi-core</artifactId>
             <version>6.1.4</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-core</artifactId>
+            <version>9.0.85</version>
+        </dependency>
     </dependencies>
 
     <!-- 打包 -->
diff --git a/eladmin-base/src/main/java/me/zhengjie/BaseAppRun.java b/eladmin-base/src/main/java/me/zhengjie/BaseAppRun.java
index aa8b6585..057ab5b4 100644
--- a/eladmin-base/src/main/java/me/zhengjie/BaseAppRun.java
+++ b/eladmin-base/src/main/java/me/zhengjie/BaseAppRun.java
@@ -32,7 +32,9 @@ import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpoi
 import org.springframework.boot.actuate.endpoint.web.annotation.ServletEndpointsSupplier;
 import org.springframework.boot.actuate.endpoint.web.servlet.WebMvcEndpointHandlerMapping;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.context.ApplicationPidFileWriter;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
@@ -58,7 +60,7 @@ import java.util.List;
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableJpaAuditing(auditorAwareRef = "auditorAware")
-public class BaseAppRun {
+public class BaseAppRun extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication springApplication = new SpringApplication(BaseAppRun.class);
@@ -113,4 +115,9 @@ public class BaseAppRun {
                 (StringUtils.hasText(basePath) ||
                         ManagementPortType.get(environment).equals(ManagementPortType.DIFFERENT));
     }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(BaseAppRun.class);
+    }
 }
diff --git a/modules/eladmin-biz-mng/pom.xml b/modules/eladmin-biz-mng/pom.xml
index 53cce5c7..72d78d14 100644
--- a/modules/eladmin-biz-mng/pom.xml
+++ b/modules/eladmin-biz-mng/pom.xml
@@ -89,9 +89,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alipay.sofa.serverless</groupId>
-            <artifactId>sofa-serverless-app-starter</artifactId>
-            <version>${sofa.serverless.version}</version>
+            <groupId>com.alipay.sofa.koupleless</groupId>
+            <artifactId>koupleless-app-starter</artifactId>
+            <version>${koupleless.runtime.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/eladmin-biz-mng/src/main/java/me/zhengjie/config/DatasourceConfig.java b/modules/eladmin-biz-mng/src/main/java/me/zhengjie/config/DatasourceConfig.java
index 21e8ee86..4097a10c 100644
--- a/modules/eladmin-biz-mng/src/main/java/me/zhengjie/config/DatasourceConfig.java
+++ b/modules/eladmin-biz-mng/src/main/java/me/zhengjie/config/DatasourceConfig.java
@@ -1,6 +1,6 @@
 package me.zhengjie.config;
 
-import com.alipay.sofa.serverless.common.api.SpringBeanFinder;
+import com.alipay.sofa.koupleless.common.api.SpringBeanFinder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/modules/eladmin-biz-quartz/pom.xml b/modules/eladmin-biz-quartz/pom.xml
index 62713e18..247bf23f 100644
--- a/modules/eladmin-biz-quartz/pom.xml
+++ b/modules/eladmin-biz-quartz/pom.xml
@@ -89,9 +89,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alipay.sofa.serverless</groupId>
-            <artifactId>sofa-serverless-app-starter</artifactId>
-            <version>${sofa.serverless.version}</version>
+            <groupId>com.alipay.sofa.koupleless</groupId>
+            <artifactId>koupleless-app-starter</artifactId>
+            <version>${koupleless.runtime.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/eladmin-biz-quartz/src/main/java/me/zhengjie/config/DatasourceConfig.java b/modules/eladmin-biz-quartz/src/main/java/me/zhengjie/config/DatasourceConfig.java
index 21e8ee86..4097a10c 100644
--- a/modules/eladmin-biz-quartz/src/main/java/me/zhengjie/config/DatasourceConfig.java
+++ b/modules/eladmin-biz-quartz/src/main/java/me/zhengjie/config/DatasourceConfig.java
@@ -1,6 +1,6 @@
 package me.zhengjie.config;
 
-import com.alipay.sofa.serverless.common.api.SpringBeanFinder;
+import com.alipay.sofa.koupleless.common.api.SpringBeanFinder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/modules/eladmin-biz-system/pom.xml b/modules/eladmin-biz-system/pom.xml
index b685a43e..a6406be3 100644
--- a/modules/eladmin-biz-system/pom.xml
+++ b/modules/eladmin-biz-system/pom.xml
@@ -89,9 +89,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.alipay.sofa.serverless</groupId>
-            <artifactId>sofa-serverless-app-starter</artifactId>
-            <version>${sofa.serverless.version}</version>
+            <groupId>com.alipay.sofa.koupleless</groupId>
+            <artifactId>koupleless-app-starter</artifactId>
+            <version>${koupleless.runtime.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/modules/eladmin-biz-system/src/main/java/me/zhengjie/config/DatasourceConfig.java b/modules/eladmin-biz-system/src/main/java/me/zhengjie/config/DatasourceConfig.java
index 21e8ee86..4097a10c 100644
--- a/modules/eladmin-biz-system/src/main/java/me/zhengjie/config/DatasourceConfig.java
+++ b/modules/eladmin-biz-system/src/main/java/me/zhengjie/config/DatasourceConfig.java
@@ -1,6 +1,6 @@
 package me.zhengjie.config;
 
-import com.alipay.sofa.serverless.common.api.SpringBeanFinder;
+import com.alipay.sofa.koupleless.common.api.SpringBeanFinder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/pom.xml b/pom.xml
index 6d91361d..9921f14b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,8 @@
         <druid.version>1.2.8</druid.version>
         <commons-pool2.version>2.11.1</commons-pool2.version>
         <mapstruct.version>1.4.2.Final</mapstruct.version>
-        <sofa.ark.version>2.2.5</sofa.ark.version>
-        <sofa.serverless.version>0.5.5</sofa.serverless.version>
+        <sofa.ark.version>2.2.9</sofa.ark.version>
+        <koupleless.runtime.version>1.2.0-SNAPSHOT</koupleless.runtime.version>
     </properties>
 
     <dependencies>
@@ -208,6 +208,33 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <id>ark-snapshot</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </repository>
+            </repositories>
+            <pluginRepositories>
+                <pluginRepository>
+                    <snapshots>
+                        <enabled>true</enabled>
+                    </snapshots>
+                    <id>ark-snapshot</id>
+                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+                </pluginRepository>
+            </pluginRepositories>
+        </profile>
+    </profiles>
+
     <repositories>
         <repository>
             <id>public</id>