From 86dd6e96379fe522f42014c782817147540a97bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B1=E9=A3=9E=E4=BA=91?= <1941783199@qq.com>
Date: Fri, 23 Oct 2020 18:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dq-financial-crms/pom.xml                     |  8 ++-
 .../src/main/resources/bootstrap.properties   | 52 +++++++++----------
 dq-financial-hrms/pom.xml                     | 16 +++---
 3 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/dq-financial-crms/pom.xml b/dq-financial-crms/pom.xml
index 0c878f17..03108c82 100644
--- a/dq-financial-crms/pom.xml
+++ b/dq-financial-crms/pom.xml
@@ -21,17 +21,21 @@
 
     <dependencies>
 
-        <dependency>
+<!--        <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-hrms-auth</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/dq-financial-crms/src/main/resources/bootstrap.properties b/dq-financial-crms/src/main/resources/bootstrap.properties
index 496d126e..7c6afdbc 100644
--- a/dq-financial-crms/src/main/resources/bootstrap.properties
+++ b/dq-financial-crms/src/main/resources/bootstrap.properties
@@ -1,39 +1,39 @@
 # 开发和测试环境（dev）
 #服务名称
-spring.application.name=dq-financial-crms
-#配置中心地址
-spring.cloud.nacos.config.server-addr=192.168.31.142:8848
-spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
-#spring.cloud.nacos.config.group=prod
-
-spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-spring.cloud.nacos.config.ext-config[0].group=dev
-spring.cloud.nacos.config.ext-config[0].refresh=true
-
-spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-spring.cloud.nacos.config.ext-config[1].group=dev
-spring.cloud.nacos.config.ext-config[1].refresh=true
-
-spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-spring.cloud.nacos.config.ext-config[2].group=dev
-spring.cloud.nacos.config.ext-config[2].refresh=true
-
-# 正式环境（prod）
-#服务名称
 #spring.application.name=dq-financial-crms
 ##配置中心地址
-#spring.cloud.nacos.config.server-addr=120.78.127.12:8848
-#spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+#spring.cloud.nacos.config.server-addr=192.168.31.142:8848
+#spring.cloud.nacos.config.namespace=1f69d47e-0aeb-4a1e-8ab4-0e84dfb86354
 ##spring.cloud.nacos.config.group=prod
 #
 #spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
-#spring.cloud.nacos.config.ext-config[0].group=prod
+#spring.cloud.nacos.config.ext-config[0].group=dev
 #spring.cloud.nacos.config.ext-config[0].refresh=true
 #
 #spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
-#spring.cloud.nacos.config.ext-config[1].group=prod
+#spring.cloud.nacos.config.ext-config[1].group=dev
 #spring.cloud.nacos.config.ext-config[1].refresh=true
 #
 #spring.cloud.nacos.config.ext-config[2].data-id=other.yml
-#spring.cloud.nacos.config.ext-config[2].group=prod
-#spring.cloud.nacos.config.ext-config[2].refresh=true
\ No newline at end of file
+#spring.cloud.nacos.config.ext-config[2].group=dev
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+
+# 正式环境（prod）
+#服务名称
+spring.application.name=dq-financial-crms
+#配置中心地址
+spring.cloud.nacos.config.server-addr=120.78.127.12:8848
+spring.cloud.nacos.config.namespace=25ce05e2-a0eb-4842-92e4-d8b550a489dd
+#spring.cloud.nacos.config.group=prod
+
+spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml
+spring.cloud.nacos.config.ext-config[0].group=prod
+spring.cloud.nacos.config.ext-config[0].refresh=true
+
+spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml
+spring.cloud.nacos.config.ext-config[1].group=prod
+spring.cloud.nacos.config.ext-config[1].refresh=true
+
+spring.cloud.nacos.config.ext-config[2].data-id=other.yml
+spring.cloud.nacos.config.ext-config[2].group=prod
+spring.cloud.nacos.config.ext-config[2].refresh=true
\ No newline at end of file
diff --git a/dq-financial-hrms/pom.xml b/dq-financial-hrms/pom.xml
index 72ba0d37..c01409a1 100644
--- a/dq-financial-hrms/pom.xml
+++ b/dq-financial-hrms/pom.xml
@@ -20,27 +20,27 @@
     </properties>
 
     <dependencies>
-        <!--<dependency>
+        <dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-api</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
-        </dependency>-->
-        <!--<dependency>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>-->
-        <!--<dependency>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>-->
+        </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>com.daqing.financial</groupId>
             <artifactId>dq-financial-hrms-auth</artifactId>
             <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency>-->
 <!--        <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>