فهرست منبع

自己写接口

cauto 2 سال پیش
والد
کامیت
fce4547d9d
2فایلهای تغییر یافته به همراه16 افزوده شده و 12 حذف شده
  1. 14 10
      app/Http/Controllers/Client/ManageController.php
  2. 2 2
      app/Utils/ApiResponse.php

+ 14 - 10
app/Http/Controllers/Client/ManageController.php

@@ -31,17 +31,17 @@ class ManageController extends Controller
         $password = $request->input('password');
 
         if (empty($email)){
-            return ApiResponse::apiResponse(400,"邮箱不能为空");
+            return ApiResponse::apiResponse(400,"邮箱不能为空",null,400);
         }
 
         if (empty($password)){
-            return ApiResponse::apiResponse(400,"密码不能为空");
+            return ApiResponse::apiResponse(400,"密码不能为空",null,400);
         }
 
         $user = User::where('email', $email)->first();
         if (!$user) {
             //abort(200, __('Incorrect email or password'));
-            return ApiResponse::apiResponse(400,"账号或者密码错误");
+            return ApiResponse::apiResponse(400,"账号或者密码错误",null,400);
         }
         if (!Helper::multiPasswordVerify(
             $user->password_algo,
@@ -49,12 +49,17 @@ class ManageController extends Controller
             $password,
             $user->password)
         ) {
-            return ApiResponse::apiResponse(400,"账号或者密码错误");
+            return ApiResponse::apiResponse(400,"账号或者密码错误",null,400);
         }
-
+        //判断到期
+//        $expireTime = $user["expired_at"];
+//
+//        if ($expireTime < date('Y-m-d H:i:s')){
+//            return response()->json(['ret' => 445, 'msg' => "用户到期,请即使续费"], 200);
+//        }
         if ($user->banned) {
 //            abort(500, __('Your account has been suspended'));
-            return ApiResponse::apiResponse(300,"账户已经被禁用");
+            return ApiResponse::apiResponse(300,"账户已经被禁用",null,447);
         }
 
         $data = [
@@ -63,9 +68,7 @@ class ManageController extends Controller
         ];
 
         if ($user->is_admin) $data['is_admin'] = true;
-//        return response([
-//            'data' => $data
-//        ]);
+
         return ApiResponse::apiResponse(0,"",$data);
     }
 
@@ -287,7 +290,8 @@ class ManageController extends Controller
         $path = "/#/";
         $base_url = $base_url . $path;
         $data = [
-            "register" => $base_url . "register"
+            "register" => $base_url . "register",
+            "user_reset" => $base_url ."forgetpassword"
         ];
         return ApiResponse::apiResponse(0,"",$data);
     }

+ 2 - 2
app/Utils/ApiResponse.php

@@ -40,7 +40,7 @@ class ApiResponse
      * @param $message //返回说明
      * @param $data //返回数据集合
      */
-    public static function apiResponse($code, $message, $data = null)
+    public static function apiResponse($code, $message, $data = null,$status = 200)
     {
         if ($data == null){
            $content = [
@@ -55,7 +55,7 @@ class ApiResponse
             ];
         }
 
-        return Response::json($content,200);
+        return Response::json($content,$status);
     }
 
 }