From b19936ced081e9499b397ef9b5c97ba68af8e847 Mon Sep 17 00:00:00 2001
From: Devil <fuxiang.gong@qq.com>
Date: Wed, 21 Jul 2021 15:15:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/PluginsAdminService.php | 10 +++++-----
 app/service/PluginsService.php      | 12 +++++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/service/PluginsAdminService.php b/app/service/PluginsAdminService.php
index 62292c34f..5543c9c33 100755
--- a/app/service/PluginsAdminService.php
+++ b/app/service/PluginsAdminService.php
@@ -63,7 +63,7 @@ class PluginsAdminService
                     {
                         // 获取插件配置信息
                         $config = self::GetPluginsConfig($temp_file);
-                        if($config !== false && !empty($config['base']))
+                        if(!empty($config) && !empty($config['base']))
                         {
                             // 获取数据库配置信息
                             $base = $config['base'];
@@ -135,7 +135,7 @@ class PluginsAdminService
         // 数据处理
         $plugins = $params['id'];
         $config = self::GetPluginsConfig($plugins);
-        if($config !== false && !empty($config['base']) && !empty($config['base']['name']))
+        if(!empty($config) && !empty($config['base']) && !empty($config['base']['name']))
         {
             $cache = PluginsService::PluginsCacheData($plugins);
             $data = [
@@ -226,7 +226,7 @@ class PluginsAdminService
         {
             $config = json_decode(file_get_contents($file), true);
         }
-        return empty($config) ? false : $config;
+        return empty($config) ? [] : $config;
     }
 
     /**
@@ -843,7 +843,7 @@ php;
 
         // 配置信息
         $config = self::GetPluginsConfig($plugins);
-        $hook = empty($config['hook']) ? [] : $config['hook'];
+        $hook = (empty($config) || empty($config['hook'])) ? [] : $config['hook'];
 
         // 配置信息组装
         $data = [
@@ -1251,7 +1251,7 @@ php;
 
         // 配置信息
         $config = self::GetPluginsConfig($plugins);
-        if($config === false)
+        if(empty($config))
         {
             return DataReturn('插件配置有误', -10);
         }
diff --git a/app/service/PluginsService.php b/app/service/PluginsService.php
index 145b81a47..e9ea05ec8 100755
--- a/app/service/PluginsService.php
+++ b/app/service/PluginsService.php
@@ -264,11 +264,21 @@ class PluginsService
         $ret = self::PluginsStatus($plugins);
         if($ret === null)
         {
+            // 不存在的插件则进入首页
+            $config = PluginsAdminService::GetPluginsConfig($plugins);
+            if(empty($config))
+            {
+                if(IS_AJAX)
+                {
+                    return DataReturn('地址有误['.$plugins.']', -10);
+                }
+                MyRedirect(__MY_URL__, true);
+            }
             return DataReturn('应用未安装['.$plugins.']', -10);
         }
         if($ret != 1)
         {
-            return DataReturn('应用未启用['.$plugins.']', -10);
+            return DataReturn('应用未启用['.$plugins.']', -11);
         }
         return DataReturn('验证成功', 0);
     }