Commit a7e3d7dc785eafd9880af71c30ce59cc6e2fe6e9
1 parent
c1d24468
2022年9月30日16:50:40 修改配置文件
Showing
4 changed files
with
12 additions
and
3 deletions
fw-dalaran-server/pom.xml
@@ -205,6 +205,12 @@ | @@ -205,6 +205,12 @@ | ||
205 | </properties> | 205 | </properties> |
206 | </profile> | 206 | </profile> |
207 | <profile> | 207 | <profile> |
208 | + <id>local</id> | ||
209 | + <properties> | ||
210 | + <activatedProfiles>local</activatedProfiles> | ||
211 | + </properties> | ||
212 | + </profile> | ||
213 | + <profile> | ||
208 | <id>test</id> | 214 | <id>test</id> |
209 | <properties> | 215 | <properties> |
210 | <activatedProfiles>test</activatedProfiles> | 216 | <activatedProfiles>test</activatedProfiles> |
fw-dalaran-server/src/main/resources/application-local.yml
@@ -21,5 +21,10 @@ rocketmq: | @@ -21,5 +21,10 @@ rocketmq: | ||
21 | producer-group: ${spring.application.name} | 21 | producer-group: ${spring.application.name} |
22 | task: | 22 | task: |
23 | switch: 'off' | 23 | switch: 'off' |
24 | +jedis: | ||
25 | + pool: | ||
26 | + host: 172.26.154.169 | ||
27 | + pwd: fw@test@redis | ||
28 | + port: 6378 | ||
24 | 29 | ||
25 | file-server-addr: 'http://testgate.feewee.cn/file/show?fid=' | 30 | file-server-addr: 'http://testgate.feewee.cn/file/show?fid=' |
fw-dalaran-server/src/main/resources/application-prd.yml
@@ -13,6 +13,7 @@ spring: | @@ -13,6 +13,7 @@ spring: | ||
13 | password: Feewee_Data2_Root123 | 13 | password: Feewee_Data2_Root123 |
14 | redis: | 14 | redis: |
15 | host: 192.168.0.101 | 15 | host: 192.168.0.101 |
16 | + port: 6379 | ||
16 | url: | 17 | url: |
17 | http-file-url: https://gate.feewee.cn/file | 18 | http-file-url: https://gate.feewee.cn/file |
18 | 19 |
fw-dalaran-server/src/main/resources/application.yml
@@ -8,7 +8,6 @@ spring: | @@ -8,7 +8,6 @@ spring: | ||
8 | key-prefix: 'dalaran:locker' | 8 | key-prefix: 'dalaran:locker' |
9 | custom: | 9 | custom: |
10 | global-prefix: 'dalaran' | 10 | global-prefix: 'dalaran' |
11 | - | ||
12 | cloud: | 11 | cloud: |
13 | nacos: | 12 | nacos: |
14 | discovery: | 13 | discovery: |
@@ -34,7 +33,6 @@ spring: | @@ -34,7 +33,6 @@ spring: | ||
34 | active: cache,${activatedProfiles} | 33 | active: cache,${activatedProfiles} |
35 | redis: | 34 | redis: |
36 | host: 172.26.154.169 | 35 | host: 172.26.154.169 |
37 | - port: 6378 | ||
38 | lettuce: | 36 | lettuce: |
39 | pool: | 37 | pool: |
40 | max-active: 20 | 38 | max-active: 20 |
@@ -84,7 +82,6 @@ jedis: | @@ -84,7 +82,6 @@ jedis: | ||
84 | test-on-return: false | 82 | test-on-return: false |
85 | test-while-idle: true | 83 | test-while-idle: true |
86 | host: 172.26.154.169 | 84 | host: 172.26.154.169 |
87 | - port: 6378 | ||
88 | db: 4 | 85 | db: 4 |
89 | mybatis-plus: | 86 | mybatis-plus: |
90 | configuration: | 87 | configuration: |