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

@@ -331,6 +331,7 @@ class ProjectUpdate extends Command
                                                 'status' => Product::STATUS_ON,
                                                 'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                 'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'send_time' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                 'sort' => $item['sort'] ?? 0,
                                                 'is_upgrade' => 1,
                                                 'six_read' => 1,
@@ -357,6 +358,7 @@ class ProjectUpdate extends Command
                                                         'keyword' => $item['keywords'] ?? '',
                                                         'description' => $item['description'] ?? ''
                                                     ]),
+                                                    'send_time' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                     'sort' => $item['sort'] ?? 0,
                                                 ], ['id' => $id]);
                                             }
@@ -469,6 +471,7 @@ class ProjectUpdate extends Command
                                                 'status' => $api_type == 'news' ? News::STATUS_ONE : Blog::STATUS_ONE,
                                                 'created_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                 'updated_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
+                                                'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                 'sort' => $item['sort'] ?? 0,
                                                 'is_upgrade' => 1,
                                                 'six_read' => 1,
@@ -490,6 +493,7 @@ class ProjectUpdate extends Command
                                                     'seo_description' => $item['description'] ?? '',
                                                     'text' => $item['content'] ?? '',
                                                     'image' => $new_img,
+                                                    'release_at' => $item['post_date'] ?? date('Y-m-d H:i:s'),
                                                     'sort' => $item['sort'] ?? 0,
                                                 ], ['id' => $id]);
                                             }
@@ -659,6 +663,7 @@ class ProjectUpdate extends Command
                                                     'image' => $new_img,
                                                     'created_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'updated_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
+                                                    'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                     'is_upgrade' => 1,
                                                     'six_read' => 1,
                                                     'route' => $route
@@ -676,6 +681,7 @@ class ProjectUpdate extends Command
                                                         'category_id' => $category_id,
                                                         'content' => $item['content'] ?? '',
                                                         'sort' => $item['sort'] ?? 0,
+                                                        'release_at' => $item['post_time'] ?? date('Y-m-d H:i:s'),
                                                         'image' => $new_img
                                                     ], ['id' => $id]);
                                                 }

@@ -330,4 +330,15 @@ class NewsController extends BaseController
         $lists = $news->list($this->map);
         $this->response('success',Code::SUCCESS,$lists);
     }
+
+    /**
+     * @remark :复制新闻
+     * @name   :copyNews
+     * @author :lyh
+     * @method :post
+     * @time   :2024/4/28 11:53
+     */
+    public function copyNews(NewsModel $news){
+
+    }
 }

@@ -166,9 +166,10 @@ class FileController
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $fileName = $enName;
         $i=1;
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
-            $enName = $enName .'-'.$i;
+            $enName = $fileName .'_'.$i;
             $i++;
         }
         return $enName.'.'.$nameArr[1];

@@ -226,9 +226,10 @@ class ImageController extends Controller
     public function getOnlyFilename($name,$project_id = 0){
         $nameArr = explode('.',$name);
         $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
+        $fileName = $enName;
         $i=1;
         while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
-            $enName = $enName .'-'.$i;
+            $enName = $fileName .'_'.$i;
             $i++;
         }
         return $enName.'.'.$nameArr[1];