From ebb5fb4a89702aa10b1903258351f047c1c4c087 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 5 Sep 2020 17:08:17 +0800 Subject: [PATCH 1/4] 1 --- sql/gamedb2004_n_migrate_200905_01.sql | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 sql/gamedb2004_n_migrate_200905_01.sql diff --git a/sql/gamedb2004_n_migrate_200905_01.sql b/sql/gamedb2004_n_migrate_200905_01.sql new file mode 100644 index 0000000..2aac70d --- /dev/null +++ b/sql/gamedb2004_n_migrate_200905_01.sql @@ -0,0 +1,14 @@ +begin; + +delete from user where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from bag where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from sign where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from quest where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from share_achievement where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from activity where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from passinfo where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from shop where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from equip where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; +delete from shop_data where accountid = '6001_2004_oTR6b5bEg5Kve4mC8PRT1QZUYEHE'; + +commit; From 371ea0000279682d9116c6f195c31e09a0aebeb1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 7 Sep 2020 10:45:23 +0800 Subject: [PATCH 2/4] 1 --- config | 1 - 1 file changed, 1 deletion(-) delete mode 120000 config diff --git a/config b/config deleted file mode 120000 index 3791d7f..0000000 --- a/config +++ /dev/null @@ -1 +0,0 @@ -../conf_test/game2004api/webapp/config \ No newline at end of file From 0d1b9cd783c842e265d9f8d8dc0f15c20e4e997c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 7 Sep 2020 10:46:03 +0800 Subject: [PATCH 3/4] 1 --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6ac12f0..8f4c22e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ *.tar *.tar.gz target -config/ +config __pycache__/ res out/ \ No newline at end of file From b85a4d4f5601233b3c4c95a647709bbab937b71e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 7 Sep 2020 10:51:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=8D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=85=8D=E7=BD=AE=E4=BB=8E../config?= =?UTF-8?q?/config.php=E9=87=8C=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webapp/classes/AddReward.php | 2 +- webapp/classes/Quest.php | 2 +- webapp/controller/ActivityController.class.php | 2 +- webapp/controller/AdditemController.class.php | 2 +- webapp/controller/BagController.class.php | 2 +- webapp/controller/EquipController.class.php | 2 +- webapp/controller/FriendController.class.php | 2 +- webapp/controller/GameOverController.class.php | 2 +- webapp/controller/HangController.class.php | 2 +- webapp/controller/PassController.class.php | 2 +- webapp/controller/PayController.class.php | 2 +- webapp/controller/PayNotifyController.class.php | 2 +- webapp/controller/QuestController.class.php | 2 +- webapp/controller/RankController.class.php | 2 +- webapp/controller/RoleController.class.php | 2 +- webapp/controller/ServerSwitchController.class.php | 2 +- webapp/controller/ShareController.class.php | 2 +- webapp/controller/ShopController.class.php | 2 +- webapp/controller/SignController.class.php | 2 +- webapp/controller/TeamController.class.php | 2 +- webapp/controller/TempController.class.php | 2 +- webapp/controller/VoiceController.class.php | 2 +- webapp/index.php | 1 + 23 files changed, 23 insertions(+), 22 deletions(-) diff --git a/webapp/classes/AddReward.php b/webapp/classes/AddReward.php index c8e83bf..b1a701e 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/classes/Quest.php b/webapp/classes/Quest.php index 30560b8..5955e97 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index fca4062..380051b 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/AdditemController.class.php b/webapp/controller/AdditemController.class.php index a4603a7..8d36c97 100644 --- a/webapp/controller/AdditemController.class.php +++ b/webapp/controller/AdditemController.class.php @@ -9,7 +9,7 @@ class AdditemController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/BagController.class.php b/webapp/controller/BagController.class.php index ca0e431..3d7c625 100644 --- a/webapp/controller/BagController.class.php +++ b/webapp/controller/BagController.class.php @@ -13,7 +13,7 @@ class BagController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/EquipController.class.php b/webapp/controller/EquipController.class.php index 1e2d347..269504f 100644 --- a/webapp/controller/EquipController.class.php +++ b/webapp/controller/EquipController.class.php @@ -13,7 +13,7 @@ class EquipController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/FriendController.class.php b/webapp/controller/FriendController.class.php index b9d1c0b..7bebd0a 100644 --- a/webapp/controller/FriendController.class.php +++ b/webapp/controller/FriendController.class.php @@ -13,7 +13,7 @@ class FriendController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/GameOverController.class.php b/webapp/controller/GameOverController.class.php index 6aafd7a..3949e49 100644 --- a/webapp/controller/GameOverController.class.php +++ b/webapp/controller/GameOverController.class.php @@ -13,7 +13,7 @@ class GameOverController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/HangController.class.php b/webapp/controller/HangController.class.php index e3696c6..8bcd956 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/PassController.class.php b/webapp/controller/PassController.class.php index 8931e79..7909c8a 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/PayController.class.php b/webapp/controller/PayController.class.php index efb90c1..70bdf4f 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/PayNotifyController.class.php b/webapp/controller/PayNotifyController.class.php index 69ddbaf..b6bc092 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/QuestController.class.php b/webapp/controller/QuestController.class.php index e5a33bf..5dfed4a 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/RankController.class.php b/webapp/controller/RankController.class.php index 57031c5..a07d618 100644 --- a/webapp/controller/RankController.class.php +++ b/webapp/controller/RankController.class.php @@ -10,7 +10,7 @@ class RankController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/RoleController.class.php b/webapp/controller/RoleController.class.php index ac06295..8fc0f37 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ServerSwitchController.class.php b/webapp/controller/ServerSwitchController.class.php index 5118bc3..017aed3 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ShareController.class.php b/webapp/controller/ShareController.class.php index 2ad8b31..63b080d 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 3d67941..f4a4fdb 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -26,7 +26,7 @@ class ShopController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/SignController.class.php b/webapp/controller/SignController.class.php index 9944e47..b305e98 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/TeamController.class.php b/webapp/controller/TeamController.class.php index c51bbf2..d41a8e2 100644 --- a/webapp/controller/TeamController.class.php +++ b/webapp/controller/TeamController.class.php @@ -23,7 +23,7 @@ class TeamController{ 'port' => $mysql_conf['port'], 'user' => $mysql_conf['user'], 'passwd' => $mysql_conf['passwd'], - 'dbname' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/controller/TempController.class.php b/webapp/controller/TempController.class.php index a207f2e..4b565f6 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' => 'gamedb2004_' . 1 + 'dbname' => DBNAME_PREFIX . 1 )); return $conn; } diff --git a/webapp/controller/VoiceController.class.php b/webapp/controller/VoiceController.class.php index ba698c3..84d53d7 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' => 'gamedb2004_' . $mysql_conf['instance_id'] + 'dbname' => DBNAME_PREFIX . $mysql_conf['instance_id'] )); return $conn; } diff --git a/webapp/index.php b/webapp/index.php index 7ed1cb9..f06f3d1 100644 --- a/webapp/index.php +++ b/webapp/index.php @@ -1,5 +1,6 @@