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 @@ eladmin-base 核心模块 + war 0.11.5 @@ -20,9 +21,9 @@ - com.alipay.sofa.serverless - sofa-serverless-base-starter - ${sofa.serverless.version} + com.alipay.sofa.koupleless + koupleless-base-starter + ${koupleless.runtime.version} @@ -102,6 +103,12 @@ oshi-core 6.1.4 + + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.85 + 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 @@ - com.alipay.sofa.serverless - sofa-serverless-app-starter - ${sofa.serverless.version} + com.alipay.sofa.koupleless + koupleless-app-starter + ${koupleless.runtime.version} 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 @@ - com.alipay.sofa.serverless - sofa-serverless-app-starter - ${sofa.serverless.version} + com.alipay.sofa.koupleless + koupleless-app-starter + ${koupleless.runtime.version} 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 @@ - com.alipay.sofa.serverless - sofa-serverless-app-starter - ${sofa.serverless.version} + com.alipay.sofa.koupleless + koupleless-app-starter + ${koupleless.runtime.version} 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 @@ 1.2.8 2.11.1 1.4.2.Final - 2.2.5 - 0.5.5 + 2.2.9 + 1.2.0-SNAPSHOT @@ -208,6 +208,33 @@ + + + default + + true + + + + + true + + ark-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + + + + + true + + ark-snapshot + https://oss.sonatype.org/content/repositories/snapshots + + + + + public