Prechádzať zdrojové kódy

【优化】 app模块优化启动验证,已处理ok

linfutong 3 rokov pred
rodič
commit
f9407b1dbc

+ 0 - 4
zd-common/zd-common-resultdata/src/main/resources/META-INF/spring.factories

@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.zd.common.response.ResponseAdvice
-
-  

+ 5 - 0
zd-model/src/main/java/com/zd/model/constant/ApplicationConstants.java

@@ -61,4 +61,9 @@ public interface ApplicationConstants {
      */
     String BOTTLE_SERVICE = "zd-bottle";
 
+    /**
+     * 小程序服务
+     */
+    String APP_SERVICE = "zd-app";
+
 }

+ 12 - 18
zd-modules/zd-modules-app/pom.xml

@@ -12,10 +12,6 @@
     <packaging>jar</packaging>
     <description>小程序服务</description>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
     <dependencies>
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
@@ -41,26 +37,25 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-        <!-- Swagger UI -->
-        <!--<dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>-->
-
         <!-- zd Common Swagger -->
         <dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-swagger</artifactId>
+            <groupId>com.zd.swagger</groupId>
+            <artifactId>common-swagger</artifactId>
         </dependency>
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-security</artifactId>
-        </dependency>-->
 
         <dependency>
             <groupId>com.zd.core</groupId>
             <artifactId>common-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.baomidou</groupId>
+                    <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>poi-ooxml-schemas</artifactId>
+                    <groupId>org.apache.poi</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -77,7 +72,6 @@
             <groupId>com.zd.system</groupId>
             <artifactId>zd-system-api</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

+ 8 - 3
zd-modules/zd-modules-app/src/main/java/com/zd/app/ZdAppApplication.java

@@ -1,10 +1,15 @@
 package com.zd.app;
 
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import com.zd.common.core.annotation.EnableCustomConfig;
 import com.zd.common.core.annotation.EnableRyFeignClients;
+import com.zd.common.core.launch.ZdStartApplication;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.constant.BaseConstants;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
 
 /**
  * 小程序web层
@@ -13,10 +18,10 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  */
 @EnableCustomConfig
 @EnableRyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, DynamicDataSourceAutoConfiguration.class})
+@ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 public class ZdAppApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ZdAppApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  小程序启动成功   ლ(´ڡ`ლ)゙");
+        ZdStartApplication.run(ApplicationConstants.APP_SERVICE, ZdAppApplication.class, args);
     }
 }

+ 1 - 22
zd-modules/zd-modules-app/src/main/resources/bootstrap.yml

@@ -1,25 +1,4 @@
 # Tomcat
 server:
-  port: 9219
+  port: ${service.port.app}
 
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: zd-app
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-      config:
-        # 配置中心地址
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}