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

刘锟
app/Console/Commands/SyncFilesImage/SyncImage.php
app/Http/Controllers/Api/WorkOrder/TicketUploadDataController.php
--- a/app/Console/Commands/SyncFilesImage/SyncImage.php
查看文件 @a497c3b
+++ b/app/Console/Commands/SyncFilesImage/SyncImage.php
查看文件 @a497c3b
@@ -32,34 +32,36 @@ class SyncImage extends Command
     protected $description = '同步图片与文件';
-    public function handle(){
-        $str = $this->getProjectConfig(4240);
-        $imageModel  = new Image();
-        $lists = $imageModel->selectField(['project_id'=>4240],'path');
-        $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
-        foreach ($lists as  $v){
-            $url = $domain . $v.'?'.$str;
-            echo date('Y-m-d H:i:s') . '水印路径:'. $url . PHP_EOL;
-            $cdu_url = $this->coverOriginalImage($url,$v);
-            echo date('Y-m-d H:i:s') . '返回的url:'. $cdu_url . PHP_EOL;
-        }
-        return  true;
-    }
-
 //    public function handle(){
-//        $data = [];
-//        $domain = 'https://ecdn6.globalso.com/';
+//        $str = $this->getProjectConfig(4240);
 //        $imageModel  = new Image();
-//        $lists = $imageModel->list(['project_id'=>1808]);
-//        foreach ($lists as $k => $v){
-//            $url = $domain . $v['path'];
-//            echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
-//            $data[] = $url;
+//        $strImage = '/upload/p/4240/image_other/2025-09/picture-18-copy-3.jpg,/upload/p/4240/image_other/2025-09/picture-17-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-16-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-12-copy-3.jpg,/upload/p/4240/image_other/2025-09/picture-5-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-6-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-10-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-11-copy-2.jpg,/upload/p/4240/image_other/2025-09/4-1.jpg,/upload/p/4240/image_other/2025-09/picture-18-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-16-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-17-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-15-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-13-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-14-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-12-copy-2.jpg,/upload/p/4240/image_other/2025-09/picture-10-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-11-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-20-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-18-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-19-copy-1.jpg,/upload/p/4240/image_other/2025-09/image-1-copy.jpg,/upload/p/4240/image_other/2025-09/image-2-copy.jpg,/upload/p/4240/image_other/2025-09/picture-3-copy.jpg,/upload/p/4240/image_other/2025-09/picture-6-copy.jpg,/upload/p/4240/image_other/2025-09/picture-4-copy.jpg,/upload/p/4240/image_other/2025-09/picture-5-copy.jpg,/upload/p/4240/image_other/2025-09/picture-9-copy.jpg,/upload/p/4240/image_other/2025-09/picture-7-copy.jpg,/upload/p/4240/image_other/2025-09/picture-8-copy.jpg,/upload/p/4240/image_other/2025-09/picture-15-copy-1.jpg,/upload/p/4240/image_other/2025-09/picture-14-copy.jpg,/upload/p/4240/image_other/2025-09/picture-13-copy.jpg,/upload/p/4240/image_other/2025-09/picture-12-copy-1.jpg,/upload/p/4240/image_other/2025-08/picture-44-copy.jpg,/upload/p/4240/image_other/2025-08/45.jpg,/upload/p/4240/image_other/2025-09/picture-10-copy.jpg,/upload/p/4240/image_other/2025-09/picture-11-copy.jpg,/upload/p/4240/image_other/2025-08/43.jpg,/upload/p/4240/image_other/2025-08/42.jpg,/upload/p/4240/image_other/2025-08/picture-38-copy.jpg,/upload/p/4240/image_other/2025-08/picture-37-copy.jpg,/upload/p/4240/image_other/2025-08/picture-36-copy.jpg,/upload/p/4240/image_other/2025-08/picture-35-copy-1.jpg,/upload/p/4240/image_other/2025-08/picture-30-copy.jpg,/upload/p/4240/image_other/2025-08/29.jpg,/upload/p/4240/image_other/2025-08/28-1.jpg,/upload/p/4240/image_other/2025-08/27-1.jpg,/upload/p/4240/image_other/2025-08/picture-23-copy.jpg,/upload/p/4240/image_other/2025-08/22-1.jpg,/upload/p/4240/image_other/2025-08/21.jpg,/upload/p/4240/image_other/2025-08/17.jpg,/upload/p/4240/image_other/2025-08/16.jpg,/upload/p/4240/image_other/2025-08/picture-15-copy.jpg,/upload/p/4240/image_other/2025-08/11-2.jpg,/upload/p/4240/image_other/2025-08/10-1.jpg,/upload/p/4240/image_other/2025-08/picture-6.jpg,/upload/p/4240/image_other/2025-08/picture-5.jpg,/upload/p/4240/image_other/2025-08/picture-4.jpg,/upload/p/4240/image_other/2025-08/api-standard-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/gb-standard-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/gost-standard-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/jis-standard-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/asmeastm-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/en-standard-welded-pipe.jpg,/upload/p/4240/image_other/2025-08/api-corrosion-resistant-alloy-cra-pipe.jpg,/upload/p/4240/image_other/2025-08/nickel-alloy-seamless-pipe.jpg,/upload/p/4240/image_other/2025-08/duplexsuper-duplex-seamless-pipe.jpg,/upload/p/4240/image_other/2025-08/super-austenitic-seamless-pipe.jpg,/upload/p/4240/image_other/2025-08/austenitic-stainless-steel-seamless-pipe.jpg,/upload/p/4240/image_other/2025-08/thick-zinc-coated-pipe.jpg,/upload/p/4240/image_other/2025-08/galvanized-fbe-pipe.jpg,/upload/p/4240/image_other/2025-08/electro-galvanized-pipe.jpg,/upload/p/4240/image_other/2025-08/hot-dip-galvanized-pipe.jpg,/upload/p/4240/image_other/2025-08/q235-galvanized-pipe.jpg,/upload/p/4240/image_other/2025-08/q195-galvanized-pipe.jpg,/upload/p/4240/image_other/2025-08/bare-ssaw-steel-pipe.jpg,/upload/p/4240/image_other/2025-08/fbe-coated-ssaw-steel-pipe.jpg,/upload/p/4240/image_other/2025-08/x52-ssaw-steel-pipe.jpg,/upload/p/4240/image_other/2025-08/q235b-ssaw-steel-pipe.jpg,/upload/p/4240/image_other/2025-08/low-alloy-steel-erw-pipe.jpg,/upload/p/4240/image_other/2025-08/carbon-steel-erw-pipe.jpg,/upload/p/4240/image_other/2025-08/black-carbon-steel-pipe.jpg,/upload/p/4240/image_other/2025-08/picture-19-copy.jpg,/upload/p/4240/image_other/2025-08/hydrogen-energy-skid.jpg';
+////        $lists = $imageModel->selectField(['project_id'=>4240],'path');
+//        $lists = explode(',',$strImage);
+//        $domain = 'http://globalso-v6-1309677403.cos.ap-hongkong.myqcloud.com';//cos域名
+//        foreach ($lists as  $v){
+//            $url = $domain . $v.'?'.$str;
+//            echo date('Y-m-d H:i:s') . '水印路径:'. $url . PHP_EOL;
+//            $cdu_url = $this->coverOriginalImage($url,$v);
+//            echo date('Y-m-d H:i:s') . '返回的url:'. $cdu_url . PHP_EOL;
 //        }
-//        $yunService = new UpyunService();
-//        return $yunService->preheatPush($data);
+//        return  true;
 //    }
+    public function handle(){
+        $data = [];
+        $domain = 'https://ecdn6.globalso.com/';
+        $imageModel  = new Image();
+        $lists = $imageModel->list(['project_id'=>4240]);
+        foreach ($lists as $k => $v){
+            $url = $domain . $v['path'];
+            echo date('Y-m-d H:i:s') . '刷新路径:'. $url .',主键id：'. $v['id'] . PHP_EOL;
+            $data[] = $url;
+        }
+        $yunService = new UpyunService();
+        return $yunService->preheatPush($data);
+    }
+
     /**
      * @remark :添加水印后保存图片（覆盖/非覆盖的文件未存入数据库）
      * @name   :uploadImages
--- a/app/Http/Controllers/Api/WorkOrder/TicketUploadDataController.php
查看文件 @a497c3b
+++ b/app/Http/Controllers/Api/WorkOrder/TicketUploadDataController.php
查看文件 @a497c3b
@@ -362,11 +362,11 @@ class TicketUploadDataController extends BaseController
         ]);
         ProjectServer::useProject($this->param['project_id']);
         if($this->param['type'] == 1){//增加产品分类
-            $data = $this->addProductCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addProductCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }elseif ($this->param['type'] == 2){//增加blog分类
-            $data = $this->addBlogCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addBlogCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }else{
-            $data = $this->addNewsCategory($this->param['title'],$this->param['project_id']);
+            $data = $this->addNewsCategory($this->param['title'],$this->param['project_id'],$this->param['pid'] ?? 0);
         }
         DB::disconnect('custom_mysql');
         $this->response('success',Code::SUCCESS, $data);
@@ -379,13 +379,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @time   :2025/10/10 10:43
      */
-    public function addProductCategory($title,$project_id){
+    public function addProductCategory($title,$project_id,$pid){
         $productCateModel = new Category();
         $info = $productCateModel->read(['title'=>$title],['id','title']);
         if($info !== false){
             return $info;
         }else{
-            $id = $productCateModel->addReturnId(['title'=>$title,'project_id'=>$project_id]);
+            $id = $productCateModel->addReturnId(['title'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_PRODUCT_CATE,$id,$project_id);
             $productCateModel->edit(['route'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];
@@ -399,13 +399,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @time   :2025/10/10 10:44
      */
-    public function addBlogCategory($title,$project_id){
+    public function addBlogCategory($title,$project_id,$pid){
         $blogCateModel = new BlogCategory();
         $info = $blogCateModel->read(['name'=>$title],['id','name as title']);
         if($info !== false){
             return $info;
         }else{
-            $id = $blogCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id]);
+            $id = $blogCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_BLOG_CATE,$id,$project_id);
             $blogCateModel->edit(['alias'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];
@@ -419,13 +419,13 @@ class TicketUploadDataController extends BaseController
      * @method :post
      * @time   :2025/10/10 10:46
      */
-    public function addNewsCategory($title,$project_id){
+    public function addNewsCategory($title,$project_id,$pid){
         $newsCateModel = new NewsCategory();//增加新闻分类
         $info = $newsCateModel->read(['name'=>$title],['id','name as title']);
         if($info !== false){
             return $info;
         }else{
-            $id = $newsCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id]);
+            $id = $newsCateModel->addReturnId(['name'=>$title,'project_id'=>$project_id,'pid'=>$pid]);
             $route = RouteMap::setRoute($title,RouteMap::SOURCE_NEWS_CATE,$id,$project_id);
             $newsCateModel->edit(['alias'=>$route],['id'=>$id]);
             return ['id'=>$id,'title'=>$title];