Selaa lähdekoodia

修改启动环境变量

Qutong 4 vuotta sitten
vanhempi
commit
01efef2c3d

+ 3 - 0
.gitignore

@@ -60,3 +60,6 @@ gen_code
 
 ### node ###
 node_modules
+
+### oneself ###
+.idea/

+ 2 - 0
hnqz-auth/src/main/resources/bootstrap.yml

@@ -8,9 +8,11 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

+ 2 - 0
hnqz-gateway/src/main/resources/bootstrap.yml

@@ -8,9 +8,11 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

+ 2 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/bootstrap.yml

@@ -8,9 +8,11 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   autoconfigure:

+ 2 - 0
hnqz-visual/hnqz-daemon-quartz/src/main/resources/bootstrap.yml

@@ -11,9 +11,11 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:hnqz-register}:${NACOS_PORT:8848}
+        namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yml
+        namespace: @profiles.namespace@
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
   profiles:

+ 3 - 1
hnqz-visual/hnqz-oa-platform/hnqz-oa-platform.iml

@@ -9,7 +9,9 @@
     <facet type="jpa" name="JPA">
       <configuration>
         <setting name="validation-enabled" value="true" />
-        <datasource-mapping />
+        <datasource-mapping>
+          <factory-entry name="hnqz-oa-platform" />
+        </datasource-mapping>
         <naming-strategy-map />
       </configuration>
     </facet>

+ 4 - 0
pom.xml

@@ -266,22 +266,26 @@
 			<properties>
 				<!-- 环境标识,需要与配置文件的名称相对应 -->
 				<profiles.active>dev</profiles.active>
+				<profiles.namespace>639c1543-7221-46c9-a3ab-8993a6c44b19</profiles.namespace>
 			</properties>
 			<activation>
 				<!-- 默认环境 -->
 				<activeByDefault>true</activeByDefault>
+				<profiles.namespace>842ded71-0bc3-41fe-8a64-460c9d091fdc</profiles.namespace>
 			</activation>
 		</profile>
 		<profile>
 			<id>test</id>
 			<properties>
 				<profiles.active>test</profiles.active>
+				<profiles.namespace>dad4fedb-3a24-4560-b6cf-d9aafa3adc71</profiles.namespace>
 			</properties>
 		</profile>
 		<profile>
 			<id>prod</id>
 			<properties>
 				<profiles.active>prod</profiles.active>
+				<profiles.namespace>e2658ecc-4abf-418e-bd91-6e8366fd0912</profiles.namespace>
 			</properties>
 		</profile>
 	</profiles>