|
|
@@ -108,6 +108,14 @@ class Register extends Common
|
|
|
$nowuid = (empty($appuid) || empty($appuid)) ? uniqid('anon_') : $appid . '_' . $appuid;
|
|
|
$avatar = "http://wx2.sinaimg.cn/mw690/5db11ff4gy1flxmew7edlj203d03wt8n.jpg"; //默认头像
|
|
|
|
|
|
+ if (!empty($nowuid) && !empty($token)) {
|
|
|
+ $old = Db::name('accounts')->where(['account_name' => $nowuid, 'tokenvip' => $token])->find();
|
|
|
+ if ($old) {
|
|
|
+ Db::name('accounts')->where(['account_name' => $nowuid])->update(['last_login_time' => time()]);
|
|
|
+ return json(['code' => 1, 'data' => ['id' => $old['id'], 'name' => $nowuid, 'token' => $old['tokenvip'], 'avatar' => $avatar], 'msg' => '注册成功']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if ($token) {
|
|
|
$old = db('accounts')->where(['token' => $token])->find();
|
|
|
if ($old) {
|
|
|
@@ -119,15 +127,10 @@ class Register extends Common
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- $old = Db::name('accounts')->where(['account_name' => $nowuid])->find();
|
|
|
- if ($old) {
|
|
|
- Db::name('accounts')->where(['account_name' => $nowuid])->update(['last_login_time' => time()]);
|
|
|
- return json(['code' => 1, 'data' => ['id' => $old['id'], 'name' => $nowuid, 'token' => $old['token'], 'avatar' => $avatar], 'msg' => '注册成功']);
|
|
|
- }
|
|
|
-
|
|
|
+ NEWUSERLABLE:
|
|
|
$now = time();
|
|
|
$token = md5(uniqid() . rand(10000, 50000));
|
|
|
+ $tokenvip = md5(md5(uniqid() . rand(60000, 90000)));
|
|
|
$newdata = [
|
|
|
'account_name' => $nowuid,
|
|
|
'password' => md5(time() . rand(1, 5000)),
|
|
|
@@ -135,11 +138,16 @@ class Register extends Common
|
|
|
'add_time' => $now,
|
|
|
'last_login_time' => $now,
|
|
|
'token' => $token,
|
|
|
+ 'tokenvip' => $tokenvip,
|
|
|
'expire_time' => $now,
|
|
|
];
|
|
|
$retid = Db::name('accounts')->insertGetId($newdata);
|
|
|
if ($retid) {
|
|
|
- return json(['code' => 1, 'data' => ['id' => $retid, 'name' => $nowuid, 'token' => $token, 'avatar' => $avatar], 'msg' => '注册成功']);
|
|
|
+ if (empty($nowuid)) {
|
|
|
+ return json(['code' => 1, 'data' => ['id' => $retid, 'name' => $nowuid, 'token' => $token, 'avatar' => $avatar], 'msg' => '注册成功']);
|
|
|
+ } else {
|
|
|
+ return json(['code' => 1, 'data' => ['id' => $retid, 'name' => $nowuid, 'token' => tokenvip, 'avatar' => $avatar], 'msg' => '注册成功']);
|
|
|
+ }
|
|
|
} else {
|
|
|
return json(['code' => 0, 'data' => [], 'msg' => '注册用户失败']);
|
|
|
}
|