From 408475e3f52004b2c11d5333d58eb4060ea45a48 Mon Sep 17 00:00:00 2001
From: Sxile <3440626@qq.com>
Date: Fri, 22 Nov 2019 17:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81mode=E9=85=8D=E7=BD=AEhistory?=
 =?UTF-8?q?=EF=BC=88=E8=A1=A8=E7=A4=BA=E5=8E=BB=E6=8E=89=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=A0=8F=E7=9A=84#=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/ruoyi/index.js  |  7 ++++
 .../src/main/resources/templates/index.html   | 35 ++++++++++++++-----
 .../ruoyi/framework/config/ShiroConfig.java   |  2 +-
 .../SpringSessionValidationScheduler.java     |  2 ++
 4 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
index 7dc6190..d2d606f 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js
@@ -484,6 +484,13 @@ $(function() {
         var nowUrl = window.location.href;
         var newUrl = nowUrl.substring(0, nowUrl.indexOf("#"));
         window.location.href = newUrl + "#" + href;
+        if($.common.equals("history", mode)) {
+            storage.set('publicPath', href);
+        } else {
+            var nowUrl = window.location.href;
+            var newUrl = nowUrl.substring(0, nowUrl.indexOf("#"));
+            window.location.href = newUrl + "#" + href;
+        }
     }
 
     $(window).keydown(function(event) {
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 62be341..0442af8 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -248,7 +248,15 @@
 <script th:src="@{/ajax/libs/fullscreen/jquery.fullscreen.js}"></script>
 <script th:inline="javascript">
 	var ctx = [[@{/}]];
+		// 皮肤缓存
 		var skin = storage.get("skin");
+		// history（表示去掉地址的#）否则地址以"#"形式展示
+		var mode = "history";
+		// 历史访问路径缓存
+		var historyPath = storage.get("historyPath");
+		// 排除非左侧菜单链接
+		var excludesUrl = ["/system/user/profile"];
+
 		// 本地主题优先，未设置取系统配置
 		if($.common.isNotEmpty(skin)){
 			$("body").addClass(skin.split('|')[0]);
@@ -276,19 +284,28 @@
 			})
 		}
 
-		// 排除非左侧菜单链接
-		var excludesUrl = ["/system/user/profile"];
+		/** 刷新时访问路径页签 */
+		function applyPath(url) {
+			$('a[href$="' + decodeURI(url) + '"]').click();
+			if($.inArray(url, excludesUrl)){
+				$('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
+			}
+		}
 
 		$(function() {
-			var hash = location.hash;
-			if (hash !== '') {
-				var url = hash.substring(1, hash.length);
-				$('a[href$="' + decodeURI(url) + '"]').click();
-				if($.inArray(url, excludesUrl)){
-					$('a[href$="' + url + '"]').parent("li").addClass("selected").parents("li").addClass("active").end().parents("ul").addClass("in");
+			if($.common.equals("history", mode) && window.performance.navigation.type == 1) {
+				var url = storage.get('publicPath');
+				if ($.common.isNotEmpty(url)) {
+					applyPath(url);
+				}
+			} else {
+				var hash = location.hash;
+				if ($.common.isNotEmpty(hash)) {
+					var url = hash.substring(1, hash.length);
+					applyPath(url);
 				}
 			}
-		});
+		})
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index 2867c7b..25fc532 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -199,7 +199,7 @@ public class ShiroConfig
      * 安全管理器
      */
     @Bean
-    public SecurityManager securityManager(UserRealm userRealm, SpringSessionValidationScheduler springSessionValidationScheduler)
+    public SecurityManager securityManager(UserRealm userRealm)
     {
         DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager();
         // 设置realm.
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java
index 790ca59..60174c0 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/session/SpringSessionValidationScheduler.java
@@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.utils.Threads;
 
@@ -39,6 +40,7 @@ public class SpringSessionValidationScheduler implements SessionValidationSchedu
      */
     @Autowired
     @Qualifier("sessionManager")
+    @Lazy
     private ValidatingSessionManager sessionManager;
 
     // 相隔多久检查一次session的有效性，单位毫秒，默认就是10分钟