t Merge branch 'dev' of http://ylsjtt.game7000.com:3000/YLSJ/jzhj2024server into dev

Gameserver/App/process/UserProc.php

@@ -45,7 +45,7 @@ class UserProc {
         TestServer::deleteUserUId(req()->uid, req()->zoneid);
         FightProc::DeleteRankInvalidUser(req()->uid);
         self::delRegRole(req()->zoneid, req()->uid, ctx()->baseInfo->name);
-        
+
         UserProc::updateUserInfo();
         $ret = array();
         return Resp::ok($ret);
@@ -218,7 +218,7 @@ class UserProc {
             } else {                                                                # 昵称已存在
                 $resp = Resp::ok(array('ret' => '用户已存在.'));
             }
-
+            $game->RegenNewToken();
             UserProc::updateUserInfo();                                         # 这一步回存操作只有在 userInfo正常存在的情况下才进行
 
             TaskProc::OnLogin_Daily();
@@ -232,6 +232,7 @@ class UserProc {
             //PayProc::m_refreshChargeOrders();                                   # 刷新订单, 多平台版本
             //PayProc::checkDeltest();                                            # 检查内侧充值记录(函数内部会只检查一次)
             //self::checkMissOrder();                                             #校验是否有漏单
+            $game->RegenNewToken();
             UserProc::updateUserInfo();                                         # 这一步回存操作只有在 userInfo正常存在的情况下才进行
 
             FightProc::Ranking_FightPower();
@@ -280,9 +281,9 @@ class UserProc {
                             'plat' => $plat
                         ))->exec();
     }
-    
+
     /**
-     * 
+     *
      * @param type $zoneid
      * @param type $userID
      * @param type $nickname
@@ -291,12 +292,12 @@ class UserProc {
      * @param type $plat
      * @return type
      */
-    static function delRegRole($zoneid, $userID, $nickname) {             
+    static function delRegRole($zoneid, $userID, $nickname) {
         return daoInst()->del('tab_rolename')
                         ->data(array(
                             'zoneid' => $zoneid,
                             'userID' => $userID,
-                            'roleName' => $nickname,                          
+                            'roleName' => $nickname,
                         ))->exec();
     }