diff --git a/pom.xml b/pom.xml
index 8675d2f..13f3d05 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
1.0.2
wfc
- WANFi Controller
+ WANFi Control and Billing System
1.0.2
diff --git a/sql/wfc_user_db/wfc_user_db.sql b/sql/wfc_user_db/wfc_user_db.sql
index 17763cb..8543ce7 100644
--- a/sql/wfc_user_db/wfc_user_db.sql
+++ b/sql/wfc_user_db/wfc_user_db.sql
@@ -11,7 +11,7 @@
Target Server Version : 50744 (5.7.44)
File Encoding : 65001
- Date: 13/12/2024 21:36:46
+ Date: 18/12/2024 10:18:09
*/
-- DROP DATABASE IF EXISTS `wfc_user_db`;
@@ -27,7 +27,7 @@ USE wfc_user_db;
-- ----------------------------
DROP TABLE IF EXISTS `u_bill`;
CREATE TABLE `u_bill` (
- `bill_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Bill ID',
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Bill ID',
`user_id` bigint(20) NULL DEFAULT NULL COMMENT 'User ID link to u_user',
`fee` double NULL DEFAULT NULL,
`billing_begin` datetime NULL DEFAULT NULL,
@@ -35,7 +35,7 @@ CREATE TABLE `u_bill` (
`status` enum('unpaid','paid') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT 'unpaid',
`create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'create name ',
`create_time` datetime NULL DEFAULT NULL COMMENT 'create time',
- PRIMARY KEY (`bill_id`) USING BTREE,
+ PRIMARY KEY (`id`) USING BTREE,
INDEX `fk_user_id`(`user_id`) USING BTREE,
CONSTRAINT `u_bill_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `u_user` (`user_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户信息表' ROW_FORMAT = DYNAMIC;
@@ -63,7 +63,7 @@ CREATE TABLE `u_cdr` (
`rate_limit_profile_id` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT 'Rate limit profile ID. ',
`up_time` bigint(20) NULL DEFAULT NULL COMMENT 'Up time (unit: s).',
`last_seen_time` bigint(20) NULL DEFAULT NULL COMMENT 'Last found time, timestamp (ms). ',
- `activity` bigint(20) DEFAULT NULL COMMENT 'Activity download speed (Bytes/s)',
+ `activity` bigint(20) NULL DEFAULT NULL COMMENT 'Activity download speed (Bytes/s)',
`del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '0' COMMENT 'delete flag',
`create_by` bigint(20) NULL DEFAULT NULL COMMENT 'creater',
`create_time` datetime NULL DEFAULT NULL COMMENT 'create time',
@@ -72,18 +72,19 @@ CREATE TABLE `u_cdr` (
PRIMARY KEY (`id`) USING BTREE,
INDEX `fk_user_id`(`user_id`) USING BTREE,
INDEX `fk_client_id`(`client_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户话单表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户话单表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of u_cdr
-- ----------------------------
-INSERT INTO `u_cdr` VALUES (1, NULL, 25, 14, 'TP-Link_OMC_Local', 229400, 286800, 3826, 5797, 662048, 880243, NULL, 48135, 1733796295310, '0', NULL, '2024-12-10 10:05:19', NULL, '2024-12-10 10:05:19');
-INSERT INTO `u_cdr` VALUES (2, NULL, 26, 14, 'TP-Link_OMC', 130000, 130000, 22291, 15729, 19055983, 4034806, NULL, 7435, 1733824739047, '0', NULL, '2024-12-10 17:59:01', NULL, '2024-12-10 17:59:01');
-INSERT INTO `u_cdr` VALUES (3, NULL, 27, 14, 'TP-Link_OMC', 1000, 51600, 28, 85, 3630, 6611, NULL, 22, 1733880802431, '0', NULL, '2024-12-11 09:33:30', NULL, '2024-12-11 09:33:30');
-INSERT INTO `u_cdr` VALUES (4, NULL, 28, 14, 'TP-Link_OMC', 1000, 39000, 63, 82, 5758, 11671, NULL, 18, 1733890274420, '0', NULL, '2024-12-11 12:11:30', NULL, '2024-12-11 12:11:30');
-INSERT INTO `u_cdr` VALUES (5, NULL, 29, 14, 'TP-Link_OMC_Local', 0, 0, 0, 0, 0, 0, NULL, 3, 1733901657547, '0', NULL, '2024-12-11 15:21:00', NULL, '2024-12-11 15:21:00');
-INSERT INTO `u_cdr` VALUES (6, NULL, 30, 14, 'TP-Link_OMC', 1000, 0, 5, 7, 950, 1284, NULL, 2, 1733913814394, '0', NULL, '2024-12-11 18:44:00', NULL, '2024-12-11 18:44:00');
-INSERT INTO `u_cdr` VALUES (7, NULL, 31, 14, 'TP-Link_OMC_Local', 7300, 154900, 5, 9, 950, 1298, NULL, 11, 1734062849401, '0', NULL, '2024-12-13 12:07:30', NULL, '2024-12-13 12:07:30');
+INSERT INTO `u_cdr` VALUES (1, NULL, 25, 14, 'TP-Link_OMC_Local', 229400, 286800, 3826, 5797, 662048, 880243, NULL, 48135, 1733796295310, NULL, '0', NULL, '2024-12-10 10:05:19', NULL, '2024-12-10 10:05:19');
+INSERT INTO `u_cdr` VALUES (2, NULL, 26, 14, 'TP-Link_OMC', 130000, 130000, 22291, 15729, 19055983, 4034806, NULL, 7435, 1733824739047, NULL, '0', NULL, '2024-12-10 17:59:01', NULL, '2024-12-10 17:59:01');
+INSERT INTO `u_cdr` VALUES (3, NULL, 27, 14, 'TP-Link_OMC', 1000, 51600, 28, 85, 3630, 6611, NULL, 22, 1733880802431, NULL, '0', NULL, '2024-12-11 09:33:30', NULL, '2024-12-11 09:33:30');
+INSERT INTO `u_cdr` VALUES (4, NULL, 28, 14, 'TP-Link_OMC', 1000, 39000, 63, 82, 5758, 11671, NULL, 18, 1733890274420, NULL, '0', NULL, '2024-12-11 12:11:30', NULL, '2024-12-11 12:11:30');
+INSERT INTO `u_cdr` VALUES (5, NULL, 29, 14, 'TP-Link_OMC_Local', 0, 0, 0, 0, 0, 0, NULL, 3, 1733901657547, NULL, '0', NULL, '2024-12-11 15:21:00', NULL, '2024-12-11 15:21:00');
+INSERT INTO `u_cdr` VALUES (6, NULL, 30, 14, 'TP-Link_OMC', 1000, 0, 5, 7, 950, 1284, NULL, 2, 1733913814394, NULL, '0', NULL, '2024-12-11 18:44:00', NULL, '2024-12-11 18:44:00');
+INSERT INTO `u_cdr` VALUES (7, NULL, 31, 14, 'TP-Link_OMC_Local', 7300, 154900, 5, 9, 950, 1298, NULL, 11, 1734062849401, NULL, '0', NULL, '2024-12-13 12:07:30', NULL, '2024-12-13 12:07:30');
+INSERT INTO `u_cdr` VALUES (8, NULL, 32, 14, 'TP-Link_OMC_Local', 0, 0, 0, 0, 0, 0, NULL, 1, 1734333874822, NULL, '0', NULL, '2024-12-16 15:25:00', NULL, '2024-12-16 15:25:00');
-- ----------------------------
-- Table structure for u_cdr_detail
@@ -199,7 +200,7 @@ CREATE TABLE `u_client` (
`update_time` datetime NULL DEFAULT NULL COMMENT 'update time',
PRIMARY KEY (`id`) USING BTREE,
INDEX `fk_user_id`(`user_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 32 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户设备表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户设备表' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of u_client
@@ -211,6 +212,7 @@ INSERT INTO `u_client` VALUES (28, NULL, 'TAS-AN00', 'unknown', 'A2-FA-6E-BA-5B-
INSERT INTO `u_client` VALUES (29, NULL, '92-7F-46-CC-2C-BA', 'unknown', '92-7F-46-CC-2C-BA', '0', NULL, '2024-12-11 15:21:00', NULL, '2024-12-11 15:21:00');
INSERT INTO `u_client` VALUES (30, NULL, 'B2-93-4C-64-A4-16', 'unknown', 'B2-93-4C-64-A4-16', '0', NULL, '2024-12-11 18:44:00', NULL, '2024-12-11 18:44:00');
INSERT INTO `u_client` VALUES (31, NULL, 'BRA-AL00', 'unknown', '82-EE-70-63-8F-C6', '0', NULL, '2024-12-13 12:07:30', NULL, '2024-12-13 12:07:30');
+INSERT INTO `u_client` VALUES (32, NULL, '12-15-30-EB-6F-59', 'unknown', '12-15-30-EB-6F-59', '0', NULL, '2024-12-16 15:25:00', NULL, '2024-12-16 15:25:00');
-- ----------------------------
-- Table structure for u_config
@@ -381,7 +383,7 @@ CREATE TABLE `u_logininfor` (
PRIMARY KEY (`info_id`) USING BTREE,
INDEX `idx_u_logininfor_s`(`status`) USING BTREE,
INDEX `idx_u_logininfor_lt`(`access_time`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 74 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户平台_系统访问记录' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 75 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户平台_系统访问记录' ROW_FORMAT = DYNAMIC;
-- ----------------------------
-- Records of u_logininfor
@@ -459,6 +461,7 @@ INSERT INTO `u_logininfor` VALUES (70, '123456', '192.168.2.167', '0', '登录
INSERT INTO `u_logininfor` VALUES (71, '123456', '192.168.2.167', '0', '登录成功', '2024-12-13 16:09:05');
INSERT INTO `u_logininfor` VALUES (72, '123456', '192.168.2.167', '0', '登录成功', '2024-12-13 17:42:27');
INSERT INTO `u_logininfor` VALUES (73, '123456', '192.168.2.94', '0', '登录成功', '2024-12-13 18:16:34');
+INSERT INTO `u_logininfor` VALUES (74, '123456', '192.168.2.94', '0', '登录成功', '2024-12-16 17:36:08');
-- ----------------------------
-- Table structure for u_menu
@@ -669,6 +672,29 @@ INSERT INTO `u_role_menu` VALUES (2, 2010);
INSERT INTO `u_role_menu` VALUES (2, 2011);
INSERT INTO `u_role_menu` VALUES (2, 2012);
+-- ----------------------------
+-- Table structure for u_service
+-- ----------------------------
+DROP TABLE IF EXISTS `u_service`;
+CREATE TABLE `u_service` (
+ `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'Service ID',
+ `user_id` bigint(20) NULL DEFAULT NULL COMMENT 'User ID link to u_user',
+ `balance` double NULL DEFAULT NULL COMMENT 'User charging money balance',
+ `traffic_balance` bigint(20) NULL DEFAULT NULL COMMENT 'User traffic package balance',
+ `status` enum('Normal','Shutdown','Arrears') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT 'Normal',
+ `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'create name ',
+ `create_time` datetime NULL DEFAULT NULL COMMENT 'create time',
+ `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT 'update by name ',
+ `update_time` datetime NULL DEFAULT NULL COMMENT 'update at time',
+ PRIMARY KEY (`id`) USING BTREE,
+ INDEX `fk_user_id`(`user_id`) USING BTREE,
+ CONSTRAINT `u_service_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `u_user` (`user_id`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '用户平台_用户信息表' ROW_FORMAT = DYNAMIC;
+
+-- ----------------------------
+-- Records of u_service
+-- ----------------------------
+
-- ----------------------------
-- Table structure for u_user
-- ----------------------------
@@ -703,7 +729,7 @@ CREATE TABLE `u_user` (
-- Records of u_user
-- ----------------------------
INSERT INTO `u_user` VALUES (1, 100, 'super', '超级用户', '超级用户', '00', 'super@mail.com', '123456', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.88.14', '2024-12-06 10:36:35', 'system', '2024-05-08 21:50:54', '', '2024-12-06 10:36:35', 'super');
-INSERT INTO `u_user` VALUES (2, NULL, '123456', '普通用户', '普通用户', '00', '12345678@mail.com', '1234567', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.2.94', '2024-12-13 18:16:34', 'system', '2024-05-08 21:50:54', '123456', '2024-12-13 18:16:34', '');
+INSERT INTO `u_user` VALUES (2, NULL, '123456', '普通用户', '普通用户', '00', '12345678@mail.com', '1234567', '1', '', '$2a$10$XF99QEWn2MjEE3pbFVvHuOyMi/YVIrQbdenEleJN5dYxAfgXFaaqG', 1, '', '0', '0', '192.168.2.94', '2024-12-16 17:36:08', 'system', '2024-05-08 21:50:54', '123456', '2024-12-16 17:36:08', '');
INSERT INTO `u_user` VALUES (3, NULL, '10086', '10086', NULL, '00', '125@qq.com', '', '0', '', '$2a$10$tqk9HquTN8XeezyOE3TK..0m/KEUsJCcwlEPn9iOgu.a/O7GkfLmq', NULL, NULL, '0', '0', '', NULL, '', '2024-12-10 15:15:19', '', NULL, NULL);
INSERT INTO `u_user` VALUES (4, NULL, 'test1', 'test1', NULL, '00', 'a@agt.com', '13823365856', '0', '', '$2a$10$LbyDxYoa3lyGw0tuU3xgSexnEeSAYrmvXxPUCYxGlr8gs94EAb10a', NULL, NULL, '0', '0', '192.168.2.63', '2024-12-10 15:29:20', '', '2024-12-10 15:16:10', '', '2024-12-10 15:29:20', NULL);
INSERT INTO `u_user` VALUES (5, NULL, 'test2', 'test2', NULL, '00', 'b@agt.com', '13823365857', '0', '', '$2a$10$lV6J2.WSOcvFaNY3AaRBWeYQYELpbakW4K.TSIrn35QEMzAfG8lB.', NULL, NULL, '0', '0', '192.168.2.63', '2024-12-10 15:56:06', '', '2024-12-10 15:52:18', '', '2024-12-10 15:56:06', NULL);