From 69a6f9612f4757ef0eababe08b736a5e8e3a8897 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 21 Oct 2019 19:34:41 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=89=93=E5=8C=85=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AutoPackController.class.php | 227 ++++--------- Application/Admin/Event/SourceEvent.class.php | 134 ++++---- .../Base/Service/ApplyService.class.php | 15 + .../Base/Service/GameSourceService.class.php | 301 +++++++++++++++++- Application/Base/Service/OssService.class.php | 122 +++++++ 5 files changed, 549 insertions(+), 250 deletions(-) create mode 100644 Application/Base/Service/OssService.class.php diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 1c9ff623b..af6beaab7 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -48,10 +48,10 @@ class AutoPackController extends Think } $this->checkPackageStatus(); - $this->app_package();//app渠道自动打包 + // $this->app_package();//app渠道自动打包 $this->channel(); - $this->launch_package(false); - $this->leak_detection(); + // $this->launch_package(false); + // $this->leak_detection(); } /** @@ -74,12 +74,10 @@ class AutoPackController extends Think ->where('1=1') ->group('l.id') ->select(); - if(!empty($launchGameIds)) { + if(!empty($launchGameIds)) { $ids = array_column($launchGameIds, 'id'); - $launchModel->where(['id'=>['in',$ids]])->setField('launch_packge', 2); - } $launchIds = $launchModel @@ -92,18 +90,18 @@ class AutoPackController extends Think ->group('apply_id') ->select(); - $launchId=''; + $launchId = []; foreach ($launchIds as $launchValue) { foreach ($launchAllIds as $launchAllValue) { if($launchValue['apply_id'] == $launchAllValue['apply_id'] && $launchValue['count'] == $launchAllValue['count']) { - $launchId[]=$launchValue['apply_id']; + $launchId[] = $launchValue['apply_id']; } } } if(!empty($launchId)) { - $applyModel->where(['id'=>['in',$launchId]])->setField('enable_status', 1); + $applyModel->where(['id'=> ['in',$launchId]])->setField('enable_status', 1); } } @@ -292,14 +290,6 @@ class AutoPackController extends Think /** * 渠道游戏打包 - * - * 针对每个申请游戏检测是否存在投放申请：有则更改投放申请状态，使其进入准备打包状态；无则进行渠道游戏打包 - * - * @author: 鹿文学[lwx] - * @since: 2019\4\17 0017 14:27 - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException */ private function channel() { $zip = new \ZipArchive(); @@ -311,140 +301,32 @@ class AutoPackController extends Think $gameSourceModel = M('Game_source', 'tab_'); $launchModel = M('apply_launch', 'tab_'); - $apply_data = $applyModel - -> field('id,game_id,game_name,promote_id,promote_account,sdk_version') - -> where($map) - -> order('bale_sort desc,id desc') - -> limit(200) - -> select(); - - if (!empty($apply_data)) { - foreach ($apply_data as $key => $value) { - - $game_so = $gameSourceModel - -> field('id,file_name,source_version') - -> where(['game_id' => $value['game_id']]) - -> find(); - - if (!file_exists(get_game_source_file_url($value['game_id'])) || null == $game_so) { - $applyModel -> where(['id' => $value['id']]) -> setField('enable_status', -1); - continue; - } - - - /* 检测是否存在投放申请，存在则更改投放申请信息，否则进行渠道打包 */ - $launchCount = $launchModel->where(['apply_id'=>$value['id']])->count(); - - if($launchCount>0) { - $applyModel->where(['id' => $value['id']]) -> setField('enable_status', 3); - - $launchModel->where(['apply_id'=>$value['id'], 'launch_packge'=>['in',[0,2,3]]])->save(['launch_packge'=>2,'launch_down_url'=>'','launch_plist_url'=>'']); - - } else { - $applyModel -> where(['id' => $value['id']]) -> setField('enable_status', 3); - - if ($value['sdk_version'] == 1) { - $str_ver = ".apk"; - $file_name = "GamePack"; - $url_ver = "META-INF/mch.properties"; - } else { - $zip_open_game_source = zip_open(get_game_source_file_url($value['game_id'])); - if ($zip_open_game_source) { - while ($zip_entry = zip_read($zip_open_game_source)) { - if (preg_match("/.app/", zip_entry_name($zip_entry))) { - $ios_app = substr(zip_entry_name($zip_entry), 8) . "
"; - } - $new_ios_1 = explode("/", $ios_app); - } - zip_close($zip_open_game_source); - } - $str_ver = ".ipa"; - $file_name = "IosGamePack"; - $url_ver = "Payload/" . $new_ios_1[0] . "/_CodeSignature/TXChannel"; - - } - $new_name = "game_package" . $value['game_id'] . "-" . $value['promote_id'] . $str_ver; - $to = "./Uploads/" . $file_name . "/" . $new_name; - $localPath = ROOTTT . ltrim($to, './'); - copy(get_game_source_file_url($value['game_id']), $localPath); - $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE); - if ($zip_res == true) { - #打包数据 - $pack_data = array( - "game_id" => $value["game_id"], - "game_name" => $value['game_name'], - "game_appid" => get_game_appid($value["game_id"], "id"), - "promote_id" => $value['promote_id'], - "promote_account" => $value['promote_account'], - "source_version" => $game_so['source_version'], - ); - $zip -> addFromString($url_ver, json_encode($pack_data)); - $zip -> close(); - - $newname = "game_package" . $value["game_id"] . "-" . $value['promote_id'] . $str_ver; - - if (get_tool_status("oss_storage") == 1) { - - if (C("oss_storage.is_cname")) { - $to = "http://" . C("oss_storage.domain") . "/" . str_replace("IosGamePack", "GamePack", $file_name) . "/" . $newname; - } else { - $to = "https://" . C("oss_storage.bucket") . "." . C("oss_storage.domain") . "/" . str_replace("IosGamePack", "GamePack", $file_name) . "/" . $newname; - $to = str_replace('-internal', '', $to); - } - if (!empty(C('oss_storage.bd_domain')) && strlen(C('oss_storage.bd_domain')) > 5) { - $to = C('oss_storage.bd_domain') . "/GamePack/" . $newname; - } - $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname; - $updata['savename'] = $newname; - $updata['path'] = $new_to; - $this -> upload_game_pak_oss($updata); - - if (file_exists($new_to)) { - @unlink($new_to); - } - } elseif (get_tool_status("qiniu_storage") == 1) { - - $this -> dleteQiNiuFile($newname); - $url = $this -> upQiNiuFile($newname, ROOTTT . ltrim($to, './')); - if (empty($url)) { - $this -> error('七牛错误，请检查七牛配置，并确保七牛空间权限正确！'); - } - @unlink(ROOTTT . ltrim($to, './')); - $to = "http://" . $url; - - } elseif (get_tool_status("cos_storage") == 1) { - - $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname; - - $updata['path'] = $new_to; - $updata['savename'] = 'GamePack/'. $newname; - - $to = $this->upload_cos($updata); - - } elseif (get_tool_status("bos_storage") == 1) { - $newname = "game_package" . $value["game_id"] . "-" . $value['promote_id'] . $str_ver; - $to = "http://" . C("bos_storage.bucket") . "." . C("bos_storage.domain") . "/" . $file_name . "/" . $newname; - $to = str_replace('-internal', '', $to); - $new_to = ROOTTT . "Uploads/" . $file_name . "/" . $newname; - $updata['savename'] = $newname; - $updata['path'] = $new_to; - $this -> upload_bos($updata); - } - $promote = array('game_id' => $value['game_id'], 'promote_id' => $value['promote_id']); - $plist_url = ''; - if ($value['sdk_version'] == 2) { - $plist_url = $this -> create_plist($promote['game_id'], $promote['promote_id'], get_payload_name($value['game_id']), $to); - } - $jieguo = $this -> updateinfo($value['id'], $to, $promote, $plist_url); - } - - } - + $applys = $applyModel + ->field('id,game_id,game_name,promote_id,promote_account,sdk_version') + ->where($map) + ->order('bale_sort desc,id desc') + ->limit(200) + ->select(); + + $gameIds = array_unique(array_column($applys, 'game_id')); + $games = M('game', 'tab_')->field(['id', 'game_appid'])->where(['id' => ['in', $gameIds]])->find(); + $games = index_by_column('id', $games); + + $launchCountList = $launchModel->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); + $launchCountList = index_by_column('apply_id', $launchCountList); + + $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name'])->where(['id' => ['game_id', $gameIds]])->find(); + $gameSources = index_by_column('game_id', $gameSources); + + $gameSourceService = new GameSourceService(); + if (!empty($applys)) { + foreach ($applys as $apply) { + $gameSource = $gameSources[$apply['game_id']] ?? null; + $game = $games[$apply['game_id']]['game_appid']; + $launchCount = $launchCountList[$apply['id']] ?? 0; + $gameSourceService->channelPack($gameSource, $game, $apply, $launchCount); } - } - - } @@ -456,21 +338,26 @@ class AutoPackController extends Think $map['a.status'] = 1; $map['a.enable_status'] = 1; $map['al.launch_packge'] = array('in', [0, 2, 3]); - $apply = $applymodel -> alias('a') - -> field('a.id,a.game_id,a.game_name,a.promote_account,a.pack_url,a.plist_url,a.promote_id,a.sdk_version,a.enable_status') - -> join('tab_apply_launch as al on (al.apply_id=a.id) ') - -> where($map) -> limit(3) -> group('a.id') -> select(); + $apply = $applymodel->alias('a') + ->field('a.id,a.game_id,a.game_name,a.promote_account,a.pack_url,a.plist_url,a.promote_id,a.sdk_version,a.enable_status') + ->join('tab_apply_launch as al on (al.apply_id=a.id) ') + ->where($map) + ->limit(300) + ->group('a.id') + ->select(); foreach ($apply as $key => $value) { - $game_so = $game_somodel -> field('id,file_name,source_version') -> where(['game_id' => $value['game_id']]) -> find(); - if (!file_exists(get_game_source_file_url($value['game_id'])) || null == $game_so) { + $gameSource = $gameSourceModel + ->field('id,file_name,source_version,file_type') + ->where(['game_id' => $value['game_id']]) + ->find(); + $gameSourceUrl = $gameSourceService->getGameSourceUrl($gameSource); + if ($gameSource || !file_exists($gameSourceUrl)) { M('apply', 'tab_') -> where(['id' => $value['id']]) -> setField('enable_status', -1); $launchmodel -> where(['apply_id' => $value['id']]) -> setField('launch_packge', 0); continue; } - - - $url = get_game_source_file_url($value['game_id']); - if (!empty($url) && is_file($url)) { + + if (!empty($gameSourceUrl) && is_file($gameSourceUrl)) { $launch = $launchmodel -> where(['apply_id' => $value['id'], 'launch_packge' => array('in', [0, 2, 3])]) -> select(); $zip = new \ZipArchive(); @@ -478,19 +365,19 @@ class AutoPackController extends Think if ($value['sdk_version'] == 1) { if (!empty($v['game_source_filename'])) { - if ($v['game_source_filename'] == $game_so['file_name']) { + if ($v['game_source_filename'] == $gameSource['file_name']) { if (!empty($v['launch_down_url'])) { $launchmodel -> where(['id' => $v['id']]) -> setField(['launch_packge' => 1]); continue; } } } - $str_ver = ".apk"; + $str_ver = '.apk'; $file_name = "GamePack"; $url_ver = "META-INF/mch.properties"; } else { if (!empty($v['game_source_filename'])) { - if ($v['game_source_filename'] == $game_so['file_name']) { + if ($v['game_source_filename'] == $gameSource['file_name']) { if (!empty($v['launch_plist_url'])) { if (!empty($v['launch_down_url'])) { $launchmodel -> where(['id' => $v['id']]) -> setField(['launch_packge' => 1]); @@ -499,7 +386,7 @@ class AutoPackController extends Think } } } - $zip_open_game_source = zip_open($url); + $zip_open_game_source = zip_open($gameSourceUrl); if ($zip_open_game_source) { while ($zip_entry = zip_read($zip_open_game_source)) { if (preg_match("/.app/", zip_entry_name($zip_entry))) { @@ -516,7 +403,7 @@ class AutoPackController extends Think } $new_name = "game_package" . $value['game_id'] . "-" . $value['promote_id'] . "-" . $v['platform_id'] . "-" . $v['position'] . $str_ver; $to = "./Uploads/" . $file_name . "/" . $new_name; - copy($url, ROOTTT . ltrim($to, './')); + copy($gameSourceUrl, ROOTTT . ltrim($to, './')); $zip_res = $zip -> open(ROOTTT . ltrim($to, './'), \ZipArchive::CREATE); if ($zip_res == true) { #打包数据 @@ -526,7 +413,7 @@ class AutoPackController extends Think "game_appid" => get_game_appid($value["game_id"], "id"), "promote_id" => $value['promote_id'], "promote_account" => $value['promote_account'], - "source_version" => $game_so['source_version'], + "source_version" => $gameSource['source_version'], 'launch_id' => $v['platform_id'], 'position' => $v['position'], ); @@ -595,7 +482,7 @@ class AutoPackController extends Think if ($value['sdk_version'] == 2) { $plist_url = $this -> create_plist($promote['game_id'], $promote['promote_id'], get_payload_name($value['game_id']), $to, $v['platform_id'], $v['position']); } - $jg = $this -> update_launch_info(['platform_id' => $v['platform_id'], 'apply_id' => $value['id'], 'position'=>$v['position']], $to, $plist_url, $game_so['file_name']); + $jg = $this -> update_launch_info(['platform_id' => $v['platform_id'], 'apply_id' => $value['id'], 'position'=>$v['position']], $to, $plist_url, $gameSource['file_name']); } @@ -643,7 +530,7 @@ class AutoPackController extends Think { $map['status'] = 1; $map['enable_status'] = 2; - $arr_id = M('app_apply', 'tab_') -> field('id') -> where($map) -> order('id desc') -> limit(3) -> select(); + $arr_id = M('app_apply', 'tab_')->field('id')->where($map)->order('id desc')->limit(300)->select(); if (empty($arr_id)) { return false; } @@ -722,8 +609,6 @@ class AutoPackController extends Think $apply_data['dow_url'] = $to; $apply_data['enable_status'] = 1; M('app_apply', 'tab_') -> save($apply_data); - - } } @@ -736,7 +621,7 @@ class AutoPackController extends Think */ public function updateinfo($id, $pack_url, $promote, $plist_url) { - $model = M('Apply', "tab_"); + $data = []; $data['id'] = $id; $data['pack_url'] = $pack_url; $data['dow_url'] = '/index.php?s=/Home/Down/down_file/game_id/' . $promote['game_id'] . '/promote_id/' . $promote['promote_id']; @@ -745,7 +630,7 @@ class AutoPackController extends Think $data['dispose_id'] = UID; $data['dispose_time'] = NOW_TIME; $data['plist_url'] = $plist_url; - $res = $model -> save($data); + $res = M('Apply', 'tab_')->save($data); return $res; } diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 1af21ac3f..2df636828 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -9,6 +9,7 @@ namespace Admin\Event; use Think\Controller; +use Base\Service\GameSourceService; /** * 后台首页控制器 @@ -20,17 +21,8 @@ class SourceEvent extends Controller public function add_source() { - $model = D('Game_source'); - $plist = A("Plist"); $data = $_REQUEST; $data['file_size'] = round($data['file_size'] / pow(1024, 2), 2) . "MB"; - /*if ($data['file_type'] == 2) { - if (preg_match("/.ipa/", $data['file_name'])) { - //copy($data['file_url'] . "/" . $data['file_name'], "./Uploads/Ios/original/" . $data['file_name']); - //@unlink($data['file_url'] . "/" . $data['file_name']); - //$data['file_url'] = "./Uploads/Ios/original"; - } - }*/ $data['file_url'] = $data['file_url'] . "/" . $data['file_name']; $data['sdk_version'] = $data['file_type']; $data['op_id'] = UID; @@ -39,19 +31,27 @@ class SourceEvent extends Controller $data['create_time'] = NOW_TIME; $remark = str_replace(array("\r\n", "\r", "\n"), "@@@", $_POST['remark']); $data['remark'] = json_encode(explode('@@@', $remark)); - if ($data['file_type'] == 2) { - $data['plist_url'] = "./Uploads/SourcePlist/" . $data['game_id'] . ".Plist"; - $data['org_plist_url'] = "./Uploads/OrgSourcePlist/" . $data['game_id'] . ".Plist"; - $plist -> create_plist($data['game_id'], 0, $data['bao_name'], $data['file_url']); + $data['source_version'] = 0; + $game = M('game', 'tab_')->where(['id' => $data['game_id']])->find(); + $gameSourceService = new GameSourceService(); + $result = $gameSourceService->sourcePack($data, $game); + var_dump($result); + if (!$result['status']) { + var_dump($result);die(); + $this->error('添加失败' , U('GameSource/lists', ['type' => $data['type']])); } - $res = $model -> add($data); - if ($res) { + $data['plist_url'] = $result['data']['plistUrl']; + $data['org_plist_url'] = $result['data']['orgPlistUrl']; + $data['file_url'] = $result['data']['fileUrl']; + $data['original_url'] = $result['data']['originalUrl']; + if (M('game_source', 'tab_')->add($data)) { //原包打包 - $this -> soure_pack($data['game_id'], $data['file_url'], $data['file_type'], 1, $data['bao_name']); - $this -> update_game_size($data); - $this -> success('添加成功', U('GameSource/lists', array('type' => $data['type']))); + $this->update_game_size($data); + var_dump('success');die(); + $this->success('添加成功', U('GameSource/lists', ['type' => $data['type']])); } else { - $this -> error('添加失败', U('GameSource/lists', array('type' => $data['type']))); + var_dump('error');die(); + $this->error('添加失败', U('GameSource/lists', ['type' => $data['type']])); } } @@ -65,23 +65,8 @@ class SourceEvent extends Controller $plist = A("Plist"); $data = $_REQUEST; $url = $data['file_url']; - $urll = $data['file_url2']; - /*if ($data['file_type'] == 2) { - if (preg_match("/.ipa/", $data['file_name']) && ($data['file_name'] != $file_name)) { - //copy($data['file_url'] . "/" . $data['file_name'], "./Uploads/Ios/original/" . $data['file_name']); - //@unlink($data['file_url'] . "/" . $data['file_name']); - //$data['file_url'] = "./Uploads/Ios/original"; - //$url = "./Uploads/Ios/original"; - - } - - }*/ + $urll = $data['file_url2']; $data['file_size'] = strpos($data['file_size'], 'MB') ? $data['file_size'] : round($data['file_size'] / pow(1024, 2), 2) . "MB"; - /*$extend = substr($data['file_url'], strlen($str) - 3, 3); - if ($extend != "apk" && $extend != "ipa") { - $data['file_url'] = $data['file_url'] . "/" . $data['file_name']; - }*/ - $data['file_url'] = $data['file_url'] . "/" . $data['file_name']; $data['id'] = $id; $data['op_id'] = UID; @@ -89,69 +74,71 @@ class SourceEvent extends Controller $data['create_time'] = NOW_TIME; $remark = str_replace(array("\r\n", "\r", "\n"), "@@@", $_POST['remark']); $data['remark'] = json_encode(explode('@@@', $remark)); - $game_source = $model -> where(array('id' => $id)) -> find(); + $game_source = $model->where(['id' => $id])->find(); if($game_source['file_name'] == $data['file_name']) { if ($from == "dev") { $this -> success('修改成功', U('Developers/source')); - } else { $this -> success('修改成功', U('GameSource/lists')); - } } - if ($data['file_type'] == 2) { - $data['plist_url'] = "./Uploads/SourcePlist/" . $data['game_id'] . ".Plist"; - $data['org_plist_url'] = "./Uploads/OrgSourcePlist/" . $data['game_id'] . ".Plist"; - $plist -> create_plist($data['game_id'], 0, $data['bao_name'], $data['file_url']); - } $data['source_version'] = $game_source['source_version'] + 1; - $res = $model -> save($data); + + $game = M('game', 'tab_')->where(['id' => $data['game_id']])->find(); + $result = $gameSourceService->sourcePack($data, $game); + if (!$result['status']) { + if ($from == "dev") { + $this->error('修改失败', U('Developers/source')); + } else { + $this->error('修改失败', U('GameSource/lists')); + } + } + $data['plist_url'] = $result['data']['plistUrl']; + $data['org_plist_url'] = $result['data']['orgPlistUrl']; + $data['file_url'] = $result['data']['fileUrl']; + $data['original_url'] = $result['data']['originalUrl']; - if ($res) { - //原包打包 - $this -> soure_pack($game_source['game_id'], $data['file_url'], $data['file_type'], $data['source_version'], $data['bao_name'], 1, $file_name); + if ($model->save($data)) { //渠道包加入打包队列 $appmodel = M('Apply', 'tab_'); $app_map['status'] = 1; $app_map['game_id'] = $game_source['game_id']; - $app_data = $appmodel -> where($app_map) -> select(); + $app_data = $appmodel->where($app_map)->select(); if ($app_data) { - M() -> startTrans(); - $app_res = $appmodel -> where($app_map) ->save(['enable_status'=>2, 'pack_url'=>'', 'plist_url'=>'']); - M('apply_launch', 'tab_') -> where(['launch_game_id'=>$game_source['game_id']]) -> setField('launch_packge', 0); + M()->startTrans(); + $app_res = $appmodel->where($app_map)->save(['enable_status'=>2, 'pack_url'=>'', 'plist_url'=>'']); + M('apply_launch', 'tab_') -> where(['launch_game_id'=>$game_source['game_id']])->setField('launch_packge', 0); if ($app_res === false) { - M() -> rollback(); + M()->rollback(); if ($from == "dev") { - $this -> error('渠道包打包失败', U('Developers/source')); + $this->error('渠道包打包失败', U('Developers/source')); } else { - $this -> error('渠道包打包失败', U('GameSource/lists')); + $this->error('渠道包打包失败', U('GameSource/lists')); } } else { - M() -> commit(); + M()->commit(); } } @unlink($url . "/" . $file_name); @unlink($urll . "/" . str_replace('.ipa', '.mobileprovision', $file_name)); - $this -> update_game_size($data); + + $this->update_game_size($data); + //发送站内信 - $user_id = M('ucenter_member') -> where('status=1') -> field('id') -> select(); - $content = '游戏：' . get_game_name($data['game_id']) . ' 已更新，请尽快处理渠道包'; - $sdk_version = M('game', 'tab_') -> field('sdk_version') -> where(['id' => $data['game_id']]) -> find(); - D('Msg') -> sendMsg2($user_id, $content, $sdk_version['sdk_version'], $data['game_id']); - if ($from == "dev") { - $this -> success('修改成功', U('Developers/source')); + $users = M('ucenter_member')->where('status=1') -> field('id')->select(); + $content = '游戏：' . $game['game_name'] . ' 已更新，请尽快处理渠道包'; + D('Msg')->sendMsg2($users, $content, $game['sdk_version'], $game['id']); + if ($from == "dev") { + $this->success('修改成功', U('Developers/source')); } else { - $this -> success('修改成功', U('GameSource/lists')); - + $this->success('修改成功', U('GameSource/lists')); } } else { if ($from == "dev") { - $this -> error('修改失败', U('Developers/source')); - + $this->error('修改失败', U('Developers/source')); } else { - $this -> error('修改失败', U('GameSource/lists')); - + $this->error('修改失败', U('GameSource/lists')); } } @@ -280,23 +267,18 @@ class SourceEvent extends Controller Vendor('OSS.autoload'); $ossClient = new \OSS\OssClient(C("oss_storage.accesskeyid"), C("oss_storage.accesskeysecr"), C("oss_storage.domain"), C("oss_storage.is_cname")); } catch (OssException $e) { - $this -> error($e -> getMessage()); + $this -> error($e->getMessage()); } $bucket = C('oss_storage.bucket'); - // if(preg_match('/.apk/',$return_data['savename']) ){ $oss_name = "SourcePack"; - // }else{ - // $oss_name="IosGamePack"; - // } $oss_file_path = $oss_name . "/" . $return_data["savename"]; $avatar = $return_data["path"]; try { - - $this -> multiuploadFile($ossClient, $bucket, $oss_file_path, $avatar); + $this->multiuploadFile($ossClient, $bucket, $oss_file_path, $avatar); return true; } catch (OssException $e) { /* 返回JSON数据 */ - $this -> error($e -> getMessage()); + $this->error($e -> getMessage()); } } diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 9d9577554..8d92b3e6d 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -22,4 +22,19 @@ class ApplyService { M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $ids]])->save($save); } + + public function updateAfterPack($apply, $packageUrl, $plistUrl) + { + $data = []; + $data['id'] = $apply['id']; + $data['pack_url'] = $packageUrl; + $data['dow_url'] = '/index.php?s=/Home/Down/down_file/game_id/' . $apply['game_id'] . '/promote_id/' . $apply['promote_id']; + $data['dow_status'] = 1; + $data['enable_status'] = 1; + $data['dispose_id'] = 0; + $data['dispose_time'] = time(); + $data['plist_url'] = $plist_url; + $res = M('Apply', 'tab_')->save($data); + return $res; + } } \ No newline at end of file diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 75511a60c..faf0cb15d 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -11,7 +11,8 @@ class GameSourceService { } - public function getChannelConfigFile($gameSource) { + public function getChannelConfigFile($gameSource) + { $configUrl = ''; if ($gameSource['sdk_version'] == 1) { $configUrl = "META-INF/mch.properties"; @@ -32,9 +33,13 @@ class GameSourceService { return $configUrl; } - public function getGameSourceUrl($gameSource){ + public function getGameSourceUrl($gameSource) + { + if (empty($gameSource)) { + return ''; + } $path = ''; - if($gameSource['file_type'] == '1'){ + if($gameSource['file_type'] == 1){ $path = './Uploads/SourcePack/'; }else{ $path = './Uploads/Ios/original/'; @@ -42,4 +47,294 @@ class GameSourceService { $fileUrl = $path . $gameSource['file_name']; return ROOTTT . ltrim($fileUrl, './'); } + + public function packChannelInfo($zipFile, $distFile, array $packData) + { + $zip = new \ZipArchive(); + if ($zip->open($zipFile, \ZipArchive::CREATE)) { + $zip->addFromString($distFile, json_encode($packData)); + $zip->close(); + return true; + } + return false; + } + + /** + * 原包打包 + */ + public function sourcePack($gameSource, $game) + { + $relativeUrl = $gameSource['file_url']; + $localPath = ROOTTT . ltrim($relativeUrl, './'); + + $packData = [ + 'game_id' => $game['id'], + 'game_name' => $game['game_name'], + 'game_appid' => $game['game_appid'], + 'promote_id' => 0, + 'promote_account' => '自然注册', + 'source_version' => $gameSource['source_version'], + ]; + + $originalUrl = ''; + if ($game['sdk_version'] == 2) { + $oldLocalPath = $localPath; + $localPath = str_replace('Uploads/SourcePack', 'Uploads/Ios/original', $oldLocalPath); + $originalUrl = $relativeUrl; + copy($oldLocalPath, $localPath); + } + $channelConfigFile = $this->getChannelConfigFile($gameSource); + $status = $this->packChannelInfo($localPath, $channelConfigFile, $packData); + if (!$status) { + return [ + 'status' => false, + 'message' => '打包失败，原包加入信息失败！', + ]; + } + + $distFilePath = 'SourcePack/' . $gameSource['file_name']; + $result = $this->uploadPackage($localPath, $distFilePath); + $fileUrl = ''; + if ($result['status']) { + $fileUrl = $result['data']['url']; + $fileUrl = $fileUrl == '@' ? $relativeUrl : $fileUrl; + } else { + return [ + 'status' => false, + 'message' => '打包失败，上传OSS失败！', + ]; + } + + $plistUrl = ''; + $orgPlistUrl = ''; + if ($game['sdk_version'] == 2) { + $params = [ + 'domain' => '', + 'packageName' => $gameSource['bao_name'], + 'gameId' => $game['id'], + 'promoteId' => 0, + 'packageUrl' => $fileUrl, + 'gameIcon' => '', + 'type' => 'pack' + ]; + $result = $this->createPlist($params); + if ($result['status']) { + $plistUrl = $result['data']['path']; + } else { + return [ + 'status' => false, + 'message' => '打包失败，生成plist文件失败！', + ]; + } + + $params['type'] = 'org'; + $result = $this->createPlist($params); + if ($result['status']) { + $orgPlistUrl = $result['data']['path']; + } else { + return [ + 'status' => false, + 'message' => '打包失败，生成原包plist文件失败！', + ]; + } + } + return [ + 'status' => true, + 'message' => '打包成功！', + 'data' => [ + 'plistUrl' => $plistUrl, + 'orgPlistUrl' => $orgPlistUrl, + 'fileUrl' => $fileUrl, + 'originalUrl' => $originalUrl, + ] + ]; + } + + /** + * 渠道打包 + */ + public function channelPack($gameSource, $game, $apply, $launchCount = 0) + { + $gameSourceUrl = $this->getGameSourceUrl($gameSource); + if ($gameSource == null || !file_exists($gameSourceUrl)) { + M('apply', 'tab_')->where(['id' => $apply['id']])->setField('enable_status', -1); + } + + /* 检测是否存在投放申请，存在则更改投放申请信息，否则进行渠道打包 */ + if ($launchCount > 0) { + M('apply', 'tab_')->where(['id' => $apply['id']])->setField('enable_status', 3); + $launchData = ['launch_packge' => 2, 'launch_down_url'=>'' , 'launch_plist_url'=>'']; + M('apply_launch', 'tab_')->where(['apply_id' => $apply['id'], 'launch_packge'=>['in', [0, 2, 3]]])->save($launchData); + } + + $savePath = ''; + $fileName = 'game_package' . $apply['game_id'] . '-' . $apply['promote_id']; + if ($apply['sdk_version'] == 1) { + $savePath = 'Uploads/GamePack/' . $fileName . '.apk'; + } else { + $savePath = 'Uploads/IosGamePack/' . $fileName . '.ipa'; + } + $channelConfigFile = $this->getChannelConfigFile($gameSource); + $relativePath = './' . $savePath; + $localPath = ROOTTT . $savePath; + copy($gameSourceUrl, $localPath); + + $packData = [ + 'game_id' => $apply['game_id'], + 'game_name' => $apply['game_name'], + 'game_appid' => $game['game_appid'], + 'promote_id' => $apply['promote_id'], + 'promote_account' => $apply['promote_account'], + 'source_version' => $gameSource['source_version'], + ]; + $status = $this->packChannelInfo($localPath, $channelConfigFile, $packData); + if (!$status) { + return [ + 'status' => false, + 'message' => '打包失败，加入渠道信息失败！', + ]; + } + $result = $this->uploadPackage($localPath, $savePath, true); + if ($result['status']) { + $packageUrl = $result['data']['url']; + $packageUrl = $packageUrl == '@' ? $relativePath : $packageUrl; + } else { + return [ + 'status' => false, + 'message' => '打包失败，上传OSS失败！', + ]; + } + $plistInfo = ['game_id' => $apply['game_id'], 'promote_id' => $apply['promote_id']]; + $plistUrl = ''; + if ($apply['sdk_version'] == 2) { + $params = [ + 'domain' => '', + 'packageName' => $gameSource['bao_name'], + 'gameId' => $game['id'], + 'promoteId' => $apply['promote_id'], + 'packageUrl' => $packageUrl, + 'gameIcon' => '', + 'type' => 'pack' + ]; + $result = $this->createPlist($params); + if ($result['status']) { + $plistUrl = $result['data']['path']; + } else { + return [ + 'status' => false, + 'message' => '打包失败，生成plist文件失败！', + ]; + } + } + $applyService->updateAfterPack($apply, $packageUrl, $plistUrl); + return [ + 'status' => true, + 'message' => '打包成功！', + 'data' => [ + 'plistUrl' => $plistUrl, + ] + ]; + } + + public function uploadPackage($localFilePath, $distFilePath, $isDeleteLocal = false) + { + if (get_tool_status('oss_storage') == 1) { + $ossService = new OssService(); + $result = $ossService->upload($localFilePath, $distFilePath); + if ($isDeleteLocal && file_exists($localFilePath)) { + @unlink($localFilePath); + } + return $result; + } else { + // 不上传OSS等第三方服务器 + return [ + 'status' => true, + 'message' => '上传成功', + 'data' => [ + 'url' => '@' + ], + ]; + } + } + + //生成游戏渠道plist文件 + public function createPlist($params) + { + $domain = $params['domain'] ?? ''; + $packageName = $params['packageName'] ?? ''; + $gameId = $params['gameId'] ?? 0; + $promoteId = $params['promoteId'] ?? 0; + $packageUrl = $params['packageUrl'] ?? ''; + $platformId = $params['platformId'] ?? 0; + $position = $params['position'] ?? 0; + $gameIcon = $params['gameIcon'] ?? ''; + $type = $params['type'] ?? ''; + + if ($gameId == 0) { + return [ + 'status' => false, + 'message' => '游戏ID错误', + ]; + } + if ($type == '' || !in_array($type, ['org', 'pack'])) { + return [ + 'status' => false, + 'message' => '类型错误', + ]; + } + + $xml = new \DOMDocument(); + $xml->load(ROOTTT . 'Uploads/Plist/testdemo.Plist'); + $online = $xml->getElementsByTagName('dict'); //查找节点 + $elements = $online->item(1)->getElementsByTagName('string'); //第二个节点下所有string + foreach ($elements as $element) { + switch ($element->textContent) { + case 'ipa_url': + if (preg_match("/http/", $packageUrl)) { + $element->nodeValue = $packageUrl; + } else { + $element->nodeValue = "https://" . $domain . ltrim($packageUrl, '.'); + } + break; + case 'icon': + if (preg_match("/http/", $gameIcon)) { + $element->nodeValue = $gameIcon; + } else { + $element->nodeValue = "https://" . $domain . $gameIcon; + } + break; + case 'com.dell': + $element->nodeValue = $packageName; + break; + case '1.0.0': + $element->nodeValue = false; + break; + case 'mchdemo': + $element->nodeValue = false; + break; + } + } + + $fileName = ''; + if ($type == 'pack') { + if ($promoteId == 0) { + $fileName = 'Uploads/SourcePlist/'. $gameId . '.Plist'; + } elseif ($platformId > 0) { + $fileName = 'Uploads/GamePlist/'. $gameId . '-' . $promoteId . '-' . $platformId . '-' .$position . '.Plist'; + } else { + $fileName = 'Uploads/GamePlist/'. $gameId . '-' . $promoteId . '.Plist'; + } + } elseif ($type == 'org') { + $fileName = 'Uploads/OrgSourcePlist/'. $gameId . '.Plist'; + } + + $xml->save('./' . $fileName); + return [ + 'status' => true, + 'message' => '生成成功', + 'data' => [ + 'path' => './' . $fileName + ] + ]; + } } \ No newline at end of file diff --git a/Application/Base/Service/OssService.class.php b/Application/Base/Service/OssService.class.php new file mode 100644 index 000000000..dcf3cba89 --- /dev/null +++ b/Application/Base/Service/OssService.class.php @@ -0,0 +1,122 @@ +accessKeyId = C('oss_storage.accesskeyid'); + $this->accessKeySecret = C('oss_storage.accesskeysecr'); + $this->domain = C('oss_storage.domain'); + $this->isCName = C('oss_storage.is_cname'); + $this->bdDomain = C('oss_storage.bd_domain'); + $this->bucket = C('oss_storage.bucket'); + $this->client = new OssClient($this->accessKeyId, $this->accessKeySecret, $this->domain, $this->isCName); + } + + public function upload($localFilePath, $saveFileName) + { + try { + $this->multiuploadFile($localFilePath, $saveFileName); + return [ + 'status' => true, + 'message' => '上传OSS成功', + 'data' => [ + 'url' => $this->getUrl() + ] + ]; + } catch (OssException $e) { + return [ + 'status' => false, + 'message' => $e->getMessage() + ]; + } + } + + private function multiuploadFile($file, $saveFileName) + { + $uploadId = $this->client->initiateMultipartUpload($this->bucket, $saveFileName); + + /* + * step 2. 上传分片 + */ + $partSize = 5 * 1000 * 1024; + $uploadFile = $file; + $uploadFileSize = filesize($uploadFile); + $pieces = $this->client->generateMultiuploadParts($uploadFileSize, $partSize); + $responseUploadPart = []; + $uploadPosition = 0; + $isCheckMd5 = true; + foreach ($pieces as $i => $piece) { + $fromPos = $uploadPosition + (integer) $piece[OssClient::OSS_SEEK_TO]; + $toPos = (integer) $piece[OssClient::OSS_LENGTH] + $fromPos - 1; + $upOptions = [ + OssClient::OSS_FILE_UPLOAD => $uploadFile, + OssClient::OSS_PART_NUM => ($i + 1), + OssClient::OSS_SEEK_TO => $fromPos, + OssClient::OSS_LENGTH => $toPos - $fromPos + 1, + OssClient::OSS_CHECK_MD5 => $isCheckMd5, + ]; + if ($isCheckMd5) { + $contentMd5 = OssUtil::getMd5SumForFile($uploadFile, $fromPos, $toPos); + $upOptions[OssClient::OSS_CONTENT_MD5] = $contentMd5; + } + // 2. 将每一分片上传到OSS + $responseUploadPart[] = $this->client->uploadPart($this->bucket, $saveFileName, $uploadId, $upOptions); + } + $uploadParts = []; + foreach ($responseUploadPart as $i => $eTag) { + $uploadParts[] = [ + 'PartNumber' => ($i + 1), + 'ETag' => $eTag, + ]; + } + + /** + * step 3. 完成上传 + */ + $this->client->completeMultipartUpload($this->bucket, $url, $uploadId, $uploadParts); + } + + /** + *删除文件 + */ + public function deleteObject($deleteFile) + { + $this->client->deleteObject($this->bucket, $deleteFile); + } + + private function getUrl($saveFileName) + { + $url = ''; + if ($this->isCName) { + $url = 'http://' . $this->domain . '/' . $saveFileName; + } else { + $url = 'https://' . $this->bucket . '.' . $this->domain . '/' . $saveFileName; + $url = str_replace('-internal', '', $url); + } + /** + * @todo unknown + */ + if (!empty($this->bdDomain) && strlen($this->bdDomain) > 5) { + $url = $this->bdDomain . $saveFileName; + } + } +} \ No newline at end of file From bcc34cbd0cda902f4575be087e1f7f15b2c26e1a Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 22 Oct 2019 14:08:39 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=89=93=E5=8C=85=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/GameSourceController.class.php | 12 +- Application/Admin/Event/SourceEvent.class.php | 20 +- Application/Admin/View/GameSource/add.html | 4 +- Application/Admin/View/GameSource/edit.html | 5 +- Application/Base/Tool/ApkParser.class.php | 450 ++++++++++++++++++ Application/Base/Tool/PlistParser.class.php | 102 ++++ 6 files changed, 581 insertions(+), 12 deletions(-) create mode 100644 Application/Base/Tool/ApkParser.class.php create mode 100644 Application/Base/Tool/PlistParser.class.php diff --git a/Application/Admin/Controller/GameSourceController.class.php b/Application/Admin/Controller/GameSourceController.class.php index 97e95f86a..618109a2c 100644 --- a/Application/Admin/Controller/GameSourceController.class.php +++ b/Application/Admin/Controller/GameSourceController.class.php @@ -54,8 +54,8 @@ class GameSourceController extends ThinkController $extend = substr($_POST['file_name'], strlen($_POST['file_name']) - 3, 3); if ($_POST['file_type'] == 1 && $extend != 'apk') { $this -> error('游戏原包格式不正确！'); - } else if ($_POST['file_type'] == 2 && $extend != 'ipa' || $_POST['file_type'] == 2 && empty($_POST['bao_name'])) { - $this -> error('游戏原包格式不正确/包名不能为空'); + } else if ($_POST['file_type'] == 2 && $extend != 'ipa') { + $this -> error('游戏原包格式不正确'); } } $map['game_id'] = $_POST['game_id']; @@ -136,17 +136,17 @@ class GameSourceController extends ThinkController $extend = substr($_POST['file_name'], strlen($str) - 3, 3); if ($_POST['file_type'] == 1 && $extend != 'apk') { $this -> error('游戏原包格式不正确！'); - } else if ($_POST['file_type'] == 2 && $extend != 'ipa' || $_POST['file_type'] == 2 && empty($_POST['bao_name'])) { - $this -> error('游戏原包格式不正确/包名不能为空'); + } else if ($_POST['file_type'] == 2 && $extend != 'ipa') { + $this -> error('游戏原包格式不正确'); } } $map['file_type'] = $_POST['file_type']; $d = D('Game_source') -> where($map) -> find(); $source = A('Source', 'Event'); if (empty($d)) { - $source -> add_source(); + $source->add_source(); } else { - $source -> update_source($d['id'], $d['file_name']); + $source->update_source($d['id'], $d['file_name']); } } else { $d = M('GameSource', "tab_") -> where($map) -> find(); diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 2df636828..b8b3e3e37 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -10,6 +10,8 @@ namespace Admin\Event; use Think\Controller; use Base\Service\GameSourceService; +use Base\Tool\PlistParser; +use Base\Tool\ApkParser; /** * 后台首页控制器 @@ -26,12 +28,27 @@ class SourceEvent extends Controller $data['file_url'] = $data['file_url'] . "/" . $data['file_name']; $data['sdk_version'] = $data['file_type']; $data['op_id'] = UID; - $data['version'] = $_POST['version']; $data['op_account'] = session("user_auth.username"); $data['create_time'] = NOW_TIME; $remark = str_replace(array("\r\n", "\r", "\n"), "@@@", $_POST['remark']); $data['remark'] = json_encode(explode('@@@', $remark)); $data['source_version'] = 0; + $version = ''; + $packageName = ''; + if ($data['file_type'] == 1) { + $parser = new ApkParser(); + $parser->open($data['file_url']); + $version = $parser->getVersionName(); + $packageName = $parser->getPackage(); + } elseif($data['file_type'] == 2) { + $parser = new PlistParser(); + $parser->openFromIpa($data['file_url'], PlistParser::PREG_INFO_PLIST); + $result = $parser->getResult(); + $version = $result['CFBundleShortVersionString']; + $packageName = $result['CFBundleIdentifier']; + } + $data['version'] = $version; + $data['bao_name'] = $packageName; $game = M('game', 'tab_')->where(['id' => $data['game_id']])->find(); $gameSourceService = new GameSourceService(); $result = $gameSourceService->sourcePack($data, $game); @@ -85,6 +102,7 @@ class SourceEvent extends Controller $data['source_version'] = $game_source['source_version'] + 1; $game = M('game', 'tab_')->where(['id' => $data['game_id']])->find(); + $gameSourceService = new GameSourceService(); $result = $gameSourceService->sourcePack($data, $game); if (!$result['status']) { if ($from == "dev") { diff --git a/Application/Admin/View/GameSource/add.html b/Application/Admin/View/GameSource/add.html index 19ed1fd3f..aeabae76f 100644 --- a/Application/Admin/View/GameSource/add.html +++ b/Application/Admin/View/GameSource/add.html @@ -123,13 +123,13 @@ 包名： - + 原包版本： - + diff --git a/Application/Admin/View/GameSource/edit.html b/Application/Admin/View/GameSource/edit.html index c98e78796..4355fa457 100644 --- a/Application/Admin/View/GameSource/edit.html +++ b/Application/Admin/View/GameSource/edit.html @@ -110,14 +110,13 @@ 包名： - + 原包版本： - - 点击修改 + diff --git a/Application/Base/Tool/ApkParser.class.php b/Application/Base/Tool/ApkParser.class.php new file mode 100644 index 000000000..d62e30c22 --- /dev/null +++ b/Application/Base/Tool/ApkParser.class.php @@ -0,0 +1,450 @@ + + */ +class ApkParser +{ + const AXML_FILE = 0x00080003; + const STRING_BLOCK = 0x001C0001; + const RESOURCEIDS = 0x00080180; + const START_NAMESPACE = 0x00100100; + const END_NAMESPACE = 0x00100101; + const START_TAG = 0x00100102; + const END_TAG = 0x00100103; + const TEXT = 0x00100104; + + const TYPE_NULL = 0; + const TYPE_REFERENCE = 1; + const TYPE_ATTRIBUTE = 2; + const TYPE_STRING = 3; + const TYPE_FLOAT = 4; + const TYPE_DIMENSION = 5; + const TYPE_FRACTION = 6; + const TYPE_INT_DEC = 16; + const TYPE_INT_HEX = 17; + const TYPE_INT_BOOLEAN = 18; + const TYPE_INT_COLOR_ARGB8 = 28; + const TYPE_INT_COLOR_RGB8 = 29; + const TYPE_INT_COLOR_ARGB4 = 30; + const TYPE_INT_COLOR_RGB4 = 31; + + const UNIT_MASK = 15; + + private static $radixMults = [0.00390625, 3.051758E-005, 1.192093E-007, 4.656613E-010]; + private static $dimensionUnits = ["px","dip","sp","pt","in","mm","",""]; + private static $fractionUnits = ["%","%p","","","","","",""]; + + private $xml=''; + private $length = 0; + private $stringCount = 0; + private $styleCount = 0; + private $stringTab = []; + private $styleTab = []; + private $resourceIDs = []; + private $ns = []; + private $cur_ns = null; + private $root = null; + private $line = 0; + + public function open($apkFile, $xmlFile='AndroidManifest.xml') + { + $zip = new ZipArchive; + if ($zip->open($apkFile) === true) { + $xml = $zip->getFromName($xmlFile); + $zip->close(); + if ($xml){ + try { + return $this->parseString($xml); + }catch (Exception $e){ + + } + } + } + return false; + } + + public function parseString($xml) + { + $this->xml = $xml; + $this->length = strlen($xml); + + $this->root = $this->parseBlock(self::AXML_FILE); + return true; + } + + public function getXML($node = null, $lv = -1) + { + if ($lv == -1) $node = $this->root; + if (!$node) return ''; + + if ($node['type'] == self::END_TAG) $lv--; + $xml = ($node['line'] == 0 || $node['line'] == $this->line) ? '' : "\n".str_repeat(' ', $lv); + $xml .= $node['tag']; + $this->line = $node['line']; + foreach ($node['child'] as $c){ + $xml .= $this->getXML($c, $lv+1); + } + return $xml; + } + + public function getPackage() + { + return $this->getAttribute('manifest', 'package'); + } + + public function getVersionName() + { + return $this->getAttribute('manifest', 'android:versionName'); + } + + public function getVersionCode() + { + return $this->getAttribute('manifest', 'android:versionCode'); + } + + public function getAppName() + { + return $this->getAttribute('manifest/application', 'android:name'); + } + + public function getMainActivity() + { + for ($id=0; true; $id++){ + $act = $this->getAttribute("manifest/application/activity[{$id}]/intent-filter/action", 'android:name'); + if (!$act) break; + if ($act == 'android.intent.action.MAIN') return $this->getActivity($id); + } + return null; + } + + public function getActivity($idx=0) + { + $idx = intval($idx); + return $this->getAttribute("manifest/application/activity[{$idx}]", 'android:name'); + } + + public function getAttribute($path, $name) + { + $r = $this->getElement($path); + if (is_null($r)) { + return null; + } + + if (isset($r['attrs'])){ + foreach ($r['attrs'] as $a) { + if ($a['ns_name'] == $name) { + return $this->getAttributeValue($a); + } + } + } + return null; + } + + private function getElement($path) + { + if (!$this->root) return NULL; + $ps = explode('/', $path); + $r = $this->root; + foreach ($ps as $v){ + if (preg_match('/([^ ]+)\[([0−9]+)$/', $v, $ms)){ + $v = $ms[1]; + $off = $ms[2]; + }else { + $off = 0; + } + foreach ($r['child'] as $c){ + if ($c['type'] == self::START_TAG && $c['ns_name'] == $v){ + if ($off == 0){ + $r = $c; continue 2; + }else { + $off--; + } + } + } + // 没有找到节点 + return NULL; + } + return $r; + } + + private function parseBlock($need = 0) + { + $o = 0; + $type = $this->get32($o); + if ($need && $type != $need) throw new Exception('Block Type Error', 1); + $size = $this->get32($o); + if ($size < 8 || $size > $this->length) throw new Exception('Block Size Error', 2); + $left = $this->length - $size; + + $props = false; + switch ($type){ + case self::AXML_FILE: + $props = [ + 'line' => 0, + 'tag' => '' + ]; + break; + case self::STRING_BLOCK: + $this->stringCount = $this->get32($o); + $this->styleCount = $this->get32($o); + $o += 4; + $strOffset = $this->get32($o); + $styOffset = $this->get32($o); + $strListOffset = $this->get32array($o, $this->stringCount); + $styListOffset = $this->get32array($o, $this->styleCount); + $this->stringTab = $this->stringCount > 0 ? $this->getStringTab($strOffset, $strListOffset) : []; + $this->styleTab = $this->styleCount > 0 ? $this->getStringTab($styOffset, $styListOffset) : []; + $o = $size; + break; + case self::RESOURCEIDS: + $count = $size / 4 - 2; + $this->resourceIDs = $this->get32array($o, $count); + break; + case self::START_NAMESPACE: + $o += 8; + $prefix = $this->get32($o); + $uri = $this->get32($o); + + if (empty($this->cur_ns)){ + $this->cur_ns = []; + $this->ns[] = &$this->cur_ns; + } + $this->cur_ns[$uri] = $prefix; + break; + case self::END_NAMESPACE: + $o += 8; + $prefix = $this->get32($o); + $uri = $this->get32($o); + + if (empty($this->cur_ns)) { + break; + } + unset($this->cur_ns[$uri]); + break; + case self::START_TAG: + $line = $this->get32($o); + + $o += 4; + $attrs = []; + $props = array( + 'line' => $line, + 'ns' => $this->getNameSpace($this->get32($o)), + 'name' => $this->getString($this->get32($o)), + 'flag' => $this->get32($o), + 'count' => $this->get16($o), + 'id' => $this->get16($o)-1, + 'class' => $this->get16($o)-1, + 'style' => $this->get16($o)-1, + 'attrs' => &$attrs + ); + $props['ns_name'] = $props['ns'].$props['name']; + for ($i=0; $i < $props['count']; $i++){ + $a = array( + 'ns' => $this->getNameSpace($this->get32($o)), + 'name' => $this->getString($this->get32($o)), + 'val_str' => $this->get32($o), + 'val_type' => $this->get32($o), + 'val_data' => $this->get32($o) + ); + $a['ns_name'] = $a['ns'].$a['name']; + $a['val_type'] >>= 24; + $attrs[] = $a; + } + // 处理TAG字符串 + $tag = "<{$props['ns_name']}"; + foreach ($this->cur_ns as $uri => $prefix){ + $uri = $this->getString($uri); + $prefix = $this->getString($prefix); + $tag .= " xmlns:{$prefix}=\"{$uri}\""; + } + foreach ($props['attrs'] as $a){ + $tag .= " {$a['ns_name']}=\"". + $this->getAttributeValue($a). + '"'; + } + $tag .= '>'; + $props['tag'] = $tag; + + unset($this->cur_ns); + $this->cur_ns = []; + $this->ns[] = &$this->cur_ns; + $left = -1; + break; + case self::END_TAG: + $line = $this->get32($o); + $o += 4; + $props = array( + 'line' => $line, + 'ns' => $this->getNameSpace($this->get32($o)), + 'name' => $this->getString($this->get32($o)) + ); + $props['ns_name'] = $props['ns'].$props['name']; + $props['tag'] = ""; + if (count($this->ns) > 1){ + array_pop($this->ns); + unset($this->cur_ns); + $this->cur_ns = array_pop($this->ns); + $this->ns[] = &$this->cur_ns; + } + break; + case self::TEXT: + $o += 8; + $props = array( + 'tag' => $this->getString($this->get32($o)) + ); + $o += 8; + break; + default: + throw new Exception('Block Type Error', 3); + break; + } + + $this->skip($o); + $child = []; + while ($this->length > $left){ + $c = $this->parseBlock(); + if ($props && $c) $child[] = $c; + if ($left == -1 && $c['type'] == self::END_TAG){ + $left = $this->length; + break; + } + } + if ($this->length != $left) throw new Exception('Block Overflow Error', 4); + if ($props){ + $props['type'] = $type; + $props['size'] = $size; + $props['child'] = $child; + return $props; + }else { + return false; + } + } + + private function getAttributeValue($a) + { + $type = &$a['val_type']; + $data = &$a['val_data']; + switch ($type){ + case self::TYPE_STRING: + return $this->getString($a['val_str']); + case self::TYPE_ATTRIBUTE: + return sprintf('?%s%08X', self::_getPackage($data), $data); + case self::TYPE_REFERENCE: + return sprintf('@%s%08X', self::_getPackage($data), $data); + case self::TYPE_INT_HEX: + return sprintf('0x%08X', $data); + case self::TYPE_INT_BOOLEAN: + return ($data != 0 ? 'true' : 'false'); + case self::TYPE_INT_COLOR_ARGB8: + case self::TYPE_INT_COLOR_RGB8: + case self::TYPE_INT_COLOR_ARGB4: + case self::TYPE_INT_COLOR_RGB4: + return sprintf('#%08X', $data); + case self::TYPE_DIMENSION: + return $this->_complexToFloat($data).self::$dimensionUnits[$data & self::UNIT_MASK]; + case self::TYPE_FRACTION: + return $this->_complexToFloat($data).self::$fractionUnits[$data & self::UNIT_MASK]; + case self::TYPE_FLOAT: + return $this->_int2float($data); + } + if ($type >=self::TYPE_INT_DEC && $type < self::TYPE_INT_COLOR_ARGB8){ + return (string)$data; + } + return sprintf('<0x%X, type 0x%02X>', $data, $type); + } + + private function _complexToFloat($data) + { + return (float)($data & 0xFFFFFF00) * self::$radixMults[($data>>4) & 3]; + } + + private function _int2float($v) + { + $x = ($v & ((1 << 23) - 1)) + (1 << 23) * ($v >> 31 | 1); + $exp = ($v >> 23 & 0xFF) - 127; + return $x * pow(2, $exp - 23); + } + + private static function _getPackage($data) + { + return ($data >> 24 == 1) ? 'android:' : ''; + } + + private function getStringTab($base, $list) + { + $tab = []; + foreach ($list as $off){ + $off += $base; + $len = $this->get16($off); + $mask = ($len >> 0x8) & 0xFF; + $len = $len & 0xFF; + if ($len == $mask){ + if ($off + $len > $this->length) throw new Exception('String Table Overflow', 11); + $tab[] = substr($this->xml, $off, $len); + }else { + if ($off + $len * 2 > $this->length) throw new Exception('String Table Overflow', 11); + $str = substr($this->xml, $off, $len * 2); + $tab[] = mb_convert_encoding($str, 'UTF-8', 'UCS-2LE'); + } + } + return $tab; + } + + private function getString($id) + { + if ($id > -1 && $id < $this->stringCount){ + return $this->stringTab[$id]; + }else { + return ''; + } + } + + private function getNameSpace($uri) + { + for ($i=count($this->ns); $i > 0; ){ + $ns = $this->ns[--$i]; + if (isset($ns[$uri])){ + $ns = $this->getString($ns[$uri]); + if (!empty($ns)) $ns .= ':'; + return $ns; + } + } + return ''; + } + + private function get32(&$off) + { + $int = unpack('V', substr($this->xml, $off, 4)); + $off += 4; + return array_shift($int); + } + + private function get32array(&$off, $size) + { + if ($size <= 0) { + return null; + } + $arr = unpack('V*', substr($this->xml, $off, 4 * $size)); + if (count($arr) != $size) throw new Exception('Array Size Error', 10); + $off += 4 * $size; + return $arr; + } + + private function get16(&$off) + { + $int = unpack('v', substr($this->xml, $off, 2)); + $off += 2; + return array_shift($int); + } + + private function skip($size) + { + $this->xml = substr($this->xml, $size); + $this->length -= $size; + } +} \ No newline at end of file diff --git a/Application/Base/Tool/PlistParser.class.php b/Application/Base/Tool/PlistParser.class.php new file mode 100644 index 000000000..e2f1148ff --- /dev/null +++ b/Application/Base/Tool/PlistParser.class.php @@ -0,0 +1,102 @@ + + */ +class PlistParser +{ + const PREG_INFO_PLIST = "/^Payload.*?\.app\/Info.plist$/"; + + private $xml; + + public function openFromIpa($ipaFile, $preg) + { + $zip = new ZipArchive; + if ($zip->open($ipaFile) === true) { + $index = -1; + for( $i = 0; $i < $zip->numFiles; $i++ ){ + $stat = $zip->statIndex($i); + if (preg_match($preg, $stat['name'], $matches)) { + $index = $stat['index']; + } + } + + $content = $zip->getFromIndex($index); + $zip->close(); + if ($content){ + $xml = new \DOMDocument(); + $xml->loadXML($content); + $this->xml = $xml; + return true; + } + } + die(); + return false; + } + + public function open($xmlFile) + { + $xml = new \DOMDocument(); + $xml->load($xmlFile); + $this->xml = $xml; + return true; + } + + public function getResult() + { + $plistTag = $this->xml->getElementsByTagName('plist'); + $dict = $plistTag->item(0)->childNodes->item(1); + return $this->parseDictNode($dict); + } + + public function parseDictNode($parentNode) + { + $lastKey = ''; + $dict = []; + foreach ($parentNode->childNodes as $node) { + if ($node instanceof \DOMElement) { + if ($node->nodeName == 'key') { + $lastKey = $node->textContent; + } else { + if ($node->nodeName == 'dict') { + $dict[$lastKey] = $this->parseDictNode($node); + } elseif ($node->nodeName == 'array') { + $dict[$lastKey] = $this->parseArrayNode($node); + } elseif($node->nodeName == 'true') { + $dict[$lastKey] = true; + } elseif($node->nodeName == 'false') { + $dict[$lastKey] = false; + } else { + $dict[$lastKey] = $node->textContent; + } + } + } + } + return $dict; + } + + public function parseArrayNode($parentNode) + { + $list = []; + foreach ($parentNode->childNodes as $node) { + if ($node instanceof \DOMElement) { + if ($node->nodeName == 'dict') { + $list[] = $this->parseDictNode($node); + } elseif ($node->nodeName == 'array') { + $list[] = $this->parseArrayNode($node); + } elseif($node->nodeName == 'true') { + $list[] = true; + } elseif($node->nodeName == 'false') { + $list[] = false; + } else { + $list[] = $node->textContent; + } + } + } + return $list; + } +} \ No newline at end of file From 53e039567404cb105981ca9c27b933676c1cd54c Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 22 Oct 2019 18:18:26 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/AutoPackController.class.php | 1 + Application/Base/Service/OssService.class.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index af6beaab7..a3ab3f691 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -19,6 +19,7 @@ use BaiduBce\Services\Bos\BosOptions; use BaiduBce\Auth\SignOptions; use BaiduBce\Log\LogFactory; use Think\Think; +use Base\Service\GameSourceService; /** * 后台首页控制器 diff --git a/Application/Base/Service/OssService.class.php b/Application/Base/Service/OssService.class.php index dcf3cba89..f6c563459 100644 --- a/Application/Base/Service/OssService.class.php +++ b/Application/Base/Service/OssService.class.php @@ -39,7 +39,7 @@ class OssService { 'status' => true, 'message' => '上传OSS成功', 'data' => [ - 'url' => $this->getUrl() + 'url' => $this->getUrl($saveFileName) ] ]; } catch (OssException $e) { @@ -92,7 +92,7 @@ class OssService { /** * step 3. 完成上传 */ - $this->client->completeMultipartUpload($this->bucket, $url, $uploadId, $uploadParts); + $this->client->completeMultipartUpload($this->bucket, $saveFileName, $uploadId, $uploadParts); } /** @@ -118,5 +118,6 @@ class OssService { if (!empty($this->bdDomain) && strlen($this->bdDomain) > 5) { $url = $this->bdDomain . $saveFileName; } + return $url; } } \ No newline at end of file From 37ef999710ca3ef08c2880d9e3b34d5e1b366fcd Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 23 Oct 2019 17:29:06 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/AutoPackController.class.php | 23 +++- .../Controller/ConsoleController.class.php | 27 +++++ .../Base/Service/ApplyService.class.php | 5 +- .../Base/Service/GameSourceService.class.php | 25 ++-- Application/Base/Tool/Base62.class.php | 109 ++++++++++++++++++ Application/Base/Tool/Printer.class.php | 13 +++ 6 files changed, 184 insertions(+), 18 deletions(-) create mode 100644 Application/Admin/Controller/ConsoleController.class.php create mode 100644 Application/Base/Tool/Base62.class.php create mode 100644 Application/Base/Tool/Printer.class.php diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index a3ab3f691..0989fff49 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -20,6 +20,7 @@ use BaiduBce\Auth\SignOptions; use BaiduBce\Log\LogFactory; use Think\Think; use Base\Service\GameSourceService; +use Base\Tool\Printer; /** * 后台首页控制器 @@ -309,23 +310,35 @@ class AutoPackController extends Think ->limit(200) ->select(); + if (count($applys) == 0) { + Printer::export('无等待队列', true); + } + + $applyIds = array_column($applys, 'id'); $gameIds = array_unique(array_column($applys, 'game_id')); - $games = M('game', 'tab_')->field(['id', 'game_appid'])->where(['id' => ['in', $gameIds]])->find(); + $games = M('game', 'tab_')->field(['id', 'game_appid'])->where(['id' => ['in', $gameIds]])->select(); $games = index_by_column('id', $games); $launchCountList = $launchModel->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); $launchCountList = index_by_column('apply_id', $launchCountList); - $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name'])->where(['id' => ['game_id', $gameIds]])->find(); + $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select(); $gameSources = index_by_column('game_id', $gameSources); - $gameSourceService = new GameSourceService(); + if (!empty($applys)) { foreach ($applys as $apply) { $gameSource = $gameSources[$apply['game_id']] ?? null; - $game = $games[$apply['game_id']]['game_appid']; + $game = $games[$apply['game_id']]; $launchCount = $launchCountList[$apply['id']] ?? 0; - $gameSourceService->channelPack($gameSource, $game, $apply, $launchCount); + $result = $gameSourceService->channelPack($gameSource, $game, $apply, $launchCount); + $message = '游戏['. $apply['game_id'] . ']，渠道['. $apply['promote_id'] . ']打包，'; + if ($result['status']) { + $message = 'SUCCESS ----- ' . $message . $result['message']; + } else { + $message = 'ERROR ----- ' . $message . $result['message']; + } + Printer::export($message); } } } diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php new file mode 100644 index 000000000..cd6fd82a8 --- /dev/null +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -0,0 +1,27 @@ +select(['game_id', 'server_id', 'role_id'])->group('game_id, server_id, role_id')->having('count(*)>1')->select(); + + } + + public function modifyRecharge() + { + + } +} diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 8d92b3e6d..f1e75a38b 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -33,8 +33,7 @@ class ApplyService { $data['enable_status'] = 1; $data['dispose_id'] = 0; $data['dispose_time'] = time(); - $data['plist_url'] = $plist_url; - $res = M('Apply', 'tab_')->save($data); - return $res; + $data['plist_url'] = $plistUrl; + return M('Apply', 'tab_')->save($data); } } \ No newline at end of file diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index faf0cb15d..054f3c9aa 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -101,7 +101,7 @@ class GameSourceService { } else { return [ 'status' => false, - 'message' => '打包失败，上传OSS失败！', + 'message' => '打包失败，上传OSS失败！' . $result['message'], ]; } @@ -123,7 +123,7 @@ class GameSourceService { } else { return [ 'status' => false, - 'message' => '打包失败，生成plist文件失败！', + 'message' => '打包失败，生成plist文件失败！' . $result['message'], ]; } @@ -134,7 +134,7 @@ class GameSourceService { } else { return [ 'status' => false, - 'message' => '打包失败，生成原包plist文件失败！', + 'message' => '打包失败，生成原包plist文件失败！' . $result['message'], ]; } } @@ -170,15 +170,16 @@ class GameSourceService { $savePath = ''; $fileName = 'game_package' . $apply['game_id'] . '-' . $apply['promote_id']; if ($apply['sdk_version'] == 1) { - $savePath = 'Uploads/GamePack/' . $fileName . '.apk'; + $fileName .= '.apk'; + $savePath = 'Uploads/GamePack/' . $fileName; } else { - $savePath = 'Uploads/IosGamePack/' . $fileName . '.ipa'; + $fileName .= '.ipa'; + $savePath = 'Uploads/IosGamePack/' . $fileName; } - $channelConfigFile = $this->getChannelConfigFile($gameSource); $relativePath = './' . $savePath; $localPath = ROOTTT . $savePath; copy($gameSourceUrl, $localPath); - + $packData = [ 'game_id' => $apply['game_id'], 'game_name' => $apply['game_name'], @@ -187,6 +188,8 @@ class GameSourceService { 'promote_account' => $apply['promote_account'], 'source_version' => $gameSource['source_version'], ]; + + $channelConfigFile = $this->getChannelConfigFile($gameSource); $status = $this->packChannelInfo($localPath, $channelConfigFile, $packData); if (!$status) { return [ @@ -194,14 +197,15 @@ class GameSourceService { 'message' => '打包失败，加入渠道信息失败！', ]; } - $result = $this->uploadPackage($localPath, $savePath, true); + $distFilePath = 'GamePack/' . $fileName; + $result = $this->uploadPackage($localPath, $distFilePath, false); if ($result['status']) { $packageUrl = $result['data']['url']; $packageUrl = $packageUrl == '@' ? $relativePath : $packageUrl; } else { return [ 'status' => false, - 'message' => '打包失败，上传OSS失败！', + 'message' => '打包失败，上传OSS失败！' . $result['message'], ]; } $plistInfo = ['game_id' => $apply['game_id'], 'promote_id' => $apply['promote_id']]; @@ -222,10 +226,11 @@ class GameSourceService { } else { return [ 'status' => false, - 'message' => '打包失败，生成plist文件失败！', + 'message' => '打包失败，生成plist文件失败！' . $result['message'], ]; } } + $applyService = new ApplyService(); $applyService->updateAfterPack($apply, $packageUrl, $plistUrl); return [ 'status' => true, diff --git a/Application/Base/Tool/Base62.class.php b/Application/Base/Tool/Base62.class.php new file mode 100644 index 000000000..b0cc27bf5 --- /dev/null +++ b/Application/Base/Tool/Base62.class.php @@ -0,0 +1,109 @@ + 5) { + $char = $encodes[$val >> ($pos -= 6)]; + $result[] = ( + $char == 'i' ? "ia" : + $char == '+' ? "ib" : + $char == '/' ? "ic" : $char + ); + $val &= ((1 << $pos) - 1); + } + } + if ($pos > 0) { + $char = $encodes[$val << (6 - $pos)]; + $result[] = ( + $char == 'i' ? "ia" : + $char == '+' ? "ib" : + $char == '/' ? "ic" : $char + ); + } + return implode('', $result); + } + + public static function decode($string, $decodes) + { + $decodes = self::getIndexChars(self::ENCODES); + $chars = self::getCharArray($string); + $pos = 0; + $val = 0; + $bytes = []; + for ($i = 0; $i < count($chars); $i++) { + $char = $chars[$i]; + if ($char == 'i') { + $char = $chars[++$i]; + $char = + $char == 'a' ? 'i' : + $char == 'b' ? '+' : + $char == 'c' ? '/' : $chars[--$i]; + } + $val = ($val << 6) | $decodes[$char]; + $pos += 6; + while ($pos > 7) { + $bytes[] = $val >> ($pos -= 8); + $val &= ((1 << $pos) - 1); + } + } + return self::bytesToString($bytes); + } + + private static function bytesToString($bytes) { + $string = ''; + foreach($bytes as $byte) { + $string .= chr($byte); + } + return $string; + } + + private static function stringToBytes($string) { + $length = strlen($string); + $bytes = array(); + for($i = 0; $i < $length; $i++) { + if(ord($string[$i]) >= 128){ + $byte = ord($string[$i]) - 256; + }else{ + $byte = ord($string[$i]); + } + $bytes[] = $byte ; + } + return $bytes; + } +} \ No newline at end of file diff --git a/Application/Base/Tool/Printer.class.php b/Application/Base/Tool/Printer.class.php new file mode 100644 index 000000000..b47935f43 --- /dev/null +++ b/Application/Base/Tool/Printer.class.php @@ -0,0 +1,13 @@ + Date: Sun, 3 Nov 2019 22:27:21 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5/=E4=B8=8B=E8=BD=BD=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/ApplyService.class.php | 26 ++ Application/Base/Tool/Request.class.php | 138 ++++++++ .../Controller/DownloadController.class.php | 329 ++++++++++++++++++ .../Home/Controller/HomeController.class.php | 77 +++- .../Home/View/default/Home/landingPage.html | 133 +++++++ Public/Home/css/landing_page.css | 102 ++++++ 6 files changed, 789 insertions(+), 16 deletions(-) create mode 100644 Application/Base/Tool/Request.class.php create mode 100644 Application/Home/Controller/DownloadController.class.php create mode 100644 Application/Home/View/default/Home/landingPage.html create mode 100644 Public/Home/css/landing_page.css diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 9d9577554..e41bfda6f 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -3,6 +3,7 @@ namespace Base\Service; use Base\Model\PromoteModel; use Base\Model\ApplyModel; +use Base\Tool\Request; class ApplyService { @@ -22,4 +23,29 @@ class ApplyService { M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $ids]])->save($save); } + + public function getDownloadUrl($apply, $game = null) + { + $host = Request::getHost(); + if(empty($apply['dow_url'])) { + if ($game == null) { + $columns = ['sdk_version', 'add_game_address', 'and_dow_address', 'ios_game_address', 'ios_dow_address']; + $game = M('game','tab_')->field($columns)->where(['id' => $apply['game_id']])->find(); + } + if($game['sdk_version'] == 1){ + if($game['add_game_address'] != '') { + return $game['add_game_address']; + }else{ + return $host . substr($game['and_dow_address'], 1); + } + } else { + if($game['ios_game_address'] != ''){ + return $game['ios_game_address']; + }else{ + return $host . substr($game['ios_dow_address'], 1); + } + } + } + return $host . $apply['dow_url']; + } } \ No newline at end of file diff --git a/Application/Base/Tool/Request.class.php b/Application/Base/Tool/Request.class.php new file mode 100644 index 000000000..1176fe064 --- /dev/null +++ b/Application/Base/Tool/Request.class.php @@ -0,0 +1,138 @@ + + */ +class Request { + + private static $instance; + + private $serverInfo; + private $scheme; + + private function __construct() + { + $this->serverInfo = $_SERVER; + } + + public static function getInstance() + { + if (self::$instance == null) { + self::$instance = new static(); + } + return self::$instance; + } + + public function isWechat() + { + $userAgent = $this->getUserAgent(); + if (strpos($userAgent, 'MicroMessenger') == false && strpos($userAgent, 'Windows Phone') == false) { + return false; + } else { + return true; + } + } + + public function getUserAgent() + { + return $this->serverInfo['HTTP_USER_AGENT'] ?? ''; + } + + public function isMobile() + { + $isMobile = false; + $userAgent = $this->getUserAgent(); + $mobileAgents = ['Android', 'iPhone', 'SymbianOS', 'Windows Phone', 'iPad','iPod']; + foreach ($mobileAgents as $mobileAgent) { + if (stripos($userAgent, $mobileAgent) !== false) { + $isMobile = true; + } + } + return $isMobile; + } + + public function isIOS() + { + $userAgent = $this->getUserAgent(); + if(stripos($userAgent, 'iphone') !== false || strpos($userAgent, 'ipad') !== false) { + return true; + } + return false; + } + + public function isAndroid() + { + $userAgent = $this->getUserAgent(); + if(strpos($userAgent, 'android')) { + return true; + } + return false; + } + + public function isIOS13() + { + if (preg_match('/OS [1][3-9]_[1-9][_\d]* like Mac OS X/i')) { + return true; + } + return false; + } + + /** + * 获取客户端IP + */ + public function getClientIP() + { + $serverInfo = $this->serverInfo; + $ip = '0.0.0.0'; + if (isset($serverInfo['HTTP_X_FORWARDED_FOR'])) { + $items = explode(',', $serverInfo['HTTP_X_FORWARDED_FOR']); + $position = array_search('unknown', $items); + if (false !== $position) { + unset($items[$position]); + } + $ip = trim($items[0]); + } elseif (isset($serverInfo['HTTP_CLIENT_IP'])) { + $ip = $serverInfo['HTTP_CLIENT_IP']; + } elseif (isset($this->serverInfo['REMOTE_ADDR'])) { + $ip = $serverInfo['REMOTE_ADDR']; + } + return $ip; + } + + public function getHost() + { + $host = $this->getScheme() . '://' . $this->serverInfo['SERVER_NAME']; + if (in_array($this->serverInfo['SERVER_PORT'], [80, 443])) { + return $host; + } + return $host . ':' . $this->serverInfo['SERVER_PORT']; + } + + public function getScheme() + { + if ($this->scheme) { + return $this->scheme; + } + $serverInfo = $this->serverInfo; + if (isset($serverInfo['REQUEST_SCHEME'])) { + $this->scheme = $serverInfo['REQUEST_SCHEME']; + return $this->scheme; + } + if ((isset($serverInfo['HTTPS']) && $serverInfo['HTTPS'] == 'on') + || (isset($serverInfo['HTTP_X_FORWARDED_PROTO']) && $serverInfo['HTTP_X_FORWARDED_PROTO'] == 'https' + || (isset($serverInfo['SERVER_PORT']) && $serverInfo['SERVER_PORT'] == 443)) + ) { + $this->scheme = 'https'; + } else { + $this->scheme = 'http'; + } + return $this->scheme; + } + + public static function __callStatic($name, $arguments) + { + $instance = self::getInstance(); + return call_user_func_array([$instance, $name], $arguments); + } +} \ No newline at end of file diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php new file mode 100644 index 000000000..30a46f3ea --- /dev/null +++ b/Application/Home/Controller/DownloadController.class.php @@ -0,0 +1,329 @@ + + */ +class DownloadController extends Controller { + + public function down_error($message='') + { + $this->assign("message",$message); + $this->display(); + } + + public function index($game_id=0,$promote_id=0){ + $applyModel = M('Apply','tab_'); + $map['status'] = 1; + $map['enable_status'] = 1; + $data = $applyModel + ->field('game_id,tab_apply.game_name,promote_id,promote_account,relation_game_id,pack_url,plist_url,`status`,enable_status,tab_apply.sdk_version') + ->join("tab_game ON tab_apply.game_id = tab_game.id AND promote_id = $promote_id AND game_id = $game_id ") + ->where($map) + ->find(); + $system_type = 1; + if(strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone')||strpos($_SERVER['HTTP_USER_AGENT'], 'iPad')){ + $system_type = 2; + } + $gamemodel = new GameModel(); + $source = $gamemodel->getGameDownInfo($game_id); + $pack_url = $this->package($source['packet'],$promote_id); + M('Game','tab_')->where('id='.$data['game_id'])->setInc('dow_num'); + if(is_mobile_request()){ + if($data['sdk_version'] == 1 && get_devices_type()==2)$this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); + // if($data['sdk_version'] == 1 && is_weixin()) $this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); + if($data['sdk_version'] == 2 && get_devices_type()==1)$this->redirect("Down/down_error",array('message'=>"请使用ios浏览器下载")); + } + switch ($data['sdk_version']) { + case 1: + if(!empty($pack_url)){ + if(preg_match("/oss/", $pack_url)){ + $url=str_replace('-internal', '', $pack_url); + echo ""; + }elseif(preg_match("/clouddn/", $pack_url)){ + $url = "http://".$pack_url; + redirect($url); + }elseif(preg_match("/myqcloud/", $pack_url)){ + redirect($pack_url); + }elseif(preg_match("/bcebos/", $pack_url)){ + redirect($pack_url); + }else{ + if (!file_exists($pack_url)){ + $this->error('文件不存在哦 亲!'); + }else{ + redirect("http://".$_SERVER['HTTP_HOST'].ltrim($pack_url,'.')); + } + } + }else{ + $this->error('原包地址不存在'); + } + break; + default: + switch ($system_type) { + case 1: + if(!empty($pack_url)){ + if(preg_match("/oss/", $pack_url)){ + $url=str_replace('-internal', '', $pack_url); + echo ""; + }elseif(preg_match("/clouddn/", $pack_url)){ + $url = "http://".$pack_url; + redirect($url); + }elseif(preg_match("/myqcloud/", $pack_url)){ + redirect($pack_url); + }elseif(preg_match("/bcebos/", $pack_url)){ + redirect($pack_url); + }else{ + $this->down($pack_url); + } + }else{ + $this->error('原包地址不存在'); + } + break; + default: + $plist_url = substr($data['plist_url'],'1',strlen($data['plist_url'])); + Header("HTTP/1.1 303 See Other"); + Header("Location: "."itms-services://?action=download-manifest&url="."https://".$_SERVER["HTTP_HOST"]."/".$plist_url); + break; + } + break; + } + } + + /** + * 投放包下载 + * @param + * @author 鹿文学 + */ + public function launch_down_file($game_id=0,$promote_id=0,$platform_id=0,$position=1) { + + /* 检查游戏是否存在 */ + //$game = M('game','tab_')->field('id,game_name')->where(['id'=>$game_id])->find(); + //if(!is_array($game)) {$this->error('游戏不存在');} + + /* 检查渠道包是否存在或更改 */ + $applymodel = M('apply','tab_'); + + $apply = $applymodel->field('id,sdk_version,pack_url,plist_url') + ->where(['game_id'=>$game_id,'promote_id'=>$promote_id])->find(); + //if(!is_array($apply)) {$this->error('渠道不存在');} + + $launchmodel = M('apply_launch','tab_'); + + $map = array( + 'platform_id'=>$platform_id, + 'apply_id'=>$apply['id'], + 'position'=>$position, + ); + + $launch = $launchmodel->where($map)->find(); + + //if(!is_array($launch)) {$this->error('游戏包不存在');} + + /* 检查原包是否存在或更改 */ + $gamesource = M('game_source','tab_')->field('id,file_name,source_version')->where(['game_id'=>$game_id])->find(); + if(!is_array($gamesource)) {$this->error('文件不存在哦');} + + if($gamesource['file_name'] == $launch['game_source_filename']) { + + + $system_type = 1; + if(strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone')||strpos($_SERVER['HTTP_USER_AGENT'], 'iPad')){ + $system_type = 2; + } + + $pack_url = $launch['launch_down_url']; + M('Game','tab_')->where(['id'=>$game_id])->setInc('dow_num'); + if(is_mobile_request()){ + if($apply['sdk_version'] == 1 && get_devices_type()==2)$this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); + if($apply['sdk_version'] == 1 && is_weixin())$this->redirect("Home/promotionofregistration",array('pid'=>$promote_id,'gid'=>$game_id,'lid'=>$platform_id,'p'=>$position,'message'=>"请使用安卓浏览器下载")); + if($apply['sdk_version'] == 2 && get_devices_type()==1)$this->redirect("Down/down_error",array('message'=>"请使用ios浏览器下载")); + } + switch ($apply['sdk_version']) { + case 1: + if(!empty($pack_url)){ + if(preg_match("/oss/", $pack_url)){ + $url=str_replace('-internal', '', $pack_url); + echo ""; + }elseif(preg_match("/clouddn/", $pack_url)){ + $url = "http://".$pack_url; + redirect($url); + }elseif(preg_match("/myqcloud/", $pack_url)){ + redirect($pack_url); + }elseif(preg_match("/bcebos/", $pack_url)){ + redirect($pack_url); + }else{ + + $url = ROOTTT . substr($pack_url,stripos($pack_url,'uploads')); + + if (!file_exists($url)){ + $this->error('文件不存在哦 亲!'); + }else{ + redirect($pack_url); + } + } + }else{ + $this->error('原包地址不存在'); + } + break; + default: + switch ($system_type) { + case 1: + if(!empty($pack_url)){ + if(preg_match("/oss/", $pack_url)){ + $url=str_replace('-internal', '', $pack_url); + echo ""; + }elseif(preg_match("/clouddn/", $pack_url)){ + $url = "http://".$pack_url; + redirect($url); + }elseif(preg_match("/myqcloud/", $pack_url)){ + redirect($pack_url); + }elseif(preg_match("/bcebos/", $pack_url)){ + redirect($pack_url); + }else{ + $this->down($pack_url); + } + }else{ + $this->error('原包地址不存在'); + } + break; + default: + $plist_url = $launch['launch_plist_url']; + if(stripos($plist_url,'https://') === false) { + $plist_url = 'https://'.$_SERVER['HTTP_HOST'].str_replace('./','/',$plist_url); + } + Header("HTTP/1.1 303 See Other"); + Header("Location: "."itms-services://?action=download-manifest&url=".$plist_url); + break; + } + break; + } + + + + + } else { + + $applymodel->where(['id'=>$apply['id']])->setField('enable_status',2); + + $this->error('游戏正在打包，请稍候'); + + } + + } + + + public function media_down_file($game_id=0,$type=1){ + $model = M('Game','tab_'); + $map['tab_game.id'] = $game_id; + $map['file_type'] = $type; + $data = $model + ->field('tab_game_source.*,tab_game.game_name,tab_game.add_game_address,tab_game.ios_game_address') + ->join("left join tab_game_source on tab_game.id = tab_game_source.game_id")->where($map)->find(); + if($type==1){ + if($data['file_url']!=''||!varify_url($data['add_game_address'])){ + $this->down($data['file_url']); + } + else{ + Header("HTTP/1.1 303 See Other"); + Header("Location: ".$data['add_game_address']); + } + }else{ + if($data['file_url']!=''||!varify_url($data['ios_game_address'])){ + $this->down($data['file_url']); + } + else{ + Header("HTTP/1.1 303 See Other"); + Header("Location: ".$data['ios_game_address']); + } + } + } + + public function down($file, $isLarge = false, $rename = NULL) + { + if(headers_sent())return false; + if(!$file) { + $this->error('文件不存在哦 亲!'); + } + if($rename==NULL){ + if(strpos($file, '/')===false && strpos($file, '\\')===false) + $filename = $file; + else{ + $filename = basename($file); + } + }else{ + $filename = $rename; + } + + header('Content-Description: File Transfer'); + header("Content-Type: application/force-download;"); + header('Content-Type: application/octet-stream'); + header("Content-Transfer-Encoding: binary"); + header("Content-Disposition: attachment; filename=\"$filename\""); + header('Expires: 0'); + header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); + header('Pragma: public'); + header('Content-Length: '.filesize($file));//$_SERVER['DOCUMENT_ROOT']. + header("Pragma: no-cache"); //不缓存页面 + ob_clean(); + flush(); + if($isLarge) + self::readfileChunked($file); + else + readfile($file); + } + + public function down_material($game_id){ + $map['status'] = 1; + $game = M("game",'tab_')->where($map)->find($game_id); + $material = $game['material_url']; + if(file_exists($material) && is_file($material)){ + clearstatcache(); + $this->down($material); + }else{ + clearstatcache(); + $this->error('下载地址错误'); + } + + } + + /** + * 安卓打包渠道信息 + * @param $source_info 原包信息 + * @param $promote_id + * @return string + * author: xmy 280564871@qq.com + */ + public function package($source_info, $promote_id) + { + $file_path = $source_info['file_url']; + //验证原包是否存在 + if (!varify_url($file_path)) { + $this->error("未上传原包"); + } else { + + $result = M('apply', 'tab_') + ->alias('a') + ->field('id, pack_url, plist_url') + ->where(['a.game_id'=>$source_info['game_id'],'a.promote_id'=>$promote_id]) + ->find(); + if(empty($result)) { + $this->error('此游戏不存在'); + } + + if(GameModel::ANDROID == $source_info['sdk_version']){ + if(varify_url($result['pack_url'])) { + return $result['pack_url']; + } + }elseif(GameModel::IOS == $source_info['sdk_version']){ + if(varify_url($result['plist_url'])) { + return $result['plist_url']; + } + }else{ + $this->error('游戏版本错误'); + } + } + } +} diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index f8b481a16..53696a362 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -1,24 +1,9 @@ - -// +---------------------------------------------------------------------- - - namespace Home\Controller; use Think\Controller; use User\Api\MemberApi; +use Base\Tool\Request; /** * 前台公共控制器 @@ -142,6 +127,66 @@ class HomeController extends Controller $this->display(); } + public function landingPage() + { + $code = I('code', ''); + $data = []; + + $isWechat = Request::isWechat(); + $isIOS = Request::isIOS(); + $isAndroid = Request::isAndroid(); + $isIOS13 = Request::isIOS13(); + + $columns = [ + 'id', + 'sdk_version', + 'icon', + 'screenshot', + 'relation_game_id', + 'relation_game_name', + 'dow_status', + 'features', + 'flooring_page_imgs', + ]; + $map = ['id' => intval($data['game_id'])]; + + $game = M('game', 'tab_')->field($columns)->where($map)->find(); + if ($game['sdk_version'] == 1 && $isIOS) { + $map['relation_game_id'] = $game['relation_game_id']; + $map['sdk_version'] = 2; + $game = M('game', 'tab_')->field($columns)->where($map)->find(); + } elseif ($game['sdk_version'] == 2 && $isAndroid) { + $map['relation_game_id'] = $game['relation_game_id']; + $map['sdk_version'] = 1; + $game = M('game', 'tab_')->field($columns)->where($map)->find(); + } + + $apply = M('apply', 'tab_')->field(['game_id', 'enable_status']) + ->where(['promote_id' => $data['promote_id'], 'game_id' => $game['id']]) + ->find(); + $game['flooring_page_imgs'] = explode(',', $game['flooring_page_imgs']); + $game['icon'] = get_cover($game['icon'], 'path'); + + $downloadUrl = ''; + if ($isIOS13) { + $gameSource = M('GameSource', 'tab_')->where(array('game_id' => $gameId))->getField('org_plist_url'); + $downloadUrl = 'itms-services://?action=download-manifest&url=' . Request::getHost() . ltrim($gameSource['org_plist_url'], '.'); + } else { + $applyService = new ApplyService(); + $downloadUrl = $applyService->getDownloadUrl($apply, $game); + } + + $this->assign('downloadUrl', $downloadUrl); + $this->assign('isIOS13', $isIOS13); + $this->assign('isWechat', $isWechat); + $this->assign('isIOS', $isIOS); + $this->assign('isAndroid', $isAndroid); + $this->assign('apply', $apply); + $this->assign('game', $game); + $this->display(); + } + + public function iosDown() { $gameId = I('get.gid'); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html new file mode 100644 index 000000000..4bcfd3e2d --- /dev/null +++ b/Application/Home/View/default/Home/landingPage.html @@ -0,0 +1,133 @@ + + + + + + + + + + + + + {$game['relation_game_name']} + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + +
+
+ + + + + \ No newline at end of file diff --git a/Public/Home/css/landing_page.css b/Public/Home/css/landing_page.css new file mode 100644 index 000000000..fcbcc4a93 --- /dev/null +++ b/Public/Home/css/landing_page.css @@ -0,0 +1,102 @@ +.weixin { + position: absolute; + top: -80px; + right: 0; + width: 17rem; + height: 30rem; + margin-top: 2px; + background: url(../images/img_sign.png) left top no-repeat; + background-size: 100% 100%; + z-index: 99; + } + + html { + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + } + + body, div { + margin: 0; + padding: 0; + } + + .bn-rule { + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + background: #333; + } + + .bn-rule img { + margin-top: 21px; + width: 100%; + } + + .register-box-max { + width: 80%; + height: 280px; + top: calc(50% - 140px); + left: 10%; + position: fixed; + z-index: 10; + background-color: #fff; + border-radius: 10px; + } + + @media screen and (min-width: 768px) { + .register-box-max { + width: 50%; + left: 25%; + } + } + + .register-bg { + width: 100%; + height: inherit; + position: fixed; + background-color: #0a0a0a; + opacity: 0.5; + } + + .register-title-box { + padding: 10px 10px; + margin-top: 10px; + text-align: center; + font-size: 1.2rem; + } + + .register-title-box span { + font-weight: 600; + } + + .register-input-box { + text-align: center; + font-size: 1rem; + } + + .register-input-box input { + width: calc(80% - 5px); + height: 2rem; + padding-left: 5px; + margin-top: 10px; + margin-bottom: 10px; + border: 1px solid #6f6f6f; + border-radius: 3px; + } + + .register-btn-box { + margin-top: 40px; + text-align: center; + } + + .register-btn-box button { + width: 80%; + height: 2.5rem; + border: 0; + border-radius: 18px; + background-color: #1993ff; + color: #fff; + font-size: 1.1rem; + } \ No newline at end of file From c3502c6120019db4cb386ec656b67ff0935afa5c Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 4 Nov 2019 18:10:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=B7=BB=E5=8A=A0ios13?= =?UTF-8?q?=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Base/Service/GameSourceService.class.php | 116 ++++++++++++------ 1 file changed, 80 insertions(+), 36 deletions(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 054f3c9aa..42051ded9 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -3,36 +3,55 @@ namespace Base\Service; use Base\Model\PromoteModel; use Base\Model\ApplyModel; +use Base\Tool\Base62; class GameSourceService { + const IS_FIXED_IOS13 = true; + public function __construct() { } + /** + * 获取IPA中的.app后缀目录 + */ + public function getIpaAppPath($ipaPath) + { + $appPath = ''; + $zipGameSource = zip_open($ipaPath); + if ($zipGameSource) { + while ($zipEntry = zip_read($zipGameSource)) { + if (preg_match("/^Payload.*?\.app/", zip_entry_name($zipEntry), $matches)) { + $appPath = $matches[0]; + break; + } + } + zip_close($zipGameSource); + } + return $appPath; + } + public function getChannelConfigFile($gameSource) { $configUrl = ''; if ($gameSource['sdk_version'] == 1) { $configUrl = "META-INF/mch.properties"; } else { - $preUrl = ''; - $zipGameSource = zip_open($this->getGameSourceUrl($gameSource)); - if ($zipGameSource) { - while ($zipEntry = zip_read($zipGameSource)) { - if (preg_match("/^Payload.*?\.app/", zip_entry_name($zipEntry), $matches)) { - $preUrl = $matches[0]; - break; - } - } - zip_close($zipGameSource); - } - $configUrl = $preUrl . '/_CodeSignature/TXChannel'; + $appPath = $this->getIpaAppPath($this->getGameSourceUrl($gameSource)); + $configUrl = $appPath . '/_CodeSignature/TXChannel'; } return $configUrl; } + public function getChannelConfigFolder($gameSource, array $packData) + { + $gameSourceUrl = $this->getGameSourceUrl($gameSource); + $appPath = $this->getIpaAppPath($this->getGameSourceUrl($gameSource)); + return $appPath . '/' . Base62::encode($packData); + } + public function getGameSourceUrl($gameSource) { if (empty($gameSource)) { @@ -47,8 +66,36 @@ class GameSourceService { $fileUrl = $path . $gameSource['file_name']; return ROOTTT . ltrim($fileUrl, './'); } + + public function packChannel($localPath, $game, $gameSource, $apply = null) + { + $packData = [ + 'game_id' => $game['id'], + 'game_name' => $game['game_name'], + 'game_appid' => $game['game_appid'], + 'promote_id' => $apply ? $apply['promote_id'] : '', + 'promote_account' => $apply ? $apply['promote_account'] : '自然渠道', + 'source_version' => $gameSource['source_version'], + ]; + + if (self::IS_FIXED_IOS13 && $game['sdk_version'] == 2) { + $channelFolder = $this->getChannelConfigFolder($gameSource, $packData); + return $this->packChannelFolder($localPath, $channelFolder); + } else { + $channelFile = $this->getChannelConfigFile($gameSource); + return $this->packChannelFile($localPath, $channelFile, $packData); + } + return false; + } - public function packChannelInfo($zipFile, $distFile, array $packData) + /** + * 打入渠道信息文件 + * @param string $zipFile 包文件地址 + * @param string $distFile 打入文件名 + * @param array $packData 打入信息 + * @return boolean 是否成功 + */ + public function packChannelFile($zipFile, $distFile, array $packData) { $zip = new \ZipArchive(); if ($zip->open($zipFile, \ZipArchive::CREATE)) { @@ -59,6 +106,23 @@ class GameSourceService { return false; } + /** + * 打入渠道信息目录（用于IOS，主要为了解决IOS13问题） + * @param string $zipFile 包文件地址 + * @param string $distFolder 打入文件夹 + * @return boolean 是否成功 + */ + public function packChannelFolder($zipFile, $distFolder) + { + $zip = new \ZipArchive(); + if ($zip->open($zipFile, \ZipArchive::CREATE)) { + $zip->addEmptyDir($distFolder); + $zip->close(); + return true; + } + return false; + } + /** * 原包打包 */ @@ -66,15 +130,6 @@ class GameSourceService { { $relativeUrl = $gameSource['file_url']; $localPath = ROOTTT . ltrim($relativeUrl, './'); - - $packData = [ - 'game_id' => $game['id'], - 'game_name' => $game['game_name'], - 'game_appid' => $game['game_appid'], - 'promote_id' => 0, - 'promote_account' => '自然注册', - 'source_version' => $gameSource['source_version'], - ]; $originalUrl = ''; if ($game['sdk_version'] == 2) { @@ -83,8 +138,7 @@ class GameSourceService { $originalUrl = $relativeUrl; copy($oldLocalPath, $localPath); } - $channelConfigFile = $this->getChannelConfigFile($gameSource); - $status = $this->packChannelInfo($localPath, $channelConfigFile, $packData); + $status = $this->packChannel($localPath, $game, $gameSource); if (!$status) { return [ 'status' => false, @@ -179,18 +233,8 @@ class GameSourceService { $relativePath = './' . $savePath; $localPath = ROOTTT . $savePath; copy($gameSourceUrl, $localPath); - - $packData = [ - 'game_id' => $apply['game_id'], - 'game_name' => $apply['game_name'], - 'game_appid' => $game['game_appid'], - 'promote_id' => $apply['promote_id'], - 'promote_account' => $apply['promote_account'], - 'source_version' => $gameSource['source_version'], - ]; - - $channelConfigFile = $this->getChannelConfigFile($gameSource); - $status = $this->packChannelInfo($localPath, $channelConfigFile, $packData); + + $status = $this->packChannel($localPath, $game, $gameSource, $apply); if (!$status) { return [ 'status' => false, From 89b243930dfd819a78cd9f10f1c3520fbe3b6012 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 5 Nov 2019 15:23:59 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E9=A1=B5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1 | 81 ++ Application/Base/Facade/Request.class.php | 26 + .../Base/Service/ApplyService.class.php | 124 ++- Application/Base/Tool/Request.class.php | 18 +- .../Home/Controller/ApplyController.class.php | 79 +- .../Controller/DownloadController.class.php | 353 ++------- .../Home/Controller/HomeController.class.php | 30 +- .../Home/View/default/Apply/my_game.html | 372 +++------ .../Home/View/default/Download/error.html | 18 + .../Home/View/default/Home/landingPage.html | 4 +- Public/Home/css/my_game.css | 76 ++ Public/Home/js/jquery.qrcode.min.js | 28 + Public/static/clipboard.min.js | 7 + Public/static/clipboard/clipboard.js | 745 ------------------ Public/static/clipboard/clipboard.min.js | 7 - 15 files changed, 592 insertions(+), 1376 deletions(-) create mode 100644 1 create mode 100644 Application/Base/Facade/Request.class.php create mode 100644 Application/Home/View/default/Download/error.html create mode 100644 Public/Home/css/my_game.css create mode 100644 Public/Home/js/jquery.qrcode.min.js create mode 100644 Public/static/clipboard.min.js delete mode 100644 Public/static/clipboard/clipboard.js delete mode 100644 Public/static/clipboard/clipboard.min.js diff --git a/1 b/1 new file mode 100644 index 000000000..4fff486ce --- /dev/null +++ b/1 @@ -0,0 +1,81 @@ +111111101001100000110010111001110100011110010111101110111111100110101000001111111 +100000101101110101010010000011011000001010010110100011101011011000000111101000001 +101110101001101100000101011111100000101011111111110000000000000110001010101011101 +101110100011011110100101111010001110000000101111111111101000000001101010101011101 +101110100110010010000110111110101101000101101101111110100100000010010000001011101 +100000101010001101110100100010110100010011011110100010101110000001001001001000001 +111111101010101010101010101010101010101010101010101010101010101010101010101111111 +000000001010000100100001100011110100101001001010100010101001000110001111000000000 +001110101001010000010001111110001111111111110111111111101010101100000011011100111 +111101000000010101101110111000000001100010111011111010001100110110001110111001111 +100011100101100001101001100011001000001000101100000011000110100100000100000111010 +010001010010110101000011010011110101011111101110111110011010000110111100000100011 +110111100001111111000001101111011010111101100100100011000100111111101010110100111 +000101011000011000111111110101001110011101001000011100110101010100010000001001110 +101001101000011110011110101010110011000111001100100000001111011011010010111010000 +000011011101001000010001000000000111010110000101000100001011000001111110101001000 +101001100011101011011011000111000010010110000110101110001001111111010111000101000 +110001001110001100100101111100001001010100111000000000011110000100011110001111101 +000011101001100111111010011101111110111001100100000001000000001110000011111100010 +111011011100000110000101011110000011000100000010011100111110000010101100111101110 +100110110010000011111010101000000100000100100100110001100110111111100111000000110 +001110011011111100101011001001101001100001101000000100110111000100111100110010010 +100010110010000111000111111001111001111111101000111111001010001111001100100000110 +111111000101011011000011101011101100100101000010110000101000001001110101000001001 +011111111010111101010101111111101000011101100010111110100111110101001001111111100 +101110001011110010101001100010010010101000100100100010000111001100111100100010011 +001010101011110001010100101011001010101011011110101010010010011110000110101010110 +110010001001111100111101100010111001010111001000100010111110100011000010100011110 +000111111001010110010010111111010110001101111110111111000101111101000110111110111 +001101001101001110101000000100000110011011110110010110000111001011100100110100001 +000000111011101000000111101111000110010000010011010010001100111010000110000101110 +001100000100010010000011001011011100101000100101101110101111000001110011110111101 +100011111000110101000000010001110010001100111010111111100100011101000101000001110 +011101000011111110110111010110111010001110111001001000101111100000010100110000010 +000011111111110000100101111101110111100010000000010000001010111011111010000101110 +011000011100110111111000010100000111001010001110011110001100000110100011110111111 +101001101000001100000000011100001101110100011111011010101011101100101011111000110 +111011000101000101111111011111101010110001111010100000000001000010100101100111100 +011000110010111000011001111011011101100000000101100011011011101110000010111110010 +011000010111101110011010101011101111100111100011100110101101000110001011100101101 +010111110010110010110010100001011110001110101000100001101010001101101110011001010 +110011001100001110110001011011100101101100110111001110010101100111011101101010110 +101001110011011001111010010010111001100101011000001011111110111100001011001101110 +010011001010011111110011001000111000001101100000100111001110000110001110110100101 +000011101111000011101110111100000010001100011001000111100010000111101110010001001 +000110011111111110100101110011011011000111101011101000110010101111100100111100011 +100111110101101101010100110000111100000110111001001110000100101111010110001100000 +100111010001000000111101010011101100111100100101010101100101001000001101110001110 +100011111000010111101001111110011011100001111000111111010110000110001100111111001 +110110001101000000101100100010010000101111011110100011111100100000000111100010011 +100110101100111100000010101011011010010101110111101010001010011111010110101010100 +011110001100011000001010100010110101010001011110100011111010010101111011100011110 +100111111010111111001010111110100101010111001000111110010010100000001100111111010 +111000010110001000110101010101110000111011000001101000110100000010001100000000001 +001100110110001111100010010001010001110100011110001001101110111111111010101000110 +001000010101011010101100101001010001001011100111000011111111000010001100011001101 +101000111110011010110101111001000101000001100100100111110110110000001110100110001 +001001011101111100011110000001100001001100101011100101010101101000000100011000000 +001101100110101000101110000111011010101001000010001000000110001101010010000100011 +000111011100101110100111000110110110110000101110010011001001001110011011001000100 +101100110001001100101100010110000100111100111001100000100000000100000010100111000 +110111001110111100111010100001011101001011100010010100111100001100111001011001111 +011010111000101001110100101100011111001010001111011010000111100000000111110101011 +000100011101001011101000101111111101011110011000010111111001011010011100010100101 +111000111101110101110001000100101110000011011010110111000110011111001100110111010 +000010010110000010111011011001100111111000010100101000101100001010100100010000100 +011001101101110111111101001011001111110010001101101100110010111010011001100100110 +000110010101100111000001101011000011111100101001101011001110000101101111011001100 +100110110001011010001000010110110101001001111010001110110000010111101100100100010 +100010010110111111010101111110011000010001001000110100111100001100100110111010110 +011100101111111010000111110011101011010101111010000000111010000100001101111111010 +010001010011001111011111111111000101101111110000011011110111101010101101001011101 +011100100011110000101010111110101111000001001101111110000010011111000000111111010 +000000001001100101111100100011110101101011110001100011101100110110001010100010101 +111111100101011111011000101010100001111011101001101010001110111111001010101010010 +100000100011101011011100100010011111100011001111100010110011001001000110100011000 +101110101011111001001001111111110111011011000101111110000100011110010010111110001 +101110101000001010000011111011000011001001101111101000101111000110000100111001100 +101110101101010111111101000000011001110010001011000001001000001011100100100001000 +100000100110110011111111101011001101100110101010011011011110000111000111010111100 +111111100111010110110100111000000100011101111011110011001111101100101011100001010 \ No newline at end of file diff --git a/Application/Base/Facade/Request.class.php b/Application/Base/Facade/Request.class.php new file mode 100644 index 000000000..8ea6817dc --- /dev/null +++ b/Application/Base/Facade/Request.class.php @@ -0,0 +1,26 @@ + + */ +class Request { + + private static $instance; + + public static function getInstance() + { + if (self::$instance == null) { + self::$instance = new BaseRequest(); + } + return self::$instance; + } + + public static function __callStatic($name, $arguments) + { + $instance = self::getInstance(); + return call_user_func_array([$instance, $name], $arguments); + } +} \ No newline at end of file diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index e41bfda6f..a9ea455d5 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -3,15 +3,51 @@ namespace Base\Service; use Base\Model\PromoteModel; use Base\Model\ApplyModel; -use Base\Tool\Request; +use Base\Facade\Request; class ApplyService { - private $model; + const ENCRYPT_METHOD = 'AES-256-ECB'; + const ENCRYPT_KEY = 'WmtX1@#Landing&Download2048'; + const ENCRYPT_TYPE_DOWNLOAD = 1; + const ENCRYPT_TYPE_LANDING_PAGE = 2; + + public static $enableStatusList = [ + '-1' => '打包失败', + '0' => '打包失败', + '1' => '打包成功 ', + '2' => '准备打包 ', + '3' => '打包中', + ]; public function __construct() { - $this->model = new ApplyModel(); + } + + public function checkApplyStatus($apply) + { + if ($apply['status'] == 0) { + return [ + 'status' => false, + 'message' => '游戏未审核', + ]; + } + if ($apply['offline_status'] == 1) { + return [ + 'status' => false, + 'message' => '游戏已下架', + ]; + } + if ($apply['enable_status'] != 1) { + return [ + 'status' => false, + 'message' => self::$enableStatusList[$apply['enable_status']] ?? '未知错误', + ]; + } + return [ + 'status' => true, + 'message' => '游戏打包成功', + ]; } public function cancelGame($gameId, $promoteId) { @@ -24,28 +60,70 @@ class ApplyService { M('apply', 'tab_')->where(['game_id' => $gameId, 'promote_id' => ['in', $ids]])->save($save); } - public function getDownloadUrl($apply, $game = null) + public function getDownloadUrl($apply) + { + $host = Request::getHost(); + $code = $this->encodeApplyCode($apply, self::ENCRYPT_TYPE_DOWNLOAD); + return $host . '/index.php?s=/Home/Download/index/code/' . $code; + } + + public function getLandingPageUrl($apply) { $host = Request::getHost(); - if(empty($apply['dow_url'])) { - if ($game == null) { - $columns = ['sdk_version', 'add_game_address', 'and_dow_address', 'ios_game_address', 'ios_dow_address']; - $game = M('game','tab_')->field($columns)->where(['id' => $apply['game_id']])->find(); - } - if($game['sdk_version'] == 1){ - if($game['add_game_address'] != '') { - return $game['add_game_address']; - }else{ - return $host . substr($game['and_dow_address'], 1); - } - } else { - if($game['ios_game_address'] != ''){ - return $game['ios_game_address']; - }else{ - return $host . substr($game['ios_dow_address'], 1); - } - } + $code = $this->encodeApplyCode($apply, self::ENCRYPT_TYPE_LANDING_PAGE); + return $host . '/index.php?s=/Home/Home/landingPage/code/' . $code; + } + + public function encodeApplyCode($apply, $type) + { + $expiresIn = 0; + $data = [ + 'promote_id' => $apply['promote_id'], + 'game_id' => $apply['game_id'], + 'expires_in' => $expiresIn, + 'created_at' => date('Y-m-d H:i:s'), + 'type' => $type + ]; + + $jsonStr = json_encode($data); + return base64_encode(openssl_encrypt($jsonStr, self::ENCRYPT_METHOD, self::ENCRYPT_KEY)); + } + + public function decodeApplyCode($code) + { + $decryptStr = openssl_decrypt(base64_decode($code), self::ENCRYPT_METHOD, self::ENCRYPT_KEY); + return json_decode($decryptStr, true); + } + + public function checkApplyCode($data, $type) + { + if ( + !isset($data['promote_id']) || + !isset($data['game_id']) || + !isset($data['expires_in']) || + !isset($data['created_at']) || + !isset($data['type']) + ) { + return [ + 'status' => false, + 'message' => '参数异常', + ]; + } + if ($data['type'] != $type) { + return [ + 'status' => false, + 'message' => '参数异常', + ]; + } + if ($data['expires_in'] > 0 && time() > (strtotime($data['created_at']) + $data['expires_in'])) { + return [ + 'status' => false, + 'message' => '链接已过期', + ]; } - return $host . $apply['dow_url']; + return [ + 'status' => true, + 'message' => '验证成功', + ]; } } \ No newline at end of file diff --git a/Application/Base/Tool/Request.class.php b/Application/Base/Tool/Request.class.php index 1176fe064..68b4f0ffe 100644 --- a/Application/Base/Tool/Request.class.php +++ b/Application/Base/Tool/Request.class.php @@ -5,25 +5,15 @@ namespace Base\Tool; * @author elf<360197197@qq.com> */ class Request { - - private static $instance; private $serverInfo; private $scheme; - private function __construct() + public function __construct() { $this->serverInfo = $_SERVER; } - public static function getInstance() - { - if (self::$instance == null) { - self::$instance = new static(); - } - return self::$instance; - } - public function isWechat() { $userAgent = $this->getUserAgent(); @@ -129,10 +119,4 @@ class Request { } return $this->scheme; } - - public static function __callStatic($name, $arguments) - { - $instance = self::getInstance(); - return call_user_func_array([$instance, $name], $arguments); - } } \ No newline at end of file diff --git a/Application/Home/Controller/ApplyController.class.php b/Application/Home/Controller/ApplyController.class.php index 9a03ac1e0..9a597e5d7 100644 --- a/Application/Home/Controller/ApplyController.class.php +++ b/Application/Home/Controller/ApplyController.class.php @@ -5,6 +5,8 @@ namespace Home\Controller; use OT\DataDictionary; use Admin\Model\ApplyModel; use Think\Model; +use Base\Facade\Request; +use Base\Service\ApplyService; /** @@ -633,9 +635,7 @@ class ApplyController extends BaseController if ($_REQUEST['pattern'] != null) { $map['tab_apply.pattern'] = $_REQUEST['pattern']; } -// $map['tab_apply.status'] = 1; -// $map['tab_game.game_status'] = 1;//游戏状态 -// empty(I('sdk_version')) || $map['tab_game.sdk_version'] = I('sdk_version'); + $page = intval(I('get.p', 0)); $page = $page ? $page : 1; //默认显示第一页数据 @@ -1750,7 +1750,80 @@ class ApplyController extends BaseController $this->ajaxReturn($result); } + } + + public function getDownloadUrl() + { + $gameId = I('game_id', 0); + $promote = $this->getLoginPromote(); + $apply = M('apply', 'tab_')->where(['promote_id' => $promote['id'], 'game_id' => $gameId])->find(); + $game = M('game', 'tab_')->field(['icon'])->where(['game_id' => $gameId])->find(); + if ($apply == null) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => '游戏不存在', + 'data' => [ + ] + ]); + } + + $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path'); + + $applyService = new ApplyService(); + $result = $applyService->checkApplyStatus($apply); + if (!$result['status']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => $result['message'], + 'data' => [ + ] + ]); + } + $url = $applyService->getDownloadUrl($apply); + $this->ajaxReturn([ + 'status' => 1, + 'message' => '获取成功', + 'data' => [ + 'url' => $url, + ] + ]); + } + + public function getLandingPageUrl() + { + $gameId = I('game_id', 0); + $promote = $this->getLoginPromote(); + $apply = M('apply', 'tab_')->where(['promote_id' => $promote['id'], 'game_id' => $gameId])->find(); + $game = M('game', 'tab_')->field(['icon'])->where(['game_id' => $gameId])->find(); + if ($apply == null) { + $this->ajaxReturn([ + 'status' => 1, + 'message' => '游戏不存在', + 'data' => [ + ] + ]); + } + $icon = Request::getHost() . '/' . get_cover($game['icon'], 'path'); + + $applyService = new ApplyService(); + $result = $applyService->checkApplyStatus($apply); + if (!$result['status']) { + $this->ajaxReturn([ + 'status' => 0, + 'message' => $result['message'], + 'data' => [ + ] + ]); + } + $url = $applyService->getLandingPageUrl($apply); + $this->ajaxReturn([ + 'status' => 1, + 'message' => '获取成功', + 'data' => [ + 'url' => $url, + ] + ]); } } diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 30a46f3ea..74d178baa 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -2,327 +2,82 @@ namespace Home\Controller; use Think\Controller; -use App\Model\GameModel; +use Base\Facade\Request; +use Base\Service\ApplyService; /** * @author elf<360197197@qq.com> */ class DownloadController extends Controller { - public function down_error($message='') + public function downloadError($message) { - $this->assign("message",$message); - $this->display(); + $this->assign('message', $message); + $this->display('error'); } - public function index($game_id=0,$promote_id=0){ - $applyModel = M('Apply','tab_'); - $map['status'] = 1; - $map['enable_status'] = 1; - $data = $applyModel - ->field('game_id,tab_apply.game_name,promote_id,promote_account,relation_game_id,pack_url,plist_url,`status`,enable_status,tab_apply.sdk_version') - ->join("tab_game ON tab_apply.game_id = tab_game.id AND promote_id = $promote_id AND game_id = $game_id ") - ->where($map) - ->find(); - $system_type = 1; - if(strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone')||strpos($_SERVER['HTTP_USER_AGENT'], 'iPad')){ - $system_type = 2; - } - $gamemodel = new GameModel(); - $source = $gamemodel->getGameDownInfo($game_id); - $pack_url = $this->package($source['packet'],$promote_id); - M('Game','tab_')->where('id='.$data['game_id'])->setInc('dow_num'); - if(is_mobile_request()){ - if($data['sdk_version'] == 1 && get_devices_type()==2)$this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); - // if($data['sdk_version'] == 1 && is_weixin()) $this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); - if($data['sdk_version'] == 2 && get_devices_type()==1)$this->redirect("Down/down_error",array('message'=>"请使用ios浏览器下载")); - } - switch ($data['sdk_version']) { - case 1: - if(!empty($pack_url)){ - if(preg_match("/oss/", $pack_url)){ - $url=str_replace('-internal', '', $pack_url); - echo ""; - }elseif(preg_match("/clouddn/", $pack_url)){ - $url = "http://".$pack_url; - redirect($url); - }elseif(preg_match("/myqcloud/", $pack_url)){ - redirect($pack_url); - }elseif(preg_match("/bcebos/", $pack_url)){ - redirect($pack_url); - }else{ - if (!file_exists($pack_url)){ - $this->error('文件不存在哦 亲!'); - }else{ - redirect("http://".$_SERVER['HTTP_HOST'].ltrim($pack_url,'.')); - } - } - }else{ - $this->error('原包地址不存在'); - } - break; - default: - switch ($system_type) { - case 1: - if(!empty($pack_url)){ - if(preg_match("/oss/", $pack_url)){ - $url=str_replace('-internal', '', $pack_url); - echo ""; - }elseif(preg_match("/clouddn/", $pack_url)){ - $url = "http://".$pack_url; - redirect($url); - }elseif(preg_match("/myqcloud/", $pack_url)){ - redirect($pack_url); - }elseif(preg_match("/bcebos/", $pack_url)){ - redirect($pack_url); - }else{ - $this->down($pack_url); - } - }else{ - $this->error('原包地址不存在'); - } - break; - default: - $plist_url = substr($data['plist_url'],'1',strlen($data['plist_url'])); - Header("HTTP/1.1 303 See Other"); - Header("Location: "."itms-services://?action=download-manifest&url="."https://".$_SERVER["HTTP_HOST"]."/".$plist_url); - break; - } - break; - } - } - - /** - * 投放包下载 - * @param - * @author 鹿文学 - */ - public function launch_down_file($game_id=0,$promote_id=0,$platform_id=0,$position=1) { - - /* 检查游戏是否存在 */ - //$game = M('game','tab_')->field('id,game_name')->where(['id'=>$game_id])->find(); - //if(!is_array($game)) {$this->error('游戏不存在');} - - /* 检查渠道包是否存在或更改 */ - $applymodel = M('apply','tab_'); - - $apply = $applymodel->field('id,sdk_version,pack_url,plist_url') - ->where(['game_id'=>$game_id,'promote_id'=>$promote_id])->find(); - //if(!is_array($apply)) {$this->error('渠道不存在');} - - $launchmodel = M('apply_launch','tab_'); - - $map = array( - 'platform_id'=>$platform_id, - 'apply_id'=>$apply['id'], - 'position'=>$position, - ); - - $launch = $launchmodel->where($map)->find(); - - //if(!is_array($launch)) {$this->error('游戏包不存在');} - - /* 检查原包是否存在或更改 */ - $gamesource = M('game_source','tab_')->field('id,file_name,source_version')->where(['game_id'=>$game_id])->find(); - if(!is_array($gamesource)) {$this->error('文件不存在哦');} - - if($gamesource['file_name'] == $launch['game_source_filename']) { - - - $system_type = 1; - if(strpos($_SERVER['HTTP_USER_AGENT'], 'iPhone')||strpos($_SERVER['HTTP_USER_AGENT'], 'iPad')){ - $system_type = 2; - } - - $pack_url = $launch['launch_down_url']; - M('Game','tab_')->where(['id'=>$game_id])->setInc('dow_num'); - if(is_mobile_request()){ - if($apply['sdk_version'] == 1 && get_devices_type()==2)$this->redirect("Down/down_error",array('message'=>"请使用安卓浏览器下载")); - if($apply['sdk_version'] == 1 && is_weixin())$this->redirect("Home/promotionofregistration",array('pid'=>$promote_id,'gid'=>$game_id,'lid'=>$platform_id,'p'=>$position,'message'=>"请使用安卓浏览器下载")); - if($apply['sdk_version'] == 2 && get_devices_type()==1)$this->redirect("Down/down_error",array('message'=>"请使用ios浏览器下载")); + public function index() + { + $code = I('code', ''); + if ($code == '') { + $this->redirect("download/downloadError", ['message' => '访问错误']); } - switch ($apply['sdk_version']) { - case 1: - if(!empty($pack_url)){ - if(preg_match("/oss/", $pack_url)){ - $url=str_replace('-internal', '', $pack_url); - echo ""; - }elseif(preg_match("/clouddn/", $pack_url)){ - $url = "http://".$pack_url; - redirect($url); - }elseif(preg_match("/myqcloud/", $pack_url)){ - redirect($pack_url); - }elseif(preg_match("/bcebos/", $pack_url)){ - redirect($pack_url); - }else{ - - $url = ROOTTT . substr($pack_url,stripos($pack_url,'uploads')); - - if (!file_exists($url)){ - $this->error('文件不存在哦 亲!'); - }else{ - redirect($pack_url); - } - } - }else{ - $this->error('原包地址不存在'); - } - break; - default: - switch ($system_type) { - case 1: - if(!empty($pack_url)){ - if(preg_match("/oss/", $pack_url)){ - $url=str_replace('-internal', '', $pack_url); - echo ""; - }elseif(preg_match("/clouddn/", $pack_url)){ - $url = "http://".$pack_url; - redirect($url); - }elseif(preg_match("/myqcloud/", $pack_url)){ - redirect($pack_url); - }elseif(preg_match("/bcebos/", $pack_url)){ - redirect($pack_url); - }else{ - $this->down($pack_url); - } - }else{ - $this->error('原包地址不存在'); - } - break; - default: - $plist_url = $launch['launch_plist_url']; - if(stripos($plist_url,'https://') === false) { - $plist_url = 'https://'.$_SERVER['HTTP_HOST'].str_replace('./','/',$plist_url); - } - Header("HTTP/1.1 303 See Other"); - Header("Location: "."itms-services://?action=download-manifest&url=".$plist_url); - break; - } - break; + $applyService = new ApplyService(); + $data = $applyService->decodeApplyCode($code); + $result = $applyService->checkApplyCode($data, ApplyService::ENCRYPT_TYPE_DOWNLOAD); + if (!$result['status']) { + $this->error($result['message']); } + + $gameId = $data['game_id']; + $promoteId = $data['promote_id']; + $map = []; + $map['status'] = 1; + $map['enable_status'] = 1; + $columns = ['game_id', 'promote_id', 'promote_account', 'pack_url', 'plist_url', 'status', 'enable_status']; + $apply = M('apply','tab_')->field($columns)->where($map)->find(); + $game = M('game','tab_')->field(['id', 'game_name', 'sdk_version'])->where(['id' => $apply['game_id']])->find(); - - - } else { - - $applymodel->where(['id'=>$apply['id']])->setField('enable_status',2); - - $this->error('游戏正在打包，请稍候'); - - } - - } - - - public function media_down_file($game_id=0,$type=1){ - $model = M('Game','tab_'); - $map['tab_game.id'] = $game_id; - $map['file_type'] = $type; - $data = $model - ->field('tab_game_source.*,tab_game.game_name,tab_game.add_game_address,tab_game.ios_game_address') - ->join("left join tab_game_source on tab_game.id = tab_game_source.game_id")->where($map)->find(); - if($type==1){ - if($data['file_url']!=''||!varify_url($data['add_game_address'])){ - $this->down($data['file_url']); - } - else{ - Header("HTTP/1.1 303 See Other"); - Header("Location: ".$data['add_game_address']); - } - }else{ - if($data['file_url']!=''||!varify_url($data['ios_game_address'])){ - $this->down($data['file_url']); + if (Request::isMobile()) { + if (!Request::isAndroid() && $game['sdk_version'] == 1) { + $this->redirect("download/downloadError", ['message' => '请使用安卓浏览器下载']); } - else{ - Header("HTTP/1.1 303 See Other"); - Header("Location: ".$data['ios_game_address']); - } - } - } - - public function down($file, $isLarge = false, $rename = NULL) - { - if(headers_sent())return false; - if(!$file) { - $this->error('文件不存在哦 亲!'); - } - if($rename==NULL){ - if(strpos($file, '/')===false && strpos($file, '\\')===false) - $filename = $file; - else{ - $filename = basename($file); + if (!Request::isIOS() && $game['sdk_version'] == 2) { + $this->redirect("download/downloadError", ['message' => '请使用ios浏览器下载']); } - }else{ - $filename = $rename; } - - header('Content-Description: File Transfer'); - header("Content-Type: application/force-download;"); - header('Content-Type: application/octet-stream'); - header("Content-Transfer-Encoding: binary"); - header("Content-Disposition: attachment; filename=\"$filename\""); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Pragma: public'); - header('Content-Length: '.filesize($file));//$_SERVER['DOCUMENT_ROOT']. - header("Pragma: no-cache"); //不缓存页面 - ob_clean(); - flush(); - if($isLarge) - self::readfileChunked($file); - else - readfile($file); - } - - public function down_material($game_id){ - $map['status'] = 1; - $game = M("game",'tab_')->where($map)->find($game_id); - $material = $game['material_url']; - if(file_exists($material) && is_file($material)){ - clearstatcache(); - $this->down($material); - }else{ - clearstatcache(); - $this->error('下载地址错误'); + $packageUrl = $game['sdk_version'] == 1 ? $apply['pack_url'] : $apply['plist_url']; + + M('game','tab_')->where(['id' => $game['id']])->setInc('dow_num'); + if (Request::isAndroid()) { + $this->gotoPkgUrl($packageUrl); + } else if (Request::isIOS()) { + $plistUrl = substr($packageUrl, 1, strlen($packageUrl)); + header("HTTP/1.1 303 See Other"); + header("Location: "."itms-services://?action=download-manifest&url=" . "https://" . Request::getHost() . "/" . $plistUrl); + } else { + $this->gotoPkgUrl($packageUrl); } - } - /** - * 安卓打包渠道信息 - * @param $source_info 原包信息 - * @param $promote_id - * @return string - * author: xmy 280564871@qq.com - */ - public function package($source_info, $promote_id) + private function gotoPkgUrl($packageUrl) { - $file_path = $source_info['file_url']; - //验证原包是否存在 - if (!varify_url($file_path)) { - $this->error("未上传原包"); + if (preg_match("/oss/", $packageUrl)) { + $url = str_replace('-internal', '', $packageUrl); + echo ""; + } elseif (preg_match("/clouddn/", $packageUrl)) { + $url = "http://".$packageUrl; + redirect($url); + } elseif (preg_match("/myqcloud/", $packageUrl)) { + redirect($packageUrl); + } elseif(preg_match("/bcebos/", $packageUrl)) { + redirect($packageUrl); } else { - - $result = M('apply', 'tab_') - ->alias('a') - ->field('id, pack_url, plist_url') - ->where(['a.game_id'=>$source_info['game_id'],'a.promote_id'=>$promote_id]) - ->find(); - if(empty($result)) { - $this->error('此游戏不存在'); - } - - if(GameModel::ANDROID == $source_info['sdk_version']){ - if(varify_url($result['pack_url'])) { - return $result['pack_url']; - } - }elseif(GameModel::IOS == $source_info['sdk_version']){ - if(varify_url($result['plist_url'])) { - return $result['plist_url']; - } + if (!file_exists($packageUrl)) { + $this->error('文件不存在哦，亲!'); }else{ - $this->error('游戏版本错误'); + redirect(Request::getHost() . ltrim($packageUrl, '.')); } } } diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 53696a362..4a5e0f735 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -3,7 +3,8 @@ namespace Home\Controller; use Think\Controller; use User\Api\MemberApi; -use Base\Tool\Request; +use Base\Facade\Request; +use Base\Service\ApplyService; /** * 前台公共控制器 @@ -130,7 +131,15 @@ class HomeController extends Controller public function landingPage() { $code = I('code', ''); - $data = []; + if ($code == '') { + $this->redirect("download/downloadError", ['message' => '访问错误']); + } + $applyService = new ApplyService(); + $data = $applyService->decodeApplyCode($code); + $result = $applyService->checkApplyCode($data, ApplyService::ENCRYPT_TYPE_LANDING_PAGE); + if (!$result['status']) { + $this->error($result['message']); + } $isWechat = Request::isWechat(); $isIOS = Request::isIOS(); @@ -160,12 +169,17 @@ class HomeController extends Controller $map['sdk_version'] = 1; $game = M('game', 'tab_')->field($columns)->where($map)->find(); } - - $apply = M('apply', 'tab_')->field(['game_id', 'enable_status']) - ->where(['promote_id' => $data['promote_id'], 'game_id' => $game['id']]) - ->find(); - $game['flooring_page_imgs'] = explode(',', $game['flooring_page_imgs']); + $apply = M('apply', 'tab_')->field(['game_id', 'enable_status', 'promote_id']) + ->where(['promote_id' => $data['promote_id'], 'game_id' => $game['id']]) + ->find(); $game['icon'] = get_cover($game['icon'], 'path'); + + $imageIds = explode(',', $game['flooring_page_imgs']) ?? []; + $imageUrls = []; + foreach ($imageIds as $imageId) { + $imageUrls[] = get_cover($imageId, 'path'); + } + $game['flooring_page_imgs'] = $imageUrls; $downloadUrl = ''; if ($isIOS13) { @@ -173,7 +187,7 @@ class HomeController extends Controller $downloadUrl = 'itms-services://?action=download-manifest&url=' . Request::getHost() . ltrim($gameSource['org_plist_url'], '.'); } else { $applyService = new ApplyService(); - $downloadUrl = $applyService->getDownloadUrl($apply, $game); + $downloadUrl = $applyService->getDownloadUrl($apply); } $this->assign('downloadUrl', $downloadUrl); diff --git a/Application/Home/View/default/Apply/my_game.html b/Application/Home/View/default/Apply/my_game.html index 599867866..30ffdf05b 100644 --- a/Application/Home/View/default/Apply/my_game.html +++ b/Application/Home/View/default/Apply/my_game.html @@ -3,89 +3,10 @@ + - - - @@ -104,15 +25,7 @@ IOS游戏 Android游戏 我的游戏 - -
@@ -151,13 +64,6 @@
- - - - - - -
@@ -236,20 +142,6 @@ 游戏类型:{$vo.game_type_name}  

- -
@@ -257,10 +149,8 @@ 添加推广员游戏 - - 复制下载链接 - $vo['id'],'pid'=>$vo['promote_id']));?> - 落地页链接 + 复制下载链接 + 落地页链接 下架
@@ -347,16 +237,11 @@
- + +
- - - - - -
复制成功,ctrl+v粘贴即可 @@ -364,8 +249,8 @@
-
- +
+
@@ -426,68 +311,16 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +