diff --git a/db_transfer.py b/db_transfer.py index d466a31..36a37c4 100644 --- a/db_transfer.py +++ b/db_transfer.py @@ -284,7 +284,7 @@ class Dbv3Transfer(DbTransfer): cur = conn.cursor() try: if id in self.port_uid_table: - cur.execute("INSERT INTO `user_traffic_log` (`id`, `user_id`, `u`, `d`, `Node_ID`, `rate`, `traffic`, `log_time`) VALUES (NULL, '" + \ + cur.execute("INSERT INTO `user_traffic_log` (`id`, `user_id`, `u`, `d`, `node_id`, `rate`, `traffic`, `log_time`) VALUES (NULL, '" + \ str(self.port_uid_table[id]) + "', '" + str(transfer[0]) + "', '" + str(transfer[1]) + "', '" + \ str(get_config().NODE_ID) + "', '" + str(get_config().TRANSFER_MUL) + "', '" + \ self.traffic_format(transfer[0] + transfer[1]) + "', unix_timestamp()); ") @@ -308,7 +308,7 @@ class Dbv3Transfer(DbTransfer): try: cur = conn.cursor() - cur.execute("INSERT INTO `ss_node_online_log` (`id`, `Node_ID`, `online_user`, `log_time`) VALUES (NULL, '" + \ + cur.execute("INSERT INTO `ss_node_online_log` (`id`, `node_id`, `online_user`, `log_time`) VALUES (NULL, '" + \ str(get_config().NODE_ID) + "', '" + str(alive_user_count) + "', unix_timestamp()); ") cur.close() diff --git a/shadowsocks.sql b/shadowsocks.sql deleted file mode 100644 index 8d84992..0000000 --- a/shadowsocks.sql +++ /dev/null @@ -1,24 +0,0 @@ -SET FOREIGN_KEY_CHECKS=0; - -CREATE TABLE `user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `email` varchar(32) NOT NULL, - `pass` varchar(16) NOT NULL, - `passwd` varchar(16) NOT NULL, - `t` int(11) NOT NULL DEFAULT '0', - `u` bigint(20) NOT NULL, - `d` bigint(20) NOT NULL, - `transfer_enable` bigint(20) NOT NULL, - `port` int(11) NOT NULL, - `switch` tinyint(4) NOT NULL DEFAULT '1', - `enable` tinyint(4) NOT NULL DEFAULT '1', - `type` tinyint(4) NOT NULL DEFAULT '1', - `last_get_gift_time` int(11) NOT NULL DEFAULT '0', - `last_rest_pass_time` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`,`port`) -) ENGINE=InnoDB AUTO_INCREMENT=415 DEFAULT CHARSET=utf8; - --- ---------------------------- --- Records of user --- ---------------------------- -INSERT INTO `user` VALUES ('7', 'test@test.com', '123456', '0000000', '1410609560', '0', '0', '9320666234', '50000', '1', '1', '7', '0', '0'); \ No newline at end of file