diff --git a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css index eeb48d9f..4a75afab 100644 --- a/common/src/main/resources/static/adminlte/css/skins/skin-dark.css +++ b/common/src/main/resources/static/adminlte/css/skins/skin-dark.css @@ -241,6 +241,7 @@ a, a:hover, a:active, a:focus, .form-unit, th[aria-selected=true] .ui-jqgrid-sor .main-header .navbar .dropdown-menu li a {color:#ddd!important;} .main-header .navbar .dropdown-menu li a:hover {background: #4c4c4c!important;} .navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a {border-color:#414141!important;} +.navbar-nav>.messages-menu>.dropdown-menu>li .menu>li>a>h4 {color:#ddd!important;} .navbar-nav>.messages-menu>.dropdown-menu>li.header,.main-header .navbar .dropdown-menu li a, .navbar-nav>.notifications-menu>.dropdown-menu>li.footer>a, .navbar-nav>.messages-menu>.dropdown-menu>li.footer>a, .navbar-nav>.tasks-menu>.dropdown-menu>li.footer>a {background-color:#1a1a1a!important;border-color:#414141!important;color:#c6c6c6!important;} 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 f22004ef..b51117c4 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 @@ -374,12 +374,11 @@ public class LoginController extends BaseController{ /** * 切换主题风格 */ - @RequiresPermissions("user") + //@RequiresPermissions("user") @RequestMapping(value = "switchSkin/{skinName}") public String switchSkin(@PathVariable String skinName, HttpServletRequest request, HttpServletResponse response) { - LoginInfo loginInfo = UserUtils.getLoginInfo(); if (StringUtils.isNotBlank(skinName) && !"select".equals(skinName)){ - CookieUtils.setCookie(response, "skinName_" + loginInfo.getId(), skinName); + CookieUtils.setCookie(response, "skinName", skinName); return REDIRECT + adminPath + "/index"; } return "modules/sys/switchSkin"; diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 5f6592bc..1a00f211 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -441,6 +441,7 @@ shiro: ${adminPath}/login = authc ${adminPath}/logout = logout ${adminPath}/file/** = user + ${adminPath}/switchSkin/* = anon ${adminPath}/sys/corpAdmin/treeData = anon ${adminPath}/cms/* = perms[cms:view] ${adminPath}/cms/site/select = user diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html index d946b86c..63d6f9c0 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenu.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenu.html @@ -11,7 +11,7 @@ <% } %> @@ -183,8 +189,6 @@ $('.full-opacity-hover').click(function(){ js.window.location = '${ctx}/switchSkin/' + $(this).data('skin'); }); -$('#skinDark').toggle(!$('html').hasClass('skin-dark')); - $('#formLayerModel') .iCheck(js.cookie('formLayerModel') == 'true' ? 'check' : 'uncheck') .on('ifChecked', function(){ diff --git a/modules/core/src/main/resources/views/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/modules/sys/sysLogin.html index e14ad58a..2fa05b39 100644 --- a/modules/core/src/main/resources/views/modules/sys/sysLogin.html +++ b/modules/core/src/main/resources/views/modules/sys/sysLogin.html @@ -11,6 +11,13 @@
+ <% var defaultSkinName = @Global.getConfig('sys.index.skinName', 'skin-blue-light3'); + var skinName = cookie('skinName', false, defaultSkinName); + if (skinName == 'skin-dark') { %> + + <% }else{ %> + + <% } %> <% var isLoginByValidCode = @Global.getConfigToBoolean('user.loginByValidCode', 'true'); %> <% if(isLoginByValidCode){ %>