Merge branch 'dev' of 47.111.118.107:/srv/git/platform

master
ELF 5 years ago
commit 17d3089310

@ -61,7 +61,7 @@ class HomeController extends Controller
if ($content) {
$ticketData = json_decode($content, true);
}
$isExpired = false;
$ticket = '';
if ($ticketData) {
@ -92,7 +92,7 @@ class HomeController extends Controller
]);
}
$ticket = $result['ticket'];
file_put_contents(RUNTIME_PATH . 'Data/wechat_ticket', json_encode(['ticket' => $ticket, 'expired_at' => time() + 3600]));
}
@ -149,7 +149,7 @@ class HomeController extends Controller
}
if ($status == 1) {
$downLink = 'itms-services://?action=download-manifest&url=' . "https://" . ltrim('.', $_SERVER["HTTP_HOST"] . M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'));
$downLink = 'itms-services://?action=download-manifest&url=' . "https://" . $_SERVER["HTTP_HOST"] . ltrim('.', M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'));
} else {
$downLink = get_apply_dow_url($gameId, $promoteId);
}
@ -230,7 +230,7 @@ class HomeController extends Controller
$map["game_id"] = $user["game_id"];
$map["user_id"] = $user["user_id"];
$map['sdk_version'] = $user['sdk_version'];
$res = $user_play -> where($map) -> find();
$res = $user_play->where($map)->find();
if (empty($res)) {
$user_entity = get_user_entity($user["user_id"]);
$data["user_id"] = $user["user_id"];
@ -254,7 +254,7 @@ class HomeController extends Controller
$data["sdk_version"] = $user["sdk_version"];
$data['ppuid'] = $user['puid'] == '' ? 0 : $user['puid'];
$data['check_time'] = time();
$user_play -> add($data);
$user_play->add($data);
}
}
}

Loading…
Cancel
Save