From 2950e123b078486eadba251902906f2f652cbe50 Mon Sep 17 00:00:00 2001 From: suxiang <2585546823@qq.com> Date: Wed, 18 Sep 2024 18:33:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/app-copy.yml | 92 +++++-------------- .../resources/sql/h2/port_mapping.data.sql | 12 +-- 2 files changed, 31 insertions(+), 73 deletions(-) diff --git a/neutrino-proxy-server/src/main/resources/app-copy.yml b/neutrino-proxy-server/src/main/resources/app-copy.yml index 44045e4b..e0fee879 100644 --- a/neutrino-proxy-server/src/main/resources/app-copy.yml +++ b/neutrino-proxy-server/src/main/resources/app-copy.yml @@ -1,100 +1,58 @@ server: # 服务端web端口，用于支持HTTP接口，管理后台页面访问 - port: ${WEB_PORT:8888} - context-path: /neutrino-proxy-server -solon: - app: - name: neutrino-proxy-server - version: 2.0.1 - config: - add: ./app.yml + port: 8888 # 日志级别 -solon.logging.appender: - console: - pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(${PID:-}) --- %-15([%15.15thread]) %-56(%cyan(%-40.40logger{39}%L)) : %msg%n" - file: - enable: true - pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- %-15([%15.15thread]) %-56(%-40.40logger{39}%L) : %msg%n" - name: "logs/${solon.app.name}" - rolling: "logs/${solon.app.name}_%d{yyyy-MM-dd}_%i.log" -solon.logging.logger: - "root": - level: info +solon.logging: + logger: + "root": + level: info + appender: + file: + level: info neutrino: proxy: - protocol: - max-frame-length: ${MAX_FRAME_LENGTH:2097152} - length-field-offset: 0 - length-field-length: 4 - initial-bytes-to-strip: 0 - length-adjustment: 0 - read-idle-time: 120 - write-idle-time: 20 - all-idle-time-seconds: 0 # 隧道相关配置-用于维持服务端与客户端的通信 tunnel: # 线程池相关配置，用于技术调优，可忽略 boss-thread-count: 2 work-thread-count: 10 # 隧道非SSL端口 - port: ${OPEN_PORT:9000} + port: 9000 # 隧道SSL端口 - ssl-port: ${SSL_PORT:9002} + ssl-port: 9002 # 隧道SSL证书配置 - key-store-password: ${STORE_PASS:123456} - key-manager-password: ${MGR_PASS:123456} - jks-path: ${JKS_PATH:classpath:/test.jks} + key-store-password: 123456 + key-manager-password: 123456 + jks-path: classpath:/test.jks # 是否开启隧道传输报文日志(日志级别为debug时开启才有效) - transfer-log-enable: ${TUNNEL_LOG:false} + transfer-log-enable: false # 是否开启心跳日志 - heartbeat-log-enable: ${HEARTBEAT_LOG:false} + heartbeat-log-enable: false server: tcp: # 线程池相关配置，用于技术调优，可忽略 boss-thread-count: 5 work-thread-count: 20 - # http代理端口，默认80 - http-proxy-port: ${HTTP_PROXY_PORT:80} - # https代理端口，默认443 （需要配置域名、证书） - https-proxy-port: ${HTTPS_PROXY_PORT:443} + # http代理端口，默认80（不配置不支持） + http-proxy-port: 80 + # https代理端口，默认443 （不配置不支持，同时需要配置域名、证书） + https-proxy-port: 443 # 是否开启代理服务报文日志(日志级别为debug时开启才有效) - transfer-log-enable: ${SERVER_LOG:false} + transfer-log-enable: false udp: # 线程池相关配置，用于技术调优，可忽略 boss-thread-count: 5 work-thread-count: 20 # 是否开启代理服务报文日志(日志级别为debug时开启才有效) - transfer-log-enable: ${SERVER_LOG:false} + transfer-log-enable: false data: db: # 数据库类型，目前支持h2、mysql、mariadb - type: ${DB_TYPE:h2} + type: h2 # 数据库连接URL - url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE} + url: jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE # 数据库用户名 - username: ${DB_USER:} + username: # 数据库密码 - password: ${DB_PASSWORD:} - -#添加MIME印射（如果有需要？） -#是否启用静态文件服务。（可不配，默认为启用） -solon.staticfiles.enable: true -#静态文件的304缓存时长。（可不配，默认为10分钟） -solon.staticfiles.maxAge: 600 -#添加静态目录映射。（按需选择）#v1.11.0 后支持 -solon.staticfiles.mappings: - - path: "/" - repository: "./neutrino-proxy-admin/dist/" #2.添加资源路径（仓库只能是目录） - -mybatis.db: - typeAliases: #支持包名 或 类名（大写开头 或 *）//支持 ** 或 * 占位符 - - "org.dromara.neutrinoproxy.server.dal.entity" - mappers: #支持包名 或 类名（大写开头 或 *）或 xml（.xml结尾）//支持 ** 或 * 占位符 - - "classpath:mapper/*.xml" - - "org.dromara.neutrinoproxy.server.dal" - configuration: #扩展配置（要与 MybatisConfiguration 类的属性一一对应） - cacheEnabled: false - mapUnderscoreToCamelCase: true - globalConfig: #全局配置（要与 GlobalConfig 类的属性一一对应） - banner: true + password: diff --git a/neutrino-proxy-server/src/main/resources/sql/h2/port_mapping.data.sql b/neutrino-proxy-server/src/main/resources/sql/h2/port_mapping.data.sql index 403143a1..c0d1e98e 100644 --- a/neutrino-proxy-server/src/main/resources/sql/h2/port_mapping.data.sql +++ b/neutrino-proxy-server/src/main/resources/sql/h2/port_mapping.data.sql @@ -1,7 +1,7 @@ #port_mapping -INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`, `subdomain`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES -(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1,'test1', now(), now()); -INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES -(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1,'test2', now(), now()); -INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES -(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1,'test3', now(), now()); \ No newline at end of file +INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES +(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1,'test1', now(), now()); +INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES +(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1,'test2', now(), now()); +INSERT INTO port_mapping(`id`, `license_id`, `server_port`, `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES +(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1,'test3', now(), now()); \ No newline at end of file