From 314cef3201a08152ccbfd324b75945fd5c1fb2b5 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sat, 22 Dec 2018 19:16:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=BD=92=E5=B1=9E=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E5=8F=8A=E5=90=84?= =?UTF-8?q?=E7=A7=8D=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/common/io/PropertiesUtils.java | 4 +++- .../com/jeesite/modules/sys/web/LoginController.java | 12 ++++-------- .../core/src/main/resources/config/logger-core.xml | 1 + .../default/modules/sys/sysIndex/leftMenu.html | 2 +- .../default/modules/sys/sysIndex/topMenuUser.html | 2 +- web/src/main/resources/config/logback-spring.xml | 5 ++++- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java index b2b4a2a9..877b5e05 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -224,7 +224,9 @@ public class PropertiesUtils { if (new File(classesLogPath).exists()){ logPath = classesLogPath; } - System.setProperty("logPath", FileUtils.path(logPath)); + if (StringUtils.isBlank(System.getProperty("logPath"))){ + System.setProperty("logPath", FileUtils.path(logPath)); + } return LoggerFactory.getLogger(PropertiesUtils.class); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 7194cbe2..7eb6aaff 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -334,15 +334,11 @@ public class LoginController extends BaseController{ @RequiresPermissions("user") @RequestMapping(value = "switch/{sysCode}") public String switchSys(@PathVariable String sysCode) { - LoginInfo principal = UserUtils.getLoginInfo(); - User user = UserUtils.get(principal.getId()); + User user = UserUtils.getUser(); if (user.isSuperAdmin() && StringUtils.isNotBlank(sysCode)){ - if (!StringUtils.equals(principal.getParam("sysCode"), sysCode)){ - principal.setParam("sysCode", sysCode); - UserUtils.removeCacheByKeyPrefix(UserUtils.CACHE_MENU_LIST); - Session session = UserUtils.getSession(); - UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId()); - } + Session session = UserUtils.getSession(); + session.setAttribute("sysCode", sysCode); + UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId()); } return REDIRECT + adminPath + "/index"; } diff --git a/modules/core/src/main/resources/config/logger-core.xml b/modules/core/src/main/resources/config/logger-core.xml index 3acf57a9..1e6e07d6 100644 --- a/modules/core/src/main/resources/config/logger-core.xml +++ b/modules/core/src/main/resources/config/logger-core.xml @@ -23,6 +23,7 @@ + diff --git a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html index 26d915f2..b6458915 100644 --- a/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html +++ b/modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html @@ -23,7 +23,7 @@ <%-->*/%>