浏览代码

重写启动类调试

linfutong 3 年之前
父节点
当前提交
bea3050282

+ 7 - 6
zd-auth/src/main/java/com/zd/auth/ZdAuthApplication.java

@@ -1,12 +1,12 @@
 package com.zd.auth;
 package com.zd.auth;
 
 
 import com.zd.common.core.annotation.EnableRyFeignClients;
 import com.zd.common.core.annotation.EnableRyFeignClients;
-import com.zd.common.core.redis.RedisConfig;
-import org.springframework.boot.SpringApplication;
+import com.zd.common.core.launch.ZdStartApplication;
+import com.zd.model.constant.ApplicationConstants;
+import com.zd.model.constant.BaseConstants;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Import;
 
 
 /**
 /**
  * 认证授权中心
  * 认证授权中心
@@ -14,11 +14,12 @@ import org.springframework.context.annotation.Import;
  * @author zd
  * @author zd
  */
  */
 @EnableRyFeignClients
 @EnableRyFeignClients
-@ComponentScan(basePackages = {"com.zd"})
+@ComponentScan(basePackages = BaseConstants.BASE_PACKAGE)
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class ZdAuthApplication {
 public class ZdAuthApplication {
     public static void main(String[] args) {
     public static void main(String[] args) {
-        SpringApplication.run(ZdAuthApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  认证授权中心启动成功   ლ(´ڡ`ლ)゙");
+        //SpringApplication.run(ZdAuthApplication.class, args);
+        //System.out.println("(♥◠‿◠)ノ゙  认证授权中心启动成功   ლ(´ڡ`ლ)゙");
+        ZdStartApplication.run(ApplicationConstants.AUTH_SERVICE, ZdAuthApplication.class, args);
     }
     }
 }
 }

+ 20 - 20
zd-auth/src/main/resources/bootstrap.yml

@@ -3,23 +3,23 @@ server:
   port: ${service.port.auth}
   port: ${service.port.auth}
 
 
 # Spring
 # Spring
-spring:
-  application:
-    # 应用名称
-    name: zd-auth
-  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}
+#spring:
+#  application:
+#    # 应用名称
+#    name: zd-auth
+#  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}

+ 2 - 2
zd-common/common-core/pom.xml

@@ -38,11 +38,11 @@
         </dependency>
         </dependency>
 
 
         <!-- Druid -->
         <!-- Druid -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.alibaba</groupId>
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
             <artifactId>druid-spring-boot-starter</artifactId>
             <version>${druid.version}</version>
             <version>${druid.version}</version>
-        </dependency>
+        </dependency>-->
 
 
         <dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <groupId>com.baomidou</groupId>

+ 1 - 1
zd-common/common-core/src/main/java/com/zd/common/core/launch/constant/LauncherConstant.java

@@ -22,7 +22,7 @@ public interface LauncherConstant {
 
 
 	String NACOS_DEV_NAMESPACE = "";
 	String NACOS_DEV_NAMESPACE = "";
 
 
-	String NACOS_TEST_NAMESPACE = "668645db-56eb-4f96-aa27-35fe8aff386d";
+	String NACOS_TEST_NAMESPACE = "430fc5e0-37a1-4b8f-9121-a191ce50b7f4";
 
 
 	String NACOS_PRO_NAMESPACE = "";
 	String NACOS_PRO_NAMESPACE = "";
 
 

+ 5 - 2
zd-gateway/src/main/java/com/zd/gateway/ZdGatewayApplication.java

@@ -1,5 +1,7 @@
 package com.zd.gateway;
 package com.zd.gateway;
 
 
+import com.zd.common.core.launch.ZdStartApplication;
+import com.zd.model.constant.ApplicationConstants;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
@@ -20,8 +22,9 @@ public class ZdGatewayApplication {
     static Logger logger = LoggerFactory.getLogger(ZdGatewayApplication.class);
     static Logger logger = LoggerFactory.getLogger(ZdGatewayApplication.class);
 
 
     public static void main(String[] args) {
     public static void main(String[] args) {
-        ConfigurableApplicationContext run = SpringApplication.run(ZdGatewayApplication.class, args);
-        System.out.println("(♥◠‿◠)ノ゙  云网关启动成功   ლ(´ڡ`ლ)゙");
+        //ConfigurableApplicationContext run = SpringApplication.run(ZdGatewayApplication.class, args);
+        ConfigurableApplicationContext run = ZdStartApplication.run(ApplicationConstants.GATEWAY_SERVICE, ZdGatewayApplication.class, args);
+        System.out.println("(♥◠‿◠)ノ゙  网关启动成功   ლ(´ڡ`ლ)゙");
 
 
         Environment env = run.getEnvironment();
         Environment env = run.getEnvironment();
         try {
         try {

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

@@ -4,27 +4,27 @@ server:
 
 
 # Spring
 # Spring
 spring:
 spring:
-  application:
-    # 应用名称
-    name: zd-gateway
-  profiles:
-    # 环境配置
-    active: dev
+#  application:
+#    # 应用名称
+#    name: zd-gateway
+#  profiles:
+#    # 环境配置
+#    active: dev
   main:
   main:
     allow-bean-definition-overriding: true
     allow-bean-definition-overriding: true
   cloud:
   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}
+#    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}
     sentinel:
     sentinel:
       # 取消控制台懒加载
       # 取消控制台懒加载
       eager: true
       eager: true

+ 6 - 1
zd-model/src/main/java/com/zd/model/constant/ApplicationConstants.java

@@ -7,11 +7,16 @@ package com.zd.model.constant;
  */
  */
 public interface ApplicationConstants {
 public interface ApplicationConstants {
     /**
     /**
-     * 认证服务的serviceid
+     * 认证服务
      */
      */
     String AUTH_SERVICE = "zd-auth";
     String AUTH_SERVICE = "zd-auth";
 
 
     /**
     /**
+     * 网关服务
+     */
+    String GATEWAY_SERVICE = "zd-gateway";
+
+    /**
      * 系统模块的serviceid
      * 系统模块的serviceid
      */
      */
     String SYSTEM_SERVICE = "zd-system";
     String SYSTEM_SERVICE = "zd-system";