From d72cebdf4765220126d586defd39e1b42e5093d5 Mon Sep 17 00:00:00 2001 From: vincent <1341870251@qq.com> Date: 星期一, 25 五月 2020 12:38:38 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/web/RouterController.java | 5 +++-- src/main/webapp/static/js/common.js | 4 ++-- src/main/resources/application.yml | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java index 63fa812..4112db7 100644 --- a/src/main/java/com/zy/common/web/RouterController.java +++ b/src/main/java/com/zy/common/web/RouterController.java @@ -1,5 +1,6 @@ package com.zy.common.web; +import com.core.common.Cools; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,7 +19,7 @@ @RequestMapping("/") public void index(HttpServletResponse response) { try{ - String redirect = "/"+applicationName+"/views/index.html"; + String redirect = Cools.isEmpty(applicationName)?"views/index.html":"/"+applicationName+"/views/index.html"; response.sendRedirect(redirect); } catch (Exception ex){ ex.printStackTrace(); @@ -28,7 +29,7 @@ @RequestMapping("/login") public void login(HttpServletResponse response) { try{ - String redirect = "/"+applicationName+"/views/login.html"; + String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/views/login.html"; response.sendRedirect(redirect); } catch (Exception ex){ ex.printStackTrace(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8ba9edc..30e20ad 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,7 +3,8 @@ spring: application: - name: @pom.artifactId@ +# name: @pom.artifactId@ + name: datasource: # mysql # driver-class-name: com.mysql.jdbc.Driver diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 7f8a9b6..9907798 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,7 +1,7 @@ // 鐢熶骇 -var baseUrl = "/asrs"; +// var baseUrl = "/asrs"; // 娴嬭瘯 -// var baseUrl = ""; +var baseUrl = ""; // 璇︽儏绐楀彛-楂樺害 -- Gitblit v1.9.1