From c8d7ea5f59af5591c4d9ea2928dfcc7d6239ba5f Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Thu, 27 Feb 2020 18:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/UserController.class.php   | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index 53bd8aaa..f9131fa7 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -111,6 +111,7 @@ class UserController extends BaseController
                             }
                             break;
                     }
+                    log_action($log);
                     echo base64_encode(json_encode($res_msg));
                     die;
 
@@ -200,6 +201,7 @@ class UserController extends BaseController
                                 }
                                 break;
                         }
+                        og_action($log);
                         echo base64_encode(json_encode($res_msg));
                         die;
 
@@ -273,6 +275,7 @@ class UserController extends BaseController
                             );
                         } else {
                             $log['remarks'] = '未知错误';
+                            $log['uid'] = $user["user_id"];
                             log_action($log);
                             $this -> set_message(1028, "fail", "未知错误");
                         }
@@ -280,6 +283,7 @@ class UserController extends BaseController
                 }
                 //同步ucenter注册
                 cus_uc_register($username, $password, $username . '@vlcms.com');
+                log_action($log);
                 echo base64_encode(json_encode($res_msg));
                 die;
 
@@ -387,6 +391,8 @@ class UserController extends BaseController
                 break;
 
         }
+        $log['uid'] = $user['user_id'];
+        log_action($log);
         echo base64_encode(json_encode($res_msg));
 
 
@@ -1215,20 +1221,14 @@ class UserController extends BaseController
     /**
      *添加玩家信息
      */
-    private function add_user_play($user = array(),$save = true,$type = '')
+    private function add_user_play($user = array())
     {
+
         $user_play = M("UserPlay", "tab_");
         $map["game_id"] = $user["game_id"];
         $map["user_id"] = $user["user_id"];
         $map['sdk_version'] = $user['sdk_version'];
         $res = $user_play -> where($map) -> find();
-        $log['uid'] = $user['user_id'];
-        $log['game_id'] = $user['game_id'];
-        $log['type'] = 3;
-        if($type === 0) {
-            $log['type'] = 4;
-        }
-        $log['action'] =  base64_decode(file_get_contents("php://input"));
         if (empty($res)) {
 
             $user_entity = get_user_entity($user["user_id"]);
@@ -1254,16 +1254,9 @@ class UserController extends BaseController
             $data['ppuid'] = $user['puid'] == '' ? 0 : $user['puid'];
             $data['check_time'] = time();
             $data['create_time'] = time();  // 创建时间  管理后台需要
-            if($save) {
-                $user_play -> add($data);
-            }
-            
-            $log['remarks'] = json_encode($data);
+            $user_play -> add($data);
 
-        } else {
-            $log['remarks'] = json_encode($res);
         }
-        log_action($log);
 
     }
 
@@ -1359,7 +1352,12 @@ class UserController extends BaseController
         $data['pipuid'] = $user_data['puid'];
 
         Log::write('save_user_play_info:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($data), 'INFO');
-
+        $log['uid'] = $user_id;
+        $log['game_id'] = $request['game_id'];
+        $log['action'] = json_encode($request);
+        $log['type'] = 5;
+        $log['remarks'] = json_encode($data);
+        log_action($log);
         if ($res['id']>0) {
             $user_play->save($data);
             $this->updateLoginRecord($data);
@@ -2389,7 +2387,6 @@ class UserController extends BaseController
 
         }
         $request['user_id'] = (!empty($user['id'])) ? $user['id'] : 0;
-        $this->add_user_play($request, false, 0);
 
         $da = array(
                 'user_id' => $user['id'],
@@ -2406,6 +2403,13 @@ class UserController extends BaseController
                 'promote_id' => $request['promote_id'],
                 'lpuid' => $user['puid'],
         );
+
+        $log['uid'] = $user['id'];
+        $log['game_id'] = $request['game_id'];
+        $log['action'] = json_encode($request);
+        $log['type'] = 4;
+        log_action($log);
+
         // $return = M('UserLoginRecord', 'tab_') -> add($da);
         $model = M('UserLoginRecord', 'tab_')->where(['user_id' => $user['id'],'game_id' => $request['game_id']])->order('id DESC')->find();
         M('UserLoginRecord', 'tab_')->where(['id' => $model['id']])->setField(['down_time' => NOW_TIME]);
@@ -2751,7 +2755,6 @@ class UserController extends BaseController
 
         }
         $request['user_id'] = (!empty($request['user_id'])) ? $request['user_id'] : 0;
-        $this->add_user_play($request, false, $request['mark']);
 
         $data = array(
                 'create_time' => $now,