Explorar el Código

Merge branch 'dev' into dev-sxb

sunxbiao hace 11 meses
padre
commit
fb8c33ec09
Se han modificado 2 ficheros con 41 adiciones y 3 borrados
  1. 38 1
      app/common/repositories/user/UserRepository.php
  2. 3 2
      route/admin.php

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 38 - 1
app/common/repositories/user/UserRepository.php


+ 3 - 2
route/admin.php

@@ -1,13 +1,14 @@
1
 <?php
1
 <?php
2
 
2
 
3
 use think\facade\Route;
3
 use think\facade\Route;
4
+use think\middleware\AllowCrossDomain;
4
 
5
 
5
 Route::group(config('admin.admin_prefix'), function () {
6
 Route::group(config('admin.admin_prefix'), function () {
6
     Route::miss(function () {
7
     Route::miss(function () {
7
         $DB = DIRECTORY_SEPARATOR;
8
         $DB = DIRECTORY_SEPARATOR;
8
         return view(app()->getRootPath() . 'public' . $DB . 'system.html');
9
         return view(app()->getRootPath() . 'public' . $DB . 'system.html');
9
     });
10
     });
10
-})->middleware(\app\common\middleware\InstallMiddleware::class);
11
+})->middleware(\app\common\middleware\InstallMiddleware::class)->middleware(AllowCrossDomain::class);
11
 
12
 
12
 Route::group(config('admin.api_admin_prefix') . '/', function () {
13
 Route::group(config('admin.api_admin_prefix') . '/', function () {
13
 
14
 
@@ -411,7 +412,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
411
 
412
 
412
 
413
 
413
 
414
 
414
-        })->prefix('admin.user.User');
415
+        })->prefix('admin.user.User')->middleware(AllowCrossDomain::class);
415
         Route::group('user/score', function () {
416
         Route::group('user/score', function () {
416
             Route::any('deduct/:uid', '/deduct')->name('systemUserScoreDeduct');
417
             Route::any('deduct/:uid', '/deduct')->name('systemUserScoreDeduct');
417
             Route::any('excel', '/excel')->name('systemUserScoreExcel');
418
             Route::any('excel', '/excel')->name('systemUserScoreExcel');