From 94480951cb377e24e32f3e916ea2243ce6a1b215 Mon Sep 17 00:00:00 2001
From: Your Name <zls@example.com>
Date: Wed, 6 Nov 2019 10:55:42 +0800
Subject: [PATCH] =?UTF-8?q?OA=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Sdk/Conf/config.php               |  3 ++
 .../Controller/FengHuoApiController.class.php | 16 ++++++--
 .../GetInfoBaseController.class.php           | 39 +++++++++++++++++++
 .../Sdk/Controller/OAController.class.php     |  4 +-
 4 files changed, 56 insertions(+), 6 deletions(-)
 create mode 100644 Application/Sdk/Controller/GetInfoBaseController.class.php

diff --git a/Application/Sdk/Conf/config.php b/Application/Sdk/Conf/config.php
index 6ca9ed729..94d64a1b6 100644
--- a/Application/Sdk/Conf/config.php
+++ b/Application/Sdk/Conf/config.php
@@ -23,6 +23,9 @@ return array(
     'DATA_CACHE_PREFIX' => 'onethink_', // 缓存前缀
     'DATA_CACHE_TYPE'   => 'File', // 数据缓存类型
 
+    /*获取信息加密KEY*/
+    'GET_INFO_KEY'         => 'wmkjtx_kj213',
+
     /* 文件上传相关配置 */
     'DOWNLOAD_UPLOAD' => array(
         'mimes'    => '', //允许上传的文件MiMe类型
diff --git a/Application/Sdk/Controller/FengHuoApiController.class.php b/Application/Sdk/Controller/FengHuoApiController.class.php
index 264aa5440..1518f145c 100644
--- a/Application/Sdk/Controller/FengHuoApiController.class.php
+++ b/Application/Sdk/Controller/FengHuoApiController.class.php
@@ -5,11 +5,11 @@
  * Date: 2019/8/5
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Sdk\Controller;
 use Think\Controller;
 use Think\Log;
 
-class FengHuoApiController extends Controller{
+class FengHuoApiController extends GetInfoBaseController{
 //    protected function _initialize(){
 //        // 制定允许其他域名访问
 //        header("Access-Control-Allow-Origin:*");
@@ -76,7 +76,7 @@ class FengHuoApiController extends Controller{
 //        默认排序：id降序
         $order = 'register_time asc';
         $data = M('user','tab_')
-            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number')
+            ->field('id,account,promote_account,register_ip,register_time,device_type,device_number','fgame_name')
             ->where($where)
             ->order($order)
             ->page($page, $row)
@@ -87,6 +87,15 @@ class FengHuoApiController extends Controller{
                 $data[$k]['device_type'] = 'Android';
             }elseif($bindType == 2) {
                 $data[$k]['device_type'] = 'IOS';
+            }else{
+                if(!empty($v['fgame_name'])){
+                    $gameServer = substr($v['fgame_name'], -10, 9);
+                    if($gameServer == '安卓版'){
+                        $data[$k]['device_type'] = 'Android';
+                    } elseif($gameServer == '苹果版') {
+                        $data[$k]['device_type'] = 'Android';
+                    }
+                }
             }
 
         }
@@ -104,7 +113,6 @@ class FengHuoApiController extends Controller{
                 'Data' => 'null'
             ];
         }
-
         Log::write('registerDetail:' . date('Y-m-d H:i:s') . ' ---- ' . json_encode($result), 'INFO');
 
         return $this->ajaxReturn($result);
diff --git a/Application/Sdk/Controller/GetInfoBaseController.class.php b/Application/Sdk/Controller/GetInfoBaseController.class.php
new file mode 100644
index 000000000..fbc05acf6
--- /dev/null
+++ b/Application/Sdk/Controller/GetInfoBaseController.class.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Sdk\Controller;
+
+use Think\Controller;
+
+class GetInfoBaseController extends Controller
+{
+    public function _initialize()
+    {
+        $data = I('param.');
+        if (empty($data['time_stamp']) || time() - 60 * 10 > $data['time_stamp']) {
+            $result = [
+                'ResultCode'    => 2002,
+                'ResultMessage' => "链接已过期",
+                'Data'          => 'null',
+            ];
+            return $this->ajaxReturn($result);
+        } else {
+            $sign = $data['sign'];
+            unset($data['sign']);
+            ksort($data);
+            reset($data);
+            $str = "";
+            foreach ($data as $k => $v) {
+                $str = $str . $k . "=" . $v;
+            }
+            $str = $str . 'key=' . C('GET_INFO_KEY');
+            if (md5($str) != $sign) {
+                $result = [
+                    'ResultCode'    => 2001,
+                    'ResultMessage' => "参数错误",
+                    'Data'          => 'null',
+                ];
+                return $this->ajaxReturn($result);
+            }
+        }
+    }
+}
diff --git a/Application/Sdk/Controller/OAController.class.php b/Application/Sdk/Controller/OAController.class.php
index 079614137..502209a29 100644
--- a/Application/Sdk/Controller/OAController.class.php
+++ b/Application/Sdk/Controller/OAController.class.php
@@ -5,10 +5,10 @@
  * Date: 2016/11/4
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Sdk\Controller;
 use Think\Controller;
 
-class OAController extends Controller{
+class OAController extends GetInfoBaseController{
 
     /**
      * 游戏列表接口