From a35b7fd143818bf926286f19200f4c48e3a4fdd7 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 6 May 2025 15:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=BB=E9=A2=98=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E5=BD=93=E5=89=8D=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=B7=B3=E8=BD=AC=E5=88=B0=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/modules/sys/web/SwitchController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java index 9e1cd0a4..c194857a 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/SwitchController.java @@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -136,13 +137,14 @@ public class SwitchController extends BaseController{ */ //@RequiresPermissions("user") @RequestMapping(value = "switchSkin/{skinName}") - public String switchSkin(@PathVariable String skinName, HttpServletRequest request, HttpServletResponse response) { + public String switchSkin(@PathVariable String skinName, @RequestParam(defaultValue="${adminPath}/index") String url, + HttpServletRequest request, HttpServletResponse response) { if (StringUtils.isNotBlank(skinName) && !"select".equals(skinName)){ CookieUtils.setCookie(response, "skinName", EncodeUtils.encodeUrl(EncodeUtils.xssFilter(skinName, request))); if (ServletUtils.isAjaxRequest(request)) { return renderResult(response, Global.TRUE, text("主题切换成功")); } - return REDIRECT + adminPath + "/index"; + return REDIRECT + EncodeUtils.decodeUrl2(url); } return "modules/sys/switchSkin"; }