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 @@