support sendya/shadowsocks-panel

shadowsocks/dbtransfer.py

@@ -58,23 +58,23 @@ def get_servers_transfer():
 
     def push_db_all_user(self):
         dt_transfer = self.get_servers_transfer()
-        query_head = 'UPDATE user'
+        query_head = 'UPDATE member'
         query_sub_when = ''
         query_sub_when2 = ''
         query_sub_in = None
         last_time = time.time()
         for id in dt_transfer.keys():
-            query_sub_when += ' WHEN %s THEN u+%s' % (id, 0) # all in d
-            query_sub_when2 += ' WHEN %s THEN d+%s' % (id, dt_transfer[id])
+            query_sub_when += ' WHEN %s THEN flow_up+%s' % (id, 0) # all in d
+            query_sub_when2 += ' WHEN %s THEN flow_down+%s' % (id, dt_transfer[id])
             if query_sub_in is not None:
                 query_sub_in += ',%s' % id
             else:
                 query_sub_in = '%s' % id
         if query_sub_when == '':
             return
-        query_sql = query_head + ' SET u = CASE port' + query_sub_when + \
-                    ' END, d = CASE port' + query_sub_when2 + \
-                    ' END, t = ' + str(int(last_time)) + \
+        query_sql = query_head + ' SET flow_up = CASE port' + query_sub_when + \
+                    ' END, flow_down = CASE port' + query_sub_when2 + \
+                    ' END, lastConnTime = ' + str(int(last_time)) + \
                     ' WHERE port IN (%s)' % query_sub_in
         # print query_sql
         conn = cymysql.connect(host=config.MYSQL_HOST, port=config.MYSQL_PORT, user=config.MYSQL_USER,
@@ -90,7 +90,7 @@ def pull_db_all_user():
         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()
-        cur.execute("SELECT port, u, d, transfer_enable, passwd, switch, enable FROM user")
+        cur.execute("SELECT port, flow_up, flow_down, transfer, sspwd, enable FROM member")
         rows = []
         for r in cur.fetchall():
             rows.append(list(r))
@@ -103,7 +103,7 @@ def del_server_out_of_bound_safe(rows):
         for row in rows:
             server = json.loads(DbTransfer.get_instance().send_command('stat: {"server_port":%s}' % row[0]))
             if server['stat'] != 'ko':
-                if row[5] == 0 or row[6] == 0:
+                if row[5] == 0:
                     #stop disable or switch off user
                     logging.info('db stop server at port [%s] reason: disable' % (row[0]))
                     DbTransfer.send_command('remove: {"server_port":%s}' % row[0])
@@ -116,7 +116,7 @@ def del_server_out_of_bound_safe(rows):
                     logging.info('db stop server at port [%s] reason: password changed' % (row[0]))
                     DbTransfer.send_command('remove: {"server_port":%s}' % row[0])
             else:
-                if row[5] == 1 and row[6] == 1 and row[1] + row[2] < row[3]:
+                if row[5] == 1 and row[1] + row[2] < row[3]:
                     logging.info('db start server at port [%s] pass [%s]' % (row[0], row[4]))
                     DbTransfer.send_command('add: {"server_port": %s, "password":"%s"}'% (row[0], row[4]))
                     print('add: {"server_port": %s, "password":"%s"}'% (row[0], row[4]))