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

lyh
app/Http/Controllers/Aside/Devops/ServersIpController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Aside/Devops/ServersIpLogic.php
app/Http/Logic/Aside/Domain/DomainInfoLogic.php
app/Jobs/EditAmpDomainBt.php
app/Jobs/EditCustomDomainBt.php
app/Jobs/EditDomainBt.php
--- a/app/Http/Controllers/Aside/Devops/ServersIpController.php
查看文件 @d2f3655
+++ b/app/Http/Controllers/Aside/Devops/ServersIpController.php
查看文件 @d2f3655
@@ -39,6 +39,7 @@ class ServersIpController extends BaseController
         }
         $serversIpModel = new ServersIpModel();
         $this->map['total'] = ['<',$info['ip_total']];
+        $this->map['status'] = 0;
         $data = $serversIpModel->list($this->map);
         $this->response('success',Code::SUCCESS,$data);
     }
@@ -57,6 +58,7 @@ class ServersIpController extends BaseController
             'servers_id.required' => '服务器servers_id不能为空'
         ]);
         $serversIpModel = new ServersIpModel();
+        $this->map['status'] = 0;
         $data = $serversIpModel->lists($this->map,$this->page,$this->row,$this->order);
         $this->response('success',Code::SUCCESS,$data);
     }
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @d2f3655
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @d2f3655
@@ -61,7 +61,7 @@ class ProductController extends BaseController
             foreach ($lists['list'] as $k=>$v){
                 $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']);;
                 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
-                $v['keyword_id_text'] = mb_substr($this->keywordName($v['keyword_id'],$key_data), 0, 20, 'UTF-8').'...';
+                $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $v = $this->getHandleFileImage($v);
--- a/app/Http/Logic/Aside/Devops/ServersIpLogic.php
查看文件 @d2f3655
+++ b/app/Http/Logic/Aside/Devops/ServersIpLogic.php
查看文件 @d2f3655
@@ -98,12 +98,12 @@ class ServersIpLogic extends BaseLogic
      * @time   :2024/6/27 13:55
      */
     public function batchDelServersIp(){
-        foreach ($this->param['ids'] as $v){
-            $info = $this->model->read(['id'=>$v['id']],['total']);
+        foreach ($this->param['ids'] as $id){
+            $info = $this->model->read(['id'=>$id],['total']);
             if($info['total'] != 0){
                 continue;
             }
-            $this->model->edit(['status'=>1],['id'=>$v]);
+            $this->model->edit(['status'=>1],['id'=>$id]);
         }
         return $this->success();
     }
--- a/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @d2f3655
+++ b/app/Http/Logic/Aside/Domain/DomainInfoLogic.php
查看文件 @d2f3655
@@ -8,6 +8,7 @@ use App\Jobs\EditAmpDomainBt;
 use App\Jobs\EditCustomDomainBt;
 use App\Jobs\EditDomainBt;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\CountryCustom;
@@ -260,10 +261,13 @@ class DomainInfoLogic extends BaseLogic
             $this->fail('获取项目数据失败');
         }
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if($server_info === false){
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if($serversIpInfo === false){
             $this->fail('获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         if($project_info['serve_id'] == 9){
             $this->fail('请切换服务器,生成站点不能使用测试服务器');
         }
@@ -378,11 +382,13 @@ class DomainInfoLogic extends BaseLogic
         if($this->param['is_create']){
             //需要创建站点
             $serverIpModel = new ServersIp();
-            $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-            if($server_info === false){
+            $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+            if($serversIpInfo === false){
                 $this->fail('获取服务器数据失败');
             }
-
+            $serverModel = new Servers();
+            $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+            $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
             //域名是否都已经解析
             if(strpos($this->param['custom_domain'],'//') === false){
                 $this->param['custom_domain'] = '//'.$this->param['custom_domain'];
--- a/app/Jobs/EditAmpDomainBt.php
查看文件 @d2f3655
+++ b/app/Jobs/EditAmpDomainBt.php
查看文件 @d2f3655
@@ -3,6 +3,7 @@
 namespace App\Jobs;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
@@ -54,10 +55,13 @@ class EditAmpDomainBt implements ShouldQueue
         }
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['domain'] . ':获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑amp站
         $api_url_amp = 'http://' . $server_info['domain'] . '/api/createSiteAmp';
         $api_param_amp = [
--- a/app/Jobs/EditCustomDomainBt.php
查看文件 @d2f3655
+++ b/app/Jobs/EditCustomDomainBt.php
查看文件 @d2f3655
@@ -3,6 +3,7 @@
 namespace App\Jobs;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Project\CountryCustom;
 use App\Models\Project\Project;
@@ -53,10 +54,13 @@ class EditCustomDomainBt implements ShouldQueue
         }
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['custom_domain'] . ':获取服务器数据失败');
         }
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑站点
         if ($domain_info['type'] == 2) {
             $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';
--- a/app/Jobs/EditDomainBt.php
查看文件 @d2f3655
+++ b/app/Jobs/EditDomainBt.php
查看文件 @d2f3655
@@ -3,6 +3,7 @@
 namespace App\Jobs;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\Servers;
 use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
@@ -55,11 +56,13 @@ class EditDomainBt implements ShouldQueue
         //获取服务器数据
         $serverIpModel = new ServersIp();
-        $server_info = $serverIpModel->read(['id'=>$project_info['serve_id']],['domain', 'ip']);
-        if ($server_info === false) {
+        $serversIpInfo = $serverIpModel->read(['id'=>$project_info['serve_id']],['servers_id','ip']);
+        if ($serversIpInfo === false) {
             return $this->output($domain_info['domain'] . ':获取服务器数据失败');
         }
-
+        $serverModel = new Servers();
+        $serverInfo = $serverModel->read(['id'=>$serversIpInfo['servers_id']],['init_domain']);
+        $server_info = ['domain'=>$serverInfo['init_domain'],'ip'=>$serversIpInfo['ip']];
         //编辑主站
         if ($domain_info['type'] == 2) {
             $api_url = 'http://' . $server_info['domain'] . '/api/setSsl';