Commit a9279b1376167ad0a0ae62c1d2dfc69138a12f28

Authored by 孙宁海
2 parents 356e2808 f14dbdce

Merge branch 'master' into 'master'

App 不经过cas 配置



See merge request !23
Showing 1 changed file with 15 additions and 3 deletions
gateway.yml
@@ -33,6 +33,10 @@ zuul: @@ -33,6 +33,10 @@ zuul:
33 path: /cxcy/** 33 path: /cxcy/**
34 #url: http://cxcy-service:16300 34 #url: http://cxcy-service:16300
35 serviceId: cxcy-service 35 serviceId: cxcy-service
  36 + appCxcy:
  37 + path: /app/cxcy/**
  38 + #url: http://cxcy-service:16300
  39 + serviceId: cxcy-service
36 40
37 hystrix: 41 hystrix:
38 command: 42 command:
@@ -76,7 +80,7 @@ cas: @@ -76,7 +80,7 @@ cas:
76 casServerUrlPrefix: https://cas.gaoxiaobang.com/ 80 casServerUrlPrefix: https://cas.gaoxiaobang.com/
77 casServerLoginUrl: https://cas.gaoxiaobang.com/login 81 casServerLoginUrl: https://cas.gaoxiaobang.com/login
78 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout 82 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
79 - ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health) 83 + ignorePattern: (^(/mvc/goto/)|^(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)|(/health)
80 84
81 tenant: 85 tenant:
82 tenantId: 991 86 tenantId: 991
@@ -112,6 +116,10 @@ zuul: @@ -112,6 +116,10 @@ zuul:
112 path: /cxcy/** 116 path: /cxcy/**
113 #url: http://cxcy-service:16300 117 #url: http://cxcy-service:16300
114 serviceId: cxcy-service 118 serviceId: cxcy-service
  119 + appCxcy:
  120 + path: /app/cxcy/**
  121 + #url: http://cxcy-service:16300
  122 + serviceId: cxcy-service
115 123
116 hystrix: 124 hystrix:
117 command: 125 command:
@@ -148,7 +156,7 @@ cas: @@ -148,7 +156,7 @@ cas:
148 casServerUrlPrefix: https://cas.gaoxiaobang.com/ 156 casServerUrlPrefix: https://cas.gaoxiaobang.com/
149 casServerLoginUrl: https://cas.gaoxiaobang.com/login 157 casServerLoginUrl: https://cas.gaoxiaobang.com/login
150 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout 158 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
151 - ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$) 159 + ignorePattern: (^(/mvc/goto/)|^(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)
152 160
153 tenant: 161 tenant:
154 tenantId: 991 162 tenantId: 991
@@ -184,6 +192,10 @@ zuul: @@ -184,6 +192,10 @@ zuul:
184 path: /cxcy/** 192 path: /cxcy/**
185 #url: http://cxcy-service:16300 193 #url: http://cxcy-service:16300
186 serviceId: cxcy-service 194 serviceId: cxcy-service
  195 + appCxcy:
  196 + path: /app/cxcy/**
  197 + #url: http://cxcy-service:16300
  198 + serviceId: cxcy-service
187 199
188 hystrix: 200 hystrix:
189 command: 201 command:
@@ -220,7 +232,7 @@ cas: @@ -220,7 +232,7 @@ cas:
220 casServerUrlPrefix: http://cas/ 232 casServerUrlPrefix: http://cas/
221 casServerLoginUrl: https://cas.gaoxiaobang.com/login 233 casServerLoginUrl: https://cas.gaoxiaobang.com/login
222 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout 234 casServerLogoutUrl: https://cas.gaoxiaobang.com/logout
223 - ignorePattern: (^(/mvc/goto/)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$) 235 + ignorePattern: (^(/mvc/goto/)|^(/app/cxcy)|(\.ico)|(/js)|(/image)|(/css)|(/fonts)|(/api)|(/downloadfile))|(.jsp$)
224 236
225 tenant: 237 tenant:
226 tenantId: 991 238 tenantId: 991
227 \ No newline at end of file 239 \ No newline at end of file