From f4084478ebe9c4599b99275c90f4f0b87abc4253 Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期一, 25 五月 2020 11:04:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/RouterController.java | 8 +++-----
src/main/webapp/views/index.html | 7 ++++++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index e059d01..63fa812 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -12,14 +12,13 @@
@Controller
public class RouterController {
- @Value("{spring.application.name}")
+ @Value("${spring.application.name}")
private String applicationName;
@RequestMapping("/")
public void index(HttpServletResponse response) {
try{
-// String redirect = "/"+applicationName+"/views/index.html";
- String redirect = "/asrs/views/index.html";
+ String redirect = "/"+applicationName+"/views/index.html";
response.sendRedirect(redirect);
} catch (Exception ex){
ex.printStackTrace();
@@ -29,8 +28,7 @@
@RequestMapping("/login")
public void login(HttpServletResponse response) {
try{
-// String redirect = "/"+applicationName+"/views/login.html";
- String redirect = "/asrs/views/login.html";
+ String redirect = "/"+applicationName+"/views/login.html";
response.sendRedirect(redirect);
} catch (Exception ex){
ex.printStackTrace();
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index f878f38..d654c1f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -84,7 +84,7 @@
<dd><a lay-href="detail.html">鍩烘湰璧勬枡</a></dd>
<!--<dd><a lay-href="set/user/password.html">淇敼瀵嗙爜</a></dd>-->
<hr>
- <dd style="text-align: center;"><a id="logout" href="/asrs">閫�鍑�</a></dd>
+ <dd style="text-align: center;"><a id="logout" href="/">閫�鍑�</a></dd>
</dl>
</li>
</ul>
@@ -152,6 +152,11 @@
var element = layui.element;
var $ = layui.jquery;
+ // 鏇挎崲閫�鍑烘寜閽彉閲�
+ var logout = document.getElementById('logout');
+ var url = logout.getAttribute('href');
+ logout.setAttribute('href', baseUrl + url);
+
$('#person-username').text(localStorage.getItem('username'));
$(function () {
--
Gitblit v1.9.1