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

Merge pull request !60 from xgc/feature/sdk

.github/workflows/linux_mac_native.yml

@@ -30,7 +30,7 @@ jobs:
       run: |
         cd neutrino-proxy-admin
         npm install
-        npm run build:docker·
+        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
@@ -58,28 +58,42 @@ jobs:
         cd neutrino-proxy-server 
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
         chmod +x target/neutrino-proxy-server
-        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ env.VERSION }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.VERSION }}/app.yml
+        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.VERSION }}'
-        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.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
-        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.VERSION }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.VERSION }}/app.yml
+        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.VERSION }}'
-        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.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
@@ -88,7 +102,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          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

@@ -57,26 +57,43 @@ jobs:
         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
-        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server.exe
+        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.exe'
-        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.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
-        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client.exe
+        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.exe'
-        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.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
@@ -85,7 +102,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}.zip
-          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}.zip
+          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

@@ -60,3 +60,5 @@ logs
 data
 **/cert/**
 neutrino-proxy-server/src/main/resources/static/**
+
+client+/neutrino-proxy-client-chrome-plugin

Milestone.md

@@ -14,3 +14,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限制)、限速

README.md

@@ -91,6 +91,9 @@
 <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

@@ -75,6 +75,13 @@
 
 ## 2.0.1
 - jdk版本升级为21
-- 解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
 - 新增安全组模块，支持黑名单、白名单限制
 - 支持对用户、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/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/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/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

@@ -74,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>

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

@@ -114,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>

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

@@ -80,7 +80,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,7 +176,7 @@
 
       <div class="pagination-container">
         <el-pagination background @size-change="handlePortMappingSizeChange" @current-change="handlePortMappingCurrentChange"
-          :current-pageInfo.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
+          :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>

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

@@ -81,7 +81,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>

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 = (s != null) ? s.getThreadGroup() :
-			Thread.currentThread().getThreadGroup();
+		group = 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.util.UdpChannelBindInfo;
+import org.dromara.neutrinoproxy.client.sdk.constant.Constants;
+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 ProxyConfig proxyConfig;
+	private final 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);
-        Integer code = load.get("code").getInt();
+        JSONObject load = JSONUtil.parseObj(info);
+        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.ExceptionEnum;
-import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
-import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
+import org.dromara.neutrinoproxy.core.*;
 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());
-        Integer code = load.get("code").getInt();
+        JSONObject load = JSONUtil.parseObj(proxyMessage.getInfo());
+        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.core.ProxyChannelBorrowListener;
-import org.dromara.neutrinoproxy.client.util.ProxyUtil;
+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;
-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;
-    @Inject("udpProxyTunnelBootstrap")
-    private Bootstrap udpProxyTunnelBootstrap;
+
+    private final ProxyConfig proxyConfig;
+    private final 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.constant.Constants;
-import org.dromara.neutrinoproxy.client.core.CustomThreadFactory;
+import org.dromara.neutrinoproxy.client.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.sdk.constant.Constants;
+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/pom.xml

@@ -16,13 +16,18 @@
     <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>

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 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.client.sdk.handler.ProxyMessageFactory;
 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.bean.LifecycleBean;
-
-import java.net.InetSocketAddress;
-import java.util.List;
+import org.noear.solon.core.runtime.NativeDetector;
 
 /**
  * 代理配置
@@ -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 {
-        List<ProxyMessageHandler> list = Solon.context().getBeansOfType(ProxyMessageHandler.class);
-        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);
+    public void stop() {
+        Solon.stop();
     }
 
-    @Bean("tunnelWorkGroup")
-    public NioEventLoopGroup tunnelWorkGroup(@Inject ProxyConfig proxyConfig) {
-        return new NioEventLoopGroup(proxyConfig.getTunnel().getThreadCount());
-    }
-
-    @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;
+    @Override
+    public boolean isAotRuntime() {
+        return NativeDetector.isAotRuntime();
     }
 
     @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 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 cn.hutool.core.bean.BeanUtil;
 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 {
-	@Inject
-	private ProxyConfig proxyConfig;
-	@Inject("cmdTunnelBootstrap")
-	private Bootstrap cmdTunnelBootstrap;
-	@Inject("udpServerBootstrap")
-	private Bootstrap udpServerBootstrap;
-	private volatile Channel channel;
-	/**
-	 * 重连次数
-	 */
-	private volatile int reconnectCount = 0;
-	/**
-	 * 重连服务执行器
-	 */
-	private static final ScheduledExecutorService reconnectExecutor = Executors.newSingleThreadScheduledExecutor(new CustomThreadFactory("ClientReconnect"));
-
+public class ProxyClientService{
+    @Inject
+    private ProxyConfiguration proxyConfiguration;
+    @Inject
+    private SolonProxyConfig solonProxyConfig;
 	@Init
 	public void init() {
-		this.reconnectExecutor.scheduleWithFixedDelay(this::reconnect, 10, proxyConfig.getTunnel().getReconnection().getIntervalSeconds(), TimeUnit.SECONDS);
-
-		try {
-			this.start();
-			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);
-		}
+        log.info("start....");
+        ProxyConfig proxyConfig = BeanUtil.toBean(solonProxyConfig, ProxyConfig.class);
+        proxyConfiguration.start(proxyConfig);
+        log.info("start success!");
 	}
 }

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

@@ -11,13 +11,13 @@ neutrino:
       key-store-password: 123456
       jks-path: classpath:/test.jks
       # 服务端IP
-      server-ip: localhost
+      server-ip: ${SERVER_IP:localhost}
       # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
-      server-port: 9002
+      server-port: ${SERVER_PORT:9002}
       # 是否启用SSL(注意：该配置必须和server-port对应上)
-      ssl-enable: true
+      ssl-enable: ${SSL_ENABLE:true}
       # 客户端连接唯一凭证
-      license-key:
+      license-key: ${LICENSE_KEY:}
       # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
       client-id:
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)

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

@@ -38,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/src/main/java/org/dromara/neutrinoproxy/core/Constants.java

@@ -50,6 +50,8 @@ public interface Constants {
     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");
 

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

@@ -2,10 +2,12 @@ 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) {
@@ -27,7 +29,8 @@ public class IpUtil extends org.noear.solon.core.util.IpUtil {
         if (StringUtils.isEmpty(ip)) {
             ip = HttpUtil.getHeaderValue(httpContent, "X-Real-IP");
         }
-        if (StringUtils.isNotEmpty(ip) && !Ipv4Util.isInnerIP(ip)) {
+        if (StringUtils.isNotEmpty(ip)) {
+            log.debug("obtain http header ip：{}", ip);
             return ip;
         }
         return null;

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

@@ -1,5 +1,6 @@
 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;
@@ -46,7 +47,10 @@ 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);
@@ -75,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/proxy/security/HttpVisitorSecurityChannelHandler.java

@@ -39,47 +39,52 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap
         }
 
         ByteBuf buf = (ByteBuf) msg;
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.readBytes(bytes);
 
-        // 获取Host请求头
-        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
-        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
         if (null == serverPort) {
-            ctx.channel().close();
-            return;
-        }
+            // 获取Host请求头
+            byte[] bytes = new byte[buf.readableBytes()];
+            buf.readBytes(bytes);
+            String httpContent = new String(bytes);
+            String host = HttpUtil.getHostIgnorePort(httpContent);
 
-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        String ip = IpUtil.getRealRemoteIp(httpContent);
-        if (ip == null) {
-            ip = IpUtil.getRemoteIp(ctx);
-        }
-        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
+            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);
         }
 
         // 继续传播
-        ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
         buf.resetReaderIndex();
         ctx.fireChannelRead(buf);
     }

neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java

@@ -1,19 +0,0 @@
-package org.dromara.neutrinoproxy.server;
-
-import org.dromara.neutrinoproxy.core.util.NeutrinoProxyVersion;
-import org.dromara.neutrinoproxy.server.app.AppBaseTest;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:51
- */
-public class VersionTest extends AppBaseTest {
-
-    @Test
-    public void testVersion() {
-        Assert.assertNotNull(NeutrinoProxyVersion.getVersion());
-        System.out.println("version: " + NeutrinoProxyVersion.getVersion());
-    }
-}

neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java

@@ -1,15 +0,0 @@
-package org.dromara.neutrinoproxy.server.app;
-
-import org.dromara.neutrinoproxy.server.ProxyServer;
-import org.junit.runner.RunWith;
-import org.noear.solon.test.SolonJUnit4ClassRunner;
-import org.noear.solon.test.SolonTest;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:56
- */
-@SolonTest(value = ProxyServer.class, properties = "server.port=18888")
-@RunWith(SolonJUnit4ClassRunner.class)
-public class AppBaseTest {
-}

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

@@ -6,13 +6,7 @@ article: false
 ---
 
 ::: tip
-当前最新版本为2.0.0，如果从之前的版本升级而来，请注意以下变更
-
-1、jdk版本升级为了jdk17，jar部署时请注意
-
-2、去掉了默认的sqlite数据库，改为了h2。如果之前使用sqlite，请自行处理数据迁移
-
-3、配置文件做了较大调整，请参照使用须知中的`服务端配置`、`客户端配置`进行更新
+当前最新版本：2.0.1。从之前的版本升级过来，请参照：更新记录 > 版本记录
 :::
 
 ## 1、快速上手须知

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

@@ -5,13 +5,13 @@ permalink: /pages/eebea1/
 ---
 
 ## 1、环境准备
-- 首先确保已安装Java17运行环境
-- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jar.zip`、`neutrino-proxy-client-jar.zip`
+- 首先确保已安装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-jar.zip`上传至服务器部署目录,并解压
+- 将`neutrino-proxy-server-jdk21-2.0.1-jar.zip`上传至服务器部署目录,并解压
 - 执行命令`java -Dfile.encoding=utf-8 -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用h2数据库。
 - 若需要指定自己的mysql数据库，则需要在当前目录下的`app.yml`文件中，修改数据库配置如下：
 
@@ -32,7 +32,7 @@ neutrino:
 - 可参照 https://gitee.com/dromara/neutrino-proxy/blob/master/scripts/unix/server_start.sh 使用shell脚本启动服务端。
 
 ## 3、部署客户端
-- 本地解压`neutrino-proxy-client-jar.zip`文件
+- 本地解压`neutrino-proxy-client-jdk21-2.0.1-jar.zip`文件
 - 修改`app.yml`文件中的server-ip为服务器公网ip，并配置license-key，以下是相关的部分配置：
 ```yml
 neutrino:

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

@@ -18,7 +18,7 @@ permalink: /pages/69699a/
 
 ## 1、安装包下载
 - 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载所需的最新的release包：
-- 比如服务器为linux则可下载`neutrino-proxy-server-ubuntu-20.04-native.zip`文件，客户端为windows则可下载`neutrino-proxy-client-windows-2022-native.zip`
+- 比如服务器为linux则可下载`neutrino-proxy-server-linux-2.0.1-native.zip`文件，客户端为windows则可下载`neutrino-proxy-client-windows-2.0.1-native.zip`
 
 ## 2、部署服务端
 - 将服务端安装包上传至服务器，并解压

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/03.支持我们/01.个人赞赏.md

@@ -11,9 +11,9 @@ permalink: /pages/1ab20b/
 |:-----|:-----|:----------------------|
 | 任意金额 | -    | 您将获得赞助者列表的永久留名。       |
 | 30   | 一个月  | 您在群内反馈的问题将优先得到作者响应    |
-| 80   | 三个月  | 获得微信一对一的咨询服务          |
-| 180  | 三个月  | 获得官网首页特别赞助席位一个，一次远程协助 |
-| 更多金额 |-| 您将获得私人定制服务            |
+| 120  | 三个月  | 获得微信一对一的咨询服务          |
+| 399  | 六个月  | 获得官网首页特别赞助席位一个，一次远程协助 |
+| 更多金额 | -    | 您将获得私人定制服务            |
 
 > 注意1：服务项目是逐级叠加：如，您赞赏的金额是 80 员那么您将享受：任意金额、一个月、三个月的服务内容
 

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

@@ -6,6 +6,15 @@ permalink: /pages/cded59/
 
 | 日期         | 渠道 | 金额   |昵称| 备注               |
 |:-----------|:---|:-----|:-|:-----------------|
+|2023-12-28|微信红包|50|雪猫|请大佬吃肯德基|
+|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||

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

@@ -4,6 +4,16 @@ 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

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

@@ -3,7 +3,7 @@ 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协议

neutrino-proxy-vuepress/docs/index.md

@@ -13,12 +13,12 @@ features: # 可选的
     details: 首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
   - title: 域名映射
     details: HTTP代理绑定子域名，开发调试三方回调更方便。
-  - title: 用户/License
-    details: 支持多用户、多客户端使用。后台禁用实时生效。
-  - title: 端口池
-    details: 对外端口统一管理，支持用户、License独占端口。
-  - title: 端口映射
-    details: 新增、编辑、删除、禁用实时生效。
+  - title: 管理后台
+    details: 使用端口池统一管理对外代理端口，支持多用户、多客户端使用。端口/用户/License/端口映射在后台禁用实时生效。
+  - title: 安全组
+    details: 安全组模块支持黑/白名单IP访问限制。
+  - title: 限速
+    details: 支持对License、端口映射限制上传、下载速率
   - title: Docker
     details: 服务端/客户端支持Docker一键部署。
   - title: 隧道SSL加密

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.5.12</version>
+        <version>2.7.0-M2</version>
         <relativePath />
     </parent>
 
@@ -20,13 +20,14 @@
         <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>2.0.1-SNAPSHOT</revision>
+        <revision>2.0.1</revision>
 
         <native.version>0.9.28</native.version>