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

Application/Admin/Conf/config.php

@@ -17,6 +17,9 @@ return array(
     'DATA_CACHE_TYPE'      => 'File', // 数据缓存类型
     'URL_MODEL'            => 3, //URL模式
 
+    /*获取信息加密KEY*/
+    'GET_INFO_KEY'         => 'wmkjtx_kj213',
+
     /* 文件上传相关配置 */
     'DOWNLOAD_UPLOAD' => array(
         'mimes'    => '', //允许上传的文件MiMe类型

Application/Admin/Controller/FengHuoApiController.class.php

@@ -5,11 +5,11 @@
  * Date: 2019/8/5
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Admin\Controller;
 use Think\Controller;
 use Think\Log;
 
-class FengHuoApiController extends Controller{
+class FengHuoApiController extends GetInfoBaseController{
 //    protected function _initialize(){
 //        // 制定允许其他域名访问
 //        header("Access-Control-Allow-Origin:*");
@@ -57,7 +57,6 @@ class FengHuoApiController extends Controller{
      * @param
      */
     public function registerDetail(){
-
         $time = $_REQUEST['time'];
         $page = $_REQUEST['page'];
         $pageSize = $_REQUEST['page_size'];

Application/Admin/Controller/GetInfoBaseController.class.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Admin\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'    => 2001,
+                '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);
+            }
+        }
+    }
+}

Application/Admin/Controller/OAController.class.php

@@ -5,10 +5,10 @@
  * Date: 2016/11/4
  * Time: 16:04
  */
-namespace SDK\Controller;
+namespace Admin\Controller;
 use Think\Controller;
 
-class OAController extends Controller{
+class OAController extends GetInfoBaseController{
 
     /**
      * 游戏列表接口

Application/Sdk/Controller/GameController.class.php

@@ -105,7 +105,9 @@ class GameController extends BaseController{
         }
         $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
         $menus = json_decode($sdkMenus['config'],true);
-        foreach($menus as $k => &$v) {
+        foreach($menus as $k => $v) {
+            if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version'])
+                unset($menus[$k]);
             $menus[$k]['icon'] = C('ADMIN_DOMAIN') . $menus[$k]['icon'];
 //             die;
             if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
@@ -128,7 +130,10 @@ class GameController extends BaseController{
         }
         $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config');
         $personalMenu = json_decode($personalMenu, true);
-        foreach($personalMenu as $k => &$v) {
+        foreach($personalMenu as $k => $v) {
+            if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){
+                unset($personalMenu[$k]);
+            }
         	 $personalMenu[$k]['icon'] = C('ADMIN_DOMAIN') . $personalMenu[$k]['icon'];
 //             die;
             if (substr($personalMenu[$k]['url'], 0, 7) == "http://" || substr($personalMenu[$k]['url'], 0, 8) == "https://") {

Application/Sdk/Controller/UserController.class.php

@@ -3227,6 +3227,43 @@ class UserController extends BaseController
         exit;
     }
 
+    /**
+     * 订单状态
+     */
+    public function order_status() {
+
+    	$request = json_decode(base64_decode(file_get_contents("php://input")), true);
+    	if (I("debug")) {
+    		$request['orderno'] = "SP_20191105154135nTcz";
+    	}
+    	if (!$request['orderno']) return ;
+    	
+    	$pay_where = substr($orderno, 0, 2);
+    	$map['pay_order_number'] = $orderno;
+    	
+    	switch ($pay_where) {
+    		case 'SP' :
+    			$result = M('Spend', 'tab_')->field("*")->where($map)->find();
+    			break;
+    		case 'PF' :
+    			$result = M('deposit', 'tab_')->field('*')->where($map)->find();
+    			break;
+    		case 'TB' :
+    			$result = M('balance', 'tab_')->field('*')->where($map)->find();
+    			break;
+    		case 'BR' :
+    			$result = M('bind_recharge', 'tab_')->field('*')->where($map)->find();
+    			break;
+    	}
+    	// 支付成功跳转页面
+    	if ($result['pay_status'] == 1) {
+    		$this->new_set_message(200, "支付成功");
+    		// $this->success("支付成功", U("userH/get_user_money", ['user_token' => $userToken]));
+    	} else {
+    		$this->new_set_message(0, "支付失败");
+    	}
+    	
+    }
         
 }