Merge remote-tracking branch 'origin/master'

src/main/resources/templates/login.html

@@ -71,7 +71,7 @@
                     if (r?.success) {
                         console.log('r: ', r);
                         layer.msg('登录成功');
-                        window.localStorage.setItem('userName',r.data.username)
+                        window.sessionStorage.setItem('userName',r.data.username)
                         setTimeout(() => window.location.href = '/template', 1500)
                         return
                     }

src/main/resources/templates/template.html

@@ -211,8 +211,11 @@
             initTreeCity(tree)
             initTreeIndicator(tree)
             initTreeIndicatorTemplate(tree)
-            // console.log(window.localStorage.getItem('userName'))
-            $("#userName").text(window.localStorage.getItem('userName'))
+            // console.log(window.sessionStorage.getItem('userName'))
+            $("#userName").text(window.sessionStorage.getItem('userName'))
+            if(!window.sessionStorage.getItem('userName')){
+                setTimeout(() => window.location.href = '/login', 1000)
+            }
         })
 
         var treeCity;
@@ -496,6 +499,10 @@
                 });
             },1000)
         });
+        window.onbeforeunload=function(e){     
+            logOutFun()
+        }
+        // window.addEventListener('unload',logOutFun());
     </script>
 </body>