立即下载
- 进入网站
+ 进入网站
- 
+
您所访问的页面不存在！
+ + diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 2fbc5ad0e..7b72d7699 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -117,7 +117,7 @@ class PromoteController extends ThinkController $row = 10; } - if (I('oa_associated', -1) != -1) { + if (I('oa_associated', -1) != -1 && false) { $map['oa_associated'] = I('oa_associated'); $oa_data = []; for ($i = 1; $i > 0; $i++) { @@ -170,7 +170,7 @@ class PromoteController extends ThinkController $list_data = M()->table("(".$list_data.") a")->field("a.*,pr.account top_account")->join("tab_promote pr on a.top_id = pr.id")->select(); $list_data = D(self::model_name)->parseListData($list_data); $oa_data = []; - if (I('oa_associated', -1) == -1) { + if (I('oa_associated', -1) == -1 && false) { foreach ($list_data as $k => $v) { // $list_data[$k]['account'] = trim($v['account']); // if($v['oa_associated'] != 1) { diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 1abd428b4..58be63d50 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -322,7 +322,7 @@ class UserController extends AdminController $this->error($this->showRegError($uid)); } } else { - $list = D('AuthGroup')->where(array('status' => 1))->select(); + $list = M('auth_group', 'sys_')->where(array('status' => 1))->select(); $this->assign('lists', $list); $this->meta_title = '新增管理员'; @@ -504,7 +504,7 @@ class UserController extends AdminController $au = D('AuthGroupAccess')->where(array('uid' => $_GET['id']))->find(); $this->assign("authid", $au["group_id"]); $this->assign("houtai", $au["houtai"]); - $list = D('AuthGroup')->where(array('status' => 1))->select(); + $list = M('auth_group', 'sys_')->where(array('status' => 1))->select(); $username = $_POST['username']; $password = $_POST['password']; $this->assign('lists', $list); @@ -894,4 +894,4 @@ class UserController extends AdminController $service->delete($id); $this->success('删除成功'); } -} \ No newline at end of file +} diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index b6923273d..c5404934c 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -119,9 +119,9 @@ class SourceEvent extends Controller $result = $gameSourceService->sourcePack($data, $game, $game_source); if (!$result['status']) { if ($from == "dev") { - $this->error('修改失败', U('Developers/source')); + $this->error('修改失败,' . $result['message'], U('Developers/source')); } else { - $this->error('修改失败', U('GameSource/lists')); + $this->error('修改失败,' . $result['message'], U('GameSource/lists')); } } $data['plist_url'] = $result['data']['plistUrl']; @@ -166,9 +166,9 @@ class SourceEvent extends Controller } } else { if ($from == "dev") { - $this->error('修改失败', U('Developers/source')); + $this->error('修改失败,' . $result['message'], U('Developers/source')); } else { - $this->error('修改失败', U('GameSource/lists')); + $this->error('修改失败,' . $result['message'], U('GameSource/lists')); } } diff --git a/Application/Common/Api/GameApi.class.php b/Application/Common/Api/GameApi.class.php index 93af900b8..b043323dc 100644 --- a/Application/Common/Api/GameApi.class.php +++ b/Application/Common/Api/GameApi.class.php @@ -98,13 +98,20 @@ class GameApi { protected function post($param,$url){ $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); + $this->logApi('url: ' . $url); curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($param)); + $this->logApi('request: ' . http_build_query($param)); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);//要求结果为字符串且输出到屏幕上 curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 3);//设置等待时间 $data = curl_exec($ch); + $this->logApi('response: ' . $data); curl_close($ch); return $data; } -} \ No newline at end of file + public function logApi($message, $level = 'info') { + $destination = C('LOG_PATH'). 'game_api/' . date('y_m_d').'.log'; + \Think\Log::write($message, $level, '', $destination); + } +} diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php index 3474f3f40..9c05f4db1 100644 --- a/Application/Common/Common/extend.php +++ b/Application/Common/Common/extend.php @@ -3067,6 +3067,8 @@ function getHideAccount($account) function getUserAccountOfPromote($account, $promote = null) { + return $account; + if ($promote && $promote['level'] == 1) { return $account; } @@ -3100,4 +3102,4 @@ function hidePromoteAccount($account) { $hideChar .= '*'; } return substr($account, 0, $strLen) . $hideChar . substr($account, $orderLen - $strLen); -} \ No newline at end of file +} diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index f9b2a88ef..3e31a3eb5 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -208,6 +208,10 @@ class HomeController extends Controller $this->error('该链接已失效'); } + if (in_array($gameId, [277, 278])) { + $this->error('该游戏链接已失效'); + } + $promoteService = new PromoteService(); if (!$promoteService->checkPromoteLimitRule($promote)) { $this->error('链接已失效'); @@ -321,6 +325,9 @@ class HomeController extends Controller if(in_array($game['id'], [191, 192])) { $game['relation_game_name'] = '九灵神域'; } + if(in_array($game['id'], [282, 283])) { + $game['relation_game_name'] = '逍遥官老爷'; + } $this->assign("serviceQQ", $serviceQQ); $this->assign('isNewIos', $isNewIos); diff --git a/async-plist.sh b/async-plist.sh new file mode 100755 index 000000000..0a301735f --- /dev/null +++ b/async-plist.sh @@ -0,0 +1,5 @@ +#/bin/bash +rsync -avz root@8.136.139.249:/var/www/windh5-qy/platform/Uploads/GamePlist /var/www/platform_qy/platform/Uploads/; +rsync -avz root@8.136.139.249:/var/www/windh5-qy/platform/Uploads/OrgSourcePlist /var/www/platform_qy/platform/Uploads/; +rsync -avz root@8.136.139.249:/var/www/windh5-qy/platform/Uploads/SourcePlist /var/www/platform_qy/platform/Uploads/; +chown -R www:www /var/www/platform_qy/platform/Uploads; diff --git a/cms.log b/cms.log new file mode 100644 index 000000000..6379b67d9 --- /dev/null +++ b/cms.log @@ -0,0 +1,8 @@ +2022-02-08 22:19:07----------------------市场结算管理计算---------------------- +日期:2022-01,游戏:权谋天下,推广员:paifu16 +市场员：133 推广员：4307 公司id：185 游戏关联id：273 支付时间：2022-01 金额：18928.00 +日期:2022-01,游戏:权谋天下,推广员:qiaosheng2021 +市场员：133 推广员：4316 公司id：186 游戏关联id：273 支付时间：2022-01 金额：227666.00 +日期:2022-01,游戏:权谋天下,推广员:dgq2021 +市场员：133 推广员：4349 公司id：199 游戏关联id：273 支付时间：2022-01 金额：102.00 +2022-02-08 22:19:08----------------------市场结算管理计算---------------------- diff --git a/init.sh b/init.sh old mode 100644 new mode 100755 diff --git a/poster.html b/poster.html index 83d4311c6..93c49555b 100644 --- a/poster.html +++ b/poster.html @@ -117,9 +117,9 @@ @@ -155,4 +155,4 @@ }