Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -278,7 +278,7 @@ class LoginController extends BaseController
             ];
             ];
         }else{
         }else{
             //有from_order_id, 找到对应的项目并登录主账号
             //有from_order_id, 找到对应的项目并登录主账号
-            $project = (new Project())->read(['from_order_id'=>$arr['from_order_id']]);
+            $project = (new Project())->read(['from_order_id'=>$arr['from_order_id'], 'delete_status' => Project::IS_DEL_FALSE]);
             if(!$project){
             if(!$project){
                 $this->response('项目不存在，请联系管理员',Code::USER_ERROR);
                 $this->response('项目不存在，请联系管理员',Code::USER_ERROR);
             }
             }

@@ -303,8 +303,8 @@ class DomainInfoLogic extends BaseLogic
 
 
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
-            'other_domain'=>json_encode($this->param['other_domain'] ?? []),
-            'extend_config'=>json_encode($this->param['extend_config'] ?? []),
+            'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
+            'extend_config'=>json_encode(array_filter($this->param['extend_config'] ?? [])),
             'type'=>$this->param['type'],
             'type'=>$this->param['type'],
             'private_key' => $this->param['key'] ?? '',
             'private_key' => $this->param['key'] ?? '',
             'private_cert' => $this->param['cert'] ?? '',
             'private_cert' => $this->param['cert'] ?? '',
@@ -313,8 +313,8 @@ class DomainInfoLogic extends BaseLogic
             'amp_type' => $this->param['amp_type'] ?? 0,
             'amp_type' => $this->param['amp_type'] ?? 0,
             '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($this->param['not_allow_country'] ?? []),
-            'not_allow_ip'=>json_encode($this->param['not_allow_ip'] ?? []),
+            'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
+            'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])),
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);
         //主站生成证书
         //主站生成证书

@@ -35,6 +35,9 @@ class Project extends Base
     const IS_UPGRADE_FALSE = 0;
     const IS_UPGRADE_FALSE = 0;
     const IS_UPGRADE_TRUE = 1;
     const IS_UPGRADE_TRUE = 1;
 
 
+    const IS_DEL_FALSE = 0;
+    const IS_DEL_TRUE = 1;
+
     /**
     /**
      * 星级客户
      * 星级客户
      * @return string[]
      * @return string[]