update

刘锟
app/Http/Logic/Aside/Domain/DomainInfoLogic.php
--- a/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @b9828ac
+++ b/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @b9828ac
@@ -9,6 +9,7 @@ use App\Models\Domain\DomainCreateTask;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainRedirectTask;
 use App\Models\Project\CountryCustom;
+use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 class DomainInfoLogic extends BaseLogic
@@ -32,21 +33,21 @@ class DomainInfoLogic extends BaseLogic
     public function saveDomain()
     {
         $domain = parse_url($this->param['domain'], PHP_URL_HOST);
-        if(!empty($domain)){
+        if (!empty($domain)) {
             $this->param['domain'] = trim($domain['host']);
         }
         //验证域名
-        $this->verifyDomain($this->param['domain'],$this->param['id'] ?? '');
-        if(isset($this->param['id']) && !empty($this->param['id'])){
-            $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
-        }else{
+        $this->verifyDomain($this->param['domain'], $this->param['id'] ?? '');
+        if (isset($this->param['id']) && !empty($this->param['id'])) {
+            $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
+        } else {
             //查看域名是否以WWW开头
             if (strpos($this->param['domain'], 'www.') === 0) {
-                $this->param['other_domain'] = json_encode([str_replace('www', '*', $this->param['domain']),str_replace('www.', '', $this->param['domain'])]);
+                $this->param['other_domain'] = json_encode([str_replace('www', '*', $this->param['domain']), str_replace('www.', '', $this->param['domain'])]);
             }
             $rs = $this->model->add($this->param);
         }
-        if($rs === false){
+        if ($rs === false) {
             $this->fail('error');
         }
         return $this->success();
@@ -60,14 +61,15 @@ class DomainInfoLogic extends BaseLogic
      * @method :post
      * @time   :2023/8/1 14:59
      */
-    public function verifyDomain($domain,$id = ''){
-        if(!empty($id)){
-            $info = $this->model->read(['domain'=>$domain,'id'=>['!=',$id]]);
+    public function verifyDomain($domain, $id = '')
+    {
+        if (!empty($id)) {
+            $info = $this->model->read(['domain' => $domain, 'id' => ['!=', $id]]);
             if ($info !== false) {
                 $this->fail('当前域名已存在');
             }
-        }else{
-            $info = $this->model->read(['domain'=>$domain]);
+        } else {
+            $info = $this->model->read(['domain' => $domain]);
             if ($info !== false) {
                 $this->fail('当前域名已存在');
             }
@@ -82,16 +84,17 @@ class DomainInfoLogic extends BaseLogic
      * @method :post
      * @time   :2023/8/1 15:43
      */
-    public function editDomainStatus(){
+    public function editDomainStatus()
+    {
         //查看当前域名是否有项目在使用
-        if($this->param['status'] != $this->model::STATUS_ONE){
-            $info = $this->model->read(['id'=>$this->param['id']]);
-            if($info === false){
+        if ($this->param['status'] != $this->model::STATUS_ONE) {
+            $info = $this->model->read(['id' => $this->param['id']]);
+            if ($info === false) {
                 $this->fail('当前域名有项目正在使用中');
             }
         }
-        $rs = $this->model->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
-        if($rs === false){
+        $rs = $this->model->edit(['status' => $this->param['status']], ['id' => $this->param['id']]);
+        if ($rs === false) {
             $this->fail('error');
         }
         return $this->success();
@@ -104,21 +107,23 @@ class DomainInfoLogic extends BaseLogic
      * @method :post
      * @time   :2023/8/1 16:10
      */
-    public function getProjectList($map){
+    public function getProjectList($map)
+    {
         $projectModel = new Project();
-        $lists = $projectModel->list($map,'id',['id','title']);
+        $lists = $projectModel->list($map, 'id', ['id', 'title']);
         return $this->success($lists);
     }
     /**
      * 删除域名
      */
-    public function delDomain(){
+    public function delDomain()
+    {
         $ids = $this->param['id'];
         // 初始化数据
         if (FALSE == is_array($ids))
             $ids = [$ids];
-        foreach ($ids as $k => $v){
+        foreach ($ids as $k => $v) {
             $domain = DomainInfo::where(['id' => $v])->first();
             if (empty($domain))
                 continue;
@@ -130,13 +135,14 @@ class DomainInfoLogic extends BaseLogic
     }
-    public function infoDomain(){
-        $info = $this->model->read(['id'=>$this->param['id']]);
-        if($info === false){
+    public function infoDomain()
+    {
+        $info = $this->model->read(['id' => $this->param['id']]);
+        if ($info === false) {
             $this->fail('当前数据不存在或者已被删除');
         }
-        if(!empty($info['project_id'])){
-            $info['company'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
+        if (!empty($info['project_id'])) {
+            $info['company'] = (new Project())->read(['id' => $info['project_id']], ['title'])['title'];
         }
         return $this->success($info);
     }
@@ -148,40 +154,41 @@ class DomainInfoLogic extends BaseLogic
      * @method :post
      * @time   :2023/11/6 10:50
      */
-    public function sslSave(){
-        $info = $this->model->read(['id'=>$this->param['id']]);
-        if($info === false || empty($info['domain'])){
+    public function sslSave()
+    {
+        $info = $this->model->read(['id' => $this->param['id']]);
+        if ($info === false || empty($info['domain'])) {
             $this->fail('当前数据不存在或者已被删除');
         }
         //获取项目数据
         $project_model = new Project();
-        $project_info = $project_model->read(['id'=>$info['project_id']],'serve_id');
-        if($project_info === false){
+        $project_info = $project_model->read(['id' => $info['project_id']], 'serve_id');
+        if ($project_info === false) {
             $this->fail('获取项目数据失败');
         }
         $serverIpModel = new ServersIp();
-        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip','domain']);
-        if($serversIpInfo === false){
+        $serversIpInfo = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id', 'ip', 'domain']);
+        if ($serversIpInfo === false) {
             $this->fail('获取服务器数据失败');
         }
-        if($serversIpInfo['servers_id'] == ServerConfig::SELF_TEST_ID){
+        if ($serversIpInfo['servers_id'] == ServerConfig::SELF_TEST_ID) {
             $this->fail('请切换服务器,生成站点不能使用测试服务器');
         }
-        if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
-            $this->model->edit(['amp_status' => $this->param['amp_status'] ?? 0],['id'=>$this->param['id']]);
-            $this->fail('自建站服务器无法生成站点');
+        if ($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID) {
+            $this->model->edit(['amp_status' => $this->param['amp_status'] ?? 0], ['id' => $this->param['id']]);
+            $this->fail('自建站服务器无需生成站点');
         }
         //域名是否都已经解析
-        if(!check_domain_record($info['domain'], $serversIpInfo)){
+        if (!check_domain_record($info['domain'], $serversIpInfo)) {
             $this->fail('域名' . $info['domain'] . '未解析至目标服务器');
         }
         $domain_301 = '';
-        foreach ($this->param['other_domain']??[] as $other_domain){
-            if($other_domain && substr($other_domain,0,2) != '*.'){
-                if(check_domain_record($other_domain,['domain'=>'','ip'=>DomainInfo::SERVER_IP_301])){
+        foreach ($this->param['other_domain'] ?? [] as $other_domain) {
+            if ($other_domain && substr($other_domain, 0, 2) != '*.') {
+                if (check_domain_record($other_domain, ['domain' => '', 'ip' => DomainInfo::SERVER_IP_301])) {
                     $domain_301 = $other_domain;
-                }else{
-                    if(!check_domain_record($other_domain, $serversIpInfo)){
+                } else {
+                    if (!check_domain_record($other_domain, $serversIpInfo)) {
                         $this->fail('域名' . $other_domain . '未解析至目标服务器');
                     }
                 }
@@ -189,32 +196,32 @@ class DomainInfoLogic extends BaseLogic
         }
         //如果要开通amp站点，判断m域名是否已经解析
-        if(isset($this->param['amp_status']) && $this->param['amp_status'] == 1){
+        if (isset($this->param['amp_status']) && $this->param['amp_status'] == 1) {
             $domain_array = parse_url($info['domain']);
             $host = $domain_array['host'] ?? $domain_array['path'];
-            $host_array = explode('.',$host);
+            $host_array = explode('.', $host);
             if (count($host_array) <= 2) {
                 array_unshift($host_array, 'm');
             } else {
                 $host_array[0] = 'm';
             }
-            $amp_domain = implode('.',$host_array);
-            if(!check_domain_record($amp_domain, $serversIpInfo)){
+            $amp_domain = implode('.', $host_array);
+            if (!check_domain_record($amp_domain, $serversIpInfo)) {
                 $this->fail('AMP站点域名' . $amp_domain . '未解析至目标服务器');
             }
             $is_redirect = $this->param['is_redirect'] ?? 0;
-        }else{
+        } else {
             //未开通amp站，主站和m站相互跳转也自动取消
             $is_redirect = 0;
         }
         $not_allow_ip = array_filter($this->param['not_allow_ip'] ?? []);
-        if($not_allow_ip){
+        if ($not_allow_ip) {
             //判断禁止访问IP是否填写正确
-            foreach ($not_allow_ip as $vn){
-                $vn_count = count(explode('.',$vn));
-                if($vn_count != 4){
+            foreach ($not_allow_ip as $vn) {
+                $vn_count = count(explode('.', $vn));
+                if ($vn_count != 4) {
                     $this->fail('禁止访问IP填写有误');
                 }
             }
@@ -222,9 +229,9 @@ class DomainInfoLogic extends BaseLogic
         $extend_config = [];
         $unique_extend = [];
-        if(isset($this->param['extend_config']) && $this->param['extend_config']){
-            foreach ($this->param['extend_config'] as $k=>$v){
-                if($v['origin'] && (!in_array($v['origin'],$unique_extend))){
+        if (isset($this->param['extend_config']) && $this->param['extend_config']) {
+            foreach ($this->param['extend_config'] as $k => $v) {
+                if ($v['origin'] && (!in_array($v['origin'], $unique_extend))) {
                     $unique_extend[] = $v['origin'];
                     $extend_config[] = $v;
                 }
@@ -233,38 +240,46 @@ class DomainInfoLogic extends BaseLogic
         $amp_extend_config = [];
         $amp_unique_extend = [];
-        if(isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']){
-            foreach ($this->param['amp_extend_config'] as $ka=>$va){
-                if($va['origin'] && (!in_array($va['origin'],$amp_unique_extend))){
+        if (isset($this->param['amp_extend_config']) && $this->param['amp_extend_config']) {
+            foreach ($this->param['amp_extend_config'] as $ka => $va) {
+                if ($va['origin'] && (!in_array($va['origin'], $amp_unique_extend))) {
                     $amp_unique_extend[] = $va['origin'];
                     $amp_extend_config[] = $va;
                 }
             }
         }
+        //小语种为二级目录的站点，强制跳转https
+        $is_https = $this->param['is_https'] ?? 0;
+        $buildModel = new DeployBuild();
+        $build_info = $buildModel->read(['project_id' => $info['project_id']], ['linking_format']);
+        if ($build_info && $build_info['linking_format'] == 1) {
+            $is_https = 1;
+        }
+
         //保存301跳转数据+其他域名
         $data = [
-            'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
-            'extend_config'=>json_encode($extend_config),
-            'type'=>$this->param['type'],
+            'other_domain' => json_encode(array_filter($this->param['other_domain'] ?? [])),
+            'extend_config' => json_encode($extend_config),
+            'type' => $this->param['type'],
             'private_key' => $this->param['key'] ?? '',
             'private_cert' => $this->param['cert'] ?? '',
-            'is_https' => $this->param['is_https'] ?? 0,
+            'is_https' => $is_https,
             'amp_status' => $this->param['amp_status'] ?? 0,
             'amp_type' => $this->param['amp_type'] ?? 0,
-            'amp_extend_config'=>json_encode($amp_extend_config),
+            'amp_extend_config' => json_encode($amp_extend_config),
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
-            'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
-            'not_allow_ip'=>json_encode($not_allow_ip),
+            'not_allow_country' => json_encode(array_filter($this->param['not_allow_country'] ?? [])),
+            'not_allow_ip' => json_encode($not_allow_ip),
             'is_redirect' => $is_redirect,
         ];
-        $this->model->edit($data,['id'=>$this->param['id']]);
+        $this->model->edit($data, ['id' => $this->param['id']]);
         //新增建站任务
         $task_model = new DomainCreateTask();
-        $task_info = $task_model->read(['type'=>DomainCreateTask::TYPE_MAIN,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
-        if(!$task_info){
+        $task_info = $task_model->read(['type' => DomainCreateTask::TYPE_MAIN, 'domain_id' => $this->param['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+        if (!$task_info) {
             $task_model->add([
                 'server_id' => $serversIpInfo['servers_id'],
                 'project_id' => $info['project_id'],
@@ -272,9 +287,9 @@ class DomainInfoLogic extends BaseLogic
                 'type' => DomainCreateTask::TYPE_MAIN
             ]);
         }
-        if($data['amp_status']){
-            $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_AMP,'domain_id'=>$this->param['id'],'status'=>['<',DomainCreateTask::STATUS_SUC]]);
-            if(!$task_amp_info){
+        if ($data['amp_status']) {
+            $task_amp_info = $task_model->read(['type' => DomainCreateTask::TYPE_AMP, 'domain_id' => $this->param['id'], 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            if (!$task_amp_info) {
                 $task_model->add([
                     'server_id' => $serversIpInfo['servers_id'],
                     'project_id' => $info['project_id'],
@@ -286,11 +301,11 @@ class DomainInfoLogic extends BaseLogic
         //新增重定向任务
         $redirect_model = new DomainRedirectTask();
-        if($domain_301){
-            $task_redirect_info = $redirect_model->read(['origin_domain'=>$domain_301]);
-            if(!$task_redirect_info){
+        if ($domain_301) {
+            $task_redirect_info = $redirect_model->read(['origin_domain' => $domain_301]);
+            if (!$task_redirect_info) {
                 $redirect_model->add([
-                    'origin_domain'=> $domain_301,
+                    'origin_domain' => $domain_301,
                     'other_domain' => json_encode([]),
                     'target_domain' => $info['domain']
                 ]);
@@ -307,63 +322,64 @@ class DomainInfoLogic extends BaseLogic
      * @author Akun
      * @date 2024/03/05 9:48
      */
-    public function country_custom($project_id){
+    public function country_custom($project_id)
+    {
         $project_model = new Project();
-        $project_info = $project_model->read(['id'=>$project_id],'serve_id');
-        if($project_info === false){
+        $project_info = $project_model->read(['id' => $project_id], 'serve_id');
+        if ($project_info === false) {
             $this->fail('获取项目数据失败');
         }
         $custom_model = new CountryCustom();
-        if($this->param['is_create']){
+        if ($this->param['is_create']) {
             //需要创建站点
             $serverIpModel = new ServersIp();
-            $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip','domain']);
-            if($serversIpInfo === false){
+            $serversIpInfo = $serverIpModel->read(['id' => $project_info['serve_id']], ['servers_id', 'ip', 'domain']);
+            if ($serversIpInfo === false) {
                 $this->fail('获取服务器数据失败');
             }
-            if($serversIpInfo['servers_id'] == ServerConfig::SELF_TEST_ID){
+            if ($serversIpInfo['servers_id'] == ServerConfig::SELF_TEST_ID) {
                 $this->fail('请切换服务器,生成站点不能使用测试服务器');
             }
-            if($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID){
+            if ($serversIpInfo['servers_id'] == ServerConfig::SELF_SITE_ID) {
                 $this->fail('自建站服务器无法生成站点');
             }
             //域名是否都已经解析
-            if(strpos($this->param['custom_domain'],'//') === false){
-                $this->param['custom_domain'] = '//'.$this->param['custom_domain'];
+            if (strpos($this->param['custom_domain'], '//') === false) {
+                $this->param['custom_domain'] = '//' . $this->param['custom_domain'];
             }
             $domain_arr = parse_url($this->param['custom_domain']);
-            if(!isset($domain_arr['host'])){
+            if (!isset($domain_arr['host'])) {
                 $this->fail('自定义域名填写错误');
             }
             $this->param['custom_domain'] = $domain_arr['host'];
             //判断域名是否已经被使用
-            $has_info = $custom_model->read(['custom_domain'=>$this->param['custom_domain']]);
-            if($has_info && ($has_info['project_id'] != $project_id || $has_info['language_id'] != $this->param['language_id'])){
+            $has_info = $custom_model->read(['custom_domain' => $this->param['custom_domain']]);
+            if ($has_info && ($has_info['project_id'] != $project_id || $has_info['language_id'] != $this->param['language_id'])) {
                 $this->fail('自定义域名已被使用');
             }
-            if(!check_domain_record($this->param['custom_domain'], $serversIpInfo)){
+            if (!check_domain_record($this->param['custom_domain'], $serversIpInfo)) {
                 $this->fail('域名' . $this->param['custom_domain'] . '未解析至目标服务器');
             }
-        }else{
-            $this->param['custom_domain'] = str_replace('https://','',$this->param['custom_domain']);
-            $this->param['custom_domain'] = str_replace('http://','',$this->param['custom_domain']);
-            $this->param['custom_domain'] = str_replace('//','',$this->param['custom_domain']);
+        } else {
+            $this->param['custom_domain'] = str_replace('https://', '', $this->param['custom_domain']);
+            $this->param['custom_domain'] = str_replace('http://', '', $this->param['custom_domain']);
+            $this->param['custom_domain'] = str_replace('//', '', $this->param['custom_domain']);
         }
-        $info = $custom_model->read(['project_id'=>$project_id,'language_id'=>$this->param['language_id']]);
-        if($info === false){
+        $info = $custom_model->read(['project_id' => $project_id, 'language_id' => $this->param['language_id']]);
+        if ($info === false) {
             $this->param['project_id'] = $project_id;
             $id = $custom_model->addReturnId($this->param);
-        }else{
-            $custom_model->edit($this->param,['id'=>$info['id']]);
+        } else {
+            $custom_model->edit($this->param, ['id' => $info['id']]);
             $id = $info['id'];
         }
-        if($this->param['is_create']){
+        if ($this->param['is_create']) {
             $task_model = new DomainCreateTask();
-            $task_amp_info = $task_model->read(['type'=>DomainCreateTask::TYPE_CUSTOM,'domain_id'=>$id,'status'=>['<',DomainCreateTask::STATUS_SUC]]);
-            if(!$task_amp_info){
+            $task_amp_info = $task_model->read(['type' => DomainCreateTask::TYPE_CUSTOM, 'domain_id' => $id, 'status' => ['<', DomainCreateTask::STATUS_SUC]]);
+            if (!$task_amp_info) {
                 $task_model->add([
                     'server_id' => $serversIpInfo['servers_id'],
                     'project_id' => $project_id,