瀏覽代碼

Merge branch 'dev' into dev-sxb

sunxbiao 11 月之前
父節點
當前提交
fb8c33ec09
共有 2 個文件被更改,包括 41 次插入3 次删除
  1. 38 1
      app/common/repositories/user/UserRepository.php
  2. 3 2
      route/admin.php

文件差異過大導致無法顯示
+ 38 - 1
app/common/repositories/user/UserRepository.php


+ 3 - 2
route/admin.php

@@ -1,13 +1,14 @@
1 1
 <?php
2 2
 
3 3
 use think\facade\Route;
4
+use think\middleware\AllowCrossDomain;
4 5
 
5 6
 Route::group(config('admin.admin_prefix'), function () {
6 7
     Route::miss(function () {
7 8
         $DB = DIRECTORY_SEPARATOR;
8 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 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 416
         Route::group('user/score', function () {
416 417
             Route::any('deduct/:uid', '/deduct')->name('systemUserScoreDeduct');
417 418
             Route::any('excel', '/excel')->name('systemUserScoreExcel');