diff --git a/app/Http/Controllers/OrderController.php b/app/Http/Controllers/OrderController.php index bc6cf972..e283c8c6 100755 --- a/app/Http/Controllers/OrderController.php +++ b/app/Http/Controllers/OrderController.php @@ -277,7 +277,7 @@ class OrderController extends Controller if ((int)config('v2board.bitpayx_enable')) { $bitpayX = new \StdClass(); - $bitpayX->name = '虚拟货币'; + $bitpayX->name = '聚合支付'; $bitpayX->method = 4; $bitpayX->icon = 'bitcoin'; array_push($data, $bitpayX); @@ -285,7 +285,7 @@ class OrderController extends Controller if ((int)config('v2board.paytaro_enable')) { $obj = new \StdClass(); - $obj->name = '支付宝'; + $obj->name = '聚合支付'; $obj->method = 5; $obj->icon = 'alipay'; array_push($data, $obj); diff --git a/app/Http/Controllers/Passport/LoginController.php b/app/Http/Controllers/Passport/LoginController.php index e88152c0..64d36137 100755 --- a/app/Http/Controllers/Passport/LoginController.php +++ b/app/Http/Controllers/Passport/LoginController.php @@ -46,8 +46,7 @@ class LoginController extends Controller } $code = Helper::guid(); $key = 'token2Login_' . $code; - Cache::put($key, $user->id); - Redis::expire($key, 600); + Cache::put($key, $user->id, 600); $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard'); if (config('v2board.app_url')) { $location = config('v2board.app_url') . $redirect;