From 9bf5fe19a2d0f4a32dc0db089e5bf3690991f8d5 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Fri, 8 Jul 2022 22:12:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=9F=9F=E5=90=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=94=9F=E6=88=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/service/DomainService.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/service/DomainService.php b/app/service/DomainService.php
index dde760613..e1d09d572 100644
--- a/app/service/DomainService.php
+++ b/app/service/DomainService.php
@@ -95,9 +95,16 @@ class DomainService
             }
         }
         // 增加
-        if(!empty($params['inc_domain']))
+        if(!empty($params['inc_domain']) && is_array($params['inc_domain']))
         {
-            $config = array_merge($config, $params['inc_domain']);
+            foreach($params['inc_domain'] as $k=>$v)
+            {
+                // 排除空字符串和null的key
+                if($k !== '' && $k !== null && !empty($v))
+                {
+                    $config[$k] = $v;
+                }
+            }
         }
 
         // 生成域名配置文件