From d42896d1fe05ba65cf3bf537075c3d00467dfbb8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 11 七月 2019 11:38:48 +0800
Subject: [PATCH] 860312 混服或合服情况下需要指定修改的平台和服务器，Serverid不填写代表不改变只替换spid
---
Tool/数据库/ChangeAccount/ChangeAccount.py | 18 +++++++++++++++++-
Tool/数据库/ChangeAccount/Config/DBConfig.py | 4 +++-
Tool/数据库/ChangeAccount/Config/config.ini | 2 ++
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/ChangeAccount.py" "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/ChangeAccount.py"
index cde7cf8..629d024 100644
--- "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/ChangeAccount.py"
+++ "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/ChangeAccount.py"
@@ -18,8 +18,11 @@
from Collections import (DataServerPlayerData, )
DBConfig = __import__('Config.DBConfig')
-
+# 没有服务器ID 标识保持原来的 只改变spid
def changeAccID(accID, spid, serverid):
+ result = CheckChangeAccID(accID)
+ if not result:
+ return ""
accpeice = accID.split("@")
if len(accpeice) < 3:
return ""
@@ -33,6 +36,19 @@
accID = accID.replace("@%s@%s"%(accpeice[-2], accpeice[-1]), "@%s@%s"%(spid, serverid))
return accID
+# 混服或合服情况下需要指定修改的平台和服务器
+def CheckChangeAccID(accID):
+ if not DBConfig.BeforeSpid:
+ return False
+ accpeice = accID.split("@")
+ if DBConfig.BeforeSpid not in accpeice:
+ return False
+
+ if DBConfig.BeforeServerid and DBConfig.BeforeServerid not in accpeice:
+ return False
+
+ return True
+
def main():
print "Connect %s:%s "%(DBConfig.USER_DB_IP, DBConfig.USER_DB_PORT)
diff --git "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/DBConfig.py" "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/DBConfig.py"
index 0ee0f55..2425c57 100644
--- "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/DBConfig.py"
+++ "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/DBConfig.py"
@@ -29,8 +29,10 @@
#update
"Spid":["test", "update"],
-"Serverid":["s1", "update"],
+"Serverid":["s1", "update"], # 没有服务器ID 标识保持原来的 只改变spid
+"BeforeSpid":["test", "update"],
+"BeforeServerid":["s1", "update"],
}
diff --git "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/config.ini" "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/config.ini"
index 3c353a3..93d4087 100644
--- "a/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/config.ini"
+++ "b/Tool/\346\225\260\346\215\256\345\272\223/ChangeAccount/Config/config.ini"
@@ -10,6 +10,8 @@
userdb_pwd=sa
[update]
+BeforeSpid=aoyou
+BeforeServerid=s3
Spid=test
Serverid=s15
--
Gitblit v1.8.0