Skip to content
This repository was archived by the owner on Jun 29, 2018. It is now read-only.

Commit 8e2ce75

Browse files
joshistejoshiste
committed
Merge pull request #51 from joshiste/api-gateway
Zuul-Reverse-Proxy for registered applications and removal of CORS-stuff
2 parents 4302e92 + e52f6c7 commit 8e2ce75

22 files changed

Lines changed: 427 additions & 372 deletions

File tree

‎pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<spring-boot.version>1.2.2.RELEASE</spring-boot.version>
2727
<hazelcast.version>3.3.3</hazelcast.version>
2828
<commons-lang3.version>3.3.2</commons-lang3.version>
29+
<spring-cloud.version>1.0.0.RELEASE</spring-cloud.version>
2930

3031
<build-plugin.jacoco.version>0.7.3.201502191951</build-plugin.jacoco.version>
3132
<build-plugin.coveralls.version>3.0.1</build-plugin.coveralls.version>
@@ -220,6 +221,23 @@
220221
<artifactId>spring-boot-starter-web</artifactId>
221222
<version>${spring-boot.version}</version>
222223
</dependency>
224+
225+
<dependency>
226+
<groupId>org.springframework.cloud</groupId>
227+
<artifactId>spring-cloud-starter-zuul</artifactId>
228+
<version>${spring-cloud.version}</version>
229+
</dependency>
230+
<dependency>
231+
<groupId>org.springframework.cloud</groupId>
232+
<artifactId>spring-cloud-netflix-core</artifactId>
233+
<version>${spring-cloud.version}</version>
234+
</dependency>
235+
<dependency>
236+
<groupId>org.springframework.cloud</groupId>
237+
<artifactId>spring-cloud-commons</artifactId>
238+
<version>${spring-cloud.version}</version>
239+
</dependency>
240+
223241
<dependency>
224242
<groupId>org.apache.commons</groupId>
225243
<artifactId>commons-lang3</artifactId>
@@ -244,4 +262,13 @@
244262
</dependency>
245263
</dependencies>
246264
</dependencyManagement>
265+
<repositories>
266+
<repository>
267+
<id>spring-release</id>
268+
<snapshots>
269+
<enabled>false</enabled>
270+
</snapshots>
271+
<url>http://repo.spring.io/release</url>
272+
</repository>
273+
</repositories>
247274
</project>

‎spring-boot-admin-server-ui/app/js/service/application.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,31 +32,31 @@ module.exports = function ($resource, $http, $rootScope) {
3232
};
3333

3434
Application.prototype.getHealth = function () {
35-
return $http.get(this.url + '/health').error(new AuthInterceptor(this));
35+
return $http.get('api/applications/' + this.id + '/health').error(new AuthInterceptor(this));
3636
};
3737

3838
Application.prototype.getInfo = function () {
39-
return $http.get(this.url + '/info').error(new AuthInterceptor(this));
39+
return $http.get('api/applications/' + this.id + '/info').error(new AuthInterceptor(this));
4040
};
4141

4242
Application.prototype.getMetrics = function () {
43-
return $http.get(this.url + '/metrics').error(new AuthInterceptor(this));
43+
return $http.get('api/applications/' + this.id + '/metrics').error(new AuthInterceptor(this));
4444
};
4545

4646
Application.prototype.getEnv = function () {
47-
return $http.get(this.url + '/env').error(new AuthInterceptor(this));
47+
return $http.get('api/applications/' + this.id + '/env').error(new AuthInterceptor(this));
4848
};
4949

5050
Application.prototype.getThreadDump = function () {
51-
return $http.get(this.url + '/dump').error(new AuthInterceptor(this));
51+
return $http.get('api/applications/' + this.id + '/dump').error(new AuthInterceptor(this));
5252
};
5353

5454
Application.prototype.getTraces = function () {
55-
return $http.get(this.url + '/trace').error(new AuthInterceptor(this));
55+
return $http.get('api/applications/' + this.id + '/trace').error(new AuthInterceptor(this));
5656
};
5757

5858
Application.prototype.hasLogfile = function () {
59-
return $http.head(this.url + '/logfile').error(new AuthInterceptor(this));
59+
return $http.head('api/applications/' + this.id + '/logfile').error(new AuthInterceptor(this));
6060
};
6161

6262
return Application;

‎spring-boot-admin-server-ui/app/js/service/applicationJmx.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
module.exports = function ($rootScope, Abbreviator, jolokia) {
1919
this.list = function (app) {
20-
return jolokia.list(app.url + '/jolokia/')
20+
return jolokia.list('/api/applications/' + app.id + '/jolokia/')
2121
.then(function (response) {
2222
var domains = [];
2323
for (var rDomainName in response.value) {
@@ -81,14 +81,14 @@ module.exports = function ($rootScope, Abbreviator, jolokia) {
8181
};
8282

8383
this.readAllAttr = function (app, bean) {
84-
return jolokia.read(app.url + '/jolokia/', bean.id);
84+
return jolokia.read('/api/applications/' + app.id + '/jolokia/', bean.id);
8585
};
8686

8787
this.writeAttr = function (app, bean, attr, val) {
88-
return jolokia.writeAttr(app.url + '/jolokia/', bean.id, attr, val);
88+
return jolokia.writeAttr('/api/applications/' + app.id + '/jolokia/', bean.id, attr, val);
8989
};
9090

9191
this.invoke = function (app, bean, opname, args) {
92-
return jolokia.exec(app.url + '/jolokia/', bean.id, opname, args);
92+
return jolokia.exec('/api/applications/' + app.id + '/jolokia/', bean.id, opname, args);
9393
};
9494
};

‎spring-boot-admin-server-ui/app/js/service/applicationLogging.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@ module.exports = function ($http, jolokia) {
2929
arguments: [loggers[j].name]
3030
});
3131
}
32-
return jolokia.bulkRequest(app.url + '/jolokia/', requests);
32+
return jolokia.bulkRequest('/api/applications/' + app.id + '/jolokia/', requests);
3333
};
3434

3535
this.setLoglevel = function (app, logger, level) {
36-
return jolokia.exec(app.url + '/jolokia/', LOGBACK_MBEAN, 'setLoggerLevel', [logger,
36+
return jolokia.exec('/api/applications/' + app.id + '/jolokia/', LOGBACK_MBEAN, 'setLoggerLevel', [logger,
3737
level
3838
]);
3939
};
4040

4141
this.getAllLoggers = function (app) {
42-
return jolokia.readAttr(app.url + '/jolokia/', LOGBACK_MBEAN, 'LoggerList');
42+
return jolokia.readAttr('/api/applications/' + app.id + '/jolokia/', LOGBACK_MBEAN, 'LoggerList');
4343
};
4444
};

‎spring-boot-admin-server-ui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "spring-boot-admin-server-ui",
3-
"version": "1.1.1",
3+
"version": "1.1.3",
44
"scripts": {
55
"postinstall": "./node_modules/protractor/bin/webdriver-manager update",
66
"pretest": "./node_modules/protractor/bin/webdriver-manager start &",

‎spring-boot-admin-server/pom.xml‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,42 @@
2525
<groupId>org.apache.commons</groupId>
2626
<artifactId>commons-lang3</artifactId>
2727
</dependency>
28+
29+
<!-- Use Zuul WITHOUT Hystrix/Ribbon/Config Client -->
30+
<dependency>
31+
<groupId>org.springframework.cloud</groupId>
32+
<artifactId>spring-cloud-starter-zuul</artifactId>
33+
<exclusions>
34+
<exclusion>
35+
<groupId>org.springframework.cloud</groupId>
36+
<artifactId>spring-cloud-starter</artifactId>
37+
</exclusion>
38+
<exclusion>
39+
<groupId>org.springframework.cloud</groupId>
40+
<artifactId>spring-cloud-starter-hystrix</artifactId>
41+
</exclusion>
42+
<exclusion>
43+
<groupId>org.springframework.cloud</groupId>
44+
<artifactId>spring-cloud-starter-ribbon</artifactId>
45+
</exclusion>
46+
</exclusions>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.springframework.cloud</groupId>
50+
<artifactId>spring-cloud-netflix-core</artifactId>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.springframework.cloud</groupId>
54+
<artifactId>spring-cloud-commons</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.apache.httpcomponents</groupId>
58+
<artifactId>httpclient</artifactId>
59+
<version>4.3.6</version>
60+
</dependency>
61+
62+
63+
<!-- Hazelcast-Support -->
2864
<dependency>
2965
<groupId>com.hazelcast</groupId>
3066
<artifactId>hazelcast</artifactId>
@@ -34,7 +70,7 @@
3470
<groupId>com.hazelcast</groupId>
3571
<artifactId>hazelcast-spring</artifactId>
3672
<optional>true</optional>
37-
</dependency>
73+
</dependency>
3874
<!-- Test -->
3975
<dependency>
4076
<groupId>junit</groupId>

0 commit comments

Comments
 (0)