From e58101543b99febfbcd873b3406abae7e7f7a8c1 Mon Sep 17 00:00:00 2001 From: zhuangqian Date: Sat, 17 Dec 2016 15:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0redirect=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smallchill/core/base/controller/BladeController.java | 7 +++++-- .../com/smallchill/system/controller/LoginController.java | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/smallchill/core/base/controller/BladeController.java b/src/main/java/com/smallchill/core/base/controller/BladeController.java index a47589e3..9b890408 100644 --- a/src/main/java/com/smallchill/core/base/controller/BladeController.java +++ b/src/main/java/com/smallchill/core/base/controller/BladeController.java @@ -80,8 +80,7 @@ public class BladeController { } public String getParameter(String name, String defaultValue) { - String result = getRequest().getParameter(name); - return StrKit.notBlank(result) ? result : defaultValue; + return Convert.toStr(getRequest().getParameter(name), defaultValue); } public Integer getParameterToInt(String name) { @@ -119,6 +118,10 @@ public class BladeController { public String getContextPath() { return getRequest().getContextPath(); } + + public String redirect(String url) { + return StrKit.format("redirect:{}", url); + } /** ============================ mapping ================================================= */ diff --git a/src/main/java/com/smallchill/system/controller/LoginController.java b/src/main/java/com/smallchill/system/controller/LoginController.java index e284f6f5..1aaa59eb 100644 --- a/src/main/java/com/smallchill/system/controller/LoginController.java +++ b/src/main/java/com/smallchill/system/controller/LoginController.java @@ -59,7 +59,7 @@ public class LoginController extends BaseController implements Const{ @GetMapping("/login") public String login() { if (ShiroKit.isAuthenticated()) { - return REDIRECT + "/"; + return redirect("/"); } return LOGIN_REALPATH; } @@ -108,13 +108,13 @@ public class LoginController extends BaseController implements Const{ doLog(ShiroKit.getSession(), "登出"); Subject currentUser = ShiroKit.getSubject(); currentUser.logout(); - return REDIRECT + "/login"; + return redirect("/login"); } @RequestMapping("/unauth") public String unauth() { if (ShiroKit.notAuthenticated()) { - return REDIRECT + "/login"; + return redirect("/login"); } return NOPERMISSION_PATH; }