baseUrl calculation is concentrated to SystemSettings

This commit is contained in:
takezoe
2014-04-29 15:43:41 +09:00
parent aae5fe387b
commit 0f9c95c15a
9 changed files with 30 additions and 28 deletions

View File

@@ -141,8 +141,8 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
val currentPath = request.getRequestURI.substring(request.getContextPath.length)
val baseURL = settings.baseUrl.getOrElse(request.getRequestURL.substring(0, request.getRequestURL.length - request.getRequestURI.length))
val host = new java.net.URL(baseURL).getHost
val baseUrl = settings.baseUrl(request)
val host = new java.net.URL(baseUrl).getHost
/**
* Get object from cache.