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

@@ -56,15 +56,15 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[2321]]]);
+        $list = $projectModel->list(['id'=>['in',[1871]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-//            $this->getProduct();
+            $this->getProduct();
 //            $this->setProductKeyword();
 //            $this->setProductKeyword();
 //            $this->getBlog();
 //            $this->getBlog();
-            $this->setCustomRoute($v['id']);
+//            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;

@@ -86,6 +86,7 @@ class CustomModuleCategoryLogic extends BaseLogic
             $this->fail('当前数据不存在或已被删除');
             $this->fail('当前数据不存在或已被删除');
         }
         }
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         $info['image'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
+        $info['banner_image'] = getImageUrl($info['banner_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -118,6 +119,9 @@ class CustomModuleCategoryLogic extends BaseLogic
         if(!isset($param['id']) || empty($param['id'])){
         if(!isset($param['id']) || empty($param['id'])){
             $param['project_id'] = $this->user['project_id'];
             $param['project_id'] = $this->user['project_id'];
         }
         }
+        if(isset($param['banner_image']) && !empty($param['banner_image'])){
+            $param['banner_image'] = str_replace_url($param['banner_image']);
+        }
         if(isset($param['image']) && !empty($param['image'])){
         if(isset($param['image']) && !empty($param['image'])){
             $param['image'] = str_replace_url($param['image']);
             $param['image'] = str_replace_url($param['image']);
         }
         }

@@ -32,10 +32,30 @@ class NewsCategoryLogic extends BaseLogic
     public function info_news_category(){
     public function info_news_category(){
         $info = $this->model->read($this->param);
         $info = $this->model->read($this->param);
         $info['url'] = $this->user['domain'] . $info['alias'];
         $info['url'] = $this->user['domain'] . $info['alias'];
+        if(!empty($info['banner_image'])){
+            $info['banner_image'] = getImageUrl($info['banner_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
     /**
     /**
+     * @remark :保存处理字段
+     * @name   :handleParam
+     * @author :lyh
+     * @method :post
+     * @time   :2024/9/13 9:15
+     */
+    public function handleParam($param)
+    {
+        if(isset($param['banner_image']) && !empty($param['banner_image'])){
+            $param['banner_image'] = str_replace_url($param['banner_image']);
+        }
+        if(isset($param['image']) && !empty($param['image'])){
+            $param['image'] = str_replace_url($param['image']);
+        }
+        return $this->success($param);
+    }
+    /**
      * @remark :保存数据
      * @remark :保存数据
      * @name   :newsCategorySave
      * @name   :newsCategorySave
      * @author :lyh
      * @author :lyh
@@ -45,6 +65,7 @@ class NewsCategoryLogic extends BaseLogic
     public function newsCategorySave(){
     public function newsCategorySave(){
         //验证名称是否存在
         //验证名称是否存在
         $this->verifyParamName($this->param['name']);
         $this->verifyParamName($this->param['name']);
+        $this->param = $this->handleParam($this->param);
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){