gx

lyh
app/Http/Controllers/Bside/Blog/BlogController.php
app/Http/Controllers/Bside/News/NewsController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Controllers/Bside/Template/BTemplateController.php
app/Http/Controllers/File/FileController.php
app/Http/Controllers/File/ImageController.php
app/Http/Logic/Bside/Blog/BlogLogic.php
app/Http/Logic/Bside/News/NewsLogic.php
app/Models/Product/Product.php
--- a/app/Http/Controllers/Bside/Blog/BlogController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/Bside/Blog/BlogController.php
查看文件 @47d12ee
@@ -38,7 +38,7 @@ class BlogController extends BaseController
             foreach ($lists['list'] as $k => $v){
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_BLOG,$v['id']);
-                $v['image_link'] = getImageUrl($v['image']);
+                $v['image_link'] = getImageUrl($v['image'],$this->user['project_location'],$this->user['storage_type']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_BLOG,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $lists['list'][$k] = $v;
@@ -186,10 +186,8 @@ class BlogController extends BaseController
             'id.required' => 'ID不能为空'
         ]);
         $info = $blogLogic->blogInfo();
-
         $template_id = $this->getTemplateId(BTemplate::SOURCE_BLOG,BTemplate::IS_DETAIL);
         $info['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_BLOG,BTemplate::IS_DETAIL,$template_id, $info['id']);
-
         $this->response('success',Code::SUCCESS,$info);
     }
--- a/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @47d12ee
@@ -41,7 +41,7 @@ class NewsController extends BaseController
             foreach ($lists['list'] as $k => $v){
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['url'] = $this->user['domain'].getRouteMap(RouteMap::SOURCE_NEWS,$v['id']);
-                $v['image_link'] = getImageUrl($v['image']);
+                $v['image_link'] = getImageUrl($v['image'],$this->user['project_location'],$this->user['storage_type']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_NEWS,BTemplate::IS_DETAIL,$template_id,$v['id']);
                 $lists['list'][$k] = $v;
@@ -175,10 +175,8 @@ class NewsController extends BaseController
             'id.required' => 'ID不能为空',
         ]);
         $info = $newsLogic->newsInfo();
-
         $template_id = $this->getTemplateId(BTemplate::SOURCE_NEWS,BTemplate::IS_DETAIL);//获取模版id
         $info['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_NEWS,BTemplate::IS_DETAIL,$template_id, $info['id']);
-
         $this->response('success',Code::SUCCESS,$info);
     }
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @47d12ee
@@ -56,11 +56,12 @@ class ProductController extends BaseController
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
             $userModel = new User();
             foreach ($lists['list'] as $k=>$v){
+                $v['url'] = $this->user['domain'].$v['route'].'/';
                 $v['category_id_text'] = $this->categoryName($v['category_id'],$cate_data);
                 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
                 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
-                $v = $this->getHandleFileImage($v,$cate_data,$key_data,$template_id);
+                $v = $this->getHandleFileImage($v);
                 $lists['list'][$k] = $v;
             }
         }
@@ -75,7 +76,6 @@ class ProductController extends BaseController
      * @time   :2024/1/23 17:43
      */
     public function getHandleFileImage($v){
-        $v['url'] = $this->user['domain'].$v['route'].'/';
         //ToDo::处理图片及文件
         if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
             $v['thumb']['url'] = getImageUrl($v['thumb']['url'],$this->user['project_location'],$this->user['storage_type']);
--- a/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/Bside/Template/BTemplateController.php
查看文件 @47d12ee
@@ -22,7 +22,7 @@ class BTemplateController extends BaseController
         $lists = $BTemplateLogic->publicTemplateLists($this->map,$this->page,$this->row,$this->order);
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => &$v){
-                $v['image_link'] = getImageUrl($v['image']);
+                $v['image_link'] = getImageUrl($v['image'],$this->user['project_location'],$this->user['storage_type']);
                 $lists['list'][$k] = $v;
             }
         }
--- a/app/Http/Controllers/File/FileController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/File/FileController.php
查看文件 @47d12ee
@@ -351,7 +351,7 @@ class FileController
     public function responseData($path, $name){
         $data = [
             'file'=>$path,
-            'file_link'=>getFileUrl($path,$this->upload_location),
+            'file_link'=>getFileUrl($path,$this->cache['project_location'] ?? 1,$this->cache['storage_type'] ?? 0),
             'name'=>$name,
             'file_download'=>url('a/download_files?path='.$path)
         ];
--- a/app/Http/Controllers/File/ImageController.php
查看文件 @47d12ee
+++ b/app/Http/Controllers/File/ImageController.php
查看文件 @47d12ee
@@ -359,7 +359,7 @@ class ImageController extends Controller
         $lists = $imageModel->lists($this->map,$this->page,$this->row);
         if(!empty($lists) && !empty($lists['list'])){
             foreach ($lists['list'] as $k => $v){
-                $v['image_link'] = getImageUrl($v['path']);
+                $v['image_link'] = getImageUrl($v['path'],$this->cache['project_location'] ?? 1,$this->cache['storage_type'] ?? 0);
                 $lists['list'][$k] = $v;
             }
         }
--- a/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @47d12ee
+++ b/app/Http/Logic/Bside/Blog/BlogLogic.php
查看文件 @47d12ee
@@ -101,7 +101,7 @@ class BlogLogic extends BaseLogic
         //获取标签名称
         $blogLabelLogic = new BlogLabelLogic();
         $info['label_name'] = $blogLabelLogic->getLabelName($info['label_id']);
-        $info['image_link'] = getImageUrl($info['image']);
+        $info['image_link'] = getImageUrl($info['image'],$this->user['project_location'],$this->user['storage_type']);
         return $this->success($info);
     }
--- a/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @47d12ee
+++ b/app/Http/Logic/Bside/News/NewsLogic.php
查看文件 @47d12ee
@@ -147,7 +147,7 @@ class NewsLogic extends BaseLogic
             $this->fail('error');
         }
         $info['category_id'] = explode(',',trim($info['category_id'],','));
-        $info['image_link'] = getImageUrl($info['image']);
+        $info['image_link'] = getImageUrl($info['image'],$this->user['project_location'],$this->user['storage_type']);
         return $this->success($info);
     }
--- a/app/Models/Product/Product.php
查看文件 @47d12ee
+++ b/app/Models/Product/Product.php
查看文件 @47d12ee
@@ -104,7 +104,7 @@ class Product extends Base
     public function getThumbAttribute($value){
         if(!empty($value)){
-            $value =  json_decode($value,true);
+            $value = Arr::s2a($value);
         }
         return $value;
     }