代码提交

This commit is contained in:
wong
2025-08-22 10:23:05 +08:00
parent 0681c69d67
commit d726be7d66
12 changed files with 363 additions and 23 deletions

View File

@@ -57,10 +57,7 @@ class PasswordLoginController extends BaseController
throw new \Exception('用户不存在或已禁用', 403);
}
$password = md5($password);
if ($user->passwordMd5 !== $password) {
throw new \Exception('账号或密码错误', 403);
}
@@ -119,8 +116,11 @@ class PasswordLoginController extends BaseController
// 生成JWT令牌
$token = JwtUtil::createToken($member, 86400 * 30);
$token_expired = time() + 86400 * 30;
return compact('member', 'token', 'token_expired','deviceTotal');
$kefuData = [
'token' => [],
'self' => [],
];
return compact('member', 'token', 'token_expired','deviceTotal','kefuData');
}
/**
@@ -131,15 +131,34 @@ class PasswordLoginController extends BaseController
public function index()
{
$params = $this->request->only(['account', 'password', 'typeId']);
try {
$result = $this->dataValidate($params)->doLogin(
$userData = $this->dataValidate($params)->doLogin(
$params['account'],
$params['password'],
$params['typeId']
);
return ResponseHelper::success($result, '登录成功');
//同时登录客服系统
if (!empty($userData['member']['passwordLocal'])){
$params = [
'grant_type' => 'password',
'username' => $userData['member']['account'],
'password' => localDecrypt($userData['member']['passwordLocal'])
];
// 调用登录接口获取token
$headerData = ['client:kefu-client'];
$header = setHeader($headerData, '', 'plain');
$result = requestCurl('https://s2.siyuguanli.com:9991/token', $params, 'POST', $header);
$token = handleApiResponse($result);
$userData['kefuData']['token'] = $token;
if (isset($token['access_token']) && !empty($token['access_token'])) {
$headerData = ['client:kefu-client'];
$header = setHeader($headerData, $token['access_token']);
$result = requestCurl( 'https://s2.siyuguanli.com:9991/api/account/self', [], 'GET', $header,'json');
$self = handleApiResponse($result);
$userData['kefuData']['self'] = $self;
}
}
return ResponseHelper::success($userData, '登录成功');
} catch (Exception $e) {
return ResponseHelper::error($e->getMessage(), $e->getCode());
}