合并分支 'akun' 到 'master'

Akun



查看合并请求 !2202

@@ -133,7 +133,7 @@ class NoticeController extends BaseController
             $origin_domain = $origin_array['host'] ?? '';
             $origin_domain = $origin_array['host'] ?? '';
         }
         }
         if (empty($origin_domain)) {
         if (empty($origin_domain)) {
-            return $this->error('origin_domain参数不能为空');
+            return $this->error('origin_domain参数填写有误');
         }
         }
 
 
         if(strpos($target_domain,'http') !== false){
         if(strpos($target_domain,'http') !== false){
@@ -141,7 +141,7 @@ class NoticeController extends BaseController
             $target_domain = $target_array['host'] ?? '';
             $target_domain = $target_array['host'] ?? '';
         }
         }
         if (empty($target_domain)) {
         if (empty($target_domain)) {
-            return $this->error('target_domain参数不能为空');
+            return $this->error('target_domain参数填写有误');
         }
         }
 
 
 
 
@@ -150,7 +150,14 @@ class NoticeController extends BaseController
         }
         }
 
 
         if($other_domain){
         if($other_domain){
-            foreach ($other_domain as $ov) {
+            foreach ($other_domain as &$ov) {
+                if(strpos($ov,'http') !== false){
+                    $ov_array = parse_url($ov);
+                    $ov = $ov_array['host'] ?? '';
+                }
+                if(empty($ov)){
+                    return $this->error('other_domain参数填写有误');
+                }
                 if (!check_domain_record($ov, ['domain'=>'','ip'=>DomainInfo::SERVER_IP_301])) {
                 if (!check_domain_record($ov, ['domain'=>'','ip'=>DomainInfo::SERVER_IP_301])) {
                     return $this->error($ov . ' 未解析至 ' . DomainInfo::SERVER_IP_301);
                     return $this->error($ov . ' 未解析至 ' . DomainInfo::SERVER_IP_301);
                 }
                 }