diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java index bce3ea7e..02255a48 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/db/DBInitialize.java @@ -45,7 +45,7 @@ import java.util.List; @Slf4j @Component public class DBInitialize implements EventListener { - private static List initDataTableNameList = Lists.newArrayList("user", "license", "port_pool", "port_mapping", "job_info"); + private static List initDataTableNameList = Lists.newArrayList("user", "license", "port_group", "port_pool", "port_mapping", "job_info"); @Inject private DbConfig dbConfig; diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql index 78fd65cd..502be1b6 100644 --- a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql @@ -29,6 +29,7 @@ CREATE TABLE IF NOT EXISTS `user_token` ( #端口池 CREATE TABLE IF NOT EXISTS `port_pool` ( `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` int NOT NULL DEFAULT 1 COMMENT '分组ID', `port` int NOT NULL COMMENT '端口', `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', `create_time` datetime(3) NOT NULL COMMENT '创建时间', @@ -37,6 +38,18 @@ CREATE TABLE IF NOT EXISTS `port_pool` ( KEY `I_port_pool_port` (`port`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +#端口分组 +CREATE TABLE IF NOT EXISTS `port_group` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `name` varchar(255) NOT NULL COMMENT '分组名称', + `possessor_type` int NOT NULL DEFAULT '0' COMMENT '所有者类型 (0、全局共享 1、用户所有 2License所有) ', + `possessor_id` int NOT NULL DEFAULT '-1' COMMENT '所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)', + `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', + `create_time` datetime(3) NOT NULL COMMENT '创建时间', + `update_time` datetime(3) NOT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='端口分组'; + #############################代理配置相关表############################# #license表 CREATE TABLE IF NOT EXISTS `license` ( @@ -66,7 +79,6 @@ CREATE TABLE IF NOT EXISTS `port_mapping` ( PRIMARY KEY (`id`), KEY `I_port_mapping_server_port` (`server_port`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; - #############################日志管理相关表############################# #用户登录记录表 CREATE TABLE IF NOT EXISTS `user_login_record` ( @@ -189,15 +201,4 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` ( KEY `I_flow_report_month_date` (`date`) USING BTREE, KEY `I_flow_report_month_user_id` (`user_id`), KEY `I_flow_report_month_license_id` (`license_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -#端口分组 -CREATE TABLE IF NOT EXISTS `port_group` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `name` varchar(255) NOT NULL COMMENT '分组名称', - `possessor_type` int NOT NULL DEFAULT '0' COMMENT '所有者类型 (0、全局共享 1、用户所有 2License所有) ', - `possessor_id` int NOT NULL DEFAULT '-1' COMMENT '所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)', - `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)', - `create_time` datetime(3) NOT NULL COMMENT '创建时间', - `update_time` datetime(3) NOT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='端口分组'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; \ No newline at end of file diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql index aa2893f5..65cdaebf 100644 --- a/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql @@ -1,2 +1,3 @@ #port_group -INSERT INTO `port_group` VALUES (1, '全局(默认)', 0, -1, 1, now(), now()); +INSERT INTO `port_group`(`id`,`name`,`possessor_type`,`possessor_id`,`enable`,`create_time`,`update_time`) VALUES +(1, '全局(默认)', 0, -1, 1, now(), now()); diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql index 3949bb75..e4288b13 100644 --- a/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql +++ b/neutrino-proxy-server/src/main/resources/sql/mysql/port_pool.data.sql @@ -1,41 +1,41 @@ #端口池 -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(1, 9101, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(2, 9102, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(3, 9103, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(4, 9104, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(5, 9105, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(6, 9106, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(7, 9107, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(8, 9108, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(9, 9109, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(10, 9110, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(11, 9111, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(12, 9112, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(13, 9113, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(14, 9114, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(15, 9115, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(16, 9116, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(17, 9117, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(18, 9118, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(19, 9119, 1, now(), now()); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(20, 9120, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(1, 1, 9101, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(2, 1, 9102, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(3, 1, 9103, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(4, 1, 9104, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(5, 1, 9105, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(6, 1, 9106, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(7, 1, 9107, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(8, 1, 9108, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(9, 1, 9109, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(10, 1, 9110, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(11, 1, 9111, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(12, 1, 9112, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(13, 1, 9113, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(14, 1, 9114, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(15, 1, 9115, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(16, 1, 9116, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(17, 1, 9117, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(18, 1, 9118, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(19, 1, 9119, 1, now(), now()); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(20, 1, 9120, 1, now(), now()); diff --git a/neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql index 759ea1cb..149617ce 100644 --- a/neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql +++ b/neutrino-proxy-server/src/main/resources/sql/sqlite/init-structure.sql @@ -27,6 +27,7 @@ CREATE INDEX IF NOT EXISTS I_user_token_expiration_time ON user_token(expiration #端口池 CREATE TABLE IF NOT EXISTS `port_pool` ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + `group_id` INTEGER NOT NULL DEFAULT 1, `port` INTEGER NOT NULL, `enable` INTEGER(2) NOT NULL, `update_time` INTEGER(20) NOT NULL, @@ -34,6 +35,16 @@ CREATE TABLE IF NOT EXISTS `port_pool` ( ); CREATE UNIQUE INDEX IF NOT EXISTS I_port_pool_port ON port_pool (port ASC); +#端口分组 +CREATE TABLE IF NOT EXISTS `port_group` ( + `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + `name` VARCHAR(255) NOT NULL, + `possessor_type` INTEGER NOT NULL DEFAULT '0', + `possessor_id` INTEGER NOT NULL DEFAULT '-1', + `enable` INTEGER NOT NULL, + `create_time` datetime(3) NOT NULL, + `update_time` datetime(3) NOT NULL +); #############################代理配置相关表############################# #license表 CREATE TABLE IF NOT EXISTS `license` ( diff --git a/neutrino-proxy-server/src/main/resources/sql/sqlite/port_group.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_group.data.sql new file mode 100644 index 00000000..49294b9f --- /dev/null +++ b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_group.data.sql @@ -0,0 +1,3 @@ +#port_group +INSERT INTO `port_group`(`id`,`name`,`possessor_type`,`possessor_id`,`enable`,`create_time`,`update_time`) VALUES +(1, '全局(默认)', 0, -1, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); diff --git a/neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql index 7bebe281..2beefa6c 100644 --- a/neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql +++ b/neutrino-proxy-server/src/main/resources/sql/sqlite/port_pool.data.sql @@ -1,41 +1,41 @@ #端口池 -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(1, 9101, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(2, 9102, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(3, 9103, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(4, 9104, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(5, 9105, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(6, 9106, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(7, 9107, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(8, 9108, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(9, 9109, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(10, 9110, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(11, 9111, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(12, 9112, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(13, 9113, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(14, 9114, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(15, 9115, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(16, 9116, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(17, 9117, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(18, 9118, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(19, 9119, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); -INSERT INTO port_pool(`id`, `port`, `enable`, `create_time`, `update_time`) VALUES -(20, 9120, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(1, 1, 9101, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(2, 1, 9102, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(3, 1, 9103, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(4, 1, 9104, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(5, 1, 9105, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(6, 1, 9106, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(7, 1, 9107, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(8, 1, 9108, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(9, 1, 9109, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(10, 1, 9110, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(11, 1, 9111, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(12, 1, 9112, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(13, 1, 9113, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(14, 1, 9114, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(15, 1, 9115, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(16, 1, 9116, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(17, 1, 9117, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(18, 1, 9118, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(19, 1, 9119, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW')); +INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES +(20, 1, 9120, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));