Merge branch 'dev' of 47.111.118.107:/srv/git/sdk into dev

Application/Admin/Model/UserModel.class.php

@@ -1097,7 +1097,9 @@ class UserModel extends Model{
         $data["last_login_ip"] = $user['login_ip'];
         $data["last_device_number"] = $user['device_number'];
         $data["token"] = $this->generateToken($uid,$account,$password);
-        $data["user_token"] = $this->generateToken($uid,$account,$password);
+        if (!$user['user_token']) {
+        	$data["user_token"] = $this->generateToken($uid,$account,$password);
+        }
         if($user_fgame_id){
             $model->save($data);
         }else{

Application/Sdk/Controller/GameController.class.php

@@ -40,10 +40,10 @@ class GameController extends BaseController{
 	public function init_sdk() {
 
 		$data = json_decode(base64_decode(file_get_contents("php://input")), true);
-		if (I('debug') == 1) {
+		/* if (I('debug') == 1) {
 			$data['user_id'] = 1;
 			$data['sdk_version'] = 2;
-		}
+		} */
 		
 		$contact_cs = M('tool','tab_')->where(['name' => 'contact_cs'])->find();
 		$contact_cs = json_decode($contact_cs['config'],true);
@@ -83,8 +83,8 @@ class GameController extends BaseController{
 		$ret = [
 			'contact_cs' => $contact_cs[$k],
 		];
-		if (I('debug') == 1)
-			pp(($ret));
+		/* if (I('debug') == 1)
+			pp(($ret)); */
 		re_msg(200,'获取成功',$ret);
 		
 	}