cauto 2 жил өмнө
parent
commit
028e2e168c

+ 64 - 7
app/Http/Controllers/Client/ManageController.php

@@ -16,7 +16,7 @@ use Facade\FlareClient\Api;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-
+use App\Services\AuthService;
 
 class ManageController extends Controller
 {
@@ -135,7 +135,22 @@ class ManageController extends Controller
      */
     public function getSubscribe(Request $request)
     {
-        $user = User::where('id', $request->user['id'])
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization)
+            return ApiResponse::apiResponse(403,"未登录或者登录已经过期");
+
+        $authData = explode(':', base64_decode($authorization));
+        if (!isset($authData[0]) || !isset($authData[1]))
+            return ApiResponse::apiResponse(403,"请求异常");
+        $user = User::where('email', $authData[0])
+            ->where('password', $authData[1])
+            ->first();
+        if (!$user) {
+            //abort(500, __('Token error'));
+            return ApiResponse::apiResponse(500,"请求异常");
+        }
+
+        $user = User::where('id', $user['id'])
             ->select([
                 'plan_id',
                 'token',
@@ -151,14 +166,14 @@ class ManageController extends Controller
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
-        if ($user->plan_id) {
-            $user['plan'] = Plan::find($user->plan_id);
+        if ($user["plan_id"]) {
+            $user['plan'] = Plan::find($user["plan_id"]);
             if (!$user['plan']) {
                 abort(500, __('Subscription plan does not exist'));
             }
         }
 
-        $model = Order::where('user_id', $request->user['id'])->where("status","=",0)
+        $model = Order::where('user_id', $user['id'])->where("status","=",0)
             ->orderBy('created_at', 'DESC');
         $order = $model->first();
         if (empty($order)){
@@ -192,7 +207,33 @@ class ManageController extends Controller
      * @return \Illuminate\Http\JsonResponse
      */
     public function server(Request $request){
-        $user = User::find($request->user['id']);
+
+//        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+//        if (!$authorization) ApiResponse::apiResponse(403,"未登录或者登录已经过期");
+
+//        $user = AuthService::decryptAuthData($authorization);
+//        if (!$user) ApiResponse::apiResponse(403,"未登录或者登录已经过期");
+//        $request->merge([
+//            'user' => $user
+//        ]);
+//        return ApiResponse::apiResponse(400,"获取线路失败",$user);
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization)
+            return ApiResponse::apiResponse(403,"未登录或者登录已经过期");
+
+        $authData = explode(':', base64_decode($authorization));
+        if (!isset($authData[0]) || !isset($authData[1]))
+            return ApiResponse::apiResponse(403,"请求异常");
+        $user = User::where('email', $authData[0])
+            ->where('password', $authData[1])
+            ->first();
+        if (!$user) {
+            //abort(500, __('Token error'));
+            return ApiResponse::apiResponse(500,"请求异常");
+        }
+
+
+        $user = User::find($user['id']);
         $servers = [];
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
@@ -225,7 +266,7 @@ class ManageController extends Controller
 
         $code = Helper::guid();
         $key = CacheKey::get('TEMP_TOKEN', $code);
-        Cache::put($key, $user->id, 60);
+        Cache::put($key, $user["id"], 60);
         $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
         if (config('v2board.app_url')) {
             $url = config('v2board.app_url') . $redirect;
@@ -239,6 +280,22 @@ class ManageController extends Controller
 
     public function getVersion(Request $request)
     {
+
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization)
+            return ApiResponse::apiResponse(403,"未登录或者登录已经过期");
+
+        $authData = explode(':', base64_decode($authorization));
+        if (!isset($authData[0]) || !isset($authData[1]))
+            return ApiResponse::apiResponse(403,"请求异常");
+        $user = User::where('email', $authData[0])
+            ->where('password', $authData[1])
+            ->first();
+        if (!$user) {
+            //abort(500, __('Token error'));
+            return ApiResponse::apiResponse(500,"请求异常");
+        }
+
        $from = $request->input("from");
        $version = $request->input("version");
 

+ 1 - 1
app/Http/Routes/ManageRoute.php

@@ -25,7 +25,7 @@ class ManageRoute
 
         $router->group([
             'prefix' => 'manager',
-            'middleware' => 'manage'
+//            'middleware' => 'manage'
         ], function ($router) {
             $router->get ('/getSubscribe', 'Client\\ManageController@getSubscribe');
             $router->get ('/server/fetch', 'Client\\ManageController@server');