diff --git a/webapp/classes/AddReward.php b/webapp/classes/AddReward.php index 2186db7..3da4bc3 100644 --- a/webapp/classes/AddReward.php +++ b/webapp/classes/AddReward.php @@ -13,7 +13,7 @@ class AddReward { 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/classes/Quest.php b/webapp/classes/Quest.php index ec766cd..6c726dc 100644 --- a/webapp/classes/Quest.php +++ b/webapp/classes/Quest.php @@ -14,7 +14,7 @@ class Quest{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index 52c83ef..f2ce5e2 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -13,7 +13,7 @@ class ActivityController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -114,7 +114,7 @@ class ActivityController{ return; } - $draw_uuid = 'game2001api_draw_uuid:' . md5($_REQUEST['account_id']); + $draw_uuid = 'game2004api_draw_uuid:' . md5($_REQUEST['account_id']); $draw_list = array(); $r = $this->getRedis($draw_uuid); if (!$r) { @@ -421,7 +421,7 @@ class ActivityController{ return; } - $randreward_uuid = 'game2001api_randreward_uuid:' . md5($_REQUEST['account_id']); + $randreward_uuid = 'game2004api_randreward_uuid:' . md5($_REQUEST['account_id']); $randreward_list = array(); $r = $this->getRedis($randreward_uuid); $user_db_str = $r->get($randreward_uuid); @@ -563,7 +563,7 @@ class ActivityController{ phpcommon\sendError(ERR_USER_BASE + 2, '今日开箱子次数已用完'); return; } - $airReward_uuid = 'game2001api_airReward_uuid:' . md5($_REQUEST['account_id']); + $airReward_uuid = 'game2004api_airReward_uuid:' . md5($_REQUEST['account_id']); $airReward_list = array(); $r = $this->getRedis($airReward_uuid); if (!$r) { @@ -625,7 +625,7 @@ class ActivityController{ phpcommon\sendError(ERR_USER_BASE + 1, 'session无效'); return; } - $airReward_uuid = 'game2001api_airReward_uuid:' . md5($_REQUEST['account_id']); + $airReward_uuid = 'game2004api_airReward_uuid:' . md5($_REQUEST['account_id']); $airReward_list = array(); $r = $this->getRedis($airReward_uuid); if (!$r) { @@ -773,7 +773,7 @@ class ActivityController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . 1 + 'dbname' => 'gamedb2004_' . 1 )); return $conn; } diff --git a/webapp/controller/EmojiController.class.php b/webapp/controller/EmojiController.class.php index 5621b2c..1056d95 100644 --- a/webapp/controller/EmojiController.class.php +++ b/webapp/controller/EmojiController.class.php @@ -13,7 +13,7 @@ class EmojiController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php index 30d6ca2..c8027b6 100644 --- a/webapp/controller/EquipController.class.php +++ b/webapp/controller/EquipController.class.php @@ -12,7 +12,7 @@ class EquipController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/HangController.class.php b/webapp/controller/HangController.class.php index f722a3e..1d489fb 100644 --- a/webapp/controller/HangController.class.php +++ b/webapp/controller/HangController.class.php @@ -10,7 +10,7 @@ class HangController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index be59900..9ea457c 100644 --- a/webapp/controller/PassController.class.php +++ b/webapp/controller/PassController.class.php @@ -13,7 +13,7 @@ class PassController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php index acf78e6..20a1051 100644 --- a/webapp/controller/PayController.class.php +++ b/webapp/controller/PayController.class.php @@ -13,7 +13,7 @@ class PayController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -506,7 +506,7 @@ class PayController{ $params['timestamp'] = $timestamp; $iv = '1dd2f605f4f8496b'; $key = 'c868a478c81ff3c168b35d703f787d3c'; - $str_encoded = '2001_' . base64_encode(phpcommon\aesEncrypt(json_encode($params), $iv, $key)); + $str_encoded = '2004_' . base64_encode(phpcommon\aesEncrypt(json_encode($params), $iv, $key)); echo json_encode(array( 'errcode' => 0, 'errmsg'=> '', diff --git a/webapp/controller/PayNotifyController.class.php b/webapp/controller/PayNotifyController.class.php index 50b767c..69ddbaf 100644 --- a/webapp/controller/PayNotifyController.class.php +++ b/webapp/controller/PayNotifyController.class.php @@ -12,7 +12,7 @@ class PayNotifyController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -100,7 +100,7 @@ class PayNotifyController{ ); $sign = phpcommon\md5Sign($params, 'fc38349c5d084e920925e614c420be9f', $_REQUEST['timestamp']); if ($sign != $_REQUEST['sign']) { - error_log('game2001api payNotify sign error:' + json_encode($_REQUEST)); + error_log('game2004api payNotify sign error:' + json_encode($_REQUEST)); echo json_encode(array( 'errcode' => 1, 'errmsg'=> '签名校验失败' diff --git a/webapp/controller/QuestController.class.php b/webapp/controller/QuestController.class.php index 6165785..04a021b 100644 --- a/webapp/controller/QuestController.class.php +++ b/webapp/controller/QuestController.class.php @@ -13,7 +13,7 @@ class QuestController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index 419cd8b..3b65194 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -10,14 +10,14 @@ class RankController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } protected function getRedis() { - $key = 'game2001api'; + $key = 'game2004api'; $redis_conf = getRedisConfig($key); $r = new phpcommon\Redis(array( 'host' => $redis_conf['host'], @@ -115,7 +115,7 @@ class RankController{ //击杀榜 $r = $this->getRedis(); $channel = phpcommon\extractChannel($account_id); - $kill_rank_db = $r->get("game2001api:kill_rank_" . $channel); + $kill_rank_db = $r->get("game2004api:kill_rank_" . $channel); $kill_db = json_decode($kill_rank_db); $i = 0; foreach ($kill_db as $kill) { @@ -165,7 +165,7 @@ class RankController{ //胜场榜 $channel = phpcommon\extractChannel($account_id); - $win_rank_db = $r->get("game2001api:win_rank_" . $channel); + $win_rank_db = $r->get("game2004api:win_rank_" . $channel); $win_db = json_decode($win_rank_db); $i = 0; foreach ($win_db as $win) { @@ -214,7 +214,7 @@ class RankController{ //积分榜 $channel = phpcommon\extractChannel($account_id); - $integral_rank_db = $r->get("game2001api:integral_rank_" . $channel); + $integral_rank_db = $r->get("game2004api:integral_rank_" . $channel); $integral_db = json_decode($integral_rank_db); $i = 0; foreach ($integral_db as $integral) { diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index 907e4d5..687d785 100644 --- a/webapp/controller/RoleController.class.php +++ b/webapp/controller/RoleController.class.php @@ -13,7 +13,7 @@ class RoleController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -857,7 +857,7 @@ class RoleController{ die(); return; } - $switch_uuid = 'game2001api_switch:' . $account_id; + $switch_uuid = 'game2004api_switch:' . $account_id; $r -> set($switch_uuid, $switch_id); $r -> pexpire($switch_uuid, 1000 * 3600 * 24); @@ -870,7 +870,7 @@ class RoleController{ die(); return; } - $switch_uuid = 'game2001api_switch:' . $account_id; + $switch_uuid = 'game2004api_switch:' . $account_id; $user_db_str = $r->get($switch_uuid); $switch = json_decode($user_db_str, true); return $switch; diff --git a/webapp/controller/ServerSwitchController.class.php b/webapp/controller/ServerSwitchController.class.php index a7f71f9..5118bc3 100644 --- a/webapp/controller/ServerSwitchController.class.php +++ b/webapp/controller/ServerSwitchController.class.php @@ -10,7 +10,7 @@ class ServerSwitchController { 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ShareController.class.php b/webapp/controller/ShareController.class.php index e7126cd..caafed2 100644 --- a/webapp/controller/ShareController.class.php +++ b/webapp/controller/ShareController.class.php @@ -13,7 +13,7 @@ class ShareController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -197,7 +197,7 @@ class ShareController{ $this->subCoin($diamond_num, $account_id, $row['diamond_num']); $num = $row['diamond_num'] - $diamond_num; //保存开宝箱奖励 - $boxreward_uuid = 'game2001api_boxreward_uuid:' . md5($_REQUEST['account_id']); + $boxreward_uuid = 'game2004api_boxreward_uuid:' . md5($_REQUEST['account_id']); $boxreward_list = array(); $r = $this->getRedis($boxreward_uuid); $user_db_str = $r->get($boxreward_uuid); @@ -258,7 +258,7 @@ class ShareController{ return; } - $boxreward_uuid = 'game2001api_boxreward_uuid:' . md5($_REQUEST['account_id']); + $boxreward_uuid = 'game2004api_boxreward_uuid:' . md5($_REQUEST['account_id']); $r = $this->getRedis($boxreward_uuid); $user_db_str = $r->get($boxreward_uuid); if (empty($user_db_str)) { @@ -561,7 +561,7 @@ class ShareController{ )); //保存客服奖励 - $kefureward_uuid = 'game2001api_kefureward_uuid:' . md5($_REQUEST['account_id']); + $kefureward_uuid = 'game2004api_kefureward_uuid:' . md5($_REQUEST['account_id']); $kefureward_list = array(); $r = $this->getRedis($kefureward_uuid); $user_db_str = $r->get($kefureward_uuid); @@ -624,7 +624,7 @@ class ShareController{ return; } $mail_id = $_REQUEST['mail_ids']; - $kefureward_uuid = 'game2001api_kefureward_uuid:' . md5($_REQUEST['account_id']); + $kefureward_uuid = 'game2004api_kefureward_uuid:' . md5($_REQUEST['account_id']); $r = $this->getRedis($kefureward_uuid); $user_db_str = $r->get($kefureward_uuid); if (empty($user_db_str)) { diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 83339a0..bcc327c 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -24,7 +24,7 @@ class ShopController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -129,8 +129,8 @@ class ShopController{ phpcommon\sendError(ERR_USER_BASE + 1, 'session无效'); return; } - $shop_uuid = 'game2001api_shop_uuid: ' . md5($_REQUEST['account_id']); - $diamond_shop_uuid = 'game2001api_diamond_shop_uuid:' . md5($_REQUEST['account_id']); + $shop_uuid = 'game2004api_shop_uuid: ' . md5($_REQUEST['account_id']); + $diamond_shop_uuid = 'game2004api_diamond_shop_uuid:' . md5($_REQUEST['account_id']); //钻石商店信息 $diamond_shop_list = $this->getShopInfo($diamond_shop_uuid, 2); //商店信息 diff --git a/webapp/controller/SignController.class.php b/webapp/controller/SignController.class.php index 6acfe0b..4f67279 100644 --- a/webapp/controller/SignController.class.php +++ b/webapp/controller/SignController.class.php @@ -13,7 +13,7 @@ class SignController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/SkinController.class.php b/webapp/controller/SkinController.class.php index ec891ba..cd987fe 100644 --- a/webapp/controller/SkinController.class.php +++ b/webapp/controller/SkinController.class.php @@ -10,7 +10,7 @@ class SkinController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/SupplyBoxController.class.php b/webapp/controller/SupplyBoxController.class.php index 551c913..8df9458 100644 --- a/webapp/controller/SupplyBoxController.class.php +++ b/webapp/controller/SupplyBoxController.class.php @@ -13,7 +13,7 @@ class SupplyBoxController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/TempController.class.php b/webapp/controller/TempController.class.php index 673f21a..a207f2e 100644 --- a/webapp/controller/TempController.class.php +++ b/webapp/controller/TempController.class.php @@ -13,7 +13,7 @@ class TempController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . 1 + 'dbname' => 'gamedb2004_' . 1 )); return $conn; } diff --git a/webapp/controller/VoiceController.class.php b/webapp/controller/VoiceController.class.php index cbc9a64..ba698c3 100644 --- a/webapp/controller/VoiceController.class.php +++ b/webapp/controller/VoiceController.class.php @@ -10,7 +10,7 @@ class VoiceController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2001_' . $mysql_conf['instance_id'] + 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] )); return $conn; } @@ -32,13 +32,13 @@ class VoiceController{ $data = base64_encode($raw_data); $md5 = md5($data); $r = $this->getRedis($md5); - $r->set('game2001:voice:' . $md5, $data); - $r -> pexpire('game2001:voice:' . $md5, 1000 * 600); + $r->set('game2004:voice:' . $md5, $data); + $r -> pexpire('game2004:voice:' . $md5, 1000 * 600); $url = ''; if (SERVER_ENV == _ONLINE) { - $url = "https://game2001api.kingsome.cn/webapp/index.php?c=Voice&a=download&res_id=" . $md5; + $url = "https://game2004api.kingsome.cn/webapp/index.php?c=Voice&a=download&res_id=" . $md5; } else { - $url = "https://game2001api-test.kingsome.cn/webapp/index.php?c=Voice&a=download&res_id=" . $md5; + $url = "https://game2004api-test.kingsome.cn/webapp/index.php?c=Voice&a=download&res_id=" . $md5; } echo json_encode(array( 'errcode' => 0, @@ -50,7 +50,7 @@ class VoiceController{ public function download() { $r = $this->getRedis($_REQUEST['res_id']); - $data = $r->get('game2001:voice:' . $_REQUEST['res_id']); + $data = $r->get('game2004:voice:' . $_REQUEST['res_id']); echo base64_decode($data); }