合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1234

@@ -306,7 +306,7 @@ class DownloadProject extends Command
         }
         $arr[] = $content4;
         foreach ($arr as $key => $val){
-            $content .= ($key+1).','.$val;
+            $content .= ($key+1).','.$val."/n";
         }
         $timestamp = strtotime('tomorrow 9:00 AM');
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);

@@ -41,7 +41,6 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/21 18:35
      */
     public function productSave(){
-        try {
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $data = $this->editProduct();
         }else{
@@ -51,10 +50,6 @@ class ProductLogic extends  BaseLogic
         KeywordRelated::saveRelated($data['id'],$this->param['keyword_id'] ?? []);//关键字关联
         $this->saveExtendInfo($data['id'],$this->param['extend'] ?? []);//扩展字段
         $this->saveDetail($data['id'],$this->param['detail'] ?? []);
-        }catch (\Exception $e){
-            Log::info('错误信息---'.$e->getMessage());
-            $this->fail('系统错误,请联系管理员');
-        }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$data['route'] ?? '');
         $this->curlDelRoute(['new_route'=>$data['route'] ?? '']);
         return $this->success(['id'=>$data['id']]);