From 295adfbd04159e4e24f3549592f7751f2e0b2081 Mon Sep 17 00:00:00 2001
From: Ying <coolsec@foxmail.com>
Date: Wed, 2 Aug 2023 18:17:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=89=B4=E6=9D=83?=
 =?UTF-8?q?=E5=92=8C=E8=B7=B3=E8=BD=AC=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/public/jumptpl.html            | 33 +++++++++----------
 .../middleware/system/IndexPermissions.php    |  4 +--
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/admin/view/public/jumptpl.html b/app/admin/view/public/jumptpl.html
index 7636460..6380d5e 100644
--- a/app/admin/view/public/jumptpl.html
+++ b/app/admin/view/public/jumptpl.html
@@ -44,30 +44,27 @@ body{font-family: '微软雅黑',serif; color: #CCC; font-size: 16px;background:
     </div>
 </body>
 <!-- 公共js部分 -->
-
 <script type="text/javascript">
     let wait = document.getElementById('wait'),
         href = document.getElementById('href').href,
         target = document.getElementById('href').target;
     let interval = setInterval(function(){
         let time = --wait.innerHTML;
-            if(time <= 0) {
-                if (window.top !== window.self) {
-                    if ('_parent' === target) {
-                        parent.location.href = href;
-                    } else {
-                        location.href = href;
-                    }
-                }
-                else {
-                    if ('_parent' === target) {
-                        parent.location.href = href;
-                    } else {
-                        location.href = href;
-                    }
-                }
-                clearInterval(interval);
+        if(time <= 0) {
+            let host = window.location.host;
+            let protocol = window.location.protocol;
+            let domain = href.replace(protocol+ '//', '').replace('/', '').replace(/(^\s*)|(\s*$)/g, "");
+            if (window.top !== window.self && host === domain) {
+                let id = window.frameElement.getAttribute('id');
+                parent.layui.layer.close(id);
             }
-        }, 1000);
+            if ('_parent' === target) {
+                parent.location.href = href;
+            } else {
+                location.href = href;
+            }
+            clearInterval(interval);
+        }
+    }, 1000);
 </script>
 </html>
diff --git a/app/index/middleware/system/IndexPermissions.php b/app/index/middleware/system/IndexPermissions.php
index 934b096..4a0c723 100644
--- a/app/index/middleware/system/IndexPermissions.php
+++ b/app/index/middleware/system/IndexPermissions.php
@@ -11,7 +11,7 @@ use Webman\Http\Response;
 use Webman\Http\Request;
 
 /**
- * 管理员权限
+ * 前端权限
  * @package app\admin\middleware\system
  * @author meystack <
  */
@@ -64,7 +64,7 @@ class IndexPermissions implements MiddlewareInterface
 
         // 是否验证登录器
         $userInfo = UserTokenService::isLogin();
-        if (!empty($userInfo)) {
+        if (!empty($userInfo) && isset($userInfo['id'])) {
             if (in_array($action, $this->repeatLogin)) {
                 return redirect($this->JumpUrl);
             }