Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/merchant/system/admin/Login.php

@@ -38,6 +38,25 @@ class Login extends BaseController
     {
     }
 
+    public function getPhpToken()
+    {
+        $merId = $this->request->param('merId');
+        $adminInfo = $this->repository->merIdByAdmin($merId);
+        if (!$adminInfo) return app('json')->fail('数据不存在');
+        $tokenInfo = $this->repository->createToken($adminInfo);
+        $admin = $adminInfo->toArray();
+        unset($admin['pwd']);
+        $data = [
+            'token' => $tokenInfo['token'],
+            'exp' => $tokenInfo['out'],
+            'admin' => $admin,
+            'url' => '/' . config('admin.merchant_prefix')
+        ];
+        return app('json')->success($data);
+    }
+
+    
+
     /**
      * @param LoginValidate $validate
      * @return mixed

route/merchant.php

@@ -605,6 +605,8 @@ Route::group(config('admin.api_merchant_prefix') . '/', function () {
     Route::group(function () {
         Route::get('test', 'merchant.system.admin.Login/test');
 
+        Route::post('getPhpToken', 'merchant.system.admin.Login/getPhpToken');
+
         //验证码
         Route::get('captcha', 'merchant.system.admin.Login/getCaptcha');
         //登录