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

@@ -612,6 +612,7 @@ class ProjectUpdate extends Command
                                                     'module_id' => $custom_info['id'],
                                                     'module_id' => $custom_info['id'],
                                                     'category_id' => $category_id,
                                                     'category_id' => $category_id,
                                                     'content' => $item['content'] ?? '',
                                                     'content' => $item['content'] ?? '',
+                                                    'sort' => $item['sort'] ?? 0,
                                                     'image' => $new_img,
                                                     'image' => $new_img,
                                                     'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
@@ -628,6 +629,7 @@ class ProjectUpdate extends Command
                                                     'name' => $item['title'],
                                                     'name' => $item['title'],
                                                     'category_id' => $category_id,
                                                     'category_id' => $category_id,
                                                     'content' => $item['content'] ?? '',
                                                     'content' => $item['content'] ?? '',
+                                                    'sort' => $item['sort'] ?? 0,
                                                     'image' => $new_img
                                                     'image' => $new_img
                                                 ], ['id' => $id]);
                                                 ], ['id' => $id]);
                                             }
                                             }

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
+use App\Utils\LogUtils;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Arr;
 
 
@@ -31,13 +32,15 @@ class ProductController extends BaseController
         }
         }
 
 
         try {
         try {
-            $gallery = Product::where('status', Product::STATUS_ON)->whereNotNull('gallery')->inRandomOrder()->value('gallery');
-            $gallery = array_map(function ($item) use ($project) {
-                return getImageUrl($item, $project['storage_type'], $project['project_location']);
-            }, Arr::pluck($gallery, 'url'));
+            $info = Product::where('status', Product::STATUS_ON)->whereNotNull('gallery')->inRandomOrder()->select(['title', 'seo_mate', 'gallery'])->first();
+            $info['gallery'] = array_map(function ($item) use ($project) {
+                 $item['url'] = getImageUrl($item['url'], $project['storage_type'], $project['project_location']);
+                 return $item;
+            }, $info['gallery']);
         } catch (\Exception $e) {
         } catch (\Exception $e) {
-            $gallery = [];
+            LogUtils::error('Project Id: ' . $project_id . ' getProductImages error:' . $e->getMessage());
+            $info = [];
         }
         }
-        $this->response('success', Code::SUCCESS, $gallery);
+        $this->response('success', Code::SUCCESS, $info);
     }
     }
 }
 }

@@ -251,11 +251,11 @@ class DomainInfoLogic extends BaseLogic
         foreach ($output as $line){
         foreach ($output as $line){
             if($line){
             if($line){
                 $checkA = strpos($line, $server_info['host']) !== false;
                 $checkA = strpos($line, $server_info['host']) !== false;
+                if($checkA){
+                    return $domain;
+                }
             }
             }
         }
         }
-        if($checkA){
-            return $domain;
-        }
 
 
         //是否cname
         //是否cname
         $process = new Process(['nslookup', '-qt=cname', $domain]);
         $process = new Process(['nslookup', '-qt=cname', $domain]);
@@ -264,12 +264,11 @@ class DomainInfoLogic extends BaseLogic
         foreach ($output as $line){
         foreach ($output as $line){
             if($line){
             if($line){
                 $checkCname = (strpos($line, $server_info['init_domain']) !== false);
                 $checkCname = (strpos($line, $server_info['init_domain']) !== false);
+                if($checkCname){
+                    return $domain;
+                }
             }
             }
         }
         }
-        if($checkCname){
-            return $domain;
-
-        }
         return false;
         return false;
     }
     }
 }
 }