解决后台分页查询的已知问题

Merge pull request !60 from xgc/feature/sdk

.editorconfig

@@ -2,4 +2,7 @@ root=true
 
 [*.{groovy,java,kt,xml}]
 indent_style = space
-indent_size = 4
+indent_size = 4
+
+[*.sh]
+end_of_line=lf

.github/workflows/linux_mac_native.yml

@@ -0,0 +1,108 @@
+name: Build linux and mac native image
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
+        # os: ['ubuntu-20.04', 'macos-12']
+        os: ['ubuntu-20.04']
+    name: build - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: setup node v13.12.0
+      uses: actions/setup-node@v3
+      with:
+        node-version: 13.12.0
+        # cache: 'npm' # 使用缓存需要把 package-lock.json 也上传到 git 上
+    - name: build neutrino-proxy-admin
+      run: |
+        cd neutrino-proxy-admin
+        npm install
+        npm run build:docker
+        cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
+    - name: GitHub Action for GraalVM JDK 21
+      uses: graalvm/setup-graalvm@v1
+      with:
+        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
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+    - name: Build with Maven (neutrino-proxy-server)
+      run: |
+        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
+        cd neutrino-proxy-server 
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        chmod +x target/neutrino-proxy-server
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
+    - name: Archive zip (neutrino-proxy-server)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    - name: Build with Maven (neutrino-proxy-client)
+      run: |
+        cd neutrino-proxy-client
+        mvn clean package --file pom.xml --no-transfer-progress
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        chmod +x target/neutrino-proxy-client
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
+    - name: Archive zip (neutrino-proxy-client)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
+    # GitHub 上创建 release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        prerelease: true
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-native.yml

@@ -0,0 +1,108 @@
+name: Build windows native image
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
+        os: ['windows-2022']
+    name: build - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: setup node v13.12.0
+      uses: actions/setup-node@v3
+      with:
+        node-version: 13.12.0
+        # cache: 'npm' # 使用缓存需要把 package-lock.json 也上传到 git 上
+    - name: build neutrino-proxy-admin
+      run: |
+        cd neutrino-proxy-admin
+        npm install
+        npm run build:docker
+        cp -r ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
+    - name: GitHub Action for GraalVM JDK 21
+      uses: graalvm/setup-graalvm@v1
+      with:
+        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
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+    - name: Build with Maven (neutrino-proxy-server)
+      run: |
+        set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
+        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
+        cd neutrino-proxy-server
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
+    - name: Archive zip (neutrino-proxy-server)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    - name: Build with Maven (neutrino-proxy-client)
+      run: |
+        set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
+        mvn clean install -U -pl neutrino-proxy-client -am -DskipTests --no-transfer-progress
+        cd neutrino-proxy-client
+        mvn clean package --file pom.xml --no-transfer-progress
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
+    - name: Archive zip (neutrino-proxy-client)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
+    # GitHub 上创建 release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        prerelease: true
+        token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -57,5 +57,8 @@ hs_err_pid*
 neutrino-proxy-vuepress/deploy.sh
 .NEUTRINO_PROXY_CLIENT_ID
 logs
+data
 **/cert/**
 neutrino-proxy-server/src/main/resources/static/**
+
+client+/neutrino-proxy-client-chrome-plugin

Milestone.md

@@ -0,0 +1,18 @@
+- 2022-06-16 1.0.0版本发布，基于自研应用框架、纯配置无管理后台
+- 2022-10-12 1.5.0版本发布，底层框架优化，新增管理后台
+- 2022-11-23 1.6.0版本发布，新增日志管理模块，新增首页流量统计
+- 2023-01-08 中微子代理Gitee Star突破100
+- 2023-01-16 加入Dromara组织
+- 2023-02-23 1.6.4版本发布，管理后台增、删、改、禁用实时生效，启动参数、GZip优化
+- 2023-03-12 1.7.0版本发布，底层框架更换为Solon + MybatisPlus
+- 2023-03-26 1.7.1版本发布，新增端口池分组、新增报表管理模块、首页图表优化
+- 2023-04-03 1.8.0版本发布，端口映射支持选择协议，HTTP映射支持子域名
+- 2023-05-27 1.8.2版本发布，增加HTTPS支持
+- 2023-06-03 1.8.3版本发布，客户端重连优化、服务端验证客户端身份逻辑优化
+- 2023-06-08 1.8.4版本发布，增加对mariadb的支持、配置文件支持指定日志级别、重连参数
+- 2023-07-04 1.8.5版本发布，后台若干细节优化、配置文件优化
+- 2023-09-07 1.8.6版本发布，后台若干细节优化
+- 2023-09-22 1.9.0版本发布，端口映射支持UDP协议
+- 2023-09-25 中微子代理Gitee Star数突破1000
+- 2023-10-31 2.0.0版本发布，升级jdk版本至jdk17、支持原生编译、去掉sqlite改为默认H2数据库
+- 2023-12-21 2.0.1版本发布，jdk版本升级到21，支持安全组(黑/白名单IP限制)、限速

Native测试.txt

@@ -1,52 +0,0 @@
-# 基础
-- [x] 服务端编译、启动成功
-- [x] 客户端编译、启动成功
-- [x] 配置
-    - [x] 启动参数
-    - [x] 外部配置文件
-    - [x] 环境变量
-- [ ] 日志
-    - [x] 控制台输出
-    - [x] debug启动有netty错误日志
-    - [x] 文件输出
-    - [x] 修改日志级别
-    - [x] 心跳日志
-    - [x] 传输报文日志
-- [x] 连接
-    - [x] 隧道SSL连接
-    - [x] 隧道非SSL连接
-    - [x] 隧道SSL连接自定义证书
-
-# 服务端管理后台
-- [x] 登录成功
-- [x] 首页统计
-- [x] 代理配置
-    - [x] license管理
-    - [x] 端口映射
-- [x] 系统管理
-    - [x] 用户管理
-    - [x] 端口分组管理
-    - [x] 端口池管理
-    - [x] 协议管理
-    - [x] 调度管理
-- [x] 报表管理
-    - [x] 用户流量报表
-    - [x] License流量报表
-    - [x] 用户流量月度明细
-    - [x] License流量月度明细
-- [x] 日志管理
-    - [x] 调度日志
-    - [x] 登录日志
-    - [x] 客户端连接日志
-
-
-# 客户端
-- [x] 重连机制
-
-# 代理
-- [x] TCP代理
-- [x] HTTP(S)代理
-    - [x] 端口访问
-    - [x] HTTP域名访问
-    - [x] HTTPS域名访问
-- [x] UDP代理

README.md

@@ -4,8 +4,8 @@
 <p align="center">
   <a href='https://gitee.com/dromara/neutrino-proxy/stargazers'><img src='https://gitee.com/dromara/neutrino-proxy/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/dromara/neutrino-proxy/members'><img src='https://gitee.com/dromara/neutrino-proxy/badge/fork.svg?theme=dark' alt='fork'></img></a>
-<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">
+<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk17-downloads.html">
-    <img src="https://img.shields.io/badge/JDK-8+-red.svg" />
+    <img src="https://img.shields.io/badge/JDK-17+-red.svg" />
 </a>
 <a href="./LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-red" alt="license MIT">
@@ -88,6 +88,12 @@
 <a href="https://gitee.com/songyinyin" target="_blank">
 <img src="assets/developer/songyinyin.png" width="11%">
 </a>
+<a href="https://gitee.com/nichenxyx" target="_blank">
+<img src="assets/developer/NichenFly.jpg" width="11%">
+</a>
+<a href="https://gitee.com/giteeClass" target="_blank">
+<img src="assets/developer/coder.png" width="11%">
+</a>
 </p>
 
 #  ❤️ 感谢

VLog.md

@@ -0,0 +1,87 @@
+# 1.x
+## 1.0.0
+> 第一个基本可用版本
+- 基于自研底层应用框架、Netty
+- 纯配置实现、无管理后台
+- 支持TCP代理
+
+## 1.5.0
+- 管理后台新增用户管理、License管理、端口映射、调度管理、客户端连接日志、调度日志
+- 支持默认sqlite数据库
+- 底层框架Aop、Banner、SqlMapper、Ioc、@Value注解、Yml配置加载、静态资源服务等优化
+- 底层框架新增@Async、@Singleton等注解
+- 新增AsgcCompiler、ApplicationEvent机制封装
+
+## 1.6.0
+- 新增日志管理模块，调度日志迁移至日志管理
+- 管理后台新增登录日志
+- 新增首页流量统计
+
+## 1.6.4
+- 支持代理服务端用户（删除/禁用）、端口池（删除/禁用/启用）、License（删除/禁用/启用）、端口映射（新增/删除/禁用/启用）实时生效
+- 启动参数优化
+- 服务端静态资源服务支持缓存、gzip压缩，提升响应速度
+
+## 1.7.0
+- 底层框架更换为Solon + MybatisPlus
+
+## 1.7.1
+- 针对管理后台各页面的排序、搜索条件的优化
+- 增加端口池分组、相关的端口映射优化
+- 增加了报表管理模块：用户流量报表、license流量报表、用户流量月度明细、license流量月度明细
+- 完成首页图表展示：license统计、端口映射统计、今日流量统计、汇总流量统计、最近15日流量折线图
+
+## 1.8.0
+- 端口映射支持选择协议
+- HTTP协议下映射支持配置子域名（前提是server端配置了域名）
+
+## 1.8.2
+- 增加HTTPS的支持。
+
+## 1.8.3
+- 客户端重连优化
+- 服务端验证客户端身份逻辑优化
+
+## 1.8.4
+- 增加对mariadb的支持
+- 服务端/客户端，支持配置文件、启动参数指定日志级别
+- 客户端支持配置文件指定重连间隔，是否开启无限重连
+
+## 1.8.5
+- 后台端口池管理支持批量删除
+- 端口映射下拉选择端口支持搜索
+- 客户端/服务端配置增加心跳日志开关，有需要时开启，方便排查问题
+- 客户端/服务端读写超时逻辑微调
+
+## 1.8.6
+- 端口映射选择端口支持分页
+- 新增/更新端口映射，增加端口占用检测（端口映射编辑时，如果端口号没有变动，则不验证。避免出现端口映射正在使用时，无法更新端口映射其他信息的问题）
+- 下拉搜索license，支持模糊搜索
+- license下拉用户搜索，支持模糊搜索
+- 端口映射HTTP(S)新增打开网页按钮
+- 客户端断开连接时，记录日志空指针异常问题修复
+
+## 1.9.0
+- 端口映射支持UDP协议
+- 端口映射HTTP(S)新增打开网页按钮，优先使用域名打开
+- 新增/编辑端口映射时端口占用检测功能屏蔽，解决docker下使用的各种问题
+
+# 2.x
+## 2.0.0
+- solon版本升级为`2.5.11`
+- jdk版本升级为17
+- 支持原生编译改造
+- 默认支持的数据库由sqlite改为h2
+
+## 2.0.1
+- jdk版本升级为21
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
+
+## 2.0.2
+- 升级solon版本到2.7.0-M2，解决不在当前目录下启动时找不到配置文件的问题
+- client抽出sdk（还需测试windows原生部署、进一步抽出neutrino-proxy-sdk）
+- 修复管理后台分页查询的已知问题
+- 修复native下，批量删除端口池报错的问题

client+/neutrino-proxy-client-starter/Dockerfile

@@ -0,0 +1,16 @@
+FROM openjdk:21-jdk-oracle
+#同步时间
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
+#    apk update && apk add wget unzip vim && apk add -U tzdata && \
+#    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 设置时区为北京时间
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN mkdir -p /root/neutrino-proxy/config
+WORKDIR /root/neutrino-proxy
+COPY ./target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
+COPY src/main/resources/app-copy.yml /root/neutrino-proxy/config/app.yml
+#VOLUME ["/root/neutrino-proxy"]
+ENTRYPOINT ["java","-jar","neutrino-proxy-client.jar","config=./config/app.yml"]
+
+#docker run -it -d --restart=always --name np_client -e SERVER_IP=127.0.0.1

client+/neutrino-proxy-client-starter/pom.xml

@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.github.javpower</groupId>
+    <artifactId>neutrino-proxy-client-spring-boot-starter</artifactId>
+    <version>2.0.1</version>
+    <name>neutrino-proxy-client-spring-boot-starter</name>
+    <description>a tool about easy neutrino-proxy-client</description>
+    <url>https://github.com/javpower/neutrino-proxy</url>
+    <licenses>
+        <license>
+            <name> The Apache Software License, Version 2.0 </name>
+            <url> http://www.apache.org/licenses/LICENSE-2.0.txt </url>
+            <distribution> repo </distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>https://github.com/javpower/neutrino-proxy</url>
+        <connection>scm:[email protected]/javpower/neutrino-proxy.git</connection>
+        <developerConnection>scm:[email protected]/javpower/neutrino-proxy.git</developerConnection>
+    </scm>
+    <developers>
+        <developer>
+            <name>gc.x</name>
+            <email>[email protected]</email>
+            <organization> https://github.com/javpower</organization>
+            <timezone>+8</timezone>
+        </developer>
+    </developers>
+    <properties>
+        <mica-auto.version>2.3.2</mica-auto.version>
+        <spring-boot.version>2.7.13</spring-boot.version>
+        <revision>2.0.1</revision>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara.neutrino-proxy</groupId>
+            <artifactId>neutrino-proxy-client-sdk</artifactId>
+            <version>${revision}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.36</version>
+        </dependency>
+        <!-- 其他依赖项... -->
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>1.2.12</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+        </dependency>
+        <!--SSH中转隧道-->
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.54</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jzlib</artifactId>
+            <version>1.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>net.dreamlu</groupId>
+            <artifactId>mica-auto</artifactId>
+            <version>${mica-auto.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ossrh</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url> https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
+    </distributionManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${spring-boot.version}</version>
+                <configuration>
+                    <mainClass>org.dromara.neutrinoproxy.client.starter.SpringProxyClient</mainClass>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.plugins</groupId>
+                <artifactId>nexus-staging-maven-plugin</artifactId>
+                <version>1.6.7</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <serverId>ossrh</serverId>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId> org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>2.2.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9.1</version>
+                <configuration>
+                    <show>private</show>
+                    <nohelp>true</nohelp>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
+                    <additionalparam>-Xdoclint:none</additionalparam>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.client.starter;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@SpringBootApplication
+@Slf4j
+public class SpringProxyClient {
+
+    public static void main(String[] args) {
+        SpringApplication.run(SpringProxyClient.class, args);
+    }
+
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.client.starter.config;
+
+import org.dromara.neutrinoproxy.client.starter.util.ApplicationContextUtils;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+/**
+ * 启动监听
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Component
+public class MainBusListeners implements ApplicationListener<ContextRefreshedEvent> {
+    @Override
+    public void onApplicationEvent(ContextRefreshedEvent event) {
+        ApplicationContextUtils.setContext(event.getApplicationContext());
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java

@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.client.starter.config;
+
+import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
+import org.dromara.neutrinoproxy.client.starter.util.ApplicationContextUtils;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 代理配置
+ * @author: aoshiguchen
+ * @date: 2022/10/8
+ */
+@Component
+public class ProxyConfiguration extends ProxyMessageFactory {
+
+    @Override
+    public void stop() {
+        ApplicationContextUtils.stop();
+    }
+
+    @Override
+    public boolean isAotRuntime() {
+        return false;
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java

@@ -0,0 +1,78 @@
+package org.dromara.neutrinoproxy.client.starter.config;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.client.starter.ssh.SSHProxy;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Data
+@ConfigurationProperties(prefix = "neutrino.proxy")
+@Component
+public class SpringProxyConfig {
+    private Boolean enable=false;
+    private Boolean sshEnable=false;
+	private Protocol protocol;
+	private Tunnel tunnel;
+	private Client client;
+    private List<SSHProxy> sshProxys;
+
+	@Data
+	public static class Protocol {
+		private Integer maxFrameLength;
+		private Integer lengthFieldOffset;
+		private Integer lengthFieldLength;
+		private Integer initialBytesToStrip;
+		private Integer lengthAdjustment;
+		private Integer readIdleTime;
+		private Integer writeIdleTime;
+		private Integer allIdleTimeSeconds;
+	}
+
+	@Data
+	public static class Tunnel {
+		private String keyStorePassword;
+		private String jksPath;
+		private String serverIp;
+		private Integer serverPort;
+		private Boolean sslEnable;
+		private Integer obtainLicenseInterval;
+		private String licenseKey;
+		private Integer threadCount;
+		private String clientId;
+		private Boolean transferLogEnable;
+		private Boolean heartbeatLogEnable;
+		private Reconnection reconnection;
+	}
+
+	@Data
+	public static class Client {
+//		private Tcp tcp;
+		private Udp udp;
+	}
+
+	@Data
+	public static class Reconnection {
+		private Integer intervalSeconds;
+		private Boolean unlimited;
+	}
+
+	@Data
+	public static class Tcp {
+
+	}
+
+	@Data
+	public static class Udp {
+		private Integer bossThreadCount;
+		private Integer workThreadCount;
+		private String puppetPortRange;
+		private Boolean transferLogEnable;
+	}
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java

@@ -0,0 +1,42 @@
+package org.dromara.neutrinoproxy.client.starter.core;
+
+import cn.hutool.core.bean.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.starter.config.ProxyConfiguration;
+import org.dromara.neutrinoproxy.client.starter.config.SpringProxyConfig;
+import org.dromara.neutrinoproxy.client.starter.ssh.SSHConnectionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * 代理客户端服务
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Slf4j
+@Component
+public class ProxyClientService implements ApplicationRunner {
+
+    @Autowired
+    private ProxyConfiguration proxyConfiguration;
+    @Autowired
+    private SpringProxyConfig springProxyConfig;
+    @Override
+    public void run(ApplicationArguments args) {
+        if(springProxyConfig.getEnable()){
+            log.info("start....");
+            ProxyConfig proxyConfig = BeanUtil.toBean(springProxyConfig, ProxyConfig.class);
+            proxyConfiguration.start(proxyConfig);
+            log.info("start success!");
+        }
+        if(springProxyConfig.getSshEnable()){
+            springProxyConfig.getSshProxys().forEach(sshProxy -> {
+                String sshId = SSHConnectionFactory.factory.addConnection(sshProxy);
+                SSHConnectionFactory.factory.openTunnel(sshId);
+            });
+        }
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHConnectionFactory.java

@@ -0,0 +1,10 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public class SSHConnectionFactory {
+    public static final SSHConnectionService factory = new SSHConnectionServiceImpl();
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHConnectionService.java

@@ -0,0 +1,14 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public interface SSHConnectionService {
+    String addConnection(String host, String username, String password, int localPort, int remotePort,String remoteHost);
+    String addConnection(SSHProxy sshProxy);
+    void openTunnel(String sshId);
+    void closeTunnel(String sshId);
+    void closeAllTunnels();
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHConnectionServiceImpl.java

@@ -0,0 +1,71 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public class SSHConnectionServiceImpl implements SSHConnectionService {
+
+    private Map<String, SSHProxy> connections;
+    private Map<String, SSHProxyFactory> factories;
+
+    public SSHConnectionServiceImpl() {
+        connections = new HashMap<>();
+        factories = new HashMap<>();
+    }
+
+    @Override
+    public String addConnection(String host, String username, String password, int localPort, int remotePort,String remoteHost) {
+        SSHProxy connection = new SSHProxy();
+        String sshId = UUID.randomUUID().toString();
+        connection.setSshId(sshId);
+        connection.setHost(host);
+        connection.setUsername(username);
+        connection.setPassword(password);
+        connection.setLocalPort(localPort);
+        connection.setRemotePort(remotePort);
+        connection.setRemoteHost(remoteHost);
+        connections.put(connection.getSshId(), connection);
+        return sshId;
+    }
+    @Override
+    public String addConnection(SSHProxy sshProxy) {
+        String sshId = UUID.randomUUID().toString();
+        sshProxy.setSshId(sshId);
+        connections.put(sshProxy.getSshId(), sshProxy);
+        return sshId;
+    }
+
+    @Override
+    public void openTunnel(String sshId) {
+        SSHProxy connection = connections.get(sshId);
+        if (connection != null && !factories.containsKey(sshId)) {
+            SSHProxyFactory factory = new SSHProxyFactoryImpl(connection);
+            factory.openTunnel();
+            factories.put(sshId, factory);
+        }
+    }
+
+    @Override
+    public void closeTunnel(String sshId) {
+        SSHProxyFactory factory = factories.get(sshId);
+
+        if (factory != null) {
+            factory.closeTunnel();
+            factories.remove(sshId);
+        }
+    }
+
+    @Override
+    public void closeAllTunnels() {
+        for (Map.Entry<String, SSHProxyFactory> entry : factories.entrySet()) {
+            SSHProxyFactory factory = entry.getValue();
+            factory.closeTunnel();
+        }
+        factories.clear();
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHProxy.java

@@ -0,0 +1,27 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+
+import lombok.Data;
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Data
+public class SSHProxy {
+    private String sshId;
+
+    //跳板机服务器公网IP
+    private String host;
+    //跳板机服务器登录名
+    private String username;
+    //跳板机登陆密码
+    private String password;
+    //本地的端口
+    private int localPort;
+
+    //需代理服务器端口号
+    private int remotePort;
+    //需代理服务器ip
+    private String remoteHost;
+
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHProxyFactory.java

@@ -0,0 +1,10 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public interface SSHProxyFactory {
+    void openTunnel();
+    void closeTunnel();
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/ssh/SSHProxyFactoryImpl.java

@@ -0,0 +1,63 @@
+package org.dromara.neutrinoproxy.client.starter.ssh;
+
+import com.jcraft.jsch.JSch;
+import com.jcraft.jsch.Session;
+import lombok.extern.slf4j.Slf4j;
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Slf4j
+public class SSHProxyFactoryImpl implements SSHProxyFactory {
+    private SSHProxy connection;
+    private Session session;
+
+    public SSHProxyFactoryImpl(SSHProxy connection) {
+        this.connection = connection;
+    }
+
+    @Override
+    public void openTunnel() {
+        try {
+            JSch jsch = new JSch();
+            session = jsch.getSession(connection.getUsername(), connection.getHost(), 22);
+            session.setPassword(connection.getPassword());
+            // 开启调试模式，打印更多详细日志
+            java.util.Properties config = new java.util.Properties();
+            config.put("StrictHostKeyChecking", "no");
+            config.put("userauth.gssapi-with-mic", "no");
+            config.put("compression.s2c", "[email protected],zlib,none");
+            config.put("compression.c2s", "[email protected],zlib,none");
+            session.setConfig(config);
+            session.setDaemonThread(true);
+            JSch.setLogger(new com.jcraft.jsch.Logger() {
+                public boolean isEnabled(int level) {
+                    return true;
+                }
+                public void log(int level, String message) {
+                    log.info("JSch - " + level + ": " + message);
+                }
+            });
+
+            int assignedPort = session.setPortForwardingL(connection.getLocalPort(), connection.getRemoteHost(), connection.getRemotePort());
+            session.connect(10000);
+            if (assignedPort != -1) {
+                log.info("SSH connection established successfully!");
+            }  else {
+                log.info("Failed to establish SSH connection!");
+            }
+        } catch (Exception e) {
+            // 异常处理
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void closeTunnel() {
+        if (session != null && session.isConnected()) {
+            session.disconnect();
+            log.info("SSH connection closed successfully!");
+        }
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java

@@ -0,0 +1,44 @@
+package org.dromara.neutrinoproxy.client.starter.util;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.GenericBeanDefinition;
+import org.springframework.boot.SpringApplication;
+import org.springframework.context.ApplicationContext;
+
+/**
+ * ApplicaitonContext工具类
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public class ApplicationContextUtils {
+
+    private static ApplicationContext context;
+
+    public static void setContext(ApplicationContext applicationContext) {
+        context = applicationContext;
+    }
+
+    public static Object getBean(String beanName) {
+        return context.getBean(beanName);
+    }
+    public static void stop(){
+        SpringApplication.exit(context);
+    }
+    public static <T> T getBean(String beanName,Class<T> t) {
+        return context.getBean(beanName,t);
+    }
+    public static <T> T getBean(Class<T> t) {
+        return context.getBean(t);
+    }
+
+    public static void addBean(String beanName,Object bean){
+        // 获取BeanFactory
+        DefaultListableBeanFactory beanFactory = (DefaultListableBeanFactory) context.getAutowireCapableBeanFactory();
+        // 创建Bean信息
+        GenericBeanDefinition beanDefinition = new GenericBeanDefinition();
+        beanDefinition.setBeanClass(bean.getClass());
+        beanDefinition.setInstanceSupplier(() -> bean);
+        // 注入Bean
+        beanFactory.registerBeanDefinition(beanName, beanDefinition);
+    }
+}

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/RemoteDeployUtil.java

@@ -0,0 +1,139 @@
+package org.dromara.neutrinoproxy.client.starter.util;
+
+import com.jcraft.jsch.*;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.*;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+/**
+ * 远程发布工具类
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+@Slf4j
+public class RemoteDeployUtil {
+
+    public static void uploadAndStartJar(List<String> localFilePaths, String remoteDirectory, String remoteStartCommand,
+                                  String remoteUsername, String remoteHost, String remotePassword) {
+        log.info("Start=================");
+        JSch jsch = new JSch();
+        Session session = null;
+        ChannelSftp channelSftp = null;
+        try {
+            session = jsch.getSession(remoteUsername, remoteHost, 22);
+            session.setPassword(remotePassword);
+            session.setConfig("StrictHostKeyChecking", "no");
+            session.connect();
+            channelSftp = (ChannelSftp) session.openChannel("sftp");
+            channelSftp.connect();
+            // 创建远程目录（如果不存在）
+            try {
+                channelSftp.cd(remoteDirectory);
+            } catch (SftpException e) {
+                channelSftp.mkdir(remoteDirectory);
+                channelSftp.cd(remoteDirectory);
+            }
+            // 上传本地文件到远程服务器指定目录
+            for (String localFilePath : localFilePaths) {
+                uploadFileWithProgress(channelSftp, localFilePath, remoteDirectory);
+            }
+            channelSftp.disconnect();
+            // 执行远程命令启动jar包
+            log.info("Command:"+remoteStartCommand);
+            ChannelExec channelExec = (ChannelExec) session.openChannel("exec");
+            channelExec.setCommand(remoteStartCommand);
+            ByteArrayOutputStream commandOutput = new ByteArrayOutputStream();
+            channelExec.setOutputStream(commandOutput);
+            channelExec.connect();
+            // 使用新线程读取并打印命令输出
+            Thread outputThread = new Thread(() -> {
+                try (BufferedReader reader = new BufferedReader(new InputStreamReader(channelExec.getInputStream()))) {
+                    String line;
+                    while ((line = reader.readLine()) != null) {
+                        System.out.println(line);
+                    }
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            });
+            outputThread.start();
+            // 等待命令执行完成
+            while (!channelExec.isClosed()) {
+                Thread.sleep(1000);
+            }
+            // 等待命令输出线程结束
+            outputThread.join();
+            channelExec.disconnect();
+            log.info("=================End");
+        } catch (JSchException | SftpException | InterruptedException | IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (channelSftp != null) {
+                channelSftp.disconnect();
+            }
+            if (session != null) {
+                session.disconnect();
+            }
+        }
+    }
+
+    private static void uploadFileWithProgress(ChannelSftp channelSftp, String localFilePath, String remoteDirectory) throws SftpException, IOException {
+        File file = new File(localFilePath);
+        String fileName = file.getName();
+        String remoteFilePath = remoteDirectory + File.separator + fileName;
+        AtomicLong uploadedSize = new AtomicLong();
+        try (InputStream inputStream = new FileInputStream(file)) {
+            // 如果远程目录已经存在同名文件，则先备份原文件
+            if (fileExists(channelSftp, remoteFilePath)) {
+                backupRemoteFile(channelSftp, remoteFilePath);
+            }
+            channelSftp.put(inputStream, remoteFilePath, new SftpProgressMonitor() {
+                @Override
+                public void init(int op, String src, String dest, long max) {
+                    // 初始化回调函数，可以做一些准备工作
+                }
+                @Override
+                public void end() {
+                    // 上传结束回调函数，可以做一些清理工作
+                }
+                @Override
+                public boolean count(long count) {
+                    uploadedSize.addAndGet(count);
+                    // 计算上传进度
+                    int progress = (int) ((uploadedSize.get() * 100) / file.length());
+
+                    // 每上传 10% 显示一次进度，可根据实际情况调整
+                    if (progress % 10 == 0) {
+                        log.info(fileName+"-----Upload progress: " + progress + "%");
+                    }
+                    // 返回 true 则继续传输，否则中止传输
+                    return true;
+                }
+            }, ChannelSftp.RESUME);
+        }
+    }
+
+    private static boolean fileExists(ChannelSftp channelSftp, String remoteFilePath) {
+        try {
+            channelSftp.lstat(remoteFilePath);
+            return true;
+        } catch (SftpException e) {
+            return false;
+        }
+    }
+
+    private static void backupRemoteFile(ChannelSftp channelSftp, String remoteFilePath) throws SftpException {
+        LocalDateTime now = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
+        String backupTime = now.format(formatter);
+        String backupFilePath = remoteFilePath + "." + backupTime;
+        channelSftp.rename(remoteFilePath, backupFilePath);
+        log.info("Remote file already exists. Backing up the original file as: " + backupFilePath);
+    }
+}
+
+
+

client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/SSHClient.java

@@ -0,0 +1,122 @@
+package org.dromara.neutrinoproxy.client.starter.util;
+
+import com.jcraft.jsch.*;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.file.Paths;
+import java.util.Scanner;
+/**
+ * 简易ssh客户端
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public class SSHClient {
+
+    private static final String COMMAND_UPLOAD = "upload";
+    private Session session;
+
+    public void connect(String remoteHost, String remoteUsername, String remotePassword) {
+        JSch jsch = new JSch();
+        try {
+            session = jsch.getSession(remoteUsername, remoteHost, 22);
+            session.setPassword(remotePassword);
+            session.setConfig("StrictHostKeyChecking", "no");
+            session.connect();
+            System.out.println("Connected to " + remoteHost);
+        } catch (JSchException e) {
+            e.printStackTrace();
+        }
+    }
+    public void startShell() {
+        if (session == null || !session.isConnected()) {
+            System.out.println("Not connected to a remote host");
+            return;
+        }
+        Channel channel;
+        try {
+            channel = session.openChannel("shell");
+            channel.connect();
+            Scanner scanner = new Scanner(System.in);
+            String line;
+            while (true) {
+                System.out.print("$ ");
+                line = scanner.nextLine();
+                if (line.equals("exit")) {
+                    break;
+                } else if (line.startsWith(COMMAND_UPLOAD)) {
+                    processUploadCommand(line);
+                } else {
+                    System.out.println("Executing command: " + line);
+                    executeCommand(line);
+                }
+            }
+        } catch (JSchException e) {
+            e.printStackTrace();
+        }finally {
+            disconnect();
+        }
+    }
+
+    public void disconnect() {
+        if (session != null && session.isConnected()) {
+            session.disconnect();
+            System.out.println("Disconnected from remote host");
+        }
+    }
+
+    private void processUploadCommand(String command) {
+        String[] parts = command.split("\\s+");
+        if (parts.length < 3) {
+            System.out.println("Invalid upload command");
+            return;
+        }
+        String localFilePath = parts[1];
+        String remoteDirectory = parts[2];
+        String remoteFilename = Paths.get(localFilePath).getFileName().toString();
+        if (parts.length >= 4) {
+            remoteFilename = parts[3];
+        }
+        uploadFile(localFilePath, remoteDirectory, remoteFilename);
+    }
+
+    private void uploadFile(String localFilePath, String remoteDirectory, String remoteFilename) {
+        ChannelSftp channelSftp = null;
+        try {
+            channelSftp = (ChannelSftp) session.openChannel("sftp");
+            channelSftp.connect();
+            channelSftp.cd(remoteDirectory);
+            System.out.println("Uploading file: " + localFilePath + " to: " + remoteDirectory + "/" + remoteFilename);
+            channelSftp.put(localFilePath, remoteFilename);
+            System.out.println("File uploaded successfully");
+        } catch (JSchException | SftpException e) {
+            e.printStackTrace();
+        } finally {
+            if (channelSftp != null) {
+                channelSftp.disconnect();
+            }
+        }
+    }
+    private void executeCommand(String command) {
+        ChannelExec channelExec = null;
+
+        try {
+            channelExec = (ChannelExec) session.openChannel("exec");
+            channelExec.setCommand(command);
+            BufferedReader in = new BufferedReader(new InputStreamReader(channelExec.getInputStream()));
+            channelExec.connect();
+            String line;
+            while ((line = in.readLine()) != null) {
+                System.out.println(line);
+            }
+            channelExec.disconnect();
+        } catch (JSchException | IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (channelExec != null) {
+                channelExec.disconnect();
+            }
+        }
+    }
+}

client+/neutrino-proxy-client-starter/src/main/resources/application.yml

@@ -0,0 +1,61 @@
+server:
+  port: 8201
+spring:
+  application:
+    name: neutrino-proxy-client
+neutrino:
+  proxy:
+    protocol:
+      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:
+      # 线程池相关配置，用于技术调优，可忽略
+      thread-count: 50
+      # 隧道SSL证书配置
+      key-store-password: ${STORE_PASS:123456}
+      jks-path: ${JKS_PATH:classpath:/test.jks}
+      # 服务端IP
+      server-ip: ${SERVER_IP:}
+      # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
+      server-port: ${SERVER_PORT:9002}
+      # 是否启用SSL(注意：该配置必须和server-port对应上)
+      ssl-enable: ${SSL_ENABLE:true}
+      # 客户端连接唯一凭证
+      license-key: ${LICENSE_KEY:}
+      # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
+      client-id: ${CLIENT_ID:}
+      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
+      transfer-log-enable: ${CLIENT_LOG:false}
+      # 是否开启心跳日志
+      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
+      # 重连设置
+      reconnection:
+        # 重连间隔（秒）
+        interval-seconds: 10
+        # 是否开启无限重连(未开启时，客户端license不合法会自动停止应用，开启了则不会，请谨慎开启)
+        unlimited: false
+    client:
+      udp:
+        # 线程池相关配置，用于技术调优，可忽略
+        boss-thread-count: 5
+        work-thread-count: 20
+        # udp傀儡端口范围
+        puppet-port-range: 10000-10500
+        # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
+        transfer-log-enable: ${CLIENT_LOG:false}
+    enable: true
+    sshEnable: false
+    sshProxys[0]:
+      host:
+      username:
+      password:
+      localPort:
+      remotePort:
+      remoteHost:
+

docs/article/2023/03/index.MD

@@ -20,7 +20,7 @@
 > 从1.9.0之前的版本升级需要注意：
 - 在项目`neutrino-proxy-server/src/main/resources/sql`目录下找到mysql/sqlite的增量sql文件`UPDATE-20230922.SQL`,执行更新自己的中微子代理数据库
 - 参照[官网服务端配置](https://dromara.gitee.io/neutrino-proxy/pages/f2d0f1)调整现有的服务端配置
-- 参照[官网客户端配置](https://dromara.gitee.io/neutrino-proxy/pages/50ce10)吊证现有的客户端配置
+- 参照[官网客户端配置](https://dromara.gitee.io/neutrino-proxy/pages/50ce10)调整现有的客户端配置
 - 从[仓库发行版](https://gitee.com/dromara/neutrino-proxy/releases)下载最新版本的客户端(neutrino-proxy-client.jar)、服务端(neutrino-proxy-server.jar、 neutrino-proxy-admin.zip)部署文件。若为服务端是docker镜像部署，则更新镜像重启即可
 
 ## 项目简介

docs/article/2023/04/index.MD

@@ -0,0 +1,60 @@
+# 中微子代理(NeutrinoProxy)2.0.0重磅发布
+
+## 项目简介
+- [中微子代理(neutrino-proxy)](https://gitee.com/asgc/neutrino-proxy) 是一款基于netty的内网穿透神器。该项目采用最为宽松的MIT协议，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
+- 市面上基于内网穿透的常见产品有：花生壳、TeamView、cpolar等。
+- 常见的使用场景：
+    - 本地开发调试第三方回调
+    - 本地开发异地接口连调
+    - 远程登录内网windows机器
+    - 将本地服务映射到外网，用于演示
+- Gitee仓库：https://gitee.com/dromara/neutrino-proxy
+- Github仓库：https://github.com/dromara/neutrino-proxy
+- 官网地址1: https://neutrino-proxy.dromara.org
+- 官网地址2: https://dromara.gitee.io/neutrino-proxy
+
+## 主要特点：
+- 1、流量监控：首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
+- 2、用户/License：支持多用户、多客户端使用。后台禁用实时生效。
+- 3、端口池：对外端口统一管理，支持用户、License独占端口。
+- 4、端口映射：新增、编辑、删除、禁用实时生效。
+- 5、Docker：服务端/客户端支持Docker一键部署。
+- 6、SSL证书：隧道通信支持SSL加密，保护您的数据安全。
+- 7、域名映射：支持绑定子域名，方便本地调试三方回调
+- 8、多种协议：支持代理TCP、HTTP、HTTPS、UDP协议
+- 9、原生部署：支持编译为原生可执行文件，更低部署门槛、更少内存占用
+- 10、采用最为宽松的MIT协议，免去你的后顾之忧
+
+## 本次更新内容
+- solon版本升级为`2.5.12-M1`
+- jdk版本升级为17
+- 支持原生编译改造
+- 默认支持的数据库由sqlite改为h2
+- 官方默认使用的docker镜像仓库从阿里云改为dockerhub
+
+## 安装使用说明
+- 快速上手：[点击这里](https://neutrino-proxy.dromara.org/neutrino-proxy/pages/793dcb/)
+- 升级须知： 
+  - jdk版本升级为了jdk17，jar部署时请注意
+  - 去掉了默认的sqlite数据库，改为了h2。如果之前使用sqlite，请自行处理数据迁移
+  - 配置文件做了较大调整，请参照官网使用须知中的`服务端配置`、`客户端配置`进行更新
+
+## 运行示例
+#### 本地原生启动截图
+<img src="./run1.png" width="100%"/>
+
+#### 管理后台首页
+<img src="./home.png" width="100%"/>
+
+#### 端口映射
+<img src="./port-mapping2.png" width="100%"/>
+
+## 联系我们
+笔者时间、能力有限，且开源项目非一朝一夕之事，存在众多问题亦在所难免。使用、学习过程中有任何问题欢迎大家与我联系。
+
+对项目有什么想法或者建议，可以加我微信拉交流群，或者创建[issues](https://gitee.com/dromara/neutrino-proxy/issues)，一起完善项目
+
+- 微信号：yuyunshize
+- Email: aoshiguchen@dromara.org
+- 微信二维码（添加时请备注"中微子进群"）：
+  <img src="MyWeChatQRCode.jpeg" width="100%"/>

docs/article/2023/05/index.MD

@@ -0,0 +1,86 @@
+# 从Neutrino-Proxy(中微子代理)到Solon Native
+
+## Neutrino-Proxy(中微子代理)是啥
+#### 项目简介
+- [中微子代理(neutrino-proxy)](https://gitee.com/asgc/neutrino-proxy) 是一款基于netty的内网穿透神器。该项目采用最为宽松的MIT协议，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
+- 市面上基于内网穿透的常见产品有：花生壳、TeamView、cpolar等。
+- 常见的使用场景：
+    - 本地开发调试第三方回调
+    - 本地开发异地接口连调
+    - 远程登录内网windows机器
+    - 将本地服务映射到外网，用于演示
+- Gitee仓库：https://gitee.com/dromara/neutrino-proxy
+- Github仓库：https://github.com/dromara/neutrino-proxy
+- 官网地址1: https://neutrino-proxy.dromara.org
+- 官网地址2: https://dromara.gitee.io/neutrino-proxy
+
+#### 主要特点：
+- 1、流量监控：首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
+- 2、用户/License：支持多用户、多客户端使用。后台禁用实时生效。
+- 3、端口池：对外端口统一管理，支持用户、License独占端口。
+- 4、端口映射：新增、编辑、删除、禁用实时生效。
+- 5、Docker：服务端/客户端支持Docker一键部署。
+- 6、SSL证书：隧道通信支持SSL加密，保护您的数据安全。
+- 7、域名映射：支持绑定子域名，方便本地调试三方回调
+- 8、多种协议：支持代理TCP、HTTP、HTTPS、UDP协议
+- 9、原生部署：支持编译为原生可执行文件，更低部署门槛、更少内存占用
+- 10、采用最为宽松的MIT协议，免去你的后顾之忧
+
+## 为什么开发Neutrino-Proxy(中微子代理)
+2022年4月份左右，因工作原因需要用到内网穿透。此前一段时间使用的`coplar`，由于公司担心带来安全隐患，
+因此决定自己研究一下这一块。
+
+对于常年写业务代码的一介码农来说，内网穿透就是一个黑盒。为了打开这个黑盒，我开始到处找相关的开源项目，其中包括lanproxy、ngrok、nps、frp等。
+
+经过一翻努力，2022年6月份，实现了中微子代理1.0.0。此版本纯粹为了练手， 所以是基于自己手写的一套底层框架(包含Ioc、Aop、SqlMaper(简易版本的mybatis)、xxljob等)，
+实现了客户端/服务端+纯配置文件版本的TCP代理。
+
+千里之行，始于足下。1.0.0版本发布后，经过不断的迭代，如今2.0.0版本终于和大家见面了。
+
+## 为什么选择Solon
+中微子1.0.0版本发布之后，大约7～8个月的时间，进行了大量的更新，主要围绕在底层基础框架、
+管理后台这一块。
+
+此时中微子陆陆续续开始有了一些用户，开始迫切的需要加快代理相关功能的迭代进度。而此时自己手写
+的底层框架成为了最大的掣肘，单单底层框架各种细节优化、测试、参考借鉴其他框架源码这些就足以耗光
+我为数不多的业余时间，更别提在这个尚不成熟的框架上开发代理功能了。任何一次底层的优化调整，可能带来的
+是上层代理功能的大量重构。
+
+于是，我开始搜寻其它替代框架。因日常工作一直都在用Spring体系，我始终相信多种技术两相印证之后学到的东西更为深刻，所以自己的开源项目始终将Spring体系作为优先级最低
+的选项。最终一个或偶然、或必然的机会，我了解到了Solon。
+
+经过对Solon项目源码、官网文档、项目更新频率、生态完善度的深入了解，最终决定选择Solon作为中微子代理的底层框架。
+
+2023年3月12日，中微子代理1.7.0版本发布，开始正式基于Solon框架。
+2023年10月30日，中微子代理2.0.0版本发布，基于Solon Native实现原生部署。
+
+## Solon简介
+#### 项目简介
+- Solon是一个全新的java生态体系，给人带来一种与众不同的开发体验，让你能更快的构建自己的应用、更小的打包产出、更快的启动速度。
+- Gitee仓库：https://gitee.com/noear/solon
+- Github仓库：https://github.com/noear/solon
+- 官网地址：https://solon.noear.org/
+
+#### 主要特性
+> 启动快 5 ～ 10 倍；qps 高 2～ 3 倍；运行时内存节省 1/3 ~ 1/2；打包可以缩到 1/2 ~ 1/10
+- 克制、简洁、高效、开放、生态
+- 支持 JDK8、JDK11、JDK17、JDK21
+- Http、WebSocket、Socket 三种信号统一的开发体验（俗称：三源合一）
+- 支持“注解”与“手动”两种模式，按需自由操控
+- Not Servlet，可以适配任何基础通讯框架（最小 0.3m 运行rpc架构）
+- 独特的 IOC/AOP 容器设计。不会因为插件变多而启动变很慢
+- 支持 Web、Data、Job、Remoting、Cloud 等任何开发场景
+- 兼顾 Handler + Context 和 Listener + Message 两种架构模式
+- 强调插件式扩展，可扩展可切换；适应不同的应用场景
+- 支持 GraalVm Native Image 打包
+- 允许业务插件“热插”、“热拔”、“热管理”
+
+## 最后说点什么
+开源实属不易，开源国产生态型基础框架更是举步维艰。不仅需要长时间、持续、稳定的投入迭代、测试、文档撰写、bug修复、发版、推广，
+还经常需要面对来自四面八方汹涌如潮的质疑。
+
+时光无言，它磨灭了一切、也证明着一切。
+
+一千八百多个日日夜夜、五年的风雨兼程，Solon生态已经初具规模，社区汇聚了一大批开源爱好者。
+
+大鹏一日通风起，扶摇直上九万里。我相信国产开源在大家的努力下，一定会越来越好!

docs/article/2023/06/index.md

@@ -0,0 +1,62 @@
+# NeutrinoProxy2.0.1发布，新增IP访问拦截+限速支持
+
+## 项目简介
+- [中微子代理(neutrino-proxy)](https://gitee.com/asgc/neutrino-proxy) 是一款基于Solon、Netty的内网穿透神器。该项目采用最为宽松的MIT协议，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
+- 市面上基于内网穿透的常见产品有：花生壳、TeamView、cpolar等。
+- 常见的使用场景：
+    - 本地开发调试第三方回调
+    - 本地开发异地接口连调
+    - 远程登录内网windows机器
+    - 将本地服务映射到外网，用于演示
+- Gitee仓库：https://gitee.com/dromara/neutrino-proxy
+- Github仓库：https://github.com/dromara/neutrino-proxy
+- 官网地址1: https://neutrino-proxy.dromara.org
+- 官网地址2: https://dromara.gitee.io/neutrino-proxy
+
+## 主要特点：
+- 1、流量监控：首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
+- 2、用户/License：支持多用户、多客户端使用。后台禁用实时生效。
+- 3、端口池：对外端口统一管理，支持用户、License独占端口。
+- 4、端口映射：新增、编辑、删除、禁用实时生效。
+- 5、Docker：服务端/客户端支持Docker一键部署。
+- 6、SSL证书：隧道通信支持SSL加密，保护您的数据安全。
+- 7、域名映射：支持绑定子域名，方便本地调试三方回调
+- 8、多种协议：支持代理TCP、HTTP、HTTPS、UDP协议
+- 9、原生部署：支持编译为原生可执行文件，更低部署门槛、更少内存占用
+- 10、安全组：支持黑/白名单IP访问限制
+- 11、限速：支持对License、端口映射限制上传/下载速度
+- 12、采用最为宽松的MIT协议，免去你的后顾之忧
+
+## 本次更新内容
+- jdk版本升级为21
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
+
+## 安装使用说明
+- 快速上手：https://neutrino-proxy.dromara.org/neutrino-proxy/pages/793dcb/
+- 升级须知： 
+  - jdk版本升级为了jdk21，jar部署时请注意
+  - 涉及到表结构变更，执行增量SQL：https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231215.SQL
+
+## 运行示例
+#### License限速
+<img src="./license2.png" width="100%"/>
+
+#### 端口映射限速
+<img src="./port-mapping2.png" width="100%"/>
+
+#### 安全组
+<img src="./security-group1.png" width="100%"/>
+<img src="./security-rule1.png" width="100%"/>
+
+## 联系我们
+笔者时间、能力有限，且开源项目非一朝一夕之事，存在众多问题亦在所难免。使用、学习过程中有任何问题欢迎大家与我联系。
+
+对项目有什么想法或者建议，可以加我微信拉交流群，或者创建[issues](https://gitee.com/dromara/neutrino-proxy/issues)，一起完善项目
+
+- 微信号：yuyunshize
+- Email: aoshiguchen@dromara.org
+- 微信二维码（添加时请备注"中微子进群"）：
+  <img src="MyWeChatQRCode.jpeg" width="100%"/>

neutrino-proxy-admin/package.json

@@ -23,7 +23,7 @@
     "codemirror": "5.32.0",
     "dropzone": "5.2.0",
     "echarts": "3.8.5",
-    "element-ui": "2.0.8",
+    "element-ui": "^2.15.14",
     "file-saver": "1.3.3",
     "font-awesome": "4.7.0",
     "js-cookie": "2.2.0",
@@ -70,7 +70,7 @@
     "friendly-errors-webpack-plugin": "1.6.1",
     "html-webpack-plugin": "2.30.1",
     "node-notifier": "5.1.2",
-    "node-sass": "^4.7.2",
+    "node-sass": "^9.0.0",
     "optimize-css-assets-webpack-plugin": "3.2.0",
     "ora": "1.3.0",
     "portfinder": "1.0.13",

neutrino-proxy-admin/src/api/portMapping.js

@@ -44,3 +44,22 @@ export function updateEnableStatus(id, enable) {
     }
   })
 }
+
+export function portMappingBindSecurityGroup(id, securityGroupId) {
+  return request({
+    url: '/port-mapping/bind/security-group',
+    method: 'post',
+    data: {
+      id: id,
+      securityGroupId: securityGroupId
+    }
+  })
+}
+
+export function portMappingUnbindSecurityGroup(id) {
+  return request({
+    url: `/port-mapping/unbind/security-group?id=${id}`,
+    method: 'post'
+  })
+}
+

neutrino-proxy-admin/src/api/securityGroup.js

@@ -0,0 +1,109 @@
+import request from '@/utils/request'
+
+export function fetchGroupPage(query) {
+  return request({
+    url: '/security/group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchGroupList() {
+  return request({
+    url: '/security/group/list',
+    method: 'get'
+  })
+}
+
+export function fetchGroupDetail(query) {
+  return request({
+    url: '/security/group/detail',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createGroup(data) {
+  return request({
+    url: `/security/group/create`,
+    method: 'post',
+    data
+  })
+}
+
+export function updateGroup(query) {
+  return request({
+    url: `/security/group/update`,
+    method: 'post',
+    params: query
+  })
+}
+
+export function deleteGroup(data) {
+  return request({
+    url: '/security/group/delete',
+    method: 'post',
+    data
+  })
+}
+
+export function updateGroupEnableStatus(id, enable) {
+  return request({
+    url: '/security/group/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
+  })
+}
+
+export function fetchRulePage(query) {
+  return request({
+    url: '/security/rule/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchRuleList(query) {
+  return request({
+    url: '/security/rule/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function createRule(data) {
+  return request({
+    url: `/security/rule/create`,
+    method: 'post',
+    data
+  })
+}
+
+export function updateRule(data) {
+  return request({
+    url: `/security/rule/update`,
+    method: 'post',
+    data
+  })
+}
+export function deleteRule(query) {
+  return request({
+    url: '/security/rule/delete',
+    method: 'post',
+    params: query
+  })
+}
+
+export function updateRuleEnableStatus(id, enable) {
+  return request({
+    url: '/security/rule/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
+  })
+}

neutrino-proxy-admin/src/components/FBATable/index.vue

@@ -50,7 +50,7 @@
         :hide-on-single-pageInfo="false"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-pageInfo="PaginationData.currentPage"
+        :current-page="PaginationData.currentPage"
         :pageInfo-sizes="[10, 20, 50, 100]"
         :pageInfo-size="PaginationData.pageSize"
         layout="total, sizes, prev, pager, next, jumper"

neutrino-proxy-admin/src/components/Link/linkPopover.vue

@@ -0,0 +1,83 @@
+<template>
+  <el-popover
+    placement="top"
+    :width="width"
+    v-model="visible">
+    <p class="popper-p-css"><i class="el-icon-warning" style="color: #e6a23c"/>{{title}}</p>
+    <div style="text-align: center; margin: 0">
+      <el-button size="mini" @click="handleCancelClick">{{cancelText}}</el-button>
+      <el-button type="primary" size="mini" @click="handleCommitClick">{{okText}}</el-button>
+    </div>
+    <el-link slot="reference" :underline="false" :type="type" :size="size" :icon="icon" :disabled="disabled" style="text-align: left; font-size: 12px">{{buttonText}}</el-link>
+  </el-popover>
+</template>
+
+<script>
+
+  export default {
+    name: 'deleteLink',
+    props: {
+      width: {
+        type: Number,
+        default: 160
+      },
+      buttonText: {
+        type: String,
+        default: '删除'
+      },
+      type: {
+        type: String,
+        default: 'danger'
+      },
+      size: {
+        type: String,
+        default: 'mini'
+      },
+      icon: {
+        type: String,
+        default: ''
+      },
+      disabled: {
+        type: Boolean,
+        default: false
+      },
+      title: {
+        type: String,
+        default: '确定删除吗？'
+      },
+      okText: {
+        type: String,
+        default: '确定'
+      },
+      cancelText: {
+        type: String,
+        default: '取消'
+      }
+    },
+    data() {
+      return {
+        visible: false
+      }
+    },
+    methods: {
+      handleCancelClick() {
+        this.visible = false
+        this.$emit('handleCancelClick')
+      },
+      handleCommitClick() {
+        this.visible = false
+        this.$emit('handleCommitClick')
+      }
+    }
+  }
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .popper-p-css{
+    margin-top: 0px !important;
+    margin-bottom: 5px !important;
+    .el-icon-warning{
+      margin-right: 5px;
+    }
+  }
+</style>

neutrino-proxy-admin/src/lang/zh.js

@@ -48,6 +48,8 @@ export default {
     user: '用户管理',
     system: '系统管理',
     portPool: '端口池管理',
+    securityGroup: '安全组管理',
+    securityRule: '安全规则管理',
     portGroup: '端口分组管理',
     protocal: '协议管理',
     proxy: '代理配置',
@@ -128,6 +130,7 @@ export default {
     confirm: '确 定',
     userId: '用户ID',
     userName: '用户名',
+    name: '名称',
     group: '分组',
     groupName: '分组名称',
     groupPossessor: '分组所属',
@@ -169,7 +172,19 @@ export default {
     totalFlow: '总流量',
     protocalName: '协议',
     supportStatus: '支持状态',
-    domainName: '域名'
+    domainName: '域名',
+    securityGroup: '安全组',
+    defaultPassType: '默认放行类型',
+    ruleName: '规则名称',
+    rule: '规则内容',
+    passType: '放行类型',
+    priority: '优先级',
+    ruleConfig: '配置规则',
+    portMappingBindSecurityGroup: '绑定安全组',
+    securityGroupBindPortMapping: '端口映射绑定',
+    bind: '绑定',
+    unbind: '解绑',
+    bindOtherSecurityGroup: '已绑定其他安全组'
   },
   button: {
     lookOver: '查看'

neutrino-proxy-admin/src/router/index.js

@@ -77,6 +77,8 @@ export const asyncRouterMap = [
       { path: 'user', component: _import('system/user'), name: 'user', meta: { title: 'user' }},
       { path: 'portGroup', component: _import('system/portGroup'), name: 'portGroup', meta: { title: 'portGroup' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
+      { path: 'securityGroup', component: _import('system/securityGroup'), name: 'securityGroup', meta: { title: 'securityGroup' }},
+      { path: 'securityRule', component: _import('system/securityRule'), name: 'securityRule', meta: { title: 'securityRule' }, hidden: true},
       { path: 'protocal', component: _import('system/protocal'), name: 'protocal', meta: { title: 'protocal' }},
       { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
     ]

neutrino-proxy-admin/src/views/log/clientConnectLog.vue

@@ -51,7 +51,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/log/jobLog.vue

@@ -46,7 +46,7 @@
       </el-table-column>-->
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/log/loginLog.vue

@@ -31,7 +31,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/proxy/license.vue

@@ -36,6 +36,11 @@
           <span>{{scope.row.key}}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column width="150px" align="center" :label="$t('table.createTime')">
         <template slot-scope="scope">
           <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
@@ -69,7 +74,7 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
@@ -85,6 +90,12 @@
         <el-form-item :label="$t('License名称')" prop="name">
           <el-input v-model="temp.name"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>

neutrino-proxy-admin/src/views/proxy/portMapping.vue

@@ -39,17 +39,17 @@
           <span>{{ scope.row.userName }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.licenseName')" width="130">
+      <el-table-column align="center" :label="$t('table.licenseName')" width="120">
         <template slot-scope="scope">
           <span>{{ scope.row.licenseName }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.protocalName')" width="100">
+      <el-table-column align="center" :label="$t('table.protocalName')" width="80">
         <template slot-scope="scope">
           <span>{{ scope.row.protocal }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.domainName')" width="200">
+      <el-table-column align="center" :label="$t('table.domainName')" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.domain }}</span>
         </template>
@@ -64,17 +64,22 @@
           <span>{{ scope.row.clientIp }}:{{ scope.row.clientPort }}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" :label="$t('table.desc')" width="120">
         <template slot-scope="scope">
           <span>{{ scope.row.description }}</span>
         </template>
       </el-table-column>
 
-      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
+<!--      <el-table-column width="150px" align="center" :label="$t('table.createTime')">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+<!--          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
       <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
         <template slot-scope="scope">
           <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
@@ -99,8 +104,7 @@
         <template slot-scope="scope">
           <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
           <el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{$t('table.disable')}}</el-button>
-          <el-button v-if="scope.row.enable == '2'" size="mini" type="success"
+          <el-button v-if="scope.row.enable == '2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
-            @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
           <!--          <el-button size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
           <ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px" />
 
@@ -110,7 +114,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-        :current-pageInfo.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+        :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
         layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
@@ -176,6 +180,18 @@
             <template slot="append">毫秒</template>
           </el-input>
         </el-form-item>
+        <el-form-item  :label="$t('table.securityGroup')" prop="securityGroup">
+          <el-select style="width: 280px;" class="filter-item" v-model="temp.securityGroupId" clearable >
+            <el-option v-for="item in securityGroupList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
         <el-form-item :label="$t('描述')" prop="description">
           <el-input v-model="temp.description"></el-input>
         </el-form-item>
@@ -204,6 +220,7 @@
 
 <script>
 import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
+import { fetchGroupList } from '@/api/securityGroup'
 import { availablePortList, portAvailable } from '@/api/portPool'
 import { licenseList, licenseAuthList } from '@/api/license'
 import { protocalList } from '@/api/protocal'
@@ -325,6 +342,7 @@ export default {
         licenseId:null,
       },
       more: true,
+      securityGroupList: []
     }
   },
   filters: {
@@ -359,6 +377,7 @@ export default {
     this.getLicenseList()
     this.getLicenseAuthList()
     this.getProtocalList()
+    this.fetchSecurityGroupList()
   },
   methods: {
     getList() {
@@ -380,6 +399,13 @@ export default {
         this.getList()
       })
     },
+    fetchSecurityGroupList () {
+      fetchGroupList().then(res => {
+        if(res.data.code == 0) {
+          this.securityGroupList = res.data.data
+        }
+      })
+    },
     getDomainNameBindInfo() {
       domainNameBindInfo().then(response => {
         this.domainName = response.data.data
@@ -484,6 +510,9 @@ export default {
     },
     handleUpdate(row) {
       this.temp = Object.assign({}, row) // copy obj
+      if (row.securityGroupId === 0) {
+        this.temp.securityGroupId = null
+      }
       this.temp.timestamp = new Date(this.temp.timestamp)
       this.dialogStatus = 'update'
       this.dialogFormVisible = true

neutrino-proxy-admin/src/views/report/licenseFlowMonthReport.vue

@@ -44,7 +44,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/report/licenseFlowReport.vue

@@ -41,7 +41,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/report/userFlowMonthReport.vue

@@ -36,7 +36,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/report/userFlowReport.vue

@@ -37,7 +37,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/jobManager.vue

@@ -51,7 +51,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/portGroup.vue

@@ -58,7 +58,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current"
+                     :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size"
                      layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>

neutrino-proxy-admin/src/views/system/portPool.vue

@@ -55,7 +55,7 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/protocal.vue

@@ -28,7 +28,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current"
+                     :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size"
                      layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>

neutrino-proxy-admin/src/views/system/securityGroup.vue

@@ -0,0 +1,463 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container">
+      <el-input v-model="listQuery.name" style="width:145px;margin-right:10px" placeholder="请输入名称" />
+      <el-input v-model="listQuery.description" style="width:145px;margin-right:10px" placeholder="请输入描述" />
+      <el-select v-model="listQuery.defaultPassType" placeholder="请选择默认放行类型" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.passType" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+          $t('table.search') }}
+      </el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
+              style="width: 100%">
+      <!-- <el-table-column align="center" width="40" type="selection" /> -->
+      <el-table-column align="center" :label="$t('table.id')" width="60">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.name')">
+        <template slot-scope="scope">
+          <span>{{scope.row.name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.desc')">
+        <template slot-scope="scope">
+          <span>{{scope.row.description}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.defaultPassType')">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.defaultPassType | passTypeFilter">{{ scope.row.defaultPassType | passTypeName }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.createTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')"  class-name="small-padding fixed-width" style="display:flex;justify-content:center">
+        <template slot-scope="scope">
+          <div >
+            <el-link :underline="false" type="primary" size="mini" @click="handleGoRulePage(scope.row)" style="font-size: 12px">{{$t('table.ruleConfig')}}</el-link>
+            <el-link :underline="false" type="primary" size="mini" @click="handleUpdate(scope.row)" style="font-size: 12px">{{$t('table.edit')}}</el-link>
+            <el-link :underline="false" v-if="scope.row.enable =='1'" size="mini" type="warning" @click="handleModifyStatus(scope.row, 2)" style="font-size: 12px">{{$t('table.disable')}}</el-link>
+            <el-link :underline="false" v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)" style="font-size: 12px">{{$t('table.enable')}}</el-link>
+          </div>
+          <el-dropdown>
+            <span class="el-dropdown-link" style="font-size: 12px">
+              更多操作<i class="el-icon-arrow-down el-icon--right"></i>
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <LinkPopover @handleCommitClick="handleDelete(scope.row)" style="width: 100%"/>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-link :underline="false" type="primary" size="mini" @click="handlePortMapping(scope.row)" style="font-size: 12px">{{$t('table.securityGroupBindPortMapping')}}</el-link>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="120px" style='width: 500px; margin-left:10px;'>
+        <el-form-item :label="$t('table.name')" prop="name">
+          <el-input :placeholder="$t('table.name')" v-model="temp.name"></el-input>
+        </el-form-item>
+
+        <el-form-item :label="$t('table.desc')" prop="desc">
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" :placeholder="$t('table.desc')" v-model="temp.description"></el-input>
+        </el-form-item>
+
+        <el-form-item  :label="$t('table.defaultPassType')" prop="defaultPassType">
+          <el-tooltip class="item" effect="dark" content="当IP地址不能匹配任何规则时，默认执行的放行类型" placement="bottom">
+            <el-select style="width: 380px" class="filter-item" v-model="temp.defaultPassType" :disabled="dialogStatus === 'update'">
+              <el-option v-for="item in  passTypeList" :key="item.key" :label="item.key" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-tooltip>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+        <el-button v-else type="primary" @click="updateData">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
+    <el-dialog :title="$t('table.securityGroupBindPortMapping')+'---'+forBindProtMappingSecurityGroup.name+'安全组'" :visible.sync="dialogBindPortMappingVisible" width="90%">
+      <el-table :key='tableKey' :data="portMappingList" v-loading="listLoading" element-loading-text="给我一点时间" border width="100%"
+        highlight-current-row style="width: 100%">
+        <el-table-column align="center" :label="$t('table.id')" width="50">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.licenseName')">
+          <template slot-scope="scope">
+            <span>{{ scope.row.licenseName }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.protocalName')" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.protocal }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.domainName')">
+          <template slot-scope="scope">
+            <span>{{ scope.row.domain }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.serverPort')" width="100">
+          <template slot-scope="scope">
+            <span>{{ scope.row.serverPort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.proxyClient')" width="200">
+          <template slot-scope="scope">
+            <span>{{ scope.row.clientIp }}:{{ scope.row.clientPort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.desc')" width="120">
+          <template slot-scope="scope">
+            <span>{{ scope.row.description }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="120">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" :label="$t('table.actions')" width="150" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" v-if="!scope.row.securityGroupId" @click="handleBind(scope.row)">{{$t('table.bind')}}</el-button>
+            <el-button type="danger" size="mini" v-if="scope.row.securityGroupId && scope.row.securityGroupId == forBindProtMappingSecurityGroup.id" @click="handleUnbind(scope.row)">{{$t('table.unbind')}}</el-button>
+            <span v-if="scope.row.securityGroupId && scope.row.securityGroupId != forBindProtMappingSecurityGroup.id" style="font-size: 12px;">{{$t('table.bindOtherSecurityGroup')}}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="pagination-container">
+        <el-pagination background @size-change="handlePortMappingSizeChange" @current-change="handlePortMappingCurrentChange"
+          :current-page.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
+          layout="total, sizes, prev, pager, next, jumper" :total="portMappingTotal">
+        </el-pagination>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {fetchGroupPage, createGroup, updateGroup, deleteGroup, updateGroupEnableStatus} from '@/api/securityGroup'
+import { fetchList as fetchPortMappingList, portMappingBindSecurityGroup, portMappingUnbindSecurityGroup} from '@/api/portMapping'
+import waves from '@/directive/waves' // 水波纹指令
+import { parseTime } from '@/utils'
+import LinkPopover from '../../components/Link/linkPopover'
+
+  export default {
+    name: 'complexTable',
+    directives: {
+      waves
+    },
+    components: {
+      LinkPopover
+    },
+    data() {
+      return {
+        tableKey: 0,
+        list: [],
+        total: null,
+        listQuery: {
+          current: 1,
+          size: 10,
+          name: undefined,
+          description: undefined,
+          defaultPassType: undefined,
+          enable: undefined
+        },
+        listLoading: true,
+        temp: {
+          id: undefined,
+          name: '',
+          description: '',
+          defaultPassType: undefined
+        },
+        selectObj: {
+          statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+          onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }],
+          passType: [{ label: '允许', value: 1 }, { label: '拒绝', value: 0 }]
+
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: '编辑',
+          create: '新建'
+        },
+        passTypeList: [{key: '允许', value: 1}, {key: '拒绝', value: 0}],
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          name: [{ required: true, message: '安全组名称必填', trigger: 'blur' }],
+          defaultPassType: [{ required: true, message: '默认放行类型必选', trigger: 'blur' }]
+        },
+        downloadLoading: false,
+        checkBoxData:[], //表单勾选的行
+        dialogBindPortMappingVisible: false,
+        forBindProtMappingSecurityGroup: {},
+        portMappingList: [],
+        portMappingTotal: null,
+        portMappingListLoading: false,
+        portMappingListQuery: {
+          current: 1,
+          size: 10,
+          importance: undefined,
+          title: undefined,
+          type: undefined,
+          userId: undefined,
+          license: undefined,
+          port: undefined,
+          isOnline: undefined,
+          enable: undefined,
+          description: undefined
+        },
+      }
+    },
+    filters: {
+      passTypeName(type) {
+        const statusMap = {
+          1: '允许',
+          0: '拒绝'
+        }
+        return statusMap[type]
+      },
+      passTypeFilter(type) {
+        const statusMap = {
+          1: 'success',
+          0: 'danger'
+        }
+        return statusMap[type]
+      },
+      statusName(status) {
+        const statusMap = {
+          1: '启用',
+          2: '禁用'
+        }
+        return statusMap[status]
+      },
+      statusFilter(status) {
+        const statusMap = {
+          1: 'success',
+          2: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
+      // eslint-disable-next-line no-sequences
+      this.getList()
+      this.getPortMappingList()
+    },
+    methods: {
+      getList() {
+        this.listLoading = true
+        fetchGroupPage(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
+          this.listLoading = false
+        })
+      },
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.current = val
+        this.getList()
+      },
+      getPortMappingList() {
+        this.portMappingListLoading = true
+        fetchPortMappingList(this.portMappingListQuery).then(response => {
+          this.portMappingList = response.data.data.records
+          this.portMappingTotal = response.data.data.total
+          this.portMappingListQuery.current = response.data.data.current
+          this.portMappingListLoading = false
+        })
+      },
+      handleModifyStatus(row, enable) {
+        updateGroupEnableStatus(row.id, enable).then(response => {
+          if (response.data.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+          this.getList()
+        })
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          name: '',
+          description: '',
+          defaultPassType: undefined
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            createGroup(this.temp).then(response => {
+              if (response.data.code === 0) {
+                this.dialogFormVisible = false
+                this.$notify({
+                  title: '成功',
+                  message: '创建成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row) // copy obj
+        // this.temp.timestamp = new Date(this.temp.timestamp)
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      updateData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp)
+            updateGroup(tempData).then(response => {
+              if (response.data.code === 0) {
+                this.$notify({
+                  title: '成功',
+                  message: '更新成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.dialogFormVisible = false
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleDelete(row) {
+        deleteGroup({groupId: row.id}).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
+      },
+      handleGoRulePage (row) {
+        this.$router.push({ path: '/system/securityRule', query: { groupId: row.id }})
+
+        // this.$router.push(`/system/securityRule?groupId=${row.id}`)
+      },
+      handlePortMapping(row) {
+        this.dialogBindPortMappingVisible = true
+        this.forBindProtMappingSecurityGroup = row
+      },
+      handlePortMappingSizeChange(val) {
+        this.portMappingListQuery.size = val
+        this.getPortMappingList()
+      },
+      handlePortMappingCurrentChange(val) {
+        this.portMappingListQuery.current = val
+        this.getPortMappingList()
+      },
+      handleBind(portMapping) {
+        portMappingBindSecurityGroup(portMapping.id, this.forBindProtMappingSecurityGroup.id).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '绑定成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getPortMappingList()
+          }
+        })
+      },
+      handleUnbind(portMapping) {
+        portMappingUnbindSecurityGroup(portMapping.id).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '解绑成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getPortMappingList()
+          }
+        })
+      }
+    }
+  }
+</script>

neutrino-proxy-admin/src/views/system/securityRule.vue

@@ -0,0 +1,419 @@
+<template>
+  <div class="app-container calendar-list-container">
+
+    <div>
+      <div style="text-align: center;line-height:48px;font-size:24px">{{group.name}}安全组</div>
+      <div style="text-align: center;font-size:14px; color: #606266">{{group.description}}</div>
+    </div>
+
+    <div class="filter-container">
+      <el-input v-model="listQuery.name" style="width:145px;margin-right:10px" placeholder="请输入名称" />
+      <el-input v-model="listQuery.description" style="width:145px;margin-right:10px" placeholder="请输入描述" />
+<!--      <el-select v-model="listQuery.passType" placeholder="请选择默认放行类型" clearable style="width:145px;margin-right:10px">-->
+<!--          <el-option v-for="item in selectObj.passType" :key="item.value" :label="item.label" :value="item.value" />-->
+<!--      </el-select>-->
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+          <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+          $t('table.search') }}
+      </el-button>
+      <el-button class="filter-item" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
+              style="width: 100%">
+      <!-- <el-table-column align="center" width="40" type="selection" /> -->
+      <el-table-column align="center" :label="$t('table.id')" width="60">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.ruleName')">
+        <template slot-scope="scope">
+          <span>{{scope.row.name}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.desc')">
+        <template slot-scope="scope">
+          <span>{{scope.row.description}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.rule')">
+        <template slot-scope="scope">
+          <span>{{scope.row.rule}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.passType')">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.passType | passTypeFilter">{{ scope.row.passType | passTypeName }}</el-tag>
+        </template>
+      </el-table-column>
+<!--      <el-table-column align="center" :label="$t('table.priority')">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{scope.row.priority}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column align="center" :label="$t('table.createTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="150">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" width="250" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-link type="primary" :underline="false" size="mini" @click="handleUpdate(scope.row)" style="font-size:12px">{{$t('table.edit')}}</el-link>
+          <el-link :underline="false" v-if="scope.row.enable =='1'" size="mini" type="warning" @click="handleModifyStatus(scope.row, 2)" style="font-size:12px">{{$t('table.disable')}}</el-link>
+          <el-link :underline="false" v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)" style="font-size:12px">{{$t('table.enable')}}</el-link>
+          <LinkPopover @handleCommitClick="handleDelete(scope.row)"/>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" top="4vh">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="100px" style='margin-left:50px;margin-right: 150px'>
+        <el-form-item :label="$t('table.name')" prop="name">
+          <el-input :placeholder="$t('table.name')" v-model="temp.name"></el-input>
+        </el-form-item>
+
+        <el-form-item :label="$t('table.desc')" prop="desc">
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" :placeholder="$t('table.desc')" v-model="temp.description"></el-input>
+        </el-form-item>
+
+        <el-form-item :label="$t('table.rule')" prop="rule">
+          <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 10}" :placeholder="$t('table.rule')" v-model="temp.rule"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <div style="line-height: 28px; color: cornflowerblue">
+            <div>规则描述:</div>
+            <div>单个ip：192.168.1.1, AA22:BB11:1122:CDEF:1234:AA99:7654:7410, ipv6只支持单个ip判断</div>
+            <div>范围类型：192.168.1.0-192.168.1.255</div>
+            <div>掩码类型：192.168.1.0/24</div>
+            <div>泛型：0.0.0.0/ALL</div>
+            <div>每个类型中间以英文逗号分隔,形如 192.168.1.1,192.168.3.0/24 是正确的 </div>
+          </div>
+        </el-form-item>
+
+
+        <el-form-item  :label="$t('table.passType')" prop="passType">
+          <el-tooltip class="item" effect="dark" :content="temp.passTypeTooltip" placement="right">
+            <!-- <el-button>右边</el-button> -->
+            <el-select class="filter-item" v-model="temp.passType" disabled>
+              <el-option v-for="item in  passTypeList" :key="item.key" :label="item.key" :value="item.value">
+              </el-option>
+            </el-select>
+          </el-tooltip>
+
+        </el-form-item>
+
+        <!-- <el-form-item :label="$t('table.priority')" prop="priority">
+          <el-input-number v-model="temp.priority" :min="1" :max="1000" :placeholder="$t('table.priority')"></el-input-number>
+        </el-form-item> -->
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+        <el-button v-else type="primary" @click="updateData">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {fetchGroupDetail, fetchRulePage, createRule, updateRule, deleteRule, updateRuleEnableStatus} from '@/api/securityGroup'
+import waves from '@/directive/waves' // 水波纹指令
+import { parseTime } from '@/utils'
+import LinkPopover from '../../components/Link/linkPopover'
+
+  export default {
+    name: 'complexTable',
+    directives: {
+      waves
+    },
+    components: {
+      LinkPopover
+    },
+    data() {
+      return {
+        groupId: 1,
+        group: {},
+        tableKey: 0,
+        list: [],
+        total: null,
+        listQuery: {
+          current: 1,
+          size: 10,
+          groupId: undefined,
+          name: undefined,
+          description: undefined,
+          passType: undefined,
+          enable: undefined
+        },
+        listLoading: true,
+        temp: {
+          id: undefined,
+          groupId: undefined,
+          name: '',
+          description: '',
+          rule: '',
+          passType: undefined,
+          passTypeTooltip: '',
+          priority: 1
+        },
+        selectObj: {
+            statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+            onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }],
+            passType: [{ label: '允许', value: 1 }, { label: '拒绝', value: 2 }]
+
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: '编辑',
+          create: '新建'
+        },
+        passTypeList: [{key: '允许', value: 1}, {key: '拒绝', value: 0}],
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          name: [{ required: true, message: '安全组名称必填', trigger: 'blur' }],
+          rule: [{ required: true, message: '规则内容必填', trigger: 'blur' }],
+          // passType: [{ required: true, message: '放行类型必选', trigger: 'blur' }],
+          // priority: [{ required: true, message: '优先级必填', trigger: 'blur' }]
+        },
+        downloadLoading: false,
+        checkBoxData:[], //表单勾选的行
+      }
+    },
+    filters: {
+      passTypeName(type) {
+        const statusMap = {
+          1: '允许',
+          0: '拒绝'
+        }
+        return statusMap[type]
+      },
+      passTypeFilter(type) {
+        const statusMap = {
+          1: 'success',
+          0: 'danger'
+        }
+        return statusMap[type]
+      },
+      statusName(status) {
+        const statusMap = {
+          1: '启用',
+          2: '禁用'
+        }
+        return statusMap[status]
+      },
+      statusFilter(status) {
+        const statusMap = {
+          1: 'success',
+          2: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
+      // eslint-disable-next-line no-sequences
+      if (this.$route.query.groupId) {
+          this.listQuery.groupId = this.$route.query.groupId
+      } else {
+          this.$notify({
+              title: '错误',
+              message: '没有获取到安全组信息',
+              type: 'error',
+              duration: 3000
+          })
+          this.$router.push(`/system/securityGroup`)
+          return
+      }
+      this.getGroupDetail()
+      this.getList()
+    },
+    methods: {
+      getGroupDetail () {
+        fetchGroupDetail({id: this.listQuery.groupId}).then(response => {
+          this.group = response.data.data
+        })
+      },
+      getList() {
+        if (!this.listQuery.groupId) {
+          this.$notify({
+              title: '错误',
+              message: '没有获取到安全组信息',
+              type: 'error',
+              duration: 3000
+            })
+          return
+        }
+        this.listLoading = true
+        fetchRulePage(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
+          this.listLoading = false
+        })
+      },
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.current = val
+        this.getList()
+      },
+      handleEnableStatus(row) {
+        enableRule(row.id).then(response => {
+          if (response.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.getList()
+          }
+        })
+      },
+      handleDisableStatus(row) {
+        disableRule(row.id).then(response => {
+          if (response.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.getList()
+          }
+        })
+      },
+      handleModifyStatus(row, enable) {
+        updateRuleEnableStatus(row.id, enable).then(response => {
+          if (response.data.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+          this.getList()
+        })
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          groupId: this.listQuery.groupId,
+          name: '',
+          description: '',
+          rule: '',
+          passType: this.group.defaultPassType == 1 ? 0 : 1,
+          passTypeTooltip: `安全组已设置默认${(this.group.defaultPassType == 1 ? '允许' : '拒绝')}`,
+          priority: 1
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.temp.groupId = this.listQuery.groupId
+            createRule(this.temp).then(response => {
+              if (response.data.code === 0) {
+                this.dialogFormVisible = false
+                this.$notify({
+                  title: '成功',
+                  message: '创建成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.temp.passType = row.passType
+        this.temp.passTypeTooltip = `安全组已设置默认${(this.group.defaultPassType == 1 ? '允许' : '拒绝')}`,
+        this.temp.timestamp = new Date(this.temp.timestamp)
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      updateData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp)
+            tempData.groupId = this.listQuery.groupId
+            updateRule(tempData).then(response => {
+              if (response.data.code === 0) {
+                this.$notify({
+                  title: '成功',
+                  message: '更新成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.dialogFormVisible = false
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleDelete(row) {
+        deleteRule({ruleId: row.id}).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
+      }
+    }
+  }
+</script>

neutrino-proxy-admin/src/views/system/user.vue

@@ -50,7 +50,7 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-client-sdk/Dockerfile

@@ -0,0 +1,16 @@
+FROM openjdk:21-jdk-oracle
+#同步时间
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
+#    apk update && apk add wget unzip vim && apk add -U tzdata && \
+#    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 设置时区为北京时间
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN mkdir -p /root/neutrino-proxy/config
+WORKDIR /root/neutrino-proxy
+COPY ./target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
+COPY ./src/main/resources/app-copy.yml /root/neutrino-proxy/config/app.yml
+#VOLUME ["/root/neutrino-proxy"]
+ENTRYPOINT ["java","-jar","neutrino-proxy-client.jar","config=./config/app.yml"]
+
+#docker run -it -d --restart=always --name np_client -e SERVER_IP=127.0.0.1

neutrino-proxy-client-sdk/pom.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>neutrino-proxy</artifactId>
+        <groupId>org.dromara.neutrino-proxy</groupId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>neutrino-proxy-client-sdk</artifactId>
+    <version>${revision}</version>
+    <packaging>jar</packaging>
+    <properties>
+        <revision>2.0.1</revision>
+<!--        <lombok.version>1.18.30</lombok.version>-->
+        <hutool.version>5.8.20</hutool.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara.neutrino-proxy</groupId>
+            <artifactId>neutrino-proxy-core</artifactId>
+            <version>${revision}</version>
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.noear</groupId>-->
+<!--                    <artifactId>solon-test</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.noear</groupId>-->
+<!--                    <artifactId>solon.aot</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.noear</groupId>-->
+<!--                    <artifactId>solon.logging.logback</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>cn.hutool</groupId>-->
+<!--                    <artifactId>hutool-core</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>cn.hutool</groupId>-->
+<!--                    <artifactId>hutool-cache</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.projectlombok</groupId>-->
+<!--            <artifactId>lombok</artifactId>-->
+<!--            <scope>${lombok.version}</scope>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>2.20.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>${project.basedir}/src/main/resources</directory>
+                <filtering>false</filtering>
+
+                <excludes>
+                    <exclude>app-dev.yml</exclude>
+                </excludes>
+            </resource>
+        </resources>
+<!--        <plugins>-->
+<!--            &lt;!&ndash; 配置打包插件（并打包成胖包） &ndash;&gt;-->
+<!--            <plugin>-->
+<!--                <groupId>org.noear</groupId>-->
+<!--                <artifactId>solon-maven-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+    </build>
+
+</project>

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/config/IProxyConfiguration.java

@@ -0,0 +1,185 @@
+package org.dromara.neutrinoproxy.client.sdk.config;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioDatagramChannel;
+import io.netty.channel.socket.nio.NioSocketChannel;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.timeout.IdleStateHandler;
+import org.dromara.neutrinoproxy.client.sdk.core.*;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+import org.dromara.neutrinoproxy.core.ProxyMessageDecoder;
+import org.dromara.neutrinoproxy.core.ProxyMessageEncoder;
+
+import java.net.InetSocketAddress;
+
+/**
+ * 代理配置
+ * @author: aoshiguchen
+ * @date: 2022/10/8
+ */
+
+public abstract class IProxyConfiguration {
+
+
+    public NioEventLoopGroup tunnelWorkGroup(ProxyConfig proxyConfig) {
+        return new NioEventLoopGroup(proxyConfig.getTunnel().getThreadCount());
+    }
+
+    public NioEventLoopGroup tcpRealServerWorkGroup(ProxyConfig proxyConfig) {
+        // 暂时先公用此配置
+        return new NioEventLoopGroup(proxyConfig.getTunnel().getThreadCount());
+    }
+
+    public NioEventLoopGroup udpServerGroup(ProxyConfig proxyConfig) {
+        // 暂时先公用此配置
+        return new NioEventLoopGroup(proxyConfig.getClient().getUdp().getBossThreadCount());
+    }
+
+    public NioEventLoopGroup udpWorkGroup(ProxyConfig proxyConfig) {
+        // 暂时先公用此配置
+        return new NioEventLoopGroup(proxyConfig.getClient().getUdp().getWorkThreadCount());
+    }
+
+    public Bootstrap cmdTunnelBootstrap(ProxyConfig proxyConfig,
+                                        NioEventLoopGroup tunnelWorkGroup) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(tunnelWorkGroup);
+        bootstrap.channel(NioSocketChannel.class);
+//		bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000);
+//		bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
+//		/**
+//		 * TCP/IP协议中，无论发送多少数据，总是要在数据前面加上协议头，同时，对方接收到数据，也需要发送ACK表示确认。为了尽可能的利用网络带宽，TCP总是希望尽可能的发送足够大的数据。（一个连接会设置MSS参数，因此，TCP/IP希望每次都能够以MSS尺寸的数据块来发送数据）。
+//		 * Nagle算法就是为了尽可能发送大块数据，避免网络中充斥着许多小数据块。
+//		 */
+//		bootstrap.option(ChannelOption.TCP_NODELAY, true);
+        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
+
+        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
+
+            @Override
+            public void initChannel(SocketChannel ch) throws Exception {
+                if (proxyConfig.getTunnel().getSslEnable()) {
+                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
+                }
+                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
+                    ch.pipeline().addFirst(new LoggingHandler(CmdChannelHandler.class));
+                }
+                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
+                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
+                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
+                ch.pipeline().addLast(new ProxyMessageEncoder());
+                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
+                ch.pipeline().addLast(new CmdChannelHandler());
+            }
+        });
+        return bootstrap;
+    }
+
+    public Bootstrap tcpProxyTunnelBootstrap(ProxyConfig proxyConfig,
+                                             NioEventLoopGroup tunnelWorkGroup) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(tunnelWorkGroup);
+        bootstrap.channel(NioSocketChannel.class);
+        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
+        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
+
+            @Override
+            public void initChannel(SocketChannel ch) throws Exception {
+                if (proxyConfig.getTunnel().getSslEnable()) {
+                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
+                }
+                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
+                    ch.pipeline().addFirst(new LoggingHandler(TcpProxyChannelHandler.class));
+                }
+                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
+                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
+                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
+                ch.pipeline().addLast(new ProxyMessageEncoder());
+                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
+                ch.pipeline().addLast(new TcpProxyChannelHandler());
+            }
+        });
+        return bootstrap;
+    }
+    public Bootstrap udpProxyTunnelBootstrap(ProxyConfig proxyConfig,
+                                              NioEventLoopGroup tunnelWorkGroup) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(tunnelWorkGroup);
+        bootstrap.channel(NioSocketChannel.class);
+        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
+        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
+
+            @Override
+            public void initChannel(SocketChannel ch) throws Exception {
+                if (proxyConfig.getTunnel().getSslEnable()) {
+                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
+                }
+                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
+                    ch.pipeline().addFirst(new LoggingHandler(TcpProxyChannelHandler.class));
+                }
+                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
+                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
+                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
+                ch.pipeline().addLast(new ProxyMessageEncoder());
+                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
+                ch.pipeline().addLast(new UdpProxyChannelHandler());
+            }
+        });
+        return bootstrap;
+    }
+
+    public Bootstrap realServerBootstrap(ProxyConfig proxyConfig,
+                                             NioEventLoopGroup tcpRealServerWorkGroup
+                                             ) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(tcpRealServerWorkGroup);
+        bootstrap.channel(NioSocketChannel.class);
+        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
+
+            @Override
+            public void initChannel(SocketChannel ch) throws Exception {
+                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
+                    ch.pipeline().addFirst(new LoggingHandler(RealServerChannelHandler.class));
+                }
+                ch.pipeline().addLast(new RealServerChannelHandler());
+            }
+        });
+        return bootstrap;
+    }
+
+    public Bootstrap udpServerBootstrap(ProxyConfig proxyConfig,
+                                        NioEventLoopGroup udpServerGroup,
+                                         NioEventLoopGroup udpWorkGroup) {
+        Bootstrap bootstrap = new Bootstrap();
+        bootstrap.group(udpServerGroup)
+                // 主线程处理
+                .channel(NioDatagramChannel.class)
+                // 广播
+                .option(ChannelOption.SO_BROADCAST, true)
+                // 设置读缓冲区为2M
+                .option(ChannelOption.SO_RCVBUF, 2048 * 1024)
+                // 设置写缓冲区为1M
+                .option(ChannelOption.SO_SNDBUF, 1024 * 1024)
+                .handler(new ChannelInitializer<NioDatagramChannel>() {
+                    @Override
+                    protected void initChannel(NioDatagramChannel ch) {
+                        ChannelPipeline pipeline = ch.pipeline();
+                        if (null != proxyConfig.getClient().getUdp().getTransferLogEnable() && proxyConfig.getClient().getUdp().getTransferLogEnable()) {
+                            ch.pipeline().addFirst(new LoggingHandler(UdpRealServerHandler.class));
+                        }
+                        pipeline.addLast(udpWorkGroup, new UdpRealServerHandler());
+                    }
+                });
+        return bootstrap;
+    }
+
+//    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar() {
+//        return new NeutrinoCoreRuntimeNativeRegistrar();
+//    }
+
+}

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/config/ProxyConfig.java

@@ -1,8 +1,6 @@
-package org.dromara.neutrinoproxy.client.config;
+package org.dromara.neutrinoproxy.client.sdk.config;
 
 import lombok.Data;
-import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 /**
  *
@@ -10,13 +8,9 @@ import org.noear.solon.annotation.Inject;
  * @date: 2022/6/16
  */
 @Data
-@Component
 public class ProxyConfig {
-	@Inject("${neutrino.proxy.protocol}")
 	private Protocol protocol;
-	@Inject("${neutrino.proxy.tunnel}")
 	private Tunnel tunnel;
-	@Inject("${neutrino.proxy.client}")
 	private Client client;
 
 	@Data

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/constant/Constants.java

@@ -1,7 +1,7 @@
-package org.dromara.neutrinoproxy.client.constant;
+package org.dromara.neutrinoproxy.client.sdk.constant;
 
 import io.netty.util.AttributeKey;
-import org.dromara.neutrinoproxy.client.util.UdpChannelBindInfo;
+import org.dromara.neutrinoproxy.client.sdk.util.UdpChannelBindInfo;
 
 /**
  * @author: aoshiguchen

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/CmdChannelHandler.java

@@ -1,17 +1,17 @@
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
-import org.dromara.neutrinoproxy.core.Constants;
-import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
-import org.noear.solon.Solon;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
 
 /**
  * 处理与服务端之间的数据传输
@@ -19,22 +19,25 @@ import org.noear.solon.Solon;
  * @date: 2022/6/16
  */
 @Slf4j
-public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage> {
+public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage>{
     private static volatile Boolean transferLogEnable = Boolean.FALSE;
 
+
     public CmdChannelHandler() {
-        ProxyConfig proxyConfig = Solon.context().getBean(ProxyConfig.class);
+        ProxyConfig proxyConfig = (ProxyConfig) ProxyMessageFactory.beanManager.get("proxyConfig").getBean();
         if (null != proxyConfig.getClient() && null != proxyConfig.getTunnel().getHeartbeatLogEnable()) {
             transferLogEnable = proxyConfig.getTunnel().getHeartbeatLogEnable();
         }
     }
 
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, ProxyMessage proxyMessage) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, ProxyMessage proxyMessage){
         if (ProxyMessage.TYPE_HEARTBEAT != proxyMessage.getType() || transferLogEnable) {
             log.debug("[CMD Channel]Client CmdChannel recieved proxy message, type is {}", proxyMessage.getType());
         }
-        Solon.context().getBean(Dispatcher.class).dispatch(ctx, proxyMessage);
+//        beanHandler.getDispatcher().dispatch(ctx, proxyMessage);
+        Dispatcher dispatcher = (Dispatcher) ProxyMessageFactory.beanManager.get("dispatcher").getBean();
+        dispatcher.dispatch(ctx,proxyMessage);
     }
 
     @Override
@@ -57,13 +60,13 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage>
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause){
         log.error("[CMD Channel]Client CmdChannel Error channelId:{}", ctx.channel().id().asLongText(), cause);
         ctx.close();
     }
 
     @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt){
         if(evt instanceof IdleStateEvent) {
             IdleStateEvent event = (IdleStateEvent)evt;
             switch (event.state()) {
@@ -82,4 +85,5 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage>
             }
         }
     }
+
 }

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/CustomThreadFactory.java

@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -35,9 +35,7 @@ public class CustomThreadFactory implements ThreadFactory {
 	private final String namePrefix;
 
 	public CustomThreadFactory(String prefix) {
-		SecurityManager s = System.getSecurityManager();
+		group = Thread.currentThread().getThreadGroup();
-		group = (s != null) ? s.getThreadGroup() :
-			Thread.currentThread().getThreadGroup();
 		namePrefix = prefix + "-thread-";
 	}
 

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/IAbProxyClientService.java

@@ -0,0 +1,126 @@
+package org.dromara.neutrinoproxy.client.sdk.core;
+
+import cn.hutool.core.util.StrUtil;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.sdk.util.UdpServerUtil;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * 代理客户端服务
+ * @author: aoshiguchen
+ * @date: 2022/6/16
+ */
+@Slf4j
+@Data
+public class IAbProxyClientService {
+
+    public ProxyConfig proxyConfig;
+
+    public Bootstrap cmdTunnelBootstrap;
+
+    public Bootstrap udpServerBootstrap;
+
+    public Boolean isAotRuntime;
+
+    private volatile Channel channel;
+    /**
+     * 重连次数
+     */
+    private volatile int reconnectCount = 0;
+
+	/**
+	 * 重连服务执行器
+	 */
+    public static final ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor(new CustomThreadFactory("ClientReconnect"));
+
+    public void init(){
+        reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 10, proxyConfig.getTunnel().getReconnection().getIntervalSeconds(), TimeUnit.SECONDS);
+        try {
+            this.start();
+            UdpServerUtil.initCache(proxyConfig, udpServerBootstrap,isAotRuntime);
+        } catch (Exception e) {
+            // 启动连不上也做一下重连，因此先catch异常
+            log.error("[CmdChannel] start error", e);
+        }
+    }
+
+	public void start() {
+		if (StrUtil.isEmpty(proxyConfig.getTunnel().getServerIp())) {
+			log.error("not found server-ip config.");
+			return;
+		}
+		if (null == proxyConfig.getTunnel().getServerPort()) {
+			log.error("not found server-port config.");
+			return;
+		}
+		if (null != proxyConfig.getTunnel().getSslEnable() && proxyConfig.getTunnel().getSslEnable()
+				&& StrUtil.isEmpty(proxyConfig.getTunnel().getJksPath())) {
+			log.error("not found jks-path config.");
+			return;
+		}
+		if (StrUtil.isEmpty(proxyConfig.getTunnel().getLicenseKey())) {
+			log.error("not found license-key config.");
+			return;
+		}
+		if (null == channel || !channel.isActive()) {
+			try {
+				connectProxyServer();
+			} catch (Exception e) {
+				log.error("client start error", e);
+			}
+		} else {
+			channel.writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getTunnel().getLicenseKey(), ProxyUtil.getClientId(proxyConfig)));
+		}
+	}
+
+	/**
+	 * 连接代理服务器
+	 */
+	private void connectProxyServer() throws InterruptedException {
+		cmdTunnelBootstrap.connect()
+			.addListener(new ChannelFutureListener() {
+
+				@Override
+				public void operationComplete(ChannelFuture future) throws Exception {
+					if (future.isSuccess()) {
+						channel = future.channel();
+						// 连接成功，向服务器发送客户端认证信息（licenseKey）
+						ProxyUtil.setCmdChannel(future.channel());
+						future.channel().writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getTunnel().getLicenseKey(), ProxyUtil.getClientId(proxyConfig)));
+						log.info("[CmdChannel] connect proxy server {}:{} success. channelId:{}", proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort(), future.channel().id().asLongText());
+
+//						reconnectServiceEnable = true;
+						reconnectCount = 0;
+					} else {
+						log.info("[CmdChannel] connect proxy server {}:{} failed!", proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort());
+					}
+				}
+			}).sync();
+	}
+
+	protected synchronized void reconnect() {
+		if (null != channel) {
+			if (channel.isActive()) {
+				return;
+			}
+			channel.close();
+		}
+
+		log.info("[CmdChannel] client reconnect seq:{}", ++reconnectCount);
+		try {
+			connectProxyServer();
+		} catch (Exception e) {
+			log.error("[CmdChannel] reconnect error", e);
+		}
+	}
+}

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/ProxyChannelBorrowListener.java

@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import io.netty.channel.Channel;
 

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/RealServerChannelHandler.java

@@ -20,10 +20,10 @@
  * SOFTWARE.
  */
 
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import io.netty.buffer.ByteBuf;

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/TcpProxyChannelHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -6,11 +6,11 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
-import org.noear.solon.Solon;
 
 /**
  * 处理与服务端之间的数据传输
@@ -26,7 +26,8 @@ public class TcpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMes
         if (ProxyMessage.TYPE_HEARTBEAT != proxyMessage.getType()) {
             log.debug("[TCP Proxy Channel]Client ProxyChannel recieved proxy message, type is {}", proxyMessage.getType());
         }
-        Solon.context().getBean(Dispatcher.class).dispatch(ctx, proxyMessage);
+        Dispatcher dispatcher = (Dispatcher) ProxyMessageFactory.beanManager.get("dispatcher").getBean();
+        dispatcher.dispatch(ctx,proxyMessage);
     }
 
     @Override
@@ -52,13 +53,13 @@ public class TcpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMes
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)  {
         log.error("[TCP Proxy Channel]Client ProxyChannel Error channelId:{}", ctx.channel().id().asLongText(), cause);
         ctx.close();
     }
 
     @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt)  {
         if(evt instanceof IdleStateEvent) {
             IdleStateEvent event = (IdleStateEvent)evt;
             switch (event.state()) {

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/UdpProxyChannelHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -6,11 +6,11 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.handler.timeout.IdleStateEvent;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
-import org.noear.solon.Solon;
 
 /**
  * 处理与服务端之间的数据传输
@@ -20,13 +20,13 @@ import org.noear.solon.Solon;
 @Slf4j
 public class UdpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMessage> {
 
-
     @Override
-    protected void channelRead0(ChannelHandlerContext ctx, ProxyMessage proxyMessage) throws Exception {
+    protected void channelRead0(ChannelHandlerContext ctx, ProxyMessage proxyMessage)  {
         if (ProxyMessage.TYPE_HEARTBEAT != proxyMessage.getType()) {
             log.debug("[UDP Proxy Channel]Client ProxyChannel recieved proxy message, type is {}", proxyMessage.getType());
         }
-        Solon.context().getBean(Dispatcher.class).dispatch(ctx, proxyMessage);
+        Dispatcher dispatcher = (Dispatcher) ProxyMessageFactory.beanManager.get("dispatcher").getBean();
+        dispatcher.dispatch(ctx,proxyMessage);
     }
 
     @Override
@@ -52,13 +52,13 @@ public class UdpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMes
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)  {
         log.error("[UDP Proxy Channel]Client ProxyChannel Error channelId:{}", ctx.channel().id().asLongText(), cause);
         ctx.close();
     }
 
     @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt)  {
         if(evt instanceof IdleStateEvent) {
             IdleStateEvent event = (IdleStateEvent)evt;
             switch (event.state()) {

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/core/UdpRealServerHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.neutrinoproxy.client.core;
+package org.dromara.neutrinoproxy.client.sdk.core;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.socket.DatagramPacket;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.constant.Constants;
+import org.dromara.neutrinoproxy.client.sdk.constant.Constants;
-import org.dromara.neutrinoproxy.client.util.UdpChannelBindInfo;
+import org.dromara.neutrinoproxy.client.sdk.util.UdpChannelBindInfo;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 
 import java.net.InetSocketAddress;

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageAuthHandler.java

@@ -1,17 +1,15 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ExceptionEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import org.noear.snack.ONode;
-import org.noear.solon.Solon;
-import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 /**
  * 认证信息处理器
@@ -20,22 +18,26 @@ import org.noear.solon.annotation.Inject;
  */
 @Slf4j
 @Match(type = Constants.ProxyDataTypeName.AUTH)
-@Component
 public class ProxyMessageAuthHandler implements ProxyMessageHandler {
-	@Inject
+	private final ProxyConfig proxyConfig;
-	private ProxyConfig proxyConfig;
+    private final Runnable stop;
+
+    public ProxyMessageAuthHandler(ProxyConfig proxyConfig,Runnable stop){
+        this.proxyConfig=proxyConfig;
+        this.stop=stop;
+    }
 	@Override
 	public void handle(ChannelHandlerContext context, ProxyMessage proxyMessage) {
 		String info = proxyMessage.getInfo();
-        ONode load = ONode.load(info);
+        JSONObject load = JSONUtil.parseObj(info);
-        Integer code = load.get("code").getInt();
+        Integer code = load.getInt("code");
 		log.info("Auth result:{}", info);
 		if (ExceptionEnum.AUTH_FAILED.getCode().equals(code)) {
 			// 客户端认证失败，直接停止服务
 			log.info("client auth failed , client stop.");
 			context.channel().close();
 			if (!proxyConfig.getTunnel().getReconnection().getUnlimited()) {
-				Solon.stop();
+				stop.run();
 			}
 		} else if (ExceptionEnum.CONNECT_FAILED.getCode().equals(code) ||
 				ExceptionEnum.LICENSE_CANNOT_REPEAT_CONNECT.getCode().equals(code)

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageConnectHandler.java

@@ -0,0 +1,86 @@
+package org.dromara.neutrinoproxy.client.sdk.handler;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.*;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.core.ProxyChannelBorrowListener;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
+import org.dromara.neutrinoproxy.core.dispatcher.Match;
+
+/**
+ * 连接信息处理器
+ * @author: aoshiguchen
+ * @date: 2022/6/16
+ */
+@Slf4j
+@Match(type = Constants.ProxyDataTypeName.CONNECT)
+public class ProxyMessageConnectHandler implements ProxyMessageHandler {
+
+	private final Bootstrap tcpProxyTunnelBootstrap;
+	private final Bootstrap realServerBootstrap;
+	private final ProxyConfig proxyConfig;
+
+    public ProxyMessageConnectHandler(Bootstrap tcpProxyTunnelBootstrap,Bootstrap realServerBootstrap,ProxyConfig proxyConfig){
+        this.proxyConfig=proxyConfig;
+        this.realServerBootstrap=realServerBootstrap;
+        this.tcpProxyTunnelBootstrap=tcpProxyTunnelBootstrap;
+    }
+
+	@Override
+	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
+		final Channel cmdChannel = ctx.channel();
+		final String visitorId = proxyMessage.getInfo();
+		String[] serverInfo = new String(proxyMessage.getData()).split(":");
+		String ip = serverInfo[0];
+		int port = Integer.parseInt(serverInfo[1]);
+		// 连接真实的、被代理的服务
+		realServerBootstrap.connect(ip, port).addListener((ChannelFutureListener) future -> {
+            // 连接后端服务器成功
+            if (future.isSuccess()) {
+                final Channel realServerChannel = future.channel();
+
+                realServerChannel.config().setOption(ChannelOption.AUTO_READ, false);
+
+                // 获取连接
+                ProxyUtil.borrowTcpProxyChanel(tcpProxyTunnelBootstrap, new ProxyChannelBorrowListener() {
+
+                    @Override
+                    public void success(Channel channel) {
+                        // 连接绑定
+                        channel.attr(Constants.NEXT_CHANNEL).set(realServerChannel);
+                        realServerChannel.attr(Constants.NEXT_CHANNEL).set(channel);
+
+                        // 远程绑定
+                        channel.writeAndFlush(ProxyMessage.buildConnectMessage(visitorId + "@" + proxyConfig.getTunnel().getLicenseKey()));
+
+                        realServerChannel.config().setOption(ChannelOption.AUTO_READ, true);
+                        ProxyUtil.addRealServerChannel(visitorId, realServerChannel);
+                        ProxyUtil.setRealServerChannelVisitorId(realServerChannel, visitorId);
+                    }
+
+                    @Override
+                    public void error(Throwable cause) {
+                        ProxyMessage proxyMessage1 = new ProxyMessage();
+                        proxyMessage1.setType(ProxyMessage.TYPE_DISCONNECT);
+                        proxyMessage1.setInfo(visitorId);
+                        cmdChannel.writeAndFlush(proxyMessage1);
+                    }
+                });
+
+            } else {
+                cmdChannel.writeAndFlush(ProxyMessage.buildDisconnectMessage(visitorId));
+            }
+        });
+	}
+
+	@Override
+	public String name() {
+		return ProxyDataTypeEnum.CONNECT.getDesc();
+	}
+
+}

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageDisconnectHandler.java

@@ -1,24 +1,24 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandlerContext;
-import org.noear.solon.annotation.Component;
 
 /**
  * 断开连接信息处理器
  * @author: aoshiguchen
  * @date: 2022/6/16
  */
+@Slf4j
 @Match(type = Constants.ProxyDataTypeName.DISCONNECT)
-@Component
 public class ProxyMessageDisconnectHandler implements ProxyMessageHandler {
 
 	@Override

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageErrorHandler.java

@@ -1,15 +1,11 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.*;
-import org.dromara.neutrinoproxy.core.ExceptionEnum;
-import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
-import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import org.noear.snack.ONode;
-import org.noear.solon.annotation.Component;
 
 /**
  * 异常信息处理器
@@ -18,14 +14,13 @@ import org.noear.solon.annotation.Component;
  */
 @Slf4j
 @Match(type = Constants.ProxyDataTypeName.ERROR)
-@Component
 public class ProxyMessageErrorHandler implements ProxyMessageHandler {
 
 	@Override
 	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
 		log.info("error: {}", proxyMessage.getInfo());
-        ONode load = ONode.load(proxyMessage.getInfo());
+        JSONObject load = JSONUtil.parseObj(proxyMessage.getInfo());
-        Integer code = load.get("code").getInt();
+        Integer code = load.getInt("code");
 		if (ExceptionEnum.AUTH_FAILED.getCode().equals(code)) {
 			System.exit(0);
 		}
@@ -35,4 +30,5 @@ public class ProxyMessageErrorHandler implements ProxyMessageHandler {
 	public String name() {
 		return ProxyDataTypeEnum.DISCONNECT.getDesc();
 	}
+
 }

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageFactory.java

@@ -0,0 +1,91 @@
+package org.dromara.neutrinoproxy.client.sdk.handler;
+
+import com.google.common.collect.Lists;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.nio.NioEventLoopGroup;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.neutrinoproxy.client.sdk.config.IProxyConfiguration;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.core.IAbProxyClientService;
+import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
+import org.dromara.neutrinoproxy.core.dispatcher.DefaultDispatcher;
+import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ *
+ * @author: gc.x
+ * @date: 2024/1/21
+ */
+public abstract class ProxyMessageFactory extends IProxyConfiguration {
+
+    public abstract void stop();
+    public abstract boolean isAotRuntime();
+    public static Map<String,BeanInfo> beanManager=new ConcurrentHashMap<>();
+    @Data
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class BeanInfo<T>{
+        private String beanName;
+        private T bean;
+        private Class<?> beanClass;
+    }
+
+    public void start(ProxyConfig proxyConfig){
+        init(proxyConfig);
+        IAbProxyClientService  clientService=new IAbProxyClientService();
+        clientService.setProxyConfig(proxyConfig);
+        clientService.setCmdTunnelBootstrap((Bootstrap)beanManager.get("cmdTunnelBootstrap").getBean());
+        clientService.setUdpServerBootstrap((Bootstrap)beanManager.get("udpServerBootstrap").getBean());
+        clientService.setIsAotRuntime(isAotRuntime());
+        clientService.init();
+    }
+
+    public void init(ProxyConfig proxyConfig){
+        beanManager.put("proxyConfig",BeanInfo.builder().bean(proxyConfig).beanName("proxyConfig").beanClass(ProxyConfig.class).build());
+        NioEventLoopGroup tunnelWorkGroup = super.tunnelWorkGroup(proxyConfig);
+        beanManager.put("tunnelWorkGroup",BeanInfo.builder().bean(tunnelWorkGroup).beanName("tunnelWorkGroup").beanClass(NioEventLoopGroup.class).build());
+        NioEventLoopGroup tcpRealServerWorkGroup = super.tcpRealServerWorkGroup(proxyConfig);
+        beanManager.put("tcpRealServerWorkGroup",BeanInfo.builder().bean(tcpRealServerWorkGroup).beanName("tcpRealServerWorkGroup").beanClass(NioEventLoopGroup.class).build());
+        NioEventLoopGroup udpServerGroup = super.udpServerGroup(proxyConfig);
+        beanManager.put("udpServerGroup",BeanInfo.builder().bean(udpServerGroup).beanName("udpServerGroup").beanClass(NioEventLoopGroup.class).build());
+        NioEventLoopGroup udpWorkGroup = super.udpWorkGroup(proxyConfig);
+        beanManager.put("udpWorkGroup",BeanInfo.builder().bean(udpWorkGroup).beanName("udpWorkGroup").beanClass(NioEventLoopGroup.class).build());
+        Bootstrap cmdTunnelBootstrap = super.cmdTunnelBootstrap(proxyConfig, tunnelWorkGroup);
+        beanManager.put("cmdTunnelBootstrap",BeanInfo.builder().bean(cmdTunnelBootstrap).beanName("cmdTunnelBootstrap").beanClass(Bootstrap.class).build());
+        Bootstrap tcpProxyTunnelBootstrap = super.tcpProxyTunnelBootstrap(proxyConfig, tunnelWorkGroup);
+        beanManager.put("tcpProxyTunnelBootstrap",BeanInfo.builder().bean(tcpProxyTunnelBootstrap).beanName("tcpProxyTunnelBootstrap").beanClass(Bootstrap.class).build());
+        Bootstrap udpProxyTunnelBootstrap = super.udpProxyTunnelBootstrap(proxyConfig, tunnelWorkGroup);
+        beanManager.put("udpProxyTunnelBootstrap",BeanInfo.builder().bean(udpProxyTunnelBootstrap).beanName("udpProxyTunnelBootstrap").beanClass(Bootstrap.class).build());
+        Bootstrap realServerBootstrap = super.realServerBootstrap(proxyConfig, tcpRealServerWorkGroup);
+        beanManager.put("realServerBootstrap",BeanInfo.builder().bean(realServerBootstrap).beanName("realServerBootstrap").beanClass(Bootstrap.class).build());
+        Bootstrap udpServerBootstrap = super.udpServerBootstrap(proxyConfig, udpServerGroup, udpWorkGroup);
+        beanManager.put("udpServerBootstrap",BeanInfo.builder().bean(udpServerBootstrap).beanName("udpServerBootstrap").beanClass(Bootstrap.class).build());
+        dispatcher(proxyConfig, tcpProxyTunnelBootstrap, realServerBootstrap);
+    }
+    public  void dispatcher(ProxyConfig proxyConfig, Bootstrap tcpProxyTunnelBootstrap, Bootstrap realServerBootstrap) {
+        List<ProxyMessageHandler> list = Lists.newArrayList(
+            new ProxyMessageAuthHandler(proxyConfig, this::stop),
+            new ProxyMessageConnectHandler(tcpProxyTunnelBootstrap,realServerBootstrap,proxyConfig),
+            new ProxyMessageDisconnectHandler(),
+            new ProxyMessageErrorHandler(),
+            new ProxyMessageTransferHandler(),
+            new UdpProxyMessageConnectHandler(proxyConfig,tcpProxyTunnelBootstrap),
+            new UdpProxyMessageTransferHandler()
+        );
+        Dispatcher<ChannelHandlerContext, ProxyMessage> dispatcher = new DefaultDispatcher<>("MessageDispatcher", list,
+            proxyMessage -> ProxyDataTypeEnum.of((int)proxyMessage.getType()) == null ?
+                null : ProxyDataTypeEnum.of((int)proxyMessage.getType()).getName());
+        beanManager.put("dispatcher",BeanInfo.builder().bean(dispatcher).beanName("dispatcher").beanClass(Dispatcher.class).build());
+    }
+}

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/ProxyMessageTransferHandler.java

@@ -1,14 +1,14 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import org.noear.solon.annotation.Component;
 
 /**
  * 传输信息处理器
@@ -16,7 +16,7 @@ import org.noear.solon.annotation.Component;
  * @date: 2022/6/16
  */
 @Match(type = Constants.ProxyDataTypeName.TRANSFER)
-@Component
+@Slf4j
 public class ProxyMessageTransferHandler implements ProxyMessageHandler {
 
 	@Override

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/UdpProxyMessageConnectHandler.java

@@ -1,20 +1,18 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
+import cn.hutool.json.JSONUtil;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.core.ProxyChannelBorrowListener;
+import org.dromara.neutrinoproxy.client.sdk.core.ProxyChannelBorrowListener;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import org.noear.snack.ONode;
-import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 /**
  * @author: aoshiguchen
@@ -22,17 +20,21 @@ import org.noear.solon.annotation.Inject;
  */
 @Slf4j
 @Match(type = Constants.ProxyDataTypeName.UDP_CONNECT)
-@Component
 public class UdpProxyMessageConnectHandler implements ProxyMessageHandler {
-    @Inject
+
-    private ProxyConfig proxyConfig;
+    private final ProxyConfig proxyConfig;
-    @Inject("udpProxyTunnelBootstrap")
+    private final Bootstrap udpProxyTunnelBootstrap;
-    private Bootstrap udpProxyTunnelBootstrap;
+
+    public UdpProxyMessageConnectHandler(ProxyConfig proxyConfig,Bootstrap udpProxyTunnelBootstrap){
+        this.proxyConfig=proxyConfig;
+        this.udpProxyTunnelBootstrap=udpProxyTunnelBootstrap;
+    }
 
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
         final Channel cmdChannel = ctx.channel();
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = ONode.deserialize(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
+        String info = proxyMessage.getInfo();
+        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONUtil.toBean(info,ProxyMessage.UdpBaseInfo.class);
         log.info("[UDP connect]info:{}", proxyMessage.getInfo());
 
         // 获取连接
@@ -61,4 +63,5 @@ public class UdpProxyMessageConnectHandler implements ProxyMessageHandler {
     public String name() {
         return ProxyDataTypeEnum.UDP_CONNECT.getDesc();
     }
+
 }

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/handler/UdpProxyMessageTransferHandler.java

@@ -1,19 +1,18 @@
-package org.dromara.neutrinoproxy.client.handler;
+package org.dromara.neutrinoproxy.client.sdk.handler;
 
+import cn.hutool.json.JSONUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.socket.DatagramPacket;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.util.UdpServerUtil;
+import org.dromara.neutrinoproxy.client.sdk.util.UdpServerUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import org.noear.snack.ONode;
-import org.noear.solon.annotation.Component;
 
 import java.net.InetSocketAddress;
 
@@ -23,12 +22,11 @@ import java.net.InetSocketAddress;
  */
 @Slf4j
 @Match(type = Constants.ProxyDataTypeName.UDP_TRANSFER)
-@Component
 public class UdpProxyMessageTransferHandler implements ProxyMessageHandler {
 
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = ONode.deserialize(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
+        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONUtil.toBean(proxyMessage.getInfo(),ProxyMessage.UdpBaseInfo.class);
         log.debug("[UDP transfer]info:{} data:{}", proxyMessage.getInfo(), new String(proxyMessage.getData()));
         Channel channel = UdpServerUtil.takeChannel(udpBaseInfo, ctx.channel());
         if (null == channel) {
@@ -45,4 +43,5 @@ public class UdpProxyMessageTransferHandler implements ProxyMessageHandler {
     public String name() {
         return ProxyDataTypeEnum.UDP_TRANSFER.getDesc();
     }
+
 }

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/util/LockChannel.java

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.util;
+package org.dromara.neutrinoproxy.client.sdk.util;
 
 import io.netty.channel.Channel;
 import lombok.Data;

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/util/ProxyUtil.java

@@ -19,23 +19,22 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package org.dromara.neutrinoproxy.client.util;
+package org.dromara.neutrinoproxy.client.sdk.util;
 
-import io.netty.channel.ChannelHandler;
-import io.netty.handler.ssl.SslHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.core.ProxyChannelBorrowListener;
-import org.dromara.neutrinoproxy.core.Constants;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelOption;
+import io.netty.handler.ssl.SslHandler;
 import io.netty.util.AttributeKey;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.core.ProxyChannelBorrowListener;
+import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.util.FileUtil;
-import org.noear.solon.Solon;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
@@ -180,11 +179,10 @@ public class ProxyUtil {
 		realServerChannels.clear();
 	}
 
-	public static String getClientId() {
+	public static String getClientId(ProxyConfig proxyConfig) {
 		if (StringUtils.isNotBlank(clientId)) {
 			return clientId;
 		}
-		ProxyConfig proxyConfig = Solon.context().getBean(ProxyConfig.class);
 		if (StringUtils.isNotBlank(proxyConfig.getTunnel().getClientId())) {
 			clientId = proxyConfig.getTunnel().getClientId();
 			return clientId;

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/util/UdpChannelBindInfo.java

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.util;
+package org.dromara.neutrinoproxy.client.sdk.util;
 
 import io.netty.channel.Channel;
 import lombok.Data;

neutrino-proxy-client-sdk/src/main/java/org/dromara/neutrinoproxy/client/sdk/util/UdpServerUtil.java

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.util;
+package org.dromara.neutrinoproxy.client.sdk.util;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.Unpooled;
@@ -7,11 +7,11 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.constant.Constants;
+import org.dromara.neutrinoproxy.client.sdk.constant.Constants;
-import org.dromara.neutrinoproxy.client.core.CustomThreadFactory;
+import org.dromara.neutrinoproxy.client.sdk.core.CustomThreadFactory;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.noear.solon.core.runtime.NativeDetector;
+import java.util.concurrent.TimeUnit;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -46,9 +46,9 @@ public class UdpServerUtil {
      * 2、维护一个UDP服务池，用于需要响应的UDP转发
      * @param proxyConfig
      */
-    public static void initCache(ProxyConfig proxyConfig, Bootstrap udpServerBootstrap) {
+    public static void initCache(ProxyConfig proxyConfig, Bootstrap udpServerBootstrap,Boolean isAotRuntime) {
         // aot 阶段，不初始化UDP服务
-        if (NativeDetector.isAotRuntime()) {
+        if (isAotRuntime) {
             return;
         }
         if (null == proxyConfig.getClient().getUdp() || StringUtils.isEmpty(proxyConfig.getClient().getUdp().getPuppetPortRange())) {

neutrino-proxy-client/Dockerfile

@@ -1,12 +1,15 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:21-jdk-oracle
 #同步时间
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
-    apk update && apk add wget unzip vim && apk add -U tzdata && \
+#    apk update && apk add wget unzip vim && apk add -U tzdata && \
-    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+#    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 设置时区为北京时间
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN mkdir -p /root/neutrino-proxy/config
 WORKDIR /root/neutrino-proxy
-COPY ../neutrino-proxy-client/target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
+COPY ./target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
-COPY ../neutrino-proxy-client/src/main/resources/app.yml /root/neutrino-proxy/config
+COPY ./src/main/resources/app-copy.yml /root/neutrino-proxy/config/app.yml
 #VOLUME ["/root/neutrino-proxy"]
 ENTRYPOINT ["java","-jar","neutrino-proxy-client.jar","config=./config/app.yml"]
 

neutrino-proxy-client/pom.xml

@@ -16,18 +16,30 @@
     <dependencies>
         <dependency>
             <groupId>org.dromara.neutrino-proxy</groupId>
-            <artifactId>neutrino-proxy-core</artifactId>
+            <artifactId>neutrino-proxy-client-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon-lib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon.aot</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>false</filtering>

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java

@@ -3,6 +3,7 @@ package org.dromara.neutrinoproxy.client;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.noear.solon.Solon;
+import org.noear.solon.Utils;
 import org.noear.solon.annotation.SolonMain;
 
 /**
@@ -16,13 +17,20 @@ public class ProxyClient {
 
 	public static void main(String[] args) {
 		Solon.start(ProxyClient.class, args, app -> {
-			setAlias("neutrino.proxy.tunnel.serverIp", "serverIp");
+            String loglevel = System.getenv("LOG_LEVEL");
-			setAlias("neutrino.proxy.tunnel.serverPort", "serverPort");
+            if (Utils.isNotEmpty(loglevel)) {
-			setAlias("neutrino.proxy.tunnel.sslEnable", "sslEnable");
+                app.cfg().put("solon.logging.logger.root.level", loglevel);
-			setAlias("neutrino.proxy.tunnel.jksPath", "jksPath");
+            }
-			setAlias("neutrino.proxy.tunnel.keyStorePassword", "keyStorePassword");
+
-			setAlias("neutrino.proxy.tunnel.licenseKey", "licenseKey");
+			setAlias("neutrino.proxy.tunnel.server-ip", "serverIp");
-		});
+			setAlias("neutrino.proxy.tunnel.server-port", "serverPort");
+			setAlias("neutrino.proxy.tunnel.ssl-enable", "sslEnable");
+			setAlias("neutrino.proxy.tunnel.jks-path", "jksPath");
+			setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword");
+			setAlias("neutrino.proxy.tunnel.license-key", "licenseKey");
+
+            log.info("NeutrinoProxy Client ：{}", app.cfg().get("solon.app.version"));
+        });
 	}
 
 	/**

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/NeutrinoClientRuntimeNativeRegistrar.java

@@ -1,5 +1,6 @@
 package org.dromara.neutrinoproxy.client.config;
 
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.aot.RuntimeNativeMetadata;
 import org.noear.solon.aot.RuntimeNativeRegistrar;
@@ -16,11 +17,23 @@ public class NeutrinoClientRuntimeNativeRegistrar implements RuntimeNativeRegist
     public void register(AppContext context, RuntimeNativeMetadata metadata) {
         metadata.registerResourceInclude("test.jks");
 
+        // sdk - ProxyConfig
+        metadata.registerReflection(ProxyConfig.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Protocol.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Client.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Tunnel.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Tcp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Udp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
         metadata.registerReflection(ProxyConfig.Reconnection.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+
+        // client - SolonProxyConfig
+        metadata.registerReflection(SolonProxyConfig.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Protocol.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Client.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Tunnel.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Tcp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Udp.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(SolonProxyConfig.Reconnection.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+
     }
 }

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java

@@ -1,30 +1,11 @@
 package org.dromara.neutrinoproxy.client.config;
 
-import io.netty.channel.ChannelInitializer;
+import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioDatagramChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.timeout.IdleStateHandler;
-import org.dromara.neutrinoproxy.client.core.*;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
-import org.dromara.neutrinoproxy.core.*;
 import org.dromara.neutrinoproxy.core.aot.NeutrinoCoreRuntimeNativeRegistrar;
-import org.dromara.neutrinoproxy.core.dispatcher.DefaultDispatcher;
-import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.ChannelHandlerContext;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
 import org.noear.solon.annotation.Configuration;
-import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.runtime.NativeDetector;
-import org.noear.solon.core.bean.LifecycleBean;
-
-import java.net.InetSocketAddress;
-import java.util.List;
 
 /**
  * 代理配置
@@ -32,182 +13,20 @@ import java.util.List;
  * @date: 2022/10/8
  */
 @Configuration
-public class ProxyConfiguration implements LifecycleBean {
+public class ProxyConfiguration extends ProxyMessageFactory {
 
     @Override
-    public void start() throws Throwable {
+    public void stop() {
-        List<ProxyMessageHandler> list = Solon.context().getBeansOfType(ProxyMessageHandler.class);
+        Solon.stop();
-        Dispatcher<ChannelHandlerContext, ProxyMessage> dispatcher = new DefaultDispatcher<>("MessageDispatcher", list,
-                proxyMessage -> ProxyDataTypeEnum.of((int)proxyMessage.getType()) == null ?
-                        null : ProxyDataTypeEnum.of((int)proxyMessage.getType()).getName());
-        Solon.context().wrapAndPut(Dispatcher.class, dispatcher);
     }
 
-    @Bean("tunnelWorkGroup")
+    @Override
-    public NioEventLoopGroup tunnelWorkGroup(@Inject ProxyConfig proxyConfig) {
+    public boolean isAotRuntime() {
-        return new NioEventLoopGroup(proxyConfig.getTunnel().getThreadCount());
+        return NativeDetector.isAotRuntime();
-    }
-
-    @Bean("tcpRealServerWorkGroup")
-    public NioEventLoopGroup tcpRealServerWorkGroup(@Inject ProxyConfig proxyConfig) {
-        // 暂时先公用此配置
-        return new NioEventLoopGroup(proxyConfig.getTunnel().getThreadCount());
-    }
-
-    @Bean("udpServerGroup")
-    public NioEventLoopGroup udpServerGroup(@Inject ProxyConfig proxyConfig) {
-        // 暂时先公用此配置
-        return new NioEventLoopGroup(proxyConfig.getClient().getUdp().getBossThreadCount());
-    }
-
-    @Bean("udpWorkGroup")
-    public NioEventLoopGroup udpWorkGroup(@Inject ProxyConfig proxyConfig) {
-        // 暂时先公用此配置
-        return new NioEventLoopGroup(proxyConfig.getClient().getUdp().getWorkThreadCount());
-    }
-
-    @Bean("cmdTunnelBootstrap")
-    public Bootstrap cmdTunnelBootstrap(@Inject ProxyConfig proxyConfig,
-                                        @Inject("tunnelWorkGroup") NioEventLoopGroup tunnelWorkGroup) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(tunnelWorkGroup);
-        bootstrap.channel(NioSocketChannel.class);
-//		bootstrap.option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 3000);
-//		bootstrap.option(ChannelOption.SO_KEEPALIVE, true);
-//		/**
-//		 * TCP/IP协议中，无论发送多少数据，总是要在数据前面加上协议头，同时，对方接收到数据，也需要发送ACK表示确认。为了尽可能的利用网络带宽，TCP总是希望尽可能的发送足够大的数据。（一个连接会设置MSS参数，因此，TCP/IP希望每次都能够以MSS尺寸的数据块来发送数据）。
-//		 * Nagle算法就是为了尽可能发送大块数据，避免网络中充斥着许多小数据块。
-//		 */
-//		bootstrap.option(ChannelOption.TCP_NODELAY, true);
-        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
-
-        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
-
-            @Override
-            public void initChannel(SocketChannel ch) throws Exception {
-                if (proxyConfig.getTunnel().getSslEnable()) {
-                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
-                }
-                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
-                    ch.pipeline().addFirst(new LoggingHandler(CmdChannelHandler.class));
-                }
-                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
-                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
-                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
-                ch.pipeline().addLast(new ProxyMessageEncoder());
-                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
-                ch.pipeline().addLast(new CmdChannelHandler());
-            }
-        });
-        return bootstrap;
-    }
-
-    @Bean("tcpProxyTunnelBootstrap")
-    public Bootstrap tcpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig,
-                                             @Inject("tunnelWorkGroup") NioEventLoopGroup tunnelWorkGroup) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(tunnelWorkGroup);
-        bootstrap.channel(NioSocketChannel.class);
-        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
-        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
-
-            @Override
-            public void initChannel(SocketChannel ch) throws Exception {
-                if (proxyConfig.getTunnel().getSslEnable()) {
-                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
-                }
-                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
-                    ch.pipeline().addFirst(new LoggingHandler(TcpProxyChannelHandler.class));
-                }
-                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
-                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
-                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
-                ch.pipeline().addLast(new ProxyMessageEncoder());
-                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
-                ch.pipeline().addLast(new TcpProxyChannelHandler());
-            }
-        });
-        return bootstrap;
-    }
-
-    @Bean("udpProxyTunnelBootstrap")
-    public Bootstrap udpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig,
-                                              @Inject("tunnelWorkGroup") NioEventLoopGroup tunnelWorkGroup) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(tunnelWorkGroup);
-        bootstrap.channel(NioSocketChannel.class);
-        bootstrap.remoteAddress(InetSocketAddress.createUnresolved(proxyConfig.getTunnel().getServerIp(), proxyConfig.getTunnel().getServerPort()));
-        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
-
-            @Override
-            public void initChannel(SocketChannel ch) throws Exception {
-                if (proxyConfig.getTunnel().getSslEnable()) {
-                    ch.pipeline().addLast(ProxyUtil.createSslHandler(proxyConfig));
-                }
-                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
-                    ch.pipeline().addFirst(new LoggingHandler(TcpProxyChannelHandler.class));
-                }
-                ch.pipeline().addLast(new ProxyMessageDecoder(proxyConfig.getProtocol().getMaxFrameLength(),
-                        proxyConfig.getProtocol().getLengthFieldOffset(), proxyConfig.getProtocol().getLengthFieldLength(),
-                        proxyConfig.getProtocol().getLengthAdjustment(), proxyConfig.getProtocol().getInitialBytesToStrip()));
-                ch.pipeline().addLast(new ProxyMessageEncoder());
-                ch.pipeline().addLast(new IdleStateHandler(proxyConfig.getProtocol().getReadIdleTime(), proxyConfig.getProtocol().getWriteIdleTime(), proxyConfig.getProtocol().getAllIdleTimeSeconds()));
-                ch.pipeline().addLast(new UdpProxyChannelHandler());
-            }
-        });
-        return bootstrap;
-    }
-
-    @Bean("realServerBootstrap")
-    public Bootstrap realServerBootstrap(@Inject ProxyConfig proxyConfig,
-                                             @Inject("tcpRealServerWorkGroup") NioEventLoopGroup tcpRealServerWorkGroup
-                                             ) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(tcpRealServerWorkGroup);
-        bootstrap.channel(NioSocketChannel.class);
-        bootstrap.handler(new ChannelInitializer<SocketChannel>() {
-
-            @Override
-            public void initChannel(SocketChannel ch) throws Exception {
-                if (null != proxyConfig.getTunnel().getTransferLogEnable() && proxyConfig.getTunnel().getTransferLogEnable()) {
-                    ch.pipeline().addFirst(new LoggingHandler(RealServerChannelHandler.class));
-                }
-                ch.pipeline().addLast(new RealServerChannelHandler());
-            }
-        });
-        return bootstrap;
-    }
-
-    @Bean("udpServerBootstrap")
-    public Bootstrap udpServerBootstrap(@Inject ProxyConfig proxyConfig,
-                                        @Inject("udpServerGroup") NioEventLoopGroup udpServerGroup,
-                                        @Inject("udpWorkGroup") NioEventLoopGroup udpWorkGroup) {
-        Bootstrap bootstrap = new Bootstrap();
-        bootstrap.group(udpServerGroup)
-                // 主线程处理
-                .channel(NioDatagramChannel.class)
-                // 广播
-                .option(ChannelOption.SO_BROADCAST, true)
-                // 设置读缓冲区为2M
-                .option(ChannelOption.SO_RCVBUF, 2048 * 1024)
-                // 设置写缓冲区为1M
-                .option(ChannelOption.SO_SNDBUF, 1024 * 1024)
-                .handler(new ChannelInitializer<NioDatagramChannel>() {
-                    @Override
-                    protected void initChannel(NioDatagramChannel ch) {
-                        ChannelPipeline pipeline = ch.pipeline();
-                        if (null != proxyConfig.getClient().getUdp().getTransferLogEnable() && proxyConfig.getClient().getUdp().getTransferLogEnable()) {
-                            ch.pipeline().addFirst(new LoggingHandler(UdpRealServerHandler.class));
-                        }
-                        pipeline.addLast(udpWorkGroup, new UdpRealServerHandler());
-                    }
-                });
-        return bootstrap;
     }
 
     @Bean
-    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar() {
+    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar(){
         return new NeutrinoCoreRuntimeNativeRegistrar();
     }
-
 }

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/config/SolonProxyConfig.java

@@ -0,0 +1,74 @@
+package org.dromara.neutrinoproxy.client.config;
+
+import lombok.Data;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/6/16
+ */
+@Data
+@Component
+public class SolonProxyConfig {
+	@Inject("${neutrino.proxy.protocol}")
+	private Protocol protocol;
+	@Inject("${neutrino.proxy.tunnel}")
+	private Tunnel tunnel;
+	@Inject("${neutrino.proxy.client}")
+	private Client client;
+
+	@Data
+	public static class Protocol {
+		private Integer maxFrameLength;
+		private Integer lengthFieldOffset;
+		private Integer lengthFieldLength;
+		private Integer initialBytesToStrip;
+		private Integer lengthAdjustment;
+		private Integer readIdleTime;
+		private Integer writeIdleTime;
+		private Integer allIdleTimeSeconds;
+	}
+
+	@Data
+	public static class Tunnel {
+		private String keyStorePassword;
+		private String jksPath;
+		private String serverIp;
+		private Integer serverPort;
+		private Boolean sslEnable;
+		private Integer obtainLicenseInterval;
+		private String licenseKey;
+		private Integer threadCount;
+		private String clientId;
+		private Boolean transferLogEnable;
+		private Boolean heartbeatLogEnable;
+		private Reconnection reconnection;
+	}
+
+	@Data
+	public static class Client {
+//		private Tcp tcp;
+		private Udp udp;
+	}
+
+	@Data
+	public static class Reconnection {
+		private Integer intervalSeconds;
+		private Boolean unlimited;
+	}
+
+	@Data
+	public static class Tcp {
+
+	}
+
+	@Data
+	public static class Udp {
+		private Integer bossThreadCount;
+		private Integer workThreadCount;
+		private String puppetPortRange;
+		private Boolean transferLogEnable;
+	}
+}

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/core/ProxyClientService.java

@@ -1,22 +1,14 @@
 package org.dromara.neutrinoproxy.client.core;
 
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.bean.BeanUtil;
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
-import org.dromara.neutrinoproxy.client.util.UdpServerUtil;
-import org.dromara.neutrinoproxy.core.ProxyMessage;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
 import lombok.extern.slf4j.Slf4j;
-import org.noear.solon.Solon;
+import org.dromara.neutrinoproxy.client.config.ProxyConfiguration;
+import org.dromara.neutrinoproxy.client.config.SolonProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
 /**
  * 代理客户端服务
  * @author: aoshiguchen
@@ -24,107 +16,16 @@ import java.util.concurrent.TimeUnit;
  */
 @Slf4j
 @Component
-public class ProxyClientService {
+public class ProxyClientService{
-	@Inject
+    @Inject
-	private ProxyConfig proxyConfig;
+    private ProxyConfiguration proxyConfiguration;
-	@Inject("cmdTunnelBootstrap")
+    @Inject
-	private Bootstrap cmdTunnelBootstrap;
+    private SolonProxyConfig solonProxyConfig;
-	@Inject("udpServerBootstrap")
-	private Bootstrap udpServerBootstrap;
-	private volatile Channel channel;
-	/**
-	 * 重连次数
-	 */
-	private volatile int reconnectCount = 0;
-	/**
-	 * 重连服务执行器
-	 */
-	private static final ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor(new CustomThreadFactory("ClientReconnect"));
-
 	@Init
 	public void init() {
-		this.reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 10, proxyConfig.getTunnel().getReconnection().getIntervalSeconds(), TimeUnit.SECONDS);
+        log.info("start....");
-
+        ProxyConfig proxyConfig = BeanUtil.toBean(solonProxyConfig, ProxyConfig.class);
-		try {
+        proxyConfiguration.start(proxyConfig);
-			this.start();
+        log.info("start success!");
-			UdpServerUtil.initCache(proxyConfig, udpServerBootstrap);
-		} catch (Exception e) {
-			// 启动连不上也做一下重连，因此先catch异常
-			log.error("[CmdChannel] start error", e);
-		}
-	}
-
-	public void start() {
-		if (StrUtil.isEmpty(proxyConfig.getTunnel().getServerIp())) {
-			log.error("not found server-ip config.");
-			Solon.stop();
-			return;
-		}
-		if (null == proxyConfig.getTunnel().getServerPort()) {
-			log.error("not found server-port config.");
-			Solon.stop();
-			return;
-		}
-		if (null != proxyConfig.getTunnel().getSslEnable() && proxyConfig.getTunnel().getSslEnable()
-				&& StrUtil.isEmpty(proxyConfig.getTunnel().getJksPath())) {
-			log.error("not found jks-path config.");
-			Solon.stop();
-			return;
-		}
-		if (StrUtil.isEmpty(proxyConfig.getTunnel().getLicenseKey())) {
-			log.error("not found license-key config.");
-			Solon.stop();
-			return;
-		}
-		if (null == channel || !channel.isActive()) {
-			try {
-				connectProxyServer();
-			} catch (Exception e) {
-				log.error("client start error", e);
-			}
-		} else {
-			channel.writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getTunnel().getLicenseKey(), ProxyUtil.getClientId()));
-		}
-	}
-
-	/**
-	 * 连接代理服务器
-	 */
-	private void connectProxyServer() throws InterruptedException {
-		cmdTunnelBootstrap.connect()
-			.addListener(new ChannelFutureListener() {
-
-				@Override
-				public void operationComplete(ChannelFuture future) throws Exception {
-					if (future.isSuccess()) {
-						channel = future.channel();
-						// 连接成功，向服务器发送客户端认证信息（licenseKey）
-						ProxyUtil.setCmdChannel(future.channel());
-						future.channel().writeAndFlush(ProxyMessage.buildAuthMessage(proxyConfig.getTunnel().getLicenseKey(), ProxyUtil.getClientId()));
-						log.info("[CmdChannel] connect proxy server success. channelId:{}", future.channel().id().asLongText());
-
-//						reconnectServiceEnable = true;
-						reconnectCount = 0;
-					} else {
-						log.info("[CmdChannel] connect proxy server failed!");
-					}
-				}
-			}).sync();
-	}
-
-	protected synchronized void reconnect() {
-		if (null != channel) {
-			if (channel.isActive()) {
-				return;
-			}
-			channel.close();
-		}
-
-		log.info("[CmdChannel] client reconnect seq:{}", ++reconnectCount);
-		try {
-			connectProxyServer();
-		} catch (Exception e) {
-			log.error("[CmdChannel] reconnect error", e);
-		}
 	}
 }

neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageConnectHandler.java

@@ -1,87 +0,0 @@
-package org.dromara.neutrinoproxy.client.handler;
-
-import org.dromara.neutrinoproxy.client.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.core.ProxyChannelBorrowListener;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
-import org.dromara.neutrinoproxy.core.Constants;
-import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
-import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
-import org.dromara.neutrinoproxy.core.dispatcher.Match;
-import io.netty.bootstrap.Bootstrap;
-import io.netty.channel.*;
-import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
-
-/**
- * 连接信息处理器
- * @author: aoshiguchen
- * @date: 2022/6/16
- */
-@Match(type = Constants.ProxyDataTypeName.CONNECT)
-@Component
-public class ProxyMessageConnectHandler implements ProxyMessageHandler {
-	@Inject("tcpProxyTunnelBootstrap")
-	private Bootstrap tcpProxyTunnelBootstrap;
-	@Inject("realServerBootstrap")
-	private Bootstrap realServerBootstrap;
-	@Inject
-	private ProxyConfig proxyConfig;
-
-	@Override
-	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-		final Channel cmdChannel = ctx.channel();
-		final String visitorId = proxyMessage.getInfo();
-		String[] serverInfo = new String(proxyMessage.getData()).split(":");
-		String ip = serverInfo[0];
-		int port = Integer.parseInt(serverInfo[1]);
-		// 连接真实的、被代理的服务
-		realServerBootstrap.connect(ip, port).addListener(new ChannelFutureListener() {
-
-			@Override
-			public void operationComplete(ChannelFuture future) throws Exception {
-
-				// 连接后端服务器成功
-				if (future.isSuccess()) {
-					final Channel realServerChannel = future.channel();
-
-					realServerChannel.config().setOption(ChannelOption.AUTO_READ, false);
-
-					// 获取连接
-					ProxyUtil.borrowTcpProxyChanel(tcpProxyTunnelBootstrap, new ProxyChannelBorrowListener() {
-
-						@Override
-						public void success(Channel channel) {
-							// 连接绑定
-							channel.attr(Constants.NEXT_CHANNEL).set(realServerChannel);
-							realServerChannel.attr(Constants.NEXT_CHANNEL).set(channel);
-
-							// 远程绑定
-							channel.writeAndFlush(ProxyMessage.buildConnectMessage(visitorId + "@" + proxyConfig.getTunnel().getLicenseKey()));
-
-							realServerChannel.config().setOption(ChannelOption.AUTO_READ, true);
-							ProxyUtil.addRealServerChannel(visitorId, realServerChannel);
-							ProxyUtil.setRealServerChannelVisitorId(realServerChannel, visitorId);
-						}
-
-						@Override
-						public void error(Throwable cause) {
-							ProxyMessage proxyMessage = new ProxyMessage();
-							proxyMessage.setType(ProxyMessage.TYPE_DISCONNECT);
-							proxyMessage.setInfo(visitorId);
-							cmdChannel.writeAndFlush(proxyMessage);
-						}
-					});
-
-				} else {
-					cmdChannel.writeAndFlush(ProxyMessage.buildDisconnectMessage(visitorId));
-				}
-			}
-		});
-	}
-
-	@Override
-	public String name() {
-		return ProxyDataTypeEnum.CONNECT.getDesc();
-	}
-}

neutrino-proxy-client/src/main/resources/app-copy.yml

@@ -0,0 +1,41 @@
+solon.logging.logger:
+  "root":
+    level: info
+
+neutrino:
+  proxy:
+    tunnel:
+      # 线程池相关配置，用于技术调优，可忽略
+      thread-count: 50
+      # 隧道SSL证书配置
+      key-store-password: 123456
+      jks-path: classpath:/test.jks
+      # 服务端IP
+      server-ip: ${SERVER_IP:localhost}
+      # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
+      server-port: ${SERVER_PORT:9002}
+      # 是否启用SSL(注意：该配置必须和server-port对应上)
+      ssl-enable: ${SSL_ENABLE:true}
+      # 客户端连接唯一凭证
+      license-key: ${LICENSE_KEY:}
+      # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
+      client-id:
+      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
+      transfer-log-enable: false
+      # 是否开启心跳日志
+      heartbeat-log-enable: false
+      # 重连设置
+      reconnection:
+        # 重连间隔（秒）
+        interval-seconds: 10
+        # 是否开启无限重连(未开启时，客户端license不合法会自动停止应用，开启了则不会，请谨慎开启)
+        unlimited: false
+    client:
+      udp:
+        # 线程池相关配置，用于技术调优，可忽略
+        boss-thread-count: 5
+        work-thread-count: 20
+        # udp傀儡端口范围
+        puppet-port-range: 10000-10500
+        # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
+        transfer-log-enable: false

neutrino-proxy-client/src/main/resources/app.yml

@@ -1,16 +1,22 @@
+solon:
+  config:
+    add: ./app.yml
+  app:
+    name: neutrino-proxy-client
+    version: 2.0.1
 # 日志级别
 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: false
+    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/${neutrino.application.name}"
     rolling: "logs/${neutrino.application.name}_%d{yyyy-MM-dd}_%i.log.gz"
 solon.logging.logger:
   "root":
-    #    level: ${LOG_LEVEL:info}
     level: info
+
 neutrino:
   application:
     name: neutrino-proxy-client
@@ -32,7 +38,7 @@ neutrino:
       key-store-password: ${STORE_PASS:123456}
       jks-path: ${JKS_PATH:classpath:/test.jks}
       # 服务端IP
-      server-ip: ${SERVER_IP:localhost}
+      server-ip: ${SERVER_IP:}
       # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
       server-port: ${SERVER_PORT:9002}
       # 是否启用SSL(注意：该配置必须和server-port对应上)

neutrino-proxy-core/pom.xml

@@ -30,10 +30,10 @@
             <artifactId>hutool-core</artifactId>
             <version>${hutool.version}</version>
         </dependency>
-        <!--lombok-->
         <dependency>
-            <groupId>org.projectlombok</groupId>
+            <groupId>cn.hutool</groupId>
-            <artifactId>lombok</artifactId>
+            <artifactId>hutool-cache</artifactId>
+            <version>${hutool.version}</version>
         </dependency>
     </dependencies>
 

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/Constants.java

@@ -49,6 +49,12 @@ public interface Constants {
     AttributeKey<Boolean> IS_UDP_KEY =  AttributeKey.newInstance("isUdp");
     AttributeKey<InetSocketAddress> SENDER = AttributeKey.newInstance("sender");
 
+    AttributeKey<Integer> SERVER_PORT = AttributeKey.newInstance("serverPort");
+    AttributeKey<String> REAL_REMOTE_IP = AttributeKey.newInstance("realRemoteIp");
+
+
+    AttributeKey<Boolean> FLOW_LIMITER_FLAG = AttributeKey.newInstance("flowLimiterFlag");
+
 
     int HEADER_SIZE = 4;
     int TYPE_SIZE = 1;

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/aot/NeutrinoCoreRuntimeNativeRegistrar.java

@@ -8,6 +8,7 @@ import org.noear.solon.aot.RuntimeNativeRegistrar;
 import org.noear.solon.aot.hint.MemberCategory;
 import org.noear.solon.core.AppContext;
 
+import java.nio.ByteBuffer;
 import java.util.Set;
 
 /**
@@ -22,9 +23,18 @@ public class NeutrinoCoreRuntimeNativeRegistrar implements RuntimeNativeRegistra
             metadata.registerReflection(clazz, MemberCategory.INVOKE_DECLARED_METHODS);
         }
 
+        Set<Class<?>> byteBufferClasses = ClassUtil.scanPackageBySuper("java", ByteBuffer.class);
+        for (Class<?> clazz : byteBufferClasses) {
+            metadata.registerReflection(clazz, MemberCategory.INVOKE_DECLARED_METHODS);
+        }
+
         metadata.registerReflection(ProxyMessage.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
         metadata.registerReflection(ProxyMessage.UdpBaseInfo.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
 
-        metadata.registerArg("--add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
+        metadata.registerArg("-J--add-opens=java.base/java.lang.invoke=ALL-UNNAMED");
+        metadata.registerArg("-J--add-opens=java.base/java.nio=ALL-UNNAMED");
+        metadata.registerArg("-J--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
+
+        metadata.registerArg("-march=compatibility");
     }
 }

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/FileUtil.java

@@ -5,6 +5,7 @@ import org.dromara.neutrinoproxy.core.base.MetaDataConstant;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.jar.JarEntry;
@@ -56,7 +57,7 @@ public class FileUtil {
 	 * @throws IOException
 	 */
 	public static String readContentAsString(String path) {
-		try (BufferedReader br = new BufferedReader(new InputStreamReader(getInputStream(path)))){
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(getInputStream(path), StandardCharsets.UTF_8))){
 			return br.lines().collect(Collectors.joining("\n"));
 		} catch (Exception e) {
 			return null;
@@ -70,7 +71,7 @@ public class FileUtil {
 	 * @throws IOException
 	 */
 	public static String readContentAsString(InputStream in) {
-		try (BufferedReader br = new BufferedReader(new InputStreamReader(in))){
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8))){
 			return br.lines().collect(Collectors.joining("\n"));
 		} catch (Exception e) {
 			return null;
@@ -84,7 +85,7 @@ public class FileUtil {
 	 * @throws IOException
 	 */
 	public static List<String> readContentAsStringList(String path) {
-		try (BufferedReader br = new BufferedReader(new InputStreamReader(getInputStream(path)))){
+		try (BufferedReader br = new BufferedReader(new InputStreamReader(getInputStream(path), StandardCharsets.UTF_8))){
 			return br.lines().collect(Collectors.toList());
 		} catch (Exception e) {
 			return null;

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/HttpUtil.java

@@ -0,0 +1,60 @@
+package org.dromara.neutrinoproxy.core.util;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author: wen.y
+ * @date: 2023/12/9
+ */
+public class HttpUtil {
+
+    /**
+     * 获取请求头 Host 忽略端口号
+     * @param httpContent
+     * @return
+     */
+    public static String getHostIgnorePort(String httpContent) {
+        String host = getHost(httpContent);
+        if (StringUtils.isEmpty(host) || !host.contains(":")) {
+            return host;
+        }
+        return host.replaceAll(":.*", "");
+    }
+
+    /**
+     * 获取请求头 Host
+     * @param httpContent
+     * @return
+     */
+    public static String getHost(String httpContent) {
+        return getHeaderValue(httpContent, "Host");
+    }
+
+    /**
+     * 获取请求头
+     * @param httpContent
+     * @return
+     */
+    public static String getHeaderValue(String httpContent, String header) {
+        String headerContent = httpContent.split("\r\n\r\n")[0];
+        String[] lines = headerContent.split("\r\n");
+        String firstLine = lines[0];
+        if (!(firstLine.endsWith("HTTP/1.1") || firstLine.endsWith("HTTP/1.0"))) {
+            return null;
+        }
+        for (int i = 1; i < lines.length; i++) {
+            String line = lines[i];
+            if (!line.startsWith(header + ":")) {
+                continue;
+            }
+            if (line.length() > header.length() + 1) {
+                return line.substring(header.length() + 1).trim();
+            } else {
+                return "";
+            }
+        }
+        return null;
+    }
+
+}

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/IpUtil.java

@@ -0,0 +1,39 @@
+package org.dromara.neutrinoproxy.core.util;
+
+import cn.hutool.core.net.Ipv4Util;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.net.InetSocketAddress;
+
+@Slf4j
+public class IpUtil extends org.noear.solon.core.util.IpUtil {
+
+    public static String getRemoteIp(ChannelHandlerContext ctx) {
+        String remoteAddress = "";
+        InetSocketAddress socketAddress = (InetSocketAddress) ctx.channel().remoteAddress();
+        if (socketAddress != null) {
+            remoteAddress = socketAddress.getAddress().getHostAddress();
+        }
+        return remoteAddress;
+    }
+
+    /**
+     * 工作原理为从http协议的header中找公网地址，此主要用于处理nginx转发时塞进去的真实IP的header，找不到返回null
+     * @param httpContent http协议文档内容
+     * @return 返回找到的第一个公网地址
+     */
+    public static String getRealRemoteIp(String httpContent) {
+        String ip = HttpUtil.getHeaderValue(httpContent, "X-Forwarded-For");
+        if (StringUtils.isEmpty(ip)) {
+            ip = HttpUtil.getHeaderValue(httpContent, "X-Real-IP");
+        }
+        if (StringUtils.isNotEmpty(ip)) {
+            log.debug("obtain http header ip：{}", ip);
+            return ip;
+        }
+        return null;
+    }
+
+}

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/util/NeutrinoProxyVersion.java

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.core.util;
+
+import org.noear.solon.Solon;
+
+/**
+ * @author songyinyin
+ * @since 2023/10/31 11:48
+ */
+public class NeutrinoProxyVersion {
+
+    /**
+     * 获取 NeutrinoProxy 版本号
+     */
+    public static String getVersion() {
+        return Solon.cfg().get("solon.app.version");
+    }
+
+
+}

neutrino-proxy-server/Dockerfile

@@ -1,15 +1,16 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:21-jdk-oracle
 #同步时间
-RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
+#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \
-    apk update && apk add wget unzip vim && apk add -U tzdata && \
+#    apk update && apk add wget unzip vim && apk add -U tzdata && \
-    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+#    ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+# 设置时区为北京时间
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 RUN mkdir -p /root/neutrino-proxy/config
-RUN mkdir -p /root/neutrino-proxy/neutrino-proxy-admin
 WORKDIR /root/neutrino-proxy
-COPY ../neutrino-proxy-server/target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar
+COPY ./target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar
-COPY ../neutrino-proxy-server/src/main/resources/app.yml /root/neutrino-proxy/config
+COPY ./src/main/resources/app-copy.yml /root/neutrino-proxy/config/app.yml
-COPY ../neutrino-proxy-admin/dist /root/neutrino-proxy/neutrino-proxy-admin/dist
 #VOLUME ["/root/neutrino-proxy"]
 ENTRYPOINT ["java","-jar","neutrino-proxy-server.jar","config=./config/app.yml"]
 
-#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7
+#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7

neutrino-proxy-server/pom.xml

@@ -61,6 +61,13 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>*.yml</include>
+                </includes>
+            </resource>
             <resource>
                 <directory>${project.basedir}/src/main/resources</directory>
                 <filtering>false</filtering>

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/ProxyServer.java

@@ -3,6 +3,7 @@ package org.dromara.neutrinoproxy.server;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.solonplugins.job.annotation.EnableJob;
 import org.noear.solon.Solon;
+import org.noear.solon.Utils;
 import org.noear.solon.annotation.SolonMain;
 import org.noear.solon.web.cors.CrossFilter;
 
@@ -20,6 +21,11 @@ public class ProxyServer {
 		Solon.start(ProxyServer.class, args, app -> {
 			// 跨域支持。加-1 优先级更高
 			app.filter(-1, new CrossFilter().allowedOrigins("*"));
+            String loglevel = System.getenv("LOG_LEVEL");
+            if (Utils.isNotEmpty(loglevel)) {
+                app.cfg().put("solon.logging.logger.root.level", loglevel);
+            }
+            log.info("NeutrinoProxy Server ：{}", app.cfg().get("solon.app.version"));
 		});
 	}
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java

@@ -1,30 +1,11 @@
 package org.dromara.neutrinoproxy.server.base;
 
+import org.apache.ibatis.type.SimpleTypeRegistry;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.base.rest.ResponseBody;
 import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
-import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper;
+import org.dromara.neutrinoproxy.server.dal.*;
-import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper;
+import org.dromara.neutrinoproxy.server.service.*;
-import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportMonthMapper;
-import org.dromara.neutrinoproxy.server.dal.JobInfoMapper;
-import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
-import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
-import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
-import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
-import org.dromara.neutrinoproxy.server.dal.UserMapper;
-import org.dromara.neutrinoproxy.server.dal.UserTokenMapper;
-import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService;
-import org.dromara.neutrinoproxy.server.service.JobInfoService;
-import org.dromara.neutrinoproxy.server.service.JobLogService;
-import org.dromara.neutrinoproxy.server.service.LicenseService;
-import org.dromara.neutrinoproxy.server.service.PortGroupService;
-import org.dromara.neutrinoproxy.server.service.PortMappingService;
-import org.dromara.neutrinoproxy.server.service.PortPoolService;
-import org.dromara.neutrinoproxy.server.service.ReportService;
-import org.dromara.neutrinoproxy.server.service.UserLoginRecordService;
-import org.dromara.neutrinoproxy.server.service.UserService;
 import org.dromara.solonplugins.job.JobBean;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.aot.RuntimeNativeMetadata;
@@ -43,6 +24,7 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
     @Override
     public void register(AppContext context, RuntimeNativeMetadata metadata) {
         metadata.registerResourceInclude("test.jks");
+        metadata.registerResourceInclude("sql/.*");
 
         // 使用 MP lambda 的类，需要注册序列化
         metadata.registerLambdaSerialization(ClientConnectRecordService.class);
@@ -55,6 +37,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
         metadata.registerLambdaSerialization(ReportService.class);
         metadata.registerLambdaSerialization(UserLoginRecordService.class);
         metadata.registerLambdaSerialization(UserService.class);
+        metadata.registerLambdaSerialization(SecurityGroupService.class);
+
 
         metadata.registerLambdaSerialization(LicenseMapper.class);
         metadata.registerLambdaSerialization(ClientConnectRecordMapper.class);
@@ -63,11 +47,17 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
         metadata.registerLambdaSerialization(FlowReportMinuteMapper.class);
         metadata.registerLambdaSerialization(FlowReportMonthMapper.class);
         metadata.registerLambdaSerialization(JobInfoMapper.class);
+        metadata.registerLambdaSerialization(JobLogMapper.class);
         metadata.registerLambdaSerialization(PortMappingMapper.class);
+        metadata.registerLambdaSerialization(PortGroupMapper.class);
+        metadata.registerLambdaSerialization(ReportMapper.class);
         metadata.registerLambdaSerialization(PortPoolMapper.class);
         metadata.registerLambdaSerialization(UserLoginRecordMapper.class);
         metadata.registerLambdaSerialization(UserMapper.class);
         metadata.registerLambdaSerialization(UserTokenMapper.class);
+        metadata.registerLambdaSerialization(SecurityGroupMapper.class);
+        metadata.registerLambdaSerialization(SecurityRuleMapper.class);
+
 
         metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS);
         metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS);
@@ -89,6 +79,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
 
         metadata.registerReflection(JobBean.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
 
+        // 解决mybatis调用deleteBatchIds报错“java.lang.ClassNotFoundException: Cannot find class: org.apache.ibatis.type.SimpleTypeRegistry”
+        metadata.registerReflection(SimpleTypeRegistry.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
     }
 
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DBInitialize.java

@@ -33,6 +33,7 @@ import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;
+import org.noear.solon.core.runtime.NativeDetector;
 import org.noear.wood.DbContext;
 import org.noear.wood.annotation.Db;
 
@@ -57,6 +58,10 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 
 	@Init
 	public void init() throws Throwable {
+        // aot 阶段，不初始化数据库
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
 		Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!");
 		dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
 		Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!");

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/proxy/ProxyConfiguration.java

@@ -20,6 +20,9 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.TcpVisitorChannelHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.UdpVisitorChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.TcpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.UdpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
 import org.noear.solon.annotation.Configuration;
@@ -74,6 +77,8 @@ public class ProxyConfiguration implements LifecycleBean {
             }
             ch.pipeline().addFirst(new BytesMetricsHandler());
 //            ch.pipeline().addLast(new ChannelTrafficShapingHandler(1024 * 1024 * 20, 1024 * 1024 * 20, 100, 20000));
+            ch.pipeline().addLast(new TcpVisitorSecurityChannelHandler());
+            ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler());
             ch.pipeline().addLast(new TcpVisitorChannelHandler());
             }
         });
@@ -111,6 +116,8 @@ public class ProxyConfiguration implements LifecycleBean {
                     if (null != proxyConfig.getServer().getUdp().getTransferLogEnable() && proxyConfig.getServer().getUdp().getTransferLogEnable()) {
                         ch.pipeline().addFirst(new LoggingHandler(UdpVisitorChannelHandler.class));
                     }
+                    pipeline.addLast(udpServerWorkerGroup, new UdpVisitorSecurityChannelHandler());
+                    ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler());
                     pipeline.addLast(udpServerWorkerGroup, new UdpVisitorChannelHandler());
                 }
             });

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/ExceptionConstant.java

@@ -40,8 +40,8 @@ public enum ExceptionConstant {
 	NO_PERMISSION_VISIT(5, "当前用户无权访问该资源"),
 	PARAMS_NOT_NULL(10, "参数[{}]不能为空"),
 	PARAMS_NOT_EMPTY(11, "参数[{}]不能为空"),
-
 	FILED_LENGTH_OUT(12 ,"{}不能超出长度{}"),
+    BYTES_DESC_INVALID(13, "参数[{}]字节描述不合法"),
 
 	// 用户管理(11000)
 	// license管理(12000)
@@ -67,7 +67,12 @@ public enum ExceptionConstant {
 
 	PORT_GROUP_NAME_ALREADY_EXIST(16000,"端口分组名称[{}]已经存在"),
 	PORT_GROUP_NAME_DOES_NOT_EXIST(16001,"端口分组不存在"),
-	DEFAULT_GROUP_FORBID_DELETE(16002,"默认分组禁止删除")
+	DEFAULT_GROUP_FORBID_DELETE(16002,"默认分组禁止删除"),
+
+    // 安全组管理(17000)
+    SECURITY_GROUP_NOT_EXIST(17000, "安全组不存在"),
+	SECURITY_RULE_NOT_EXIST(17001, "安全规则不存在"),
+
 	;
 
 	private int code;

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/constant/SecurityRulePassTypeEnum.java

@@ -0,0 +1,16 @@
+package org.dromara.neutrinoproxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum SecurityRulePassTypeEnum {
+    DENY(0, "deny"),
+    ALLOW(1, "allow"),
+    NONE(-1, "none")
+    ;
+
+    private final Integer type;
+    private final String desc;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/LicenseController.java

@@ -70,6 +70,8 @@ public class LicenseController {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotEmpty(req.getName(), "name");
 		ParamCheckUtil.checkNotNull(req.getUserId(), "userId");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
 
 		return licenseService.create(req);
 	}
@@ -81,6 +83,8 @@ public class LicenseController {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotNull(req.getId(), "id");
 		ParamCheckUtil.checkNotEmpty(req.getName(), "name");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
 
 		return licenseService.update(req);
 	}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/PortMappingController.java

@@ -13,6 +13,8 @@ import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.noear.solon.annotation.*;
 
+import java.util.List;
+
 /**
  * 端口映射
  * @author: aoshiguchen
@@ -41,6 +43,8 @@ public class PortMappingController {
         ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
         ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
         if (StringUtils.isBlank(req.getClientIp())) {
             // 没传客户端ip，默认为127.0.0.1
             req.setClientIp("127.0.0.1");
@@ -58,19 +62,24 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }
 
 		return portMappingService.create(req);
 	}
 
 	@Post
 	@Mapping("/update")
-	public PortMappingUpdateRes update(PortMappingUpdateReq req) {
+	public void update(PortMappingUpdateReq req) {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotNull(req.getLicenseId(), "licenseId");
 		ParamCheckUtil.checkNotNull(req.getServerPort(), "serverPort");
 		ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
 		ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
 		if (StringUtils.isBlank(req.getClientIp())) {
 			// 没传客户端ip，默认为127.0.0.1
 			req.setClientIp("127.0.0.1");
@@ -88,8 +97,11 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }
 
-		return portMappingService.update(req);
+        portMappingService.update(req);
 	}
 
 	@Get
@@ -119,4 +131,26 @@ public class PortMappingController {
 
 		portMappingService.delete(req.getId());
 	}
+
+    /**
+     * 绑定安全组
+     * @param req portMappingId和securityGroupId
+     */
+    @Post
+    @Mapping("/bind/security-group")
+    public void bindSecurityGroup(PortMappingBindSecurityGroupReq req) {
+        portMappingService.portBindSecurityGroup(req.getId(), req.getSecurityGroupId());
+    }
+
+    /**
+     * 安全组解绑
+     * @param id 端口映射Id
+     */
+    @Post
+    @Mapping("/unbind/security-group")
+    public void unbindSecurityGroup(Integer id) {
+        portMappingService.portUnbindSecurityGroup(id);
+    }
+
+
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/SecurityController.java

@@ -0,0 +1,127 @@
+package org.dromara.neutrinoproxy.server.controller;
+
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.controller.req.system.*;
+import org.dromara.neutrinoproxy.server.controller.res.system.*;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.noear.solon.annotation.*;
+
+import java.util.List;
+
+@Controller
+@Mapping("/security")
+public class SecurityController {
+
+    @Inject
+    private SecurityGroupService groupService;
+
+    @Inject
+    private PortMappingService portMappingService;
+
+    /**
+     * 获取当前用户权限下的安全组
+     */
+    @Get
+    @Mapping("/group/page")
+    public PageInfo<SecurityGroupListRes> groupPage(PageQuery pageQuery, SecurityGroupListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return groupService.groupPage(pageQuery, req);
+    }
+
+    @Get
+    @Mapping("/group/list")
+    public List<SecurityGroupListRes> groupList() {
+        return groupService.groupList();
+    }
+
+    @Get
+    @Mapping("/group/detail")
+    public SecurityGroupDetailRes groupDetail(SecurityGroupDetailReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+
+        return groupService.groupDetail(req);
+    }
+
+    @Post
+    @Mapping("/group/create")
+    public void createGroup(SecurityGroupCreateReq req) {
+        groupService.createGroup(req);
+    }
+
+    @Post
+    @Mapping("/group/update")
+    public void updateGroup(SecurityGroupUpdateReq req) {
+        groupService.updateGroup(req);
+    }
+
+    /**
+     * 将级联删除对应规则,并更新缓存
+     * @param groupId 安全组Id
+     */
+    @Post
+    @Mapping("/group/delete")
+    public void deleteGroup(Integer groupId) {
+        ParamCheckUtil.checkNotNull(groupId, "groupId");
+
+        groupService.deleteGroup(groupId);
+    }
+
+    @Post
+    @Mapping("/group/update/enable-status")
+    public SecurityGroupUpdateEnableStatueRes updateGroupEnableStatueReq(SecurityGroupUpdateEnableStatueReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
+
+        return groupService.updateGroupEnableStatueReq(req);
+    }
+
+    @Get
+    @Mapping("/rule/page")
+    public PageInfo<SecurityRuleListRes> rulePage(PageQuery pageQuery, SecurityRuleListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return groupService.rulePage(pageQuery, req);
+    }
+
+    @Get
+    @Mapping("/rule/list")
+    public List<SecurityRuleListRes> getRuleListByGroupId(SecurityRuleListReq req) {
+        return groupService.ruleList(req);
+    }
+
+    @Post
+    @Mapping("/rule/create")
+    public void createRule(SecurityRuleCreateReq req) {
+        groupService.createRule(req);
+    }
+
+    @Post
+    @Mapping("/rule/update")
+    public void updateRule(SecurityRuleUpdateReq req) {
+        groupService.updateRule(req);
+    }
+
+    @Post
+    @Mapping("/rule/delete")
+    public void deleteRule(Integer ruleId) {
+        groupService.deleteRule(ruleId);
+    }
+
+
+    @Post
+    @Mapping("/rule/update/enable-status")
+    public SecurityRuleUpdateEnableStatueRes updateRuleEnableStatueReq(SecurityRuleUpdateEnableStatueReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
+
+        return groupService.updateRuleEnableStatueReq(req);
+    }
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseCreateReq.java

@@ -38,4 +38,12 @@ public class LicenseCreateReq {
 	 * 用户ID
 	 */
 	private Integer userId;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/LicenseUpdateReq.java

@@ -38,4 +38,12 @@ public class LicenseUpdateReq {
 	 * license名称
 	 */
 	private String name;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingBindSecurityGroupReq.java

@@ -0,0 +1,12 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+
+@Data
+public class PortMappingBindSecurityGroupReq {
+
+    private Integer id;
+
+    private Integer securityGroupId;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingCreateReq.java

@@ -54,6 +54,14 @@ public class PortMappingCreateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -62,6 +70,12 @@ public class PortMappingCreateReq {
 	 * 代理超时时间
 	 */
 	private Long proxyTimeoutMs;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId;
+
 	/**
 	 * 描述
 	 */

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/proxy/PortMappingUpdateReq.java

@@ -58,6 +58,14 @@ public class PortMappingUpdateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -66,6 +74,12 @@ public class PortMappingUpdateReq {
 	 * 代理超时时间
 	 */
 	private Long proxyTimeoutMs;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId;
+
 	/**
 	 * 描述
 	 */

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupCreateReq.java

@@ -0,0 +1,23 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+@Data
+public class SecurityGroupCreateReq {
+    /**
+     * 组名
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 通过类型
+     */
+    private Integer defaultPassType;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupDetailReq.java

@@ -0,0 +1,12 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupDetailReq {
+    private Integer id;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupListReq.java

@@ -0,0 +1,22 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+/**
+ * @author: wen.y
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupListReq {
+    private String name;
+    /**
+     * 描述
+     */
+    private String description;
+    /**
+     * 通过类型
+     */
+    private Integer defaultPassType;
+    private Integer enable;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateEnableStatueReq.java

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupUpdateEnableStatueReq {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityGroupUpdateReq.java

@@ -0,0 +1,21 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+@Data
+public class SecurityGroupUpdateReq {
+
+    private Integer id;
+
+    /**
+     * 组名
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleCreateReq.java

@@ -0,0 +1,57 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import cn.hutool.core.net.Ipv4Util;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+import java.util.Date;
+
+@Data
+@ToString
+@Accessors(chain = true)
+public class SecurityRuleCreateReq {
+
+    /**
+     * 所属安全组
+     */
+    private Integer groupId;
+
+    /**
+     * 规则名
+     */
+    private String name;
+
+    /**
+     * 规则描述
+     */
+    private String description;
+
+    /**
+     * 规则,ipv6只支持单个ip判断
+     * 单个ip：192.168.1.1,0:0:0:0:0:0:10.0.0.1
+     * 范围类型：192.168.1.0-192.168.1.255
+     * 掩码类型：192.168.1.0/24
+     * 泛型：0.0.0.0/ALL
+     * 每个类型中间以英文逗号分隔
+     */
+    private String rule;
+
+    /**
+     * 放行类型，reject 或 allow
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer passType;
+
+    /**
+     * 优先级，数字越小，优先级越高
+     */
+    private Integer priority = 1;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleListReq.java

@@ -0,0 +1,16 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityRuleListReq {
+    private String groupId;
+    private String name;
+    private String description;
+    private Integer passType;
+    private Integer enable;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleUpdateEnableStatueReq.java

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityRuleUpdateEnableStatueReq {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/req/system/SecurityRuleUpdateReq.java

@@ -0,0 +1,51 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+@Data
+@ToString
+@Accessors(chain = true)
+public class SecurityRuleUpdateReq {
+
+    private Integer id;
+
+    /**
+     * 所属安全组
+     */
+    private Integer groupId;
+
+    /**
+     * 规则名
+     */
+    private String name;
+
+    /**
+     * 规则描述
+     */
+    private String description;
+
+    /**
+     * 规则,ipv6只支持单个ip判断
+     * 单个ip：192.168.1.1,0:0:0:0:0:0:10.0.0.1
+     * 范围类型：192.168.1.0-192.168.1.255
+     * 掩码类型：192.168.1.0/24
+     * 泛型：0.0.0.0/ALL
+     * 每个类型中间以英文逗号分隔
+     */
+    private String rule;
+
+    /**
+     * 放行类型，reject 或 allow
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer passType;
+
+    /**
+     * 优先级，数字越小，优先级越高
+     */
+    private Integer priority;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/LicenseListRes.java

@@ -32,6 +32,14 @@ public class LicenseListRes {
 	 * 用户名
 	 */
 	private String userName;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 是否在线
 	 * {@link OnlineStatusEnum}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/proxy/PortMappingListRes.java

@@ -75,6 +75,14 @@ public class PortMappingListRes {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 客户端端口
 	 */
@@ -101,6 +109,12 @@ public class PortMappingListRes {
 	 * 描述
 	 */
 	private String description;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId;
+
 	/**
 	 * 创建时间
 	 */

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/SecurityGroupDetailRes.java

@@ -0,0 +1,47 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+@Data
+@Accessors(chain = true)
+public class SecurityGroupDetailRes {
+
+    private Integer id;
+
+    /**
+     * 组名
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+
+    /**
+     * 默认放行类型
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer defaultPassType;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
+    /**
+     * 更新时间
+     */
+    private String updateTime;
+
+
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/SecurityGroupListRes.java

@@ -0,0 +1,49 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+public class SecurityGroupListRes {
+
+    private Integer id;
+
+    /**
+     * 组名
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+
+    /**
+     * 默认放行类型
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer defaultPassType;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/SecurityGroupUpdateEnableStatueRes.java

@@ -0,0 +1,12 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupUpdateEnableStatueRes {
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/SecurityRuleListRes.java

@@ -0,0 +1,67 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+import java.util.Date;
+
+@Data
+@ToString
+@Accessors(chain = true)
+public class SecurityRuleListRes {
+
+    private Integer id;
+
+    /**
+     * 所属安全组
+     */
+    private Integer groupId;
+
+    /**
+     * 规则名
+     */
+    private String name;
+
+    /**
+     * 规则描述
+     */
+    private String description;
+
+    /**
+     * 规则,ipv6只支持单个ip判断
+     * 单个ip：192.168.1.1,0:0:0:0:0:0:10.0.0.1
+     * 范围类型：192.168.1.0-192.168.1.255
+     * 掩码类型：192.168.1.0/24
+     * 泛型：0.0.0.0/ALL
+     * 每个类型中间以英文逗号分隔
+     */
+    private String rule;
+
+    /**
+     * 放行类型，reject 或 allow
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer passType;
+
+    /**
+     * 优先级，数字越小，优先级越高
+     */
+    private Integer priority;
+
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/controller/res/system/SecurityRuleUpdateEnableStatueRes.java

@@ -0,0 +1,8 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+public class SecurityRuleUpdateEnableStatueRes {
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/FlowReportHourMapper.java

@@ -45,8 +45,8 @@ public interface FlowReportHourMapper extends BaseMapper<FlowReportHourDO> {
 
     default List<FlowReportHourDO> findListByDateRange(Date startDate, Date endDate) {
         return this.selectList(new LambdaQueryWrapper<FlowReportHourDO>()
-                .ge(FlowReportHourDO::getDateStr, startDate)
+                .ge(FlowReportHourDO::getDate, startDate)
-                .le(FlowReportHourDO::getDateStr, endDate)
+                .le(FlowReportHourDO::getDate, endDate)
         );
     }
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/LicenseMapper.java

@@ -89,14 +89,6 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
         return this.selectById(id);
     }
 
-    default void update(Integer id, String name, Date updateTime) {
-        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-                .eq(LicenseDO::getId, id)
-                .set(LicenseDO::getName, name)
-                .set(LicenseDO::getUpdateTime, updateTime)
-        );
-    }
-
     default List<LicenseDO> findByIds(Set<Integer> ids) {
         return selectBatchIds(ids);
     }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/SecurityGroupMapper.java

@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.server.dal;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupListReq;
+import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SecurityGroupMapper extends BaseMapper<SecurityGroupDO> {
+    List<SecurityGroupDO> selectByCondition(IPage<SecurityGroupDO> page, @Param("req") SecurityGroupListReq req);
+
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<SecurityGroupDO>()
+            .eq(SecurityGroupDO::getId, id)
+            .set(SecurityGroupDO::getEnable, enable)
+            .set(SecurityGroupDO::getUpdateTime, updateTime)
+        );
+    }
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/SecurityRuleMapper.java

@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.server.dal;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleListReq;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SecurityRuleMapper extends BaseMapper<SecurityRuleDO> {
+    List<SecurityRuleDO> selectByCondition(IPage<SecurityRuleDO> page, @Param("req") SecurityRuleListReq req);
+
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<SecurityRuleDO>()
+                .eq(SecurityRuleDO::getId, id)
+                .set(SecurityRuleDO::getEnable, enable)
+                .set(SecurityRuleDO::getUpdateTime, updateTime)
+        );
+    }
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/LicenseDO.java

@@ -21,6 +21,7 @@
  */
 package org.dromara.neutrinoproxy.server.dal.entity;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -59,6 +60,14 @@ public class LicenseDO {
 	 * 用户ID
 	 */
 	private Integer userId;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 是否在线
 	 * {@link OnlineStatusEnum}
@@ -80,14 +89,7 @@ public class LicenseDO {
 
     public LicenseListRes toRes() {
         LicenseListRes res = new LicenseListRes();
-        res.setId(id);
+        BeanUtil.copyProperties(this, res);
-        res.setName(name);
-        res.setKey(key);
-        res.setUserId(userId);
-        res.setIsOnline(isOnline);
-        res.setEnable(enable);
-        res.setCreateTime(createTime);
-        res.setUpdateTime(updateTime);
         return res;
     }
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/PortMappingDO.java

@@ -21,6 +21,7 @@
  */
 package org.dromara.neutrinoproxy.server.dal.entity;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -69,6 +70,14 @@ public class PortMappingDO {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 描述
 	 */
@@ -92,6 +101,12 @@ public class PortMappingDO {
 	 * {@link EnableStatusEnum}
 	 */
 	private Integer enable;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId = 0; // 设置为null不生效，不知道为啥
+
 	/**
 	 * 创建时间
 	 */
@@ -101,23 +116,9 @@ public class PortMappingDO {
 	 */
 	private Date updateTime;
 
-
     public PortMappingListRes toRes() {
         PortMappingListRes res = new PortMappingListRes();
-        res.setId(id);
+        BeanUtil.copyProperties(this, res);
-        res.setLicenseId(licenseId);
-        res.setProtocal(protocal);
-        res.setSubdomain(subdomain);
-        res.setServerPort(serverPort);
-        res.setClientIp(clientIp);
-        res.setClientPort(clientPort);
-        res.setDescription(description);
-        res.setIsOnline(isOnline);
-        res.setProxyResponses(proxyResponses);
-        res.setProxyTimeoutMs(proxyTimeoutMs);
-        res.setEnable(enable);
-        res.setCreateTime(createTime);
-        res.setUpdateTime(updateTime);
         return res;
     }
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityGroupDO.java

@@ -0,0 +1,74 @@
+package org.dromara.neutrinoproxy.server.dal.entity;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupDetailRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupListRes;
+
+import java.util.Date;
+
+@Data
+@ToString
+@Accessors(chain = true)
+@TableName("security_group")
+public class SecurityGroupDO {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 组名
+     */
+    private String name;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+
+    /**
+     * 默认放行类型
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer defaultPassType;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public SecurityGroupListRes toListRes() {
+        SecurityGroupListRes res = new SecurityGroupListRes();
+        BeanUtil.copyProperties(this, res);
+        return res;
+    }
+
+    public SecurityGroupDetailRes toDetailRes() {
+        SecurityGroupDetailRes res = new SecurityGroupDetailRes();
+        BeanUtil.copyProperties(this, res);
+        return res;
+    }
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/dal/entity/SecurityRuleDO.java

@@ -0,0 +1,152 @@
+package org.dromara.neutrinoproxy.server.dal.entity;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.net.Ipv4Util;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityRuleListRes;
+
+import java.util.Date;
+
+@Data
+@ToString
+@Accessors(chain = true)
+@TableName("security_rule")
+public class SecurityRuleDO {
+
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 所属安全组
+     */
+    private Integer groupId;
+
+    /**
+     * 规则名
+     */
+    private String name;
+
+    /**
+     * 规则描述
+     */
+    private String description;
+
+    /**
+     * 规则,ipv6只支持单个ip判断
+     * 单个ip：192.168.1.1,0:0:0:0:0:0:10.0.0.1
+     * 范围类型：192.168.1.0-192.168.1.255
+     * 掩码类型：192.168.1.0/24
+     * 泛型：0.0.0.0/ALL
+     * 每个类型中间以英文逗号分隔
+     */
+    private String rule;
+
+    /**
+     * 放行类型，reject 或 allow
+     * {@link SecurityRulePassTypeEnum}
+     */
+    private Integer passType;
+
+    /**
+     * 优先级，数字越小，优先级越高
+     */
+    private Integer priority = 1;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 判断当前规则是否允许指定ip放行
+     * @param ip 指定的IP
+     * @return 放行状态
+     */
+    public SecurityRulePassTypeEnum judge(String ip) {
+
+        // 被判断的IP地址为空，不做判断
+        if (StrUtil.isEmpty(ip)) {
+            return SecurityRulePassTypeEnum.NONE;
+        }
+
+        // 没有规则，默认允许访问
+        if (StrUtil.isEmpty(rule)) {
+            return SecurityRulePassTypeEnum.ALLOW;
+        }
+
+        // ipv6只适配单ip形式
+        boolean isIpv6 = ip.contains(":");
+        long ipLong = -1L;
+        if (!isIpv6) {
+            ipLong = Ipv4Util.ipv4ToLong(ip);
+        }
+
+        String[] rules = this.rule.split(",");
+        for (String rule : rules) {
+
+            rule = rule.trim();
+
+            // 单个ip,ipv6在此步已处理，后面不需要额外判断ipv6的情况
+            if (rule.matches("(\\d+\\.){3}\\d+") || isIpv6) {
+                if (rule.equalsIgnoreCase(ip)) {
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                }
+            }
+
+            // 范围类型
+            if (rule.matches("(\\d+\\.){3}\\d+-(\\d+\\.){3}\\d+")) {
+                String[] ipRange = rule.split("-");
+                if (ipRange[0].compareTo(ip) <= 0 && ip.compareTo(ipRange[1]) <= 0) {
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                }
+            }
+
+            // 掩码类型
+            if (rule.matches("(\\d+\\.){3}\\d+/\\d+")) {
+                String[] netIp = rule.split("/");
+                Long beginIp = Ipv4Util.getBeginIpLong(netIp[0], Integer.parseInt(netIp[1]));
+                Long endIp = Ipv4Util.getEndIpLong(netIp[0], Integer.parseInt(netIp[1]));
+                if (beginIp <= ipLong && ipLong <= endIp) {
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                }
+            }
+
+            if (rule.equalsIgnoreCase("ALL") || rule.equals("0.0.0.0") || rule.equals("0.0.0.0/0")) {
+                return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+            }
+
+        }
+
+        // 都没有匹配到
+        return SecurityRulePassTypeEnum.NONE;
+    }
+
+    public SecurityRuleListRes toListRes() {
+        SecurityRuleListRes res = new SecurityRuleListRes();
+        BeanUtil.copyProperties(this, res);
+        return res;
+    }
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/TcpVisitorChannelHandler.java

@@ -1,6 +1,11 @@
 package org.dromara.neutrinoproxy.server.proxy.core;
 
 import cn.hutool.core.util.StrUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
@@ -8,11 +13,6 @@ import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
 import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
-import io.netty.buffer.ByteBuf;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.SimpleChannelInboundHandler;
 import org.noear.solon.Solon;
 
 import java.net.InetSocketAddress;
@@ -43,13 +43,13 @@ public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBu
             ctx.channel().close();
             return;
         }
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);
 
         // 代理通道可写，则设置访问通道可读。代理通道不可写，则设置访问通道不可读
         visitorChannel.config().setAutoRead(proxyChannel.isWritable());
 
         // 转发代理数据
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.readBytes(bytes);
         String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
         proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));
 
@@ -62,8 +62,8 @@ public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBu
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         Channel visitorChannel = ctx.channel();
         InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
-        Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(sa.getPort());
 
+        Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(sa.getPort());
         if (null == cmdChannel) {
             // 该端口还没有代理客户端
             ctx.channel().close();

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/core/UdpVisitorChannelHandler.java

@@ -7,7 +7,6 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.socket.DatagramPacket;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
@@ -18,7 +17,6 @@ import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.noear.solon.Solon;
 
 import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;
 
 /**
  * @author: aoshiguchen
@@ -29,7 +27,9 @@ public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler<Datagr
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket datagramPacket) throws Exception {
-        log.debug("chid>>>{}", ctx.channel().id().asLongText());
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+
         byte[] bytes = new byte[datagramPacket.content().readableBytes()];
         datagramPacket.content().readBytes(bytes);
         datagramPacket.content().resetReaderIndex();
@@ -65,12 +65,6 @@ public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler<Datagr
             Solon.context().getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), bytes.length);
         });
 
-//        String visitorId = ProxyUtil.getVisitorIdByChannel(ctx.channel());
-//        if (StringUtils.isNotBlank(visitorId)) {
-//            // UDP代理隧道已就绪，直接转发
-//            proxyAttachment.execute();
-//            return;
-//        }
         Channel proxyChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
         if (null != proxyChannel && proxyChannel.isActive()) {
             // UDP代理隧道已就绪，直接转发
@@ -78,8 +72,6 @@ public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler<Datagr
             return;
         }
 
-        Channel visitorChannel = ctx.channel();
-        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
         Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(sa.getPort());
 
         // 没有指令通道，直接结束

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpProxy.java

@@ -11,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
@@ -46,7 +48,9 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
                                 ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
                             }
                             ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
+                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
                         }
                     });
             bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync();

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpVisitorChannelHandler.java

@@ -1,6 +1,5 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;
 
-import cn.hutool.core.util.StrUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -25,22 +24,9 @@ import java.net.InetSocketAddress;
  */
 @Slf4j
 public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {
-    /**
-     * 域名
-     */
-    private String domainName;
-
-    public HttpVisitorChannelHandler(String domainName) {
-        this.domainName = domainName;
-    }
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
-        if (StrUtil.isBlank(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-
         byte[] bytes = new byte[byteBuf.readableBytes()];
         byteBuf.readBytes(bytes);
         byteBuf.resetReaderIndex();
@@ -68,25 +54,9 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
         // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
         ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);
 
-        String host = getHost(bytes);
-        log.debug("HttpProxy host: {}", host);
-        if (StringUtils.isBlank(host)) {
-            ctx.channel().close();
-            return;
-        }
-        if (!host.endsWith(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-        int index = host.lastIndexOf("." + domainName);
-        String subdomain = host.substring(0, index);
 
         // 根据域名拿到绑定的映射对应的cmdChannel
-        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
-        if (null == serverPort) {
-            ctx.channel().close();
-            return;
-        }
         Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(serverPort);
         if (null == cmdChannel) {
             ctx.channel().close();
@@ -150,23 +120,15 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
         ctx.close();
     }
 
-    private String getHost(byte[] buf) {
+    @Override
-        String req = new String(buf);
+    public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
-        String[] lines = req.split("\r\n");
+
-        String firstLine = lines[0];
+        // 通知代理客户端
-        if (!(firstLine.endsWith("HTTP/1.1") || firstLine.endsWith("HTTP/1.0"))) {
+        Channel visitorChannel = ctx.channel();
-            return null;
+        Channel proxyChannel = visitorChannel.attr(Constants.NEXT_CHANNEL).get();
+        if (null != proxyChannel) {
+            proxyChannel.config().setOption(ChannelOption.AUTO_READ, visitorChannel.isWritable());
         }
-        for (int i = 1; i < lines.length; i++) {
+        super.channelWritabilityChanged(ctx);
-            String line = lines[i];
-            if (!line.startsWith("Host: ")) {
-                continue;
-            }
-            // 域名
-            String domain = line.substring(6);
-            // 去掉域名后面的端口号
-            return domain.replaceAll(":.*", "");
-        }
-        return null;
     }
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/enhance/HttpsProxy.java

@@ -14,6 +14,8 @@ import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
@@ -55,7 +57,9 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
                             }
                             ch.pipeline().addLast(createSslHandler());
                             ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
+                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
                         }
                     });
             bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync();

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageAuthHandler.java

@@ -90,7 +90,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 
 		if (StrUtil.isEmpty(licenseKey)) {
 			log.warn("[client connection] license cannot empty info:{} ", info);
-			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不能为空!", licenseKey));
+			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license cannot be empty!", licenseKey));
 			ctx.channel().close();
 			clientConnectRecordService.add(new ClientConnectRecordDO()
 					.setIp(ip)
@@ -105,7 +105,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 		LicenseDO licenseDO = licenseService.findByKey(licenseKey);
 		if (null == licenseDO) {
 			log.warn("[client connection] license notfound info:{} ", info);
-			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不存在!", licenseKey));
+			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license not found!", licenseKey));
 			ctx.channel().close();
 			clientConnectRecordService.add(new ClientConnectRecordDO()
 					.setIp(ip)

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/handler/ProxyMessageConnectHandler.java

@@ -50,7 +50,7 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 
 		LicenseDO licenseDO = licenseService.findByKey(licenseKey);
 		if (null == licenseDO) {
-			ctx.channel().writeAndFlush(ProxyMessage.buildErrMessage(ExceptionEnum.CONNECT_FAILED, "the license notfound!"));
+			ctx.channel().writeAndFlush(ProxyMessage.buildErrMessage(ExceptionEnum.CONNECT_FAILED, "the license not found!"));
 			ctx.channel().close();
 			return;
 		}
@@ -69,7 +69,7 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 		Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(licenseDO.getId());
 
 		if (null == cmdChannel) {
-			ctx.channel().writeAndFlush(ProxyMessage.buildErrMessage(ExceptionEnum.CONNECT_FAILED, "server error，cmd channel notfound!"));
+			ctx.channel().writeAndFlush(ProxyMessage.buildErrMessage(ExceptionEnum.CONNECT_FAILED, "server error，cmd channel not found!"));
 			ctx.channel().close();
 			return;
 		}
@@ -82,7 +82,8 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 		ctx.channel().attr(Constants.LICENSE_ID).set(licenseDO.getId());
 		ctx.channel().attr(Constants.NEXT_CHANNEL).set(visitorChannel);
 		visitorChannel.attr(Constants.NEXT_CHANNEL).set(ctx.channel());
-		// 代理客户端与后端服务器连接成功，修改用户连接为可读状态
+        visitorChannel.attr(Constants.LICENSE_ID).set(licenseDO.getId());
+        // 代理客户端与后端服务器连接成功，修改用户连接为可读状态
 		visitorChannel.config().setOption(ChannelOption.AUTO_READ, true);
 
 		// 获取代理附加对象

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java

@@ -0,0 +1,92 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import cn.hutool.core.util.StrUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.HttpUtil;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.solon.Solon;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+    /**
+     * 域名
+     */
+    private String domainName;
+
+    public HttpVisitorSecurityChannelHandler(String domainName) {
+        this.domainName = domainName;
+    }
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        // 未配置域名则不支持通过域名访问
+        if (StrUtil.isBlank(domainName)) {
+            ctx.channel().close();
+            return;
+        }
+
+        ByteBuf buf = (ByteBuf) msg;
+
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
+        if (null == serverPort) {
+            // 获取Host请求头
+            byte[] bytes = new byte[buf.readableBytes()];
+            buf.readBytes(bytes);
+            String httpContent = new String(bytes);
+            String host = HttpUtil.getHostIgnorePort(httpContent);
+
+            log.debug("HttpProxy host: {}", host);
+            if (StringUtils.isBlank(host)) {
+                ctx.channel().close();
+                return;
+            }
+
+            // 根据Host匹配端口映射
+            if (!host.endsWith(domainName)) {
+                ctx.channel().close();
+                return;
+            }
+            int index = host.lastIndexOf("." + domainName);
+            String subdomain = host.substring(0, index);
+
+            // 根据域名拿到绑定的映射对应的cmdChannel
+            serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+            if (null == serverPort) {
+                ctx.channel().close();
+                return;
+            }
+
+            // 判断IP是否在该端口绑定的安全组允许的规则内
+            String ip = IpUtil.getRealRemoteIp(httpContent);
+            if (ip == null) {
+                ip = IpUtil.getRemoteIp(ctx);
+            }
+            if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
+                // 不在安全组规则放行范围内
+                ctx.channel().close();
+                return;
+            }
+
+            ctx.channel().attr(Constants.REAL_REMOTE_IP).set(ip);
+            ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
+        }
+
+        // 继续传播
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/TcpVisitorSecurityChannelHandler.java

@@ -0,0 +1,68 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class TcpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+
+        ByteBuf buf = (ByteBuf) msg;
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        String ip = IpUtil.getRealRemoteIp(new String(bytes));
+        if (StringUtils.isEmpty(ip)) {
+            ip = IpUtil.getRemoteIp(ctx);
+        }
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.fireChannelActive();
+    }
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/UdpVisitorSecurityChannelHandler.java

@@ -0,0 +1,39 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.socket.DatagramPacket;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class UdpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        DatagramPacket datagramPacket = (DatagramPacket) msg;
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(datagramPacket.sender().getAddress().getHostAddress(), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        ctx.fireChannelRead(msg);
+    }
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/VisitorFlowLimiterChannelHandler.java

@@ -0,0 +1,50 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.traffic.ChannelTrafficShapingHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.LicenseService;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
+import org.noear.solon.Solon;
+
+/**
+ * 访问者流量限制器
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Slf4j
+public class VisitorFlowLimiterChannelHandler extends ChannelInboundHandlerAdapter {
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Boolean flowLimiterFlag = ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).get();
+
+        if (null == flowLimiterFlag || !flowLimiterFlag) {
+            Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
+            Long upLimitRate = null;
+            Long downLimitRate = null;
+            // 先获取端口映射上的限速设置
+            FlowLimitBO flowLimitBO = portMappingService.getFlowLimitByServerPort(serverPort);
+            if (null != flowLimitBO) {
+                upLimitRate = flowLimitBO.getUpLimitRate();
+                downLimitRate = flowLimitBO.getDownLimitRate();
+            }
+            if (null != upLimitRate || null != downLimitRate) {
+                // 如果不全为空，则需要做限速
+                ctx.pipeline().addAfter("flowLimiter", "trafficShaping", new ChannelTrafficShapingHandler(downLimitRate == null ? 0 : downLimitRate, upLimitRate == null ? 0 : upLimitRate, 100, 600000));
+            }
+
+            // 每个连接第一次处理之后。无论是否限速，该连接后续都不在处理，避免频繁执行影响性能
+            ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).set(Boolean.TRUE);
+        }
+
+        // 继续传播
+        ctx.fireChannelRead(msg);
+    }
+
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobInfoService.java

@@ -35,11 +35,9 @@ import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.runtime.NativeDetector;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -67,6 +65,10 @@ public class JobInfoService implements IJobSource {
 
     @Init
     public void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
         jobHandlerMap.put("DataCleanJob", dataCleanJob);
         jobHandlerMap.put("DemoJob", demoJob);
         jobHandlerMap.put("FlowReportForDayJob", flowReportForDayJob);
@@ -107,6 +109,10 @@ public class JobInfoService implements IJobSource {
 
     @Override
     public List<JobInfo> sourceList() {
+        // aot 阶段，不查数据库
+        if (NativeDetector.isAotRuntime()) {
+            return Collections.emptyList();
+        }
         List<JobInfo> jobInfoList = Lists.newArrayList();
         List<JobInfoDO> jobInfoDOList = jobInfoMapper.findList();
         if (CollectionUtil.isEmpty(jobInfoDOList)) {

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/JobLogService.java

@@ -35,7 +35,9 @@ import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO;
 import org.dromara.solonplugins.job.IJobCallback;
 import org.dromara.solonplugins.job.JobInfo;
 import org.noear.solon.annotation.Component;
+import org.noear.solon.core.runtime.NativeDetector;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -53,6 +55,10 @@ public class JobLogService implements IJobCallback {
 
 	@Override
 	public void executeLog(JobInfo jobInfo, String param, Throwable throwable) {
+        // aot 阶段，不查数据库
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
 		Integer code = 0;
 		String msg = "";
 		if (null == throwable) {

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/LicenseService.java

@@ -1,7 +1,10 @@
 package org.dromara.neutrinoproxy.server.service;
 
+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
@@ -29,11 +32,14 @@ import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
+import org.noear.solon.core.runtime.NativeDetector;
 
 import java.util.Arrays;
 import java.util.Date;
@@ -62,6 +68,8 @@ public class LicenseService implements LifecycleBean {
     private VisitorChannelService visitorChannelService;
     @Inject
     private DBInitialize dbInitialize;
+    // 流量限制缓存
+    private final Cache<Integer, FlowLimitBO> flowLimitCache = CacheUtil.newLRUCache(200, 1000 * 60 * 5);
 
     public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
         Page<LicenseDO> page = licenseMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<LicenseDO>()
@@ -127,15 +135,21 @@ public class LicenseService implements LifecycleBean {
         String key = UUID.randomUUID().toString().replaceAll("-", "");
         Date now = new Date();
 
-        licenseMapper.insert(new LicenseDO()
+        licenseDO = new LicenseDO()
-                .setName(req.getName())
+            .setName(req.getName())
-                .setKey(key)
+            .setKey(key)
-                .setUserId(req.getUserId())
+            .setUserId(req.getUserId())
-                .setIsOnline(OnlineStatusEnum.OFFLINE.getStatus())
+            .setUpLimitRate(req.getUpLimitRate())
-                .setEnable(EnableStatusEnum.ENABLE.getStatus())
+            .setDownLimitRate(req.getDownLimitRate())
-                .setCreateTime(now)
+            .setIsOnline(OnlineStatusEnum.OFFLINE.getStatus())
-                .setUpdateTime(now)
+            .setEnable(EnableStatusEnum.ENABLE.getStatus())
-        );
+            .setCreateTime(now)
+            .setUpdateTime(now);
+
+        licenseMapper.insert(licenseDO);
+
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(licenseDO.getId(), licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
         return new LicenseCreateRes();
     }
 
@@ -146,7 +160,17 @@ public class LicenseService implements LifecycleBean {
         LicenseDO licenseCheck = licenseMapper.checkRepeat(oldLicenseDO.getUserId(), req.getName(), Sets.newHashSet(oldLicenseDO.getId()));
         ParamCheckUtil.checkMustNull(licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
 
-        licenseMapper.update(req.getId(), req.getName(), new Date());
+        licenseMapper.update(null, new LambdaUpdateWrapper<LicenseDO>()
+            .eq(LicenseDO::getId, req.getId())
+            .set(LicenseDO::getName, req.getName())
+            .set(LicenseDO::getUpLimitRate, req.getUpLimitRate())
+            .set(LicenseDO::getDownLimitRate, req.getDownLimitRate())
+            .set(LicenseDO::getUpdateTime, new Date())
+        );
+
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(req.getId(), req.getUpLimitRate(), req.getDownLimitRate());
+
         return new LicenseUpdateRes();
     }
 
@@ -199,6 +223,8 @@ public class LicenseService implements LifecycleBean {
         licenseMapper.deleteById(id);
         // 更新VisitorChannel
         visitorChannelService.updateVisitorChannelByLicenseId(id, EnableStatusEnum.DISABLE.getStatus());
+        // 删除流量限制缓存
+        flowLimitCache.remove(id);
     }
 
     /**
@@ -238,10 +264,55 @@ public class LicenseService implements LifecycleBean {
      */
     @Init
     public void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        // 服务刚启动，所以默认所有license都是离线状态。解决服务突然关闭，在线状态来不及更新的问题
         licenseMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
+        // 刷新流量限制缓存
+        List<LicenseDO> licenseDOList = licenseMapper.listAll();
+        if (CollectionUtils.isEmpty(licenseDOList)) {
+            for (LicenseDO licenseDO : licenseDOList) {
+                refreshFlowLimitCache(licenseDO.getId(), licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
+            }
+        }
     }
 
 
+    /**
+     * 刷新流量限制缓存
+     * @param id
+     * @param upLimitRate
+     * @param downLimitRate
+     */
+    private void refreshFlowLimitCache(Integer id, String upLimitRate, String downLimitRate) {
+        if (null == id) {
+            return;
+        }
+        flowLimitCache.put(id, new FlowLimitBO()
+            .setUpLimitRate(StringUtil.parseBytes(upLimitRate))
+            .setDownLimitRate(StringUtil.parseBytes(downLimitRate))
+        );
+    }
+
+    /**
+     * 获取license的流量限制
+     * @param licenseId
+     * @return
+     */
+    public FlowLimitBO getFlowLimit(Integer licenseId) {
+        FlowLimitBO res = flowLimitCache.get(licenseId);
+        if (null == res) {
+            LicenseDO licenseDO = licenseMapper.queryById(licenseId);
+            if (null != licenseDO) {
+                refreshFlowLimitCache(licenseId, licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
+                res = flowLimitCache.get(licenseId);
+            }
+        }
+        return res;
+    }
+
     @Override
     public void start() throws Throwable {
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java

@@ -1,10 +1,15 @@
 package org.dromara.neutrinoproxy.server.service;
 
+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
 import org.apache.ibatis.solon.annotation.Db;
@@ -34,18 +39,18 @@ import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
+import org.noear.solon.core.runtime.NativeDetector;
 
-import java.util.Comparator;
+import java.util.*;
-import java.util.Date;
+import java.util.concurrent.ConcurrentHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -72,6 +77,17 @@ public class PortMappingService implements LifecycleBean {
     private ProxyConfig proxyConfig;
     @Inject
     private DBInitialize dbInitialize;
+    @Inject
+    private LicenseService licenseService;
+
+    /** 端口到安全组Id的映射 */
+    private final Map<Integer, Integer> mappingPortToSecurityGroupMap = new ConcurrentHashMap<>();
+    // 服务端端口到端口映射id的映射
+    private final Cache<Integer, Integer> serverPortToPortMappingIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
+    // 端口映射id到licenseId
+    private final Cache<Integer, Integer> idToLicenseIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
+    // 流量限制缓存
+    private final Cache<Integer, FlowLimitBO> flowLimitCache = CacheUtil.newLRUCache(500, 1000 * 60 * 5);
 
     public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
         if (StringUtils.isNotEmpty(req.getDescription())) {
@@ -122,7 +138,9 @@ public class PortMappingService implements LifecycleBean {
             }
         });
         //sorted [userId asc] [licenseId asc] [createTime asc]
-        respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
+        respList = respList.stream()
+            .filter(e -> null != e.getUserId())
+            .sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
         return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }
 
@@ -146,6 +164,8 @@ public class PortMappingService implements LifecycleBean {
         portMappingDO.setServerPort(req.getServerPort());
         portMappingDO.setClientIp(req.getClientIp());
         portMappingDO.setClientPort(req.getClientPort());
+        portMappingDO.setUpLimitRate(req.getUpLimitRate());
+        portMappingDO.setDownLimitRate(req.getDownLimitRate());
         portMappingDO.setProxyResponses(req.getProxyResponses());
         portMappingDO.setProxyTimeoutMs(req.getProxyTimeoutMs());
         portMappingDO.setDescription(req.getDescription());
@@ -160,10 +180,20 @@ public class PortMappingService implements LifecycleBean {
         if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
         }
+
+        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
+
+        // 更新端口到映射的缓存
+        serverPortToPortMappingIdCache.put(req.getServerPort(), portMappingDO.getId());
+        // 更新端口映射到licenseId的缓存
+        idToLicenseIdCache.put(portMappingDO.getId(), portMappingDO.getLicenseId());
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(portMappingDO.getId(), portMappingDO.getUpLimitRate(), portMappingDO.getDownLimitRate());
+
         return new PortMappingCreateRes();
     }
 
-    public PortMappingUpdateRes update(PortMappingUpdateReq req) {
+    public void update(PortMappingUpdateReq req) {
         LicenseDO licenseDO = licenseMapper.findById(req.getLicenseId());
         ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
         if (!SystemContextHolder.isAdmin()) {
@@ -179,21 +209,25 @@ public class PortMappingService implements LifecycleBean {
         PortMappingDO oldPortMappingDO = portMappingMapper.findById(req.getId());
         ParamCheckUtil.checkNotNull(oldPortMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
-        PortMappingDO portMappingDO = new PortMappingDO();
+        // 更新端口映射
-        portMappingDO.setId(req.getId());
+        portMappingMapper.update(null, new LambdaUpdateWrapper<PortMappingDO>()
-        portMappingDO.setProtocal(req.getProtocal());
+            .eq(PortMappingDO::getId, req.getId())
-        portMappingDO.setSubdomain(req.getSubdomain());
+            .set(PortMappingDO::getProtocal, req.getProtocal())
-        portMappingDO.setLicenseId(req.getLicenseId());
+            .set(PortMappingDO::getSubdomain, req.getSubdomain())
-        portMappingDO.setServerPort(req.getServerPort());
+            .set(PortMappingDO::getServerPort, req.getServerPort())
-        portMappingDO.setClientIp(req.getClientIp());
+            .set(PortMappingDO::getClientIp, req.getClientIp())
-        portMappingDO.setClientPort(req.getClientPort());
+            .set(PortMappingDO::getClientPort, req.getClientPort())
-        portMappingDO.setProxyResponses(req.getProxyResponses());
+            .set(PortMappingDO::getUpLimitRate, req.getUpLimitRate())
-        portMappingDO.setProxyTimeoutMs(req.getProxyTimeoutMs());
+            .set(PortMappingDO::getDownLimitRate, req.getDownLimitRate())
-        portMappingDO.setDescription(req.getDescription());
+            .set(PortMappingDO::getProxyTimeoutMs, req.getProxyTimeoutMs())
-        portMappingDO.setUpdateTime(new Date());
+            .set(PortMappingDO::getProxyResponses, req.getProxyResponses())
-        portMappingDO.setEnable(EnableStatusEnum.ENABLE.getStatus());
+            .set(PortMappingDO::getSecurityGroupId, req.getSecurityGroupId())
-        portMappingMapper.updateById(portMappingDO);
+            .set(PortMappingDO::getDescription, req.getDescription())
+            .set(PortMappingDO::getUpdateTime, new Date())
+        );
+
         // 更新VisitorChannel
+        PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
         visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
         // 删除老的域名映射
         if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal()) && StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
@@ -203,7 +237,15 @@ public class PortMappingService implements LifecycleBean {
         if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
         }
-        return new PortMappingUpdateRes();
+
+        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
+
+        // 更新端口到映射的缓存
+        serverPortToPortMappingIdCache.put(req.getServerPort(), req.getId());
+        // 更新端口映射到licenseId的缓存
+        idToLicenseIdCache.put(portMappingDO.getId(), portMappingDO.getLicenseId());
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(req.getId(), req.getUpLimitRate(), req.getDownLimitRate());
     }
 
     public PortMappingDetailRes detail(Integer id) {
@@ -278,6 +320,35 @@ public class PortMappingService implements LifecycleBean {
         if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
             ProxyUtil.removeSubdomainToServerPort(portMappingDO.getSubdomain());
         }
+
+        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), null);
+
+        // 删除id到licenseId的映射
+        idToLicenseIdCache.remove(id);
+        // 删除流量限制缓存
+        flowLimitCache.remove(id);
+    }
+
+    public void portBindSecurityGroup(Integer portMappingId, Integer groupId) {
+        PortMappingDO mappingDO = portMappingMapper.findById(portMappingId);
+        if (mappingDO == null) {
+            throw new RuntimeException("指定的端口映射不存在");
+        }
+        mappingDO.setSecurityGroupId(groupId);
+        mappingDO.setUpdateTime(new Date());
+        portMappingMapper.updateById(mappingDO);
+        updateMappingPortToSecurityGroupMap(mappingDO.getServerPort(), groupId);
+    }
+
+    public void portUnbindSecurityGroup(Integer portMappingId) {
+        PortMappingDO mappingDO = portMappingMapper.findById(portMappingId);
+        if (mappingDO == null) {
+            throw new RuntimeException("指定的端口映射不存在");
+        }
+        mappingDO.setSecurityGroupId(0);
+        mappingDO.setUpdateTime(new Date());
+        portMappingMapper.updateById(mappingDO);
+        updateMappingPortToSecurityGroupMap(mappingDO.getServerPort(), null);
     }
 
     /**
@@ -290,18 +361,44 @@ public class PortMappingService implements LifecycleBean {
         return portMappingMapper.findEnableListByLicenseId(licenseId);
     }
 
+    public Integer getSecurityGroupIdByMappingPort(Integer port) {
+        return mappingPortToSecurityGroupMap.get(port);
+    }
+
+
     /**
      * 服务端项目停止、启动时，更新在线状态为离线
      */
     @Init
     public void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        // 服务刚启动，所以默认所有license都是离线状态。解决服务突然关闭，在线状态来不及更新的问题
         portMappingMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
 
+        List<PortMappingDO> allMappingDOList = portMappingMapper.selectList(Wrappers.lambdaQuery(PortMappingDO.class));
+        allMappingDOList.forEach(item -> {
+            Integer securityGroupId = item.getSecurityGroupId();
+            if (securityGroupId != null && securityGroupId > 0) {
+                updateMappingPortToSecurityGroupMap(item.getServerPort(), item.getSecurityGroupId());
+            }
+            // 更新端口到映射的缓存
+            serverPortToPortMappingIdCache.put(item.getServerPort(), item.getId());
+            // 更新端口映射到licenseId的缓存
+            idToLicenseIdCache.put(item.getId(), item.getLicenseId());
+            // 刷新流量限制缓存
+            refreshFlowLimitCache(item.getId(), item.getUpLimitRate(), item.getDownLimitRate());
+        });
+
         // 未配置域名，则不需要处理域名映射逻辑
         if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName())) {
             return;
         }
-        List<PortMappingDO> portMappingDOList = portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>().eq(PortMappingDO::getProtocal, NetworkProtocolEnum.HTTP.getDesc()).isNotNull(PortMappingDO::getSubdomain));
+        List<PortMappingDO> portMappingDOList = allMappingDOList.stream()
+            .filter(item -> NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal()) && item.getSubdomain() != null)
+            .collect(Collectors.toList());
         if (CollectionUtil.isEmpty(portMappingDOList)) {
             return;
         }
@@ -310,9 +407,96 @@ public class PortMappingService implements LifecycleBean {
                 return;
             }
             ProxyUtil.setSubdomainToServerPort(item.getSubdomain(), item.getServerPort());
+
         });
     }
 
+    /**
+     * 刷新流量限制缓存
+     * @param id
+     * @param upLimitRate
+     * @param downLimitRate
+     */
+    private void refreshFlowLimitCache(Integer id, String upLimitRate, String downLimitRate) {
+        if (null == id) {
+            return;
+        }
+        flowLimitCache.put(id, new FlowLimitBO()
+            .setUpLimitRate(StringUtil.parseBytes(upLimitRate))
+            .setDownLimitRate(StringUtil.parseBytes(downLimitRate))
+        );
+    }
+
+    /**
+     * 获取license的流量限制
+     * @param id
+     * @return
+     */
+    public FlowLimitBO getFlowLimit(Integer id) {
+        FlowLimitBO res = flowLimitCache.get(id);
+        if (null == res) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                refreshFlowLimitCache(id, portMappingDO.getUpLimitRate(), portMappingDO.getDownLimitRate());
+                res = flowLimitCache.get(id);
+            }
+        }
+        return res;
+    }
+
+    public Integer getPortMappingIdByServerPort(Integer serverPort) {
+        if (null == serverPort) {
+            return null;
+        }
+        Integer id = serverPortToPortMappingIdCache.get(serverPort);
+        if (null != id) {
+            return id;
+        }
+        List<PortMappingDO> portMappingDOList = portMappingMapper.findListByServerPort(serverPort);
+        // 不存在 或者 有多条记录，都不处理
+        if (CollectionUtils.isEmpty(portMappingDOList) || portMappingDOList.size() > 1) {
+            return null;
+        }
+        id = portMappingDOList.get(0).getId();
+        serverPortToPortMappingIdCache.put(serverPort, id);
+        return id;
+    }
+
+    public Integer getLicenseIdById(Integer id) {
+        Integer licenseId = idToLicenseIdCache.get(id);
+        if (null == licenseId) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                licenseId = portMappingDO.getLicenseId();
+                idToLicenseIdCache.put(id, licenseId);
+            }
+        }
+        return licenseId;
+    }
+
+    public FlowLimitBO getFlowLimitByServerPort(Integer serverPort) {
+        Integer id = getPortMappingIdByServerPort(serverPort);
+        if (null == id) {
+            return null;
+        }
+        FlowLimitBO res = getFlowLimit(id);
+        if (null == res || (null == res.getUpLimitRate() && null == res.getDownLimitRate())) {
+            Integer licenseId = getLicenseIdById(id);
+            if (null != licenseId) {
+                res = licenseService.getFlowLimit(licenseId);
+            }
+        }
+        return res;
+    }
+
+    private void updateMappingPortToSecurityGroupMap(Integer serverPort, Integer securityGroupId) {
+        if (securityGroupId == null || securityGroupId == 0) {
+            mappingPortToSecurityGroupMap.remove(serverPort);
+            return;
+        }
+        mappingPortToSecurityGroupMap.put(serverPort, securityGroupId);
+    }
+
     @Override
     public void start() throws Throwable {
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/ProtocalService.java

@@ -23,7 +23,7 @@ public class ProtocalService {
     public List<ProtocalListRes> list() {
         return Lists.newArrayList(
                 new ProtocalListRes().setName("TCP").setEnable(Boolean.TRUE).setRemark("支持一切TCP之上的协议"),
-                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于时使用TCP。 若配置了证书，则同时支持HTTPS。"),
+                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于使用TCP。 若配置了证书，则同时支持HTTPS。"),
                 new ProtocalListRes().setName("UDP").setEnable(Boolean.TRUE).setRemark("支持UDP转发、响应。需要配合响应数、超时时间使用")
         );
     }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/SecurityGroupService.java

@@ -0,0 +1,267 @@
+package org.dromara.neutrinoproxy.server.service;
+
+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+import org.dromara.neutrinoproxy.server.controller.req.system.*;
+import org.dromara.neutrinoproxy.server.controller.res.system.*;
+import org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper;
+import org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Init;
+import org.noear.solon.core.runtime.NativeDetector;
+
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class SecurityGroupService {
+
+    @Db
+    private SecurityGroupMapper securityGroupMapper;
+
+    @Db
+    private SecurityRuleMapper securityRuleMapper;
+
+    private final Map<Integer, SecurityGroupDO> securityGroupMap = new ConcurrentHashMap<>();
+
+    // 允许通过控制的缓存，缓存类型最近最久未使用缓存，容量100，超时时间5分钟
+    private final Cache<String, Boolean> ipAllowControlCache = CacheUtil.newLRUCache(100, 1000 * 60 * 5);
+
+    @Init(index = 100)
+    public synchronized void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        securityGroupMap.clear();
+        List<SecurityGroupDO> groupDOList = securityGroupMapper.selectList(Wrappers.lambdaQuery(SecurityGroupDO.class)
+            .eq(SecurityGroupDO::getEnable, EnableStatusEnum.ENABLE.getStatus()));
+        groupDOList.forEach(securityGroupDO -> securityGroupMap.put(securityGroupDO.getId(), securityGroupDO));
+        ipAllowControlCache.clear();
+    }
+
+    public void clearCache() {
+        ipAllowControlCache.clear();
+    }
+
+    public PageInfo<SecurityGroupListRes> groupPage(PageQuery pageQuery, SecurityGroupListReq req) {
+        if (StringUtils.isNotEmpty(req.getName())) {
+            //在应用层处理，否则sqlite不支持
+            req.setName("%" + req.getName() + "%");
+        }
+        if (StringUtils.isNotEmpty(req.getDescription())) {
+            //在应用层处理，否则sqlite不支持
+            req.setDescription("%" + req.getDescription() + "%");
+        }
+        Page<SecurityGroupDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<SecurityGroupDO> list = securityGroupMapper.selectByCondition(page, req);
+        if (CollectionUtils.isEmpty(list)) {
+            return PageInfo.of(null, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        }
+        List<SecurityGroupListRes> respList = list.stream().map(SecurityGroupDO::toListRes).collect(Collectors.toList());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
+
+    public List<SecurityGroupListRes> groupList() {
+        List<SecurityGroupDO> list = securityGroupMapper.selectList(Wrappers.lambdaQuery(SecurityGroupDO.class)
+            .eq(SecurityGroupDO::getUserId, SystemContextHolder.getUserId()));
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(SecurityGroupDO::toListRes).collect(Collectors.toList());
+    }
+
+    public SecurityGroupDetailRes groupDetail(SecurityGroupDetailReq req) {
+        SecurityGroupDO securityGroupDO = securityGroupMapper.selectById(req.getId());
+        if (null != securityGroupDO) {
+            return securityGroupDO.toDetailRes();
+        }
+        return null;
+    }
+
+    public void createGroup(SecurityGroupCreateReq req) {
+        SecurityGroupDO groupDO = new SecurityGroupDO();
+        BeanUtil.copyProperties(req, groupDO);
+        groupDO.setEnable(EnableStatusEnum.ENABLE.getStatus())
+            .setUserId(SystemContextHolder.getUserId())
+            .setCreateTime(new Date())
+            .setUpdateTime(new Date());
+        securityGroupMapper.insert(groupDO);
+        init();
+    }
+
+    /**
+     * 更新时不允许更新默认放行类型
+     * @param req 安全组更新参数
+     */
+    public void updateGroup(SecurityGroupUpdateReq req) {
+        SecurityGroupDO groupDO = securityGroupMapper.selectById(req.getId());
+        BeanUtil.copyProperties(req, groupDO, "defaultPassType");
+        securityGroupMapper.updateById(groupDO);
+        init();
+    }
+
+    /**
+     * 删除安全组，并级联删除安全组下的规则，删除后，需缓存
+     * @param groupId 安全组Id
+     */
+    public void deleteGroup(Integer groupId) {
+        securityGroupMapper.deleteById(groupId);
+        securityRuleMapper.delete(Wrappers.lambdaQuery(SecurityRuleDO.class)
+            .eq(SecurityRuleDO::getGroupId, groupId));
+        init();
+    }
+
+    public SecurityGroupUpdateEnableStatueRes updateGroupEnableStatueReq(SecurityGroupUpdateEnableStatueReq req) {
+        SecurityGroupDO groupDO = securityGroupMapper.selectById(req.getId());
+        ParamCheckUtil.checkNotNull(groupDO, ExceptionConstant.SECURITY_GROUP_NOT_EXIST);
+
+        securityGroupMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        init();
+        return new SecurityGroupUpdateEnableStatueRes();
+    }
+
+    public PageInfo<SecurityRuleListRes> rulePage(PageQuery pageQuery, SecurityRuleListReq req) {
+        if (StringUtils.isNotEmpty(req.getName())) {
+            //在应用层处理，否则sqlite不支持
+            req.setName("%" + req.getName() + "%");
+        }
+        if (StringUtils.isNotEmpty(req.getDescription())) {
+            //在应用层处理，否则sqlite不支持
+            req.setDescription("%" + req.getDescription() + "%");
+        }
+        Page<SecurityRuleDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<SecurityRuleDO> list = securityRuleMapper.selectByCondition(page, req);
+        if (CollectionUtils.isEmpty(list)) {
+            return PageInfo.of(null, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        }
+        List<SecurityRuleListRes> respList = list.stream().map(SecurityRuleDO::toListRes).collect(Collectors.toList());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
+
+    public List<SecurityRuleListRes> ruleList(SecurityRuleListReq req) {
+        List<SecurityRuleDO> list = securityRuleMapper.selectList(new LambdaQueryWrapper<SecurityRuleDO>()
+                .eq(null != req.getGroupId(), SecurityRuleDO::getGroupId, req.getGroupId())
+        );
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(SecurityRuleDO::toListRes).collect(Collectors.toList());
+    }
+
+    public void createRule(SecurityRuleCreateReq req) {
+        SecurityRuleDO ruleDO = new SecurityRuleDO();
+        BeanUtil.copyProperties(req, ruleDO);
+        ruleDO.setUserId(SystemContextHolder.getUserId())
+                .setCreateTime(new Date())
+                .setEnable(EnableStatusEnum.ENABLE.getStatus())
+                .setUpdateTime(new Date());
+        securityRuleMapper.insert(ruleDO);
+        clearCache();
+    }
+
+    public void updateRule(SecurityRuleUpdateReq req) {
+        SecurityRuleDO ruleDO = securityRuleMapper.selectById(req.getId());
+        BeanUtil.copyProperties(req, ruleDO);
+        securityRuleMapper.updateById(ruleDO);
+        clearCache();
+    }
+
+    public void deleteRule(Integer ruleId) {
+        securityRuleMapper.deleteById(ruleId);
+        clearCache();
+    }
+
+    public SecurityRuleUpdateEnableStatueRes updateRuleEnableStatueReq(SecurityRuleUpdateEnableStatueReq req) {
+        SecurityRuleDO ruleDO = securityRuleMapper.selectById(req.getId());
+        ParamCheckUtil.checkNotNull(ruleDO, ExceptionConstant.SECURITY_RULE_NOT_EXIST);
+
+        securityRuleMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        clearCache();
+        return new SecurityRuleUpdateEnableStatueRes();
+    }
+
+    /**
+     * 判断ip在该安全组下是否允许,如果安全组没有创建，则放行，默认黑名单规则
+     * @param ip 被判断的IP地址
+     * @param groupId 安全组Id
+     * @return 是否放行
+     */
+    public boolean judgeAllow(String ip, Integer groupId) {
+        ip = ip.toLowerCase();
+        // 不能判断当前连接的IP，保守处理，拒绝放行
+        if (StrUtil.isEmpty(ip)) {
+            log.debug("[SecurityGroup] cannot get remote ip,this pack be reject");
+            return false;
+        }
+
+        // 黑名单规则，没有该安全组，则放行
+        if (groupId == null) {
+            return true;
+        }
+        SecurityGroupDO groupDO = securityGroupMap.get(groupId);
+        if (groupDO == null) {
+            return true;
+        }
+
+        Boolean allow = null;
+        String judgeAllowMapKey = ip + groupId;
+        if (ipAllowControlCache.containsKey(judgeAllowMapKey)) {
+            allow = ipAllowControlCache.get(judgeAllowMapKey);
+            log.debug("[SecurityGroup] ip:{} groupId:{} cached security strategy:{}", ip, groupId, allow ? "allow" : "reject");
+            return allow;
+        }
+
+        List<SecurityRuleDO>  ruleDOList = securityRuleMapper.selectList(Wrappers.lambdaQuery(SecurityRuleDO.class)
+            .eq(SecurityRuleDO::getGroupId, groupId)
+            .eq(SecurityRuleDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
+            .orderByAsc(SecurityRuleDO::getPriority)
+        );
+        for (SecurityRuleDO ruleDO : ruleDOList) {
+            SecurityRulePassTypeEnum passType = ruleDO.judge(ip);
+            if (passType == SecurityRulePassTypeEnum.ALLOW) {
+                allow = true;
+                log.debug("[SecurityGroup] ip:{} groupId:{} ruleId:{} security strategy:{}", ip, groupId, ruleDO.getId(), "allow");
+                break;
+            }
+            if (passType == SecurityRulePassTypeEnum.DENY) {
+                allow = false;
+                log.info("[SecurityGroup] ip:{} groupId:{} ruleId:{} security strategy:{}", ip, groupId, ruleDO.getId(), "reject");
+                break;
+            }
+        }
+
+        // 当前IP没有匹配到任何一条规则，则使用安全组默认规则
+        if (allow == null) {
+            allow = SecurityRulePassTypeEnum.ALLOW.getType().equals(groupDO.getDefaultPassType());
+            log.debug("[SecurityGroup] ip:{} groupId{} use security group default strategy:{}", ip, groupId, allow ? "allow" : "reject");
+        }
+
+        ipAllowControlCache.put(judgeAllowMapKey, allow);
+
+        return allow;
+    }
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/bo/FlowLimitBO.java

@@ -0,0 +1,15 @@
+package org.dromara.neutrinoproxy.server.service.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Accessors(chain = true)
+@Data
+public class FlowLimitBO {
+    private Long upLimitRate;
+    private Long downLimitRate;
+}

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/ParamCheckUtil.java

@@ -103,4 +103,20 @@ public class ParamCheckUtil {
         }
     }
 
+    /**
+     * 校验字节描述
+     * @param str
+     * @param params
+     */
+    public static void checkBytesDesc(String str, Object... params) {
+        // 允许为空
+        if (StrUtil.isEmpty(str)) {
+            return;
+        }
+        Long bytes = StringUtil.parseBytes(str);
+        if (null == bytes || bytes <= 0) {
+            throw ServiceException.create(ExceptionConstant.BYTES_DESC_INVALID, params);
+        }
+    }
+
 }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/StringUtil.java

@@ -0,0 +1,75 @@
+package org.dromara.neutrinoproxy.server.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+public class StringUtil {
+    private static final Integer BYTES_MUL_KB = 1024;
+    private static final Integer BYTES_MUL_MB = BYTES_MUL_KB * 1024;
+    private static final Integer BYTES_MUL_GB = BYTES_MUL_MB * 1024;
+    private static final String[] BYTES_UNIT_STR = {"B", "K", "KB", "M", "MB", "G", "GB"};
+    private static final Integer[] BYTES_UNIT_MUL = {1, BYTES_MUL_KB, BYTES_MUL_KB, BYTES_MUL_MB, BYTES_MUL_MB, BYTES_MUL_GB, BYTES_MUL_GB};
+    private static final String BYTES_DESC_REGEX = "\\s*(\\d+\\.*\\d*)\\s*(B|K|KB|M|MB|G|GB)\\s*";
+    private static final Pattern BYTES_DESC_PATTERN = Pattern.compile(BYTES_DESC_REGEX);
+
+    /**
+     * 校验是否符合字节描述
+     * @param desc
+     * @return
+     */
+    public static boolean isBytesDesc(String desc) {
+        if (StrUtil.isBlank(desc)) {
+            return false;
+        }
+        return desc.toUpperCase().matches(BYTES_DESC_REGEX);
+    }
+
+    /**
+     * 解析字节数
+     * 支持B、K、KB、M、MB、G、GB 忽略大小写、忽略首尾空格、忽略数字与单位之间的空格
+     * @param desc
+     * @return
+     */
+    public static Long parseBytes(String desc) {
+        try {
+            if (!isBytesDesc(desc)) {
+                return null;
+            }
+            Matcher matcher = BYTES_DESC_PATTERN.matcher(desc.toUpperCase());
+            boolean found = matcher.find();
+            if (!found) {
+                return null;
+            }
+            Double n = Double.parseDouble(matcher.group(1));
+            String unit = matcher.group(2);
+            Integer unitIndex = getBytesUnitIndex(unit);
+            if (null == unitIndex) {
+                return null;
+            }
+
+            return (long)(n * BYTES_UNIT_MUL[unitIndex]);
+        } catch (Exception e) {
+            // ignore
+        }
+
+        return null;
+    }
+
+    private static Integer getBytesUnitIndex(String unit) {
+        if (StrUtil.isBlank(unit)) {
+            return null;
+        }
+        for (int i = 0; i < BYTES_UNIT_STR.length; i++) {
+            if (unit.equals(BYTES_UNIT_STR[i])) {
+                return i;
+            }
+        }
+        return null;
+    }
+}

neutrino-proxy-server/src/main/resources/app-copy.yml

@@ -0,0 +1,63 @@
+server:
+  # 服务端web端口，用于支持HTTP接口，管理后台页面访问
+  port: 8888
+# 日志级别
+solon.logging:
+  logger:
+    "root":
+      level: info
+  appender:
+    file:
+      level: info
+
+neutrino:
+  proxy:
+    # 隧道相关配置-用于维持服务端与客户端的通信
+    tunnel:
+      # 线程池相关配置，用于技术调优，可忽略
+      boss-thread-count: 2
+      work-thread-count: 10
+      # 隧道非SSL端口
+      port: 9000
+      # 隧道SSL端口
+      ssl-port: 9002
+      # 隧道SSL证书配置
+      key-store-password: 123456
+      key-manager-password: 123456
+      jks-path: classpath:/test.jks
+      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
+      transfer-log-enable: false
+      # 是否开启心跳日志
+      heartbeat-log-enable: false
+    server:
+      tcp:
+        # 线程池相关配置，用于技术调优，可忽略
+        boss-thread-count: 5
+        work-thread-count: 20
+        # http代理端口，默认80
+        http-proxy-port: 80
+        # https代理端口，默认443 （需要配置域名、证书）
+        https-proxy-port: 443
+        # 如果不配置，则不支持域名映射
+        domain-name:
+        # https证书配置
+        key-store-password:
+        jks-path:
+        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
+        transfer-log-enable: false
+      udp:
+        # 线程池相关配置，用于技术调优，可忽略
+        boss-thread-count: 5
+        work-thread-count: 20
+        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
+        transfer-log-enable: false
+  data:
+    db:
+      # 数据库类型，目前支持h2、mysql、mariadb
+      type: h2
+      # 数据库连接URL
+      url: jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE
+      # 数据库用户名
+      username:
+      # 数据库密码
+      password:

neutrino-proxy-server/src/main/resources/app.yml

@@ -5,23 +5,22 @@ server:
 solon:
   app:
     name: neutrino-proxy-server
-#  aot:
+    version: 2.0.1
-#    jvmArguments: --add-opens java.base/java.lang=ALL-UNNAMED
+  config:
+    add: ./app.yml
 # 日志级别
 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: false
+    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: ${LOG_LEVEL:info}
     level: info
 
-
 neutrino:
   proxy:
     protocol:
@@ -77,7 +76,7 @@ neutrino:
       # 数据库类型，目前支持h2、mysql、mariadb
       type: ${DB_TYPE:h2}
       # 数据库连接URL
-      url: ${DB_URL:jdbc:h2:file:~/.neutrino-proxy/data/db;MODE=MySQL;AUTO_SERVER=TRUE}
+      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
       # 数据库用户名
       username: ${DB_USER:}
       # 数据库密码

neutrino-proxy-server/src/main/resources/mapper/SecurityGroupMapper.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO">
+        SELECT sg.* from security_group sg
+        <where>
+            <if test="req.name != null and req.name != '' ">
+                AND sg.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sg.description like #{req.description}
+            </if>
+            <if test="req.defaultPassType != null">
+                AND sg.default_pass_type like #{req.defaultPassType}
+            </if>
+            <if test="req.enable != null">
+                AND sg.enable like #{req.enable}
+            </if>
+        </where>
+        order by sg.id DESC
+    </select>
+</mapper>

neutrino-proxy-server/src/main/resources/mapper/SecurityRuleMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO">
+        SELECT sr.* from security_rule sr
+        <where>
+            <if test="req.groupId != null">
+                AND sr.group_id = ${req.groupId}
+            </if>
+            <if test="req.name != null and req.name != '' ">
+                AND sr.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sr.description like #{req.description}
+            </if>
+            <if test="req.passType != null">
+                AND sr.pass_type like #{req.passType}
+            </if>
+            <if test="req.enable != null">
+                AND sr.enable like #{req.enable}
+            </if>
+        </where>
+        order by sr.id DESC
+    </select>
+</mapper>

neutrino-proxy-server/src/main/resources/sql/h2/init-structure.sql

@@ -45,6 +45,37 @@ CREATE TABLE IF NOT EXISTS `port_group` (
     `create_time` TIMESTAMP NOT NULL,
     `update_time` TIMESTAMP NOT NULL
 );
+
+#安全组
+CREATE TABLE IF NOT EXISTS `security_group` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(20) NOT NULL,
+    `description` VARCHAR(255),
+    `user_id` INTEGER NOT NULL,
+    `enable` INTEGER NOT NULL,
+    `default_pass_type` INTEGER NOT NULL,
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL,
+    PRIMARY KEY (`id`)
+);
+
+#安全组规则
+CREATE TABLE IF NOT EXISTS `security_rule` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `group_id` INTEGER NOT NULL,
+    `name` VARCHAR(20) NOT NULL,
+    `description` VARCHAR(255) NOT NULL,
+    `rule` text NOT NULL,
+    `pass_type` INTEGER NOT NULL,
+    `priority` INTEGER NOT NULL,
+    `user_id` INTEGER 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);
+
 #############################代理配置相关表#############################
 #license表
 CREATE TABLE IF NOT EXISTS `license` (
@@ -52,6 +83,8 @@ CREATE TABLE IF NOT EXISTS `license` (
     `name` VARCHAR(50) NOT NULL,
     `key` VARCHAR(100) NOT NULL,
     `user_id` INTEGER NOT NULL,
+    `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+    `down_limit_rate` VARCHAR(20) DEFAULT NULL,
     `is_online` INTEGER(2) NOT NULL,
     `enable` INTEGER(2) NOT NULL,
     `create_time` TIMESTAMP NOT NULL,
@@ -68,11 +101,14 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
   `server_port` INTEGER NOT NULL,
   `client_ip` VARCHAR(20) NOT NULL,
   `client_port` INTEGER NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
   `is_online` INTEGER(2) NOT NULL,
   `description` VARCHAR(100) DEFAULT NULL,
   `proxy_responses` INTEGER(20) NOT NULL DEFAULT 0,
   `proxy_timeout_ms` 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
 );
@@ -135,8 +171,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` bigint NOT NULL,
     `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` TIMESTAMP NOT NULL
@@ -151,8 +187,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` bigint NOT NULL,
     `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` TIMESTAMP NOT NULL
@@ -167,8 +203,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` bigint NOT NULL,
     `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` TIMESTAMP NOT NULL
@@ -183,8 +219,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `read_bytes` bigint NOT NULL,
     `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
     `create_time` TIMESTAMP NOT NULL

neutrino-proxy-server/src/main/resources/sql/h2/update/UPDATE-20231215.SQL

@@ -0,0 +1,38 @@
+#安全组
+CREATE TABLE IF NOT EXISTS `security_group` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `name` VARCHAR(20) NOT NULL,
+    `description` VARCHAR(255),
+    `user_id` INTEGER NOT NULL,
+    `enable` INTEGER NOT NULL,
+    `default_pass_type` INTEGER NOT NULL,
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL,
+    PRIMARY KEY (`id`)
+);
+
+#安全组规则
+CREATE TABLE IF NOT EXISTS `security_rule` (
+    `id` INTEGER NOT NULL AUTO_INCREMENT,
+    `group_id` INTEGER NOT NULL,
+    `name` VARCHAR(20) NOT NULL,
+    `description` VARCHAR(255) NOT NULL,
+    `rule` text NOT NULL,
+    `pass_type` INTEGER NOT NULL,
+    `priority` INTEGER NOT NULL,
+    `user_id` INTEGER 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);
+
+# port_mapping表增加字段
+ALTER TABLE `port_mapping` ADD COLUMN `security_group_id` INTEGER DEFAULT 0;
+ALTER TABLE `port_mapping` ADD COLUMN `up_limit_rate` varchar(20) DEFAULT NULL;
+ALTER TABLE `port_mapping` ADD COLUMN `down_limit_rate` varchar(20) DEFAULT NULL;
+
+# license表增加字段
+ALTER TABLE `license` ADD COLUMN `up_limit_rate` varchar(20) DEFAULT NULL;
+ALTER TABLE `license` ADD COLUMN `down_limit_rate` varchar(20) DEFAULT NULL;

neutrino-proxy-server/src/main/resources/sql/mariadb/init-structure.sql

@@ -50,6 +50,36 @@ CREATE TABLE IF NOT EXISTS `port_group` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
 
+#安全组
+CREATE TABLE IF NOT EXISTS `security_group` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `name` varchar(20) NOT NULL COMMENT '安全组名称',
+    `description` varchar(255) COMMENT '安全组描述',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#安全组规则
+CREATE TABLE IF NOT EXISTS `security_rule` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `group_id` int NOT NULL COMMENT '关联安全组',
+    `name` varchar(20) NOT NULL COMMENT '规则名称',
+    `description` varchar(255) NOT NULL COMMENT '规则描述',
+    `rule` text NOT NULL COMMENT '规则内容',
+    `pass_type` int NOT NULL COMMENT '放行类型',
+    `priority` int(1) NOT NULL COMMENT '优先级',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY `I_security_rule_group_id_priority` (`group_id`, `priority`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 #############################代理配置相关表#############################
 #license表
 CREATE TABLE IF NOT EXISTS `license` (
@@ -57,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
     `name` varchar(50) NOT NULL COMMENT 'license名称',
     `key` varchar(100) NOT NULL COMMENT 'license key',
     `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
     `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
     `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -74,11 +106,14 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     `server_port` int NOT NULL COMMENT '服务端端口',
     `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
     `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
     `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
     `description` varchar(100) DEFAULT NULL COMMENT '描述',
     `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
     `proxy_timeout_ms` int NOT NULL DEFAULT 0 COMMENT '代理超时毫秒数',
     `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `security_group_id` int DEFAULT 0 COMMENT '安全组Id',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
     `update_time` datetime(3) NOT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`),
@@ -145,8 +180,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH:mm',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -162,8 +197,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -179,8 +214,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -196,8 +231,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',

neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql

@@ -50,6 +50,36 @@ CREATE TABLE IF NOT EXISTS `port_group` (
     PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4;
 
+#安全组
+CREATE TABLE IF NOT EXISTS `security_group` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `name` varchar(20) NOT NULL COMMENT '安全组名称',
+    `description` varchar(255) COMMENT '安全组描述',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#安全组规则
+CREATE TABLE IF NOT EXISTS `security_rule` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `group_id` int NOT NULL COMMENT '关联安全组',
+    `name` varchar(20) NOT NULL COMMENT '规则名称',
+    `description` varchar(255) NOT NULL COMMENT '规则描述',
+    `rule` text NOT NULL COMMENT '规则内容',
+    `pass_type` int NOT NULL COMMENT '放行类型',
+    `priority` int(1) NOT NULL COMMENT '优先级',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY `I_security_rule_group_id_priority` (`group_id`, `priority`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 #############################代理配置相关表#############################
 #license表
 CREATE TABLE IF NOT EXISTS `license` (
@@ -57,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
     `name` varchar(50) NOT NULL COMMENT 'license名称',
     `key` varchar(100) NOT NULL COMMENT 'license key',
     `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
     `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
     `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -74,11 +106,14 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     `server_port` int NOT NULL COMMENT '服务端端口',
     `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
     `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
     `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
     `description` varchar(100) DEFAULT NULL COMMENT '描述',
     `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
     `proxy_timeout_ms` int NOT NULL DEFAULT 0 COMMENT '代理超时毫秒数',
     `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `security_group_id` int DEFAULT 0 COMMENT '安全组Id',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
     `update_time` datetime(3) NOT NULL COMMENT '更新时间',
     PRIMARY KEY (`id`),
@@ -145,8 +180,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH:mm',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -162,8 +197,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd HH',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -179,8 +214,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM-dd',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -196,8 +231,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `user_id` int NOT NULL COMMENT '用户ID',
     `license_id` int NOT NULL COMMENT 'licenseId',
-    `write_bytes` int NOT NULL COMMENT '写入流量',
+    `write_bytes` bigint NOT NULL COMMENT '写入流量',
-    `read_bytes` int NOT NULL COMMENT '读取流量',
+    `read_bytes` bigint NOT NULL COMMENT '读取流量',
     `date` datetime(3) NOT NULL COMMENT '时间',
     `date_str` varchar(20) NOT NULL COMMENT '时间 yyyy-MM',
     `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -207,3 +242,4 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     KEY `I_flow_report_month_user_id` (`user_id`),
     KEY `I_flow_report_month_license_id` (`license_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+

neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231126.SQL

@@ -0,0 +1,8 @@
+ALTER TABLE `flow_report_minute` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
+ALTER TABLE `flow_report_minute` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
+ALTER TABLE `flow_report_hour` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
+ALTER TABLE `flow_report_hour` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
+ALTER TABLE `flow_report_day` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
+ALTER TABLE `flow_report_day` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
+ALTER TABLE `flow_report_month` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
+ALTER TABLE `flow_report_month` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';

neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231215.SQL

@@ -0,0 +1,38 @@
+#安全组
+CREATE TABLE IF NOT EXISTS `security_group` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `name` varchar(20) NOT NULL COMMENT '安全组名称',
+    `description` varchar(255) COMMENT '安全组描述',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#安全组规则
+CREATE TABLE IF NOT EXISTS `security_rule` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `group_id` int NOT NULL COMMENT '关联安全组',
+    `name` varchar(20) NOT NULL COMMENT '规则名称',
+    `description` varchar(255) NOT NULL COMMENT '规则描述',
+    `rule` text NOT NULL COMMENT '规则内容',
+    `pass_type`int NOT NULL COMMENT '放行类型',
+    `priority` int(1) NOT NULL COMMENT '优先级',
+    `user_id` int NOT NULL COMMENT '用户ID',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY `I_security_rule_group_id_priority` (`group_id`, `priority`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+# port_mapping表增加字段
+ALTER TABLE `port_mapping` ADD COLUMN `security_group_id` int DEFAULT 0 COMMENT '安全组Id';
+ALTER TABLE `port_mapping` ADD COLUMN `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速';
+ALTER TABLE `port_mapping` ADD COLUMN `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速';
+
+# license表增加字段
+ALTER TABLE `license` ADD COLUMN `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速';
+ALTER TABLE `license` ADD COLUMN `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速';

neutrino-proxy-vuepress/docs/.vuepress/config.js

@@ -30,7 +30,9 @@ module.exports = {
                     {text: '后台操作指南', link: '/pages/793dcc/'},
                 ]
             },
-            {text: '演示', link: '/pages/db78e2/'},
+            {text: '案例', link: '/pages/5d571c/'},
+            {text: '支持', link: '/pages/1ab20b/'},
+            {text: '更新记录', link: '/pages/ff3519/'},
             {text: 'Gitee', link: 'https://gitee.com/dromara/neutrino-proxy'},
         ],
         sidebarDepth: 2, // 侧边栏显示深度，默认1，最大2（显示到h3标题）

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/01.快速上手.md

@@ -0,0 +1,34 @@
+---
+title: 快速上手
+date: 2023-03-28 20:30:00
+permalink: /pages/793dcb
+article: false
+---
+
+::: tip
+当前最新版本：2.0.1。从之前的版本升级过来，请参照：更新记录 > 版本记录
+:::
+
+## 1、快速上手须知
+- 所谓快速上手，就是针对从来没用过的新手编写的、快速完成从安装部署到首次使用的最简化流程
+- 该流程中请严格按照说明步骤执行，不要靠猜测自作聪明的修改配置
+- 如果的确需要修改，请先把安装部署、使用须知、常见问题全部仔细读一遍
+- 快速上手中涉及到的配置，仅仅是快速体验所必须的配置，完整的配置请参照使用须知中的`服务端配置`、`客户端配置`
+
+## 2、部署服务
+- 根据需要自行选择jar、docker、原生部署任意一种完成部署
+- 三种方式分别参见对应的文档
+- 任何一种部署方式，不要求客户端与服务端一致。如：服务端采用docker部署，客户端可以用docker部署、也可以用jar、原生部署
+- 管理后台说明
+  - 服务端部署成功后，访问http://{服务端IP}:8888打开后台管理页面。使用默认的管理员帐号登录：admin/123456
+  - 打开代理配置>License管理页面，可以看到系统已经自动为管理员初始化了一条License记录，复制该LicenseKey备用，后续客户端配置需要。
+- 客户端说明
+  - 客户端启动后，查看服务端License管理，刷新页面，对应的License在线状态为`在线`，则表明客户端已正常连接。
+
+## 3、代理验证
+- 本地启动被代理服务，如：redis、本地web项目、本地mysql等等，假设被代理服务端口为：8080
+- 先确保本地能正常访问被代理服务，如果本地都不能访问，不用想代理更不可能！！！
+- 服务端管理后台端口映射管理，使用默认的licesne创建一条端口映射，如：9101 -> 127.0.0.1:8080
+- 通过服务端IP+9101（上面License配置的端口映射重的服务端端口）访问本地被代理服务
+
+访问成功，至此首次完整的内网穿透体验完成。开源不易，请速至[Gitee仓库](https://gitee.com/dromara/neutrino-proxy)一键三连🤝

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/02.使用jar部署.md

@@ -0,0 +1,55 @@
+---
+title: 使用jar部署
+date: 2023-10-26 13:50:45
+permalink: /pages/eebea1/
+---
+
+## 1、环境准备
+- 首先确保已安装Java21运行环境
+- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jdk21-2.0.1-jar.zip`、`neutrino-proxy-client-jdk21-2.0.1-jar.zip`
+
+
+## 2、部署服务端
+- 在服务器上新建部署目录：`/work/projects/neutrino-proxy-server`
+- 将`neutrino-proxy-server-jdk21-2.0.1-jar.zip`上传至服务器部署目录,并解压
+- 执行命令`java -Dfile.encoding=utf-8 -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用h2数据库。
+- 若需要指定自己的mysql数据库，则需要在当前目录下的`app.yml`文件中，修改数据库配置如下：
+
+```yml
+neutrino:
+  data:
+    db:
+      type: mysql
+      # 自己的数据库实例，创建一个空的名为'neutrino-proxy'的数据库即可，首次启动服务端会自动初始化
+      url: jdbc:mysql://xxxx:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false
+      driver-class: com.mysql.jdbc.Driver
+      # 数据库帐号
+      username: xxx
+      # 数据库密码
+      password: xxx
+```
+
+- 可参照 https://gitee.com/dromara/neutrino-proxy/blob/master/scripts/unix/server_start.sh 使用shell脚本启动服务端。
+
+## 3、部署客户端
+- 本地解压`neutrino-proxy-client-jdk21-2.0.1-jar.zip`文件
+- 修改`app.yml`文件中的server-ip为服务器公网ip，并配置license-key，以下是相关的部分配置：
+```yml
+neutrino:
+  proxy:
+    tunnel:
+      # ssl证书密钥（使用jjar包内自带的证书，则此处无需修改）
+      key-store-password: 123456
+      # ssl证书管理密钥（使用jjar包内自带的证书，则此处无需修改。自定义证书，则此处配置对应的路径）
+      jks-path: classpath:/test.jks
+      # 代理服务端IP
+      server-ip: xxxx
+      # 代理服务端IP, 若是非ssl端口，则ssl-enable需要配置为false
+      server-port: 9002
+      # 是否启用ssl
+      ssl-enable: true
+      # licenseKey，客户端凭证。此处需要配置刚刚从管理后台复制的LicenseKey
+      license-key: xxxx
+```
+- 执行命令`java -jar neutrino-proxy-client.jar`启动客户端
+

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/03.使用docker容器化部署.md

@@ -0,0 +1,42 @@
+---
+title: 使用docker容器化部署
+date: 2023-10-26 13:51:29
+permalink: /pages/5b9bef/
+---
+
+## 1、 部署服务端
+### 使用默认h2数据库一键部署
+```shell
+docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
+-d --restart=always --name neutrino-proxy \
+-v /root/neutrino-proxy-server/config:/root/neutrino-proxy/config \
+-v /root/neutrino-proxy-server/data:/root/neutrino-proxy/data \
+-v /root/neutrino-proxy-server/logs:/root/neutrino-proxy/logs \
+aoshiguchen/neutrino-proxy-server:latest
+```
+
+### 指定自己的mysql数据库
+- 在服务器上创建目录：/root/neutrino-proxy/config
+- 在该目录下创建`app.yml`文本文件，并配置如下内容：
+```yml
+neutrino:
+  data:
+    db:
+      type: mysql
+      # 自己的数据库实例，创建一个空的名为'neutrino-proxy'的数据库即可，首次启动服务端会自动初始化
+      url: jdbc:mysql://xxxx:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false
+      driver-class: com.mysql.jdbc.Driver
+      # 数据库帐号
+      username: xxx
+      # 数据库密码
+      password: xxx
+```
+- 然后再执行上面的docker一键部署命令即可
+
+## 2、部署客户端
+- 命令中的服务端ip、license请自行补充
+- 若是首次使用，请仔细阅读快速上手，以确定license从哪里取得
+```shell 
+docker run -it -d --restart=always --name npclient -e SERVER_IP=xxxx -e LICENSE_KEY=xxxx \
+aoshiguchen/neutrino-proxy-client:latest
+```

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/04.原生部署.md

@@ -0,0 +1,61 @@
+---
+title: 原生部署
+date: 2023-10-26 13:51:44
+permalink: /pages/69699a/
+---
+
+::: tip
+1、目前的原生部署包支持mac、linux、windows三个平台
+
+2、这三个平台的部署包均由作者分别测试通过
+
+3、尽管如此，仍然可能存在有的机器不支持的情况，可自行拉取仓库源码编译出目标平台可执行文件、或换成其它部署方式
+
+4、若linux/mac下提示文件没有执行权限，可执行`chmod +x {文件路径}`解决
+
+5、若mac下运行提示移到废纸篓，可执行`sudo xattr -rd com.apple.quarantine {文件路径}`解决
+:::
+
+## 1、安装包下载
+- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载所需的最新的release包：
+- 比如服务器为linux则可下载`neutrino-proxy-server-linux-2.0.1-native.zip`文件，客户端为windows则可下载`neutrino-proxy-client-windows-2.0.1-native.zip`
+
+## 2、部署服务端
+- 将服务端安装包上传至服务器，并解压
+- 服务端默认使用h2数据库，若需要改为mysql，则可修改安装包`app.yml`内的数据库配置，如下：
+```yml
+neutrino:
+  data:
+    db:
+      type: mysql
+      # 自己的数据库实例，创建一个空的名为'neutrino-proxy'的数据库即可，首次启动服务端会自动初始化
+      url: jdbc:mysql://xxxx:3306/neutrino-proxy?useUnicode=true&allowMultiQueries=true&useAffectedRows=true&useSSL=false
+      driver-class: com.mysql.jdbc.Driver
+      # 数据库帐号
+      username: xxx
+      # 数据库密码
+      password: xxx
+```
+- 然后直接启动服务端可执行程序即可
+
+## 3、部署客户端
+- 本地解压客户端安装包
+- 修改`app.yml`文件中的server-ip为服务器公网ip，并配置license-key，以下是相关的部分配置：
+```yml
+neutrino:
+  proxy:
+    tunnel:
+      # ssl证书密钥（使用jjar包内自带的证书，则此处无需修改）
+      key-store-password: 123456
+      # ssl证书管理密钥（使用jjar包内自带的证书，则此处无需修改。自定义证书，则此处配置对应的路径）
+      jks-path: classpath:/test.jks
+      # 代理服务端IP
+      server-ip: xxxx
+      # 代理服务端IP, 若是非ssl端口，则ssl-enable需要配置为false
+      server-port: 9002
+      # 是否启用ssl
+      ssl-enable: true
+      # licenseKey，客户端凭证。此处需要配置刚刚从管理后台复制的LicenseKey
+      license-key: xxxx
+```
+- 然后直接启动客户端可执行程序即可

neutrino-proxy-vuepress/docs/01.使用教程/01.开始使用/01.快速上手.md

@@ -1,123 +0,0 @@
----
-title: 快速上手
-date: 2023-03-28 20:30:00
-permalink: /pages/793dcb
-article: false
----
-
-## 1、 部署服务端
-### 1.1、 Docker一键部署
-> 当前最新版本为1.9.0，下面的脚本中，可以使用：`registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:1.9.0` 指定版本安装，推荐使用`latest`直接安装最新版。
-
-#### 使用默认sqlite数据库
-```shell
-docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
--d --restart=always --name neutrino-proxy \
-registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
-```
-
-#### 指定自己的mysql数据库
-- 在服务器上创建目录：/root/neutrino-proxy/config
-- 在该目录下创建`app.yml`文本文件，并配置如下内容：
-```yml
-neutrino:
-  data:
-    db:
-      type: mysql
-      # 自己的数据库实例，创建一个空的名为'neutrino-proxy'的数据库即可，首次启动服务端会自动初始化
-      url: jdbc:mysql://xxxx:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false
-      driver-class: com.mysql.jdbc.Driver
-      # 数据库帐号
-      username: xxx
-      # 数据库密码
-      password: xxx
-```
-- 然后执行如下命令：
-```shell
-docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
--v /root/neutrino-proxy/config:/root/neutrino-proxy/config \
--d --restart=always --name neutrino \
-registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
-```
-
-### 1.2、使用jar包自行部署
-- 首先确保服务器上已安装java8运行环境
-- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server.jar`、`neutrino-proxy-admin.zip`
-- 在服务器上新建部署目录：`/work/projects/neutrino-proxy-server`
-- 将` neutrino-proxy-server.jar`、`neutrino-proxy-admin.zip`上传至服务器部署目录。
-- 解压`neutrino-proxy-admin.zip`文件
-- 执行命令`java -Dfile.encoding=utf-8 -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用sqlite数据库。
-- 若需要指定自己的mysql数据库，同样的需要在当前目录下新建`app.yml`文件，文件内容同上。执行命令`java -Dfile.encoding=utf-8 -jar neutrino-proxy-server.jar config=app.yml`启动服务端完成部署
-- 可参照 https://gitee.com/dromara/neutrino-proxy/blob/master/scripts/unix/server_start.sh 使用shell脚本启动服务端。
-
-## 2、管理后台配置
-- 服务端部署成功后，访问`http://{服务端IP}:8888`打开后台管理页面。
-- 使用默认的管理员帐号登录：admin/123456
-- 打开`代理配置>License管理`页面，可以看到系统已经自动为管理员初始化了一条License记录，复制该`LicenseKey`备用，后续客户端配置需要。
-- 打开`代理配置>端口映射`页面，可以看到系统已经自动为初始化了几条端口映射。可根据需要自行添加、修改。这里我们以`9101 -> 127.0.0.1:8080`映射为例
-
-## 3、启动客户端
-- 首先确保本地已安装java8运行环境
-- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-client.jar`
-- 在本地`neutrino-proxy-client.jar`同级别目录下新建`app.yml`文件，并配置如下内容：
-```yml
-neutrino:
-  proxy:
-    tunnel:
-      # ssl证书密钥（使用jjar包内自带的证书，则此处无需修改）
-      key-store-password: 123456
-      # ssl证书管理密钥（使用jjar包内自带的证书，则此处无需修改。自定义证书，则此处配置对应的路径）
-      jks-path: classpath:/test.jks
-      # 代理服务端IP
-      server-ip: localhost
-      # 代理服务端IP, 若是非ssl端口，则ssl-enable需要配置为false
-      server-port: 9002
-      # 是否启用ssl
-      ssl-enable: true
-      # licenseKey，客户端凭证。此处需要配置刚刚从管理后台复制的LicenseKey
-      license-key: xxxx
-```
-- 执行命令`java -jar neutrino-proxy-client.jar config=app.yml`启动客户端
-- 查看服务端License管理，刷新页面，对应的License在线状态为`在线`，则表明客户端已正常连接。
-
-## 4、代理验证
-- 本地启动被代理服务，如：redis、本地web项目、本地mysql等等
-- 先确保本地能正常访问被代理服务，如果本地都不能访问，不用想代理更不可能！！！
-- 通过服务端IP+9101（上面License配置的端口映射重的服务端端口）访问本地被代理服务
-
-访问成功，至此首次完整的内网穿透体验完成。开源不易，请速至[Gitee仓库](https://gitee.com/dromara/neutrino-proxy)一键三连🤝
-
-## 5、客户端Docker部署
-> 因为一些原因，官方不推荐客户端使用Docker方式部署，但有不少朋友希望采用这种方式，因此从1.9.0版本开始维护了客户端镜像，版本号同服务端，也可使用`latest`直接安装最新版。
-- 客户端镜像地址：registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy-client:latest
-- 注意：客户端采用docker部署时，服务端端口映射客户端ip请不要配置127.0.0.1应该配置为容器访问宿主机的ip或者hostname，具体请自行百度
-
-<!--
-## 4.开发&调试
-
-::: tip
-  1. 不建议在原默认vuepress项目上单独安装使用本主题包，而是clone我的整个项目再替换你自己的内容即可。
-  2. 修改`config.js`配置后需要重新启动项目才会生效。
-  3. 更多关于项目上手的问题，请查阅 [问答](/pages/9cc27d/)。
-:::
-
-
-## 版本升级
-
-主题的版本会不定期更新，你只需更新npm主题包即可：
-```sh
-npm update vuepress-theme-vdoing
-```
-
-::: tip
-1. 如更新后没起作用或报错，尝试把`node_modules`文件夹删除再`npm i`重新安装。
-2. 在.vuepress/config.js中，设置`theme: 'vdoing'`才是使用npm主题依赖包:
-```js
-// config.js
-module.exports = {
-  theme: 'vdoing', // npm主题依赖包
-  // theme: require.resolve('../../vdoing'), // 使用本地主题包
-}
-```
-:::
--->

neutrino-proxy-vuepress/docs/01.使用教程/01.开始使用/100.常见问题汇总.md

@@ -1,58 +0,0 @@
----
-title: 常见问题汇总
-date: 2023-07-01 13:35:00
-permalink: /pages/a00001/
----
-
-## 1. 客户端启动后连不上服务端，一直在重连
-### 1.1. 启动日志包含`not found license-key config`相关字样
-出现这种情况，说明客户端没获取到配置的license，可按如下检查：
-- 客户端是否有配置app.yml，app.yml中是否有配置`license-key`
-- 客户端启动参数是否指定app.yml配置，若未指定客户端不会加载任何jar外部的配置文件
-- 客户端启动参数指定的配置文件路径是否正确？如：`java -jar neutrino-proxy-client.jar config=app.yml`，代表`app.yml`文件与jar在同级别目录下，如果不在同级别目录，请使用绝对/相对路径指定
-- 除此之外license还可以用以下方法直接在启动参数中指定：
-    - `java -jar -DLICENSE_KEY=xxxx -DSERVER_IP=x.x.x.x -DSERVER_PORT=9000 -DSSL_ENABLE=false neutrino-proxy-client.jar`
-    - `java -jar neutrino-proxy-client.jar serverIp=x.x.x.x serverPort=9000 sslEnable=false licenseKey=xxxx`
-
-### 1.2. 配置文件确定都已经配置，且启动参数正确指定了，但是没有出现`认证成功日志`
-- 确认客户端配置的`server-ip`，必须是服务端所在机器的ip，且保证客户端所在机器能正常ping通
-- 确认客户端配置的`server-port`与`ssl-enable`，默认情况应配置为9000、false或9002、true，除非服务端app.yml有改动隧道对外端口
-- 确认服务端对外的9000、9002端口是否已经放开
-- 服务端如果采用docker部署，需要确保容器的9000、9002端口映射到宿主机
-
-## 2. 关于中微子代理涉及的2类SSL证书
-### 2.1. HTTPS证书
-该证书用于服务端支持HTTPS，若需要在服务端`app.yml`中配置即可
-
-### 2.2. 隧道SSL证书
-该证书用于对客户端-服务端之间的数据通信进行加密，因此客户端/服务端均需要配置该证书。可参考如下命令生成：
-```
-keytool -genkey -alias test1 -keyalg RSA -keysize 1024 -validity 3650 -keypass 123456 -storepass 123456 -keystore  "./test.jks"
-```
-
-## 3. 1.9.0 版本udp代理无效
-### 问题描述
-代理本地udp端口9231，公网访问代理端口无效，代理端口测试发送成功，但是本地服务没有收到，使用路由器的ddns功能也可以成功代理。
-### 解决方案
-+ 防火墙开放端口的时候一定要指定udp协议
-+ 还有如果想收到回复需要配置两个响应参数
-+ 响应数量根据实际响应数量配置，可以配置的大一些，但是不能比实际小
-+ 超时时间根据实际响应时间配置，比如正常响应时间是10s，这里就可以配置15000毫秒等
-<img :src="$withBase('/img/run-example/question_3_1.png')"></img>
-+ 相关链接：[1.9.0版本udp代理无效 · Issue #I83XOI · dromara/neutrino-proxy - Gitee.com](https://gitee.com/dromara/neutrino-proxy/issues/I83XOI)
-+ 贡献者：gitee：眉黛如画
-
-## 4. Vue项目出现Invalid Host header 的解决方案
-### 问题描述
-内网穿透 Vue项目出现Invalid Host header 的解决方案
-### 解决方案
-manifest.json中配置
-```
-"h5":{
-		"devServer":{
-			"disableHostCheck":true
-		}
-},
-```
-+ 相关链接：[内网穿透 Vue项目出现Invalid Host header 的解决方案](https://blog.csdn.net/weixin_41549915/article/details/96132925)
-+ 贡献者：wx：明天会更好

neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/01.管理后台.md

@@ -17,8 +17,22 @@ article: false
 # 代理配置
 - License管理：License是客户端连接服务端的唯一合法凭证。一个License同时只能被一个客户端使用，一个License可以维护多条端口映射
 - 端口映射：服务端IP+端口 -> 客户端IP+端口的四元组映射(因目前服务端单节点只有一个公网IP，所以不体现出来)，是内网穿透的基本单元。
+- 限速：
+  - 默认所有代理没有限速
+  - 对License限速，将使得License下的所有端口映射都被限速
+  - 若License设置了限速，License下的某条映射也设置了限速，则对于该映射优先采用端口映射上的限速规则
+
+<img :src="$withBase('/img/run-example/license2.png')"></img>
+<img :src="$withBase('/img/run-example/port-mapping2.png')"></img>
+
+# 安全组
+一个端口映射可绑定一个安全组，通过安全组的默认放行类型 + 安全组下的安全规则 控制该端口映射的安全访问规则。
+- 场景1: 内部服务，穿透出来自己使用，不希望被其他人访问。端口映射可关联一个默认放行类型为“拒绝”的安全组，安全组下新增安全规则，将本地的出口ip添加到允许放行规则中。
+- 场景2：公网服务，穿透出来开放给大家使用，但是希望拒绝某些IP访问。端口映射可关联一个默认放行类型为“允许”的安全组，安全组下新增安全规则，将黑名单ip添加到拒绝放行规则中。
+
+<img :src="$withBase('/img/run-example/security-group1.png')"></img>
+<img :src="$withBase('/img/run-example/security-rule1.png')"></img>
 
-<img :src="$withBase('/img/run-example/license1.png')"></img>
 
 # 系统管理
 - 用户管理：支持多用户，一个用户可持有多个License。由于项目目前主推个人版，所以暂是没有权限这一套，管理员之外的所有用户都属于游客。对于绝大多数操作，游客仅有只读权限。
@@ -44,4 +58,4 @@ article: false
 - 登录日志：管理后端登录、退出登录的日志
 - 客户端连接日志：客户端连接、断开的日志
 
-<img :src="$withBase('/img/run-example/login-log1.png')"></img>
+<img :src="$withBase('/img/run-example/login-log1.png')"></img>

neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/05.服务端配置.md

@@ -16,12 +16,13 @@ permalink: /pages/f2d0f1/
 server:
   # 服务端web端口，用于支持HTTP接口，管理后台页面访问
   port: ${WEB_PORT:8888}
+# 日志级别
+solon.logging.logger:
+  "root":
+    level: info
 
 neutrino:
   proxy:
-    logger:
-      # 日志级别
-      level: ${LOG_LEVEL:info}
     # 隧道相关配置-用于维持服务端与客户端的通信
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
@@ -37,6 +38,8 @@ neutrino:
       jks-path: ${JKS_PATH:classpath:/test.jks}
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
       transfer-log-enable: ${TUNNEL_LOG:false}
+      # 是否开启心跳日志
+      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
     server:
       tcp:
         # 线程池相关配置，用于技术调优，可忽略
@@ -61,10 +64,10 @@ neutrino:
         transfer-log-enable: ${SERVER_LOG:false}
   data:
     db:
-      # 数据库类型，目前支持sqlite、mysql、mariadb
+      # 数据库类型，目前支持h2、mysql、mariadb
-      type: ${DB_TYPE:sqlite}
+      type: ${DB_TYPE:h2}
       # 数据库连接URL
-      url: ${DB_URL:jdbc:sqlite:data.db}
+      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
       # 数据库用户名
       username: ${DB_USER:}
       # 数据库密码

neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/06.客户端配置.md

@@ -12,11 +12,13 @@ permalink: /pages/50ce10/
 
 # 以下是最新的客户端配置格式(app.yml)
 ```yml
+# 日志级别
+solon.logging.logger:
+  "root":
+    level: info
+    
 neutrino:
   proxy:
-    logger:
-      # 日志级别
-      level: ${LOG_LEVEL:info}
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
       thread-count: 50
@@ -35,6 +37,8 @@ neutrino:
       client-id: ${CLIENT_ID:}
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
       transfer-log-enable: ${CLIENT_LOG:false}
+      # 是否开启心跳日志
+      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
       # 重连设置
       reconnection:
         # 重连间隔（秒）

neutrino-proxy-vuepress/docs/01.使用教程/02.开发指南/01.项目结构.md

@@ -1,39 +0,0 @@
----
-title: 项目结构
-date: 2020-05-11 13:54:56
-permalink: /pages/2f674a
-article: false
----
-
-# 主要目录、文件
-
-```
-├── data.db (为配置mysql时，项目启动默认初始化生成的本地sqlite数据库文件)
-├── docs  (项目相关的一些文档)
-├── neutrino-proxy-admin (管理后台前端项目，基于vue-element-admin)
-├── neutrino-proxy-client  (基于netty的代理客户端，用于和服务端交互、转发内网数据)
-├── neutrino-proxy-core  (代理相关的公共代码（协议、常量）)
-├── neutrino-proxy-server  (基于netty的代理服务端，用于和客户段交互，将客户端转发的内网数据转发至外网端口)
-└── todolist.MD  (近期的开发计划)
-```
-
-# 代理服务端 `neutrino-proxy-server`
-- base：基础的配置、初始化代码
-- constant：服务端常量、枚举定义
-- dal：持久层mapper、实体
-- job：定时任务执行入口
-- proxy：代理核心实现
-- service：基础业务
-- util：基础工具封装
-- resource/mapper：mybatis SQL文件
-- resource/sql：维护mysql/sqlite的初始化SQL、SQL变更记录
-- resource/app.yml：项目默认配置
-- resource/test.jks：默认的SSL证书
-
-# 代理客户端 `neutrino-proxy-client`
-- config：基础配置
-- core：客户端代理核心入口
-- handler：客户端代理数据处理逻辑
-- util：基础工具封装
-- resource/app.yml：项目默认配置
-- resource/test.jks：默认的SSL证书

neutrino-proxy-vuepress/docs/01.使用教程/03.演示/01.演示环境 .md

@@ -1,15 +0,0 @@
----
-title: 演示环境
-date: 2020-05-12 15:10:15
-permalink: /pages/db78e2
-article: false
----
-
-### 演示环境
-> 由于部分用户使用演示环境代理非法网站导致演示环境服务器被封禁，因此不再提供演示服务。
-
-可使用分配好的游客license试用。服务器带宽较低，仅供学习使用！
-
-管理后台地址：<a href="http://103.163.47.16:9527" target="_blank">http://103.163.47.16:9527</a>
-
-游客账号：visitor/123456

neutrino-proxy-vuepress/docs/01.使用教程/99.常见问题/01.客户端连接服务端失败.md

@@ -0,0 +1,20 @@
+---
+title: 客户端连接服务端失败
+date: 2023-10-25 17:55:20
+permalink: /pages/31d253/
+---
+
+## 1.1. 启动日志包含`not found license-key config`相关字样
+出现这种情况，说明客户端没获取到配置的license，可按如下检查：
+- 客户端是否有配置app.yml，app.yml中是否有配置`license-key`
+- 客户端启动参数是否指定app.yml配置，若未指定客户端不会加载任何jar外部的配置文件
+- 客户端启动参数指定的配置文件路径是否正确？如：`java -jar neutrino-proxy-client.jar config=app.yml`，代表`app.yml`文件与jar在同级别目录下，如果不在同级别目录，请使用绝对/相对路径指定
+- 除此之外license还可以用以下方法直接在启动参数中指定：
+    - `java -jar -DLICENSE_KEY=xxxx -DSERVER_IP=x.x.x.x -DSERVER_PORT=9000 -DSSL_ENABLE=false neutrino-proxy-client.jar`
+    - `java -jar neutrino-proxy-client.jar serverIp=x.x.x.x serverPort=9000 sslEnable=false licenseKey=xxxx`
+
+## 1.2. 配置文件确定都已经配置，且启动参数正确指定了，但是没有出现`认证成功日志`
+- 确认客户端配置的`server-ip`，必须是服务端所在机器的ip，且保证客户端所在机器能正常ping通
+- 确认客户端配置的`server-port`与`ssl-enable`，默认情况应配置为9000、false或9002、true，除非服务端app.yml有改动隧道对外端口
+- 确认服务端对外的9000、9002端口是否已经放开
+- 服务端如果采用docker部署，需要确保容器的9000、9002端口映射到宿主机

neutrino-proxy-vuepress/docs/01.使用教程/99.常见问题/02.易混淆的2类证书.md

@@ -0,0 +1,14 @@
+---
+title: 易混淆的2类证书
+date: 2023-10-25 17:56:59
+permalink: /pages/e4c3d7/
+---
+
+## 2.1. HTTPS证书
+该证书用于服务端支持HTTPS，若需要在服务端`app.yml`中配置即可
+
+## 2.2. 隧道SSL证书
+该证书用于对客户端-服务端之间的数据通信进行加密，因此客户端/服务端均需要配置该证书。可参考如下命令生成：
+```
+keytool -genkey -alias test1 -keyalg RSA -keysize 1024 -validity 3650 -keypass 123456 -storepass 123456 -keystore  "./test.jks"
+```

neutrino-proxy-vuepress/docs/01.使用教程/99.常见问题/03.udp代理无效.md

@@ -0,0 +1,16 @@
+---
+title: udp代理无效
+date: 2023-10-25 17:58:35
+permalink: /pages/7b990f/
+---
+
+## 问题描述
+代理本地udp端口9231，公网访问代理端口无效，代理端口测试发送成功，但是本地服务没有收到，使用路由器的ddns功能也可以成功代理。
+## 解决方案
++ 防火墙开放端口的时候一定要指定udp协议
++ 还有如果想收到回复需要配置两个响应参数
++ 响应数量根据实际响应数量配置，可以配置的大一些，但是不能比实际小
++ 超时时间根据实际响应时间配置，比如正常响应时间是10s，这里就可以配置15000毫秒等
+  <img :src="$withBase('/img/run-example/question_3_1.png')"></img>
++ 相关链接：[1.9.0版本udp代理无效 · Issue #I83XOI · dromara/neutrino-proxy - Gitee.com](https://gitee.com/dromara/neutrino-proxy/issues/I83XOI)
++ 贡献者：gitee：眉黛如画

neutrino-proxy-vuepress/docs/01.使用教程/99.常见问题/04.Vue项目出现Invalid Host header 的解决方案.md

@@ -0,0 +1,19 @@
+---
+title: Vue项目出现Invalid Host header 的解决方案
+date: 2023-10-25 17:59:29
+permalink: /pages/441163/
+---
+
+## 问题描述
+内网穿透 Vue项目出现Invalid Host header 的解决方案
+## 解决方案
+manifest.json中配置
+```
+"h5":{
+		"devServer":{
+			"disableHostCheck":true
+		}
+},
+```
++ 相关链接：[内网穿透 Vue项目出现Invalid Host header 的解决方案](https://blog.csdn.net/weixin_41549915/article/details/96132925)
++ 贡献者：wx：明天会更好

neutrino-proxy-vuepress/docs/03.支持我们/01.个人赞赏.md

@@ -0,0 +1,39 @@
+---
+title: 个人赞赏
+date: 2023-10-26 13:08:02
+permalink: /pages/1ab20b/
+---
+
+## 个人赞赏说明
+随着用户增加，需要协助解决的问题也多种多样，为了能给用户提供 `更优质`、`更准确` 的 疑难问题 解答我们推出赞赏咨询服务
+
+| 赞赏金额 | 服务时长 | 服务说明                  |
+|:-----|:-----|:----------------------|
+| 任意金额 | -    | 您将获得赞助者列表的永久留名。       |
+| 30   | 一个月  | 您在群内反馈的问题将优先得到作者响应    |
+| 120  | 三个月  | 获得微信一对一的咨询服务          |
+| 399  | 六个月  | 获得官网首页特别赞助席位一个，一次远程协助 |
+| 更多金额 | -    | 您将获得私人定制服务            |
+
+> 注意1：服务项目是逐级叠加：如，您赞赏的金额是 80 员那么您将享受：任意金额、一个月、三个月的服务内容
+
+> 注意2：二开问题不在个人赞赏支持服务范畴内，如需咨询二开问题或者二开方案请找作者协商
+
+## 赞赏途径
+> 除4以外，赞赏后请及时通过官网首页微信二维码与作者取得联系
+
+- 1、微信赞赏
+- 2、支付宝转账
+- 3、Gitee项目捐赠：[点击这里](https://gitee.com/dromara/neutrino-proxy)打开后拉到最底部点击捐赠
+- 4、微信好友转账
+
+<table>
+<tr>
+<td align="center">微信赞赏</td><td align="center">支付宝转账</td>
+</tr>
+<tr>
+<td><img width="300px" src="./a1.png"></td><td><img width="300px" src="./a2.png"></td>
+</tr>
+<tr>
+</tr>
+</table>

neutrino-proxy-vuepress/docs/03.支持我们/02.贡献指南/01.如何贡献.md

@@ -36,8 +36,8 @@ permalink: /pages/a3f096/
 - 注释完备，尤其每个新增的方法应按照Java文档规范标明方法说明、参数说明、返回值说明等信息，必要时请添加单元测试，如果愿意，也可以加上你的大名。
 - 原则上，不允许自行添加第三方依赖库。若确有必要，请先和项目负责人沟通达成一致。
 - 对现有代码的优化，请在注释中说明原因。
-- 如果涉及到数据库的变更，则至少需要做到以下绩点：
+- 如果涉及到数据库的变更，则至少需要做到以下几点：
-    - sqlite、mysql下均测试通过
+    - h2、mysql下均测试通过
     - 在`./neutrino-proxy-server/src/main/resource/sql`下维护更新对应的表结构sql文件
     - 对于新增的表，维护必要的初始化数据
-    - 在对应的mysql、sqlite的update目录下，维护SQL变更记录，确保SQL执行测试通过
+    - 在对应的mysql、h2的update目录下，维护SQL变更记录，确保SQL执行测试通过

neutrino-proxy-vuepress/docs/03.支持我们/02.贡献指南/02.项目结构.md

@@ -0,0 +1,28 @@
+---
+title: 项目结构
+date: 2020-05-11 13:54:56
+permalink: /pages/2f674a
+article: false
+---
+
+# 主要目录、文件
+
+```
+├── assets (资源文件)
+├── docs  (项目相关的一些文档)
+├── neutrino-proxy-admin (管理后台前端项目，基于vue-element-admin)
+├── neutrino-proxy-client  (基于netty的代理客户端，用于和服务端交互、转发内网数据)
+├── neutrino-proxy-core  (代理相关的公共代码（协议、常量）)
+├── neutrino-proxy-server  (基于netty的代理服务端，用于和客户段交互，将客户端转发的内网数据转发至外网端口)
+├── neutrino-proxy-vuepress (中微子代理官网文档)
+├── scripts (常用的编译、打包脚本)
+├── Milestone.md (里程碑事件节点)
+├── VLog.md (版本变更记录)
+└── todolist.MD  (近期的开发计划)
+```
+
+# 代码分支说明
+- dev：常规开发分支，日常的开发、Bug修复、提交PR都在此分支
+- feature/xxx：特征分支，一些试验性开发、提交PR都在此分支，xxx可自行取一个有意义的名称
+- release/xxx：发行版分支，作为阶段性成果、重大更新的版本固化分支。受保护，不允许任何提交。
+- master：主分支，定期同步最新代码，目前仅支持本人(傲世孤尘/雨韵诗泽)提交。

neutrino-proxy-vuepress/docs/03.支持我们/99.赞赏公示/100.2023年.md

@@ -6,8 +6,24 @@ permalink: /pages/cded59/
 
 | 日期         | 渠道 | 金额   |昵称| 备注               |
 |:-----------|:---|:-----|:-|:-----------------|
-|2023-10-11|微信红包|50|喜鸽小宝||
+|2023-12-28|微信红包|50|雪猫|请大佬吃肯德基|
-|2023-10-10|微信红包|20|海洋||
+|2023-12-27|微信红包|50|D|请大佬喝杯茶|
+|2023-12-25|微信赞赏码|30|Simen|伟大的项目，尽点绵薄之力|
+|2023-12-25|微信红包|50|KAI|大佬加油|
+|2023-12-22|微信赞赏|30|walking|好东西必须支持一下|
+|2023-12-21|微信红包|100|洗最大的碗|中微子越来越强大，雨哥越来越富有|
+|2023-12-15|Gitee捐助|10|一杯香梨||
+|2023-12-12|微信红包|50|喜鸽小宝||
+|2023-11-30|支付宝收款码|30|*平|大佬继续加油|
+|2023-11-30|Gitee捐助|10|26263|感谢您的开源项目！|
+|2023-11-30|微信红包|10|姫野永遠||
+| 2023-11-26 |微信转账|180|Teacher Du||
+| 2023-11-10 |微信红包|50|喜鸽小宝||
+| 2023-11-01 |微信红包|20|Sun|感谢大佬，请你喝杯奶茶[微笑]|
+| 2023-10-30 |微信赞赏|50|杨娃娃||
+| 2023-10-16 |微信转账|50|Mark Isaac赵方丈|金额不大，开源感恩。|
+| 2023-10-11 |微信红包|50|喜鸽小宝||
+| 2023-10-10 |微信红包|20|海洋||
 | 2023-07-31 |Gitee捐助| 50   |失败女神| 感谢您的开源项目！	               |
 | 2023-07-28 |微信转账| 50   |AdrianPteLtd.com-咨询|                |
 | 2023-07-12 |微信红包| 100  |MaxKeyTop| 请大佬抽包烟               |

neutrino-proxy-vuepress/docs/04.案例/01.案例.md

@@ -1,428 +0,0 @@
----
-title: 案例
-date: 2020-05-14 11:39:45
-permalink: /pages/5d571c
-# sidebar: false
-article: false
----
-## 特别用户
-::: cardImgList 3
-```yaml
-config:
-    imgHeight: 140px
-
-data:
-  # - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20210729-233554@2x.22bdqeiem2sg.png
-  #   link: https://docs.openharmony.cn/pages/000000/
-  #   name: OpenHarmony
-  #   desc: 开放原子开源基金会
-  #   author: OpenHarmony
-  #   avatar: https://www.openharmony.cn/static/img/core-card-item2.a72a0d10.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20211215-144040.hgt2875r2zc.webp
-    link: https://baomidou.com/
-    name: MyBatis-Plus官网
-    desc: 🚀为简化开发而生
-    author: 青苗
-    avatar: https://baomidou.com/img/logo.svg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20210729-235804@2x.75e9lfd65t40.png
-    link: https://docs.deepin.org
-    name: Deepin 社区文档
-    desc: Deepin 应用开发技术分享、DTK开发经验等
-    author: Deepin
-    avatar: https://fastly.jsdelivr.net/gh/xmuli/xmuliPic@pic/2021/deepin.png
-  - img: https://ks3-cn-beijing.ksyuncs.com/vform-static/img/vform_website.png
-    link: http://www.vform666.com
-    name: VForm官网
-    desc: 低代码表单优选方案，拖拽式设计，一键生成源码
-    author: vformAdmin
-    avatar: https://www.vform666.com/vform-logo.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/blog-gitalk-comment@master/img/xxx.7feub7n1y0g0.png
-    link: https://liteflow.yomahub.com
-    name: LiteFlow官网
-    desc: 轻量，快速，稳定可编排的组件式规则引擎
-    author: 铂赛东
-    avatar: https://portrait.gitee.com/uploads/avatars/user/367/1102362_bryan31_1578940308.png!avatar60
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/blog-gitalk-comment@master/img/176866696-743faf44-4afd-4c12-9728-f982ea885836.2205nb3vf5mo.webp
-    link: https://easy-es.cn/
-    name: Easy-Es官网
-    desc: 傻瓜级ElasticSearch搜索引擎ORM框架
-    author: 老汉
-    avatar: https://iknow.hs.net/9fa0407f-30ff-4d8b-82da-a4990e41a04b.png
- ```
-:::
-
-## 知识库兼博客
-::: cardImgList 4
-```yaml
-config:
-    imgHeight: 140px
-
-data:
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200530114033.png
-    link: https://xugaoyi.com/
-    name: Evan's blog
-    desc: Web前端技术博客，积跬步以至千里，致敬每个爱学习的你。
-    author: Evan Xu
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200103123203.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200727170555.jpg
-    link: https://miluluyo.github.io/vdoingBlog/
-    name: 麋鹿鲁哟
-    desc: 运气交给锦鲤，</br>你只管努力就好。  (●ˇ∀ˇ●)
-    author: 麋鹿鲁哟
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200122153807.jpg
-  - img: https://i.loli.net/2020/07/26/BUCplirGIq9YTNA.png
-    link: https://lingze.xyz/
-    name: Lingze's blog
-    desc: 少侠, 别来无恙?
-    author: 令则
-    avatar: https://i.loli.net/2020/07/11/XhqR7Idnk5LD8bC.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20210730-000829@2x.6pjgy10flk00.png
-    link: https://www.xswsym.online/
-    name: summer's blog
-    desc: Devops运维技术博客，分享运维技术
-    author: 夏苏文
-    avatar: https://fastly.jsdelivr.net/gh/summerking1/image@main/tx.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20201110221457.png
-    link: https://gocifer.github.io
-    name: Gocifer's DB & Blog
-    desc: 一个中二少年，专注于计算机基础架构、云原生、网络、云计算的所学、所思、所行、所想。
-    author: gocifer.jay
-    avatar: https://gocifer.github.io/img/avatar/gocifer.png
-  - img: https://dra-m.com/images/thumbnail.png
-    link: https://dra-m.com/
-    name: Dra-M
-    desc: JAVA后端
-    author: 莫小龙
-    avatar: https://q1.qlogo.cn/g?b=qq&nk=975425198&s=640
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200905142134.png
-    link: https://www.coder163.com/
-    name: 跟着老侯玩编程
-    desc: 一个乐于编程知识分享的站点
-    author: 舞动的代码
-    avatar: https://www.coder163.com/img/qun.png
-
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20210119213748.jpg
-    link: https://haijunit.top/
-    name: 学习笔记
-    desc: 平时的技术积累|分享交流技术心得|温故而知新
-    author: 爱做梦的奋斗青年
-    avatar: https://haijunit.top/images/avatar.png
-  - img: https://fastly.jsdelivr.net/gh/yxw839841231/images/studying-icu/20210120110320.png
-    link: https://www.studying.icu/
-    name: 研究院
-    desc: 一万年太久，只争朝夕
-    author: xwyang
-    avatar: https://avatars1.githubusercontent.com/u/13757119?s=80&v=4
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20210704-230751@2x.3pw80u1fo6u0.png
-    link: https://blog.kimen.com.cn/
-    name: Kimen's Blog
-    desc: 全沾攻城狮
-    author: Kimen
-    avatar: https://avatars.githubusercontent.com/u/25970284?s=460&u=69b419ad6de33eaa1d6b73d7f065f710076d6c55&v=4
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20211101-165045-(1).4b4axinii160.png
-    link: https://lixianglong3210.gitee.io/xlong-vdoing/
-    name: XLONG's blog
-    desc: 蒸汽波、咖啡
-    author: lixianglong3210
-    avatar: http://www.lixianglong.cn/bg_store/img/avatar/default.jpg
-  - img: https://fastly.jsdelivr.net/gh/Awrtiger/mirrorfile/img/web.png
-    link: https://www.ool.cool/
-    name: 偷吃了鸡蛋的梨
-    desc: 捣鼓这,捣鼓那。
-    author: Awrtiger
-    avatar: https://fastly.jsdelivr.net/gh/Awrtiger/mirrorfile/img/avatar.jpg
-  - img: https://image-1302577725.cos.ap-beijing.myqcloud.com/img/20210402183053.png
-    link: https://f4de-bak.github.io/
-    name: Xinghai's Blog
-    desc: Web Security | Java Security
-    author: Xinghai
-    avatar: https://image-1302577725.cos.ap-beijing.myqcloud.com/img/20210328234543.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/eyjf.png
-    link: https://wiki.eryajf.net
-    name: 二丫讲梵
-    desc: 学习，记录，分享。(运维生活编程)
-    author: 二丫讲梵
-    avatar: https://wiki.eryajf.net/img/logo.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/ss.2tev477ruza0.png
-    link: https://masongsong.cn
-    name: 松松的一尺三分地
-    desc: 记录工作和学习中的所得
-    author: masongsong
-    avatar: https://fastly.jsdelivr.net/gh/MssText/learn@master/images/49203535.35emn5vryma0.png
-  - img: https://fastly.jsdelivr.net/gh/Kele-Bingtang/static/user/20211218235045.png
-    link: https://notes.youngkbt.cn/
-    name: Young Kbt Blog
-    desc: 记录学习Java, Web, 框架, 工具, 前端等相关知识, 记录生活和技术路程, 分享编程技巧。
-    author: Ship Liu
-    avatar: https://fastly.jsdelivr.net/gh/Kele-Bingtang/static/user/avatar2.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/123.57gcfayi85k0.webp
-    link: https://blog.dragon1573.wang/
-    name: 断桥烟雨の学习笔记
-    desc: 学习爱我，我爱学习～
-    author: べ断桥烟雨ミ
-    avatar: https://avatars.githubusercontent.com/u/49941141
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/blog-gitalk-comment@master/img/20220210094650.3q09d26tigc0.webp
-    link: https://chuck6.github.io/blog/
-    name: 梵一的博客
-    desc: 个人博客和知识分享
-    author: 梵一
-    avatar: https://chuck6.github.io/blog/img/paizhao.jpg
-  - img: https://fastly.jsdelivr.net/gh/niumoo/cdn-assets/2021/20220316145528.png
-    link: https://www.wdbyte.com
-    name: 未读代码
-    desc: Java 开发知识库，分享原创文章
-    author: 程序猿阿朗
-    avatar: https://avatars.githubusercontent.com/u/26371673?v=4
-  - img: https://fastly.jsdelivr.net/gh/simonzhangs/image-hosting@master/vue-plugin-example/blog.qg2buhe5h4g.webp
-    link: https://simonzhangs.github.io/
-    name: 松本松的博客儿
-    desc: Web前端技术博客，积跬步以至千里。
-    author: simonzhangs
-    avatar: https://fastly.jsdelivr.net/gh/simonzhangs/image-hosting@master/20220319/image.4x708q9wzse0.webp
-  - img: https://fastly.jsdelivr.net/gh/terwer/upload/img/image-20220422000045653.png
-    link: http://terwergreen.com
-    name: 远方的灯塔
-    desc: 专注于服务端技术分享
-    author: terwer
-    avatar: https://fastly.jsdelivr.net/gh/terwer/upload/img/photo.jpg
-  - img: https://fastly.jsdelivr.net/gh/nksuya/image_store@main/suyablog_home.5iou2ogjrm80.webp
-    link: https://suyaspace.com/
-    name: Suya's blog
-    desc: 个人博客，分享技术文章，学习笔记，植物相关知识等。
-    author: Suya
-    avatar: https://fastly.jsdelivr.net/gh/nksuya/image_store@master/tech/avatar.2tycyyc1ebr4.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store2@master/img/QQ20220526-224620@2x.44o82ibj9qq0.png
-    link: https://colorpanda.aifan.jp/
-    name: ColorPanda
-    desc: 日语中文英文学习网站
-    author: ColorPanda
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store2@master/img/image.3qr8m501tl20.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/blog-gitalk-comment@master/img/asdf.23jsekfejla8.jpeg
-    link: https://inannan423.github.io/
-    name: Zihanio
-    desc: Zihan的学习博客
-    author: Zihan
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/blog-gitalk-comment@master/img/xxx.67b3ygadagk0.jpeg
-  - img: https://user-images.githubusercontent.com/866409/175853573-28ded198-2348-4a82-8ddd-05088161e3fe.png
-    link: https://xingcxb.com
-    name: 不器小窝
-    desc: 但知行好事,莫要问前程
-    author: 不器
-    avatar: https://avatars.githubusercontent.com/u/866409?v=4
-  - img: https://cdn.staticaly.com/gh/xugaoyi/blog-gitalk-comment@master/img/QQ20220722-141037.22uk9ow7ary.png
-    link: https://eryajf.github.io/vdoing-template/
-    name: Vdoing主题博客模板
-    desc: Vdoing主题博客模板
-    author: eryajf
-    avatar: https://cdn.staticaly.com/gh/xugaoyi/blog-gitalk-comment@master/img/33259379.277tur21ir40.jpeg
-  - img: https://cdn.jsdelivr.net/gh/FireHH/github_img_repository/logo/微信截图_20220810164903.png
-    link: https://javaessay.cn/
-    name: Java essay
-    desc: Java散文知识库，Spring全家桶，SpringCloud全家桶，高可用高并发架构，面试等
-    author: Mr.Fire
-    avatar: https://cdn.jsdelivr.net/gh/FireHH/github_img_repository/logo/huge.jpg
-  - img: https://chendapeng.cn/images/about/blog_image.png
-    link: https://chendapeng.cn
-    name: 行百里er
-    desc: Java,个人技术博客,后端开发,技术架构,分布式技术,Spring Cloud Alibaba,Elasticsearch,Redis,算法,数据结构,Git
-    author: 行百里er
-    avatar: https://chendapeng.cn/images/about/avatar.png
-  - img: http://xyhwh-nav.cn/img/index.png
-    link: http://xyhwh-nav.cn
-    name: Captain
-    desc: 学习技术，Java基础、面试知识点、项目经验总结和一些学习笔记
-    author: Captain
-    avatar: http://xyhwh-nav.cn/img/logo.png
-  - img: https://xiaoxue-images.oss-cn-shenzhen.aliyuncs.com/blog/202212271108541.jpg
-    link: https://blog.xueqimiao.com/
-    name: 小薛博客
-    desc: 小薛博客，专注IT技术分享，助力人人成为架构师
-    author: xueqimiao
-    avatar: https://xiaoxue-images.oss-cn-shenzhen.aliyuncs.com/blog/202212271110209.png
-  - img: https://cdn.jsdelivr.net/gh/su-dd/cdn/博客/202301311644669.png
-    link: https://blog.addai.cn/
-    name: 呆呆的博客
-    desc: 个人博客
-    author: 呆呆
-    avatar: https://cdn.addai.cn/博客/网站使用/呆呆.webp
-  - img: https://raw.githubusercontent.com/jorgen-zhao/blog/master/images/snapshot.png
-    link: https://jorgen.website
-    name: Jorgen's blog
-    desc: 🚀个人知识库兼博客🚀
-    author: jorgen
-    avatar: https://jorgen.website/img/avatar.jpg
- ```
-:::
-
-## 知识库
-::: cardImgList 4
-```yaml
-config:
-    imgHeight: 150px
-
-data:
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200530114035.png
-    link: https://xugaoyi.github.io/vdoing-demo-repository/
-    name: 知识库演示
-    desc: Vdoing主题演示-知识库
-    author: Evan Xu
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200103123203.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20201219205536.jpg
-    link: https://wiki.router86.com/
-    name: X86软路由和NAS
-    desc: 记录X86软路由和NAS的一些知识
-    author: MonoLogueChi
-    avatar: https://blog.xxwhite.com/assets/img/avatar.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20201219205318.jpg
-    link: https://blog.northword.cn/dft-learning
-    name: 计算模拟学习笔记
-    desc: 《能源环境材料计算模拟方法》学习笔记，涉及密度泛函理论、第一性原理等和Materials Studio、VASP等的使用。
-    author: Northword
-    avatar: https://storage.live.com/items/28C1032A24A9C53B!25785?authkey=AHAx3GOYEKGqm8I
-  - img: https://singerwimg-1300001977.cos.accelerate.myqcloud.com/20211008/WccSrJ0s.png
-    link: https://repository.singerw.com
-    name: Singerw's Repository
-    desc: 技术的风花雪月之事，有个存档的地方，对于复盘，回忆，都是一个极好的方谭。
-    author: Singerw
-    avatar: https://singerwimg-1300001977.cos.accelerate.myqcloud.com/2021/09/20/76f29482ffc9b.png
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/QQ20220113-114927.5oha7j06c580.webp
-    link: https://hippox.cn
-    name: hippo4j
-    desc: 🔥 动态线程池框架，附带监控报警功能，轻量级的运维监控平台
-    author: Acmenlt
-    avatar: https://hippox.cn/img/web.png
-  - img: https://pics.landcover100.com/pics/624e63f4c82b8.png
-    link: https://www.gisrsdata.com
-    name: 地信遥感数据汇
-    desc: 解决目前地信遥感方向数据混杂，资源难以寻找的问题，构建一个地信遥感学习、讨论、交流的平台。
-    author: 锐多宝
-    avatar: https://pics.landcover100.com/pics/624e6469cbb8a.jpg
-  - img: https://img.de7v.com/img/site-pic.jpg
-    link: https://www.de7v.com
-    name: De7v
-    desc: 专注于安卓领域的技术传播
-    author: wresource
-    avatar: https://img.de7v.com/img/wresource.png
-  - img: https://cdn.staticaly.com/gh/xugaoyi/blog-gitalk-comment@master/img/11123.1aljpnjyr074.png
-    link: https://eryajf.github.io/HowToStartOpenSource/
-    name: HowToStartOpenSource
-    desc: GitHub开源项目维护协作指南
-    author: eryajf
-    avatar: https://cdn.staticaly.com/gh/xugaoyi/blog-gitalk-comment@master/img/33259379.277tur21ir40.jpeg
-```
-:::
-## 社区类
-:::cardImgList
-```yaml
-config:
-    imgHeight: 150px
-
-data:
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200921220111.png
-    link: https://course.yiwiz.com/
-    name: 奕维投资教程站
-    desc: 股票投资
-    author: 奕维
-    avatar: https://course.yiwiz.com/img/logo.png
-```
-:::
-
-## 博客类
-::: cardImgList
-```yaml
-config:
-    imgHeight: 150px
-
-data:
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200530114034.png
-    link: https://xugaoyi.github.io/vdoing-demo-blog/
-    name: Vdoing's blog
-    desc: Vdoing主题演示-博客
-    author: Evan Xu
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200103123203.jpg
-  - img: https://s4.ax1x.com/2022/02/25/bAjINF.png
-    link: https://fangweilong.github.io/
-    name: Teler的日常
-    desc: 好好学习，天天向上
-    author: Teler
-    avatar: https://s4.ax1x.com/2022/02/25/bAva8J.jpg
-  - img: https://user-images.githubusercontent.com/53399655/163007243-1b99b96b-cac3-49ca-9950-03a1e877a6d8.png
-    link: https://xustudyxu.github.io/
-    name: xustudyxu's Blog
-    desc: 一起学习编程!
-    author: xustudyxu
-    avatar: https://xustudyxu.github.io/img/01.png
-```
-:::
-
-## 文档类
-::: cardImgList 4
-```yaml
-config:
-    imgHeight: 150px
-
-data:
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200530114036.png
-    link: https://xugaoyi.github.io/vuepress-theme-vdoing-doc/
-    name: vdoing(本站)
-    desc: 🚀一款简洁高效的VuePress 知识管理&博客 主题
-    author: Evan Xu
-    avatar: https://fastly.jsdelivr.net/gh/xugaoyi/image_store/blog/20200103123203.jpg
-  - img: https://fastly.jsdelivr.net/gh/xugaoyi/image_store@master/blog/QQ20210925-124836@2x (1).6ogvf85maog0.png
-    link: https://justauth.plus/
-    name: JA Plus 开发者文档
-    desc: 一款开源的登录认证中间件
-    author: yadong,zhang
-    avatar: https://portrait.gitee.com/uploads/avatars/user/261/784199_yadong.zhang_1578932767.png!avatar200
-  - img: https://assets.imgradeone.com/docsdokimod-pv.png
-    link: https://docs.dokimod.cn
-    name: DokiMod 开发文档
-    desc: 为 DDLC Mod 开发提供的完善文档
-    author: imgradeone
-    avatar: https://docs.dokimod.cn/logo_128x128.png
-  # - img: http://yogoyun.oss-cn-beijing.aliyuncs.com/help/public/other/20200630125515.png
-  #   link: http://help.yogoyun.com/
-  #   name: 柚果云服务
-  #   desc: 智能商业应用程序服务商。
-  #   author: 柚果云服务
-  #   avatar: http://yogoyun.oss-cn-beijing.aliyuncs.com/admin/console/logo.png
-  - img: https://jeesite.com/docs/img/docs.png
-    link: http://docs.jeesite.com
-    name: JeeSite 在线文档
-    desc: JeeSite 快速开发平台 - 在线文档
-    author: ThinkGem
-    avatar: https://jeesite.com/docs/img/logo.png
-  - img: https://fastly.jsdelivr.net/gh/dreamncn/picBed@master/uPic/2022_05_12_20_40_04_1652359204_1652359204449_9mVkaR.png
-    link: https://cleanphp.ankio.net/
-    name: CleanPHP
-    desc: CleanPHP开发者文档
-    author: ankio
-    avatar: https://fastly.jsdelivr.net/gh/dreamncn/picBed@master/uPic/2022_04_04_19_48_51_1649072931_1649072931346_h4BGpQ.jpg
-  - img: https://cdn.staticaly.com/gh/xugaoyi/blog-gitalk-comment@master/img/28284d.56bkx9qvhc00.webp
-    link: https://jpom-docs.keepbx.cn/
-    name: Jpom
-    desc: 简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件
-    author: 不忘初心
-    avatar: https://jpom-docs.keepbx.cn/images/jpom_logo.png
-  - img: https://wumei.live/kerwincui/document/raw/branch/master/images/img.png
-    link: https://wumei.live/doc/
-    name: 物美智能
-    desc: 物美智能开源物联网平台，简单易用，可用于搭建物联网平台以及二次开发和学习。适用于智能家居、智慧办公、智慧社区、农业监测、水利监测、工业控制等。
-    author: 随遇而安 / kerwincui
-    avatar: https://portrait.gitee.com/uploads/avatars/user/611/1834441_kerwincui_1581523162.png!avatar200
-  - img: https://pic.imgdb.cn/item/637c92ef16f2c2beb11293c7.jpg
-    link: https://trace-recorder.xusc.cn
-    name: trace-recorder官网
-    desc: 简单的， 可伸缩的， 高性能的跟踪记录仪
-    author: 蔡旺
-    avatar: https://pic.imgdb.cn/item/637c933516f2c2beb112ed43.jpg
-```
-:::
-
-</br></br>
-
-## 申请加入案例
-
-::: tip 你想在这个页面展示你的站点吗？
-欢迎使用Vdoing主题的小伙伴到 [**这里**](https://github.com/xugaoyi/vuepress-theme-vdoing/issues/new?assignees=&labels=&template=+join_case.md) 留下你的站点信息，你的站点将有机会出现在这个页面里~
-:::

neutrino-proxy-vuepress/docs/04.案例/01.用户使用案例/01.企业登记.md

@@ -0,0 +1,21 @@
+---
+title: 企业登记案例
+date: 2020-05-14 11:39:45
+permalink: /pages/5d571c
+---
+
+## 企业登记
+如果您所在的企业使用到了中微子代理，麻烦抽出宝贵的时间[点击这里](https://gitee.com/dromara/neutrino-proxy/issues/I6WC71)进行登记，这将会助力中微子代理走得更远。
+
+## 案例展示
+|企业名称| logo                                                                                                       | 官网地址                     | 使用人数 |用途|
+|:-|:-----------------------------------------------------------------------------------------------------------|:-------------------------|:-----|:-|
+|北京吉威空间信息股份有限公司| ![logo](https://foruda.gitee.com/images/1681717113043198586/b7f0b6b3_8006959.png) | http://www.geoway.com.cn | 10   |开发环境的session会话同步与开发环境的对接测试华为云与微信等云端回调接口|
+|悦邻供应链科技有限公司|![logo](https://foruda.gitee.com/images/1684996781645413637/277d0b9b_5234431.png)| https://yinghecloud.com  | 10   |开发及生产环境内网服务器VPN搭建，本地开发服务端口调试|
+|阿依瓦（北京）技术有限公司|![logo](https://foruda.gitee.com/images/1684998300312143862/74a96cec_4788807.png)| https://www.alva.com.cn  | 50   |开发及生产环境内网服务器VPN搭建，本地开发服务端口调试,云端同步数据等|
+|常州裕景信息科技有限公司|![logo](https://foruda.gitee.com/images/1688542732735699110/bb238481_2342807.jpeg)| 无                        | 5    |远程管理虚拟机，接口、数据库等功能调试|
+|湖北楚商联盟金融信息服务有限公司|![logo](https://foruda.gitee.com/images/1675831034400302128/3621dd88_9993534.png)| http://www.chually.cn    | 10   |开发及生产环境内网服务器VPN搭建，本地开发服务端口调试,云端同步数据等|
+|中科元景智能（深圳）有限公司|![logo](https://foruda.gitee.com/images/1689584776864189267/d66c78a8_9373604.png)| https://yjupi.com        | 20   |本地开发连接测试环境及生产环境内网服务器，包含数据库、redis、模块服务等|
+|长沙小蜂科技有限公司|![logo](https://foruda.gitee.com/images/1692156755102754023/c7d82730_1207310.png)| 无                        | 1～3人 |主要用于测试环境内网服务器，包含数据库，远程桌面等|
+|江西六湛科技|![logo](https://foruda.gitee.com/images/1694073479398767455/0f7570a7_10166803.png)| http://www.liuzhankj.com | 12   |主要用于部署一些使用时长较短的项目|
+|杭州艾佳智能科技有限公司|![logo](https://foruda.gitee.com/images/1695608742879653626/314c72a4_5720492.png)| http://www.ajaiot.com    | 12-16人    |公司部分设备是通过udp通信的，对接调试设备，搭建测试环境服务网关的时候需要|

neutrino-proxy-vuepress/docs/05.更新记录/01.版本记录/98.2.x.md

@@ -0,0 +1,25 @@
+---
+title: 2.x
+date: 2023-10-26 17:43:43
+permalink: /pages/ff3519/
+---
+
+## 2.0.1
+- jdk版本升级为21
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
+- 升级须知：
+  - jdk版本升级为了jdk21，jar部署时请注意
+  - 涉及到表结构变更，执行[增量SQL](https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231215.SQL)
+
+## 2.0.0
+- solon版本升级为`2.5.11`
+- jdk版本升级为17
+- 支持原生编译改造
+- 默认支持的数据库由sqlite改为h2
+- 升级须知：
+  - jdk版本升级为了jdk17，jar部署时请注意
+  - 去掉了默认的sqlite数据库，改为了h2。如果之前使用sqlite，请自行处理数据迁移
+  - 配置文件做了较大调整，请参照官网使用须知中的`服务端配置`、`客户端配置`进行更新

neutrino-proxy-vuepress/docs/05.更新记录/01.版本记录/99.1.x.md

@@ -0,0 +1,72 @@
+---
+title: 1.x
+date: 2023-10-26 17:43:34
+permalink: /pages/dda8e5/
+---
+
+## 1.9.0
+- 端口映射支持UDP协议
+- 端口映射HTTP(S)新增打开网页按钮，优先使用域名打开
+- 新增/编辑端口映射时端口占用检测功能屏蔽，解决docker下使用的各种问题
+
+## 1.8.6
+- 端口映射选择端口支持分页
+- 新增/更新端口映射，增加端口占用检测（端口映射编辑时，如果端口号没有变动，则不验证。避免出现端口映射正在使用时，无法更新端口映射其他信息的问题）
+- 下拉搜索license，支持模糊搜索
+- license下拉用户搜索，支持模糊搜索
+- 端口映射HTTP(S)新增打开网页按钮
+- 客户端断开连接时，记录日志空指针异常问题修复
+
+## 1.8.5
+- 后台端口池管理支持批量删除
+- 端口映射下拉选择端口支持搜索
+- 客户端/服务端配置增加心跳日志开关，有需要时开启，方便排查问题
+- 客户端/服务端读写超时逻辑微调
+
+## 1.8.4
+- 增加对mariadb的支持
+- 服务端/客户端，支持配置文件、启动参数指定日志级别
+- 客户端支持配置文件指定重连间隔，是否开启无限重连
+
+## 1.8.3
+- 客户端重连优化
+- 服务端验证客户端身份逻辑优化
+
+## 1.8.2
+- 增加HTTPS的支持。
+
+## 1.8.0
+- 端口映射支持选择协议
+- HTTP协议下映射支持配置子域名（前提是server端配置了域名）
+
+## 1.7.1
+- 针对管理后台各页面的排序、搜索条件的优化
+- 增加端口池分组、相关的端口映射优化
+- 增加了报表管理模块：用户流量报表、license流量报表、用户流量月度明细、license流量月度明细
+- 完成首页图表展示：license统计、端口映射统计、今日流量统计、汇总流量统计、最近15日流量折线图
+
+## 1.7.0
+- 底层框架更换为Solon + MybatisPlus
+
+## 1.6.4
+- 支持代理服务端用户（删除/禁用）、端口池（删除/禁用/启用）、License（删除/禁用/启用）、端口映射（新增/删除/禁用/启用）实时生效
+- 启动参数优化
+- 服务端静态资源服务支持缓存、gzip压缩，提升响应速度
+
+## 1.6.0
+- 新增日志管理模块，调度日志迁移至日志管理
+- 管理后台新增登录日志
+- 新增首页流量统计
+
+## 1.5.0
+- 管理后台新增用户管理、License管理、端口映射、调度管理、客户端连接日志、调度日志
+- 支持默认sqlite数据库
+- 底层框架Aop、Banner、SqlMapper、Ioc、@Value注解、Yml配置加载、静态资源服务等优化
+- 底层框架新增@Async、@Singleton等注解
+- 新增AsgcCompiler、ApplicationEvent机制封装
+
+## 1.0.0
+> 第一个基本可用版本
+- 基于自研底层应用框架、Netty
+- 纯配置实现、无管理后台
+- 支持TCP代理

neutrino-proxy-vuepress/docs/05.更新记录/02.里程碑.md

@@ -0,0 +1,24 @@
+---
+title: 里程碑
+date: 2023-10-26 17:41:26
+permalink: /pages/e406dd/
+---
+- 2023-12-21 2.0.1版本发布，jdk版本升级到21，支持安全组(黑/白名单IP限制)、限速
+- 2023-10-31 2.0.0版本发布，升级jdk版本至jdk17、支持原生编译、去掉sqlite改为默认H2数据库
+- 2023-09-25 中微子代理Gitee Star数突破1000
+- 2023-09-22 1.9.0版本发布，端口映射支持UDP协议
+- 2023-09-07 1.8.6版本发布，后台若干细节优化
+- 2023-07-04 1.8.5版本发布，后台若干细节优化、配置文件优化
+- 2023-06-08 1.8.4版本发布，增加对mariadb的支持、配置文件支持指定日志级别、重连参数
+- 2023-06-03 1.8.3版本发布，客户端重连优化、服务端验证客户端身份逻辑优化
+- 2023-05-27 1.8.2版本发布，增加HTTPS支持
+- 2023-04-03 1.8.0版本发布，端口映射支持选择协议，HTTP映射支持子域名
+- 2023-03-26 1.7.1版本发布，新增端口池分组、新增报表管理模块、首页图表优化
+- 2023-03-12 1.7.0版本发布，底层框架更换为Solon + MybatisPlus
+- 2023-02-23 1.6.4版本发布，管理后台增、删、改、禁用实时生效，启动参数、GZip优化
+- 2023-01-16 加入Dromara组织
+- 2023-01-08 中微子代理Gitee Star突破100
+- 2022-11-23 1.6.0版本发布，新增日志管理模块，新增首页流量统计
+- 2022-10-12 1.5.0版本发布，底层框架优化，新增管理后台
+- 2022-06-16 1.0.0版本发布，基于自研应用框架、纯配置无管理后台
+

neutrino-proxy-vuepress/docs/05.最近更新/01.最近更新.md

@@ -1,39 +0,0 @@
----
-title: 最近更新
-date: 2020-05-25 12:01:52
-permalink: /pages/9cc27d
-# sidebar: false
-article: false
----
-
-# TODO
-
-### 1.x剩余规划
-- [ ] 参考鹊桥，增加对域名的支持
-- [ ] 官网上线
-
-####  Bug
-- windows环境下直接运行发布版的jar包，日志输出乱码
-- 代理mysql时，使用未开启远程访问的账号走代理访问mysql，代理客户端出现断开现象
-
-### 2.x规划
-- 插件开发
-    - [ ] neutrino-proxy-solon-plugin
-    - [ ] neutrino-proxy-jetbrains-plugin
-    - [ ] neutrino-proxy-starter (SpringBoot)
-- 基础优化
-    - [ ] 支持批量端口映射
-    - [ ] 代理协议规范化，方便后续更好扩展、支持不同语言客户端接入
-- 监控运维
-    - [ ] 监控服务端状态
-    - [ ] 支持调整服务端端口、证书
-    - [ ] 服务端版本、协议版本、客户端版本管理
-    - [ ] 服务端日志
-- client+计划启动
-    - [ ] 安卓客户端
-    - [ ] 基于electron-egg的多平台客户端
-
-### 3.x规划
-- [ ] 支持针对用户限速、限流
-- [ ] 支持P2P穿透
-- [ ] 支持原生编译

neutrino-proxy-vuepress/docs/05.最近更新/02.如何贡献.md

@@ -1,45 +0,0 @@
----
-title: 如何贡献
-date: 2023-03-29 12:55:44
-permalink: /pages/69a632/
----
-# 🎋代码分支说明
-- dev：常规开发分支，日常的开发、Bug修复、提交PR都在此分支
-- feature/xxx：特征分支，一些试验性开发、提交PR都在此分支，xxx可自行取一个有意义的名称
-- release/xxx：发行版分支，作为阶段性成果、重大更新的版本固化分支。受保护，不允许任何提交。
-- master：主分支，定期同步最新代码，目前仅支持本人(傲世孤尘/雨韵诗泽)提交。
-
-
-# ✊贡献的方式
-包括，但不限于以下形式：
-- 提交[issues](https://gitee.com/dromara/neutrino-proxy/issues)
-- 参与[issues](https://gitee.com/dromara/neutrino-proxy/issues)解决的必要性、解决方案的讨论、给出建设性的意见
-- 领取[issues](https://gitee.com/dromara/neutrino-proxy/issues) 并完成开发、提交PR
-- 为[本项目](https://gitee.com/dromara/neutrino-proxy)完善代码注释
-- 为[本项目](https://gitee.com/dromara/neutrino-proxy)增加测试代码
-- 为[本项目](https://gitee.com/dromara/neutrino-proxy)优化现有代码
-- 为[本项目](https://gitee.com/dromara/neutrino-proxy)优化操作体验
-- 通过公众号、博客、贴吧、论坛等形式分享/宣传中微子代理
-- 丰富项目文档，包括使用过程中踩过的坑、需要优化的点、具体问题的解决方法等
-
-# 🧬贡献代码的步骤
-- 在Gitee或者Github上fork项目到自己的repo，fork，一定要把项目fork一份。 
-- 把fork过去的项目也就是你的项目clone到你的本地
-- 同步feature/1.7.1最新代码
-- 修改代码
-- 开发完成后，不忙着提PR，再拉一遍最新代码，如果有冲突、解决冲突
-- commit后push到自己的库
-- 登录Gitee在你首页可以看到一个 pull request 按钮，点击它，填写一些说明信息，然后提交即可。
-- 等待维护者合并
-
-# 📐PR的规范
-> 你可能发现有的代码并不符合这个规范，但我们后续都会朝着这个方向迈进。后续我们会逐步全面规范化，请先保证新提交的代码满足以下要求：
-
-- 注释完备，尤其每个新增的方法应按照Java文档规范标明方法说明、参数说明、返回值说明等信息，必要时请添加单元测试，如果愿意，也可以加上你的大名。
-- 原则上，不允许自行添加第三方依赖库。若确有必要，请先和项目负责人沟通达成一致。
-- 对现有代码的优化，请在注释中说明原因。
-- 如果涉及到数据库的变更，则至少需要做到以下绩点：
-    - sqlite、mysql下均测试通过
-    - 在`./neutrino-proxy-server/src/main/resource/sql`下维护更新对应的表结构sql文件
-    - 对于新增的表，维护必要的初始化数据
-    - 在对应的mysql、sqlite的update目录下，维护SQL变更记录，确保SQL执行测试通过

neutrino-proxy-vuepress/docs/index.md

@@ -13,20 +13,20 @@ features: # 可选的
     details: 首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
   - title: 域名映射
     details: HTTP代理绑定子域名，开发调试三方回调更方便。
-  - title: 用户/License
+  - title: 管理后台
-    details: 支持多用户、多客户端使用。后台禁用实时生效。
+    details: 使用端口池统一管理对外代理端口，支持多用户、多客户端使用。端口/用户/License/端口映射在后台禁用实时生效。
-  - title: 端口池
+  - title: 安全组
-    details: 对外端口统一管理，支持用户、License独占端口。
+    details: 安全组模块支持黑/白名单IP访问限制。
-  - title: 端口映射
+  - title: 限速
-    details: 新增、编辑、删除、禁用实时生效。
+    details: 支持对License、端口映射限制上传、下载速率
   - title: Docker
-    details: 服务端支持Docker一键部署。
+    details: 服务端/客户端支持Docker一键部署。
   - title: 隧道SSL加密
     details: 隧道通信支持SSL，保护您的数据安全
-  - title: HTTPS
+  - title: 多种协议
-    details: 支持HTTPS
+    details: 支持TCP、HTTP、HTTPS、UDP
-  - title: 多客户端支持
+  - title: 原生部署
-    details: 暂未支持
+    details: 支持原生部署，更简单、性能更好的使用体验
 
 # 文章列表显示方式: detailed 默认，显示详细版文章列表（包括作者、分类、标签、摘要、分页等）| simple => 显示简约版文章列表（仅标题和日期）| none 不显示文章列表
 postList: none
@@ -137,7 +137,7 @@ postList: none
 或者加入我们的交流群：
 <div align="center">
     <img :src="$withBase('/img/qrcode/wxq.png')"  class="no-zoom" style="width:200px;margin: 10px;">
-    <p>中微子 微信群(添加我微信备注"进群")</p>
+    <p>中微子 微信群(添加我微信备注"中微子进群")</p>
 </div>
 <br/>
 
@@ -146,9 +146,13 @@ postList: none
 
 <div class="cardListContainer">
     <div class="card-list">
-        <a href="https://www.xigexb.com" target="_blank" class="card-item row-3" style="background-color:#102863;--random-color:#102863;color:#FFFFFF;">
+        <a href="https://www.xigexb.com?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#102863;--random-color:#102863;color:#FFFFFF;">
             <img src="img/sponsor/xigexiaobao.jpg" class="no-zoom"> 
-            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学</p></div>
+            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。</p></div>
+        </a>
+        <a href="https://7bu.top?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#c6ddff;--random-color:#c6ddff;color:#000000;">
+            <img src="img/sponsor/7bu.ico" class="no-zoom"> 
+            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。</p></div>
         </a>
     </div>
 </div>

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.5.11</version>
+        <version>2.7.0-M2</version>
         <relativePath />
     </parent>
 
@@ -20,17 +20,18 @@
         <module>neutrino-proxy-core</module>
         <module>neutrino-proxy-client</module>
         <module>neutrino-proxy-server</module>
+        <module>neutrino-proxy-client-sdk</module>
     </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <revision>1.1-SNAPSHOT</revision>
+        <revision>2.0.1</revision>
 
         <native.version>0.9.28</native.version>
 
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-flatten.version>1.1.0</maven-flatten.version>
     </properties>
@@ -76,7 +77,7 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.49</version>
+                <version>8.0.33</version>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
@@ -110,6 +111,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -121,8 +123,8 @@
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
+            <groupId>org.noear</groupId>
-            <artifactId>junit</artifactId>
+            <artifactId>solon-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -216,7 +218,7 @@
                     <plugin>
                         <groupId>org.noear</groupId>
                         <artifactId>solon-maven-plugin</artifactId>
-                        <version>${solon-maven-plugin.version}</version>
+                        <version>${solon.version}</version>
                         <executions>
                             <execution>
                                 <id>process-aot</id>

scripts/unix/admin_build_dev.sh

@@ -44,3 +44,9 @@ cp -rf ./neutrino-proxy-admin/dist $adminDeployDir/
 cp -rf ./neutrino-proxy-admin/dist/ $giteePagesDir
 cd $serverDeployDir
 zip -r neutrino-proxy-admin.zip "neutrino-proxy-admin/"
+
+#拷贝到neutrino-proxy-server项目静态资源目录下
+cd ../..
+rm -rf ./neutrino-proxy-server/src/main/resources/static
+mkdir -p neutrino-proxy-server/src/main/resources/static
+cp -rf ./neutrino-proxy-admin/dist/ ./neutrino-proxy-server/src/main/resources/static

scripts/unix/client_build.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 # 中微子代理客户端编译打包脚本，基础参数请自行修改
 
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
+#export JAVA_HOME=/Users/yangwen/my/service/jdk/jdk17/jdk-17.0.4.1.jdk/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
@@ -11,14 +12,20 @@ clientDeployDir=$deployDir"/client"
 #切到项目根目录
 cd ../..
 #初始化文件夹
-if [ ! -d "$deployDir" ];then
+mkdir -p $clientDeployDir
-  mkdir $deployDir
-fi
-if [ ! -d "$clientDeployDir" ];then
-  mkdir $clientDeployDir
-fi
 rm -rf $clientDeployDir/neutrino-proxy-client.jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
+
 #客户端打包
 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
+
+#打zip包，用于发版
+cd $clientDeployDir
+mkdir neutrino-proxy-client-jar
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
+cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml
+zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar

scripts/unix/client_docker_build.sh

@@ -1,29 +1,29 @@
 #!/bin/sh
 
 # 镜像版本，每次更新版本时需要调整
-ImageVer=1.8.5
+ImageVer=2.0.0
 ImageName=neutrino-proxy-client
-DockerFilePath=$PWD/../../neutrino-proxy-client/Dockerfile
+DockerFilePath=$PWD/../../neutrino-proxy-client
 
-deployDir=$PWD/../../"deploy"
+##初始化文件夹
-clientDeployDir=$deployDir"/client"
+#deployDir=$PWD/../../"deploy"
-
+#clientDeployDir=$deployDir"/client"
-#切到项目根目录
+#if [ ! -d "$deployDir" ];then
-#初始化文件夹
+#  mkdir $deployDir
-if [ ! -d "$deployDir" ];then
+#fi
-  mkdir $deployDir
+#if [ ! -d "$clientDeployDir" ];then
-fi
+#  mkdir $clientDeployDir
-if [ ! -d "$clientDeployDir" ];then
+#fi
-  mkdir $clientDeployDir
+#rm -rf $clientDeployDir/$ImageName.tar
-fi
-rm -rf $clientDeployDir/$ImageName.tar
 
 #echo '打包jar...'
-sh ./client_build.sh
+#sh ./client_build.sh
 
 # 删除老的本地镜像
 docker rmi -f $(docker images | grep $ImageName | awk '{print $3}')
 # 构建镜像
-docker build -t $ImageName:$ImageVer -t $ImageName:latest -f $DockerFilePath $PWD/../..
+docker build -t $ImageName:$ImageVer -t $ImageName:latest $DockerFilePath
 # 保存镜像到本地
-docker save -o $clientDeployDir/$ImageName.tar $ImageName:$ImageVer
+#docker save -o $clientDeployDir/$ImageName.tar $ImageName:$ImageVer
+
+# docker run -it -e LICENSE_KEY=b0a907332b474b25897c4dcb31fc7eb6 -e SERVER_IP=host.docker.internal --name np-client neutrino-proxy-client:2.0.0

scripts/unix/client_native_build.sh

@@ -1,12 +1,13 @@
 #!/bin/sh
 # 中微子代理客户端编译打包脚本，基础参数请自行修改
 
-export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
 deployDir="deploy"
 clientDeployDir=$deployDir"/client"
+machine=macos
 
 #切到项目根目录
 cd ../..
@@ -16,6 +17,10 @@ mkdir -p $clientDeployDir
 # 删除原来的编译文件
 rm -rf $clientDeployDir/neutrino-proxy-client.jar
 rm -rf $clientDeployDir/neutrino-proxy-client
+rm -rf $clientDeployDir/neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
+rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native
+rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native.zip
 
 #客户端打包
 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
@@ -23,7 +28,25 @@ cd neutrino-proxy-client
 mvn clean native:compile -P native -DskipTests
 cd ..
 
+# 给执行权限
+chmod +x ./neutrino-proxy-client/target/neutrino-proxy-client
+
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
 cp ./neutrino-proxy-client/target/neutrino-proxy-client $clientDeployDir/neutrino-proxy-client
 
+#打zip包，用于发版
+cd $clientDeployDir
+## jar
+mkdir neutrino-proxy-client-jar
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
+cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml
+zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
+rm -rf ./neutrino-proxy-client-jar
+
+## native
+mkdir neutrino-proxy-client-${machine}-native
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client ./neutrino-proxy-client-${machine}-native/neutrino-proxy-client
+cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-${machine}-native/app.yml
+zip -r neutrino-proxy-client-${machine}-native.zip ./neutrino-proxy-client-${machine}-native
+rm -rf ./neutrino-proxy-client-${machine}-native

scripts/unix/client_start.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # 中微子代理客户端启动脚本，基础参数请自行修改
 
-JAVA_OPS="-server -Xms256m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError  -XX:HeapDumpPath=/work/$NAME/heapError/"
+JAVA_OPS="-server -Xms256m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError  -XX:HeapDumpPath=/work/$NAME/heapError/"
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
 export PATH=:$PATH:$JAVA_HOME/bin
 export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
 mkdir -p /work/$NAME/heapError/

scripts/unix/server_build.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 # 中微子代理服务端编译打包脚本，基础参数请自行修改
 
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
+#export JAVA_HOME=/Users/yangwen/my/service/jdk/jdk17/jdk-17.0.4.1.jdk/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
@@ -11,15 +12,20 @@ serverDeployDir=$deployDir"/server"
 #切到项目根目录
 cd ../..
 #初始化文件夹
-if [ ! -d "$deployDir" ];then
+mkdir -p $serverDeployDir
-  mkdir $deployDir
-fi
-if [ ! -d "$serverDeployDir" ];then
-  mkdir $serverDeployDir
-fi
 rm -rf $serverDeployDir/neutrino-proxy-server.jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
 
 #服务端打包
 mvn clean install -U -pl neutrino-proxy-server -am -Dmaven.test.skip=true
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
+
+#打zip包，用于发版
+cd $serverDeployDir
+mkdir neutrino-proxy-server-jar
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
+cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml
+zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar

scripts/unix/server_docker_build.sh

@@ -1,17 +1,18 @@
 #!/bin/sh
 
 # 镜像版本，每次更新版本时需要调整
-ImageVer=1.0.0
+ImageVer=2.0.0
 ImageName=neutrino-proxy
-DockerFilePath=$PWD/../..
+DockerFilePath=$PWD/../../neutrino-proxy-server
 
-#echo '打包jar...'
-sh ./server_build.sh
 #echo '打包管理后台...'
 sh ./admin_build_docker.sh
+#echo '打包jar...'
+sh ./server_build.sh
 
 # 删除老的本地镜像
 docker rmi -f $(docker images | grep $ImageName | awk '{print $3}')
 # 构建镜像
 docker build -t $ImageName:$ImageVer -t $ImageName:latest $DockerFilePath
 
+# docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 --name np-server neutrino-proxy:2.0.0

scripts/unix/server_native_build.sh

@@ -1,12 +1,13 @@
 #!/bin/sh
 # 中微子代理服务端编译打包脚本，基础参数请自行修改
 
-export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
 deployDir="deploy"
 serverDeployDir=$deployDir"/server"
+machine=macos
 
 #切到项目根目录
 cd ../..
@@ -16,6 +17,10 @@ mkdir -p $serverDeployDir
 # 删除原来的编译文件
 rm -rf $serverDeployDir/neutrino-proxy-server.jar
 rm -rf $serverDeployDir/neutrino-proxy-server
+rm -rf $serverDeployDir/neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
+rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native
+rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
 
 # 不需要每次都重新编译一次前端代码，如果前端代码有变更，编译前需要手动执行`admin_build_docker.sh`
 ##前端页面打包
@@ -32,7 +37,25 @@ cd neutrino-proxy-server
 mvn clean native:compile -P native -DskipTests
 cd ..
 
+# 给执行权限
+chmod +x ./neutrino-proxy-server/target/neutrino-proxy-server
+
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
 cp ./neutrino-proxy-server/target/neutrino-proxy-server $serverDeployDir/neutrino-proxy-server
 
+#打zip包，用于发版
+cd $serverDeployDir
+## jar
+mkdir neutrino-proxy-server-jar
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
+cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml
+zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
+rm -rf ./neutrino-proxy-server-jar
+
+## native
+mkdir neutrino-proxy-server-${machine}-native
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server ./neutrino-proxy-server-${machine}-native/neutrino-proxy-server
+cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-${machine}-native/app.yml
+zip -r neutrino-proxy-server-${machine}-native.zip ./neutrino-proxy-server-${machine}-native
+rm -rf ./neutrino-proxy-server-${machine}-native

scripts/unix/server_start.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 # 中微子代理服务端启动脚本，基础参数请自行修改
 
-JAVA_OPS="-server -Xms256m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError  -XX:HeapDumpPath=/work/$NAME/heapError/"
+JAVA_OPS="-server -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError  -XX:HeapDumpPath=/work/$NAME/heapError/"
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
 export PATH=:$PATH:$JAVA_HOME/bin
 export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
 mkdir -p /work/$NAME/heapError/

scripts/unix/test1.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo 'hello'

todolist.MD

@@ -1,54 +1,21 @@
-# 1.x规划
-- Bug
-- 优化
-  - 添加端口映射时，验证端口是否被其他服务占用
-  - 拉下搜索license，支持模糊搜索
-  - license下拉用户搜索，支持模糊搜索
-- UDP支持
-- 官网文档完善
-  - HTTPS配置说明
-- 协议重构
-- 代码重构
-
-# 1.8.6
-- [x] 端口映射选择端口支持分页
-- [x] 新增/更新端口映射，增加端口占用检测
-- [x] 拉下搜索license，支持模糊搜索
-- [x] license下拉用户搜索，支持模糊搜索
-- [x] 端口映射编辑时，如果端口号没有变动，则不验证。避免出现端口映射正在使用时，无法更新端口映射其他信息的问题
-- [x] 端口映射HTTP(S)新增打开网页按钮
-- [x] 客户端断开连接时，记录日志空指针异常问题修复
-
-# 1.9.0
-- [x] 支持UDP
-  - 服务端
-    - 原`neutrino.proxy.server`配置移到`neutrino.proxy.server.tcp`下
-  - 客户端
-    - 原`neutrino.proxy.client`配置移到`neutrino.proxy.tunnel`下
-- [x] 端口映射HTTP(S)新增打开网页按钮，优先使用域名打开
-- [x] 新增/编辑端口映射时端口占用检测功能屏蔽，解决docker下使用的各种问题
-
-# 1.9.1
-- [ ] 如果UDP映射服务端端口变动，流量统计似乎不准，转发功能或许也受到影响，需要评估、测试、思考如何优化
-- [ ] 增加服务端/客户端jar式一键部署脚本
-- [ ] 排查解决问题：https://gitee.com/dromara/neutrino-proxy/issues/I7LGLB
-- [ ] 访问白名单
-- [ ] 端口映射分组
-
-# Bug
-- 指令通达被close的问题，org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelChannelHandler.channelInactive 
-- windows环境下直接运行发布版的jar包，日志输出乱码
-- 代理mysql时，使用未开启远程访问的账号走代理访问mysql，代理客户端出现断开现象
-- 客户端连接映射某个端口以后，如果在服务器端禁用了，没有立刻反映出来，要灯客户端重连以后才会屏蔽被禁用的端口。
-
 # 2.x规划
-- 插件开发
+- 思考
-  - [ ] neutrino-proxy-solon-plugin
+  - 流量编排
-  - [ ] neutrino-proxy-jetbrains-plugin
+  - 插件化定制
-  - [ ] neutrino-proxy-starter (SpringBoot)
+- 重构
+  - 代码重构
+    - 多租户支持
+    - 多个代理服务端节点支持
+  - 协议重构
+    - 支持多个隧道协议，支持扩展（TCP、KCP、QUIC）
+    - 支持不同语言客户端、服务端接入
 - 基础优化
+  - [ ] 访问白名单
+  - [ ] 端口映射分组
   - [ ] 支持批量端口映射
   - [ ] 代理协议规范化，方便后续更好扩展、支持不同语言客户端接入
+  - [ ] 如果UDP映射服务端端口变动，流量统计似乎不准，转发功能或许也受到影响，需要评估、测试、思考如何优化
+  - [ ] 排查解决问题：https://gitee.com/dromara/neutrino-proxy/issues/I7LGLB
 - 监控运维
   - [ ] 监控服务端状态
   - [ ] 支持调整服务端端口、证书
@@ -56,11 +23,14 @@
   - [ ] 服务端日志
   - [ ] 支持持管理后台动态调整日志级别。
   - [ ] 动态调整转发、报文、心跳输出
-- client+计划启动
-  - [ ] 安卓客户端
-  - [ ] 基于electron-egg的多平台客户端
 
 # 3.x规划
 - [ ] 支持针对用户限速、限流
 - [ ] 支持P2P穿透
-- [ ] 支持原生编译
+- 插件开发
+  - [ ] neutrino-proxy-solon-plugin
+  - [ ] neutrino-proxy-jetbrains-plugin
+  - [ ] neutrino-proxy-starter (SpringBoot)
+- client+计划启动
+  - [ ] 安卓客户端
+  - [ ] 基于electron-egg的多平台客户端

使用登记.MD

@@ -1,7 +0,0 @@
-以下为部分使用中机构/组织/个人：
-
----
-
-|单位/组织名称| 主营业务描述    |使用中微子的主要用途|
-|:----|:----------|:--------|
-|常州裕景信息科技有限公司| 高校数字化软件建设 |统筹管理个单位的服务器|