diff --git a/.github/workflows/linux_mac_native.yml b/.github/workflows/linux_mac_native.yml index d8dd5ae5..153d04fc 100644 --- a/.github/workflows/linux_mac_native.yml +++ b/.github/workflows/linux_mac_native.yml @@ -32,10 +32,10 @@ jobs: npm install npm run build:docker· cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/ - - name: GitHub Action for GraalVM JDK 17 + - name: GitHub Action for GraalVM JDK 21 uses: graalvm/setup-graalvm@v1 with: - java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17 + java-version: '21.0.1' # for a specific JDK 21 distribution: 'graalvm' # New 'distribution' option github-token: ${{ secrets.GITHUB_TOKEN }} - name: Cache local Maven repository diff --git a/.github/workflows/windows-native.yml b/.github/workflows/windows-native.yml index 7ab4a339..ebebef7f 100644 --- a/.github/workflows/windows-native.yml +++ b/.github/workflows/windows-native.yml @@ -31,10 +31,10 @@ jobs: npm install npm run build:docker cp -r ./dist/ ./../neutrino-proxy-server/src/main/resources/static/ - - name: GitHub Action for GraalVM JDK 17 + - name: GitHub Action for GraalVM JDK 21 uses: graalvm/setup-graalvm@v1 with: - java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17 + java-version: '21.0.1' # for a specific JDK 21; distribution: 'graalvm' # New 'distribution' option github-token: ${{ secrets.GITHUB_TOKEN }} - name: Cache local Maven repository diff --git a/neutrino-proxy-client/src/main/resources/app-copy.yml b/neutrino-proxy-client/src/main/resources/app-copy.yml index bbc05203..e3c6a8cc 100644 --- a/neutrino-proxy-client/src/main/resources/app-copy.yml +++ b/neutrino-proxy-client/src/main/resources/app-copy.yml @@ -8,22 +8,22 @@ neutrino: # 线程池相关配置,用于技术调优,可忽略 thread-count: 50 # 隧道SSL证书配置 - key-store-password: ${STORE_PASS:123456} - jks-path: ${JKS_PATH:classpath:/test.jks} + key-store-password: 123456 + jks-path: classpath:/test.jks # 服务端IP - server-ip: ${SERVER_IP:localhost} + server-ip: localhost # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port) - server-port: ${SERVER_PORT:9002} + server-port: 9002 # 是否启用SSL(注意:该配置必须和server-port对应上) - ssl-enable: ${SSL_ENABLE:true} + ssl-enable: true # 客户端连接唯一凭证 - license-key: ${LICENSE_KEY:} + license-key: # 客户端唯一身份标识(可忽略,若不设置首次启动会自动生成) - client-id: ${CLIENT_ID:} + client-id: # 是否开启隧道传输报文日志(日志级别为debug时开启才有效) - transfer-log-enable: ${CLIENT_LOG:false} + transfer-log-enable: false # 是否开启心跳日志 - heartbeat-log-enable: ${HEARTBEAT_LOG:false} + heartbeat-log-enable: false # 重连设置 reconnection: # 重连间隔(秒) @@ -38,4 +38,4 @@ neutrino: # udp傀儡端口范围 puppet-port-range: 10000-10500 # 是否开启隧道传输报文日志(日志级别为debug时开启才有效) - transfer-log-enable: ${CLIENT_LOG:false} + transfer-log-enable: false diff --git a/neutrino-proxy-server/src/main/resources/app-copy.yml b/neutrino-proxy-server/src/main/resources/app-copy.yml index 36113f44..e7360e41 100644 --- a/neutrino-proxy-server/src/main/resources/app-copy.yml +++ b/neutrino-proxy-server/src/main/resources/app-copy.yml @@ -18,46 +18,46 @@ neutrino: 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} + http-proxy-port: 80 # https代理端口,默认443 (需要配置域名、证书) - https-proxy-port: ${HTTPS_PROXY_PORT:443} + https-proxy-port: 443 # 如果不配置,则不支持域名映射 - domain-name: ${DOMAIN_NAME:} + domain-name: # https证书配置 - key-store-password: ${HTTPS_STORE_PASS:} - jks-path: ${HTTPS_JKS_PATH:} + key-store-password: + jks-path: # 是否开启代理服务报文日志(日志级别为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:} + password: