|
@@ -12,6 +12,7 @@ class User extends Lyapi_Controller{
|
|
|
$this->load->_model("Model_logic_tools","logic_tools");
|
|
$this->load->_model("Model_logic_tools","logic_tools");
|
|
|
$this->load->_model("Model_user",'user');
|
|
$this->load->_model("Model_user",'user');
|
|
|
$this->load->_model("Model_power",'power');
|
|
$this->load->_model("Model_power",'power');
|
|
|
|
|
+ $this->load->_model("Model_wechat","wechat");
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -25,10 +26,11 @@ class User extends Lyapi_Controller{
|
|
|
$data = json_decode($json_str,true);
|
|
$data = json_decode($json_str,true);
|
|
|
$account = $data['account'];
|
|
$account = $data['account'];
|
|
|
$pass = $data['pass'];
|
|
$pass = $data['pass'];
|
|
|
|
|
+ $code = $data['code'];
|
|
|
$account = $this->logic_tools->toolsjiemi($account,"v!frlbpnjgir6alv","k!2w94m6jt!6ook4");
|
|
$account = $this->logic_tools->toolsjiemi($account,"v!frlbpnjgir6alv","k!2w94m6jt!6ook4");
|
|
|
$pass = $this->logic_tools->toolsjiemi($pass,"v!frlbpnjgir6alv","k!2w94m6jt!6ook4");
|
|
$pass = $this->logic_tools->toolsjiemi($pass,"v!frlbpnjgir6alv","k!2w94m6jt!6ook4");
|
|
|
$pass = sha1($pass);
|
|
$pass = sha1($pass);
|
|
|
-
|
|
|
|
|
|
|
+ $is_wxbd = 0;
|
|
|
if(stripos($account,'lyzzz') !== false){
|
|
if(stripos($account,'lyzzz') !== false){
|
|
|
$userid = explode('zzz',$account);
|
|
$userid = explode('zzz',$account);
|
|
|
$userid = $userid[1];
|
|
$userid = $userid[1];
|
|
@@ -69,10 +71,26 @@ class User extends Lyapi_Controller{
|
|
|
$all_arr[] = $v['shortname'];
|
|
$all_arr[] = $v['shortname'];
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if(!empty($code)){
|
|
|
|
|
+ $r = $this->wechat->getopenid($code);
|
|
|
|
|
+ if($r['code'] == 1){
|
|
|
|
|
+ $wxopenid = json_decode($userinfo['wxopenid'],true);
|
|
|
|
|
+ $openid = $r['data']['openid'];
|
|
|
|
|
+ if(in_array($openid,$wxopenid)){
|
|
|
|
|
+ $token = $openid;
|
|
|
|
|
+ $is_wxbd = 1;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $token = bin2hex(random_bytes(32));
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $token = bin2hex(random_bytes(32));
|
|
|
|
|
+ }
|
|
|
|
|
+ }else{
|
|
|
|
|
+ // 生成唯一 token(可以用 JWT 或随机字符串)
|
|
|
|
|
+ $token = bin2hex(random_bytes(32));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- // 生成唯一 token(可以用 JWT 或随机字符串)
|
|
|
|
|
- $token = bin2hex(random_bytes(32));
|
|
|
|
|
|
|
+
|
|
|
// 写入缓存,有效期7200秒(2小时)
|
|
// 写入缓存,有效期7200秒(2小时)
|
|
|
$this->cache->save($token, [
|
|
$this->cache->save($token, [
|
|
|
'userid'=>$userinfo['id'],
|
|
'userid'=>$userinfo['id'],
|
|
@@ -85,6 +103,7 @@ class User extends Lyapi_Controller{
|
|
|
$this->_json_error("登陆成功",200,[
|
|
$this->_json_error("登陆成功",200,[
|
|
|
'username'=>$userinfo['userid'],
|
|
'username'=>$userinfo['userid'],
|
|
|
'mobile'=>'',
|
|
'mobile'=>'',
|
|
|
|
|
+ 'is_wxbd'=>$is_wxbd,
|
|
|
'token'=>$token,
|
|
'token'=>$token,
|
|
|
'lypower'=>implode(',',$all_arr)
|
|
'lypower'=>implode(',',$all_arr)
|
|
|
]);
|
|
]);
|