合并分支 'akun' 到 'master'

Akun



查看合并请求 !739

@@ -198,6 +198,17 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
+        $not_allow_ip = array_filter($this->param['not_allow_ip'] ?? []);
+        if($not_allow_ip){
+            //判断禁止访问IP是否填写正确
+            foreach ($not_allow_ip as $vn){
+                $vn_count = count(explode('.',$vn));
+                if($vn_count != 4){
+                    $this->fail('禁止访问IP填写有误');
+                }
+            }
+        }
+
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
@@ -211,7 +222,7 @@ class DomainInfoLogic extends BaseLogic
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
-            'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])),
+            'not_allow_ip'=>json_encode($not_allow_ip),
             'is_redirect' => $this->param['is_redirect'] ?? 0,
             'is_redirect' => $this->param['is_redirect'] ?? 0,
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);