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

@@ -153,7 +153,7 @@ class BaseController extends Controller
             $cos = new CosService();
             $cos = new CosService();
             $url = $cos->getImageUrl($info['path']);
             $url = $cos->getImageUrl($info['path']);
         }else{
         }else{
-            $url = url('b/image/'.$info['hash']);
+            $url = url('a/image/'.$info['hash']);
         }
         }
         return $url;
         return $url;
     }
     }
@@ -172,7 +172,7 @@ class BaseController extends Controller
             $cos = new CosService();
             $cos = new CosService();
             $url = $cos->getImageUrl($info['path']);
             $url = $cos->getImageUrl($info['path']);
         }else{
         }else{
-            $url = url('b/file_hash/'.$info['hash']);
+            $url = url('a/file/'.$info['hash']);
         }
         }
         return $url;
         return $url;
     }
     }

 <?php
 <?php
 
 
-namespace App\Http\Controllers\Aside\Project;
+namespace App\Http\Controllers\Aside\Optimize;
 
 
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 
 
 /**
 /**
- * @remark :项目关键词
+ * @remark :关键字查询案例
  * @class  :KeywordsController.php
  * @class  :KeywordsController.php
  * @author :lyh
  * @author :lyh
  * @time   :2023/7/17 9:51
  * @time   :2023/7/17 9:51
@@ -19,7 +19,7 @@ class KeywordsController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/7/17 9:52
      * @time   :2023/7/17 9:52
      */
      */
-    public function getKeywordCase(){
+    public function getSearchKeyword(){
 
 
     }
     }
 }
 }

@@ -352,7 +352,7 @@ class FileController
             $cos = new CosService();
             $cos = new CosService();
             $url = $cos->getImageUrl($info['path']);
             $url = $cos->getImageUrl($info['path']);
         }else{
         }else{
-            $url = url('b/file_hash/'.$info['hash']);
+            $url = url('a/file/'.$info['hash']);
         }
         }
         return $url;
         return $url;
     }
     }

@@ -403,7 +403,7 @@ class Logic
                 $cos = new CosService();
                 $cos = new CosService();
                 $url = $cos->getImageUrl($info['path']);
                 $url = $cos->getImageUrl($info['path']);
             }else{
             }else{
-                $url = url('b/image/'.$info['hash']);
+                $url = url('a/image/'.$info['hash']);
             }
             }
         }
         }
 
 

-<?php
-
-namespace App\Models\Bside;
-
-use App\Models\Base;
-
-/**
- * 模板 头部底部 客户自己的
- * @author：dc
- * @time 2023/4/26 11:21
- * Class TemplateHeaderFooter
- * @package App\Models\Bside
- */
-class TemplateHeaderFooter extends Base
-{
-    protected $table = 'gl_bside_template_header_footer';
-}

-<?php
-
-namespace App\Models\Project;
-
-use App\Models\Base;
-
-/**
- * @remark :项目关键字
- * @class  :Keywords.php
- * @author :lyh
- * @time   :2023/7/17 9:46
- */
-class Keywords extends Base
-{
-    protected $table = 'gl_project_keyword';
-}

@@ -12,19 +12,19 @@ class ProcessRecords extends Base
     protected $table = 'gl_project_process_records';
     protected $table = 'gl_project_process_records';
 
 
     public function setRecordAttribute($value){
     public function setRecordAttribute($value){
-        foreach ($value as &$v){
-            $v['image'] = Upload::url2path($v['image']);
-            $v['file'] = Upload::url2path($v['file']);
-        }
+//        foreach ($value as &$v){
+//            $v['image'] = Upload::url2path($v['image']);
+//            $v['file'] = Upload::url2path($v['file']);
+//        }
         $this->attributes['record'] = Arr::a2s($value);
         $this->attributes['record'] = Arr::a2s($value);
     }
     }
 
 
     public function getRecordAttribute($value){
     public function getRecordAttribute($value){
         $value = Arr::s2a($value);
         $value = Arr::s2a($value);
-        foreach ($value as &$v){
-            $v['image'] = Upload::path2url($v['image']);
-            $v['file'] = Upload::path2url($v['file']);
-        }
+//        foreach ($value as &$v){
+//            $v['image'] = Upload::path2url($v['image']);
+//            $v['file'] = Upload::path2url($v['file']);
+//        }
         return $value;
         return $value;
     }
     }