Merge branch 'develop' into dc

@@ -6,7 +6,7 @@ use App\Enums\Common\Code;
 use App\Helper\AyrShare as AyrShareHelper;
 use App\Helper\AyrShare as AyrShareHelper;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\FileController;
 use App\Http\Controllers\Bside\FileController;
-use App\Http\Controllers\file\ImageController;
+use App\Http\Controllers\File\ImageController;
 use App\Http\Logic\Bside\AyrShare\AyrReleaseLogic;
 use App\Http\Logic\Bside\AyrShare\AyrReleaseLogic;
 use App\Http\Logic\Bside\AyrShare\AyrShareLogic;
 use App\Http\Logic\Bside\AyrShare\AyrShareLogic;
 use App\Models\File\Image;
 use App\Models\File\Image;

 <?php
 <?php
 
 
-namespace App\Http\Controllers\file;
+namespace App\Http\Controllers\File;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Models\File\File;
 use App\Models\File\File;

 <?php
 <?php
 
 
-namespace App\Http\Controllers\file;
+namespace App\Http\Controllers\File;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\type;
 use App\Http\Controllers\type;
@@ -41,6 +41,15 @@ class ImageController
         $this->path = $this->config['root'].$this->uploads['path'].'/';
         $this->path = $this->config['root'].$this->uploads['path'].'/';
     }
     }
 
 
+    /**
+     * @param $hash
+     * @param $w
+     * @param $h
+     * @name   :index
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/11 17:19
+     */
     public function index($hash = '', $w = 0 ,$h = 0 ){
     public function index($hash = '', $w = 0 ,$h = 0 ){
         if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
         if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
             header("HTTP/1.1 304 Not Modified");
             header("HTTP/1.1 304 Not Modified");
@@ -58,7 +67,7 @@ class ImageController
             $header = str_replace(['%Expires%', "%etag%", '%Last-Modified%'],
             $header = str_replace(['%Expires%', "%etag%", '%Last-Modified%'],
                 [$last_modified_time, $hash . ':' . $w . '_' . $h . '_' . 1, $last_modified_time], $this->upload_img['header']);
                 [$last_modified_time, $hash . ':' . $w . '_' . $h . '_' . 1, $last_modified_time], $this->upload_img['header']);
             $content = file_get_contents($filename);
             $content = file_get_contents($filename);
-            $header['Content-Length'] = $info['size'];
+            $header['Content-Length'] = strlen($content);
         }else{
         }else{
             $path = $info['path'];
             $path = $info['path'];
             if (!is_file($path)) {
             if (!is_file($path)) {
@@ -78,10 +87,7 @@ class ImageController
             }
             }
         }
         }
         $header['Content-Type'] = 'image/'.$info['type'];
         $header['Content-Type'] = 'image/'.$info['type'];
-        $img_type = $info['type'];
-        $content = base64_encode($content);
-        $img_base64 = 'data:image/' . $img_type . ';base64,' . $content;
-        return response($img_base64,200,$header);
+        return response($content,200,$header);
     }
     }
 
 
     /**
     /**

@@ -6,7 +6,7 @@ namespace App\Http\Logic\Bside;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Enums\Common\Common;
 use App\Enums\Common\Common;
 use App\Exceptions\BsideGlobalException;
 use App\Exceptions\BsideGlobalException;
-use App\Http\Controllers\file\ImageController;
+use App\Http\Controllers\File\ImageController;
 use App\Http\Logic\Logic;
 use App\Http\Logic\Logic;
 use App\Models\File\Image as ImageModel;
 use App\Models\File\Image as ImageModel;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;

@@ -59,19 +59,19 @@ class NewsLogic extends BaseLogic
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['created_at'] = date('Y-m-d H:i:s',time());
         $this->param['created_at'] = date('Y-m-d H:i:s',time());
         $this->param['updated_at'] = date('Y-m-d H:i:s',time());
         $this->param['updated_at'] = date('Y-m-d H:i:s',time());
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             if(isset($this->param['image'])){
             if(isset($this->param['image'])){
                 $data = $this->upload();
                 $data = $this->upload();
                 $this->param['image'] = $data;
                 $this->param['image'] = $data;
             }
             }
             $rs = $this->model->insertGetId($this->param);
             $rs = $this->model->insertGetId($this->param);
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']);
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $rs, $this->user['project_id']);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('添加失败');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('添加失败');
+        }
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -190,11 +190,11 @@ Route::middleware(['bloginauth'])->group(function () {
     });
     });
     //图片操作
     //图片操作
     Route::prefix('images')->group(function () {
     Route::prefix('images')->group(function () {
-        Route::post('/upload', [\App\Http\Controllers\file\ImageController::class, 'upload'])->name('image_upload');
+        Route::post('/upload', [\App\Http\Controllers\File\ImageController::class, 'upload'])->name('image_upload');
     });
     });
     //文件上传第三方操作
     //文件上传第三方操作
     Route::prefix('files')->group(function () {
     Route::prefix('files')->group(function () {
-        Route::post('/upload', [\App\Http\Controllers\file\FileController::class, 'upload'])->name('files_upload');
+        Route::post('/upload', [\App\Http\Controllers\File\FileController::class, 'upload'])->name('files_upload');
     });
     });
     //精准询盘
     //精准询盘
     Route::prefix('inquiry')->group(function () {
     Route::prefix('inquiry')->group(function () {
@@ -260,6 +260,6 @@ Route::group([], function () {
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
 //    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'get_country'])->name('get_country');
 //    Route::any('/', [\App\Http\Controllers\Bside\ComController::class, 'get_country'])->name('get_country');
     Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download');
     Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download');
-    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\file\ImageController::class,'index'])->name('image_show');
-    Route::any('/file_hash/{hash}/', [\App\Http\Controllers\file\FileController::class,'index'])->name('file_show');
+    Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class,'index'])->name('image_show');
+    Route::any('/file_hash/{hash}/', [\App\Http\Controllers\File\FileController::class,'index'])->name('file_show');
 });
 });