From a7e3d7dc785eafd9880af71c30ce59cc6e2fe6e9 Mon Sep 17 00:00:00 2001
From: 王明元 <97082371@qq.com>
Date: Fri, 30 Sep 2022 16:50:51 +0800
Subject: [PATCH] 2022年9月30日16:50:40 修改配置文件

---
 fw-dalaran-server/pom.xml                                  | 6 ++++++
 fw-dalaran-server/src/main/resources/application-local.yml | 5 +++++
 fw-dalaran-server/src/main/resources/application-prd.yml   | 1 +
 fw-dalaran-server/src/main/resources/application.yml       | 3 ---
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/fw-dalaran-server/pom.xml b/fw-dalaran-server/pom.xml
index ff046d0..5b45c49 100644
--- a/fw-dalaran-server/pom.xml
+++ b/fw-dalaran-server/pom.xml
@@ -205,6 +205,12 @@
             </properties>
         </profile>
         <profile>
+            <id>local</id>
+            <properties>
+                <activatedProfiles>local</activatedProfiles>
+            </properties>
+        </profile>
+        <profile>
             <id>test</id>
             <properties>
                 <activatedProfiles>test</activatedProfiles>
diff --git a/fw-dalaran-server/src/main/resources/application-local.yml b/fw-dalaran-server/src/main/resources/application-local.yml
index f3d0979..07a2061 100644
--- a/fw-dalaran-server/src/main/resources/application-local.yml
+++ b/fw-dalaran-server/src/main/resources/application-local.yml
@@ -21,5 +21,10 @@ rocketmq:
   producer-group: ${spring.application.name}
 task:
   switch: 'off'
+jedis:
+  pool:
+    host: 172.26.154.169
+    pwd: fw@test@redis
+    port: 6378
 
 file-server-addr: 'http://testgate.feewee.cn/file/show?fid='
diff --git a/fw-dalaran-server/src/main/resources/application-prd.yml b/fw-dalaran-server/src/main/resources/application-prd.yml
index 55352fb..3c3e59f 100644
--- a/fw-dalaran-server/src/main/resources/application-prd.yml
+++ b/fw-dalaran-server/src/main/resources/application-prd.yml
@@ -13,6 +13,7 @@ spring:
     password: Feewee_Data2_Root123
   redis:
     host: 192.168.0.101
+    port: 6379
   url:
     http-file-url: https://gate.feewee.cn/file
 
diff --git a/fw-dalaran-server/src/main/resources/application.yml b/fw-dalaran-server/src/main/resources/application.yml
index 8c03126..23d5bf3 100644
--- a/fw-dalaran-server/src/main/resources/application.yml
+++ b/fw-dalaran-server/src/main/resources/application.yml
@@ -8,7 +8,6 @@ spring:
       key-prefix: 'dalaran:locker'
     custom:
       global-prefix: 'dalaran'
-
   cloud:
     nacos:
       discovery:
@@ -34,7 +33,6 @@ spring:
     active: cache,${activatedProfiles}
   redis:
     host: 172.26.154.169
-    port: 6378
     lettuce:
       pool:
         max-active: 20
@@ -84,7 +82,6 @@ jedis:
       test-on-return: false
       test-while-idle: true
     host: 172.26.154.169
-    port: 6378
     db: 4
 mybatis-plus:
   configuration:
--
libgit2 0.22.2