修改web中间件

app/Http/Controllers/Api/MediaController.php

@@ -134,7 +134,7 @@ class MediaController extends Controller
 
             $params = array(
                 'media_id'  => 'mda-'.generateRandomNum(16),
-                'media_type'=> '5efa9cb5d16f5a214671fd86',
+                'media_type'=> '5efa9cb5d16f5a214671fd86',//默认，中公网校
                 'start_time'=> $data_time,
                 'end_time'  => $data_time,
                 'access_key'=> '',

app/Http/Controllers/Web/LoginController.php

@@ -59,7 +59,9 @@ class LoginController extends Controller
                     }
 
                     if (!$user->mis_uid){
-
+                        /**
+                         * 获取mis用户信息
+                         */
                         $request->replace(array_merge($request->all(),['mis_uid'=>'000000']));
 
                         $url = getRbac($request,"api/mis/userinfo",'','mis_user');
@@ -71,33 +73,13 @@ class LoginController extends Controller
 
                         $userInfo = json_decode($result,true);
 
-                        var_dump($userInfo);die;
-
-
-
-
-
-
-//                        $staffNo = $request->username;
-//                        $url = 'http://api-mis.offcn.com/index.php/applogin/isworking';
-//                        $data = sign($staffNo);
-//                        $data['type'] = 6;
-//                        $data['username'] = $staffNo;
-//
-//                        $result = http_request_code($url,
-//                            null,
-//                            'POST',
-//                            $data
-//                        );
-
-//                        $userInfo = json_decode($result,true);
 
                         if (!isset($userInfo['data'])){
-                            LogModel::addlog(["获取用户信息失败",$request->all(),'userInfo'=>$userInfo,'data'=>$data]);
+                            LogModel::addlog(["获取用户信息失败",$request->all(),'userInfo'=>$userInfo]);
                             throw new \Exception("获取用户信息失败");
                         }
 
-                        $userid = $userInfo['data']['userid'];
+                        $userid = $userInfo['data']['userId'];
                         $mis_uid = $userid;
 
 

app/Http/Controllers/Web/MemberController.php

@@ -222,7 +222,7 @@ class MemberController extends Controller
                 throw new \App\Exceptions\FormException('你不能操作别人的');
             }
 
-            if ($id == getAdmin()->_id) {
+            if ($id == Auth::user()->_id) {
                 throw new \App\Exceptions\FormException('你不能操作你自己');
             }
             UserModel::deleteUserById($id);
@@ -240,7 +240,7 @@ class MemberController extends Controller
     public function checkOwnHandle($user_id)
     {
 
-        $user = getAdmin();
+        $user = Auth::user();
 
         if ($user->name != config('custom.supper_admin.name')) {
 
@@ -250,6 +250,7 @@ class MemberController extends Controller
                 return false;
             }
 
+
             if (!$user->user_type) {
                 return false;
             }

app/Http/Kernel.php

@@ -36,7 +36,6 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
             \App\Http\Middleware\ApiMiddleware::class,
-            \App\Http\Middleware\AdminLogin::class
         ],
         'auth' => [\App\Http\Middleware\Apprialisal::class],
         'api' => [

app/Http/Middleware/AdminLogin.php

@@ -18,16 +18,17 @@ class AdminLogin
      */
     public function handle($request, Closure $next)
     {
-        if (!Auth::guard('web')->check()) {
-            return redirect('/web/login');
-        }
 
-        if (request()->isMethod('DELETE') || request()->isMethod('PUT')) {
-            self::getPutValueHandle($request);
-        }
+//        if (!Auth::guard('web')->check()) {
+//            return redirect('/web/login');
+//        }
+//
+//        if (request()->isMethod('DELETE') || request()->isMethod('PUT')) {
+//            self::getPutValueHandle($request);
+//        }
 
-        $user = Auth::user();
-        $request->replace(array_merge($request->all(),['mis_uid'=>$user->mis_uid]));
+//        $user = Auth::user();
+//        $request->replace(array_merge($request->all(),['mis_uid'=>$user->mis_uid]));
 
         return $next($request);
     }

app/Http/Middleware/ApiMiddleware.php

@@ -32,7 +32,11 @@ class ApiMiddleware
 
         $ajax = $request->ajax();
 
+
         $user = Auth::user();
+        $request->replace(array_merge($request->all(),['mis_uid'=>$user->mis_uid]));
+
+
 
         if (empty($user->name)){
             if ($ajax){

app/Model/UserModel.php

@@ -149,6 +149,8 @@ class UserModel extends Authenticatable
             }
             $flag = UserModel::where('_id',$id)->delete();
 
+            RecycleModel::addRecycle($id,"users");
+
         }catch (\Exception $exception){
             throw new \Exception($exception->getMessage());
         }