gx

@@ -525,10 +525,8 @@ if (!function_exists('str_replace_url')) {
         // 使用 parse_url 函数来解析 URL
         // 使用 parse_url 函数来解析 URL
         $urlParts = parse_url($url);
         $urlParts = parse_url($url);
         // 检查是否存在 host（域名）部分
         // 检查是否存在 host（域名）部分
-        if (isset($urlParts['host'])) {
-            $path = $urlParts['path'];
-            // 使用 str_replace 函数删除域名信息
-            $urlWithoutDomain = str_replace('upload', '', $url);
+        if (isset($urlParts['path'])) {
+            $urlWithoutDomain = str_replace('/upload', '', $urlParts['path']);
             return $urlWithoutDomain;
             return $urlWithoutDomain;
         } else {
         } else {
             return $url;
             return $url;

@@ -259,6 +259,6 @@ class LoginController extends BaseController
     public function ceshi(){
     public function ceshi(){
         $url = "https://develop.globalso.com/upload/m/file/2023-08/64e86d1942c4c67754.psd";
         $url = "https://develop.globalso.com/upload/m/file/2023-08/64e86d1942c4c67754.psd";
         $urlParts = parse_url($url);
         $urlParts = parse_url($url);
-        return  str_replace('upload', '', $urlParts['path']);
+        str_replace('/upload', '', $urlParts['path']);
     }
     }
 }
 }

@@ -100,7 +100,6 @@ class TaskLogic extends BaseLogic
         if($ownerInfo === false){
         if($ownerInfo === false){
             $this->fail('当前工单不属于您');
             $this->fail('当前工单不属于您');
         }
         }
-        DB::beginTransaction();
         try {
         try {
             $this->model->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
             $this->model->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
             $taskOwnerModel->edit(['status'=>$this->param['status']],['task_id'=>$this->param['id']]);
             $taskOwnerModel->edit(['status'=>$this->param['status']],['task_id'=>$this->param['id']]);
@@ -113,7 +112,6 @@ class TaskLogic extends BaseLogic
     public function clearCache($id)
     public function clearCache($id)
     {
     {
         parent::clearCache($id);
         parent::clearCache($id);
-
         parent::setWith(['owner', 'follow']);
         parent::setWith(['owner', 'follow']);
         parent::clearCache($id);
         parent::clearCache($id);
     }
     }

@@ -76,7 +76,7 @@ class ATemplateModuleLogic extends BaseLogic
         if(isset($param['video']) && !empty($param['video'])){
         if(isset($param['video']) && !empty($param['video'])){
             $arr_video = [];
             $arr_video = [];
             foreach ($param['video'] as $v){
             foreach ($param['video'] as $v){
-                $arr_video[] = $v;
+                $arr_video[] = str_replace_url($v);
             }
             }
             $param['video'] = implode(',',$arr_video);
             $param['video'] = implode(',',$arr_video);
         }
         }

@@ -65,8 +65,14 @@ class ProductLogic extends  BaseLogic
      * @time   :2023/8/21 17:03
      * @time   :2023/8/21 17:03
      */
      */
     public function handleSaveParam(&$param){
     public function handleSaveParam(&$param){
-        $param['thumb'] = Arr::a2s($param['gallery'][0] ?? '');
-        $param['gallery'] = Arr::a2s($param['gallery'] ?? '');
+        if(isset($param['gallery']) && !empty($param['gallery'])){
+            foreach ($param['gallery'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $param['gallery'][$k] = $v;
+            }
+            $param['thumb'] = Arr::a2s($param['gallery'][0] ?? '');
+            $param['gallery'] = Arr::a2s($param['gallery'] ?? '');
+        }
         $param['attrs'] = Arr::a2s($param['attrs'] ?? '');
         $param['attrs'] = Arr::a2s($param['attrs'] ?? '');
         $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
         $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
         $param['category_id'] = ','.Arr::arrToSet($param['category_id']).',';
         $param['category_id'] = ','.Arr::arrToSet($param['category_id']).',';

@@ -40,7 +40,7 @@ class Product extends Base
     ];
     ];
 
 
     public function setThumbAttribute($value){
     public function setThumbAttribute($value){
-        $value['url'] = basename($value['url']);
+        $value['url'] = str_replace_url($value['url']);
         $this->attributes['thumb'] = Arr::a2s($value);
         $this->attributes['thumb'] = Arr::a2s($value);
     }
     }
 
 
@@ -52,7 +52,7 @@ class Product extends Base
 
 
     public function setGalleryAttribute($value){
     public function setGalleryAttribute($value){
         foreach ($value as $k => $v){
         foreach ($value as $k => $v){
-            $v['url'] = basename($v['url']);
+            $v['url'] = str_replace_url($v['url']);
             $value[$k] = $v;
             $value[$k] = $v;
         }
         }
         $this->attributes['gallery'] = Arr::a2s($value);
         $this->attributes['gallery'] = Arr::a2s($value);
@@ -76,7 +76,7 @@ class Product extends Base
      */
      */
     public function setIconAttribute($value){
     public function setIconAttribute($value){
         foreach ($value as $k => $v){
         foreach ($value as $k => $v){
-            $v = basename($v);
+            $v = str_replace_url($v);
             $value[$k] = $v;
             $value[$k] = $v;
         }
         }
         $this->attributes['icon'] = Arr::a2s($value);
         $this->attributes['icon'] = Arr::a2s($value);