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

@@ -345,7 +345,7 @@ class ImageController 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;
     }
     }

@@ -229,6 +229,7 @@ Route::group([], function () {
     Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
     Route::any('/login', [Aside\LoginController::class, 'login'])->name('admin.login.white');
     Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
     Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('admin.image_show');
     Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
     Route::any('/file/{hash}', [\App\Http\Controllers\File\FileController::class, 'index'])->name('admin.file_show');
+    Route::any('/downLoad', [\App\Http\Controllers\File\FileController::class, 'downLoad'])->name('files_downLoad');
     Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
     Route::any('/notice/project', [Aside\NoticeController::class, 'project'])->name('admin.notice.project');
     //放开模版上传
     //放开模版上传
     // 公共主题模版
     // 公共主题模版

@@ -337,8 +337,5 @@ 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('/stringTranslation', [\App\Http\Controllers\Bside\ComController::class, 'stringTranslation'])->name('com_stringTranslation');
     Route::any('/stringTranslation', [\App\Http\Controllers\Bside\ComController::class, 'stringTranslation'])->name('com_stringTranslation');
     Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\ComController::class, 'sendLoginSms'])->name('sendLoginSms');
     Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\ComController::class, 'sendLoginSms'])->name('sendLoginSms');
-    Route::any('/downLoad', [\App\Http\Controllers\File\FileController::class, 'downLoad'])->name('files_downLoad');
     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');
 });
 });