elf
/
cf-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

贝塔版美国IP

Browse Source
master
tping 5 years ago
parent 676722379d
commit c428c69523
5 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
Application/Common/Common/function.php
Unescape Escape View File

@ -1189,7 +1189,7 @@ function age_verify($cardno, $name, $user_id = '')
$arr['create_time'] = time(); $arr['create_time'] = time();
$arr['info'] = $info; $arr['info'] = $info;
if ($date['status'] == '01') { if ($date['status'] == '01') { // 验证成功
$arr['status'] = 1; $arr['status'] = 1;
M('idcard_log', 'tab_')->data($arr)->add(); M('idcard_log', 'tab_')->data($arr)->add();
$age = floor((time() - strtotime($date['birthday'])) / (60 * 60 * 24 * 365)); $age = floor((time() - strtotime($date['birthday'])) / (60 * 60 * 24 * 365));
@ -1198,7 +1198,7 @@ function age_verify($cardno, $name, $user_id = '')
} else { } else {
return 2; return 2;
} }
} elseif (isset($date['status']) && $date['status'] != '01') { } elseif (isset($date['status']) && $date['status'] != '01') { // 验证错误 身份证和姓名不匹配
$arr['status'] = 0; $arr['status'] = 0;
M('idcard_log', 'tab_')->data($arr)->add(); M('idcard_log', 'tab_')->data($arr)->add();
return 0; return 0;

1
Application/Sdk/Common/function.php
Unescape Escape View File

@ -308,7 +308,6 @@ function jsonOutput($status=0, $msg='', $data=[]) {
} }
/** /**
<<<<<<< HEAD
* 使用淘宝接口 判断ip,,,确定是否属于该地区 * 使用淘宝接口 判断ip,,,确定是否属于该地区
* @param $ip * @param $ip
* @return bool * @return bool

11
Application/Sdk/Controller/ExchangeController.class.php
Unescape Escape View File

@ -93,6 +93,7 @@ class ExchangeController extends BaseController{
$prefix = $request['code'] == 1 ? "SP_" : "PF_"; $prefix = $request['code'] == 1 ? "SP_" : "PF_";
$out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4); $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
if (C('PAY_TEST')) $out_trade_no = $out_trade_no."_test";
$request['pay_order_number'] = $out_trade_no; $request['pay_order_number'] = $out_trade_no;
$user_entity = get_user_entity($request['user_id']); $user_entity = get_user_entity($request['user_id']);
@ -195,10 +196,16 @@ class ExchangeController extends BaseController{
// 是否是beta版苹果内购 // 是否是beta版苹果内购
$isBeta = false; $isBeta = false;
$isUSBeta = false;
if (isset($request['app_type']) && $request['app_type'] == 2) { if (isset($request['app_type']) && $request['app_type'] == 2) {
$isBeta = true; $isBeta = true;
// 美国IP 贝塔版
$ip = get_client_ip();
$isUSBeta = ip_is_country($ip, ['xx']);
} }
if (get_game_appstatus2($request['game_id']) || $istest || !$isBeta/* &&$request['is_create_ordernumer']!=1 */){ /* 第三方支付 */ $isUSBeta = ip_is_country($ip);
// 美国IP的贝塔包 不管游戏设置怎么设置 都走苹果支付
if (!$isUSBeta && (get_game_appstatus2($request['game_id']) || $istest || !$isBeta/* &&$request['is_create_ordernumer']!=1 */)){ /* 第三方支付 */
$prefix = $request['code'] == 1 ? "SP_" : "PF_"; // SP $prefix = $request['code'] == 1 ? "SP_" : "PF_"; // SP
$out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4); $out_trade_no = $prefix.date('Ymd').date('His').sp_random_string(4);
$request['pay_order_number'] = $out_trade_no; $request['pay_order_number'] = $out_trade_no;
@ -209,7 +216,7 @@ class ExchangeController extends BaseController{
$url = C('PAY_DOMAIN') . '/sdk.php?s=/Spend/'.$payPage.'&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1'.'&user_token='.$userToken.'&action=pay'.'&extend='.urlencode($request['extend']); $url = C('PAY_DOMAIN') . '/sdk.php?s=/Spend/'.$payPage.'&user_id='.$request['user_id'].'&game_id='.$request['game_id'].'&type=1'.'&user_token='.$userToken.'&action=pay'.'&extend='.urlencode($request['extend']);
echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>$url)));exit; echo base64_encode(json_encode(array('status'=>200,'out_trade_no'=>$out_trade_no,'img'=>$url)));exit;
// 只走第三方支付 不走苹果支付 // 只走第三方支付 不走苹果支付
} elseif(!get_game_appstatus2($request['game_id'] && $isBeta)/* &&$request['is_create_ordernumer']==1 */){ /* 废弃 苹果支付 */ } elseif ($isUSBeta || (!get_game_appstatus2($request['game_id'] && $isBeta))/* &&$request['is_create_ordernumer']==1 */){ /* 废弃 苹果支付 */
#获取订单信息 #获取订单信息
$prefix = $request['code'] == 1 ? "SP_" : "PF_"; $prefix = $request['code'] == 1 ? "SP_" : "PF_";

28
Application/Sdk/Controller/GameController.class.php
Unescape Escape View File

@ -154,6 +154,10 @@ class GameController extends BaseController{
// $data['sdk_version'] = 2; // $data['sdk_version'] = 2;
// } // }
// 美国IP 贝塔版
$ip = get_client_ip();
$isUSIP = ip_is_country($ip);
// var_dump($isUSIP);
if(empty($data['user_id'])) { if(empty($data['user_id'])) {
re_msg(1004, 'fail', '用户不存在'); re_msg(1004, 'fail', '用户不存在');
} }
@ -166,7 +170,9 @@ class GameController extends BaseController{
$sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find(); $sdkMenus = M('tool','tab_')->where(['name' => 'sdk_menu'])->find();
$menus = json_decode($sdkMenus['config'],true); $menus = json_decode($sdkMenus['config'],true);
$rmenus = array();
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']){ if(!empty($v['menu_version']) && $data['sdk_version'] != 0 && $v['menu_version'] != $data['sdk_version']){
unset($menus[$k]); unset($menus[$k]);
continue; continue;
@ -192,12 +198,20 @@ class GameController extends BaseController{
continue; continue;
} }
} }
// var_dump($isUSIP);
if (/* isset($data['app_type']) && $data['app_type'] == 2 && */$isUSIP) {
if($v['name'] == 'gift' || $v['name'] == 'suppersign') {
unset($menus[$k]);
continue;
}
}
//测试账号苹果审核 //测试账号苹果审核
$menus[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : $menus[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] :
C('ADMIN_DOMAIN') . $v['icon']; C('ADMIN_DOMAIN') . $v['icon'];
// die; // die;
if($v['type'] != 3){ if($v['type'] != 3){ //
if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") { if (substr($menus[$k]['url'], 0, 7) == "http://" || substr($menus[$k]['url'], 0, 8) == "https://") {
$menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2'; $menus[$k]['url'] = $menus[$k]['url'] . '/user_token/' . $user['user_token']."/game_id/".$data['game_id'].'/sdk_version/'.$data['sdk_version'].'/api_ver/2';
} else { } else {
@ -215,6 +229,7 @@ class GameController extends BaseController{
if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign'){ if ($data['sdk_version'] == 1 && $menus[$k]['name'] == 'suppersign'){
unset($menus[$k]); unset($menus[$k]);
continue;
}elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){ }elseif($data['sdk_version'] != 1 && $v['name'] == 'suppersign'){
// $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id']; // $menus[$k]['url'] = $v['url'] . '/user_token/' . $user['user_token'] . "/game_id/". $data['game_id'];
$menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . '/user_id/' . $data['user_id'] . '/game_id/' . $data['game_id'] . '.html?action=openurl'; $menus[$k]['ios_url'] = $v['ios_url'] . '/user_token/' . $user['user_token'] . '/user_id/' . $data['user_id'] . '/game_id/' . $data['game_id'] . '.html?action=openurl';
@ -224,6 +239,7 @@ class GameController extends BaseController{
} }
} }
$personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config'); $personalMenu = M('tool','tab_')->where(['name' => 'personal_menu'])->getField('config');
$personalMenu = json_decode($personalMenu, true); $personalMenu = json_decode($personalMenu, true);
foreach($personalMenu as $k => $v) { foreach($personalMenu as $k => $v) {
@ -250,6 +266,14 @@ class GameController extends BaseController{
continue; continue;
} }
} }
if (/* isset($data['app_type']) && $data['app_type'] == 2 && */$isUSIP) {
if($v['name'] == 'gift' || $v['name'] == 'balance') {
unset($personalMenu[$k]);
continue;
}
}
//测试账号苹果审核 //测试账号苹果审核
$personalMenu[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] : $personalMenu[$k]['icon'] = (substr($v['icon'], 0, 7) == "http://" || substr($v['icon'], 0, 8) == "https://" ) ? $v['icon'] :
C('ADMIN_DOMAIN') . $v['icon']; C('ADMIN_DOMAIN') . $v['icon'];
@ -282,7 +306,7 @@ class GameController extends BaseController{
} }
// 2456623.96 // 2456623.96
array_multisort(array_column($menus,'sort'),SORT_ASC,$menus); array_multisort(array_column($menus,'sort'), SORT_ASC, $menus);
array_multisort(array_column($personalMenu,'sort'),SORT_ASC,$personalMenu); array_multisort(array_column($personalMenu,'sort'),SORT_ASC,$personalMenu);
$menusArr = []; $menusArr = [];

2
Application/Sdk/Controller/UserController.class.php
Unescape Escape View File

@ -201,7 +201,7 @@ class UserController extends BaseController
} }
break; break;
} }
og_action($log); log_action($log);
echo base64_encode(json_encode($res_msg)); echo base64_encode(json_encode($res_msg));
die; die;

Write Preview
Loading…
Cancel
Save