Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

app/models/user/User.php

@@ -53,8 +53,6 @@ class User extends BaseModel
     {
         $res1 = true;
         if ($spread_uid) $res1 = self::where('uid', $spread_uid)->inc('spread_count', 1)->update();
-        @file_put_contents('sub2.txt', json_encode($wechatUser), FILE_APPEND);
-        @file_put_contents('sub2.5.txt', json_encode($spread_uid), FILE_APPEND);
         $res2 = self::create([
             'account' => 'wx' . $wechatUser['uid'] . time(),
             'pwd' => md5(123456),
@@ -69,8 +67,6 @@ class User extends BaseModel
             'user_type' => 'wechat'
         ]);
         $res = $res1 && $res2;
-        @file_put_contents('sub3.txt', json_encode($res1), FILE_APPEND);
-        @file_put_contents('sub3.txt', json_encode($res2), FILE_APPEND);
         self::checkTrans($res);
         return $res2;
     }

app/models/user/WechatUser.php

@@ -169,12 +169,12 @@ class WechatUser extends BaseModel
             }
         }
         self::beginTrans();
+        $userInfo['uid'] = User::getkeytoid('uid');
         $wechatUser = self::create(is_object($userInfo) ? $userInfo->toArray() : $userInfo);
         if (!$wechatUser) {
             self::rollbackTrans();
             exception('用户储存失败!');
         }
-        @file_put_contents('sub1.txt', json_encode($wechatUser), FILE_APPEND);
         if (!User::setWechatUser($wechatUser)) {
             self::rollbackTrans();
             exception('用户信息储存失败!');