From 5d7385e77a275651bfc6d2b02bc6b4658a9cbe93 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Tue, 22 Oct 2019 18:28:54 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E7=99=BB=E9=99=86bug=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/Ssg/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/Ssg/login.html b/Application/Mobile/View/Ssg/login.html
index 18a666838..b7553fe45 100644
--- a/Application/Mobile/View/Ssg/login.html
+++ b/Application/Mobile/View/Ssg/login.html
@@ -139,7 +139,7 @@
                         </div>
                         <div class="formitem">
                             <img src="__IMG__/ssg/login/password.png">
-                            <input id="regpassword" type="password" placeholder="请输入6-12位自字母组合密码" value="">
+                            <input id="regpassword" type="password" placeholder="请输入6-12位字母组合密码" value="">
                         </div>
                         <div class="formitem">
                             <img src="__IMG__/ssg/login/password.png">

From 281605436144032fcc1923b46ad55e4f5bf89712 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 22 Oct 2019 18:33:26 +0800
Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Base/Repository/PromoteRepository.class.php | 6 +++++-
 Application/Home/Controller/QueryController.class.php   | 6 +++---
 Application/Home/View/default/Query/arpu.html           | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Application/Base/Repository/PromoteRepository.class.php b/Application/Base/Repository/PromoteRepository.class.php
index 514f7a734..ed7704485 100644
--- a/Application/Base/Repository/PromoteRepository.class.php
+++ b/Application/Base/Repository/PromoteRepository.class.php
@@ -48,7 +48,11 @@ class PromoteRepository {
         if (isset($params['lock_status'])) {
             $lockUserIds = M('user', 'tab_')->where(['lock_status' => 0, 'promote_id' => ['in', $allIds]])->getField('id', 'true');
             if (count($lockUserIds) > 0) {
-                $map['user_id'] = ['not in', $lockUserIds];
+                if ($params['lock_status'] == 1) {
+                    $map['user_id'] = ['not in', $lockUserIds];
+                } else {
+                    $map['user_id'] = ['in', $lockUserIds];
+                }
             }
         }
         return $map;
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 8c36d5835..d5b30fd31 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1990,9 +1990,9 @@ class QueryController extends BaseController
             if ($costBegin != '' && $costEnd != '') {
                 $having = 'sum(cost) between ' . $costBegin . ' and ' . $costEnd;
             } elseif ($costBegin != '' && $costEnd == '') {
-                $having = 'sum(cost) > ' . $costBegin;
+                $having = 'sum(cost) >= ' . $costBegin;
             } elseif ($costBegin == '' && $costEnd != '') {
-                $having = 'sum(cost) < ' . $costEnd;
+                $having = 'sum(cost) <= ' . $costEnd;
             }
             $subMap = $map;
             $subMap['pay_status'] = 1;
@@ -2088,7 +2088,7 @@ class QueryController extends BaseController
     public function getGameServers()
     {
         $gameId = I('game_id', 0);
-        $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => $gameId])->select();
+        $servers = M('server', 'tab_')->field(['id', 'server_id', 'server_name'])->where(['game_id' => $gameId])->order('server_id asc')->select();
         $this->ajaxReturn([
             'status' => 1,
             'msg' => '成功',
diff --git a/Application/Home/View/default/Query/arpu.html b/Application/Home/View/default/Query/arpu.html
index cbd0971e5..546ef5c88 100644
--- a/Application/Home/View/default/Query/arpu.html
+++ b/Application/Home/View/default/Query/arpu.html
@@ -235,7 +235,7 @@
 <script type="text/javascript" src="__JS__/20170831/tabpage.js"></script>
 <eq name='timeout' value='1'>
 <script>
-  layer.msg('时间间隔不能超过90天');
+  layer.msg('时间间隔不能超过30天');
 </script>
 </eq>
 <script>

From b8f93f74c6f587a94f79d93e7ef3d64d1886740d Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 22 Oct 2019 18:38:38 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=91=98=E7=B3=BB=E7=BB=9F=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Public/promote_base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 0b91d3371..6342067b6 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -47,7 +47,7 @@
 					<a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
 				</if>
 			</div>
-			<?php $isOpenQuery = in_array($loginer['id'], [1, 84, 531]) || in_array($loginer['parent_id'], [1, 84, 531]) || in_array($loginer['grand_id'], [1, 84, 531]) ? true : false; ?>
+			<?php $isOpenQuery = in_array($loginer['id'], [1]) || in_array($loginer['parent_id'], [1]) || in_array($loginer['grand_id'], [1]) ? true : false; ?>
 			<?php if($isOpenQuery):?>
 
 			<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>

From c3d4c112d661b5f79584d72044a6bc1476c4e8ad Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 22 Oct 2019 18:48:47 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0->=E5=8C=BA=E6=9C=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index c2913a8d7..1c70e57f1 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1671,6 +1671,7 @@ class QueryController extends BaseController
         $serverData = M('Server', 'tab_')
             ->field('server_id,server_name')
             ->where($where)
+            ->order('server_version,start_time desc')
             ->select();
         $result['status'] = 1;
         $result['data'] = $serverData;

From 4d0359aaba0045120f05ac14e55ed048c9ece89f Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 23 Oct 2019 10:33:20 +0800
Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Base/Repository/PromoteRepository.class.php        | 10 +++++++++-
 .../Home/Controller/PromoteController.class.php        |  6 +++++-
 Application/Home/View/default/Public/promote_base.html |  5 ++++-
 Application/Home/View/default/Query/achievement.html   |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Application/Base/Repository/PromoteRepository.class.php b/Application/Base/Repository/PromoteRepository.class.php
index ed7704485..9f2f55f50 100644
--- a/Application/Base/Repository/PromoteRepository.class.php
+++ b/Application/Base/Repository/PromoteRepository.class.php
@@ -53,6 +53,10 @@ class PromoteRepository {
                 } else {
                     $map['user_id'] = ['in', $lockUserIds];
                 }
+            } else {
+                if ($params['lock_status'] == 2) {
+                    $map['_string'] = ' 1<>1';
+                }
             }
         }
         return $map;
@@ -218,7 +222,11 @@ class PromoteRepository {
         }
 
         $subQuery = M('user_play_info', 'tab_')->field('user_id')->group('user_id')->where($subMap)->buildSql();
-        $map['_string'] =  ' user_id not in (' . $subQuery . ')';
+        if (isset($map['_string'])) {
+            $map['_string'] .= ' and user_id not in (' . $subQuery . ')';
+        } else {
+            $map['_string'] =  ' user_id not in (' . $subQuery . ')';
+        }
         $inQuery = M('user_play_info', 'tab_')->field('user_id')->group('user_id')->where($map)->buildSql();
 
         $resultMap = ['_string' => 'user_id in (' . $inQuery . ')'];
diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index d4774857b..7fd048109 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -37,7 +37,11 @@ class PromoteController extends BaseController
     {
         $this->meta_title = "首页";
         $loginPromote = $this->getLoginPromote();
-        if ($loginPromote['id'] != 1 && $loginPromote['parent_id'] != 1 && $loginPromote['grand_id'] != 1) {
+
+        $whiteList = [1, 8];
+        $isOpenQuery = in_array($loginer['id'], $whiteList) || in_array($loginer['parent_id'], $whiteList) || in_array($loginer['grand_id'], $whiteList) ? true : false; 
+                
+        if (!$isOpenQuery) {
             $this->display('prepare');
             exit(0);
         }
diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html
index 6342067b6..21ceebfe2 100644
--- a/Application/Home/View/default/Public/promote_base.html
+++ b/Application/Home/View/default/Public/promote_base.html
@@ -47,7 +47,10 @@
 					<a href="{:U('Promote/mygrand')}" class="<if condition='CONTROLLER_NAME eq Promote and (ACTION_NAME eq mygrand or ACTION_NAME eq add_chlid or ACTION_NAME eq edit_chlid) '>active</if> ">推广员管理</a>
 				</if>
 			</div>
-			<?php $isOpenQuery = in_array($loginer['id'], [1]) || in_array($loginer['parent_id'], [1]) || in_array($loginer['grand_id'], [1]) ? true : false; ?>
+			<?php
+				$whiteList = [1, 8];
+				$isOpenQuery = in_array($loginer['id'], $whiteList) || in_array($loginer['parent_id'], $whiteList) || in_array($loginer['grand_id'], $whiteList) ? true : false; 
+			?>
 			<?php if($isOpenQuery):?>
 
 			<div class="subNav jssubNav"><i class="prev_icon icon_shujvi"></i><span>数据管理</span><i class="arrow_icon"></i></div>
diff --git a/Application/Home/View/default/Query/achievement.html b/Application/Home/View/default/Query/achievement.html
index 00b1b8500..56ede133f 100644
--- a/Application/Home/View/default/Query/achievement.html
+++ b/Application/Home/View/default/Query/achievement.html
@@ -81,7 +81,7 @@
             </div>
             <?php if (I('parent_id', 0) > 0):?>
             <div class="form-group">
-              <input type="buttom" class="submit normal_space" onclick="window.history.back();" value="返回上级" style="text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">
+              <a class="submit normal_space" href="{:U('Query/achievement', ['row'=>I('get.row')])}" style="line-height: 36px; display: inline-block; text-align: center; background: #E5E5E5; color: #2bd8ed; cursor: pointer;">返回上级</a>
             </div>
             <?php endif;?>
           </form>

From b7964e19d08a22c6b4cfa7fb87feaf58b982554a Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Wed, 23 Oct 2019 10:38:05 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/PromoteController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index 7fd048109..890c04244 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -39,7 +39,7 @@ class PromoteController extends BaseController
         $loginPromote = $this->getLoginPromote();
 
         $whiteList = [1, 8];
-        $isOpenQuery = in_array($loginer['id'], $whiteList) || in_array($loginer['parent_id'], $whiteList) || in_array($loginer['grand_id'], $whiteList) ? true : false; 
+        $isOpenQuery = in_array($loginPromote['id'], $whiteList) || in_array($loginPromote['parent_id'], $whiteList) || in_array($loginPromote['grand_id'], $whiteList) ? true : false; 
                 
         if (!$isOpenQuery) {
             $this->display('prepare');

From db424fde849b19a29bdbf79c018a4a8d471263d3 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 23 Oct 2019 11:18:12 +0800
Subject: [PATCH 07/12] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0->=E6=AF=8F=E6=97=A5=E6=A6=82=E5=86=B5->=E6=B8=B8?=
 =?UTF-8?q?=E6=88=8F=E6=A3=80=E7=B4=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 1c70e57f1..1c76845ed 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1155,7 +1155,9 @@ class QueryController extends BaseController
 
             $newUserNumData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.user_id) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();
@@ -1163,7 +1165,9 @@ class QueryController extends BaseController
 
             $newDeviceData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_device_number) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();
@@ -1171,7 +1175,9 @@ class QueryController extends BaseController
 
             $newIpNumData = $userPlayInfoModel
                 ->field('tab_user_play_info.create_time,count(distinct tab_user_play_info.create_ip) as num')
+                ->join($join)
                 ->where($userPlayInfoWhere2)
+                ->where($map)
                 ->having('tab_user_play_info.create_time between ' . $begTime . ' and ' . ($endTime + 86399))
                 ->order('tab_user_play_info.id')
                 ->find();

From dee6c2e60dead07520384dc8fdeb800d15dacfe0 Mon Sep 17 00:00:00 2001
From: zhengchanglong <zcl_office@163.com>
Date: Wed, 23 Oct 2019 11:21:49 +0800
Subject: [PATCH 08/12] =?UTF-8?q?=E6=89=B6=E6=8C=81=E5=8F=B7SDK=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=AE=89=E5=85=A8=E9=98=B2=E6=8A=A4=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Model/UserModel.class.php   | 97 ++++++++++++++++++-
 .../Sdk/Controller/UserController.class.php   |  8 +-
 Application/User/Api/MemberApi.class.php      | 10 +-
 3 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php
index e031fb6a5..f16e12318 100644
--- a/Application/Admin/Model/UserModel.class.php
+++ b/Application/Admin/Model/UserModel.class.php
@@ -1051,16 +1051,32 @@ class UserModel extends Model{
         }
     }
 
-		public function login_sdk($account,$password,$type=1,$game_id,$game_name,$sdk_version){
+    public function login_sdk($account,$password,$type=1,$game_id,$game_name,$sdk_version,$unique_code){
         $map['account'] = $account;
         /* 获取用户数据 */
         $user = $this->where($map)->find();
         if(is_array($user) && $user['lock_status']  && $user['check_status']){
             /* 验证用户密码 */
             if(think_ucenter_md5($password, UC_AUTH_KEY) === $user['password']||$type==2){
-                $token = $this->updateLogin_($user['id'],$account,$password,$user['fgame_id'],$game_id,$game_name); //更新用户登录信息
-                $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
-                return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
+                $test_resource =  M('test_resource','tab_')->where("user_id=%s and apply_status=2",$user['id'])->find();//测试资源（扶持号）
+                if($test_resource){ //扶持号
+                    if($user['device_number'] && $unique_code && $user['device_number'] !=$unique_code){ //#当前登录设备信息与历史登录设备信息不一致，触发账户冻结
+                        $this->sdklogin_device_error($user,$test_resource,$unique_code);
+                        $this->sdklogin_ip_error($user,$test_resource,get_client_ip());
+                        return -1;//扶持号被禁用
+                    }else{
+                        $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
+                        $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
+                        $this->sdklogin_ip_error($user,$test_resource,get_client_ip());
+                        return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
+                    }
+                }else{
+                    Log::write('进入SDK_1' , 'INFO');
+                    $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
+                    $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
+                    return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
+                }
+
             } else {
                 return -2; //密码错误
             }
@@ -1070,6 +1086,79 @@ class UserModel extends Model{
     }
 
 
+    //更新用户登录信息
+    protected function sdklogin_update($user,$account,$password,$user_fgame_id,$game_id,$game_name,$unique_code=''){
+        $model = M('User','tab_');
+        $uid = $user['id'];
+        $data["id"] = $uid;
+        $data["login_time"] = NOW_TIME;
+        $data["login_ip"] = get_client_ip();
+        $data["device_number"] = $unique_code;
+        $data["last_login_ip"] = $user['login_ip'];
+        $data["last_device_number"] = $user['device_number'];
+        $data["token"] = $this->generateToken($uid,$account,$password);
+        if($user_fgame_id){
+            $model->save($data);
+        }else{
+            $data['fgame_id']=$game_id;
+            $data['fgame_name']=$game_name;
+            $model->save($data);
+        }
+        return $data["token"];
+    }
+
+    // 扶持号登录设备异常
+    protected function sdklogin_device_error($user,$resource,$unique_code){
+        $model = M('User','tab_');
+        $uid = $user['id'];
+        $data["id"] = $uid;
+        $data["device_number"] = $unique_code;
+        $data["last_device_number"] = $user['device_number'];
+        $data["lock_status"] = 0 ;
+        $model->save($data);
+        $protect_data['user_id']= $uid;
+        $protect_data['user_account']= $resource['user_account'];
+        $protect_data['server_id'] = $resource['server_id'];
+        $protect_data['server_name']= $resource['server_name'];
+        $protect_data['game_id']=$resource['game_id'];
+        $protect_data['game_name']=$resource['game_name'];
+        $protect_data['nickname']=$resource['role_name'];
+        $protect_data['promote_id']=$resource['promote_id'];
+        $protect_data['promote_account']=$resource['promote_account'];
+        $protect_data['type']=2;
+        $protect_data['detail']="登录设备号异常，本次异常设备号：".$unique_code."，历史登录设备号：".$user['device_number'];
+        $protect_data['create_time'] = NOW_TIME;
+        M('protect_log','tab_')->add($protect_data);
+    }
+
+    // 扶持号登录IP异常
+    protected function sdklogin_ip_error($user,$resource,$ip){
+        $newloginip_source =  file_get_contents("http://ip.taobao.com/service/getIpInfo.php?ip=".$ip);
+        $aldloginip_source = file_get_contents("http://ip.taobao.com/service/getIpInfo.php?ip=".$user['login_ip']);
+
+        $newloginip_source = json_decode($newloginip_source,true);
+        $aldloginip_source = json_decode($aldloginip_source,true);
+
+        if($newloginip_source['data']['city']!=$aldloginip_source['data']['city']){  //登录城市不一致时触发IP异常
+            $uid = $user['id'];
+            $protect_data['user_id']= $uid;
+            $protect_data['user_account']= $resource['user_account'];
+            $protect_data['server_id'] = $resource['server_id'];
+            $protect_data['server_name']= $resource['server_name'];
+            $protect_data['game_id']=$resource['game_id'];
+            $protect_data['game_name']=$resource['game_name'];
+            $protect_data['nickname']=$resource['role_name'];
+            $protect_data['promote_id']=$resource['promote_id'];
+            $protect_data['promote_account']=$resource['promote_account'];
+            $protect_data['type']=1;
+            $protect_data['detail']="登录IP异常，本次异常IP：".$ip."，历史登录IP：".$user['login_ip'];
+            $protect_data['create_time'] = NOW_TIME;
+            M('protect_log','tab_')->add($protect_data);
+        }
+    }
+
+
+
     //判断game_id是否有值
     protected function updateLogin_($uid,$account,$password,$user_fgame_id,$game_id,$game_name){
         $model = M('User','tab_');
diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index d8a701d54..16882a765 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -40,7 +40,7 @@ class UserController extends BaseController
                 //1.登录成功,验证在本地是否有此账号
                 $user_res = M('user', 'tab_') -> where(['account' => $uc_username]) -> find();
                 if (!empty($user_res)) {//本地存在账号,验证密码直接登录
-                    $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version']);#调用登录
+                    $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'],$user['unique_code']);#调用登录
                     $res_msg = array();
                     switch ($result) {
                         case - 1:
@@ -112,7 +112,7 @@ class UserController extends BaseController
                     if ($res > 0) {
 
 
-                        $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version']);#调用登录
+                        $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'],$user['unique_code']);#调用登录
                         $res_msg = array();
                         switch ($result) {
                             case - 1:
@@ -173,7 +173,7 @@ class UserController extends BaseController
 
             } elseif ($uc_uid == - 1) {
                 //用户不存在,验证本地用户账号密码
-                $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version']);#调用登录
+                $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'],$user['unique_code']);#调用登录
                 $res_msg = array();
                 switch ($result) {
                     case - 1:
@@ -236,7 +236,7 @@ class UserController extends BaseController
         }
         #实例化用户接口
         $userApi = new MemberApi();
-        $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version']);#调用登录
+        $result = $userApi -> login_sdk($user["account"], $user['password'], 1, $user["game_id"], get_game_name($user["game_id"]), $user['sdk_version'],$user['unique_code']);#调用登录
         $res_msg = array();
         switch ($result) {
 
diff --git a/Application/User/Api/MemberApi.class.php b/Application/User/Api/MemberApi.class.php
index 6df0a929c..97baf85f0 100644
--- a/Application/User/Api/MemberApi.class.php
+++ b/Application/User/Api/MemberApi.class.php
@@ -111,12 +111,12 @@ class MemberApi extends Api{
     public function login_($account, $password,$type=2,$game_id=0,$game_name='',$sdk_version){
         return $this->model->login_1($account, $password,$type,$game_id,$game_name,$sdk_version);
     }
-		
-		public function login_sdk($account, $password,$type=2,$game_id=0,$game_name='',$sdk_version){
-        return $this->model->login_sdk($account, $password,$type,$game_id,$game_name,$sdk_version);
+    
+    public function login_sdk($account, $password,$type=2,$game_id=0,$game_name='',$sdk_version,$unique_code=''){
+        return $this->model->login_sdk($account, $password,$type,$game_id,$game_name,$sdk_version,$unique_code);
     }
-		
-		
+
+
     /**
     *修改数据
     */

From 9bc512722340472b9788e44b15992c360a7cc7eb Mon Sep 17 00:00:00 2001
From: jbrazz <2436953959@qq.com>
Date: Wed, 23 Oct 2019 11:29:21 +0800
Subject: [PATCH 09/12] upt

---
 .../Home/Controller/PromoteController.class.php    |  9 +++++++++
 .../Home/View/default/Promote/add_chlid.html       | 14 ++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index 890c04244..037cb7b5f 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -860,6 +860,15 @@ class PromoteController extends BaseController
                     $this->ajaxReturn(array('status' => -1, 'msg' => '身份证格式错误'));
                 }
             }
+            if (mb_strlen($_POST['account']) < 6 || mb_strlen($_POST['account']) > 15) {
+                $this->error('账号长度为6-15个字符', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+                return false;
+            }
+
+            if (mb_strlen($_POST['real_name']) < 2 || mb_strlen($_POST['real_name']) > 4) {
+                $this->error('姓名长度为2-4个字符', U('Promote/edit_chlid', array('id' => $id, 'type' => I('type', 0))));
+                return false;
+            }
 
             $res = $user->promote_add($_POST);
             if (is_numeric($res)) {
diff --git a/Application/Home/View/default/Promote/add_chlid.html b/Application/Home/View/default/Promote/add_chlid.html
index e87d01b21..5d9d63c2a 100644
--- a/Application/Home/View/default/Promote/add_chlid.html
+++ b/Application/Home/View/default/Promote/add_chlid.html
@@ -37,13 +37,13 @@
                   <tr>
                     <td class="l"><span class="req">*</span>帐号：</td>
                     <td class="r">
-                      <input type="text" class="name input-txt txt" name="account" id="account" placeholder="请输入帐号">
+                      <input type="text" class="name input-txt txt" name="account" id="account" maxlength="15" minlength="6" placeholder="请输入帐号">
                     </td>
                   </tr>
                   <tr>
                     <td class="l"><span class="req">*</span>姓名：</td>
                     <td class="r">
-                      <input type="text" class="name input-txt txt" name="real_name" id="real_name" placeholder="请输入姓名">
+                      <input type="text" class="name input-txt txt" name="real_name" id="real_name" maxlength="4" minlength="2" placeholder="请输入姓名">
                     </td>
                   </tr>
                   <tr>
@@ -141,8 +141,14 @@
        if($('#account').val()==""){
         return json_data = {'status':0,'msg':'子渠道账号不能为空'}
        }
-      if($.trim($('#account').val()).length < 6){
-        return json_data = {'status':0,'msg':'子渠道账号不能小于6位字符'}
+      //  if($.trim($('#account').val()).length < 6){
+      //   return json_data = {'status':0,'msg':'子渠道账号不能小于6位字符'}
+      // }
+      if($.trim($('#account').val()).length < 6 || $.trim($('#account').val()).length > 15){
+        return json_data = {'status':0,'msg':'子渠道账号长度为6-15位字符'}
+      }
+      if($.trim($('#real_name').val()).length < 2 || $.trim($('#real_name').val()).length > 4){
+        return json_data = {'status':0,'msg':'子渠道姓名长度为2-4位字符'}
       }
       if($('#password').val()==""){
         return json_data = {'status':0,'msg':'子渠道密码不能为空'}

From 29883f60ac397b704614fb87c4223b2a0d7d4795 Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Wed, 23 Oct 2019 13:42:57 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98=20=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95=20=20=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=92=E5=85=A5=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Controller/UserController.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index 16882a765..3fcb8157c 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -1196,7 +1196,13 @@ class UserController extends BaseController
             $data['create_ip'] = get_client_ip();
             // $data['create_device_number'] = time();
 
-            $user_play->add($data);
+            // 修改重复插入问题  增加唯一索引  记录重复插入异常
+            try {
+                $user_play->add($data);
+            } catch (\Exception $e) {
+                Log::write('Duplicate Exception:' .json_encode($e->getMessage()), Log::ERR);
+            }
+
             $this->updateLoginRecord($data);
         }
 

From 66e011e101effcef2dcaf21155dd31d494f96a00 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 23 Oct 2019 13:50:51 +0800
Subject: [PATCH 11/12] =?UTF-8?q?PC=E5=AE=98=E7=BD=91->=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=B8=81=E5=85=85=E5=80=BC=E7=AE=80=E4=BB=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Media/View/default/Index/business.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Media/View/default/Index/business.html b/Application/Media/View/default/Index/business.html
index ad0a46623..f8e21cf2c 100644
--- a/Application/Media/View/default/Index/business.html
+++ b/Application/Media/View/default/Index/business.html
@@ -40,7 +40,7 @@
                         </div>
                         <div style="float: left;margin-left: 20px">
                             <h3 style="color: #0C0C0C">平台币充值</h3>
-                            <p style="font-size: 14px;color: #666;margin-bottom: 30px">平台币简介平台币简介平台币简介平台币简介平台币简介平台币简介</p>
+                            <p style="font-size: 14px;color: #666;margin-bottom: 30px">平台币是可以在游戏内直接消费使用的，1平台币=1人民币，在游戏内您可直接用平台币选择购买相应的道具（钻石、宝石、金币等）。</p>
                             <style>
                                 .btn{
                                     background-color: #03B4F5;

From 85839b7e94bbfef54bb6c2467404c090578782ad Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 23 Oct 2019 13:52:59 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=AE=98=E7=BD=91->?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=85=85=E5=80=BC=E7=AE=80=E4=BB=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Mobile/View/Index/product.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Mobile/View/Index/product.html b/Application/Mobile/View/Index/product.html
index 370123230..a1225e492 100644
--- a/Application/Mobile/View/Index/product.html
+++ b/Application/Mobile/View/Index/product.html
@@ -141,7 +141,7 @@
           <div class="swiper-slide">
             <span class="join">
                 平台币简介：
-              这是平台币简介内容
+              平台币是可以在游戏内直接消费使用的，1平台币=1人民币，在游戏内您可直接用平台币选择购买相应的道具（钻石、宝石、金币等）。
             </span>
             <style>
               .btn{