Merge branch 'dev-xpy' into dev

route/admin.php

@@ -1,13 +1,14 @@
 <?php
 
 use think\facade\Route;
+use think\middleware\AllowCrossDomain;
 
 Route::group(config('admin.admin_prefix'), function () {
     Route::miss(function () {
         $DB = DIRECTORY_SEPARATOR;
         return view(app()->getRootPath() . 'public' . $DB . 'system.html');
     });
-})->middleware(\app\common\middleware\InstallMiddleware::class);
+})->middleware(\app\common\middleware\InstallMiddleware::class)->middleware(AllowCrossDomain::class);
 
 Route::group(config('admin.api_admin_prefix') . '/', function () {
 
@@ -411,7 +412,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
 
 
-        })->prefix('admin.user.User');
+        })->prefix('admin.user.User')->middleware(AllowCrossDomain::class);
         Route::group('user/score', function () {
             Route::any('deduct/:uid', '/deduct')->name('systemUserScoreDeduct');
             Route::any('excel', '/excel')->name('systemUserScoreExcel');