Merge remote-tracking branch 'origin/master' into akun

@@ -226,7 +226,7 @@ class DownloadProject extends Command
                     $country .= $k.'、';
                     $country .= $k.'、';
                 };
                 };
                 $country = trim($country,'、');
                 $country = trim($country,'、');
-                $content1 = '询盘主要来源于'.$country.'等国家地区';
+                $content1 .= '询盘主要来源于'.$country.'等国家地区';
             }
             }
             $content1 .= '如有高质量客户，请您密切关注与跟进;';
             $content1 .= '如有高质量客户，请您密切关注与跟进;';
         }
         }

@@ -639,9 +639,9 @@ if (!function_exists('getImageUrl')) {
                 return 'https:'.$path;
                 return 'https:'.$path;
             }
             }
             if($location == 0){
             if($location == 0){
-//                $cos = config('filesystems.disks.cos');
-//                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
-                $cosCdn = 'https://file.globalso.com';//TODO::暂时使用
+                $cos = config('filesystems.disks.cos');
+                $cosCdn = ($storage_type == 0) ? $cos['cdn'] : $cos['cdn1'];
+//                $cosCdn = 'https://file.globalso.com';//TODO::暂时使用
                 $url = $cosCdn.$path;
                 $url = $cosCdn.$path;
             }else{
             }else{
                 $s3 = config('filesystems.disks.s3');
                 $s3 = config('filesystems.disks.s3');