admin/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2025-12-08 01:48:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

theme fix

Browse Source
This commit is contained in:
shimingxy 2020-05-10 14:27:10 +08:00
parent b378920fcb
commit 79b25624fe
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maxkey-core/src/main/java/org/maxkey/web/tag/ThemeTagDirective.java
View File

@ -9,6 +9,8 @@ import java.io.IOException;
import java.util.Map; import java.util.Map;
import javax.servlet.http.Cookie; import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.maxkey.constants.ConstantsTimeInterval;
import org.maxkey.web.WebConstants; import org.maxkey.web.WebConstants;
import org.maxkey.web.WebContext; import org.maxkey.web.WebContext;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -29,6 +31,9 @@ public class ThemeTagDirective implements TemplateDirectiveModel {
private static final Logger _logger = LoggerFactory.getLogger(ThemeTagDirective.class); private static final Logger _logger = LoggerFactory.getLogger(ThemeTagDirective.class);
@Autowired @Autowired
private HttpServletRequest request; private HttpServletRequest request;
@Autowired
HttpServletResponse response;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
@ -49,6 +54,15 @@ public class ThemeTagDirective implements TemplateDirectiveModel {
_logger.trace("read theme form cookie , theme is " + theme); _logger.trace("read theme form cookie , theme is " + theme);
} }
} }
//每次登陆完成设置一次COOKIE
if (request.getAttribute(WebConstants.THEME_COOKIE_NAME) == null
&& null != WebContext.getUserInfo()) {
request.setAttribute(WebConstants.THEME_COOKIE_NAME, "theme");
WebContext.setCookie(response,
WebConstants.THEME_COOKIE_NAME, theme, ConstantsTimeInterval.ONE_WEEK);
}
env.getOut().append(theme == null ? "default" : theme); env.getOut().append(theme == null ? "default" : theme);
} }

3
maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SafeController.java
View File

@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.maxkey.constants.ConstantsOperateMessage; import org.maxkey.constants.ConstantsOperateMessage;
import org.maxkey.constants.ConstantsTimeInterval;
import org.maxkey.crypto.ReciprocalUtils; import org.maxkey.crypto.ReciprocalUtils;
import org.maxkey.crypto.password.PasswordReciprocal; import org.maxkey.crypto.password.PasswordReciprocal;
import org.maxkey.dao.service.UserInfoService; import org.maxkey.dao.service.UserInfoService;
@ -171,7 +172,7 @@ public class SafeController {
userInfo.setEmail(email); userInfo.setEmail(email);
userInfo.setTheme(theme); userInfo.setTheme(theme);
WebContext.setCookie(response, WebConstants.THEME_COOKIE_NAME, theme, 0); WebContext.setCookie(response, WebConstants.THEME_COOKIE_NAME, theme, ConstantsTimeInterval.ONE_WEEK);
userInfoService.changeEmail(userInfo); userInfoService.changeEmail(userInfo);