feat(ms-init): 完善config, gateway, business module中配置文件的问题 #174

zhonghuasheng · Dec 30, 2020 · d00d2c5 · d00d2c5
1 parent 63f2bc6
commit d00d2c5
Show file tree

Hide file tree

Showing 14 changed files with 24 additions and 13 deletions.
diff --git a/musicstore-springboot-vue/ms-platform/.idea/encodings.xml b/musicstore-springboot-vue/ms-platform/.idea/encodings.xml
diff --git a/...e/ms-platform/ms-business/ms-user/src/main/java/com/zhonghuasheng/ms/UserApplication.java b/...e/ms-platform/ms-business/ms-user/src/main/java/com/zhonghuasheng/ms/UserApplication.java
@@ -15,7 +15,7 @@ public class UserApplication {
 
     public static void main(String[] args) {
         YamlPropertiesFactoryBean yaml = new YamlPropertiesFactoryBean();
-        yaml.setResources(new ClassPathResource("application.yml"));
+        yaml.setResources(new ClassPathResource("bootstrap.yml"));
         Properties property = yaml.getObject();
         System.setProperty("SERVICE_NAME", property.getProperty("spring.application.name"));
         System.setProperty("FILE_PATH", property.getProperty("logging.file.path"));

diff --git a/...s-user/src/main/resources/application.yml → .../ms-user/src/main/resources/bootstrap.yml b/...s-user/src/main/resources/application.yml → .../ms-user/src/main/resources/bootstrap.yml
@@ -36,8 +36,10 @@ spring:
       time-between-log-stats-millis: 30000
   cloud:
     nacos:
+      config:
+        server-addr: ${ms.nacos.host}
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${ms.nacos.host}
 mybatis-plus:
   type-aliases-package: com.zhonghuasheng.ms.model
 logging:

diff --git a/musicstore-springboot-vue/ms-platform/ms-business/pom.xml b/musicstore-springboot-vue/ms-platform/ms-business/pom.xml
@@ -28,6 +28,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.zhonghuasheng</groupId>
+            <artifactId>ms-config</artifactId>
+        </dependency>
     </dependencies>
 
     <modules>

diff --git a/...cstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-dev.properties b/...cstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-dev.properties
@@ -0,0 +1 @@
+ms.env.name=dev
diff --git a/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-dev.yml b/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-dev.yml
diff --git a/...store-springboot-vue/ms-platform/ms-config/src/main/resources/application-prod.properties b/...store-springboot-vue/ms-platform/ms-config/src/main/resources/application-prod.properties
@@ -0,0 +1 @@
+ms.env.name=prod
diff --git a/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-prod.yml b/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application-prod.yml
diff --git a/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application.properties b/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.profiles.active=dev
diff --git a/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application.yml b/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/application.yml
diff --git a/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/bootstrap.properties b/musicstore-springboot-vue/ms-platform/ms-config/src/main/resources/bootstrap.properties
@@ -0,0 +1 @@
+ms.nacos.host=192.168.88.127:8848
diff --git a/musicstore-springboot-vue/ms-platform/ms-gateway/pom.xml b/musicstore-springboot-vue/ms-platform/ms-gateway/pom.xml
@@ -49,5 +49,9 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
             <version>2.2.3.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>com.zhonghuasheng</groupId>
+            <artifactId>ms-config</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...oot-vue/ms-platform/ms-gateway/src/main/java/com/zhonghuasheng/ms/GatewayApplication.java b/...oot-vue/ms-platform/ms-gateway/src/main/java/com/zhonghuasheng/ms/GatewayApplication.java
@@ -14,7 +14,7 @@ public class GatewayApplication {
 
     public static void main(String[] args) {
         YamlPropertiesFactoryBean yaml = new YamlPropertiesFactoryBean();
-        yaml.setResources(new ClassPathResource("application.yml"));
+        yaml.setResources(new ClassPathResource("bootstrap.yml"));
         Properties property = yaml.getObject();
         System.setProperty("SERVICE_NAME", property.getProperty("spring.application.name"));
         System.setProperty("FILE_PATH", property.getProperty("logging.file.path"));

diff --git a/...ateway/src/main/resources/application.yml → ...-gateway/src/main/resources/bootstrap.yml b/...ateway/src/main/resources/application.yml → ...-gateway/src/main/resources/bootstrap.yml
@@ -1,12 +1,16 @@
 server:
   port: 8888
+# nacos是优先启动的，properties配置优先于yml，故我在config中配置了bootstrap.properties中。同时gateway的配置文件也改为比config的application-x
+# 优先级高的bootstrap.yml否则，config中的application-x.properties优先启动，然而那里面没有配置nacos的信息，导致前面会报错
 spring:
   application:
     name: ms-gateway
   cloud:
     nacos:
+      config:
+        server-addr: ${ms.nacos.host}
       discovery:
-        server-addr: localhost:8848
+        server-addr: ${ms.nacos.host}
     gateway:
       discovery:
         locator: