yeyinlaoying/neutrino-proxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、jdk版本改为21，对应的打包脚本调整

Browse Source 
2、安全组相关代码优化
This commit is contained in:
aoshiguchen
2023-12-10 16:42:52 +08:00
parent 1ad80a6d8b
commit 5ccf0d1936
26 changed files with 376 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql
+2 -2
View File
@@ -52,7 +52,7 @@ CREATE TABLE IF NOT EXISTS `security_group` (
`name` VARCHAR(20) NOT NULL,
`description` VARCHAR(255),
`user_id` INTEGER NOT NULL,
`enable` VARCHAR(20) NOT NULL,
`enable` INTEGER NOT NULL,
`default_pass_type` VARCHAR(20) NOT NULL,
`create_time` TIMESTAMP NOT NULL,
`update_time` TIMESTAMP NOT NULL,
@@ -69,7 +69,7 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
`pass_type` VARCHAR(20) NOT NULL,
`priority` INTEGER NOT NULL,
`user_id` INTEGER NOT NULL,
`enable` VARCHAR(20) NOT NULL,
`enable` INTEGER NOT NULL,
`create_time` TIMESTAMP NOT NULL,
`update_time` TIMESTAMP NOT NULL,
PRIMARY KEY (`id`)
neutrino-proxy-server/src/main/resources/sql/h2/update/UPDATE-20231207.SQL
+3 -3
View File
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS `security_group` (
`name` VARCHAR(20) NOT NULL,
`description` VARCHAR(255),
`user_id` INTEGER NOT NULL,
`enable` VARCHAR(20) NOT NULL,
`enable` INTEGER NOT NULL,
`default_pass_type` VARCHAR(20) NOT NULL,
`create_time` TIMESTAMP NOT NULL,
`update_time` TIMESTAMP NOT NULL,
@@ -21,10 +21,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
`pass_type` VARCHAR(20) NOT NULL,
`priority` INTEGER NOT NULL,
`user_id` INTEGER NOT NULL,
`enable` VARCHAR(20) NOT NULL,
`enable` INTEGER NOT NULL,
`create_time` TIMESTAMP NOT NULL,
`update_time` TIMESTAMP NOT NULL,
PRIMARY KEY (`id`)
);
CREATE INDEX IF NOT EXISTS I_security_rule_group_id ON security_rule(group_id);
ALTER TABLE `port_mapping` ADD COLUMN IF NOT EXISTS `security_group_id` INTEGER DEFAULT 0;
ALTER TABLE `port_mapping` ADD COLUMN `security_group_id` INTEGER DEFAULT 0;
neutrino-proxy-server/src/main/resources/sql/mariadb/init-structure.sql
+2 -2
View File
@@ -56,7 +56,7 @@ CREATE TABLE IF NOT EXISTS `security_group` (
`name` varchar(20) NOT NULL COMMENT '安全组名称',
`description` varchar(255) COMMENT '安全组描述',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
`pass_type` varchar(20) NOT NULL COMMENT '放行类型',
`priority` int(1) NOT NULL COMMENT '优先级',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
PRIMARY KEY (`id`),
neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
+2 -2
View File
@@ -56,7 +56,7 @@ CREATE TABLE IF NOT EXISTS `security_group` (
`name` varchar(20) NOT NULL COMMENT '安全组名称',
`description` varchar(255) COMMENT '安全组描述',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
@@ -73,7 +73,7 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
`pass_type` varchar(20) NOT NULL COMMENT '放行类型',
`priority` int(1) NOT NULL COMMENT '优先级',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
PRIMARY KEY (`id`),
neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231207.SQL
+2 -2
View File
@@ -4,7 +4,7 @@ CREATE TABLE IF NOT EXISTS `security_group` (
`name` varchar(20) NOT NULL COMMENT '安全组名称',
`description` varchar(255) COMMENT '安全组描述',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
`pass_type` varchar(20) NOT NULL COMMENT '放行类型',
`priority` int(1) NOT NULL COMMENT '优先级',
`user_id` int NOT NULL COMMENT '用户ID',
`enable` varchar(20) NOT NULL COMMENT '启用状态',
`enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
`create_time` datetime(3) NOT NULL COMMENT '创建时间',
`update_time` datetime(3) NOT NULL COMMENT '更新时间',
PRIMARY KEY (`id`),