zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed gui service external address default settings

Browse source
This commit is contained in:
anhefti 2020-10-29 18:09:00 +01:00
parent 6ea548548f
commit c8d2052329
No known key found for this signature in database
GPG key ID: E9AD9471B6BC114D
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ch/ethz/seb/sebserver/gui/GuiServiceInfo.java
View file

@ -31,6 +31,8 @@ public class GuiServiceInfo {
public GuiServiceInfo( public GuiServiceInfo(
@Value("${sebserver.gui.http.external.scheme:https}") final String externalScheme, @Value("${sebserver.gui.http.external.scheme:https}") final String externalScheme,
@Value("${server.address}") final String internalServer, @Value("${server.address}") final String internalServer,
@Value("${sebserver.webservice.http.external.servername}") final String webserviceServer,
@Value("${sebserver.webservice.http.external.port}") final String webservicePort,
@Value("${sebserver.gui.http.external.servername}") final String externalServer, @Value("${sebserver.gui.http.external.servername}") final String externalServer,
@Value("${server.port}") final String internalPort, @Value("${server.port}") final String internalPort,
@Value("${sebserver.gui.http.external.port}") final String externalPort, @Value("${sebserver.gui.http.external.port}") final String externalPort,
@ -38,9 +40,13 @@ public class GuiServiceInfo {
this.externalScheme = externalScheme; this.externalScheme = externalScheme;
this.internalServer = internalServer; this.internalServer = internalServer;
this.externalServer = StringUtils.isNotBlank(externalServer) ? externalServer : internalServer; this.externalServer = StringUtils.isNotBlank(externalServer)
? externalServer
: StringUtils.isNotBlank(webserviceServer)
? webserviceServer
: internalServer;
this.internalPort = internalPort; this.internalPort = internalPort;
this.externalPort = externalPort; this.externalPort = StringUtils.isNotBlank(externalPort) ? externalPort : webservicePort;
this.entryPoint = entryPoint; this.entryPoint = entryPoint;
this.internalServerURIBuilder = UriComponentsBuilder this.internalServerURIBuilder = UriComponentsBuilder
.fromHttpUrl("http://" + this.internalServer); .fromHttpUrl("http://" + this.internalServer);