Commit 6d1d5a6d4bae067621d115aa322e20ac10a34c57

Authored by 孙宁海
2 parents 5e362ea2 863b0e62

Merge branch 'master' into 'master'

gateway 集成redis



See merge request !26
Showing 1 changed file with 33 additions and 28 deletions
gateway.yml
... ... @@ -7,16 +7,7 @@ spring:
7 7 config:
8 8 discovery:
9 9 enabled: true
10   -
11   -endpoints:
12   - restart:
13   - enabled: true
14   - shutdown:
15   - enabled: true
16   - health:
17   - sensitive: false
18   -
19   -redis:
  10 + redis:
20 11 database: 0
21 12 host: redis-server
22 13 port: 6379
... ... @@ -30,6 +21,16 @@ redis:
30 21 master: mymaster1
31 22 nodes: redis-server:16379,redis-server:16379
32 23  
  24 +endpoints:
  25 + restart:
  26 + enabled: true
  27 + shutdown:
  28 + enabled: true
  29 + health:
  30 + sensitive: false
  31 +
  32 +
  33 +
33 34 zuul:
34 35 host:
35 36 connect-timeout-millis: 10000
... ... @@ -110,15 +111,7 @@ spring:
110 111 discovery:
111 112 enabled: true
112 113  
113   -endpoints:
114   - restart:
115   - enabled: true
116   - shutdown:
117   - enabled: true
118   - health:
119   - sensitive: false
120   -
121   -redis:
  114 + redis:
122 115 database: 0
123 116 host: redis-server
124 117 port: 6379
... ... @@ -132,6 +125,16 @@ redis:
132 125 master: mymaster1
133 126 nodes: redis-server:16379,redis-server:16379
134 127  
  128 +endpoints:
  129 + restart:
  130 + enabled: true
  131 + shutdown:
  132 + enabled: true
  133 + health:
  134 + sensitive: false
  135 +
  136 +
  137 +
135 138 zuul:
136 139 routes:
137 140 users:
... ... @@ -200,15 +203,7 @@ spring:
200 203 discovery:
201 204 enabled: true
202 205  
203   -endpoints:
204   - restart:
205   - enabled: true
206   - shutdown:
207   - enabled: true
208   - health:
209   - sensitive: false
210   -
211   -redis:
  206 + redis:
212 207 database: 0
213 208 host: redis1
214 209 port: 6379
... ... @@ -222,6 +217,16 @@ redis:
222 217 master: mymaster1
223 218 nodes: redis1:16379,redis2:16379
224 219  
  220 +endpoints:
  221 + restart:
  222 + enabled: true
  223 + shutdown:
  224 + enabled: true
  225 + health:
  226 + sensitive: false
  227 +
  228 +
  229 +
225 230 zuul:
226 231 routes:
227 232 users:
... ...