Ver código fonte

【优化】 优化配置

linfutong 3 anos atrás
pai
commit
06bd905837

+ 0 - 1
zd-api/pom.xml

@@ -12,7 +12,6 @@
     <description>api接口</description>
 
     <modules>
-        <module>zd-api-system</module><!--整合完成之后要处理掉-->
         <module>zd-system-api</module>
         <module>zd-base-api</module>
         <module>zd-laboratory-api</module>

+ 0 - 9
zd-common/pom.xml

@@ -12,17 +12,8 @@
     <description>通用模块</description>
 
     <modules>
-        <module>zd-common-log</module>
-        <module>zd-common-core</module>
-        <module>zd-common-redis</module>
-        <module>zd-common-swagger</module>
-        <module>zd-common-security</module>
-        <module>zd-common-datascope</module>
-	    <module>zd-common-datasource</module>
-        <module>zd-common-mqtt</module>
         <module>common-core</module>
         <module>common-mqtt</module>
         <module>common-swagger</module>
     </modules>
-
 </project>

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

@@ -23,7 +23,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 @EnableRyFeignClients
 @SpringBootApplication(scanBasePackages = Constants.BASE_PACKAGE)
 @EnableConfigurationProperties({MqttProperties.class, AlgorithmYml.class, FireProperties.class})
-@Slf4j
 public class AlgorithmApplication {
 
     private static String[] args;

+ 3 - 2
zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/ZdBottleApplication.java

@@ -2,6 +2,8 @@ package com.zd.bottle;
 
 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.Constants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
@@ -22,7 +24,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @Slf4j
 public class ZdBottleApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ZdBottleApplication.class, args);
-        log.info("(♥◠‿◠)ノ゙  气瓶模块启动成功   ლ(´ڡ`ლ)゙");
+        ZdStartApplication.run(ApplicationConstants.BOTTLE_SERVICE, ZdBottleApplication.class, args);
     }
 }

+ 1 - 27
zd-modules/zd-bottle-parent/zd-bottle/src/main/resources/bootstrap.yml

@@ -1,32 +1,6 @@
 # Tomcat
 server:
-  port: 9401
-# Spring
-#logging:
-#  level:
-#    root: debug
-spring:
-  application:
-    # 应用名称
-    name: zd-bottle
-  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}
+  port: ${service.port.airbottle}
 
 # mybatis配置
 mybatis-plus: