作者 赵彬吉

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

... ... @@ -173,15 +173,16 @@ class LoginController extends BaseController
$message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
$jsonData = json_encode($message);
$arrayData = json_decode($jsonData, true);
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($arrayData, true) . PHP_EOL, FILE_APPEND);
// $data = $this->wechatLogin($message->FromUserName);
// if($data == 0){//登录失败,请先绑定
// $resMessage = $data['message'];
// }else{
// $resMessage = $data['message'];
// $info = $data['data'];
// Cache::add('user-login-'.$info['id'],$info,300);
// }
$data = $this->wechatLogin($arrayData['ToUserName']);
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($data, true) . PHP_EOL, FILE_APPEND);
if($data['code'] == 0){//登录失败,请先绑定
$resMessage = $data['message'];
}else{
$resMessage = $data['message'];
$info = $data['data'];
Cache::add($arrayData['Ticket'],$info,300);
}
@file_put_contents(storage_path('logs/lyh_error.log'), var_export($resMessage, true) . PHP_EOL, FILE_APPEND);
// $arr = [
// 'ToUserName' => 'gh_27174ac5c9d8',
// 'FromUserName' => 'oMbcI6gRzvfrU8ssGsEyvzXOO94w',
... ... @@ -196,7 +197,7 @@ class LoginController extends BaseController
<FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
<CreateTime>".time()."</CreateTime>
<MsgType><![CDATA[text]]></MsgType>
<Content><![CDATA[成功]]></Content>
<Content><![CDATA[$resMessage]]></Content>
</xml>";
}
... ... @@ -208,7 +209,8 @@ class LoginController extends BaseController
* @time :2023/9/1 10:12
*/
public function getWechatLoginInfo(){
$info = Cache::get($this->param['Ticket']);
$this->response('success',Code::SUCCESS,$info);
}
/**
... ... @@ -251,7 +253,7 @@ class LoginController extends BaseController
if($info === false){
$data = [
'code'=>0,
'message'=>'当前用户未绑定账户,请绑定后',
'message'=>'当前用户未绑定账户,请绑定后登录',
];
}else {
//获取项目详情
... ...
... ... @@ -344,4 +344,5 @@ Route::group([], function () {
Route::any('/autologin', [\App\Http\Controllers\Bside\LoginController::class, 'autologin'])->name('autologin');
Route::any('/qrcode', [\App\Http\Controllers\Bside\LoginController::class, 'qrcode'])->name('qrcode');
Route::any('/globalSo_v6_login', [\App\Http\Controllers\Bside\LoginController::class, 'globalSo_v6_login'])->name('globalSo_v6_login');
Route::any('/getWechatLoginInfo', [\App\Http\Controllers\Bside\LoginController::class, 'getWechatLoginInfo'])->name('getWechatLoginInfo');
});
... ...