From 298e8a06c9eb7a70f1249ec0265d44289db781cc Mon Sep 17 00:00:00 2001
From: breakwa11 <mmgac001@gmail.com>
Date: Wed, 1 Jul 2015 10:55:24 +0800
Subject: [PATCH] add getKeys in switchrule.py

---
 db_transfer.py | 6 +++++-
 switchrule.py  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/db_transfer.py b/db_transfer.py
index 680ed15..6566527 100644
--- a/db_transfer.py
+++ b/db_transfer.py
@@ -76,7 +76,11 @@ class DbTransfer(object):
 	@staticmethod
 	def pull_db_all_user():
 		#数据库所有用户信息
-		keys = ['port', 'u', 'd', 'transfer_enable', 'passwd', 'enable' ]
+		try:
+			import switchrule
+			keys = switchrule.getKeys()
+		except Exception, e:
+			keys = ['port', 'u', 'd', 'transfer_enable', 'passwd', 'enable' ]
 		conn = cymysql.connect(host=Config.MYSQL_HOST, port=Config.MYSQL_PORT, user=Config.MYSQL_USER,
 								passwd=Config.MYSQL_PASS, db=Config.MYSQL_DB, charset='utf8')
 		cur = conn.cursor()
diff --git a/switchrule.py b/switchrule.py
index 2a0b324..036c61b 100644
--- a/switchrule.py
+++ b/switchrule.py
@@ -1,3 +1,6 @@
+def getKeys():
+	return ['port', 'u', 'd', 'transfer_enable', 'passwd', 'enable' ]
+
 def isTurnOn(row):
 	return True