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

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

Browse Source
master
zhanglingsheng 5 years ago
parent 6a9d454e4f 3e4df08518
commit c8e7436b32
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File

6
Application/Sdk/Conf/config.php
Unescape Escape View File

@ -117,7 +117,11 @@ $config = array(
'ADMIN_DOMAIN' => 'http://www.platform.com', // 'http://10.0.1.75:8089/',// 'ADMIN_DOMAIN' => 'http://www.platform.com', // 'http://10.0.1.75:8089/',//
'WX_PAY_LIMIT' => 3000, 'WX_PAY_LIMIT' => 3000,
'PAY_DOMAIN' => 'https://api.wmtxkj.cn/', 'PAY_DOMAIN' => 'https://api.wmtxkj.cn/',
'H5_DOMAIN' => 'http://api.wmtxkj.cn/' 'H5_DOMAIN' => 'http://api.wmtxkj.cn/',
'DL_DOMAIN' => 'https://dl.wmtxkj.cn/',
//'PAY_DOMAIN' => 'http://10.0.1.75:8088/',
//'H5_DOMAIN' => 'http://10.0.1.75:8088/',
); );
return $config; return $config;
/* $pay = include(APP_PATH . "/Sdk/Conf/pay.php"); /* $pay = include(APP_PATH . "/Sdk/Conf/pay.php");

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

@ -2486,13 +2486,14 @@ class UserController extends BaseController
$data['and_file_size'] = !empty($game_source['file_size']) ? $game_source['file_size'] : 0; $data['and_file_size'] = !empty($game_source['file_size']) ? $game_source['file_size'] : 0;
$data['and_version_code'] = !empty($game_source['version']) ? $game_source['version'] : 0; $data['and_version_code'] = !empty($game_source['version']) ? $game_source['version'] : 0;
$data['and_version_name'] = !empty($game_source['version']) ? $game_source['version'] : ''; $data['and_version_name'] = !empty($game_source['version']) ? $game_source['version'] : '';
$host = 'http://' . $_SERVER['HTTP_HOST']; $host = C('DL_DOMAIN');
} else { } else {
$data['ios_remark'] = !empty($remark) ? $remark : []; $data['ios_remark'] = !empty($remark) ? $remark : [];
$data['ios_file_size'] = !empty($game_source['file_size']) ? $game_source['file_size'] : 0; $data['ios_file_size'] = !empty($game_source['file_size']) ? $game_source['file_size'] : 0;
$data['ios_version_code'] = !empty($game_source['version']) ? $game_source['version'] : 0; $data['ios_version_code'] = !empty($game_source['version']) ? $game_source['version'] : 0;
$data['ios_version_name'] = !empty($game_source['version']) ? $game_source['version'] : ''; $data['ios_version_name'] = !empty($game_source['version']) ? $game_source['version'] : '';
$host = 'https://' . $_SERVER['HTTP_HOST'];
$host = C('DL_DOMAIN');
} }
if ($request['promote_id'] > 0) { if ($request['promote_id'] > 0) {
//渠道包 //渠道包
@ -2519,7 +2520,7 @@ class UserController extends BaseController
} else { } else {
$data['game_url'] = 'http://' . $_SERVER['HTTP_HOST'] . '/index.php?s=/Home/Home/promitionofregestion/pid/' . $request['promote_id'] . '/gid/' . $game_info['relation_game_id']; $data['game_url'] = C('DL_DOMAIN') . '/index.php?s=/Home/Home/promitionofregestion/pid/' . $request['promote_id'] . '/gid/' . $game_info['relation_game_id'];
$file_url = strpos($apply_info['pack_url'],'http') ===false ?$host . ltrim($apply_info['pack_url'], '.') : $apply_info['pack_url']; $file_url = strpos($apply_info['pack_url'],'http') ===false ?$host . ltrim($apply_info['pack_url'], '.') : $apply_info['pack_url'];
$pfile_url = strpos($apply_info['plist_url'],'http') ===false ?$host . ltrim($apply_info['plist_url'], '.') : $apply_info['plist_url']; $pfile_url = strpos($apply_info['plist_url'],'http') ===false ?$host . ltrim($apply_info['plist_url'], '.') : $apply_info['plist_url'];
} }
@ -2531,7 +2532,7 @@ class UserController extends BaseController
} }
} else { } else {
//原包 //原包
$data['game_url'] = 'http://' . $_SERVER['HTTP_HOST'] . '/mobile.php?s=/Game/detail/id/' . $request['game_id']; $data['game_url'] = C('DL_DOMAIN') . '/mobile.php?s=/Game/detail/id/' . $request['game_id'];
$file_url = strpos($game_source['file_url'],'http') ===false ? $host . ltrim($game_source['file_url'], '.') : $game_source['file_url']; $file_url = strpos($game_source['file_url'],'http') ===false ? $host . ltrim($game_source['file_url'], '.') : $game_source['file_url'];
$pfile_url = strpos($game_source['plist_url'],'http')===false ? $host . ltrim($game_source['plist_url'], '.') : $game_source['plist_url']; $pfile_url = strpos($game_source['plist_url'],'http')===false ? $host . ltrim($game_source['plist_url'], '.') : $game_source['plist_url'];
@ -2539,7 +2540,7 @@ class UserController extends BaseController
if ($game_info['sdk_version'] == 1) { if ($game_info['sdk_version'] == 1) {
$data['and_file_url'] = $file_url; $data['and_file_url'] = $file_url;
} else { } else {
$data['ios_file_url'] = $pfile_url; $data['ios_file_url'] = "itms-services://?action=download-manifest&url=" . $pfile_url;
} }
echo base64_encode(json_encode(array('code' => 200, 'msg' => '请求成功', 'data' => $data))); echo base64_encode(json_encode(array('code' => 200, 'msg' => '请求成功', 'data' => $data)));
} }

Write Preview
Loading…
Cancel
Save