启动类添加验证

zd-auth/src/main/java/com/zd/auth/ZdAuthApplication.java

@@ -18,6 +18,6 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class ZdAuthApplication {
     public static void main(String[] args) {
-        ZdStartApplication.run(ApplicationConstants.AUTH_SERVICE, Boolean.TRUE, ZdAuthApplication.class, args);
+        ZdStartApplication.run(ApplicationConstants.AUTH_SERVICE, ZdAuthApplication.class, args);
     }
 }

zd-common/common-core/src/main/java/com/zd/common/core/launch/ZdStartApplication.java

@@ -27,13 +27,12 @@ public class ZdStartApplication {
      * 运行服务
      *
      * @param appName -- 应用名
-     * @param isShareDataSource 是否共用数据库，ture-是，fasle-否
      * @param source
      * @param args
      * @return
      */
-    public static ConfigurableApplicationContext run(String appName, Boolean isShareDataSource, Class<?> source, String... args) {
-        SpringApplicationBuilder builder = createSpringApplicationBuilder(appName, isShareDataSource, source, args);
+    public static ConfigurableApplicationContext run(String appName, Class<?> source, String... args) {
+        SpringApplicationBuilder builder = createSpringApplicationBuilder(appName, source, args);
         return builder.run(args);
     }
 
@@ -41,12 +40,11 @@ public class ZdStartApplication {
      * 创建ApplicationBuilder
      *
      * @param appName -- 应用名
-     * @param isShareDataSource 是否共用数据库，ture-是，fasle-否
      * @param source
      * @param args
      * @return
      */
-    public static SpringApplicationBuilder createSpringApplicationBuilder(String appName, Boolean isShareDataSource, Class<?> source, String... args) {
+    public static SpringApplicationBuilder createSpringApplicationBuilder(String appName, Class<?> source, String... args) {
         Assert.hasText(appName, "[appName]服务名不能为空");
         ConfigurableEnvironment environment = new StandardEnvironment();
         MutablePropertySources propertySources = environment.getPropertySources();
@@ -67,10 +65,8 @@ public class ZdStartApplication {
             if (activeProfileList.size() != 1) {
                 throw new RuntimeException("同时存在环境变量:[" + StringUtils.arrayToCommaDelimitedString(activeProfiles) + "]");
             }
-
             profile = activeProfileList.get(0);
         }
-
         String startJarPath = Objects.requireNonNull(ZdStartApplication.class.getResource("/")).getPath().split("!")[0];
         String activePros = joinFun.apply(activeProfileList.toArray());
         System.out.printf("============ 启动中，读取到的环境变量:[%s]，jar地址:[%s]============ %n", activePros, startJarPath);
@@ -93,14 +89,10 @@ public class ZdStartApplication {
             props.setProperty("spring.cloud.nacos.discovery.namespace", nameSpace);
             props.setProperty("spring.cloud.nacos.config.namespace", nameSpace);
         }
-
-        String prefixName = (isShareDataSource == null || isShareDataSource)?LauncherConstant.NACOS_CONFIG_NAME:appName;
-        props.setProperty("spring.cloud.nacos.config.prefix", prefixName);
+        props.setProperty("spring.cloud.nacos.config.prefix", appName);
         props.setProperty("spring.cloud.nacos.config.file-extension", "yml");
         props.setProperty("spring.cloud.nacos.config.shared-configs", "application.yml");
-        //props.setProperty("spring.cloud.nacos.config.extension-configs[0].data-id", "application.yml");
-
-        log.info("============ nacos配置信息 addr:[{}], namespace:[{}]，prefixName:[{}] ===========", new Object[]{addr, nameSpace, prefixName});
+        log.info("============ nacos配置信息 addr:[{}], namespace:[{}] ===========", new Object[]{addr, nameSpace});
         return builder;
     }
 

zd-gateway/src/main/java/com/zd/gateway/ZdGatewayApplication.java

@@ -22,7 +22,7 @@ public class ZdGatewayApplication {
 
     public static void main(String[] args) {
         //ConfigurableApplicationContext run = SpringApplication.run(ZdGatewayApplication.class, args);
-        ConfigurableApplicationContext run = ZdStartApplication.run(ApplicationConstants.GATEWAY_SERVICE, null, ZdGatewayApplication.class, args);
+        ConfigurableApplicationContext run = ZdStartApplication.run(ApplicationConstants.GATEWAY_SERVICE, ZdGatewayApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  网关启动成功   ლ(´ڡ`ლ)ﾞ");
 
         Environment env = run.getEnvironment();

zd-gateway/src/main/resources/bootstrap.yml

@@ -1,4 +1,3 @@
-# Tomcat
 server:
   port: ${service.port.gateway}
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/AlgorithmApplication.java

@@ -32,6 +32,7 @@ public class AlgorithmApplication {
     private static ConfigurableApplicationContext context;
     public static void main(String[] args) {
         AlgorithmApplication.args=args;
+        //context = SpringApplication.run(AlgorithmApplication.class, args);
         context = SpringApplication.run(AlgorithmApplication.class, args);
     }
 

zd-modules/zd-algorithm/src/main/resources/bootstrap.yml

@@ -1,30 +1,7 @@
 # Tomcat
 server:
-  port: 9910
+  port: ${service.port.}
 
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: zd-algorithm
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-      # server-addr: 180.76.134.43:8848
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-      config:
-        # 配置中心地址
-        # server-addr: 180.76.134.43:8848
-        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}
 # mybatis配置
 mybatis:
   # 搜索指定包别名

zd-modules/zd-base/src/main/java/com/zd/base/BaseApplicaion.java

@@ -5,6 +5,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -15,10 +16,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableRyFeignClients
 @SpringBootApplication
 @EnableScheduling
-@ComponentScan(basePackages = {"com.zd"})
+@ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 @Slf4j
 public class BaseApplicaion {
     public static void main(String[] args) {
-        ZdStartApplication.run(ApplicationConstants.SYSTEM_SERVICE, Boolean.TRUE, BaseApplicaion.class, args);
+        ZdStartApplication.run(ApplicationConstants.BASE_SERVICE, BaseApplicaion.class, args);
     }
 }

zd-modules/zd-base/src/main/resources/bootstrap.yml

@@ -1,34 +1,25 @@
-# Tomcat
 server:
   port: ${service.port.base}
-# Spring
-#logging:
-#  level:
-#    root: debug
-spring:
-  application:
-    # 应用名称
-    name: zd-base
-  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
-        # 动态刷新
-        refresh-enabled: true
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
 
 
+spring:
+  freemarker:
+    request-context-attribute: request
+    #prefix: /templates/
+    suffix: .html
+    content-type: text/html
+    enabled: true
+    cache: false
+    charset: UTF-8
+    allow-request-override: false
+    expose-request-attributes: true
+    expose-session-attributes: true
+    expose-spring-macro-helpers: true
+  #日志
+  logging:
+    level:
+      root: info
+
 # mybatis配置
 mybatis:
   # 搜索指定包别名

zd-modules/zd-modules-laboratory/pom.xml

@@ -61,30 +61,6 @@
             <artifactId>common-core</artifactId>
         </dependency>
 
-        <!-- zd Common DataSource -->
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datasource</artifactId>
-        </dependency>-->
-
-        <!-- zd Common DataScope -->
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-datascope</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-webmvc</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>-->
-
-        <!-- zd Common Log -->
-        <!--<dependency>
-            <groupId>com.zd</groupId>
-            <artifactId>zd-common-log</artifactId>
-        </dependency>-->
-
         <!-- zd Common Swagger -->
         <dependency>
             <groupId>com.zd.swagger</groupId>
@@ -105,14 +81,6 @@
             <artifactId>spring-integration-mqtt</artifactId>
         </dependency>
 
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>-->
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>-->
         <dependency>
             <groupId>com.deepoove</groupId>
             <artifactId>poi-tl</artifactId>
@@ -124,17 +92,6 @@
             <artifactId>jsoup</artifactId>
             <version>1.8.3</version>
         </dependency>
-        <!--<dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>-->
 
         <dependency>
             <groupId>com.zd.base</groupId>

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/ZdLaboratoryApplication.java

@@ -22,6 +22,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class ZdLaboratoryApplication {
     public static void main(String[] args) {
         //SpringApplication.run(ZdLaboratoryApplication.class, args);
-        ZdStartApplication.run(ApplicationConstants.SYSTEM_SERVICE, Boolean.TRUE, ZdLaboratoryApplication.class, args);
+        ZdStartApplication.run(ApplicationConstants.LABORATORY_SERVICE, ZdLaboratoryApplication.class, args);
     }
 }

zd-modules/zd-modules-laboratory/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: ${service.port.auth}
+  port: ${service.port.laboratory}
 
 # mybatis配置
 mybatis:
@@ -12,4 +12,4 @@ mybatis:
 ##日志
 logging:
   level:
-    root: debug
+    root: info

zd-modules/zd-modules-system/src/main/java/com/zd/system/ZdSystemApplication.java

@@ -20,6 +20,6 @@ import org.springframework.context.annotation.ComponentScan;
 @ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 public class ZdSystemApplication {
     public static void main(String[] args) {
-        ZdStartApplication.run(ApplicationConstants.SYSTEM_SERVICE, Boolean.TRUE, ZdSystemApplication.class, args);
+        ZdStartApplication.run(ApplicationConstants.SYSTEM_SERVICE, ZdSystemApplication.class, args);
     }
 }