Skip to content

Commit

Permalink
Updated contexts and proxy so spring data links are correct when run …
Browse files Browse the repository at this point in the history
…through zuul proxy.

customers :9000/api/customers
stores :8081/api/stores
ui :9900/
ui proxy :9900/api/*
  • Loading branch information
spencergibb committed Nov 24, 2014
1 parent 0130bab commit 5f5f9ef
Show file tree
Hide file tree
Showing 16 changed files with 12 additions and 7 deletions.
4 changes: 2 additions & 2 deletions customers-stores-ui/app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ angular
])
.constant('appConfiguration', {
//e.g. http://myserver:9000/rest
customerApiUrl: window.location.protocol + '//' + window.location.host+'/proxy',
storeApiUrl: window.location.protocol + '//' + window.location.host+'/proxy'
customerApiUrl: window.location.protocol + '//' + window.location.host+'/api',
storeApiUrl: window.location.protocol + '//' + window.location.host+'/api'
})
.config(function () {

Expand Down
7 changes: 5 additions & 2 deletions customers-stores-ui/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
server.port: 9900
zuul.proxy.route.customers: /customers
zuul.proxy.route.stores: /stores
zuul.proxy.mapping: /api
zuul.proxy.stripMapping: false
zuul.proxy.addProxyHeaders: true
zuul.proxy.route.customers: /api/customers
zuul.proxy.route.stores: /api/stores
logging.level.com.netflix.discovery: OFF
logging.level.com.netflix.zuul: OFF
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed customers-stores-ui/dist/images/yeoman.5cff96e1.png
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion customers-stores-ui/dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
ga('create', 'UA-XXXXX-X');
ga('send', 'pageview');</script> <!--[if lt IE 9]>
<script src="scripts/oldieshim.ff90b0fb.js"></script>
<![endif]--> <script src="//maps.googleapis.com/maps/api/js?sensor=false"></script> <script src="scripts/vendor.3db9f926.js"></script> <script src="scripts/scripts.0b96fbf4.js"></script>
<![endif]--> <script src="//maps.googleapis.com/maps/api/js?sensor=false"></script> <script src="scripts/vendor.3db9f926.js"></script> <script src="scripts/scripts.8acd9242.js"></script>
1 change: 0 additions & 1 deletion customers-stores-ui/dist/scripts/scripts.0b96fbf4.js

This file was deleted.

1 change: 1 addition & 0 deletions customers-stores-ui/dist/scripts/scripts.8acd9242.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion customers-stores-ui/dist/styles/main.fc9417dd.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server:
port: 9000
context-path: /api

integration:
stores:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server:
port: 8081
context-path: /api

spring:
data:
Expand Down

0 comments on commit 5f5f9ef

Please sign in to comment.