作者 张关杰

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

@@ -19,7 +19,7 @@ class Manage extends Base @@ -19,7 +19,7 @@ class Manage extends Base
19 */ 19 */
20 const ADMINISTRATOR_ID = 1; 20 const ADMINISTRATOR_ID = 1;
21 21
22 - public function statusMap(){ 22 + public static function statusMap(){
23 return [ 23 return [
24 self::STATUS_ACTIVE => '禁用', 24 self::STATUS_ACTIVE => '禁用',
25 self::STATUS_DISABLE => '正常', 25 self::STATUS_DISABLE => '正常',
@@ -334,6 +334,7 @@ Route::middleware(['bloginauth'])->group(function () { @@ -334,6 +334,7 @@ Route::middleware(['bloginauth'])->group(function () {
334 Route::group([], function () { 334 Route::group([], function () {
335 Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login'); 335 Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
336 Route::any('/stringTranslation', [\App\Http\Controllers\Bside\ComController::class, 'stringTranslation'])->name('com_stringTranslation'); 336 Route::any('/stringTranslation', [\App\Http\Controllers\Bside\ComController::class, 'stringTranslation'])->name('com_stringTranslation');
  337 + Route::any('/getImageList', [\App\Http\Controllers\File\ImageController::class, 'getImageList'])->name('image_getImageList');
337 Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\ComController::class, 'sendLoginSms'])->name('sendLoginSms'); 338 Route::any('/sendLoginSms', [\App\Http\Controllers\Bside\ComController::class, 'sendLoginSms'])->name('sendLoginSms');
338 Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download'); 339 Route::get('/file/download', [\App\Http\Controllers\Bside\FileController::class, 'download'])->name('file_download');
339 Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('image_show'); 340 Route::any('/image/{hash}/{w?}/{h?}', [\App\Http\Controllers\File\ImageController::class, 'index'])->name('image_show');