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

Application/Sdk/Controller/BaseController.class.php

@@ -34,7 +34,6 @@ class BaseController extends RestController{
        	$a = ACTION_NAME;
        	$data = json_decode ( base64_decode ( file_get_contents ( "php://input" ) ), true );
        		
-       	if (isset($data['api_ver']) && $data['api_ver'] == 2) {
        	if (!(in_array($c, $this->noNeedGame) || in_array($a, $this->noNeedGame) || in_array($c.".".$a, $this->noNeedGame))) {
        		// 解决在游戏中未退出的用户 user_token 不存在问题
        		$userToken = M('user', 'tab_')->where(['id' => $data['user_id']])->getField('user_token');
@@ -96,56 +95,6 @@ class BaseController extends RestController{
             }
 
         }
-       	} else {  // 旧版
-       		
-
-       		C(api('Config/lists'));
-       		
-       		if(
-       		!preg_match("/apple_alipay_pay/",GetCurUrl())
-       		&&!preg_match("/apple_weixin_pay/",GetCurUrl())
-       		&&!preg_match("/get_alipay_zmxy_return/",GetCurUrl())
-       		&&!preg_match("/apple_platform_pay/",GetCurUrl())
-       		&&!preg_match("/notice/",GetCurUrl())
-       		&&!preg_match("/apple_union_pay/",GetCurUrl())
-       		&&!preg_match("/test/",GetCurUrl())
-       		&&!preg_match("/wap_shortcut_pay/",GetCurUrl())
-       		&&!preg_match("/shortcut_pay/",GetCurUrl())
-       		&&!preg_match("/android_shortcut_pay/",GetCurUrl())
-       		&&!preg_match("/wap_shortcut_pay/",GetCurUrl())
-       		&&!preg_match("/apple_weixin_pay/",GetCurUrl())
-       		&&!preg_match("/Ipa365/",GetCurUrl())
-       		&&!preg_match("/user_login/",GetCurUrl())
-       		&&!preg_match("/platform_coin_deduction/",GetCurUrl())
-       		){
-       			$data = json_decode(base64_decode(file_get_contents("php://input")),true);
-       			 
-       			// #判断数据是否为空
-       			if(empty($data) || empty($data['game_id'])){
-       				echo base64_encode(json_encode(array("status"=>10,"return_msg"=>"操作数据或游戏ID不能为空")));exit();
-       			}
-       			$md5Sign = $data['md5_sign'];
-       			unset($data['md5_sign']);
-       		
-       			#获取游戏key
-       			$game_data = M("game","tab_")->alias("g")->field("s.*")
-       			->where(['g.apply_status'=>1,'g.id'=>$data['game_id']])
-       			->join("left join tab_game_set s on s.game_id = g.id")
-       			->find();
-       			if(empty($game_data)){
-       				$this->set_message(0,"fail","游戏不存在或未通过审核");
-       			}
-       				
-       			if (isset($data['openid'])) // 小程序支付增加参数
-       				unset($data['openid']);
-       			$md5_sign = $this->encrypt_md5($data,$game_data["access_key"]);//mengchuang DZQkkiz!@#9527
-       			if($md5Sign !== $md5_sign){
-       				$this->set_message(0,"fail","验签失败");
-       			}
-       		
-       		}
-       		
-       	}
             
     }
 

Application/Sdk/Controller/GameGiftPageController.class.php

@@ -4,6 +4,20 @@ use Think\Controller;
 use Common\Api\GaemApi;
 class GameGiftPageController extends Controller{
 
+    public $userId;
+    public function _initialize()
+    {
+        $userToken = I("request.user_token");
+        if (!$userToken) {
+            re_msg(11, "参数有误，请重新登入获取！");
+        }
+
+        $this->userId = M("user", "tab_")->where(['user_token' => $userToken])->getField("id");
+        $this->userToken = $userToken;
+        if (!$this->userId) {
+            re_msg(12, $userToken."Token失效");
+        }
+    }
 	public function gift_list(){
 	 	$gameId = I('game_id');
 	 	$sdkVersion = I('sdk_version', -1);

Application/Sdk/Controller/PageBaseController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Sdk\Controller;
+
+use Think\Controller;
+
+class PageBaseController extends Controller
+{
+
+    public $userId;
+    public function _initialize()
+    {
+        $userToken = I("request.user_token");
+        if (!$userToken) {
+            re_msg(11, "参数有误，请重新登入获取！");
+        }
+
+        $this->userId = M("user", "tab_")->where(['user_token' => $userToken])->getField("id");
+        $this->userToken = $userToken;
+        if (!$this->userId) {
+            re_msg(12, $userToken."Token失效");
+        }
+    }
+}

Application/Sdk/Controller/UserHController.class.php

@@ -7,6 +7,24 @@ use Think\Log;
 
 class UserHController extends Controller
 {
+
+
+    public $userId;
+    public function _initialize()
+    {
+        $userToken = I("request.user_token");
+        if (!$userToken) {
+            re_msg(11, "参数有误，请重新登入获取！");
+        }
+
+        $this->userId = M("user", "tab_")->where(['user_token' => $userToken])->getField("id");
+        $this->userToken = $userToken;
+        if (!$this->userId) {
+            re_msg(12, $userToken."Token失效");
+        }
+    }
+
+    
 	 /**
      * 获取用户平台币充值记录绑币余额
      * @return [type] [description]

Application/Sdk/View/default/Spend/pay_way_v1.html

@@ -78,7 +78,7 @@
 					<div class="recharge_way_wrap recharge_table">
 						<if condition="C('wei_xin.status') eq 1 or C('weixin_gf.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.wx') eq 1) or (C('heepay.status') eq 1 and C('heepay.wxp') eq 1)">
 						<div class="recharge_cell">
-							<a href="{:U('Apple/apple_weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_wechat"><img src="__IMG__/btn_pay_wechat@3x.png"></a>
+							<a id="wxpay" data-url="{:U('Apple/apple_weixin_pay',array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_wechat"><img src="__IMG__/btn_pay_wechat@3x.png"></a>
 						</div>
 						</if>
 						<if condition="C('alipay.status') eq 1 or (C('goldpig.status') eq 1 and C('goldpig.zfb') eq 1) or (C('sqpay.status') eq 1 and C('sqpay.zfb') eq 1)">
@@ -92,12 +92,13 @@
 							  -->
 						</div>
 						</if>
-						<if condition="C('sqpay.status') eq 1 and C('sqpay.union') eq 1">
+						
+						<!-- <if condition="C('sqpay.status') eq 1 and C('sqpay.union') eq 1">
 						<div class="recharge_cell">
 							 <a href="{:U('Apple/apple_union_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_alipay">
 							 <img src="__IMG__/unionpay.png"></a>
 						</div>
-						</if>
+						</if> -->
 
 						<if condition="pay_set_status('ptb_pay') eq 1 and $data['code'] eq 1">
 						<div class="recharge_cell">
@@ -110,13 +111,13 @@
 								<a href="javascript:;" id="platform_id1" class="recharge_way_btn recharge_way_btn_platform"><img src="__IMG__/icon_bangbi@3x.png"></a>
 							</div>
 						</if>
-						
+						<!-- 
 						<if condition="C('sqpay.status') eq 1 and C('sqpay.shortcut') eq 1">
 						<div class="recharge_cell">
 							 <a href="{:U('WapPay/wap_shortcut_pay', array('user_id'=>I('user_id'),'game_id'=>I('game_id')))}" class="recharge_way_btn recharge_way_btn_alipay">
-							 <img src="__IMG__/unionpay.png"></a>
+							 <img src="__IMG__/onlinepay.png"></a>
 						</div>
-						</if>
+						</if> -->
 						
 					</div>
 					
@@ -180,6 +181,13 @@
 			}
 			
 			$(function() {
+				var flag = false;
+				$("#wxpay").on('click', function() {
+					if (flag) return ;
+					flag = true;
+					window.location.href = $(this).data('url');
+				});
+				
 				$(".recharge_way_wrap a").one("click",function(){
 					$(this).click(function (){return false;});
 				});
@@ -203,6 +211,8 @@
                 });
 				
 				$('#alipaybtn').on('click',function() {
+					if (flag) return ;
+					flag = true;
 					var that = $(this),url = $.trim(that.attr('data-url'));
 					if(that.hasClass('disabledbtn')){return false;}
 					that.addClass('disabled');