|
@@ -552,7 +552,6 @@ class LoginController extends AbstractController
|
|
*/
|
|
*/
|
|
public function logout(Jwt $jwt)
|
|
public function logout(Jwt $jwt)
|
|
{
|
|
{
|
|
-
|
|
|
|
$reqData = $this->request->all();
|
|
$reqData = $this->request->all();
|
|
$validator = $this->validationFactory->make(
|
|
$validator = $this->validationFactory->make(
|
|
$reqData,
|
|
$reqData,
|
|
@@ -569,31 +568,34 @@ class LoginController extends AbstractController
|
|
$errorMessage = $validator->errors()->first();
|
|
$errorMessage = $validator->errors()->first();
|
|
return Result::error($errorMessage);
|
|
return Result::error($errorMessage);
|
|
}
|
|
}
|
|
|
|
+
|
|
$redis = $this->container->get(\Hyperf\Redis\Redis::class);
|
|
$redis = $this->container->get(\Hyperf\Redis\Redis::class);
|
|
$ticket = md5($reqData['admintoken']);
|
|
$ticket = md5($reqData['admintoken']);
|
|
|
|
|
|
$res = $redis->del('ticket:' . $ticket);
|
|
$res = $redis->del('ticket:' . $ticket);
|
|
var_dump("删除redis:", $res);
|
|
var_dump("删除redis:", $res);
|
|
var_dump("获取redis:", $redis->get('ticket:' . $ticket));
|
|
var_dump("获取redis:", $redis->get('ticket:' . $ticket));
|
|
- $expire = time();
|
|
|
|
- $cookieName = 'Admin-Token';
|
|
|
|
- // 创建 Cookie 实例
|
|
|
|
- $cookie = new Cookie($cookieName, '', $expire, '/');
|
|
|
|
- // 清空 Cookie
|
|
|
|
- $r = $this->response = $this->response->withCookie($cookie);
|
|
|
|
- var_dump("清空Cookie:", $r);
|
|
|
|
|
|
+
|
|
|
|
+ // 获取所有 Cookie
|
|
|
|
+ $cookies = $this->request->getCookieParams();
|
|
|
|
+ foreach ($cookies as $name => $value) {
|
|
|
|
+ $expire = time() - 3600; // 设置过期时间为过去的时间
|
|
|
|
+ $cookie = new Cookie($name, '', $expire, '/');
|
|
|
|
+ $this->response = $this->response->withCookie($cookie);
|
|
|
|
+ }
|
|
|
|
+
|
|
try {
|
|
try {
|
|
$jwt->logout($reqData['admintoken']);
|
|
$jwt->logout($reqData['admintoken']);
|
|
- }catch (\Exception $e){
|
|
|
|
- var_dump("返回错误信息:",$e->getMessage());
|
|
|
|
-// $backurl = $this->fun_http($reqData['backurl']);
|
|
|
|
-// return $this->response->redirect($backurl, 302);
|
|
|
|
|
|
+ } catch (\Exception $e) {
|
|
|
|
+ var_dump("返回错误信息:", $e->getMessage());
|
|
}
|
|
}
|
|
|
|
+
|
|
$backurl = $this->fun_http($reqData['backurl']);
|
|
$backurl = $this->fun_http($reqData['backurl']);
|
|
- var_dump("返回地址:",$backurl);
|
|
|
|
|
|
+ var_dump("返回地址:", $backurl);
|
|
return $this->response->redirect($backurl, 302);
|
|
return $this->response->redirect($backurl, 302);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 登录回调
|
|
* 登录回调
|
|
* @return void
|
|
* @return void
|