diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php index a3f7e8664..ce8cf11ac 100644 --- a/Application/Admin/Model/PromoteModel.class.php +++ b/Application/Admin/Model/PromoteModel.class.php @@ -161,6 +161,15 @@ class PromoteModel extends Model{ session('promote_auth_sign', data_auth_sign($auth)); } + + /** + * 退出登录 + */ + public function logout(){ + session('promote_auth', null); + session('promote_auth_sign', null); + session('game_divide_second_pwd', null); + } /** * 验证用户密码 diff --git a/Application/Admin/View/Mend/edit.html b/Application/Admin/View/Mend/edit.html index b1d310b39..88a4e2e25 100644 --- a/Application/Admin/View/Mend/edit.html +++ b/Application/Admin/View/Mend/edit.html @@ -90,16 +90,6 @@ - - - 换绑类型 - - - In - Out - - - 备注 diff --git a/Application/Base/Service/ApplyService.class.php b/Application/Base/Service/ApplyService.class.php index 4b9aba2ed..b6b1f416f 100644 --- a/Application/Base/Service/ApplyService.class.php +++ b/Application/Base/Service/ApplyService.class.php @@ -79,7 +79,7 @@ class ApplyService { $host = C('DOMAIN_DOWNLOAD'); $host = $host ? $host : Request::getHost(); $code = $this->encodeApplyCode($apply, self::ENCRYPT_TYPE_DOWNLOAD); - return $host . '/index.php?s=/Home/Download/index/code/' . $code; + return $host . '/index.php?s=/Home/Package/download/code/' . $code; } public function getLandingPageUrl($apply) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 08a6a3cb1..ecfe350bf 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -319,10 +319,17 @@ class PromoteService { $toPromote = M('promote', 'tab_')->where(['id' => $toPromoteId])->find(); $fromPromote = M('promote', 'tab_')->where(['id' => $fromPromoteId])->find(); - $map = ['promote_id' => $fromPromote['id']]; + if (!$fromPromote && count($shiftIds) == 0) { + return ['status' => false, 'msg' => '官方渠道玩家不能全部迁移']; + } + + $map = []; if (count($shiftIds) > 0) { $map['id'] = ['in', $shiftIds]; } + if ($fromPromote) { + $map['promote_id'] = $fromPromote['id']; + } $users = M('user', 'tab_')->field(['id', 'account', 'nickname'])->where($map)->select(); @@ -332,10 +339,10 @@ class PromoteService { 'user_id' => $item['id'], 'user_account' => $item['account'], 'user_nickname' => $item['nickname'], - 'promote_id' => $fromPromote['id'], - 'promote_account' => $fromPromote['account'], - 'promote_id_to' => $toPromote['id'], - 'promote_account_to' => $toPromote['account'], + 'promote_id' => $fromPromote ? $fromPromote['id'] : 0, + 'promote_account' => $fromPromote ? $fromPromote['account'] : '官方渠道', + 'promote_id_to' => $toPromote ? $toPromote['id'] : 0, + 'promote_account_to' => $toPromote ? $toPromote['account'] : '官方渠道', 'remark' => '玩家迁移', 'create_time' => time(), 'op_id' => $createPromote['id'], @@ -355,8 +362,8 @@ class PromoteService { } $updateData = [ - 'promote_id' => $toPromote['id'], - 'promote_account' => $toPromote['account'] + 'promote_id' => $toPromote ? $toPromote['id'] : 0, + 'promote_account' => $toPromote ? $toPromote['account'] : '官方渠道' ]; $map = $otherMap = ['promote_id' => $fromPromote['id']]; @@ -834,6 +841,12 @@ class PromoteService { 'message' => '账号长度为6-15个字符', ]; } + if (!preg_match("/^[a-zA-Z0-9_\.]+$/", $account)) { + return [ + 'status' => false, + 'message' => '账号只能为数字，字母和下划线', + ]; + } if ($mobile == '') { return [ 'status' => false, diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 0b2b62e69..f7028dcd7 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -35,90 +35,6 @@ class DownloadController extends BaseController { 2 => '已汇款', ]; - public function downloadError($message) - { - $this->assign('message', $message); - $this->display('error'); - } - - public function index() - { - $code = I('code', ''); - $gameId = I('game_id', 0); - $promoteId = I('promote_id', 0); - - if ($code == '' && ($gameId == 0 || $promoteId == 0)) { - $this->redirect("download/downloadError", ['message' => '访问错误']); - } - - $blackList = []; - if (in_array($code, $blackList) || in_array('game_id/' . $gameId . '/promote_id/' . $promoteId, $blackList)) { - $this->redirect("download/downloadError", ['message' => '该链接已被禁']); - } - if ($code != '') { - $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; - $map['game_id'] = $gameId; - $map['promote_id'] = $promoteId; - $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(); - - if (Request::isMobile()) { - if (!Request::isAndroid() && $game['sdk_version'] == 1) { - $this->redirect("download/downloadError", ['message' => '请使用安卓浏览器下载']); - } - if (!Request::isIOS() && $game['sdk_version'] == 2) { - $this->redirect("download/downloadError", ['message' => '请使用ios浏览器下载']); - } - } - $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=" . Request::getHost() . "/" . $plistUrl); - } else { - $this->gotoPkgUrl($packageUrl); - } - } - - private function gotoPkgUrl($packageUrl) - { - 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 { - if (!file_exists($packageUrl)) { - $this->error('文件不存在哦，亲!'); - }else{ - redirect(Request::getHost() . ltrim($packageUrl, '.')); - } - } - } - /** * excel */ @@ -2804,13 +2720,5 @@ class DownloadController extends BaseController { } return $records; } - public function getLoginPromote() - { - if ($this->loginPromote == null) { - $promoteId = session('promote_auth.pid'); - $this->loginPromote = M('promote', 'tab_')->where(['id' => $promoteId])->find(); - } - return $this->loginPromote; - } } diff --git a/Application/Home/Controller/IndexController.class.php b/Application/Home/Controller/IndexController.class.php index f5e2133b5..7f311defd 100644 --- a/Application/Home/Controller/IndexController.class.php +++ b/Application/Home/Controller/IndexController.class.php @@ -283,4 +283,13 @@ class IndexController extends HomeController $this->assign('data', $data); $this->display(); } + + /** + * 退出登录 + */ + public function logout(){ + $Promote = new PromoteApi(); + $Promote->logout(); + redirect(U('Index/index')); + } } diff --git a/Application/Home/Controller/PackageController.class.php b/Application/Home/Controller/PackageController.class.php index f525419ad..5dc73aaa1 100644 --- a/Application/Home/Controller/PackageController.class.php +++ b/Application/Home/Controller/PackageController.class.php @@ -2,591 +2,104 @@ namespace Home\Controller; -use Qiniu\Storage\UploadManager; -use User\Api\UserApi as UserApi; -use OSS\OssClient; -use OSS\Core\OSsException; -use Qiniu\Storage\BucketManager; -use Qiniu\Auth; use Think\Controller; -use BaiduBce\BceClientConfigOptions; -use BaiduBce\Util\Time; -use BaiduBce\Util\MimeTypes; -use BaiduBce\Http\HttpHeaders; -use BaiduBce\Services\Bos\BosClient; -use BaiduBce\Services\Bos\CannedAcl; -use BaiduBce\Services\Bos\BosOptions; -use BaiduBce\Auth\SignOptions; -use BaiduBce\Log\LogFactory; use Think\Think; +use Base\Service\PromoteService; +use Base\Facade\Request; +use Base\Service\ApplyService; /** - * 后台首页控制器 - * - * @author 麦当苗儿 + * @author elf<360197197@qq.com> */ + class PackageController extends Controller { - - protected function _initialize() { C(api('Config/lists')); } - - public function package($applyId = 0) - { - if ($_POST['applyid']) { - $map['id'] = $_POST['applyid']; - } else { - $map['id'] = $applyId; - } - - $zip = new \ZipArchive(); - $find_web_stie = M('config')->field('value')->where(['name' => 'WEB_SITE'])->find(); - if (null == $find_web_stie) { - \Think\Log::record('请先到站点->网站设置->网站域名处设置官网域名'); - exit; - } - $apply_data = M('apply', 'tab_')->field('id,game_id,game_name,promote_id,promote_account,sdk_version')->where($map)->select(); - foreach ($apply_data as $key => $value) { - $game_so = M('Game_source', 'tab_')->field('id,source_version')->where(['game_id' => $value['game_id']])->find(); - if (!file_exists(get_game_source_file_url($value['game_id'])) || null == $game_so) { - M('apply', 'tab_')->where(['id' => $value['id']])->setField('enable_status', -1); - M('apply_launch', 'tab_')->where(['apply_id' => $value['id']])->setField('launch_packge', -1); - $this->ajaxReturn(['status' => 0, 'msg' => '原包不存在']); - continue; - } - M('apply', 'tab_')->where(['id' => $value['id']])->setField('enable_status', 3); - M('apply_launch', 'tab_')->where(['apply_id' => $value['id']])->save(['launch_packge' => 0, 'launch_down_url' => '', 'launch_plist_url' => '']); - 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; - copy(get_game_source_file_url($value['game_id']), ROOTTT . ltrim($to, './')); - $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); - @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) { - /*$cos = A('Cos'); - $cos -> cosupload("", "/" . $file_name . "/" . $newname, 2); - $cos_res = $cos -> cosupload(ROOTTT . ltrim($to, './'), "/" . $file_name . "/" . $newname); - if (strlen($cos_res) > 10) { - @unlink(ROOTTT . ltrim($to, './')); - $to = $cos_res; - - } else { - $this -> error("Cos参数错误", U('ios_lists')); - }*/ - - - $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) { - - $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); - } - M('apply_launch', 'tab_')->where(['apply_id' => $value['id']])->save(['launch_packge' => 2]); - $jieguo = $this->updateinfo($value['id'], $to, $promote, $plist_url); - - $this->ajaxReturn(['status' => 1, 'msg' => '成功']); - } - } - - } - - - /** - *修改申请信息 - */ - public function updateinfo($id, $pack_url, $promote, $plist_url) - { - $model = M('Apply', "tab_"); - $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']; - $data['dow_status'] = 1; - $data['enable_status'] = 3; - $data['dispose_id'] = UID; - $data['dispose_time'] = NOW_TIME; - $data['plist_url'] = $plist_url; - $res = $model->save($data); - return $res; - } - - - //生成游戏渠道plist文件 - public function create_plist($game_id = 0, $promote_id = 0, $marking = "", $url = "") - { - $find_web_stie = M('config')->field('value')->where(['name' => 'WEB_SITE'])->find(); - $xml = new \DOMDocument(); - $xml->load(ROOTTT . 'Uploads/Plist/testdemo.Plist'); - $online = $xml->getElementsByTagName('dict');//查找节点 - $asd = $online->item(1)->getElementsByTagName('string');//第二个节点下所有string - foreach ($asd as $key => $value) { - switch ($value->textContent) { - case 'ipa_url': - if (preg_match("/Uploads/", $url)) { - $value->nodeValue = "https://" . $find_web_stie['value'] . ltrim($url, ".");//"https://iosdemo.vlcms.com/app/MCHSecretary.ipa";//替换xml对应的值 - } else { - $value->nodeValue = $url; - } - break; - case 'icon': - $value->nodeValue = "https://" . $find_web_stie['value'] . get_cover(get_game_icon_id($game_id), 'path', 2);; - break; - case 'com.dell': - $value->nodeValue = $marking; - break; - case '1.0.0': - $value->nodeValue = game_version($game_id); - break; - case 'mchdemo': - $value->nodeValue = get_ios_game_name($game_id); - break; - - } - if ($promote_id == 0) { - $xml->save(ROOTTT . "Uploads/SourcePlist/$game_id.Plist"); - } else { - $pname = $game_id . "-" . $promote_id; - $xml->save(ROOTTT . "Uploads/GamePlist/$pname.Plist"); - } - } - if ($promote_id == 0) { - return "./Uploads/SourcePlist/$game_id.Plist"; - } else { - return "./Uploads/GamePlist/$pname.Plist"; - } - - - } - - - public function qiniu_ios_upload($promote_id, $game_id) - { - if (get_tool_status("qiniu_storage") == 1) { - $map['channelid'] = $promote_id; - $map['game_id'] = $game_id; - $find = M('iospacket')->where($map)->find(); - if (file_exists("./Uploads/Ios/" . $find['channelpath']) && !empty($find['channelpath'])) { - $newname = "game_package" . $find["game_id"] . "-" . $find['channelid'] . ".ipa"; - $to = "./Uploads/Ios/" . $find['channelpath']; - $this->dleteQiNiuFile($newname); - $url = $this->upQiNiuFile($newname, $to); - if (empty($url)) { - $this->error('七牛错误，请检查七牛配置，并确保七牛空间权限正确！'); - } - unset($map['channelid']); - $map['promote_id'] = $promote_id; - $data['pack_url'] = $url; - $result = M('apply', 'tab_')->where($map)->save($data); - if ($result !== false) { - @unlink($to); - $this->AjaxReturn(['status' => 1, 'msg' => '上传成功']); - } else { - $this->AjaxReturn(['status' => 0, 'msg' => '上传失败']); - } - } else { - $this->AjaxReturn(['status' => 0, 'msg' => '文件不存在或已上传云空间']); - } - } else { - $this->AjaxReturn(['status' => 0, 'msg' => '未开启七牛上传']); - } - } - - - /** - *上传到OSS - */ - public function upload_game_pak_oss($return_data = null) + public function downloadError($message) { - /** - * 根据Config配置，得到一个OssClient实例 - */ - try { - Vendor('OSS.autoload'); - $ossClient = new \OSS\OssClient(C("oss_storage.accesskeyid"), C("oss_storage.accesskeysecr"), C("oss_storage.domain")); - } catch (OssException $e) { - $this->error($e->getMessage()); - } - $bucket = C('oss_storage.bucket'); - // if(preg_match('/.apk/',$return_data['savename']) ){ - $oss_name = "GamePack"; - // }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); - return true; - } catch (OssException $e) { - /* 返回JSON数据 */ - $this->error($e->getMessage()); - } + $this->assign('message', $message); + $this->display('error'); } - /** - *删除OSS - */ - public function delete_oss($objectname) + public function download() { - /** - * 根据Config配置，得到一个OssClient实例 - */ - try { - Vendor('OSS.autoload'); - $ossClient = new \OSS\OssClient(C("oss_storage.accesskeyid"), C("oss_storage.accesskeysecr"), C("oss_storage.domain")); - } catch (OssException $e) { - $this->error($e->getMessage()); - } - $bucket = C('oss_storage.bucket'); - $objectname = "GamePack/" . $objectname; - $ossClient->deleteObject($bucket, $objectname); - - } + $code = I('code', ''); + $gameId = I('game_id', 0); + $promoteId = I('promote_id', 0); - /** - *上传到BOS - */ - public function upload_bos($return_data = null) - { - /** - * 根据Config配置，得到一个OssClient实例 - */ - try { - $BOS_TEST_CONFIG = - array( - 'credentials' => array( - 'accessKeyId' => C("bos_storage.AccessKey"), - 'secretAccessKey' => C("bos_storage.SecretKey"), - ), - 'endpoint' => C("bos_storage.domain"), - ); - require VENDOR_PATH . 'BOS/BaiduBce.phar'; - $client = new BosClient($BOS_TEST_CONFIG); - } catch (Exception $e) { - $this->error($e->getMessage()); + if ($code == '' && ($gameId == 0 || $promoteId == 0)) { + $this->redirect("download/downloadError", ['message' => '访问错误']); } - $bucket = C('bos_storage.bucket'); - $bos_file_path = "GamePack/" . $return_data["savename"]; //在bos的路径 - $avatar = $return_data["path"]; - try { - $client->putObjectFromFile($bucket, $bos_file_path, $avatar); - } catch (Exception $e) { - $this->error($e->getMessage()); + $blackList = []; + if (in_array($code, $blackList) || in_array('game_id/' . $gameId . '/promote_id/' . $promoteId, $blackList)) { + $this->redirect("download/downloadError", ['message' => '该链接已被禁']); } - - } - - - /* - 删除bos的object - */ - public function delete_bos($name) - { - /** - * 根据Config配置，得到一个OssClient实例 - */ - try { - $BOS_TEST_CONFIG = - array( - 'credentials' => array( - 'accessKeyId' => C("bos_storage.AccessKey"), - 'secretAccessKey' => C("bos_storage.SecretKey"), - ), - 'endpoint' => C("bos_storage.domain"), - ); - require VENDOR_PATH . 'BOS/BaiduBce.phar'; - $client = new BosClient($BOS_TEST_CONFIG); - } catch (Exception $e) { - $this->error($e->getMessage()); - } - $bucket = C('bos_storage.bucket'); - //$path ="icon/". $name; //在bos的路径 - $path = "GamePack/" . $name; - $client->deleteObject($bucket, $path); - - - } - - - public function game_source($game_id, $type) - { - $model = D('GameSource'); - $map['game_id'] = $game_id; - $map['type'] = $type; - $data = $model->where($map)->find(); - return $data; - } - - public function multiuploadFile($ossClient, $bucket, $url, $file) - { - //$file = __FILE__; - $options = array(); - try { - #初始化分片上传文件 - $uploadId = $ossClient->initiateMultipartUpload($bucket, $url); - //$ossClient->multiuploadFile($bucket, $url, $file, $options); - } catch (OssException $e) { - printf(__FUNCTION__ . ": initiateMultipartUpload FAILED\n"); - printf($e->getMessage() . "\n"); - return; - } - /* - * step 2. 上传分片 - */ - $partSize = 5 * 1000 * 1024; - $uploadFile = $file; - $uploadFileSize = filesize($uploadFile); - $pieces = $ossClient->generateMultiuploadParts($uploadFileSize, $partSize); - $responseUploadPart = array(); - $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 = array( - $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 = \OSS\Core\OssUtil::getMd5SumForFile($uploadFile, $fromPos, $toPos); - $upOptions[$ossClient::OSS_CONTENT_MD5] = $contentMd5; + if ($code != '') { + $applyService = new ApplyService(); + $data = $applyService->decodeApplyCode($code); + $result = $applyService->checkApplyCode($data, ApplyService::ENCRYPT_TYPE_DOWNLOAD); + if (!$result['status']) { + $this->error($result['message']); } - //2. 将每一分片上传到OSS - try { - $responseUploadPart[] = $ossClient->uploadPart($bucket, $url, $uploadId, $upOptions); - } catch (OssException $e) { - printf(__FUNCTION__ . ": initiateMultipartUpload, uploadPart - part#{$i} FAILED\n"); - printf($e->getMessage() . "\n"); - return; + + $gameId = $data['game_id']; + $promoteId = $data['promote_id']; + } + + $map = []; + $map['status'] = 1; + $map['enable_status'] = 1; + $map['game_id'] = $gameId; + $map['promote_id'] = $promoteId; + $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(); + + if (Request::isMobile()) { + if (!Request::isAndroid() && $game['sdk_version'] == 1) { + $this->redirect("download/downloadError", ['message' => '请使用安卓浏览器下载']); + } + if (!Request::isIOS() && $game['sdk_version'] == 2) { + $this->redirect("download/downloadError", ['message' => '请使用ios浏览器下载']); } } - $uploadParts = array(); - foreach ($responseUploadPart as $i => $eTag) { - $uploadParts[] = array( - 'PartNumber' => ($i + 1), - 'ETag' => $eTag, - ); - } - /** - * step 3. 完成上传 - */ - try { - $ossClient->completeMultipartUpload($bucket, $url, $uploadId, $uploadParts); - } catch (OssException $e) { - printf(__FUNCTION__ . ": completeMultipartUpload FAILED\n"); - printf($e->getMessage() . "\n"); - return; - } - } - - /** - * 获取七牛上传token - */ - public function getQiNiuToken() - { - $this->dleteQiNiuFile($_REQUEST['key']); - Vendor('Qiniu.autoload'); - $config = C('qiniu_storage'); - $accessKey = $config['AccessKey']; - $secretKey = $config['SecretKey']; - $Qiniu = new Auth($accessKey, $secretKey); - $bucket = $config['bucket']; - //定义上传后返回客户端的值 - $policy = array( - 'returnBody' => '{"name":$(fname),"size":$(fsize),"key":$(key)}', - ); - //生成上传token - $result['uptoken'] = $Qiniu->uploadToken($bucket, null, 3600, $policy); - $this->ajaxReturn($result); - } - - /** - * 删除七牛空间文件 - * - * @param $key - * - * @return mixed - */ - public function dleteQiNiuFile($key) - { - Vendor('Qiniu.autoload'); - $config = C('qiniu_storage'); - $accessKey = $config['AccessKey']; - $secretKey = $config['SecretKey']; - $auth = new Auth($accessKey, $secretKey); - //初始化BucketManager - $bucketMgr = new BucketManager($auth); - $bucket = C('qiniu_storage.bucket'); - $res = $bucketMgr->delete($bucket, $key); - return $res; - } - - /** - * 七牛上传 - * - * @param $newName 上传到七牛的文件名称 - * @param $filePath 文件路径 - */ - public function upQiNiuFile($newName, $filePath) - { - Vendor('Qiniu.autoload'); - //读取七牛配置 - $config = C('qiniu_storage'); - $accessKey = $config['AccessKey']; - $secretKey = $config['SecretKey']; - //实例化鉴权对象 - $auth = new Auth($accessKey, $secretKey); - $bucket = $config['bucket']; - //生成token - $token = $auth->uploadToken($bucket); - //实例化上传类 - $uploadMgr = new UploadManager(); - //上传附件 - list($ret, $err) = $uploadMgr->putFile($token, $newName, $filePath); - if ($ret) { - - return $url = $config['domain'] . '/' . $newName; + $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=" . Request::getHost() . "/" . $plistUrl); } else { - return ''; + $this->gotoPkgUrl($packageUrl); } } - - /** - * 腾讯云上传 - * - * @param null $data - * - * @return mixed - * - * @author: 鹿文学[lwx] - * @since: 2019\4\18 0018 17:40 - */ - public function upload_cos($data = null) + private function gotoPkgUrl($packageUrl) { - - Vendor('COS5.vendor.autoload'); - - $schema = C("cos_storage.schema") ?: "https"; - - $secretId = C("cos_storage.SecretId"); //"云 API 密钥 SecretId"; - $secretKey = C("cos_storage.SecretKey"); //"云 API 密钥 SecretKey"; - $region = C("cos_storage.domain"); //设置一个默认的存储桶地域 - $cosClient = new \Qcloud\Cos\Client( - array( - 'region' => $region, - 'schema' => $schema, //协议头部，默认为http - 'credentials' => array( - 'secretId' => $secretId, - 'secretKey' => $secretKey - ) - ) - ); - - - $bucket = C("cos_storage.bucket"); //存储桶名称 格式：BucketName-APPID - $key = $data['savename']; - $srcPath = $data["path"];//本地文件绝对路径 - - try { - $result = $cosClient->Upload( - $bucket = $bucket, - $key = $key, - $body = fopen($srcPath, 'rb') - ); - return $result['Location']; - } catch (\Exception $e) { - $this->error($e); + 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 { + if (!file_exists($packageUrl)) { + $this->error('文件不存在哦，亲!'); + }else{ + redirect(Request::getHost() . ltrim($packageUrl, '.')); + } } - } - - } diff --git a/Application/Home/View/default/Index/index.html b/Application/Home/View/default/Index/index.html index 8977216aa..0177ed378 100644 --- a/Application/Home/View/default/Index/index.html +++ b/Application/Home/View/default/Index/index.html @@ -155,7 +155,7 @@ */ $.validator.addMethod("numOrLetter", function(value, element) { return this.optional(element) || /^[a-zA-Z0-9_\.]+$/.test(value); - }, '只能是字母或数字'); + }, '只能是字母或数字或下划线'); // 登录验证 $("#loginForm").validate({ diff --git a/Application/Home/View/default/Public/promote_base.html b/Application/Home/View/default/Public/promote_base.html index 47a40a8c0..0c2687b6f 100644 --- a/Application/Home/View/default/Public/promote_base.html +++ b/Application/Home/View/default/Public/promote_base.html @@ -148,7 +148,7 @@
今天是： 您好！{:session('promote_auth.account')} - +
diff --git a/Application/User/Api/PromoteApi.class.php b/Application/User/Api/PromoteApi.class.php index d57581935..e527967fc 100644 --- a/Application/User/Api/PromoteApi.class.php +++ b/Application/User/Api/PromoteApi.class.php @@ -76,6 +76,13 @@ class PromoteApi extends Api{ public function login($username, $password){ return $this->model->login($username, $password); } + + /** + * 退出登录 + */ + public function logout(){ + $this->model->logout(); + } /** *添加推广员