Commit 34cf51c9 authored by hujun's avatar hujun

变量名和二维码类名修改

parent f4ba4ae3
...@@ -45,7 +45,7 @@ class Member extends Basic ...@@ -45,7 +45,7 @@ class Member extends Basic
$data['data'] = $user_data->getData(); $data['data'] = $user_data->getData();
$data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']); $data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']);
$data['data']['authToken'] = $jwt->createToken($jwt_data); $data['data']['AuthToken'] = $jwt->createToken($jwt_data);
$data['msg'] = '登陆成功'; $data['msg'] = '登陆成功';
$data['status'] = 200; $data['status'] = 200;
Session::set('u_user', $data['data']); Session::set('u_user', $data['data']);
...@@ -182,13 +182,13 @@ class Member extends Basic ...@@ -182,13 +182,13 @@ class Member extends Basic
$jwt_phone = $jwt_data['data']['phone']; $jwt_phone = $jwt_data['data']['phone'];
$note = new NoteLog(); $note = new NoteLog();
$note_data = $note->field('send_time')->where([ $note_data = $note->field('id,code,send_time')->where([
'phone'=> $phone, 'phone'=> $phone,
'code'=>$code, 'code'=>$code,
'is_success'=>1 'is_success'=>1
])->find(); ])->find();
if (time()-strtotime($note_data->send_time)->send_time > 18000) { if (time()-strtotime($note_data->send_time) > 18000) {
return $this->response(101, '请重新获取验证码'); return $this->response(101, '请重新获取验证码');
} }
...@@ -225,7 +225,7 @@ class Member extends Basic ...@@ -225,7 +225,7 @@ class Member extends Basic
$jwt_data['phone'] = $insert_data['user_phone']; $jwt_data['phone'] = $insert_data['user_phone'];
$jwt = new JwtUntils(); $jwt = new JwtUntils();
$insert_data['authToken'] = $jwt->createToken($jwt_data); $insert_data['AuthToken'] = $jwt->createToken($jwt_data);
$insert_data['id'] = $this->user->id; $insert_data['id'] = $this->user->id;
Session::set('u_user', $insert_data['data']); //登录 Session::set('u_user', $insert_data['data']); //登录
...@@ -342,7 +342,7 @@ class Member extends Basic ...@@ -342,7 +342,7 @@ class Member extends Basic
$result = $this->user->where('status',0)->where('id',$parms['id'])->find(); $result = $this->user->where('status',0)->where('id',$parms['id'])->find();
if ($result) { if ($result) {
$code = new \app\api\untils\GenerateCode(); $code = new \app\api\untils\GenerateCodeUntils();
$url = $this->request->domain().'/test.html?referrer_source=0&id='.$result->id; $url = $this->request->domain().'/test.html?referrer_source=0&id='.$result->id;
$path = $code->getCode($url, $result->id); $path = $code->getCode($url, $result->id);
$data['data'] = ['path' => $this->request->domain().'/'.$path]; $data['data'] = ['path' => $this->request->domain().'/'.$path];
......
...@@ -6,7 +6,7 @@ use Endroid\QrCode\QrCode; ...@@ -6,7 +6,7 @@ use Endroid\QrCode\QrCode;
* *
* @author fuju * @author fuju
*/ */
class GenerateCode { class GenerateCodeUntils {
/** /**
* 生成二维码 * 生成二维码
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment