From 1be6450d5a4450650666f5a63edf710153bf9ea1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Thu, 18 Nov 2021 19:41:58 +0800 Subject: [PATCH] NRank merge to Rank --- doc/NRank.py | 42 --------- doc/Rank.py | 33 +++++++ webapp/controller/NRankController.class.php | 96 --------------------- webapp/controller/RankController.class.php | 84 ++++++++++++++++++ webapp/index.php | 1 + 5 files changed, 118 insertions(+), 138 deletions(-) delete mode 100644 doc/NRank.py delete mode 100644 webapp/controller/NRankController.class.php diff --git a/doc/NRank.py b/doc/NRank.py deleted file mode 100644 index 72db2d81..00000000 --- a/doc/NRank.py +++ /dev/null @@ -1,42 +0,0 @@ -# -*- coding: utf-8 -*- - -import _common - -class NRank(object): - - def __init__(self): - self.apis = [ - { - 'desc': 'getGunInfo', - 'group': 'NRank', - 'url': 'webapp/index.php?c=NRank&a=getGunInfo', - 'params': [ - _common.ReqHead(), - ], - 'response': [ - _common.RspHead(), - ] - }, - { - 'desc': 'getRankInfo', - 'group': 'NRank', - 'url': 'webapp/index.php?c=NRank&a=getRankInfo', - 'params': [ - _common.ReqHead(), - ], - 'response': [ - _common.RspHead(), - ] - }, - { - 'desc': 'mailTest', - 'group': 'NRank', - 'url': 'webapp/index.php?c=NRank&a=mailTest', - 'params': [ - _common.ReqHead(), - ], - 'response': [ - _common.RspHead(), - ] - }, - ] diff --git a/doc/Rank.py b/doc/Rank.py index 27ac5722..c1cd0dac 100644 --- a/doc/Rank.py +++ b/doc/Rank.py @@ -17,4 +17,37 @@ class Rank(object): _common.RspHead(), ] }, + { + 'desc': 'getGunInfo', + 'group': 'NRank', + 'url': 'webapp/index.php?c=NRank&a=getGunInfo', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ] + }, + { + 'desc': 'getRankInfo', + 'group': 'NRank', + 'url': 'webapp/index.php?c=NRank&a=getRankInfo', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ] + }, + { + 'desc': 'mailTest', + 'group': 'NRank', + 'url': 'webapp/index.php?c=NRank&a=mailTest', + 'params': [ + _common.ReqHead(), + ], + 'response': [ + _common.RspHead(), + ] + }, ] diff --git a/webapp/controller/NRankController.class.php b/webapp/controller/NRankController.class.php deleted file mode 100644 index a9d3c3c5..00000000 --- a/webapp/controller/NRankController.class.php +++ /dev/null @@ -1,96 +0,0 @@ -getMysql($account_id); - $sqlStr = "SELECT * FROM gun_intensify WHERE accountid=:accountid; "; - $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - $this->sendDataToClient(0,"test02",$row); - } - public function getRankInfo() - { - - $account_id = $_REQUEST['account_id']; - $conn = $this->getMysql($account_id); - - - $killResultArr = array(); - $rankPointArr = array(); - //获得自己的击杀排行榜 - $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,kills,win_times FROM user WHERE accountid=:accountid"; - $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) - { - array_push($killResultArr,$row[0]); - } - //击杀排行榜 - $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,kills,win_times FROM user order by win_times desc limit 50"; - $row = $conn->execQuery($sqlStr); - if($row) { - $len = count($row); - for($i = 0 ; $i < $len ; $i ++) - { - array_push($killResultArr,$row[$i]); - } - } - //获得自己的排位积分 - $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,integral FROM user WHERE accountid=:accountid"; - $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); - if($row) - { - array_push($rankPointArr,$row[0]); - } - //积分排行榜 - $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,integral FROM user order by integral desc limit 50"; - $row = $conn->execQuery($sqlStr); - if($row) { - $len = count($row); - for($i = 0 ; $i < $len ; $i ++) - { - array_push($rankPointArr,$row[$i]); - } - } - //好友排行榜 - - $resultData = array(); - array_push($resultData,$killResultArr); - array_push($resultData,$rankPointArr); - - - - - $this->sendDataToClient(100,"getRankInfo",$resultData); - } - public function mailTest() - { - $url = ''; - $account_id = $_REQUEST['account_id']; - - if (SERVER_ENV == _ONLINE) { - $url = 'https://gamemail.kingsome.cn/webapp/index.php?c=MailMgr&a=sendMail&'; - } else { - $url = 'https://gamemail-test.kingsome.cn/webapp/index.php?c=MailMgr&a=sendMail&'; - } - $params = array( - 'gameid' => "1234", - 'to' => $account_id, - 'from' => $account_id, - 'mailsubtype'=>12, - 'content'=>"采蘑菇的小朋友", - 'subject'=>"皮卡猪", - "attachments"=>"1001:10|1002:20", - "ext"=>"10" - ); - if (!phpcommon\HttpClient::get($url, $params, $response)) { - phpcommon\sendError(ERR_RETRY, '系统繁忙'); - return; - } - $data = json_decode($response, true); - //error_log("邮件测试=====".json_encode($data)); - $this->sendDataToClient(100,"MailTest",$data); - } - -} \ No newline at end of file diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index 5bad7a97..1058cea0 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -271,4 +271,88 @@ class RankController extends BaseAuthedController { 'integral_list' => $integral_list, )); } + + public function getRankInfo() + { + + $account_id = $_REQUEST['account_id']; + $conn = $this->getMysql($account_id); + + + $killResultArr = array(); + $rankPointArr = array(); + //获得自己的击杀排行榜 + $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,kills,win_times FROM user WHERE accountid=:accountid"; + $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); + if($row) + { + array_push($killResultArr,$row[0]); + } + //击杀排行榜 + $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,kills,win_times FROM user order by win_times desc limit 50"; + $row = $conn->execQuery($sqlStr); + if($row) { + $len = count($row); + for($i = 0 ; $i < $len ; $i ++) + { + array_push($killResultArr,$row[$i]); + } + } + //获得自己的排位积分 + $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,integral FROM user WHERE accountid=:accountid"; + $row = $conn->execQuery($sqlStr,array(':accountid' => $account_id)); + if($row) + { + array_push($rankPointArr,$row[0]); + } + //积分排行榜 + $sqlStr = "SELECT accountid,user_name,hi_id,head_kuang_id,integral FROM user order by integral desc limit 50"; + $row = $conn->execQuery($sqlStr); + if($row) { + $len = count($row); + for($i = 0 ; $i < $len ; $i ++) + { + array_push($rankPointArr,$row[$i]); + } + } + //好友排行榜 + + $resultData = array(); + array_push($resultData,$killResultArr); + array_push($resultData,$rankPointArr); + + + + + $this->sendDataToClient(100,"getRankInfo",$resultData); + } + public function mailTest() + { + $url = ''; + $account_id = $_REQUEST['account_id']; + + if (SERVER_ENV == _ONLINE) { + $url = 'https://gamemail.kingsome.cn/webapp/index.php?c=MailMgr&a=sendMail&'; + } else { + $url = 'https://gamemail-test.kingsome.cn/webapp/index.php?c=MailMgr&a=sendMail&'; + } + $params = array( + 'gameid' => "1234", + 'to' => $account_id, + 'from' => $account_id, + 'mailsubtype'=>12, + 'content'=>"采蘑菇的小朋友", + 'subject'=>"皮卡猪", + "attachments"=>"1001:10|1002:20", + "ext"=>"10" + ); + if (!phpcommon\HttpClient::get($url, $params, $response)) { + phpcommon\sendError(ERR_RETRY, '系统繁忙'); + return; + } + $data = json_decode($response, true); + //error_log("邮件测试=====".json_encode($data)); + $this->sendDataToClient(100,"MailTest",$data); + } + } diff --git a/webapp/index.php b/webapp/index.php index 058b65f4..ed9f4ff7 100644 --- a/webapp/index.php +++ b/webapp/index.php @@ -29,6 +29,7 @@ $rewriteRule = array( 'NBag' => 'Bag', 'NHero' => 'Hero', 'NPlayer' => 'NPlayerInfo', + 'NRank' => 'Rank', ); function getRewriteClass($oldC)