diff --git a/api/checkAccount.php b/api/checkAccount.php index ab199f7..0424b20 100644 --- a/api/checkAccount.php +++ b/api/checkAccount.php @@ -28,11 +28,13 @@ if($redis->exists('account/'.$hash)){ $cnn = db__connect(); db__pushData($cnn, "account", $arr_t); $arr['isExist'] = true; - $redis->set('account/'.$arr['hash'], json_encode($arr)); + $redis->set('account/'.$hash, json_encode($arr)); } + $token = hash('sha256', $hash.time()); + $redis->set('auth/token/'.$token, $hash); - echo json_encode(array("code"=> 200, "hash"=>$arr['hash'], "message" => "Verified successfully!")); + echo json_encode(array("code"=> 200, "token"=>$token, "message" => "Verified successfully!")); }else{ echo json_encode(array("code"=> 500, "message"=>"Error!!")); diff --git a/api/verCode.php b/api/verCode.php index 53fc0a7..832b7cc 100644 --- a/api/verCode.php +++ b/api/verCode.php @@ -48,7 +48,8 @@ if($redis->exists('vercode/'.$usr) && $redis->get('vercode/'.$usr) == $code){ $arr['email'] = $usr; } $arr = array_merge($arr, array("isExist"=>false)); - } + } + $redis->set('account/'.$arr['hash'], json_encode($arr)); echo json_encode(array("code"=> 200, "hash"=>$arr['hash'], "isExist"=>$arr['isExist'], "message" => "Verified successfully!")); diff --git a/index.html b/index.html index 4abf45a..8c07f9c 100644 --- a/index.html +++ b/index.html @@ -93,5 +93,8 @@ message: '1. 为了更好地提供服务,本站需要您提供一个联系方 + diff --git a/js/login.js b/js/login.js index 48483f7..97c1ab3 100644 --- a/js/login.js +++ b/js/login.js @@ -163,8 +163,13 @@ $(function(){ $.get('/api/checkAccount.php?hash='+hash, function(data){ data = JSON.parse(data); if(data.code == 200){ - tips.success({message: '登录/注册成功!'}) - window.location.href="https://www.eee.dog/"; + tips.success({message: '登录/注册成功!'}); + var to = 'https://www.eee.dog/'; + if(cookie.get('_from')){ + to = decodeURI(cookie.get('_from')); + cookie.del('_from'); + } + window.location.href="https://auth.yimian.xyz/setToken.php?token="+data.token+"&from="+to; }else{ tips.warning({message: '登录/注册失败!'}) } diff --git a/logout.html b/logout.html new file mode 100644 index 0000000..ca213a3 --- /dev/null +++ b/logout.html @@ -0,0 +1 @@ +