From 6f6a57eda564a74209a8daebcb523972d8800991 Mon Sep 17 00:00:00 2001 From: xj <550345579@qq.com> Date: Sun, 3 Mar 2024 22:36:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neutrino-proxy-admin/package.json | 2 +- neutrino-proxy-admin/src/api/domain.js | 2 +- neutrino-proxy-admin/src/lang/zh.js | 1 + neutrino-proxy-admin/src/router/index.js | 3 +- .../src/views/proxy/domainMapping.vue | 638 ++++++++++++++++++ .../server/base/db/DBInitialize.java | 1 - .../controller/DomainNameController.java | 2 +- .../main/resources/sql/h2/init-structure.sql | 18 + 8 files changed, 662 insertions(+), 5 deletions(-) create mode 100644 neutrino-proxy-admin/src/views/proxy/domainMapping.vue diff --git a/neutrino-proxy-admin/package.json b/neutrino-proxy-admin/package.json index 3fafb115..b64788bb 100644 --- a/neutrino-proxy-admin/package.json +++ b/neutrino-proxy-admin/package.json @@ -70,7 +70,7 @@ "friendly-errors-webpack-plugin": "1.6.1", "html-webpack-plugin": "2.30.1", "node-notifier": "5.1.2", - "node-sass": "^9.0.0", + "node-sass": "4.13.1", "optimize-css-assets-webpack-plugin": "3.2.0", "ora": "1.3.0", "portfinder": "1.0.13", diff --git a/neutrino-proxy-admin/src/api/domain.js b/neutrino-proxy-admin/src/api/domain.js index d3a9f7fd..21c16e34 100644 --- a/neutrino-proxy-admin/src/api/domain.js +++ b/neutrino-proxy-admin/src/api/domain.js @@ -2,7 +2,7 @@ import request from '@/utils/request' export function domainNameBindInfo(query) { return request({ - url: '/domain-name/bind-info', + url: '/domain/bind-info', method: 'get', params: query }) diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js index 998795df..e613c8d9 100644 --- a/neutrino-proxy-admin/src/lang/zh.js +++ b/neutrino-proxy-admin/src/lang/zh.js @@ -55,6 +55,7 @@ export default { proxy: '代理配置', license: 'License管理', portMapping: '端口映射', + domainMapping: '域名解析', jobManager: '调度管理', jobLog: '调度日志', log: '日志管理', diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js index 47a870f2..331573a8 100644 --- a/neutrino-proxy-admin/src/router/index.js +++ b/neutrino-proxy-admin/src/router/index.js @@ -61,7 +61,8 @@ export const asyncRouterMap = [ }, children: [ { path: 'license', component: _import('proxy/license'), name: 'license', meta: { title: 'license' }}, - { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }} + { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }}, + { path: 'domainMapping', component: _import('proxy/domainMapping'), name: 'domainMapping', meta: { title: 'domainMapping' }} ] }, { diff --git a/neutrino-proxy-admin/src/views/proxy/domainMapping.vue b/neutrino-proxy-admin/src/views/proxy/domainMapping.vue new file mode 100644 index 00000000..5e71a596 --- /dev/null +++ b/neutrino-proxy-admin/src/views/proxy/domainMapping.vue @@ -0,0 +1,638 @@ + + + diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java index a387e1ce..51ad71b2 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java @@ -109,7 +109,6 @@ public class DBInitialize implements EventListener { } for (String tableName : initDataTableNameList) { // 表里没有数据的时候，才进行初始化操作 - Object result = dbContext.exe(String.format("select count(1) from `%s`", tableName)); if (result != null && ((Number) result).intValue() > 0) { continue; diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainNameController.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainNameController.java index 3f64d661..319a4e5b 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainNameController.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/DomainNameController.java @@ -12,7 +12,7 @@ import org.noear.solon.annotation.Mapping; * @date: 2023/4/2 */ @Slf4j -@Mapping("/domain-name") +@Mapping("/domain") @Controller public class DomainNameController { @Inject diff --git a/neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql index bfeaeda7..ba58704d 100644 --- a/neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql +++ b/neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql @@ -229,3 +229,21 @@ CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month( CREATE INDEX IF NOT EXISTS I_flow_report_month_date ON flow_report_month(`date`); CREATE INDEX IF NOT EXISTS I_flow_report_month_user_id ON flow_report_month(`user_id`); CREATE INDEX IF NOT EXISTS I_flow_report_month_license_id ON flow_report_month(`license_id`); + +# 域名 映射表 +CREATE TABLE IF NOT EXISTS `domain_mapping` ( + `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT, + `license_id` INTEGER(20) NOT NULL, + `protocal` VARCHAR(10) NOT NULL DEFAULT 'HTTP', + `domain` VARCHAR(50) DEFAULT NULL, + `target_path` VARCHAR(50) NOT NULL, + `up_limit_rate` VARCHAR(20) DEFAULT NULL, + `down_limit_rate` VARCHAR(20) DEFAULT NULL, + `description` VARCHAR(100) DEFAULT NULL, + `request_header` INTEGER(20) NOT NULL DEFAULT 0, + `enable` INTEGER(2) NOT NULL, + `security_group_id` INTEGER(20) NOT NULL DEFAULT 0, + `create_time` TIMESTAMP NOT NULL, + `update_time` TIMESTAMP NOT NULL +); +CREATE UNIQUE INDEX IF NOT EXISTS I_domain_mapping_domain ON domain_mapping (`domain` ASC); \ No newline at end of file