manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

菜单归属系统代码优化及各种细节优化

Browse Source
This commit is contained in:
thinkgem
2018-12-22 19:16:47 +08:00
parent e663ae3207
commit 314cef3201
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
View File

@@ -224,7 +224,9 @@ public class PropertiesUtils {
if (new File(classesLogPath).exists()){ if (new File(classesLogPath).exists()){
logPath = classesLogPath; 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); return LoggerFactory.getLogger(PropertiesUtils.class);
} }

12
modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
View File

@@ -334,15 +334,11 @@ public class LoginController extends BaseController{
@RequiresPermissions("user") @RequiresPermissions("user")
@RequestMapping(value = "switch/{sysCode}") @RequestMapping(value = "switch/{sysCode}")
public String switchSys(@PathVariable String sysCode) { public String switchSys(@PathVariable String sysCode) {
LoginInfo principal = UserUtils.getLoginInfo(); User user = UserUtils.getUser();
User user = UserUtils.get(principal.getId());
if (user.isSuperAdmin() && StringUtils.isNotBlank(sysCode)){ if (user.isSuperAdmin() && StringUtils.isNotBlank(sysCode)){
if (!StringUtils.equals(principal.getParam("sysCode"), sysCode)){ Session session = UserUtils.getSession();
principal.setParam("sysCode", sysCode); session.setAttribute("sysCode", sysCode);
UserUtils.removeCacheByKeyPrefix(UserUtils.CACHE_MENU_LIST); UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId());
Session session = UserUtils.getSession();
UserUtils.removeCache(UserUtils.CACHE_AUTH_INFO+"_"+session.getId());
}
} }
return REDIRECT + adminPath + "/index"; return REDIRECT + adminPath + "/index";
} }

1
modules/core/src/main/resources/config/logger-core.xml
View File

@@ -23,6 +23,7 @@
<logger name="com.jeesite" level="DEBUG" /> <logger name="com.jeesite" level="DEBUG" />
<logger name="com.jeesite.common.i18n" level="INFO" /> <logger name="com.jeesite.common.i18n" level="INFO" />
<logger name="com.jeesite.common.shiro" level="INFO" /> <logger name="com.jeesite.common.shiro" level="INFO" />
<logger name="com.jeesite.common.cache" level="INFO" />
<logger name="com.jeesite.common.j2cache" level="INFO" /> <logger name="com.jeesite.common.j2cache" level="INFO" />
<logger name="com.jeesite.common.mybatis" level="INFO" /> <logger name="com.jeesite.common.mybatis" level="INFO" />
<logger name="com.jeesite.common.mybatis.mapper" level="DEBUG" /> <logger name="com.jeesite.common.mybatis.mapper" level="DEBUG" />

2
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/leftMenu.html
View File

@@ -23,7 +23,7 @@
<%-->*/%> <%-->*/%>
<ul class="sidebar-menu" data-widget="tree"> <ul class="sidebar-menu" data-widget="tree">
<%/*<!--%> <%/*<!--%>
<% var menuSysCode = @UserUtils.getLoginInfo().getParam('sysCode', 'default'); %> <% var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %>
<li class="header">${@DictUtils.getDictLabel('sys_menu_sys_code', menuSysCode, '')}</li> <li class="header">${@DictUtils.getDictLabel('sys_menu_sys_code', menuSysCode, '')}</li>
<%-->*/%> <%-->*/%>
<% <%

2
modules/core/src/main/resources/views/themes/default/modules/sys/sysIndex/topMenuUser.html
View File

@@ -20,7 +20,7 @@
<% if(user.superAdmin){ %> <% if(user.superAdmin){ %>
<li class="divider"></li> <li class="divider"></li>
<li class="dropdown-header mb5">${text('系统切换')}：</li> <li class="dropdown-header mb5">${text('系统切换')}：</li>
<% var menuSysCode = @UserUtils.getLoginInfo().getParam('sysCode', 'default'); %> <% var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %>
<% for(var dict in @DictUtils.getDictList('sys_menu_sys_code')){ %> <% for(var dict in @DictUtils.getDictList('sys_menu_sys_code')){ %>
<li> <li>
<a href="${ctx}/switch/${dict.dictValue}"> <a href="${ctx}/switch/${dict.dictValue}">

5
web/src/main/resources/config/logback-spring.xml
View File

@@ -5,9 +5,12 @@
<property name="log.path" value="${logPath:-${java.io.tmpdir:-.}}/logs" /> <property name="log.path" value="${logPath:-${java.io.tmpdir:-.}}/logs" />
<!-- Console log output --> <!-- Console log output -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder> <encoder>
<pattern>%d{MM-dd HH:mm:ss.SSS} %-5level [%logger{50}] - %msg%n</pattern> <pattern>%clr(%d{MM-dd HH:mm:ss.SSS}) %-5level %clr([%logger{50}]) - %msg%n</pattern>
</encoder> </encoder>
</appender> </appender>