修改登录

app/Http/Controllers/Api/V1/IndexController.php

@@ -289,16 +289,14 @@ class IndexController extends Controller
         $type = $request->input('type');
         $message = MessagesInfoModel::where([['id',$id],['type',$type],['state',0]])->first();
         if(!$message){
-            $data['msg'] = '该信息不存在或者已完成';
-            $data['code'] = 0;
-            return $this->api($data);
+            $msg = '该信息不存在或者已完成';
+            return $this->api($msg);
         }
 
         $check_is_buy = MessagesFollowerModel::where([['user_id',$this->getUserId()],['messages_id',$message->id]])->first();
         if($check_is_buy){
-            $data['msg'] = '您已获取该知识，请勿重复操作';
-            $data['code'] = 0;
-            return $this->api($data);
+            $msg = '您已获取该知识，请勿重复操作';
+            return $this->api($msg);
         }
         $user = UserInfoModel::find($this->getUserId());
         if($type == 2) {
@@ -306,15 +304,13 @@ class IndexController extends Controller
             $out_trade_no = 'We'.date('YmdHis').rand(1000,9999);
             $user->money -= $message->price;
             if($user->money<0){
-                $data['msg'] = '您的余额已不足，请先充值';
-                $data['code'] = 0;
-                return $this->api($data);
+                $msg = '您的余额已不足，请先充值';
+                return $this->api($msg);
             }
             if(!$user->save()){
-                $data['msg'] = '购买失败';
+                $msg = '购买失败';
                 DB::rollback();
-                $data['code'] = 0;
-                return $this->api($data);
+                return $this->api($msg);
             }
             //dd(111);
             $save['openid'] = $user->openid;
@@ -325,10 +321,9 @@ class IndexController extends Controller
             $save['type'] = 2;
             $res = PaymentInfoModel::create($save);
             if(!$res) {
-                $data['msg'] = '购买失败';
+                $msg = '购买失败';
                 DB::rollback();
-                $data['code'] = 0;
-                return $this->api($data);
+                return $this->api($msg);
             }
 
         }
@@ -338,14 +333,12 @@ class IndexController extends Controller
         $followers['mobile'] = $user->mobile;
         $followers['state'] = $type == 1?0:1;
         if(MessagesFollowerModel::create($followers)){
-            $data['msg'] = '获取成功';
-            $data['code'] = 1;
+            $msg = '获取成功';
             DB::commit();
         } else {
-            $data['msg'] = '购买失败';
-            $data['code'] = 0;
+            $msg = '购买失败';
             DB::rollback();
         }
-        return $this->api($data);
+        return $this->api($msg);
     }
 }

app/Http/Controllers/Api/V1/LoginController.php

@@ -12,6 +12,7 @@ use App\Models\UserInfoModel;
 use App\Models\WechatAppModel;
 use EasyWeChat\Factory;
 use Illuminate\Http\Request;
+use Auth;
 
 class LoginController extends Controller
 {
@@ -20,6 +21,7 @@ class LoginController extends Controller
     public function __construct()
     {
         $wechat_app = WechatAppModel::find(1);
+        //dd($wechat_app);
         $this->config = [
             'app_id' => $wechat_app->appId,
             'secret' => $wechat_app->appSecret,
@@ -28,9 +30,9 @@ class LoginController extends Controller
     }
 
     /**
-     * @api {post} /api//login 登陆（login）
+     * @api {post} /api/login 登陆（login）
      * @apiDescription 登陆(login)login
-     * @apiGroup Auth
+     * @apiGroup Login
      * @apiPermission none
      * @apiVersion 0.1.0
      * @apiParam {string}  nickname   手机号码
@@ -73,17 +75,25 @@ class LoginController extends Controller
     {
         $data = $request->input();
         $app = Factory::miniProgram($this->config);
-        $res = $app->auth->session($data['code']);
-        if (!$res || empty($res['openid'])) {
+        //$res = $app->auth->session($data['code']);
+       /* if (!$res || empty($res['openid'])) {
             $user= [
                 'code' => 1,
                 'msg' => '获取用户OpenId失败',
                 'data' => $res,
             ];
             return $this->api($user);
+        }*/
+        $check_user = UserInfoModel::where('openid',$data['openid'])->first();
+        //dd(111);
+        if(Auth::loginUsingId($check_user->id)) {
+            $user = Auth::user();
+            $success['token'] =  $user->createToken('MyApp')->accessToken;
+            dd($success);
+        }else {
+            echo 2;
         }
-        $check_user = UserInfoModel::where('openid',$res['openid'])->first();
-        if(!$check_user){
+       /* if(!$check_user){
             $add['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
             $add['wechat_open_id'] = $res['openid'];
             $add['avatar'] = $data['avatar'];
@@ -119,6 +129,6 @@ class LoginController extends Controller
                 ];
             }
         }
-        $this->api($user);
+        $this->api($user);*/
     }
 }

app/Models/UserInfoModel.php

@@ -4,7 +4,8 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Foundation\Auth\User as Authenticatable;
-
+use Laravel\Passport\HasApiTokens;
+use Illuminate\Notifications\Notifiable;
 /**
  * @description 用户表
  * @author  system;
@@ -14,6 +15,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable;
  */
 class UserInfoModel extends Authenticatable
 {
+    use HasApiTokens, Notifiable;
     use SoftDeletes;
     /**
      * 数据表名

app/Providers/AuthServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Laravel\Passport\Passport;
 
 class AuthServiceProvider extends ServiceProvider
 {
@@ -24,7 +25,7 @@ class AuthServiceProvider extends ServiceProvider
     public function boot()
     {
         $this->registerPolicies();
-
+        Passport::routes();
         //
     }
 }

config/auth.php

@@ -45,7 +45,7 @@ return [
             'provider' => 'admin_users',
         ],
         'api' => [
-            'driver' => 'token',
+            'driver' => 'passport',
             'provider' => 'users',
         ],
     ],
@@ -70,7 +70,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\User::class,
+            'model' => App\Models\UserInfoModel::class,
         ],
 
         'admin_users' => [
@@ -100,11 +100,11 @@ return [
     */
 
     'passwords' => [
-        'users' => [
+    /*    'users' => [
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
-        ],
+        ],*/
 
         'admin_users' => [
             'provider' => 'admin_users',

routes/api.php

@@ -21,11 +21,14 @@ $api = app('Dingo\Api\Routing\Router');
 //
 $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($api) {
 //    // test
-    $api->get('login', [
+    $api->post('/login', [
         'as' => 'login.login',
         'uses' => 'LoginController@login',
     ]);
 
+    Route::group(['middleware' => 'auth:api'], function(){
+
+    });
     $api->get('/index/menu', 'IndexController@indexMenu');
     $api->get('/index/message', 'IndexController@indexMessage');
     $api->get('/index/get_message', 'IndexController@indexGetMessage');