升级版本为2.0.3

Merge pull request !66 from 晚安,地球/master-fix-License流量报表SQL报错

.github/workflows/linux_mac_native.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
         # os: ['ubuntu-20.04', 'macos-12']
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-latest']
     name: build - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
@@ -39,7 +39,7 @@ jobs:
         distribution: 'graalvm' # New 'distribution' option
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -84,7 +84,7 @@ jobs:
         filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
     # 上传构建产物
     - name: Upload artifact
-      uses: actions/upload-artifact@v3.0.0
+      uses: actions/upload-artifact@v4.3.1
       with:
         name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
         path: |

.github/workflows/windows-native.yml

@@ -38,7 +38,7 @@ jobs:
         distribution: 'graalvm' # New 'distribution' option
         github-token: ${{ secrets.GITHUB_TOKEN }}
     - name: Cache local Maven repository
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -69,7 +69,6 @@ jobs:
     - 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
@@ -84,7 +83,7 @@ jobs:
         filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
     # 上传构建产物
     - name: Upload artifact
-      uses: actions/upload-artifact@v3.0.0
+      uses: actions/upload-artifact@v4.3.1
       with:
         name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
         path: |

.gitignore

@@ -54,11 +54,10 @@ hs_err_pid*
 
 **/memo/**
 
+neutrino-proxy-vuepress/deploy
 neutrino-proxy-vuepress/deploy.sh
 .NEUTRINO_PROXY_CLIENT_ID
 logs
 data
 **/cert/**
 neutrino-proxy-server/src/main/resources/static/**
-
-client+/neutrino-proxy-client-chrome-plugin

.workflow/pipeline-docs-build.yml

@@ -0,0 +1,74 @@
+version: '1.0'
+name: pipeline-docs-build
+displayName: 官网静态资源构建
+triggers:
+  trigger: auto
+  push:
+    branches:
+      precise:
+        - master
+    paths:
+      include:
+        - neutrino-proxy-vuepress.*
+variables:
+  global:
+    - git_token
+    - username
+  commit_name: aoshiguchen
+  commit_email: [email protected]
+  repo_url: https://gitee.com/dromara/neutrino-proxy.git
+  target_branch: site
+stages:
+  - name: stage-build
+    displayName: 构建
+    strategy: naturally
+    trigger: auto
+    executor:
+      - asgc
+    steps:
+      - step: build@nodejs
+        name: build_nodejs
+        displayName: Nodejs 构建
+        nodeVersion: 14.16.0
+        commands:
+          - '# 切换到工作目录'
+          - ''
+          - cd ./neutrino-proxy-vuepress
+          - '# 设置NPM源，提升安装速度'
+          - npm config set registry https://registry.npmmirror.com
+          - ''
+          - '# 执行编译命令'
+          - npm install && npm run build
+          - ''
+          - '# 初始化git仓库'
+          - cd docs/.vuepress/dist
+          - git init
+          - ''
+          - '# 设置Git信息'
+          - GIT_REPO_URL=$repo_url
+          - GIT_USERNAME=$username
+          - GIT_NAME=$commit_name
+          - GIT_EMAIL=$commit_email
+          - GIT_TOKEN=$git_token
+          - echo "https://${GIT_USERNAME}:${GIT_TOKEN}@${GIT_REPO_URL#https://}" > ~/.git-credentials
+          - git config --global credential.helper store
+          - git remote add origin ${GIT_REPO_URL}
+          - git config user.name ${GIT_NAME}
+          - git config user.email ${GIT_EMAIL}
+          - ''
+          - '# 将构建产物推送到目标分支'
+          - git add -A
+          - '# git commit -m $GITEE_COMMIT_MESSAGE'
+          - git commit -m "update"
+          - git checkout -b $target_branch
+          - git push -f origin $target_branch
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ./neutrino-proxy-vuepress/docs/.vuepress/dist
+        caches:
+          - ~/.npm
+          - ~/.yarn
+        notify: []
+        strategy:
+          retry: '0'

README.md

@@ -4,8 +4,8 @@
 <p align="center">
   <a href='https://gitee.com/dromara/neutrino-proxy/stargazers'><img src='https://gitee.com/dromara/neutrino-proxy/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/dromara/neutrino-proxy/members'><img src='https://gitee.com/dromara/neutrino-proxy/badge/fork.svg?theme=dark' alt='fork'></img></a>
-<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk17-downloads.html">
-    <img src="https://img.shields.io/badge/JDK-17+-red.svg" />
+<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk21-downloads.html">
+    <img src="https://img.shields.io/badge/JDK-21+-red.svg" />
 </a>
 <a href="./LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-red" alt="license MIT">
@@ -17,8 +17,7 @@
 - 技术栈：Solon、MybatisPlus、Netty
 - 遵循MIT许可，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
 - 官网地址1：https://neutrino-proxy.dromara.org
-- 官网地址2：https://dromara.gitee.io/neutrino-proxy
-- 快速上手请[点击这里](https://dromara.gitee.io/neutrino-proxy/pages/793dcb)
+- 快速上手请[点击这里](https://neutrino-proxy.dromara.org/neutrino-proxy/pages/793dcb/)
 
 # 2、名称由来
 中微子，是轻子的一种，是组成自然界的最基本的粒子之一。它十分微小、不带电，可自由穿过地球，以接近光速运动，与其他物质的相互作用十分微弱，号称宇宙间的“隐身人”。
@@ -27,21 +26,30 @@
 
 因此以中微子命名，寓意着中微子代理拥有中微子"安全"、"快速"、"穿透力强"的特点。
 
-# 3、运行示例
+# 3、部署方式
+- 1、[使用宝塔面板](https://neutrino-proxy.dromara.org/pages/9e0fde/)
+- 2、[使用jar文件](https://neutrino-proxy.dromara.org/pages/eebea1/)
+- 3、[使用Docker](https://neutrino-proxy.dromara.org/pages/5b9bef/)
+- 4、[原生部署](https://neutrino-proxy.dromara.org/pages/69699a/)
+- 5、[使用Docker-Compose](https://neutrino-proxy.dromara.org/pages/2d4123/)
+
+# 4、运行示例
 ![首页](assets/run-example/home.png)
 ![用户管理](assets/run-example/user-manager1.png)
 ![端口池管理](assets/run-example/port-pool1.png)
 ![License管理](assets/run-example/license1.png)
 ![端口映射管理](assets/run-example/port-mapping1.png)
 
-# 4、代理示意图
+# 5、代理示意图
 ![代理流程](assets/design/neutrino-proxy-process.jpg)
 
-# 5、联系我们
+# 6、联系我们
 - 微信: yuyunshize
+- GitCode：https://gitcode.com/dromara/neutrino-proxy
 - Gitee: https://gitee.com/asgc/neutrino-proxy
+- Github仓库：https://github.com/dromara/neutrino-proxy
 
-# 6、贡献者列表
+# 7、贡献者列表
 <p>
 <a href="https://gitee.com/zcans" target="_blank">
 <img src="assets/developer/zcans.png" width="11%">
@@ -91,8 +99,8 @@
 <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 href="https://gitee.com/miracrl" target="_blank">
+<img src="assets/developer/miracrl.png" width="11%">
 </a>
 </p>
 

VLog.md

@@ -81,7 +81,16 @@
 - 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
 
 ## 2.0.2
-- 升级solon版本到2.7.0-M2，解决不在当前目录下启动时找不到配置文件的问题
-- client抽出sdk（还需测试windows原生部署、进一步抽出neutrino-proxy-sdk）
-- 修复管理后台分页查询的已知问题
-- 修复native下，批量删除端口池报错的问题
+- 部分细节优化
+    - 解决客户端docker方式部署环境变量指定参数不生效的问题
+    - 服务端解决服务端native下，清理日志定时任务报错的问题
+    - 解决后台分页查询的已知问题
+    - 端口映射中的客户端ip字段加长，解决配置阿里云数据库域名字段不够的问题
+- 管理后台新增域名管理
+    - [x] 支持设置一个默认域名
+    - [x] 删除、修改、禁用实时生效
+    - [x] 支持维护https证书
+- 端口映射支持支持绑定多个子域名
+    - 选择择不同的主域名、子域名变更实时生效
+## 2.0.3
+- 解决http请求拆包情况下域名映射失效的问题

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

@@ -1,16 +0,0 @@
-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

@@ -1,211 +0,0 @@
-<?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

@@ -1,19 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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

@@ -1,42 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,71 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,63 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,139 +0,0 @@
-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

@@ -1,122 +0,0 @@
-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();
-            }
-        }
-    }
-}

docs/article/2024/01/index.md

@@ -0,0 +1,81 @@
+# NeutrinoProxy2.0.2发布，端口映射支持绑定多个域名
+
+## 项目简介
+- [中微子代理(neutrino-proxy)](https://gitee.com/dromara/neutrino-proxy) 是一款基于Solon、Netty的内网穿透神器。该项目采用最为宽松的MIT协议，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
+- 市面上基于内网穿透的常见产品有：花生壳、TeamView、cpolar等。
+- 常见的使用场景：
+    - 本地开发调试第三方回调
+    - 本地开发异地接口连调
+    - 远程登录内网windows机器
+    - 将本地服务映射到外网，用于演示
+- GitCode：https://gitcode.com/dromara/neutrino-proxy
+- Gitee仓库：https://gitee.com/dromara/neutrino-proxy
+- Github仓库：https://github.com/dromara/neutrino-proxy
+- 官网地址: https://neutrino-proxy.dromara.org
+
+## 主要特点：
+- 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协议，免去你的后顾之忧
+
+## 本次更新内容
+- bug修复
+  - 解决安全组在ipv6场景下误拦截导致域名映射访问不通的问题
+  - 解决native编译后，端口池批量删除报错的问题
+  - 解决客户端docker方式部署环境变量指定参数不生效的问题
+  - 服务端解决native下清理日志定时任务报错的问题
+  - 解决后台分页查询的已知问题
+  - 端口映射中的客户端ip字段加长一点，解决配置阿里云数据库域名字段不够的问题
+  - 解决服务端native部署时，访问后台用户列表，日志警告“you should use: nativeMetadata.registerField(field) at aot runtime”的问题
+- 新增功能
+  - 新增后台域名管理，⽀持新增、修改、删除、禁⽤主域名，支持添加多级域名。
+  - 域名管理支持上传域名对应的SSL证书、⽀持设置强制HTTPS、⽀持域名映射⾃动加载对应的服务器证书。
+  - 端口映射支持选择切换不同的主域名，⽀持绑定多个⼦域名，单个端⼝⽀持绑定多个不同的主域名。
+
+## 安装使用说明
+- 快速上手：https://neutrino-proxy.dromara.org/neutrino-proxy/pages/793dcb/
+- 支持的部署方式
+  - 1、jar
+  - 2、docker
+  - 3、native
+    - windows
+    - linux
+    - mac
+  - 4、docker-compose
+- 升级须知： 
+  - **域名和SSL证书的配置由配置文件配置改为后台域名管理页面配置。**
+  - 去掉了配置文件声明服务器端域名和证书的方式，改为通过页面进行管理，请注意自行进行数据迁移。
+  - 数据库新增`域名表`和`域名映射中间表`，修改了`端口映射表`，涉及到表结构变更，执行[增量SQL](https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20240808.SQL)
+
+## 运行示例
+#### License限速
+<img src="./license2.png" width="100%"/>
+
+#### 端口映射限速
+<img src="./port-mapping2.png" width="100%"/>
+
+#### 端口映射绑定多个域名
+<img src="./port-mapping3.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%"/>

docs/如何贡献.MD

@@ -31,7 +31,7 @@
 - 原则上，不允许自行添加第三方依赖库。若确有必要，请先和项目负责人沟通达成一致。
 - 对现有代码的优化，请在注释中说明原因。
 - 如果涉及到数据库的变更，则至少需要做到以下绩点：
-    - sqlite、mysql下均测试通过
+    - h2、mysql下均测试通过
     - 在`./neutrino-proxy-server/src/main/resource/sql`下维护更新对应的表结构sql文件
     - 对于新增的表，维护必要的初始化数据
-    - 在对应的mysql、sqlite的update目录下，维护SQL变更记录，确保SQL执行测试通过
+    - 在对应的mysql、h2的update目录下，维护SQL变更记录，确保SQL执行测试通过

docs/快速使用.MD

@@ -37,7 +37,7 @@ registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:1.7.1
 - 在服务器上新建部署目录：`/work/projects/neutrino-proxy-server`
 - 将` neutrino-proxy-server.jar`、`neutrino-proxy-admin.zip`上传至服务器部署目录。
 - 解压`neutrino-proxy-admin.zip`文件
-- 执行命令`java -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用sqlite数据库。
+- 执行命令`java -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用h2数据库。
 - 若需要指定自己的mysql数据库，同样的需要在当前目录下新建`app.yml`文件，文件内容同上。执行命令`java -jar neutrino-proxy-server.jar config=app.yml`启动服务端完成部署
 - 可参照 https://gitee.com/dromara/neutrino-proxy/blob/master/bin/server_start.sh 使用shell脚本启动服务端。
 

docs/管理后台使用指南.MD

@@ -8,6 +8,7 @@
 # 代理配置
 - License管理：License是客户端连接服务端的唯一合法凭证。一个License同时只能被一个客户端使用，一个License可以维护多条端口映射
 - 端口映射：服务端IP+端口 -> 客户端IP+端口的四元组映射(因目前服务端单节点只有一个公网IP，所以不体现出来)，是内网穿透的基本单元。
+- 域名管理：用于统一管理服务器主域名和证书，支持多域名。
 
 # 系统管理
 - 用户管理：支持多用户，一个用户可持有多个License。由于项目目前主推个人版，所以暂是没有权限这一套，管理员之外的所有用户都属于游客。对于绝大多数操作，游客仅有只读权限。

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

@@ -7,3 +7,69 @@ export function domainNameBindInfo(query) {
     params: query
   })
 }
+export function fetchList(query) {
+  return request({
+    url: '/domain/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function fetchAvailableDomainList(query) {
+  return request({
+    url: '/domain/all',
+    method: 'get',
+    params: query
+  })
+}
+
+export function updateEnableStatus(id, enable, domain) {
+  return request({
+    url: '/domain/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable,
+      domain: domain,
+    }
+  })
+}
+
+export function createDomain(data) {
+  return request({
+    url: '/domain/create',
+    method: 'post',
+    data
+  })
+}
+
+export function updateDomain(data) {
+  return request({
+    url: '/domain/update',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteDomain(id) {
+  return request({
+    url: '/domain/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
+
+export function updateDefaultStatus(id, isDefault) {
+  return request({
+    url: '/domain/update/default-status',
+    method: 'post',
+    data: {
+      id: id,
+      isDefault: isDefault
+    }
+  })
+}
+
+

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

@@ -55,6 +55,7 @@ export default {
     proxy: '代理配置',
     license: 'License管理',
     portMapping: '端口映射',
+    domainManagement: '域名管理',
     jobManager: '调度管理',
     jobLog: '调度日志',
     log: '日志管理',
@@ -128,6 +129,7 @@ export default {
     deleteBatch: '批量删除',
     cancel: '取 消',
     confirm: '确 定',
+    domain: '域名',
     userId: '用户ID',
     userName: '用户名',
     name: '名称',

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

@@ -61,7 +61,8 @@ export const asyncRouterMap = [
     },
     children: [
       { path: 'license', component: _import('proxy/license'), name: 'license', meta: { title: 'license' }},
-      { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }}
+      { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }},
+      { path: 'domainManagement', component: _import('proxy/domain'), name: 'domainManagement', meta: { title: 'domainManagement' }}
     ]
   },
   {
@@ -78,7 +79,7 @@ export const asyncRouterMap = [
       { path: 'portGroup', component: _import('system/portGroup'), name: 'portGroup', meta: { title: 'portGroup' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
       { path: 'securityGroup', component: _import('system/securityGroup'), name: 'securityGroup', meta: { title: 'securityGroup' }},
-      { path: 'securityRule', component: _import('system/securityRule'), name: 'securityRule', meta: { title: 'securityRule' }, hidden: true},
+      { path: 'securityRule', component: _import('system/securityRule'), name: 'securityRule', meta: { title: 'securityRule' }, hidden: true },
       { path: 'protocal', component: _import('system/protocal'), name: 'protocal', meta: { title: 'protocal' }},
       { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
     ]

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

@@ -0,0 +1,467 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container" style="display:flex">
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable style="margin-right:10px;width: 120px;">
+        <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"/>
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value"/>
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
+              style="width: 100%">
+      <el-table-column align="center" :label="$t('table.id')" width="50">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.userName')" width="150">
+        <template slot-scope="scope">
+          <span>{{scope.row.userName}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.domain')" width="300">
+        <template slot-scope="scope">
+          <span>{{scope.row.domain}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
+        <template slot-scope="scope">
+          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('SSL证书状态')" width="110">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.sslStatus | statusFilter">{{scope.row.sslStatus | sslStatusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('默认域名')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.isDefault | statusFilter">{{scope.row.isDefault | httpStatusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('强制HTTPS')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.forceHttps | statusFilter">{{scope.row.forceHttps | httpStatusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.enable | statusFilter">{{scope.row.enable | statusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" width="330" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.isDefault !='1' && scope.row.enable == '1'" size="mini" type="primary" @click="handleDefaultStatus(scope.row)">{{$t('默认')}}</el-button>
+
+          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{$t('table.edit')}}</el-button>
+          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
+          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>
+          <!--          <el-button size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
+          <ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px"/>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
+                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px" style='width: 400px; margin-left:50px;'>
+        <el-form-item :label="$t('主域名')" prop="domain">
+          <el-input v-model="temp.domain"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('强制HTTPS')" prop="userId">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.forceHttps" placeholder="请选择">
+            <el-option label="开启" :value="1"></el-option>
+            <el-option label="关闭" :value="2"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('JKS文件上传')" prop="file">
+          <el-upload
+            ref="upload"
+            class="upload-demo"
+            action=""
+            :http-request="httpRequest"
+            :file-list="this.fileList"
+            :auto-upload="false"
+            :multiple="false"
+            accept=".jks"
+            :limit="1"
+            :on-change="handleChange"
+            >
+            <el-button slot="trigger" size="small" type="primary">选择文件</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-form-item v-if="passWordInputStatus" :label="$t('JKS密码')" prop="filePassword">
+          <el-input type="password" v-model="temp.keyStorePassword"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+        <el-button v-else type="primary" @click="updateData">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
+<!--    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">-->
+<!--      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">-->
+<!--        <el-table-column prop="key" label="Channel"> </el-table-column>-->
+<!--        <el-table-column prop="pv" label="Pv"> </el-table-column>-->
+<!--      </el-table>-->
+<!--      <span slot="footer" class="dialog-footer">-->
+<!--        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>-->
+<!--      </span>-->
+<!--    </el-dialog>-->
+  </div>
+</template>
+
+<script>
+  import { fetchList, updateEnableStatus, createDomain, updateDomain, deleteDomain, updateDefaultStatus } from '@/api/domain'
+  import { userList } from '@/api/user'
+  import waves from '@/directive/waves' // 水波纹指令
+  import { parseTime } from '@/utils'
+  import ButtonPopover from '../../components/Button/buttonPopover'
+
+  const calendarTypeOptions = [
+    { key: 'CN', display_name: 'China' },
+    { key: 'US', display_name: 'USA' },
+    { key: 'JP', display_name: 'Japan' },
+    { key: 'EU', display_name: 'Eurozone' }
+  ]
+
+  // arr to obj ,such as { CN : "China", US : "USA" }
+  const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+    acc[cur.key] = cur.display_name
+    return acc
+  }, {})
+
+  export default {
+    name: 'complexTable',
+    directives: {
+      waves
+    },
+    components: {
+      ButtonPopover
+    },
+    data() {
+      return {
+        fileList: [],
+        tableKey: 0,
+        list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          current: 1,
+          size: 10,
+          enable: undefined,
+          userId: null
+        },
+        importanceOptions: [1, 2, 3],
+        calendarTypeOptions,
+        userList: [],
+        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+        statusOptions: ['published', 'draft', 'deleted'],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          importance: 1,
+          remark: '',
+          timestamp: new Date(),
+          title: '',
+          type: '',
+          status: 'published',
+          domain: '',
+          jks: undefined,
+          keyStorePassword: '',
+          forceHttps: ''
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        passWordInputStatus: false,
+        textMap: {
+          update: '编辑',
+          create: '新建'
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          domain: [
+            { required: true, message: '主域名不能为空', trigger: 'blur' },
+            { validator: this.validateDomain, trigger: 'blur' }
+          ],
+          file: [
+            { required: false, message: '请选择文件', trigger: 'blur' }
+          ],
+          filePassword: [
+            { required: false, message: '密码不能为空', trigger: 'blur' }
+          ]// TODO required改为true后，密码不为空，仍不能通过
+        },
+        downloadLoading: false,
+        selectObj: {
+          statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+          onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }]
+        }
+      }
+    },
+    filters: {
+      statusName(status) {
+        const statusMap = {
+          1: '启用',
+          2: '禁用'
+        }
+        return statusMap[status]
+      },
+      sslStatusName(status) {
+        const statusMap = {
+          1: '已上传',
+          2: '未上传',
+          3: '已验证'
+        }
+        return statusMap[status]
+      },
+      httpStatusName(status) {
+        const statusMap = {
+          1: '开启',
+          2: '关闭'
+        }
+        return statusMap[status]
+      },
+      statusFilter(status) {
+        const statusMap = {
+          1: 'success',
+          2: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
+      this.getDataList()
+    },
+    methods: {
+      httpRequest(param) {
+        this.temp.jks = param.file
+      },
+      validateDomain(rule, value, callback) {
+        // 匹配多级域名，例如：sub.example.com, sub.sub.example.com
+        const domainPattern = /^(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)+[A-Za-z]{2,6}$/
+
+        if (!value) {
+          callback(new Error('主域名不能为空'));
+        } else if (!domainPattern.test(value)) {
+          callback(new Error('请输入正确的域名格式'));
+        } else {
+          callback();
+        }
+      },
+      handleChange(file) {
+        this.fileList = [file]
+        this.passWordInputStatus = true
+      },
+      getList() {
+        this.listLoading = true
+        fetchList(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
+          this.listLoading = false
+        })
+      },
+      getUserList() {
+        userList().then(response => {
+          this.userList = response.data.data
+        })
+      },
+      getDataList() {
+        const loginName = this.$store.state.user.loginName
+        userList().then(response => {
+          this.userList = response.data.data
+          const curUser = this.userList.find((val) => val.loginName === loginName)
+          if (curUser) {
+            this.listQuery.userId = curUser.id
+          }
+          this.getList()
+        })
+      },
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.current = val
+        this.getList()
+      },
+      handleDefaultStatus(row) {
+        updateDefaultStatus(row.id, 1).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '操作成功',
+              type: 'success'
+            })
+            this.getList()
+          }
+          this.getList()
+        })
+      },
+      handleModifyStatus(row, enable) {
+        console.log('route', this.$route)
+        updateEnableStatus(row.id, enable, row.domain).then(response => {
+          if (response.data.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+          this.getList()
+        })
+      },
+      resetTemp() {
+        this.passWordInputStatus = false
+        this.fileList = []
+        this.temp = {
+          domain: undefined,
+          jks: undefined,
+          keyStorePassword: undefined,
+          forceHttps: undefined
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            this.$refs.upload.submit()
+            const formData = this.objectToFormData(this.temp)
+            createDomain(formData).then(response => {
+              if (response.data.code === 0) {
+                this.dialogFormVisible = false
+                this.$notify({
+                  title: '成功',
+                  message: '创建成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.resetTemp()
+        this.temp = Object.assign({}, row) // copy obj
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      updateData() {
+        this.$refs['dataForm'].validate((valid) => {
+          console.log(this.temp)
+          if (valid) {
+            this.$refs.upload.submit()
+            const tempData = Object.assign({}, this.temp)
+            const formData = this.objectToFormData(tempData)
+            updateDomain(formData).then(response => {
+              if (response.data.code === 0) {
+                this.dialogFormVisible = false
+                this.$notify({
+                  title: '成功',
+                  message: '创建成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      objectToFormData(obj) {
+        const formData = new FormData()
+        Object.keys(obj).forEach(key => {
+          if (obj[key] !== undefined) {
+            formData.append(key, obj[key])
+          }
+        })
+        return formData
+      },
+      handleDelete(row) {
+        this.$confirm('确定要删除吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          deleteDomain(row.id).then(response => {
+            if (response.data.code === 0) {
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.getList()
+            }
+          })
+        }).catch(() => {})
+      },
+      handleDelete2(row) {
+        deleteDomain(row.id).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
+      },
+      handleDownload() {
+        this.downloadLoading = true
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+          const data = this.formatJson(filterVal, this.list)
+          excel.export_json_to_excel(tHeader, data, 'table-list')
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        }))
+      }
+    }
+  }
+</script>

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

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
-      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable>
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable style="margin-right:10px;width: 120px;">
         <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"/>
       </el-select>
-      <el-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable>
+      <el-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable style="width:145px;margin-right:10px">
         <el-option v-for="item in selectObj.onlineOptions" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
-      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
         <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>

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

@@ -49,9 +49,11 @@
           <span>{{ scope.row.protocal }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.domainName')" width="180">
+      <el-table-column align="center" :label="$t('table.domainName')" width="190">
         <template slot-scope="scope">
-          <span>{{ scope.row.domain }}</span>
+          <div v-for="(domain, index) in scope.row.allFullDomainList" :key="index">
+            <span>{{ domain }}</span>
+          </div>
         </template>
       </el-table-column>
       <el-table-column align="center" :label="$t('table.serverPort')" width="80">
@@ -119,83 +121,107 @@
       </el-pagination>
     </div>
 
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px"
-        style='width: 400px; margin-left:50px;'>
-        <!--        <el-form-item :label="$t('License')" prop="licenseId">-->
-        <!--          <el-select style="width: 280px;" class="filter-item" v-model="temp.licenseId" placeholder="请选择" :disabled="dialogStatus=='update'">-->
-        <!--            <el-option v-for="item in licenseList" :key="item.id" :label="item.name" :value="item.id">-->
-        <!--            </el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-
-        <el-form-item :label="$t('License')" prop="licenseId">
-          <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList"
-            @selectedData="selectedFeeItem" placeholder="请选择" :width="280" :disabled="dialogStatus === 'update'" />
-          <!--          <DropdownTable
-            :columns="countryColumns"
-            :data="licenseList"
-            v-model="temp.licenseId"
-            :value="temp.licenseName"
-            @rowClick="selectedFeeItem"
-            disabled
-            :disabled="dialogStatus==='update'"
-            style="width: 280px"
-          />-->
-        </el-form-item>
-        <el-form-item :label="$t('协议')" prop="protocal">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.protocal" placeholder="请选择">
-            <el-option v-for="item in protocalList" :key="item.name" :label="item.name" :value="item.name"
-              :disabled="!item.enable">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('服务端端口')" prop="serverPort" >
-          <load-select style="width: 280px;" class="filter-item"
-            v-model="temp.serverPort"
-            :data="serverPortList"
-            :page="loadServerPortQuery.page"
-            :hasMore="more"
-            :clearable="false"
-            :dictLabel="'port'"
-            :dictValue="'port'"
-            :request="loadServerPort"/>
-        </el-form-item>
-        <el-form-item :label="$t('客户端IP')" prop="clientIp">
-          <el-input v-model="temp.clientIp"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('客户端端口')" prop="clientPort">
-          <el-input v-model="temp.clientPort"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('域名')" prop="subdomain" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainName && domainName != ''">
-          <el-input v-model="temp.subdomain">
-            <template slot="append">.{{ domainName }}</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item :label="$t('响应数量')" prop="proxyResponses" v-if="temp.protocal === 'UDP'">
-          <el-input v-model="temp.proxyResponses"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('超时时间')" prop="proxyTimeoutMs" v-if="temp.protocal === 'UDP'">
-          <el-input v-model="temp.proxyTimeoutMs">
-            <template slot="append">毫秒</template>
-          </el-input>
-        </el-form-item>
-        <el-form-item  :label="$t('table.securityGroup')" prop="securityGroup">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.securityGroupId" clearable >
-            <el-option v-for="item in securityGroupList" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
-          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
-          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
-        </el-form-item>
-        <el-form-item :label="$t('描述')" prop="description">
-          <el-input v-model="temp.description"></el-input>
-        </el-form-item>
-      </el-form>
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" width="800px">
+      <div style="height: 500px; overflow-y: auto;">
+        <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="150px" inline>
+          <!--        <el-form-item :label="$t('License')" prop="licenseId">-->
+          <!--          <el-select style="width: 187px;" class="filter-item" v-model="temp.licenseId" placeholder="请选择" :disabled="dialogStatus=='update'">-->
+          <!--            <el-option v-for="item in licenseList" :key="item.id" :label="item.name" :value="item.id">-->
+          <!--            </el-option>-->
+          <!--          </el-select>-->
+          <!--        </el-form-item>-->
+          <el-form-item :label="$t('License')" prop="licenseId">
+            <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList"
+                           @selectedData="selectedFeeItem" placeholder="请选择" :width="280" :disabled="dialogStatus === 'update'" />
+            <!--          <DropdownTable
+              :columns="countryColumns"
+              :data="licenseList"
+              v-model="temp.licenseId"
+              :value="temp.licenseName"
+              @rowClick="selectedFeeItem"
+              disabled
+              :disabled="dialogStatus==='update'"
+              style="width: 280px"
+            />-->
+          </el-form-item>
+          <el-form-item :label="$t('协议')" prop="protocal">
+            <el-select style="width: 187px;" class="filter-item" v-model="temp.protocal" placeholder="请选择">
+              <el-option v-for="item in protocalList" :key="item.name" :label="item.name" :value="item.name"
+                         :disabled="!item.enable">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('服务端端口')" prop="serverPort" >
+            <load-select style="width: 187px;" class="filter-item"
+                         v-model="temp.serverPort"
+                         :data="serverPortList"
+                         :page="loadServerPortQuery.page"
+                         :hasMore="more"
+                         :clearable="false"
+                         :dictLabel="'port'"
+                         :dictValue="'port'"
+                         :request="loadServerPort"/>
+          </el-form-item>
+          <el-form-item :label="$t('客户端IP')" prop="clientIp">
+            <el-input v-model="temp.clientIp"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('客户端端口')" prop="clientPort">
+            <el-input v-model="temp.clientPort"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('响应数量')" prop="proxyResponses" v-if="temp.protocal === 'UDP'">
+            <el-input v-model="temp.proxyResponses"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('超时时间')" prop="proxyTimeoutMs" v-if="temp.protocal === 'UDP'">
+            <el-input v-model="temp.proxyTimeoutMs">
+              <template slot="append">毫秒</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item  :label="$t('table.securityGroup')" prop="securityGroup">
+            <el-select style="width: 187px;" class="filter-item" v-model="temp.securityGroupId" clearable >
+              <el-option v-for="item in securityGroupList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+            <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+            <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('描述')" prop="description">
+            <el-input v-model="temp.description" style="width: 540px;"></el-input>
+          </el-form-item>
+          <el-form-item :label="$t('域名')" prop="domainMappings" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainList != null && domainList.length > 0" >
+            <div class="my-tag">
+              <el-tag
+                :key="index"
+                v-for="(domain, index) in temp.domainMappings"
+                closable
+                :disable-transitions="false"
+                @close="removeDomainMapping(index)"
+                class="my-tag_item"
+              >
+                <el-input v-model="domain.subdomain" class="my-input"></el-input>
+                <el-select v-model="domain.domainId" placeholder="请选择主域名" class="my-select">
+                  <el-option v-for="tmp in domainList" :key="tmp.id" :label="'.'+tmp.domain" :value="tmp.id"></el-option>
+                </el-select>
+              </el-tag>
+              <el-button v-if="!temp.domainMappings.length || temp.domainMappings[temp.domainMappings.length - 1].subdomain" class="button-new-tag" size="small" @click="addDomainMapping">+ 添加域名</el-button>
+            </div>
+            <!--<div v-for="(domain, index) in temp.domainMappings" :key="index" class="domain-mapping">
+              <el-input v-model="domain.subdomain">
+                <template slot="append">
+                  <el-select v-model="domain.domainId" placeholder="请选择主域名" style="width: 187px;">
+                    <el-option v-for="tmp in domainList" :key="tmp.id" :label="'.'+tmp.domain" :value="tmp.id"></el-option>
+                  </el-select>
+                  <el-button type="danger" @click="removeDomainMapping(index)" style="margin-left: 10px;">删除</el-button>
+                </template>
+              </el-input>
+            </div>
+            <el-button type="primary" @click="addDomainMapping" style="margin-top: 10px;">添加域名</el-button>-->
+          </el-form-item>
+        </el-form>
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="
           dialogFormVisible = false">{{ $t('table.cancel') }}</el-button>
@@ -225,13 +251,13 @@ import { availablePortList, portAvailable } from '@/api/portPool'
 import { licenseList, licenseAuthList } from '@/api/license'
 import { protocalList } from '@/api/protocal'
 import { userList } from '@/api/user'
-import { domainNameBindInfo } from '@/api/domain'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
 import ButtonPopover from '../../components/Button/buttonPopover'
 import DropdownTable from '../../components/Dropdown/DropdownTable'
 // 下拉选择加载组件
 import loadSelect from "@/components/Select/SelectLoadMore";
+import {fetchAvailableDomainList} from "../../api/domain";
 
 const calendarTypeOptions = [
   { key: 'CN', display_name: 'China' },
@@ -297,7 +323,7 @@ export default {
       protocalList: [],
       licenseAuthList: [],
       serverPortList: [],
-      domainName: '',
+      domainList: [{ 'name': 'link.com', 'id': '1' }],
       showReviewer: false,
       temp: {
         id: undefined,
@@ -308,7 +334,8 @@ export default {
         clientPort: undefined,
         protocal: undefined,
         proxyResponses: undefined,
-        proxyTimeoutMs: undefined
+        proxyTimeoutMs: undefined,
+        domainMappings: []
       },
       selectObj: {
         statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
@@ -323,6 +350,27 @@ export default {
       dialogPvVisible: false,
       pvData: [],
       rules: {
+        domainMappings: [
+          {
+            validator: (rule, value, callback) => {
+              if (value && value.length > 0) {
+                for (let i = 0; i < value.length; i++) {
+                  if (!value[i].subdomain || !value[i].domainId) {
+                    return callback(new Error(`子域名和主域名都不能为空`))
+                  }
+                }
+                const set = new Set()
+                value.forEach(i => {
+                  const row = this.domainList.find(d => d.id === i.domainId)
+                  set.add(i.subdomain + '.' + row.domain)
+                })
+                if (set.size !== value.length) return callback(new Error(`域名不能重复`))
+              }
+              callback() // 验证通过
+            },
+            trigger: ''
+          }
+        ],
         licenseId: [{ required: true, message: '请选择License', trigger: 'blur,change' }],
         serverPort: [{ required: true, message: '请输入服务端端口', trigger: 'blur' },
           // { validator: isPortAvailable, trigger: 'change' }
@@ -372,18 +420,64 @@ export default {
     }
   },
   created() {
-    this.getDomainNameBindInfo()
     this.getDataList()
     this.getLicenseList()
     this.getLicenseAuthList()
     this.getProtocalList()
     this.fetchSecurityGroupList()
+    this.getAvailableDomainList()
   },
   methods: {
+    // 添加新的域名映射
+    addDomainMapping() {
+      let defaultDomainId = this.domainList[0].id
+      this.domainList.forEach(item => {
+        if (item.isDefault === 1) {
+          defaultDomainId = item.id
+        }
+      })
+      this.temp.domainMappings.push({
+        subdomain: undefined,
+        domain: undefined,
+        domainId: defaultDomainId
+      });
+      console.log(this.list)
+    },
+    // 删除指定的域名映射
+    removeDomainMapping(index) {
+      this.temp.domainMappings.splice(index, 1);
+    },
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
-        this.list = response.data.data.records
+        this.list = response.data.data.records.map(item => {
+          // 初始化 domainMappings 字段
+          item.domainMappings = [];
+          // 检查是否存在 subdomain 和 domain 字段
+          if (item.fullDomainMappings && Array.isArray(item.fullDomainMappings)) {
+            let allFullDomainList = []
+            for (const fullDomainMapping of item.fullDomainMappings) {
+              item.domainMappings.push({
+                id: fullDomainMapping.id || '',
+                subdomain: fullDomainMapping.subdomain || '', // 使用 || '' 保证字段非空
+                domainId: fullDomainMapping.domainNameId || '',
+                domain: fullDomainMapping.domain || ''
+              });
+              // 拼接完整的域名
+              let fullDomain = null;
+              if (fullDomainMapping.forceHttps == 1) {
+                fullDomain = `https://` + `${fullDomainMapping.subdomain}.${fullDomainMapping.domain}`;
+              } else {
+                fullDomain = `http://` + `${fullDomainMapping.subdomain}.${fullDomainMapping.domain}`;
+              }
+              // 将拼接后的域名添加到
+              allFullDomainList.push(fullDomain);
+            }
+            item.allFullDomainList = allFullDomainList
+          }
+          return item;
+        });
+        // console.log(this.list)
         this.total = response.data.data.total
         this.listLoading = false
       })
@@ -406,15 +500,15 @@ export default {
         }
       })
     },
-    getDomainNameBindInfo() {
-      domainNameBindInfo().then(response => {
-        this.domainName = response.data.data
-      })
-    },
     getAvailablePortList(licenseId) {
       this.loadServerPortQuery.licenseId = licenseId;
       this.serverPortList = []; //清掉数据
     },
+    getAvailableDomainList() {
+      fetchAvailableDomainList({}).then(response => {
+        this.domainList = response.data.data
+      })
+    },
     getAllUserList() {
       userList().then(response => {
         this.userList = response.data.data
@@ -469,9 +563,10 @@ export default {
         clientPort: undefined,
         userId: undefined,
         proxyResponses: undefined,
-        proxyTimeoutMs: undefined
-      }
-      this.serverPortList = []
+        proxyTimeoutMs: undefined,
+        domainMappings: []
+      };
+      this.serverPortList = [];
       this.loadServerPortQuery.licenseId = null;
       this.more = true;
     },
@@ -486,6 +581,7 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
+          // console.log(this.temp)
           createUserPortMapping(this.temp).then(response => {
             if (response.data.code === 0) {
               this.dialogFormVisible = false
@@ -503,13 +599,16 @@ export default {
     },
     handleOpenWebPage(row) {
       let url = location.protocol + '//' + location.hostname + ':' + row.serverPort
-      if (row.domain) {
-        url = location.protocol + '//' + row.domain
+      if (row.allFullDomainList && row.allFullDomainList.length > 0) {
+        url = row.allFullDomainList[0]
       }
       open(url)
     },
     handleUpdate(row) {
-      this.temp = Object.assign({}, row) // copy obj
+      this.resetTemp()
+      console.log(this.temp)
+      this.temp = JSON.parse(JSON.stringify(row))
+      console.log(this.temp)
       if (row.securityGroupId === 0) {
         this.temp.securityGroupId = null
       }
@@ -636,3 +735,42 @@ export default {
   }
 }
 </script>
+
+<style scoped lang="scss">
+.my-tag {
+  width: 570px;
+  &_item {
+    height: 36px;
+    line-height: 35px;
+    padding: 0 7px;
+    .my-input, .my-select {
+      width: auto;
+      /deep/ input {
+        height: 32px;
+        line-height: 32px;
+      }
+    }
+    .my-input {
+      /deep/ input {
+        width: 120px;
+        padding: 0 6px;
+      }
+    }
+    .my-select {
+      /deep/ input {
+        width: 110px;
+        border-width: 0!important;
+        background: #ecf5ff!important;
+      }
+    }
+    &:first-child {
+      margin-right: 8px;
+    }
+    & + & {
+      margin-right: 8px;
+      margin-bottom: 6px;
+    }
+  }
+}
+
+</style>

neutrino-proxy-client-sdk/Dockerfile

@@ -1,16 +0,0 @@
-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

@@ -1,96 +0,0 @@
-<?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

@@ -1,185 +0,0 @@
-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/core/CustomThreadFactory.java

@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.dromara.neutrinoproxy.client.sdk.core;
-
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- *
- * @author: aoshiguchen
- * @date: 2022/9/4
- */
-public class CustomThreadFactory implements ThreadFactory {
-	private final ThreadGroup group;
-	private final AtomicInteger threadNumber = new AtomicInteger(1);
-	private final String namePrefix;
-
-	public CustomThreadFactory(String prefix) {
-		group = Thread.currentThread().getThreadGroup();
-		namePrefix = prefix + "-thread-";
-	}
-
-	@Override
-	public Thread newThread(Runnable r) {
-		Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
-		if (t.isDaemon()) {
-			t.setDaemon(false);
-		}
-		if (t.getPriority() != Thread.NORM_PRIORITY) {
-			t.setPriority(Thread.NORM_PRIORITY);
-		}
-		return t;
-	}
-}

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

@@ -1,126 +0,0 @@
-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/handler/ProxyMessageConnectHandler.java

@@ -1,86 +0,0 @@
-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/ProxyMessageFactory.java

@@ -1,91 +0,0 @@
-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/pom.xml

@@ -16,18 +16,13 @@
     <dependencies>
         <dependency>
             <groupId>org.dromara.neutrino-proxy</groupId>
-            <artifactId>neutrino-proxy-client-sdk</artifactId>
+            <artifactId>neutrino-proxy-core</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/ProxyClient.java

@@ -28,8 +28,6 @@ public class ProxyClient {
 			setAlias("neutrino.proxy.tunnel.jks-path", "jksPath");
 			setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword");
 			setAlias("neutrino.proxy.tunnel.license-key", "licenseKey");
-
-            log.info("NeutrinoProxy Client ：{}", app.cfg().get("solon.app.version"));
         });
 	}
 

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

@@ -0,0 +1,35 @@
+package org.dromara.neutrinoproxy.client.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.Solon;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.event.EventListener;
+import org.noear.solon.core.runtime.NativeDetector;
+
+/**
+ * 启动成功后信息输出
+ * @author: aoshiguchen
+ * @date: 2024/10/16
+ */
+@Slf4j
+@Component
+public class AppLoadEndExecutor implements EventListener<AppLoadEndEvent> {
+
+    @Override
+    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
+        // aot 阶段，不执行
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        System.out.printf("""
+            ---------------------------------------------------------------
+                    Neutrino Proxy Client %s
+            Gitee: https://gitee.com/dromara/neutrino-proxy
+            GitHub: https://github.com/dromara/neutrino-proxy
+            GitCode: https://gitcode.com/dromara/neutrino-proxy
+            ---------------------------------------------------------------
+            %n""", Solon.app().cfg().get("solon.app.version"));
+    }
+
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -17,23 +16,11 @@ 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/ProxyConfig.java

@@ -1,6 +1,8 @@
-package org.dromara.neutrinoproxy.client.sdk.config;
+package org.dromara.neutrinoproxy.client.config;
 
 import lombok.Data;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;
 
 /**
  *
@@ -8,9 +10,13 @@ import lombok.Data;
  * @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/src/main/java/org/dromara/neutrinoproxy/client/config/ProxyConfiguration.java

@@ -1,11 +1,30 @@
 package org.dromara.neutrinoproxy.client.config;
 
-import org.dromara.neutrinoproxy.client.sdk.handler.ProxyMessageFactory;
+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.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.core.runtime.NativeDetector;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.bean.LifecycleBean;
+
+import java.net.InetSocketAddress;
+import java.util.List;
 
 /**
  * 代理配置
@@ -13,20 +32,182 @@ import org.noear.solon.core.runtime.NativeDetector;
  * @date: 2022/10/8
  */
 @Configuration
-public class ProxyConfiguration extends ProxyMessageFactory {
+public class ProxyConfiguration implements LifecycleBean {
 
     @Override
-    public void stop() {
-        Solon.stop();
+    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);
     }
 
-    @Override
-    public boolean isAotRuntime() {
-        return NativeDetector.isAotRuntime();
+    @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;
     }
 
     @Bean
-    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar(){
+    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar() {
         return new NeutrinoCoreRuntimeNativeRegistrar();
     }
+
 }

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

@@ -1,74 +0,0 @@
-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/constant/Constants.java

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

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

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

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

@@ -0,0 +1,34 @@
+package org.dromara.neutrinoproxy.client.core;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/9/4
+ */
+public class CustomThreadFactory implements ThreadFactory {
+	private final ThreadGroup group;
+	private final AtomicInteger threadNumber = new AtomicInteger(1);
+	private final String namePrefix;
+
+	public CustomThreadFactory(String prefix) {
+		SecurityManager s = System.getSecurityManager();
+		group = (s != null) ? s.getThreadGroup() :
+			Thread.currentThread().getThreadGroup();
+		namePrefix = prefix + "-thread-";
+	}
+
+	@Override
+	public Thread newThread(Runnable r) {
+		Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
+		if (t.isDaemon()) {
+			t.setDaemon(false);
+		}
+		if (t.getPriority() != Thread.NORM_PRIORITY) {
+			t.setPriority(Thread.NORM_PRIORITY);
+		}
+		return t;
+	}
+}

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

@@ -0,0 +1,16 @@
+package org.dromara.neutrinoproxy.client.core;
+
+import io.netty.channel.Channel;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/6/16
+ */
+public interface ProxyChannelBorrowListener {
+
+    void success(Channel channel);
+
+    void error(Throwable cause);
+
+}

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

@@ -1,14 +1,22 @@
 package org.dromara.neutrinoproxy.client.core;
 
-import cn.hutool.core.bean.BeanUtil;
+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 lombok.extern.slf4j.Slf4j;
-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.Solon;
 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
@@ -16,16 +24,107 @@ import org.noear.solon.annotation.Inject;
  */
 @Slf4j
 @Component
-public class ProxyClientService{
-    @Inject
-    private ProxyConfiguration proxyConfiguration;
-    @Inject
-    private SolonProxyConfig solonProxyConfig;
+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"));
+
 	@Init
 	public void init() {
-        log.info("start....");
-        ProxyConfig proxyConfig = BeanUtil.toBean(solonProxyConfig, ProxyConfig.class);
-        proxyConfiguration.start(proxyConfig);
-        log.info("start success!");
+		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);
+		}
 	}
 }

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

@@ -1,29 +1,7 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package org.dromara.neutrinoproxy.client.sdk.core;
+package org.dromara.neutrinoproxy.client.core;
 
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+import org.dromara.neutrinoproxy.client.util.ProxyUtil;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import io.netty.buffer.ByteBuf;

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

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.sdk.core;
+package org.dromara.neutrinoproxy.client.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.sdk.handler.ProxyMessageFactory;
-import org.dromara.neutrinoproxy.client.sdk.util.ProxyUtil;
+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 org.noear.solon.Solon;
 
 /**
  * 处理与服务端之间的数据传输
@@ -26,8 +26,7 @@ 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());
         }
-        Dispatcher dispatcher = (Dispatcher) ProxyMessageFactory.beanManager.get("dispatcher").getBean();
-        dispatcher.dispatch(ctx,proxyMessage);
+        Solon.context().getBean(Dispatcher.class).dispatch(ctx, proxyMessage);
     }
 
     @Override
@@ -53,13 +52,13 @@ public class TcpProxyChannelHandler extends SimpleChannelInboundHandler<ProxyMes
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause)  {
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         log.error("[TCP Proxy Channel]Client ProxyChannel Error channelId:{}", ctx.channel().id().asLongText(), cause);
         ctx.close();
     }
 
     @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt)  {
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
         if(evt instanceof IdleStateEvent) {
             IdleStateEvent event = (IdleStateEvent)evt;
             switch (event.state()) {

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

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

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

@@ -1,11 +1,11 @@
-package org.dromara.neutrinoproxy.client.sdk.core;
+package org.dromara.neutrinoproxy.client.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.sdk.constant.Constants;
-import org.dromara.neutrinoproxy.client.sdk.util.UdpChannelBindInfo;
+import org.dromara.neutrinoproxy.client.constant.Constants;
+import org.dromara.neutrinoproxy.client.util.UdpChannelBindInfo;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 
 import java.net.InetSocketAddress;

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

@@ -1,15 +1,17 @@
-package org.dromara.neutrinoproxy.client.sdk.handler;
+package org.dromara.neutrinoproxy.client.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.sdk.config.ProxyConfig;
+import org.dromara.neutrinoproxy.client.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;
 
 /**
  * 认证信息处理器
@@ -18,26 +20,22 @@ import org.dromara.neutrinoproxy.core.dispatcher.Match;
  */
 @Slf4j
 @Match(type = Constants.ProxyDataTypeName.AUTH)
+@Component
 public class ProxyMessageAuthHandler implements ProxyMessageHandler {
-	private final ProxyConfig proxyConfig;
-    private final Runnable stop;
-
-    public ProxyMessageAuthHandler(ProxyConfig proxyConfig,Runnable stop){
-        this.proxyConfig=proxyConfig;
-        this.stop=stop;
-    }
+	@Inject
+	private ProxyConfig proxyConfig;
 	@Override
 	public void handle(ChannelHandlerContext context, ProxyMessage proxyMessage) {
 		String info = proxyMessage.getInfo();
-        JSONObject load = JSONUtil.parseObj(info);
-        Integer code = load.getInt("code");
+        ONode load = ONode.load(info);
+        Integer code = load.get("code").getInt();
 		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()) {
-				stop.run();
+				Solon.stop();
 			}
 		} else if (ExceptionEnum.CONNECT_FAILED.getCode().equals(code) ||
 				ExceptionEnum.LICENSE_CANNOT_REPEAT_CONNECT.getCode().equals(code)

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

@@ -0,0 +1,87 @@
+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/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageDisconnectHandler.java

@@ -1,24 +1,24 @@
-package org.dromara.neutrinoproxy.client.sdk.handler;
+package org.dromara.neutrinoproxy.client.handler;
 
-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.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.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/src/main/java/org/dromara/neutrinoproxy/client/handler/ProxyMessageErrorHandler.java

@@ -1,11 +1,15 @@
-package org.dromara.neutrinoproxy.client.sdk.handler;
+package org.dromara.neutrinoproxy.client.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.*;
+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.dispatcher.Match;
+import org.noear.snack.ONode;
+import org.noear.solon.annotation.Component;
 
 /**
  * 异常信息处理器
@@ -14,13 +18,14 @@ import org.dromara.neutrinoproxy.core.dispatcher.Match;
  */
 @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());
-        JSONObject load = JSONUtil.parseObj(proxyMessage.getInfo());
-        Integer code = load.getInt("code");
+        ONode load = ONode.load(proxyMessage.getInfo());
+        Integer code = load.get("code").getInt();
 		if (ExceptionEnum.AUTH_FAILED.getCode().equals(code)) {
 			System.exit(0);
 		}
@@ -30,5 +35,4 @@ public class ProxyMessageErrorHandler implements ProxyMessageHandler {
 	public String name() {
 		return ProxyDataTypeEnum.DISCONNECT.getDesc();
 	}
-
 }

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

@@ -1,14 +1,14 @@
-package org.dromara.neutrinoproxy.client.sdk.handler;
+package org.dromara.neutrinoproxy.client.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.dromara.neutrinoproxy.core.dispatcher.Match;
  * @date: 2022/6/16
  */
 @Match(type = Constants.ProxyDataTypeName.TRANSFER)
-@Slf4j
+@Component
 public class ProxyMessageTransferHandler implements ProxyMessageHandler {
 
 	@Override

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

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

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

@@ -1,18 +1,19 @@
-package org.dromara.neutrinoproxy.client.sdk.handler;
+package org.dromara.neutrinoproxy.client.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.sdk.util.UdpServerUtil;
+import org.dromara.neutrinoproxy.client.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;
 
@@ -22,11 +23,12 @@ 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 = JSONUtil.toBean(proxyMessage.getInfo(),ProxyMessage.UdpBaseInfo.class);
+        final ProxyMessage.UdpBaseInfo udpBaseInfo = ONode.deserialize(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) {
@@ -43,5 +45,4 @@ public class UdpProxyMessageTransferHandler implements ProxyMessageHandler {
     public String name() {
         return ProxyDataTypeEnum.UDP_TRANSFER.getDesc();
     }
-
 }

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

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

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

@@ -1,40 +1,20 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.dromara.neutrinoproxy.client.sdk.util;
+package org.dromara.neutrinoproxy.client.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;
@@ -179,10 +159,11 @@ public class ProxyUtil {
 		realServerChannels.clear();
 	}
 
-	public static String getClientId(ProxyConfig proxyConfig) {
+	public static String getClientId() {
 		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/src/main/java/org/dromara/neutrinoproxy/client/util/UdpChannelBindInfo.java

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

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

@@ -1,4 +1,4 @@
-package org.dromara.neutrinoproxy.client.sdk.util;
+package org.dromara.neutrinoproxy.client.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.sdk.config.ProxyConfig;
-import org.dromara.neutrinoproxy.client.sdk.constant.Constants;
-import org.dromara.neutrinoproxy.client.sdk.core.CustomThreadFactory;
+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.core.ProxyMessage;
-import java.util.concurrent.TimeUnit;
+import org.noear.solon.core.runtime.NativeDetector;
 
 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,Boolean isAotRuntime) {
+    public static void initCache(ProxyConfig proxyConfig, Bootstrap udpServerBootstrap) {
         // aot 阶段，不初始化UDP服务
-        if (isAotRuntime) {
+        if (NativeDetector.isAotRuntime()) {
             return;
         }
         if (null == proxyConfig.getClient().getUdp() || StringUtils.isEmpty(proxyConfig.getClient().getUdp().getPuppetPortRange())) {

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

@@ -3,7 +3,7 @@ solon:
     add: ./app.yml
   app:
     name: neutrino-proxy-client
-    version: 2.0.1
+    version: 2.0.2
 # 日志级别
 solon.logging.appender:
   console:
@@ -38,7 +38,7 @@ neutrino:
       key-store-password: ${STORE_PASS:123456}
       jks-path: ${JKS_PATH:classpath:/test.jks}
       # 服务端IP
-      server-ip: ${SERVER_IP:}
+      server-ip: ${SERVER_IP:localhost}
       # 服务端端口(对应服务端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/ChannelAttribute.java

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.core;
 
 import java.util.HashMap;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import io.netty.channel.Channel;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import io.netty.channel.ChannelHandlerContext;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import lombok.Data;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import lombok.AllArgsConstructor;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import lombok.Data;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import io.netty.buffer.ByteBuf;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core;
 
 import io.netty.buffer.ByteBuf;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core.base;
 
 /**

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

@@ -1,5 +1,3 @@
-
-
 package org.dromara.neutrinoproxy.core.base;
 
 /**

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core.dispatcher;
 
 /**

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core.dispatcher;
 
 /**

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.core.dispatcher;
 
 import java.lang.annotation.*;

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

@@ -1,4 +1,3 @@
-
 package org.dromara.neutrinoproxy.core.type;
 
 /**

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

@@ -25,7 +25,6 @@ public class ProxyServer {
             if (Utils.isNotEmpty(loglevel)) {
                 app.cfg().put("solon.logging.logger.root.level", loglevel);
             }
-            log.info("NeutrinoProxy Server ：{}", app.cfg().get("solon.app.version"));
 		});
 	}
 }

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

@@ -0,0 +1,37 @@
+package org.dromara.neutrinoproxy.server.base;
+
+import lombok.extern.slf4j.Slf4j;
+import org.noear.solon.Solon;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.event.EventListener;
+import org.noear.solon.core.runtime.NativeDetector;
+
+/**
+ * 启动成功后信息输出
+ * @author: aoshiguchen
+ * @date: 2024/10/16
+ */
+@Slf4j
+@Component
+public class AppLoadEndExecutor implements EventListener<AppLoadEndEvent> {
+
+    @Override
+    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
+        // aot 阶段，不执行
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        System.out.printf("""
+            ---------------------------------------------------------------
+                    Neutrino Proxy Server %s
+            admin: http://localhost:8888
+            account: admin/123456
+            Gitee: https://gitee.com/dromara/neutrino-proxy
+            GitHub: https://github.com/dromara/neutrino-proxy
+            GitCode: https://gitcode.com/dromara/neutrino-proxy
+            ---------------------------------------------------------------
+            %n""", Solon.app().cfg().get("solon.app.version"));
+    }
+
+}

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

@@ -3,8 +3,11 @@ package org.dromara.neutrinoproxy.server.base;
 import org.apache.ibatis.type.SimpleTypeRegistry;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.base.rest.ResponseBody;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingCreateReq;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingUpdateReq;
 import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
 import org.dromara.neutrinoproxy.server.dal.*;
+import org.dromara.neutrinoproxy.server.proxy.enhance.SslContextManager;
 import org.dromara.neutrinoproxy.server.service.*;
 import org.dromara.solonplugins.job.JobBean;
 import org.noear.solon.annotation.Component;
@@ -38,7 +41,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
         metadata.registerLambdaSerialization(UserLoginRecordService.class);
         metadata.registerLambdaSerialization(UserService.class);
         metadata.registerLambdaSerialization(SecurityGroupService.class);
-
+        metadata.registerLambdaSerialization(DomainService.class);
+        metadata.registerLambdaSerialization(SslContextManager.class);
 
         metadata.registerLambdaSerialization(LicenseMapper.class);
         metadata.registerLambdaSerialization(ClientConnectRecordMapper.class);
@@ -57,7 +61,11 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
         metadata.registerLambdaSerialization(UserTokenMapper.class);
         metadata.registerLambdaSerialization(SecurityGroupMapper.class);
         metadata.registerLambdaSerialization(SecurityRuleMapper.class);
+        metadata.registerLambdaSerialization(DomainMapper.class);
+        metadata.registerLambdaSerialization(DomainPortMappingMapper.class);
 
+        metadata.registerReflection(PortMappingUpdateReq.DomainMapping.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(PortMappingCreateReq.DomainMapping.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
 
         metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS);
         metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS);

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.db;
 
 import cn.hutool.core.collection.CollectionUtil;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.db;
 
 import org.dromara.neutrinoproxy.server.constant.DbTypeEnum;

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

@@ -63,7 +63,6 @@ public class ProxyConfig {
 	public static class Tcp {
 		private Integer bossThreadCount;
 		private Integer workThreadCount;
-		private String domainName;
 		private Integer httpProxyPort;
 		private Integer httpsProxyPort;
 		private String keyStorePassword;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.rest;
 
 import java.lang.annotation.ElementType;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.rest;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.rest;
 
 import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.rest;
 
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.base.rest;
 
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/rest/interceptor/BaseAuthInterceptor.java

@@ -8,7 +8,6 @@ import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
 import org.dromara.neutrinoproxy.server.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.dromara.neutrinoproxy.server.base.rest.*;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.core.handle.Action;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 默认域名状态枚举
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Getter
+@AllArgsConstructor
+public enum DefaultDomainStatusEnum {
+    ENABLE(1, "默认域名"),
+    DISABLE(2, "关闭");
+
+    private Integer status;
+    private String desc;
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;
@@ -59,8 +38,6 @@ public enum ExceptionConstant {
 	PORT_MAPPING_NOT_EXIST(14000, "端口映射记录不存在"),
 	PORT_CANNOT_REPEAT_MAPPING(14001, "服务端口[{}]不能重复映射"),
 	AN_UNSUPPORTED_PROTOCOL(14002, "不支持的协议[{}]！"),
-	PORT_MAPPING_SUBDONAME_CONNOT_REPEAT(14003, "子域名不能重复使用！"),
-
 	// 调度管理(15000)
 	JOB_INFO_NOT_EXIST(15000, "调度管理记录不存在"),
 	SYSTEM_ERROR(500, "系统异常"),
@@ -72,7 +49,12 @@ public enum ExceptionConstant {
     // 安全组管理(17000)
     SECURITY_GROUP_NOT_EXIST(17000, "安全组不存在"),
 	SECURITY_RULE_NOT_EXIST(17001, "安全规则不存在"),
-
+    // 域名映射管理(18000)
+    DOMAIN_NAME_CANNOT_REPEAT(18000, "域名不能重复"),
+    DOMAIN_NAME_NOT_EXIST(18001, "域名不存在"),
+    DOMAIN_NAME_IS_DISABLE(18002, "当前域名[{}]被禁用"),
+    SUDOMAIN_NAME_CANNOT_REPEAT(18003, "子域名不能重复"),
+    DOMAIN_NAME_IS_USED(18002, "当前域名正在使用"),
 	;
 
 	private int code;

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

@@ -0,0 +1,29 @@
+package org.dromara.neutrinoproxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 仅Https状态枚举
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Getter
+@AllArgsConstructor
+public enum HttpsStatusEnum {
+    ONLY_HTTPS(1, "仅HTTPS"),
+    DISABLE_ONLY_HTTPS(2, "关闭仅HTTPS");
+    private static Map<Integer, HttpsStatusEnum> CACHE = Stream.of(HttpsStatusEnum.values()).collect(Collectors.toMap(HttpsStatusEnum::getStatus, Function.identity()));
+
+    private Integer status;
+    private String desc;
+
+    public static HttpsStatusEnum of(Integer status) {
+        return CACHE.get(status);
+    }
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.server.constant;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 仅Https状态枚举
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Getter
+@AllArgsConstructor
+public enum SslStatusEnum {
+    UPLOADED(1, "已上传"),
+    NOT_UPLOADED(2, "未上传"),
+    CERTIFIED(3, "已认证");//预留，用于证书验证
+
+    private Integer status;
+    private String desc;
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.constant;
 
 import lombok.AllArgsConstructor;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -0,0 +1,91 @@
+package org.dromara.neutrinoproxy.server.controller;
+
+import cn.hutool.core.util.StrUtil;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.base.rest.Authorization;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainListRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateDefaultStatusRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateEnableStatusRes;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.noear.solon.annotation.*;
+import org.dromara.neutrinoproxy.server.service.DomainService;
+import org.noear.solon.core.handle.Context;
+import org.noear.solon.core.handle.UploadedFile;
+import org.noear.solon.lang.Nullable;
+
+import javax.sound.midi.Soundbank;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Mapping("/domain")
+@Controller
+public class DomainController {
+    @Inject
+    private DomainService domainService;
+
+    @Get
+    @Mapping("/page")
+    public PageInfo<DomainListRes> page(PageQuery pageQuery, DomainListReq req) {
+        return domainService.page(pageQuery, req);
+    }
+    @Get
+    @Mapping("/all")
+    public List<DomainListRes> all(DomainListReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        return domainService.all(req);
+    }
+
+    @Post
+    @Mapping(path = "/create")
+    @Authorization(onlyAdmin = true)
+    public void create(DomainCreateReq req, UploadedFile jks) throws IOException {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotEmpty(req.getDomain(), "domain");
+        domainService.create(req, jks);
+    }
+
+    @Post
+    @Mapping(path = "/update")
+    @Authorization(onlyAdmin = true)
+    public void update(DomainUpdateReq req, UploadedFile jks) throws IOException {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotEmpty(req.getDomain(), "domain");
+        domainService.update(req, jks);
+    }
+
+    @Post
+    @Mapping(path = "/update/enable-status")
+    @Authorization(onlyAdmin = true)
+    public DomainUpdateEnableStatusRes updateEnableStatus(DomainUpdateEnableStatusReq req){
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
+        return domainService.updateEnableStatus(req);
+    }
+
+    @Post
+    @Mapping(path = "/delete")
+    @Authorization(onlyAdmin = true)
+    public void delete(DomainDeleteReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+
+        domainService.delete(req.getId());
+    }
+
+    @Post
+    @Mapping(path = "/update/default-status")
+    @Authorization(onlyAdmin = true)
+    public DomainUpdateDefaultStatusRes updateDefaultStatus(DomainUpdateDefaultStatusReq req){
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getIsDefault(), "isDefault");
+        return domainService.updateDefaultStatus(req.getId(), req.getIsDefault());
+    }
+}

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

@@ -1,27 +0,0 @@
-package org.dromara.neutrinoproxy.server.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
-import org.noear.solon.annotation.Controller;
-import org.noear.solon.annotation.Get;
-import org.noear.solon.annotation.Inject;
-import org.noear.solon.annotation.Mapping;
-
-/**
- * @author: aoshiguchen
- * @date: 2023/4/2
- */
-@Slf4j
-@Mapping("/domain-name")
-@Controller
-public class DomainNameController {
-    @Inject
-    private ProxyConfig proxyConfig;
-
-    @Get
-    @Mapping("/bind-info")
-    public String bindInfo () {
-        return proxyConfig.getServer().getTcp().getDomainName();
-    }
-
-}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.rest.Authorization;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -30,7 +30,6 @@ public class PortMappingController {
 	@Mapping("/page")
 	public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
 		ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
-
 		return portMappingService.page(pageQuery, req);
 	}
 
@@ -53,7 +52,7 @@ public class PortMappingController {
         ParamCheckUtil.checkNotNull(networkProtocolEnum, ExceptionConstant.AN_UNSUPPORTED_PROTOCOL, req.getProtocal());
         if (networkProtocolEnum != NetworkProtocolEnum.HTTP) {
             // 目前仅HTTP支持绑定域名
-			req.setSubdomain(null);
+			req.setDomainMappings(null);
         }
 		req.setProtocal(networkProtocolEnum.getDesc());
 		if (null == req.getProxyResponses()) {
@@ -88,7 +87,7 @@ public class PortMappingController {
 		ParamCheckUtil.checkNotNull(networkProtocolEnum, ExceptionConstant.AN_UNSUPPORTED_PROTOCOL, req.getProtocal());
 		if (networkProtocolEnum != NetworkProtocolEnum.HTTP) {
 			// 目前仅HTTP支持绑定域名
-			req.setSubdomain(null);
+			req.setDomainMappings(null);
 		}
 		req.setProtocal(networkProtocolEnum.getDesc());
 		if (null == req.getProxyResponses()) {

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
@@ -28,13 +7,11 @@ import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
 import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
 import org.dromara.neutrinoproxy.server.controller.req.system.*;
 import org.dromara.neutrinoproxy.server.controller.res.system.*;
-import org.dromara.neutrinoproxy.server.controller.res.system.*;
 import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
 import org.dromara.neutrinoproxy.server.service.UserService;
 import org.dromara.neutrinoproxy.server.util.Md5Util;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
-import org.dromara.neutrinoproxy.server.controller.req.system.*;
 import org.noear.solon.annotation.*;
 
 import java.util.List;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller;
 
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.log;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.log;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.log;
 
 import lombok.Data;

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

@@ -0,0 +1,25 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Data
+public class DomainCreateReq {
+    /**
+     * 主域名
+     */
+    private String domain;
+
+    /**
+     * KeyStore密码
+     */
+    private String keyStorePassword;
+
+    /**
+     * 强制Https
+     */
+    private Integer forceHttps;
+}

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

@@ -0,0 +1,15 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+
+/**
+ * @author Mirac
+ * @date 23/7/2024
+ */
+@Data
+public class DomainDeleteReq {
+    /**
+     * id
+     */
+    private Integer id;
+}

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

@@ -0,0 +1,21 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Data
+public class DomainListReq {
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+}

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

@@ -0,0 +1,22 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.DefaultDomainStatusEnum;
+
+/**
+ * @author Mirac
+ * @date 23/7/2024
+ */
+@Data
+public class DomainUpdateDefaultStatusReq {
+
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 启用状态 {@link DefaultDomainStatusEnum}
+     */
+    private Integer isDefault;
+}

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

@@ -0,0 +1,26 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+
+/**
+ * @author Mirac
+ * @date 23/7/2024
+ */
+@Data
+public class DomainUpdateEnableStatusReq {
+
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+
+    /**
+     * 域名
+     */
+    private String domain;
+}

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

@@ -0,0 +1,30 @@
+package org.dromara.neutrinoproxy.server.controller.req.proxy;
+
+import lombok.Data;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Data
+public class DomainUpdateReq {
+    /**
+     * id
+     */
+    private Integer id;
+
+    /**
+     * 主域名
+     */
+    private String domain;
+
+    /**
+     * KeyStore密码
+     */
+    private String keyStorePassword;
+
+    /**
+     * 强制Https
+     */
+    private Integer forceHttps;
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,28 +1,9 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 端口映射创建请求
  * @author: aoshiguchen
@@ -38,10 +19,6 @@ public class PortMappingCreateReq {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */
@@ -80,4 +57,15 @@ public class PortMappingCreateReq {
 	 * 描述
 	 */
 	private String description;
+
+    /**
+     * 域名映射列表
+     */
+    private List<DomainMapping> domainMappings;
+
+    @Data
+    public class DomainMapping {
+        private Integer domainId;
+        private String subdomain;
+    }
 }

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;

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

@@ -1,28 +1,9 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 端口映射更新请求
  * @author: aoshiguchen
@@ -42,10 +23,6 @@ public class PortMappingUpdateReq {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */
@@ -84,4 +61,16 @@ public class PortMappingUpdateReq {
 	 * 描述
 	 */
 	private String description;
+
+    /**
+     * 域名映射列表
+     */
+    private List<DomainMapping> domainMappings;
+
+    @Data
+    public class DomainMapping {
+        private Integer id;
+        private Integer domainId;
+        private String subdomain;
+    }
 }

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,31 +1,18 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
+import lombok.Data;
+
 /**
  * 用户列表请求
  * @author: aoshiguchen
  * @date: 2022/8/14
  */
+@Data
 public class UserListReq {
 
+    /**
+     * 用户名
+     */
+    private String name;
+
 }

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.req.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.log;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.log;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.log;
 
 import lombok.Data;

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

@@ -0,0 +1,72 @@
+package org.dromara.neutrinoproxy.server.controller.res.proxy;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.DefaultDomainStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.HttpsStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.SslStatusEnum;
+
+import java.util.Date;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Accessors(chain = true)
+@Data
+public class DomainListRes {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 主域名
+     */
+    private String domain;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 是否是默认域名(1、是 2、否)
+     * {@link DefaultDomainStatusEnum}
+     */
+    private Integer isDefault;
+
+    /**
+     * 强制使用HTTPS(1、是 2、否)
+     * {@link HttpsStatusEnum}
+     */
+    private Integer forceHttps;
+
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+
+    /**
+     * SSLStatusEnum
+     * {@link SslStatusEnum}
+     */
+    private Integer sslStatus;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}

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

@@ -0,0 +1,8 @@
+package org.dromara.neutrinoproxy.server.controller.res.proxy;
+
+/**
+ * @author Mirac
+ * @date 23/7/2024
+ */
+public class DomainUpdateDefaultStatusRes {
+}

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

@@ -0,0 +1,8 @@
+package org.dromara.neutrinoproxy.server.controller.res.proxy;
+
+/**
+ * @author Mirac
+ * @date 23/7/2024
+ */
+public class DomainUpdateEnableStatusRes {
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 /**

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 /**

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 import lombok.Data;

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

@@ -1,31 +1,12 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
+import lombok.Data;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
-import lombok.Data;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 端口映射列表响应
@@ -43,14 +24,10 @@ public class PortMappingListRes {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
-	/**
-	 * 域名
-	 */
-	private String domain;
+    /**
+     * 完整域名映射
+     */
+    private List<FullDomainNameBO> fullDomainMappings;
 	/**
 	 * license名称
 	 */

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 /**

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 import lombok.Data;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 /**

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.controller.res.system;
 
 /**

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

@@ -0,0 +1,61 @@
+package org.dromara.neutrinoproxy.server.dal;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainNameDO;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+
+@Mapper
+public interface DomainMapper extends BaseMapper<DomainNameDO> {
+    default DomainNameDO checkRepeat(String domain, Set<Integer> excludeIds) {
+        // 查询与输入域名相关的域名列表
+        List<DomainNameDO> domainList = this.selectList(new LambdaQueryWrapper<DomainNameDO>()
+            .notIn(excludeIds != null, DomainNameDO::getId, excludeIds)
+        );
+
+        // 遍历数据库中的域名，检查是否存在重复（包括子域名）
+        for (DomainNameDO domainNameDO : domainList) {
+            String existingDomain = domainNameDO.getDomain();
+            // 完全相等的情况
+            if (existingDomain.equals(domain)) {
+                return domainNameDO;
+            }
+//            // 是子域名关系
+//            if (isSubdomainOrEqual(existingDomain, domain)) {
+//                return domainNameDO;
+//            }
+        }
+
+        // 如果没有找到重复的，返回 null
+        return null;
+    }
+
+    // 辅助方法：判断 domain1 是否是 domain2 的子域名，或者两者相等
+    private boolean isSubdomainOrEqual(String domain1, String domain2) {
+        // 判断是否是子域名关系，例如 "proxy.asgc.fun" 是 "asgc.fun" 的子域名
+        return domain1.endsWith("." + domain2) || domain2.endsWith("." + domain1);
+    }
+
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(Wrappers.<DomainNameDO>lambdaUpdate()
+            .eq(DomainNameDO::getId, id)
+            .set(DomainNameDO::getEnable, enable)
+            .set(DomainNameDO::getUpdateTime, updateTime)
+        );
+    }
+
+
+    List<FullDomainNameBO> selectFullDomainNameListByPortMappingIds(@Param("ids") Set<Integer> ids);
+
+    List<FullDomainNameBO> selectFullDomainNameListByDomainNameIds(@Param("ids") Set<Integer> ids);
+
+    List<FullDomainNameBO> selectFullDomainNameList();
+}

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

@@ -0,0 +1,41 @@
+package org.dromara.neutrinoproxy.server.dal;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainPortMappingDO;
+
+import java.util.List;
+
+/**
+ * @author: Mirac
+ * @date: 2024/8/24
+ */
+@Mapper
+public interface DomainPortMappingMapper extends BaseMapper<DomainPortMappingDO> {
+    default Boolean checkRepeatBySubdomain(String subdomain, Integer domainNameId, Integer id) {
+        return StringUtils.isEmpty(subdomain)? Boolean.FALSE : this.selectCount(new LambdaQueryWrapper<DomainPortMappingDO>()
+            .eq(DomainPortMappingDO::getSubdomain, subdomain)
+            .eq(DomainPortMappingDO::getDomainNameId, domainNameId)
+            .ne(id != null, DomainPortMappingDO::getId, id)
+            .last("limit 1")
+        ).intValue() > 0;
+    }
+
+    default List<DomainPortMappingDO> findByPortMappingId(Integer portMappingId) {
+        return this.selectList(Wrappers.<DomainPortMappingDO>lambdaQuery()
+            .eq(DomainPortMappingDO::getPortMappingId, portMappingId));
+    }
+
+    default void deleteByDomainNameId(Integer doomainNameId) {
+        this.delete(Wrappers.<DomainPortMappingDO>lambdaQuery()
+            .eq(DomainPortMappingDO::getDomainNameId, doomainNameId));
+    }
+
+    default boolean checkUsed(Integer domainNameId) {
+        return this.exists(Wrappers.<DomainPortMappingDO>lambdaQuery()
+            .eq(DomainPortMappingDO::getDomainNameId, domainNameId));
+    }
+}

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

@@ -11,6 +11,7 @@ import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 
 import java.util.Date;
 import java.util.List;
@@ -44,18 +45,6 @@ public interface PortMappingMapper extends BaseMapper<PortMappingDO> {
 		);
 	}
 
-	/**
-	 * 校验子域名是否重复
-	 * @param subdomain
-	 * @return
-	 */
-	default Boolean checkRepeatBySubdomain(String subdomain, Set<Integer> excludeIds) {
-		return StringUtils.isEmpty(subdomain)? Boolean.FALSE : this.selectCount(new LambdaQueryWrapper<PortMappingDO>()
-				.eq(PortMappingDO::getSubdomain, subdomain)
-				.notIn(!CollectionUtil.isEmpty(excludeIds), PortMappingDO::getId, excludeIds)
-		).intValue() > 0;
-	}
-
 	default List<PortMappingDO> findEnableListByLicenseId(Integer licenseId) {
 		return this.selectList(new LambdaQueryWrapper<PortMappingDO>()
 				.eq(PortMappingDO::getLicenseId, licenseId)

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

@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.dromara.neutrinoproxy.server.dal.entity;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainListRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
+
+import java.util.Date;
+
+/**
+ * 域名
+ * @author: Mirac
+ * @date: 2024/7/21
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@TableName("domain_name")
+public class DomainNameDO {
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 主域名
+     */
+    private String domain;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * SSL证书文件内容
+     */
+    private byte[] jks;
+
+    /**
+     * KeyStore密码
+     */
+    private String keyStorePassword;
+
+    /**
+     * 是否是默认域名(1、是 2、否)
+     * {@link DefaultDomainStatusEnum}
+     */
+    private Integer isDefault;
+
+    /**
+     * 强制使用HTTPS(1、是 2、否)
+     * {@link HttpsStatusEnum}
+     */
+    private Integer forceHttps;
+
+    /**
+     * 启用状态
+     * {@link EnableStatusEnum}
+     */
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    public DomainListRes toRes() {
+        DomainListRes res = new DomainListRes();
+        BeanUtil.copyProperties(this, res);
+        res.setSslStatus(this.getJks() == null ? SslStatusEnum.NOT_UPLOADED.getStatus() : SslStatusEnum.UPLOADED.getStatus());
+        return res;
+    }
+}

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

@@ -19,20 +19,46 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+package org.dromara.neutrinoproxy.server.dal.entity;
 
-package org.dromara.neutrinoproxy.client.sdk.core;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
 
-import io.netty.channel.Channel;
+import java.util.Date;
 
 /**
- *
- * @author: aoshiguchen
- * @date: 2022/6/16
+ * @author: Mirac
+ * @date: 2024/8/24
  */
-public interface ProxyChannelBorrowListener {
-
-    void success(Channel channel);
-
-    void error(Throwable cause);
+@ToString
+@Accessors(chain = true)
+@Data
+@TableName("domain_port_mapping")
+public class DomainPortMappingDO {
 
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+	/**
+	 * 端口映射id
+	 */
+	private Integer portMappingId;
+	/**
+	 * 域名id
+	 */
+	private Integer domainNameId;
+	/**
+	 * 子域名
+	 */
+	private String subdomain;
 }

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

@@ -54,10 +54,6 @@ public class PortMappingDO {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.job;
 
 import cn.hutool.core.collection.CollectionUtil;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.server.proxy.core;
 
 import org.dromara.neutrinoproxy.server.proxy.domain.MetricsCollector;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.server.proxy.core;
 
 import org.dromara.neutrinoproxy.core.Constants;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.proxy.domain;
 
 import io.netty.channel.Channel;

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.server.proxy.domain;
 
 import java.util.ArrayList;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.proxy.domain;
 
 import lombok.Data;

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

@@ -1,8 +1,7 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;
 
-import cn.hutool.core.util.StrUtil;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
+import io.netty.channel.ChannelInitializer;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
@@ -10,7 +9,6 @@ import io.netty.handler.logging.LoggingHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
-import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
 import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
 import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
@@ -30,8 +28,8 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
     private ProxyConfig proxyConfig;
     @Override
     public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName()) || null == proxyConfig.getServer().getTcp().getHttpProxyPort()) {
-            log.info("no config domain name,nonsupport http proxy.");
+        if (null == proxyConfig.getServer().getTcp().getHttpProxyPort()) {
+            log.info("no config http proxy port, nonsupport http proxy.");
             return;
         }
         this.start();
@@ -48,7 +46,7 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
                                 ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
                             }
                             ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(false));
                             ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
                             ch.pipeline().addLast(new HttpVisitorChannelHandler());
                         }

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

@@ -1,19 +1,16 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;
 
-import cn.hutool.core.util.StrUtil;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
+import io.netty.channel.ChannelInitializer;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.ssl.SniHandler;
+import io.netty.handler.ssl.SslContext;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
-import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
 import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
 import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
@@ -21,10 +18,6 @@ import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;
 
-import javax.net.ssl.*;
-import java.io.InputStream;
-import java.security.KeyStore;
-
 /**
  * HTTPS代理
  * @author: aoshiguchen
@@ -35,11 +28,13 @@ import java.security.KeyStore;
 public class HttpsProxy implements EventListener<AppLoadEndEvent> {
     @Inject
     private ProxyConfig proxyConfig;
+    @Inject
+    private SslContextManager sslContextManager;
+
     @Override
-    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName()) || null == proxyConfig.getServer().getTcp().getHttpsProxyPort() ||
-                StringUtils.isEmpty(proxyConfig.getServer().getTcp().getJksPath()) || StringUtils.isEmpty(proxyConfig.getServer().getTcp().getKeyStorePassword())) {
-            log.info("no config domain name,nonsupport https proxy.");
+    public void onEvent(AppLoadEndEvent appLoadEndEvent) {
+        if (null == proxyConfig.getServer().getTcp().getHttpsProxyPort()) {
+            log.info("no config https proxy port, nonsupport http proxy.");
             return;
         }
         this.start();
@@ -55,9 +50,9 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
                             if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
                                 ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class));
                             }
-                            ch.pipeline().addLast(createSslHandler());
+                            ch.pipeline().addLast(createSniHandler());
                             ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(true));
                             ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
                             ch.pipeline().addLast(new HttpVisitorChannelHandler());
                         }
@@ -69,26 +64,19 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
         }
     }
 
-    private ChannelHandler createSslHandler() {
+    public SniHandler createSniHandler() {
         try {
-            InputStream jksInputStream = FileUtil.getInputStream(proxyConfig.getServer().getTcp().getJksPath());
-            SSLContext serverContext = SSLContext.getInstance("TLS");
-            final KeyStore ks = KeyStore.getInstance("JKS");
-
-            ks.load(jksInputStream, proxyConfig.getServer().getTcp().getKeyStorePassword().toCharArray());
-            final KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-            kmf.init(ks, proxyConfig.getServer().getTcp().getKeyStorePassword().toCharArray());
-            TrustManager[] trustManagers = null;
-
-            serverContext.init(kmf.getKeyManagers(), trustManagers, null);
-
-            SSLEngine sslEngine = serverContext.createSSLEngine();
-            sslEngine.setUseClientMode(false);
-            sslEngine.setNeedClientAuth(false);
-
-            return new SslHandler(sslEngine);
+            return new SniHandler(domainName -> {
+                SslContext sslContext = sslContextManager.getSslContextByFullDomain(domainName);
+                if (sslContext != null) {
+                    return sslContext;
+                } else {
+                    log.info("No SSL context available for domain: {}", domainName);
+                    return null;
+                }
+            });
         } catch (Exception e) {
-            log.error("create SSL handler failed", e);
+            log.info("create SSL handler failed", e);
             e.printStackTrace();
         }
         return null;

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

@@ -0,0 +1,126 @@
+package org.dromara.neutrinoproxy.server.proxy.enhance;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import io.netty.handler.ssl.ClientAuth;
+import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslContextBuilder;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.db.DBInitialize;
+import org.dromara.neutrinoproxy.server.dal.DomainMapper;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainNameDO;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Init;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.event.AppLoadEndEvent;
+import org.noear.solon.core.event.EventListener;
+import org.noear.solon.core.runtime.NativeDetector;
+
+import javax.net.ssl.KeyManagerFactory;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.security.KeyStore;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 域名到SSL上下文
+ * @author: Mirac
+ * @date: 2024/8/25
+ */
+@Slf4j
+@Component
+@Data
+public class SslContextManager implements EventListener<AppLoadEndEvent> {
+
+    @Db
+    private DomainMapper domainMapper;
+
+    @Inject
+    private DBInitialize dbInitialize;
+
+    // 初始化时加载所有域名的 SSL 上下文
+    @Init
+    public void init() throws Throwable {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        try {
+            initializeSslContexts();
+        } catch (Exception e) {
+            log.error("initialize SSL handler failed", e);
+            throw e;
+        }
+    }
+
+
+    @Override
+    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
+
+    }
+
+    // 维护域名到 SslContext 的映射
+    private final ConcurrentHashMap<String, SslContext> domainSslContexts = new ConcurrentHashMap<>();
+
+    // 初始化所有域名的 SSL 上下文
+    private void initializeSslContexts() throws Exception {
+        List<DomainNameDO> domainNameDOS = domainMapper.selectList(Wrappers.<DomainNameDO>lambdaQuery()
+            .isNotNull(DomainNameDO::getDomain)
+            .isNotNull(DomainNameDO::getJks)
+            .isNotNull(DomainNameDO::getKeyStorePassword));
+
+        for (DomainNameDO domainNameDO : domainNameDOS) {
+            if (domainNameDO.getDomain() != null && domainNameDO.getKeyStorePassword() != null && domainNameDO.getJks() != null) {
+                String domain = domainNameDO.getDomain();
+                byte[] jks = domainNameDO.getJks();// 假设数据库中存储了每个域名对应的 JKS 路径
+                String keyStorePassword = domainNameDO.getKeyStorePassword();
+                SslContext sslContext = loadSslContextFromJks(jks, keyStorePassword);
+                domainSslContexts.put(domain, sslContext);
+            }
+        }
+    }
+
+    // 动态添加新的域名和证书
+    public void addDomainAndCert(String domain, byte[] jks, String keyStorePassword) throws Exception {
+        SslContext sslContext = loadSslContextFromJks(jks, keyStorePassword);
+        domainSslContexts.put(domain, sslContext);
+    }
+
+    // 使用 JKS 文件加载 SSL 上下文，禁用客户端认证并设置为服务器模式
+    private SslContext loadSslContextFromJks(byte[] jks, String keyStorePassword) throws Exception {
+        InputStream jksInputStream = new ByteArrayInputStream(jks);
+        // 初始化 KeyStore
+        KeyStore keyStore = KeyStore.getInstance("JKS");
+        keyStore.load(jksInputStream, keyStorePassword.toCharArray());
+
+        // 初始化 KeyManagerFactory
+        KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+        kmf.init(keyStore, keyStorePassword.toCharArray());
+
+        // 创建 SslContext 并禁用客户端认证
+        return SslContextBuilder.forServer(kmf)
+            .clientAuth(ClientAuth.NONE)  // 禁用客户端认证
+            .build();
+    }
+
+    public SslContext getSslContextByDomain(String domain) {
+        return domainSslContexts.get(domain);
+    }
+
+
+    public void removeSslContextByDomain(String domain) {
+        domainSslContexts.remove(domain);
+    }
+
+    public SslContext getSslContextByFullDomain(String fullDomain) {
+        String domain = ProxyUtil.getDomainNameByFullDomain(fullDomain);
+        if (StrUtil.isBlank(domain)) {
+            return null;
+        }
+        return domainSslContexts.get(domain);
+    }
+}

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

@@ -1,25 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package org.dromara.neutrinoproxy.server.proxy.handler;
 
 import cn.hutool.core.util.StrUtil;

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

@@ -1,14 +1,17 @@
 package org.dromara.neutrinoproxy.server.proxy.security;
 
-import cn.hutool.core.util.StrUtil;
 import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.CharsetUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.i18nformatter.qual.I18nFormat;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.util.HttpUtil;
 import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.DomainService;
 import org.dromara.neutrinoproxy.server.service.PortMappingService;
 import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
@@ -22,55 +25,70 @@ import org.noear.solon.Solon;
 public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
     private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
     private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+    private final DomainService domainService = Solon.context().getBean(DomainService.class);
     /**
      * 域名
      */
-    private String domainName;
+    private Boolean isHttps;
 
-    public HttpVisitorSecurityChannelHandler(String domainName) {
-        this.domainName = domainName;
+    // 拼接收到的 ByteBuf 内容
+    private ByteBuf cumulationBuf = Unpooled.buffer();
+//    private boolean initialized = false;
+
+    public HttpVisitorSecurityChannelHandler(Boolean isHttps) {
+        this.isHttps = isHttps;
     }
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-        // 未配置域名则不支持通过域名访问
-        if (StrUtil.isBlank(domainName)) {
+//        if (initialized) {
+//            // 已经初始化，直接透传
+//            ctx.fireChannelRead(msg);
+//            return;
+//        }
+
+        // 累加数据包
+        ByteBuf buf = (ByteBuf) msg;
+        cumulationBuf.writeBytes(buf);
+
+        String dataStr = cumulationBuf.toString(CharsetUtil.UTF_8);
+        int headerEndIndex = dataStr.indexOf("\r\n\r\n");
+        if (-1 == headerEndIndex) {
+            // 请求头还没读完，继续等
+            return;
+        }
+
+        // 获取Host请求头
+        String headerPart = dataStr.substring(0, headerEndIndex + 4);
+        String host = HttpUtil.getHostIgnorePort(headerPart); //test1.asgc.fun
+
+        log.debug("HttpProxy host: {}", host);
+        if (StringUtils.isBlank(host)) {
+            ctx.channel().close();
+            return;
+        }
+        // 判断域名是否被禁用或删除
+        Integer domainNameId = ProxyUtil.getDomainNameIdByFullDomain(host);
+        if (domainNameId == null) {
+            ctx.channel().close();
+            return;
+        }
+        // 域名映射强制https验证
+        if (!isHttps && domainService.isOnlyHttps(domainNameId)) {
             ctx.channel().close();
             return;
         }
 
-        ByteBuf buf = (ByteBuf) msg;
-
         Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
         if (null == serverPort) {
-            // 获取Host请求头
-            byte[] bytes = new byte[buf.readableBytes()];
-            buf.readBytes(bytes);
-            String httpContent = new String(bytes);
-            String host = HttpUtil.getHostIgnorePort(httpContent);
-
-            log.debug("HttpProxy host: {}", host);
-            if (StringUtils.isBlank(host)) {
-                ctx.channel().close();
-                return;
-            }
-
-            // 根据Host匹配端口映射
-            if (!host.endsWith(domainName)) {
-                ctx.channel().close();
-                return;
-            }
-            int index = host.lastIndexOf("." + domainName);
-            String subdomain = host.substring(0, index);
-
-            // 根据域名拿到绑定的映射对应的cmdChannel
-            serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+            // channel没有服务器端口信息，尝试根据完整域名拿到服务端端口
+            serverPort = ProxyUtil.getServerPortByFullDomain(host);
             if (null == serverPort) {
                 ctx.channel().close();
                 return;
             }
 
             // 判断IP是否在该端口绑定的安全组允许的规则内
-            String ip = IpUtil.getRealRemoteIp(httpContent);
+            String ip = IpUtil.getRealRemoteIp(headerPart);
             if (ip == null) {
                 ip = IpUtil.getRemoteIp(ctx);
             }
@@ -84,9 +102,11 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap
             ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
         }
 
-        // 继续传播
-        buf.resetReaderIndex();
-        ctx.fireChannelRead(buf);
-    }
+        // 从此之后所有的 in 都是“直接透传”。
+        // 否则，若请求体过长，数据包被拆分为多个，后续的数据包都无法解析出host，导致转发数据不完整。
+        ctx.pipeline().remove(this);
 
+        // 继续传播
+        ctx.fireChannelRead(cumulationBuf);
+    }
 }

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

@@ -0,0 +1,301 @@
+package org.dromara.neutrinoproxy.server.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.text.StrPool;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import com.google.common.collect.Sets;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
+import org.dromara.neutrinoproxy.server.constant.*;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.DomainCreateReq;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.DomainListReq;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.DomainUpdateEnableStatusReq;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.DomainUpdateReq;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainListRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateDefaultStatusRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateEnableStatusRes;
+import org.dromara.neutrinoproxy.server.dal.DomainMapper;
+import org.dromara.neutrinoproxy.server.dal.DomainPortMappingMapper;
+import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
+import org.dromara.neutrinoproxy.server.dal.UserMapper;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainNameDO;
+import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
+import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.proxy.enhance.SslContextManager;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Init;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.handle.UploadedFile;
+import org.noear.solon.core.runtime.NativeDetector;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author Mirac
+ * @date 21/7/2024
+ */
+@Slf4j
+@Component
+public class DomainService {
+    @Db
+    private DomainMapper domainMapper;
+    @Db
+    private UserMapper userMapper;
+    @Db
+    private PortMappingMapper portMappingMapper;
+    @Db
+    private DomainPortMappingMapper domainPortMappingMapper;
+
+    @Inject
+    private SslContextManager sslContextManager;
+
+    public PageInfo<DomainListRes> page(PageQuery pageQuery, DomainListReq req) {
+        Page<DomainNameDO> page = domainMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<DomainNameDO>()
+            .eq(req.getEnable() != null, DomainNameDO::getEnable, req.getEnable())
+            .eq(req.getUserId() != null, DomainNameDO::getUserId, req.getUserId())
+            .orderByAsc(Arrays.asList(DomainNameDO::getUserId, DomainNameDO::getId))
+        );
+        List<DomainListRes> resList = page.getRecords().stream().map(DomainNameDO::toRes).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(page.getRecords())) {
+            return PageInfo.of(resList, page);
+        }
+        Set<Integer> userIds = resList.stream().map(DomainListRes::getUserId).collect(Collectors.toSet());
+        List<UserDO> userDOList = userMapper.findByIds(userIds);
+        Map<Integer, UserDO> userMap = userDOList.stream().collect(Collectors.toMap(UserDO::getId, c -> c));
+        for (DomainListRes item : resList) {
+            UserDO userDO = userMap.get(item.getUserId());
+            if (null != userDO) {
+                item.setUserName(userDO.getName());
+            }
+        }
+        return PageInfo.of(resList, page);
+    }
+
+    public List<DomainListRes> all(DomainListReq req) {
+        LambdaQueryWrapper<DomainNameDO> wrapper = Wrappers.<DomainNameDO>lambdaQuery()
+            .eq(req.getEnable() != null, DomainNameDO::getEnable, req.getEnable());
+        List<DomainNameDO> domainNameDOS = domainMapper.selectList(wrapper);
+        if (CollectionUtil.isEmpty(domainNameDOS)) {
+            return null;
+        }
+        List<DomainListRes> resList = domainNameDOS.stream().map(DomainNameDO::toRes).toList();
+        Set<Integer> userIds = resList.stream().map(DomainListRes::getUserId).collect(Collectors.toSet());
+        List<UserDO> userDOList = userMapper.findByIds(userIds);
+        Map<Integer, UserDO> userMap = userDOList.stream().collect(Collectors.toMap(UserDO::getId, c -> c));
+        for (DomainListRes item : resList) {
+            UserDO userDO = userMap.get(item.getUserId());
+            if (null != userDO) {
+                item.setUserName(userDO.getName());
+            }
+        }
+        return resList;
+    }
+
+    /**
+     * 创建域名
+     *
+     * @param req
+     */
+    public void create(DomainCreateReq req, UploadedFile jks) {
+        DomainNameDO domainNameCheck = domainMapper.checkRepeat(req.getDomain(), null);
+        ParamCheckUtil.checkMustNull(domainNameCheck, ExceptionConstant.DOMAIN_NAME_CANNOT_REPEAT);
+        DomainNameDO domainNameDO = new DomainNameDO();
+        if (null != jks) {
+            try {
+                ParamCheckUtil.checkNotEmpty(req.getKeyStorePassword(), "keyStorePassword");
+
+                InputStream content = jks.getContent();
+                byte[] byteArray = toByteArray(content);
+                domainNameDO.setJks(byteArray);
+                domainNameDO.setKeyStorePassword(req.getKeyStorePassword());
+                //添加证书
+                sslContextManager.addDomainAndCert(req.getDomain(), byteArray, req.getKeyStorePassword());
+            } catch (Exception e) {
+                log.error("证书添加失败", e);
+                e.printStackTrace();
+            }
+        }
+        Integer userId = SystemContextHolder.getUserId();
+        Date now = new Date();
+        domainNameDO.setDomain(req.getDomain());
+        domainNameDO.setIsDefault(DefaultDomainStatusEnum.DISABLE.getStatus());
+        domainNameDO.setForceHttps(req.getForceHttps() != null ? HttpsStatusEnum.of(req.getForceHttps()).getStatus() : HttpsStatusEnum.DISABLE_ONLY_HTTPS.getStatus());
+        domainNameDO.setUserId(userId);
+        domainNameDO.setEnable(EnableStatusEnum.ENABLE.getStatus());
+        domainNameDO.setCreateTime(now);
+        domainNameDO.setUpdateTime(now);
+        domainMapper.insert(domainNameDO);
+        //更新主域名到域名id映射
+        ProxyUtil.setDomainToDomainNameId(domainNameDO.getDomain(), domainNameDO.getId());
+    }
+
+    /**
+     * 将 InputStream 转换为 byte[]
+     */
+    private byte[] toByteArray(InputStream input) throws IOException {
+        ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+        int nRead;
+        byte[] data = new byte[1024];
+        while ((nRead = input.read(data, 0, data.length)) != -1) {
+            buffer.write(data, 0, nRead);
+        }
+        buffer.flush();
+        return buffer.toByteArray();
+    }
+
+    public void update(DomainUpdateReq req, UploadedFile jks) {
+        DomainNameDO domainNameCheck = domainMapper.checkRepeat(req.getDomain(), Sets.newHashSet(req.getId()));
+        ParamCheckUtil.checkMustNull(domainNameCheck, ExceptionConstant.DOMAIN_NAME_CANNOT_REPEAT);
+
+        DomainNameDO oldDomainNameDO = domainMapper.selectOne(Wrappers.<DomainNameDO>lambdaQuery().eq(DomainNameDO::getId, req.getId()));
+        List<FullDomainNameBO> oldFullDomainNameBOS = domainMapper.selectFullDomainNameListByDomainNameIds(Sets.newHashSet(req.getId()));
+        LambdaUpdateWrapper<DomainNameDO> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(DomainNameDO::getId, req.getId());
+        if (null != jks) {
+            try {
+                ParamCheckUtil.checkNotEmpty(req.getKeyStorePassword(), "keyStorePassword");
+
+                InputStream content = jks.getContent();
+                byte[] byteArray = toByteArray(content);
+                updateWrapper.set(DomainNameDO::getKeyStorePassword, req.getKeyStorePassword());
+                updateWrapper.set(DomainNameDO::getJks, byteArray);
+                //添加证书并删除旧的证书
+                sslContextManager.addDomainAndCert(req.getDomain(), byteArray, req.getKeyStorePassword());
+                if (!req.getDomain().equals(oldDomainNameDO.getDomain())) {
+                    sslContextManager.removeSslContextByDomain(oldDomainNameDO.getDomain());
+                }
+            } catch (Exception e) {
+                log.error("证书添加失败", e);
+                e.printStackTrace();
+            }
+        }
+        updateWrapper.set(DomainNameDO::getDomain, req.getDomain());
+        updateWrapper.set(DomainNameDO::getUpdateTime, new Date());
+        updateWrapper.set(req.getForceHttps() != null, DomainNameDO::getForceHttps, req.getForceHttps());
+        domainMapper.update(updateWrapper);
+
+        //更新域名相关映射
+        if (!Objects.equals(oldDomainNameDO.getDomain(), req.getDomain())) {
+            //更新主域名到域名id映射
+            ProxyUtil.removeDomainToDomainNameId(oldDomainNameDO.getDomain());
+            ProxyUtil.setDomainToDomainNameId(req.getDomain(), req.getId());
+            if (CollectionUtil.isEmpty(oldFullDomainNameBOS)) return;
+            //存在域名映射，更新完整域名到服务器端口映射
+            for (FullDomainNameBO oldFullDomainNameBO : oldFullDomainNameBOS) {
+                String oldFullDomain = StrUtil.join(StrPool.DOT, oldFullDomainNameBO.getSubdomain(), oldFullDomainNameBO.getDomain());
+                Integer serverPort = ProxyUtil.getServerPortByFullDomain(oldFullDomain);
+                ProxyUtil.removeFullDomainToServerPort(oldFullDomain);
+                ProxyUtil.setFullDomainToServerPort(StrUtil.join(StrPool.DOT, oldFullDomainNameBO.getSubdomain(), req.getDomain()), serverPort);
+            }
+        }
+    }
+
+    public DomainUpdateEnableStatusRes updateEnableStatus(DomainUpdateEnableStatusReq req) {
+        if (Objects.equals(req.getEnable(), EnableStatusEnum.DISABLE.getStatus())) {
+            //如果设置状态为禁用，则将默认域名设置为非默认域名
+            updateDefaultStatus(req.getId(), DefaultDomainStatusEnum.DISABLE.getStatus());
+        }
+        domainMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        if (Objects.equals(req.getEnable(), EnableStatusEnum.ENABLE.getStatus())) {
+            ProxyUtil.setDomainToDomainNameId(req.getDomain(), req.getId());
+        } else {
+            ProxyUtil.removeDomainToDomainNameId(req.getDomain());
+        }
+        return new DomainUpdateEnableStatusRes();
+    }
+
+    public void delete(Integer domainNameId) {
+        //检查当前域名是否正在使用
+        boolean checkUsed = domainPortMappingMapper.checkUsed(domainNameId);
+        ParamCheckUtil.checkExpression(!checkUsed, ExceptionConstant.DOMAIN_NAME_IS_USED);
+        DomainNameDO domainNameDO = domainMapper.selectOne(Wrappers.<DomainNameDO>lambdaQuery()
+            .eq(DomainNameDO::getId, domainNameId)
+            .select(DomainNameDO::getDomain, DomainNameDO::getEnable));
+        if (Objects.equals(domainNameDO.getEnable(), EnableStatusEnum.ENABLE.getStatus())) {
+            ProxyUtil.removeDomainToDomainNameId(domainNameDO.getDomain());
+        }
+        domainMapper.deleteById(domainNameId);
+        //删除证书
+        sslContextManager.removeSslContextByDomain(domainNameDO.getDomain());
+    }
+
+    public DomainUpdateDefaultStatusRes updateDefaultStatus(Integer id, Integer isDefault) {
+        if (Objects.equals(isDefault, DefaultDomainStatusEnum.ENABLE.getStatus())) {
+            //如果设置状态为默认域名，则将之前的默认域名设置为非默认域名
+            DomainNameDO oldDomainNameDO = domainMapper.selectOne(Wrappers.<DomainNameDO>lambdaQuery()
+                .select(DomainNameDO::getId)
+                .eq(DomainNameDO::getIsDefault, DefaultDomainStatusEnum.ENABLE.getStatus()));
+            if (oldDomainNameDO != null) {
+                oldDomainNameDO.setIsDefault(DefaultDomainStatusEnum.DISABLE.getStatus());
+                domainMapper.updateById(oldDomainNameDO);
+            }
+        }
+
+        DomainNameDO domainNameDO = new DomainNameDO();
+        domainNameDO.setId(id);
+        domainNameDO.setIsDefault(isDefault);
+        domainMapper.updateById(domainNameDO);
+
+        return new DomainUpdateDefaultStatusRes();
+    }
+
+    @Init
+    public void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        List<FullDomainNameBO> fullDomainNameBOS = domainMapper.selectFullDomainNameList();
+        if (CollectionUtil.isEmpty(fullDomainNameBOS)) {
+            return;
+        }
+        Set<Integer> portMappingIds = fullDomainNameBOS.stream().map(FullDomainNameBO::getPortMappingId).collect(Collectors.toSet());
+        List<PortMappingDO> portMappingDOS = portMappingMapper.selectBatchIds(portMappingIds);
+        if (CollectionUtil.isEmpty(portMappingDOS)) {
+            return;
+        }
+        Map<Integer, PortMappingDO> portMappingDOMap = portMappingDOS.stream()
+            .filter(item -> NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal()))
+            .collect(Collectors.toMap(PortMappingDO::getId, Function.identity()));
+        fullDomainNameBOS.forEach(item -> {
+            PortMappingDO portMappingDO = portMappingDOMap.get(item.getPortMappingId());
+            if (null == portMappingDO) {
+                return;
+            }
+            String fullDomain = StrUtil.join(StrPool.DOT, item.getSubdomain(), item.getDomain());
+            //更新完整域名到端口映射
+            ProxyUtil.setFullDomainToServerPort(fullDomain, portMappingDO.getServerPort());
+        });
+
+        //更新主域名到主域名id缓存，未禁用
+        List<DomainNameDO> domainNameDOS = domainMapper.selectList(Wrappers.<DomainNameDO>lambdaQuery()
+            .eq(DomainNameDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
+            .select(DomainNameDO::getDomain, DomainNameDO::getId));
+        for (DomainNameDO domainNameDO : domainNameDOS) {
+            ProxyUtil.setDomainToDomainNameId(domainNameDO.getDomain(), domainNameDO.getId());
+        }
+    }
+
+    public boolean isOnlyHttps(Integer domainNameId) {
+        ParamCheckUtil.checkExpression((domainNameId != null && domainNameId > 0), ExceptionConstant.DOMAIN_NAME_NOT_EXIST);
+        DomainNameDO domainNameDO = domainMapper.selectOne(Wrappers.<DomainNameDO>lambdaQuery()
+            .eq(DomainNameDO::getId, domainNameId));
+        return domainNameDO != null && Objects.equals(domainNameDO.getForceHttps(), HttpsStatusEnum.ONLY_HTTPS.getStatus());
+    }
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.service;
 
 import org.dromara.neutrinoproxy.core.util.LockUtil;

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

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

@@ -2,8 +2,8 @@ package org.dromara.neutrinoproxy.server.service;
 
 import cn.hutool.cache.Cache;
 import cn.hutool.cache.CacheUtil;
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -30,16 +30,10 @@ import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingCreateRe
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingDetailRes;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingUpdateEnableStatusRes;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingUpdateRes;
-import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
-import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
-import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
-import org.dromara.neutrinoproxy.server.dal.UserMapper;
-import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
-import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
-import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
-import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.dal.*;
+import org.dromara.neutrinoproxy.server.dal.entity.*;
 import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
+import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.dromara.neutrinoproxy.server.util.StringUtil;
@@ -68,6 +62,10 @@ public class PortMappingService implements LifecycleBean {
     private UserMapper userMapper;
     @Db
     private PortPoolMapper portPoolMapper;
+    @Db
+    private DomainMapper domainMapper;
+    @Db
+    private DomainPortMappingMapper domainPortMappingMapper;
     @Inject
     private VisitorChannelService visitorChannelService;
 
@@ -82,7 +80,6 @@ public class PortMappingService implements LifecycleBean {
 
     /** 端口到安全组Id的映射 */
     private final Map<Integer, Integer> mappingPortToSecurityGroupMap = new ConcurrentHashMap<>();
-    // 服务端端口到端口映射id的映射
     private final Cache<Integer, Integer> serverPortToPortMappingIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
     // 端口映射id到licenseId
     private final Cache<Integer, Integer> idToLicenseIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
@@ -118,6 +115,11 @@ public class PortMappingService implements LifecycleBean {
         Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
         Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
 
+        //域名相关
+        Set<Integer> portMappingIds = respList.stream().map(PortMappingListRes::getId).collect(Collectors.toSet());
+        List<FullDomainNameBO> fullDomainNameBOS = domainMapper.selectFullDomainNameListByPortMappingIds(portMappingIds);
+        Map<Integer, List<FullDomainNameBO>> fullDomainNameBOMap = fullDomainNameBOS.stream().collect(Collectors.groupingBy(FullDomainNameBO::getPortMappingId));
+
         respList.forEach(item -> {
             LicenseDO license = licenseMap.get(item.getLicenseId());
             if (null == license) {
@@ -130,9 +132,8 @@ public class PortMappingService implements LifecycleBean {
                 return;
             }
             item.setUserName(user.getName());
-            if (StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(item.getSubdomain())) {
-                item.setDomain(item.getSubdomain() + "." + proxyConfig.getServer().getTcp().getDomainName());
-            }
+            //域名映射
+            item.setFullDomainMappings(fullDomainNameBOMap.get(item.getId()));
             if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) {
                 item.setProtocal("HTTP(S)");
             }
@@ -154,13 +155,25 @@ public class PortMappingService implements LifecycleBean {
         PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
         ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
         ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), null), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
-        ParamCheckUtil.checkExpression(!portMappingMapper.checkRepeatBySubdomain(req.getSubdomain(), null), ExceptionConstant.PORT_MAPPING_SUBDONAME_CONNOT_REPEAT);
+        //验证域名映射相关参数条件
+        if (NetworkProtocolEnum.isHttp(req.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
+            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
+            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
+            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
 
+            req.getDomainMappings().forEach(item -> {
+                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
+                ParamCheckUtil.checkNotNull(domainNameDO, ExceptionConstant.DOMAIN_NAME_NOT_EXIST);
+                //检查当前域名是否被禁用
+                //ParamCheckUtil.checkExpression(Objects.equals(EnableStatusEnum.ENABLE.getStatus(), domainNameDO.getEnable()), ExceptionConstant.DOMAIN_NAME_IS_DISABLE, domainNameDO.getDomain());
+                //检查子域名是否重复
+                ParamCheckUtil.checkExpression(!domainPortMappingMapper.checkRepeatBySubdomain(item.getSubdomain(), item.getDomainId(), null), ExceptionConstant.SUDOMAIN_NAME_CANNOT_REPEAT);
+            });
+        }
         Date now = new Date();
         PortMappingDO portMappingDO = new PortMappingDO();
         portMappingDO.setLicenseId(req.getLicenseId());
         portMappingDO.setProtocal(req.getProtocal());
-        portMappingDO.setSubdomain(req.getSubdomain());
         portMappingDO.setServerPort(req.getServerPort());
         portMappingDO.setClientIp(req.getClientIp());
         portMappingDO.setClientPort(req.getClientPort());
@@ -176,9 +189,24 @@ public class PortMappingService implements LifecycleBean {
         portMappingMapper.insert(portMappingDO);
         // 更新VisitorChannel
         visitorChannelService.addVisitorChannelByPortMapping(portMappingDO);
-        // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
+
+        // 更新域名映射，添加新的域名映射
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
+            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
+            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
+            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
+
+            req.getDomainMappings().forEach(item -> {
+                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
+                //创建域名映射
+                DomainPortMappingDO domainPortMappingDO = new DomainPortMappingDO();
+                domainPortMappingDO.setDomainNameId(item.getDomainId());
+                domainPortMappingDO.setSubdomain(item.getSubdomain());
+                domainPortMappingDO.setPortMappingId(portMappingDO.getId());
+                domainPortMappingMapper.insert(domainPortMappingDO);
+                //设置完整域名到服务端端口的映射
+                ProxyUtil.setFullDomainToServerPort(StrUtil.join(StrPool.DOT, item.getSubdomain(), domainNameDO.getDomain()), portMappingDO.getServerPort());
+            });
         }
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
@@ -203,17 +231,29 @@ public class PortMappingService implements LifecycleBean {
         PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
         ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
         ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
-        ParamCheckUtil.checkExpression(!portMappingMapper.checkRepeatBySubdomain(req.getSubdomain(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_MAPPING_SUBDONAME_CONNOT_REPEAT);
-
         // 查询原端口映射
         PortMappingDO oldPortMappingDO = portMappingMapper.findById(req.getId());
         ParamCheckUtil.checkNotNull(oldPortMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
+        //验证域名映射相关参数条件
+        if (NetworkProtocolEnum.isHttp(req.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
+            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
+            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
+            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
+
+            req.getDomainMappings().forEach(item -> {
+                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
+                ParamCheckUtil.checkNotNull(domainNameDO, ExceptionConstant.DOMAIN_NAME_NOT_EXIST);
+                //检查子域名是否重复
+                boolean b = !domainPortMappingMapper.checkRepeatBySubdomain(item.getSubdomain(), item.getDomainId(), item.getId());
+                ParamCheckUtil.checkExpression(b,
+                    ExceptionConstant.SUDOMAIN_NAME_CANNOT_REPEAT);
+            });
+        }
         // 更新端口映射
         portMappingMapper.update(null, new LambdaUpdateWrapper<PortMappingDO>()
             .eq(PortMappingDO::getId, req.getId())
             .set(PortMappingDO::getProtocal, req.getProtocal())
-            .set(PortMappingDO::getSubdomain, req.getSubdomain())
             .set(PortMappingDO::getServerPort, req.getServerPort())
             .set(PortMappingDO::getClientIp, req.getClientIp())
             .set(PortMappingDO::getClientPort, req.getClientPort())
@@ -229,13 +269,34 @@ public class PortMappingService implements LifecycleBean {
         // 更新VisitorChannel
         PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
         visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
-        // 删除老的域名映射
-        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal()) && StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
-            ProxyUtil.removeSubdomainToServerPort(oldPortMappingDO.getSubdomain());
-        }
+
         // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
+        // 删除老的域名映射
+        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal())) {
+            //删除完整域名到服务端端口的映射
+            ProxyUtil.removeFullDomainToServerPortByServerPort(oldPortMappingDO.getServerPort());
+            //删除旧的域名映射
+            LambdaQueryWrapper<DomainPortMappingDO> lambdaQueryWrapper = Wrappers.<DomainPortMappingDO>lambdaQuery()
+                .eq(DomainPortMappingDO::getPortMappingId, oldPortMappingDO.getId());
+            domainPortMappingMapper.delete(lambdaQueryWrapper);
+        }
+        // 添加新的域名映射
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
+            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
+            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
+            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
+
+            req.getDomainMappings().forEach(item -> {
+                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
+                //创建域名映射
+                DomainPortMappingDO domainPortMappingDO = new DomainPortMappingDO();
+                domainPortMappingDO.setDomainNameId(item.getDomainId());
+                domainPortMappingDO.setSubdomain(item.getSubdomain());
+                domainPortMappingDO.setPortMappingId(portMappingDO.getId());
+                domainPortMappingMapper.insert(domainPortMappingDO);
+                //设置完整域名到服务端端口的映射
+                ProxyUtil.setFullDomainToServerPort(StrUtil.join(StrPool.DOT, item.getSubdomain(), domainNameDO.getDomain()), portMappingDO.getServerPort());
+            });
         }
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
@@ -316,9 +377,15 @@ public class PortMappingService implements LifecycleBean {
 
         // 更新VisitorChannel
         visitorChannelService.removeVisitorChannelByPortMapping(portMappingDO);
-        // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.removeSubdomainToServerPort(portMappingDO.getSubdomain());
+
+        // 删除域名映射
+        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal())) {
+            //删除完整域名到服务端端口的映射
+            ProxyUtil.removeFullDomainToServerPortByServerPort(portMappingDO.getServerPort());
+            //删除旧的域名映射
+            LambdaQueryWrapper<DomainPortMappingDO> lambdaQueryWrapper = Wrappers.<DomainPortMappingDO>lambdaQuery()
+                .eq(DomainPortMappingDO::getPortMappingId, portMappingDO.getId());
+            domainPortMappingMapper.delete(lambdaQueryWrapper);
         }
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), null);
@@ -391,24 +458,6 @@ public class PortMappingService implements LifecycleBean {
             // 刷新流量限制缓存
             refreshFlowLimitCache(item.getId(), item.getUpLimitRate(), item.getDownLimitRate());
         });
-
-        // 未配置域名，则不需要处理域名映射逻辑
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName())) {
-            return;
-        }
-        List<PortMappingDO> portMappingDOList = allMappingDOList.stream()
-            .filter(item -> NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal()) && item.getSubdomain() != null)
-            .collect(Collectors.toList());
-        if (CollectionUtil.isEmpty(portMappingDOList)) {
-            return;
-        }
-        portMappingDOList.forEach(item -> {
-            if (StrUtil.isBlank(item.getSubdomain())) {
-                return;
-            }
-            ProxyUtil.setSubdomainToServerPort(item.getSubdomain(), item.getServerPort());
-
-        });
     }
 
     /**

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.service;
 
 import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;

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

@@ -3,6 +3,7 @@ package org.dromara.neutrinoproxy.server.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.core.util.DateUtil;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
@@ -131,6 +132,7 @@ public class UserService {
 
 	public PageInfo<UserListRes> page(PageQuery pageQuery, UserListReq req) {
         Page<UserDO> page = userMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<UserDO>()
+            .like(StringUtils.isNotBlank(req.getName()), UserDO::getName, req.getName())
             .orderByAsc(UserDO::getId)
         );
         List<UserListRes> respList = page.getRecords().stream().map(UserDO::toRes).collect(Collectors.toList());

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

@@ -0,0 +1,40 @@
+package org.dromara.neutrinoproxy.server.service.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.HttpsStatusEnum;
+
+/**
+ * 完整域名
+ * @author: mirac
+ * @date: 2024/8/8
+ */
+@Data
+@Accessors(chain = true)
+public class FullDomainNameBO {
+    /**
+     * 域名端口映射id
+     */
+    private Integer id;
+    /**
+     * 端口映射id
+     */
+    private Integer portMappingId;
+    /**
+     * 子域名
+     */
+    private String subdomain;
+    /**
+     * 域名id
+     */
+    private Integer domainNameId;
+    /**
+     * 域名
+     */
+    private String domain;
+    /**
+     * 强制使用HTTPS(1、是 2、否)
+     * {@link HttpsStatusEnum}
+     */
+    private Integer forceHttps;
+}

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

@@ -1,24 +1,3 @@
-/**
- * Copyright (c) 2022 aoshiguchen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
 package org.dromara.neutrinoproxy.server.util;
 
 import java.math.BigInteger;

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.ChannelAttribute;
-import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
 import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
@@ -19,6 +18,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -32,7 +32,7 @@ public class ProxyUtil {
 	 */
 	private static final Map<Integer, Set<Integer>> licenseToServerPortMap = new HashMap<>();
 	/**
-	 * 代理信息映射
+	 * 代理信息映射 e.g.: 9104 -> 127.0.0.1:8848
 	 */
 	private static final Map<Integer, String> proxyInfoMap = new ConcurrentHashMap<>();
 	/**
@@ -61,9 +61,13 @@ public class ProxyUtil {
 	 */
 	private static Map<String, ProxyAttachment> proxyConnectAttachmentMap = new HashMap<>();
 	/**
-	 * 子域名 - 服务端端口映射
+	 * 完整域名 - 服务端端口映射
 	 */
-	private static Map<String, Integer> subdomainToServerPort = new HashMap<>();
+	private static Map<String, Integer> fullDomainToServerPortMap = new ConcurrentHashMap<>();
+    /**
+     * 主域名 - 域名id映射
+     */
+    private static Map<String, Integer> domainToDomainNameIdMap = new ConcurrentHashMap<>();
 	/**
 	 * licenseId - 客户端Id映射
 	 */
@@ -339,32 +343,86 @@ public class ProxyUtil {
 	}
 
 	/**
-	 * 设置子域名到服务端端口的映射
-	 * @param subdomain
+	 * 设置完整域名到服务端端口的映射
+	 * @param fullDomain
 	 * @param serverPort
 	 */
-	public static void setSubdomainToServerPort(String subdomain, Integer serverPort) {
-		subdomainToServerPort.put(subdomain, serverPort);
+	public static void setFullDomainToServerPort(String fullDomain, Integer serverPort) {
+        fullDomainToServerPortMap.put(fullDomain, serverPort);
 	}
 
 	/**
-	 * 删除子域名到服务端端口的映射
-	 * @param subdomain
+	 * 删除完整域名到服务端端口的映射
+	 * @param fullDomain
 	 */
-	public static void removeSubdomainToServerPort(String subdomain) {
-		subdomainToServerPort.remove(subdomain);
+	public static void removeFullDomainToServerPort(String fullDomain) {
+        fullDomainToServerPortMap.remove(fullDomain);
 	}
 
+    /**
+     * 通过服务器端口删除完整域名到服务端端口的映射
+     * @param serverPort
+     */
+    public static void removeFullDomainToServerPortByServerPort(Integer serverPort) {
+        fullDomainToServerPortMap.entrySet().removeIf(entry -> Objects.equals(entry.getValue(), serverPort));
+    }
+
 	/**
-	 * 根据子域名获取外网端口
-	 * @param subdomain
+	 * 根据完整域名获取外网端口
+	 * @param fullDomain
 	 * @return
 	 */
-	public static Integer getServerPortBySubdomain(String subdomain) {
-		return subdomainToServerPort.get(subdomain);
+	public static Integer getServerPortByFullDomain(String fullDomain) {
+		return fullDomainToServerPortMap.get(fullDomain);
 	}
 
-	/**
+    /**
+     * 添加域名到域名id的映射
+     */
+    public static void setDomainToDomainNameId(String domain, Integer domainNameId) {
+        domainToDomainNameIdMap.put(domain, domainNameId);
+    }
+
+    /**
+     * 删除域名到域名id的映射
+     */
+    public static void removeDomainToDomainNameId(String domain) {
+        domainToDomainNameIdMap.remove(domain);
+    }
+
+    /**
+     * 通过主域名获取域名id
+     */
+    public static Integer getDomainNameIdByDomain(String domain) {
+        return domainToDomainNameIdMap.get(domain);
+    }
+
+    /**
+     * 通过完整域名获取域名id
+     */
+    public static Integer getDomainNameIdByFullDomain(String fullDomain) {
+        List<String> domains = domainToDomainNameIdMap.keySet().stream().sorted((a,b) -> b.length() - a.length()).filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList());
+        // 不存在，返回null
+        if (CollectionUtil.isEmpty(domains)) {
+            return null;
+        }
+        // 优先匹配最长的域名，默认取第一个，后续思考如何优化
+        return getDomainNameIdByDomain(domains.get(0));
+    }
+
+    /**
+     * 通过完整域名获取域名
+     */
+    public static String getDomainNameByFullDomain(String fullDomain) {
+        List<String> domains = domainToDomainNameIdMap.keySet().stream().filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList());
+        // 不存在 或者 有多条记录，返回null
+        if (CollectionUtil.isEmpty(domains) || domains.size() > 1) {
+            return null;
+        }
+        return domains.getFirst();
+    }
+
+    /**
 	 * 关闭http响应channel
 	 * @param channel
 	 * @return

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

@@ -1,6 +1,6 @@
 server:
   # 服务端web端口，用于支持HTTP接口，管理后台页面访问
-  port: 8888
+  port: ${WEB_PORT:8888}
 # 日志级别
 solon.logging:
   logger:
@@ -18,9 +18,9 @@ neutrino:
       boss-thread-count: 2
       work-thread-count: 10
       # 隧道非SSL端口
-      port: 9000
+      port: ${OPEN_PORT:9000}
       # 隧道SSL端口
-      ssl-port: 9002
+      ssl-port: ${SSL_PORT:9002}
       # 隧道SSL证书配置
       key-store-password: 123456
       key-manager-password: 123456
@@ -34,15 +34,10 @@ neutrino:
         # 线程池相关配置，用于技术调优，可忽略
         boss-thread-count: 5
         work-thread-count: 20
-        # http代理端口，默认80
-        http-proxy-port: 80
-        # https代理端口，默认443 （需要配置域名、证书）
-        https-proxy-port: 443
-        # 如果不配置，则不支持域名映射
-        domain-name:
-        # https证书配置
-        key-store-password:
-        jks-path:
+        # http代理端口，默认80（不配置不支持）
+        http-proxy-port: ${HTTP_PROXY_PORT:80}
+        # https代理端口，默认443 （不配置不支持，同时需要配置域名、证书）
+        https-proxy-port: ${HTTPS_PROXY_PORT:443}
         # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
         transfer-log-enable: false
       udp:
@@ -54,10 +49,10 @@ neutrino:
   data:
     db:
       # 数据库类型，目前支持h2、mysql、mariadb
-      type: h2
+      type: ${DB_TYPE:h2}
       # 数据库连接URL
-      url: jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE
+      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
       # 数据库用户名
-      username:
+      username: ${DB_USER:}
       # 数据库密码
-      password:
+      password: ${DB_PASSWORD:}

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

@@ -5,7 +5,7 @@ server:
 solon:
   app:
     name: neutrino-proxy-server
-    version: 2.0.1
+    version: 2.0.2
   config:
     add: ./app.yml
 # 日志级别
@@ -54,15 +54,10 @@ neutrino:
         # 线程池相关配置，用于技术调优，可忽略
         boss-thread-count: 5
         work-thread-count: 20
-        # http代理端口，默认80
+        # http代理端口，默认80（不配置不支持）
         http-proxy-port: ${HTTP_PROXY_PORT:80}
-        # https代理端口，默认443 （需要配置域名、证书）
+        # https代理端口，默认443 （不配置不支持，同时需要配置域名、证书）
         https-proxy-port: ${HTTPS_PROXY_PORT:443}
-        # 如果不配置，则不支持域名映射
-        domain-name: ${DOMAIN_NAME:}
-        # https证书配置
-        key-store-password: ${HTTPS_STORE_PASS:}
-        jks-path: ${HTTPS_JKS_PATH:}
         # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
         transfer-log-enable: ${SERVER_LOG:false}
       udp:

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

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.DomainMapper">
+
+    <select id="selectFullDomainNameListByPortMappingIds" resultType="org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO">
+        SELECT dpm.id as id, pm.id AS portMappingId, dpm.subdomain as subdomain, dn.domain AS domain, dn.id as domainNameId, dn.force_https as forceHttps
+        FROM domain_port_mapping dpm
+        LEFT JOIN port_mapping pm ON pm.id = dpm.port_mapping_id
+        LEFT JOIN domain_name dn ON dn.id = dpm.domain_name_id
+        WHERE pm.id IN
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+    <select id="selectFullDomainNameList"
+            resultType="org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO">
+        SELECT dpm.id as id, pm.id AS portMappingId, dpm.subdomain as subdomain, dn.domain AS domain, dn.id as domainNameId, dn.force_https as forceHttps
+        FROM domain_port_mapping dpm
+        LEFT JOIN port_mapping pm ON pm.id = dpm.port_mapping_id
+        LEFT JOIN domain_name dn ON dn.id = dpm.domain_name_id
+    </select>
+    <select id="selectFullDomainNameListByDomainNameIds"
+            resultType="org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO">
+        SELECT dpm.id as id, pm.id AS portMappingId, dpm.subdomain as subdomain, dn.domain AS domain, dn.id as domainNameId, dn.force_https as forceHttps
+        FROM domain_port_mapping dpm
+        LEFT JOIN port_mapping pm ON pm.id = dpm.port_mapping_id
+        LEFT JOIN domain_name dn ON dn.id = dpm.domain_name_id
+        WHERE dn.id IN
+        <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+</mapper>

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

@@ -48,7 +48,7 @@
         LEFT JOIN `user` u ON l.user_id = u.id
         LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_month GROUP BY license_id) frm ON l.id = frm.license_id
         LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_day
-        WHERE date >= #{curMonthBeginDate} AND #{curDayBeginDate}
+        WHERE date >= #{curMonthBeginDate} AND date <= #{curDayBeginDate}
         GROUP BY license_id) frd ON l.id = frd.license_id
         LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_minute
         WHERE date >= #{curDayBeginDate} AND date <= #{curDate}

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

@@ -97,9 +97,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `license_id` INTEGER(20) NOT NULL,
   `protocal` VARCHAR(10) NOT NULL DEFAULT 'TCP',
-  `subdomain` VARCHAR(50) DEFAULT NULL,
   `server_port` INTEGER NOT NULL,
-  `client_ip` VARCHAR(20) NOT NULL,
+  `client_ip` VARCHAR(255) NOT NULL,
   `client_port` INTEGER NOT NULL,
   `up_limit_rate` VARCHAR(20) DEFAULT NULL,
   `down_limit_rate` VARCHAR(20) DEFAULT NULL,
@@ -114,6 +113,32 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_port_mapping_server_port ON port_mapping (server_port ASC);
 
+#域名表
+CREATE TABLE IF NOT EXISTS `domain_name` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `domain` VARCHAR(50) NOT NULL,
+    `user_id` INTEGER NOT NULL,
+    `jks` BLOB DEFAULT NULL,
+    `key_store_password` varchar(255) DEFAULT NULL,
+    `is_default` INTEGER(2) NOT NULL,
+    `force_https` INTEGER(2) NOT NULL,
+    `enable` INTEGER(2) NOT NULL,
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL
+);
+CREATE UNIQUE INDEX IF NOT EXISTS I_domain_name_domain ON domain_name (`domain` ASC);
+
+#域名映射中间表
+CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `subdomain` VARCHAR(50) NOT NULL,
+    `domain_name_id` INTEGER NOT NULL,
+    `port_mapping_id` INTEGER NOT NULL
+);
+CREATE UNIQUE INDEX IF NOT EXISTS I_unique_domain_port_mapping ON domain_port_mapping (`domain_name_id` ASC, `subdomain` ASC);
+CREATE INDEX IF NOT EXISTS I_domain_port_mapping_domain_name_id ON domain_port_mapping (`domain_name_id` ASC);
+CREATE INDEX IF NOT EXISTS I_domain_port_mapping_port_mapping_id ON domain_port_mapping (`port_mapping_id` ASC);
+
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (

neutrino-proxy-server/src/main/resources/sql/h2/port_mapping.data.sql

@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1,'test3', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1,'test3', now(), now());

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

@@ -0,0 +1,28 @@
+#域名表
+CREATE TABLE IF NOT EXISTS `domain_name` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `domain` VARCHAR(50) NOT NULL,
+    `user_id` INTEGER NOT NULL,
+    `jks` BLOB DEFAULT NULL,
+    `key_store_password` varchar(255) DEFAULT NULL,
+    `is_default` INTEGER(2) NOT NULL,
+    `force_https` INTEGER(2) NOT NULL,
+    `enable` INTEGER(2) NOT NULL,
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL
+    );
+CREATE UNIQUE INDEX IF NOT EXISTS I_domain_name_domain ON domain_name (`domain` ASC);
+
+#域名映射中间表
+CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+    `subdomain` VARCHAR(50) NOT NULL,
+    `domain_name_id` INTEGER NOT NULL,
+    `port_mapping_id` INTEGER NOT NULL
+    );
+CREATE UNIQUE INDEX IF NOT EXISTS I_unique_domain_port_mapping ON domain_port_mapping (`domain_name_id` ASC, `subdomain` ASC);
+CREATE INDEX IF NOT EXISTS I_domain_port_mapping_domain_name_id ON domain_port_mapping (`domain_name_id` ASC);
+CREATE INDEX IF NOT EXISTS I_domain_port_mapping_port_mapping_id ON domain_port_mapping (`port_mapping_id` ASC);
+
+# port_mapping表删除字段
+ALTER TABLE `port_mapping` DROP COLUMN `subdomain`;

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

@@ -102,9 +102,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `license_id` int NOT NULL COMMENT 'licenseID',
     `protocal` varchar(10) NOT NULL DEFAULT 'TCP' COMMENT '协议',
-    `subdomain` varchar(50) DEFAULT NULL COMMENT '子域名（仅HTTP时有效）',
     `server_port` int NOT NULL COMMENT '服务端端口',
-    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
+    `client_ip` varchar(255) NOT NULL COMMENT '客户端IP',
     `client_port` int NOT NULL COMMENT '客户端端口',
     `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
     `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
@@ -119,6 +118,34 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     PRIMARY KEY (`id`),
     KEY `I_port_mapping_server_port` (`server_port`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#域名表
+CREATE TABLE IF NOT EXISTS `domain_name` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `domain` varchar(50) NOT NULL COMMENT '域名',
+    `user_id` int NOT NULL COMMENT '用户Id',
+    `jks` BLOB DEFAULT NULL COMMENT 'jks文件',
+    `key_store_password` varchar(255) DEFAULT NULL COMMENT 'jks密码',
+    `is_default` int(2) NOT NULL COMMENT '是否开启默认域名（1、开启 2、关闭）',
+    `force_https` int(2) NOT NULL COMMENT '是否启用强制https（1、开启 2、关闭）',
+    `enable` int(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    `update_time` datetime NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_domain_name_domain` (`domain` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#域名映射中间表
+CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '创建时间',
+    `subdomain` varchar(50) NOT NULL COMMENT '子域名',
+    `domain_name_id` int NOT NULL COMMENT '域名Id',
+    `port_mapping_id` int NOT NULL COMMENT '端口映射Id',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_unique_domain_port_mapping` (`domain_name_id` ASC, `subdomain` ASC),
+    INDEX `I_domain_port_mapping_domain_name_id` (`domain_name_id` ASC),
+    INDEX `I_domain_port_mapping_port_mapping_id` (`port_mapping_id` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (

neutrino-proxy-server/src/main/resources/sql/mariadb/port_mapping.data.sql

@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1, now(), now());

neutrino-proxy-server/src/main/resources/sql/mysql/domain_name.data.sql

@@ -0,0 +1,3 @@
+#域名表
+INSERT INTO domain_name(`id`, `domain`, `user_id`, `jks`, `key_store_password`, `is_default`, `force_https`, `enable`,`create_time`, `update_time`) VALUES
+(1, 'default.fun', 1, null, null, 1, 2, 1, now(), now());

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

@@ -102,9 +102,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
     `license_id` int NOT NULL COMMENT 'licenseID',
     `protocal` varchar(10) NOT NULL DEFAULT 'TCP' COMMENT '协议',
-    `subdomain` varchar(50) DEFAULT NULL COMMENT '子域名（仅HTTP时有效）',
     `server_port` int NOT NULL COMMENT '服务端端口',
-    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
+    `client_ip` varchar(255) NOT NULL COMMENT '客户端IP',
     `client_port` int NOT NULL COMMENT '客户端端口',
     `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
     `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
@@ -119,6 +118,34 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     PRIMARY KEY (`id`),
     KEY `I_port_mapping_server_port` (`server_port`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#域名表
+CREATE TABLE IF NOT EXISTS `domain_name` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `domain` varchar(50) NOT NULL COMMENT '域名',
+    `user_id` int NOT NULL COMMENT '用户Id',
+    `jks` BLOB DEFAULT NULL COMMENT 'jks文件',
+    `key_store_password` varchar(255) DEFAULT NULL COMMENT 'jks密码',
+    `is_default` int(2) NOT NULL COMMENT '是否开启默认域名（1、开启 2、关闭）',
+    `force_https` int(2) NOT NULL COMMENT '是否启用强制https（1、开启 2、关闭）',
+    `enable` int(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    `update_time` datetime NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_domain_name_domain` (`domain` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#域名映射中间表
+CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '创建时间',
+    `subdomain` varchar(50) NOT NULL COMMENT '子域名',
+    `domain_name_id` int NOT NULL COMMENT '域名Id',
+    `port_mapping_id` int NOT NULL COMMENT '端口映射Id',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_unique_domain_port_mapping` (`domain_name_id` ASC, `subdomain` ASC),
+    INDEX `I_domain_port_mapping_domain_name_id` (`domain_name_id` ASC),
+    INDEX `I_domain_port_mapping_port_mapping_id` (`port_mapping_id` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (

neutrino-proxy-server/src/main/resources/sql/mysql/port_mapping.data.sql

@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1, now(), now());

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

@@ -0,0 +1,30 @@
+#域名表
+CREATE TABLE IF NOT EXISTS `domain_name` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `domain` varchar(50) NOT NULL COMMENT '域名',
+    `user_id` int NOT NULL COMMENT '用户Id',
+    `jks` BLOB DEFAULT NULL COMMENT 'jks文件',
+    `key_store_password` varchar(255) DEFAULT NULL COMMENT 'jks密码',
+    `is_default` int(2) NOT NULL COMMENT '是否开启默认域名（1、开启 2、关闭）',
+    `force_https` int(2) NOT NULL COMMENT '是否启用强制https（1、开启 2、关闭）',
+    `enable` int(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `create_time` datetime NOT NULL COMMENT '创建时间',
+    `update_time` datetime NOT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_domain_name_domain` (`domain` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+#域名映射中间表
+CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
+    `id` int NOT NULL AUTO_INCREMENT COMMENT '创建时间',
+    `subdomain` varchar(50) NOT NULL COMMENT '子域名',
+    `domain_name_id` int NOT NULL COMMENT '域名Id',
+    `port_mapping_id` int NOT NULL COMMENT '端口映射Id',
+    PRIMARY KEY (`id`),
+    UNIQUE INDEX `I_unique_domain_port_mapping` (`domain_name_id` ASC, `subdomain` ASC),
+    INDEX `I_domain_port_mapping_domain_name_id` (`domain_name_id` ASC),
+    INDEX `I_domain_port_mapping_port_mapping_id` (`port_mapping_id` ASC)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+# port_mapping表删除字段
+ALTER TABLE `port_mapping` DROP COLUMN `subdomain`;

neutrino-proxy-vuepress/README.MD

@@ -8,3 +8,5 @@
 [主题仓库](https://github.com/xugaoyi/vuepress-theme-vdoing)
 
 [本仓库的gitee镜像](https://gitee.com/xugaoyi/vuepress-theme-vdoing-doc)
+
+hello11

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

@@ -9,7 +9,8 @@ module.exports = {
 
     title: "中微子代理",
     description: '一个基于Netty的开源内网穿透神器',
-    base: '/neutrino-proxy/', // 默认'/'。如果你想将你的网站部署到如 https://foo.github.io/bar/，那么 base 应该被设置成 "/bar/",（否则页面将失去样式等文件）
+    // base: '/neutrino-proxy/', // 默认'/'。如果你想将你的网站部署到如 https://foo.github.io/bar/，那么 base 应该被设置成 "/bar/",（否则页面将失去样式等文件）
+    base: '/',
     head: [ // 注入到页面<head> 中的标签，格式[tagName, { attrName: attrValue }, innerHTML?]
         ['link', {rel: 'icon', href: '/img/favicon.ico'}], //favicons，资源放在public文件夹
         ['meta', {name: 'keywords', content: 'vuepress,theme,blog,vdoing'}],
@@ -33,6 +34,7 @@ module.exports = {
             {text: '案例', link: '/pages/5d571c/'},
             {text: '支持', link: '/pages/1ab20b/'},
             {text: '更新记录', link: '/pages/ff3519/'},
+            {text: 'GitCode', link: 'https://gitcode.com/dromara/neutrino-proxy'},
             {text: 'Gitee', link: 'https://gitee.com/dromara/neutrino-proxy'},
         ],
         sidebarDepth: 2, // 侧边栏显示深度，默认1，最大2（显示到h3标题）

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

@@ -6,7 +6,7 @@ article: false
 ---
 
 ::: tip
-当前最新版本：2.0.1。从之前的版本升级过来，请参照：更新记录 > 版本记录
+当前最新版本：2.0.3。从之前的版本升级过来，请参照：更新记录 > 版本记录.
 :::
 
 ## 1、快速上手须知
@@ -16,8 +16,7 @@ article: false
 - 快速上手中涉及到的配置，仅仅是快速体验所必须的配置，完整的配置请参照使用须知中的`服务端配置`、`客户端配置`
 
 ## 2、部署服务
-- 根据需要自行选择jar、docker、原生部署任意一种完成部署
-- 三种方式分别参见对应的文档
+- 根据需要自行选择宝塔面板、jar、docker、原生部署、docker-compose任意一种完成部署，分别参见对应的文档
 - 任何一种部署方式，不要求客户端与服务端一致。如：服务端采用docker部署，客户端可以用docker部署、也可以用jar、原生部署
 - 管理后台说明
   - 服务端部署成功后，访问http://{服务端IP}:8888打开后台管理页面。使用默认的管理员帐号登录：admin/123456

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/02.通过宝塔面板部署.md

@@ -0,0 +1,43 @@
+---
+title: 通过宝塔面板部署
+date: 2024-23-20 13:32:00
+permalink: /pages/9e0fde/
+article: false
+---
+
+## 前提
+- 仅适用于宝塔面板9.2.0及以上版本
+- 安装宝塔面板，前往[宝塔面板](https://www.bt.cn/new/download.html?r=dk_neuproxy)官网，选择正式版的脚本下载安装
+
+## 部署
+#### 1、登录宝塔面板，在左侧菜单栏中点击`Docker`
+
+<img :src="$withBase('/img/baota/step1.png')"></img>
+
+#### 2、首次会提示安装Docker和Docker Compose服务，点击立即安装，若已安装请忽略。
+
+<img :src="$withBase('/img/baota/step2.png')"></img>
+
+#### 3、安装完成后在Docker-应用商店中找到 中微子代理(搜索“NeutrinoProxy”)，点击安装
+
+<img :src="$withBase('/img/baota/step3.png')"></img>
+
+#### 4、设置基本信息，点击确定
+- 名称：应用名称，默认`neuproxy_随机字符`
+- 版本：默认`latest`
+- 允许外部访问：如您需通过`IP+Port`直接访问，请勾选，如您已经设置了域名，请不要勾选此处
+- web管理端口：默认`9988`,可自行修改
+- 客户端连接端口：默认`9989`，可自行修改
+- 客户端SSL连接端口：默认`9990`，可自行修改
+
+<img :src="$withBase('/img/baota/step4.png')"></img>
+
+#### 5、提交后面板会自动进行应用初始化，大概需要`1-3`分钟，初始化完成后即可访问。
+- 如果部署失败，可能是从DockerHub拉取镜像失败，可以自行设置镜像加速。
+
+<img :src="$withBase('/img/baota/step5.png')"></img>
+
+#### 6、访问中微子代理管理后台
+<img :src="$withBase('/img/baota/step6.png')"></img>
+
+

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

@@ -6,12 +6,12 @@ permalink: /pages/eebea1/
 
 ## 1、环境准备
 - 首先确保已安装Java21运行环境
-- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jdk21-2.0.1-jar.zip`、`neutrino-proxy-client-jdk21-2.0.1-jar.zip`
+- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jdk21-2.0.2-jar.zip`、`neutrino-proxy-client-jdk21-2.0.2-jar.zip`
 
 
 ## 2、部署服务端
 - 在服务器上新建部署目录：`/work/projects/neutrino-proxy-server`
-- 将`neutrino-proxy-server-jdk21-2.0.1-jar.zip`上传至服务器部署目录,并解压
+- 将`neutrino-proxy-server-jdk21-2.0.2-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-jdk21-2.0.1-jar.zip`文件
+- 本地解压`neutrino-proxy-client-jdk21-2.0.2-jar.zip`文件
 - 修改`app.yml`文件中的server-ip为服务器公网ip，并配置license-key，以下是相关的部分配置：
 ```yml
 neutrino:

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

@@ -5,6 +5,8 @@ permalink: /pages/5b9bef/
 ---
 
 ## 1、 部署服务端
+- dockerHub镜像地址：aoshiguchen/neutrino-proxy-server:latest
+- 阿里云镜像地址：registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
 ### 使用默认h2数据库一键部署
 ```shell
 docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
@@ -34,6 +36,8 @@ neutrino:
 - 然后再执行上面的docker一键部署命令即可
 
 ## 2、部署客户端
+- dockerHub镜像地址：aoshiguchen/neutrino-proxy-client:latest
+- 阿里云镜像地址：registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy-client:latest
 - 命令中的服务端ip、license请自行补充
 - 若是首次使用，请仔细阅读快速上手，以确定license从哪里取得
 ```shell 

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

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

neutrino-proxy-vuepress/docs/01.使用教程/01.安装部署/06.使用docker-compose部署.md

@@ -0,0 +1,30 @@
+---
+title: 使用docker-compose部署
+date: 2024-12-07 14:40:50
+permalink: /pages/2d4123/
+---
+
+## 1、 部署服务端
+### 使用默认h2数据库一键部署
+- 注意自行修改配置文件：config/app.yml
+```shell
+git clone https://gitee.com/dromara/neutrino-proxy.git
+cd neutrino-proxy/scripts/docker-compose/neutrino-proxy-server-h2
+docker-compose up -d
+```
+
+### 使用默认mysql数据库一键部署
+- 注意自行修改配置文件：config/app.yml
+```shell
+git clone https://gitee.com/dromara/neutrino-proxy.git
+cd neutrino-proxy/scripts/docker-compose/neutrino-proxy-server-mysql
+docker-compose up -d
+```
+
+## 2、部署客户端
+- 注意自行修改配置文件：config/app.yml
+```shell
+git clone https://gitee.com/dromara/neutrino-proxy.git
+cd neutrino-proxy/scripts/docker-compose/neutrino-proxy-client
+docker-compose up -d
+```

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

@@ -21,6 +21,7 @@ article: false
   - 默认所有代理没有限速
   - 对License限速，将使得License下的所有端口映射都被限速
   - 若License设置了限速，License下的某条映射也设置了限速，则对于该映射优先采用端口映射上的限速规则
+- 域名管理：用于管理服务器主域名和证书，用于支持域名映射。一个主域名域名可以创建多个域名映射（配置不同的子域名）。
 
 <img :src="$withBase('/img/run-example/license2.png')"></img>
 <img :src="$withBase('/img/run-example/port-mapping2.png')"></img>

neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/03.域名映射.md

@@ -6,6 +6,7 @@ permalink: /pages/269a2e/
 
 # 什么是域名映射？
 域名映射是将指定端口映射绑定到某一个子域名上，通过直接访问域名的方式，达到访问被代理服务的目的。
+支持维护多个主域名并为多个主域名配置不同的子域名实现域名映射。
 
 # 域名映射能解决什么问题？
 - 1、当服务端端口需要经常变动的时候，可以通过固定域名的方式，使得开发调试能够长期稳定的进行，不用每次更改访问地址。
@@ -17,8 +18,8 @@ permalink: /pages/269a2e/
 
 ## 情况1：代理服务端使用80端口
 - 1、DNS解析配置泛域名解析 proxy.asgc.fun 指向代理服务端IP
-- 2、代理服务端app.yml配置域名：proxy.asgc.fun，部署
-- 3、服务端管理后台新建端口映射，协议选择：HTTP，设置好子域名，如：test1
+- 2、服务端管理后台域名管理新建域名，如：asgc.fun
+- 3、服务端管理后台新建端口映射，协议选择：HTTP(S)，选择主域名并设置好子域名，如：test1.proxy
 - 4、配置好客户端并启动，代理映射完成
 - 5、通过访问: http://test1.proxy.asgc.fun 实现访问被代理服务
 
@@ -27,8 +28,8 @@ permalink: /pages/269a2e/
 
 - 1、DNS解析配置泛域名解析 proxy.asgc.fun 指向代理服务端IP
 - 2、nginx 80端口下将 *.proxy.asgc.fun 请求转到82端口，并附带原有请求头（特别是`Host`）
-- 3、代理服务端app.yml配置域名：proxy.asgc.fun，部署
-- 4、服务端管理后台新建端口映射，协议选择：HTTP，设置好子域名，如：test1
+- 3、服务端管理后台域名管理新建域名，如：asgc.fun
+- 4、服务端管理后台新建端口映射，协议选择：HTTP(S)，设置好子域名，如：test1.proxy
 - 5、配置好客户端并启动，代理映射完成
 - 6、通过访问: http://test1.proxy.asgc.fun 实现访问被代理服务
 
@@ -36,6 +37,13 @@ permalink: /pages/269a2e/
 不行的。之所以能实现域名绑定，原因是HTTP请求附带了Host请求头，包含了请求的域名信息，代理服务端能根据请求的域名做分发。而TCP协议本身并不包含域名，因此无法实现。
 所以，目前只有HTTP（涵盖HTTPS）协议能支持。
 
+# 域名映射支持HTTPS吗？
+支持的。在服务端管理后台-域名管理中新建域名并上传域名对应的服务器证书，可以选择强制HTTPS，这样会拦截所有HTTP请求，只支持通过HTTPS访问。
+如果上传后的证书仍不支持HTTPS访问，请确保上传证书有效并且和配置的主域名或完整域名映射匹配。
+
+# 上传服务器证书的文件有要求吗？
+有的。目前只支持通过jks文件上传服务器证书，jks文件中只包含服务器证书（如：.cer文件），并设置密码。
+
 # 代理服务端使用非80端口时，nginx配置示例
 ```
 server {

neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/04.HTTPS配置.md

@@ -18,7 +18,8 @@ permalink: /pages/99a300/
 
 ## HTTPS配置流程
 - 按照域名映射流程，完成域名的配置
-- 在服务端配置域名的HTTPS证书信息（此处应该是通配符证书）
+- 在服务端管理后台上传对应域名的HTTPS证书信息（此处应该是通配符证书）
+
 
 ## HTTPS端口问题
 - 与HTTP类似，HTTPS也有一个默认端口：443，默认情况下需要占用服务端443端口

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

@@ -1,12 +1,12 @@
 ---
 title: 服务端配置
-date: 2023-05-27 11:41:44
+date: 2024-09-22 11:41:44
 permalink: /pages/f2d0f1/
 ---
 
 ::: tip
 
-1.9.0版本，服务端配置格式有所调整。从之前的版本升级的，需要注意
+2.0.2版本，服务端配置格式有所调整。从之前的版本升级的，需要注意
 
 :::
 
@@ -16,13 +16,12 @@ permalink: /pages/f2d0f1/
 server:
   # 服务端web端口，用于支持HTTP接口，管理后台页面访问
   port: ${WEB_PORT:8888}
-# 日志级别
-solon.logging.logger:
-  "root":
-    level: info
 
 neutrino:
   proxy:
+    logger:
+      # 日志级别
+      level: ${LOG_LEVEL:info}
     # 隧道相关配置-用于维持服务端与客户端的通信
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
@@ -38,8 +37,6 @@ neutrino:
       jks-path: ${JKS_PATH:classpath:/test.jks}
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
       transfer-log-enable: ${TUNNEL_LOG:false}
-      # 是否开启心跳日志
-      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
     server:
       tcp:
         # 线程池相关配置，用于技术调优，可忽略
@@ -49,11 +46,6 @@ neutrino:
         http-proxy-port: ${HTTP_PROXY_PORT:80}
         # https代理端口，默认443 （需要配置域名、证书）
         https-proxy-port: ${HTTPS_PROXY_PORT:443}
-        # 如果不配置，则不支持域名映射
-        domain-name: ${DOMAIN_NAME:}
-        # https证书配置
-        key-store-password: ${HTTPS_STORE_PASS:}
-        jks-path: ${HTTPS_JKS_PATH:}
         # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
         transfer-log-enable: ${SERVER_LOG:false}
       udp:
@@ -64,7 +56,7 @@ neutrino:
         transfer-log-enable: ${SERVER_LOG:false}
   data:
     db:
-      # 数据库类型，目前支持h2、mysql、mariadb
+      # 数据库类型，目前支持sqlite、mysql、mariadb
       type: ${DB_TYPE:h2}
       # 数据库连接URL
       url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}

neutrino-proxy-vuepress/docs/01.使用教程/99.常见问题/05.服务端原声包启动，db初始化异常.md

@@ -0,0 +1,8 @@
+---
+title: 服务端原声包启动，db初始化异常
+date: 2024-11-09 15:28:37
+permalink: /pages/7dcba8/
+---
+
+## 1.1、报错“Data truncation: Data too long for column 'name' at row 1”
+配置文件中配置的mysql连接地址，去掉“characterEncoding=UTF-8”参数

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

@@ -0,0 +1,28 @@
+---
+title: 2024年
+date: 2024-04-16 19:22:05
+permalink: /pages/acdf0a/
+---
+
+
+| 日期         | 渠道 | 金额   |昵称| 备注                                    |
+|:-----------|:---|:-----|:-|:--------------------------------------|
+| 2024-11-19|支付宝收款码|2|*亮||
+| 2024-10-06 |Gitee捐助|100|碧云天|感谢您的开源项目！|
+| 2024-10-14 |微信红包|5|泛微eteams刘新东17699059661|
+| 2024-09-04 |Gitee捐助|8.88|lusen998|感谢您的开源项目！|
+| 2024-08-30 | 微信转账|100|吴忧吴虑|
+| 2024-07-29 |Gitee捐助|10|QuanJWS|感谢您的开源项目！看着很不错的样子，加油！ |
+| 2024-07-29 |微信赞赏码|120|陈某|                                       |
+| 2024-05-07 |微信转账|100|仲秀|                                       |
+| 2024-04-16 |微信转账|100|暮光：城中城|                                       |
+| 2024-04-03 |微信转账|100|仲秀| 大神，非常感谢                               |
+| 2024-03-24 |Gitee捐助|10|include|
+| 2024-03-24 |微信赞赏码|9|宗| 麻烦了，最好能加一个返回公网IP。<br/>不知道有没有几乎通用的方案   |
+| 2024-03-22 |微信红包|20|不允| 请你吃外卖                                 |
+| 2024-03-12 |微信红包|50|喜鸽小宝|
+| 2024-02-12 |微信红包|50|喜鸽小宝|
+| 2024-02-02 |微信红包|38.88|不请自来君|
+| 2024-01-24 |Gitee捐助|30|唐吉诃德| 感谢您的开源项目！是一个不错的项目！<br/>希望继续完善界面UI的设计。 |
+| 2024-01-20 |微信红包|shiyongsway|8.88|
+| 2024-01-17 |微信红包|50|喜鸽小宝|                                       |

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

@@ -4,6 +4,27 @@ date: 2023-10-26 17:43:43
 permalink: /pages/ff3519/
 ---
 
+## 2.0.3
+- 紧急bug修复：解决http请求拆包情况下域名映射失效的问题
+
+## 2.0.2
+- bug修复
+  - 解决安全组在ipv6场景下误拦截导致域名映射访问不通的问题
+  - 解决native编译后，端口池批量删除报错的问题
+  - 解决客户端docker方式部署环境变量指定参数不生效的问题
+  - 服务端解决native下清理日志定时任务报错的问题
+  - 解决后台分页查询的已知问题
+  - 端口映射中的客户端ip字段加长一点，解决配置阿里云数据库域名字段不够的问题
+  - 解决服务端native部署时，访问后台用户列表，日志警告“you should use: nativeMetadata.registerField(field) at aot runtime”的问题
+- 新增功能
+  - 新增后台域名管理，⽀持新增、修改、删除、禁⽤主域名，支持添加多级域名。
+  - 域名管理支持上传域名对应的SSL证书、⽀持设置强制HTTPS、⽀持域名映射⾃动加载对应的服务器证书。
+  - 端口映射支持选择切换不同的主域名，⽀持绑定多个⼦域名，单个端⼝⽀持绑定多个不同的主域名。
+- 升级须知：
+  - **域名和SSL证书的配置由配置文件配置改为后台域名管理页面配置。**
+  - 去掉了配置文件声明服务器端域名和证书的方式，改为通过页面进行管理，请注意自行进行数据迁移。
+  - 数据库新增`域名表`和`域名映射中间表`，修改了`端口映射表`，涉及到表结构变更，执行[增量SQL](https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20240808.SQL)
+
 ## 2.0.1
 - jdk版本升级为21
 - 新增安全组模块，支持黑名单、白名单限制

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

@@ -3,6 +3,8 @@ title: 里程碑
 date: 2023-10-26 17:41:26
 permalink: /pages/e406dd/
 ---
+- 2024-12-20 中微子代理服务端支持宝塔面板一件部署
+- 2024-12-10 2.0.2版本发布，新增域名管理，端口映射支持绑定多个域名
 - 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

neutrino-proxy-vuepress/docs/index.md

@@ -148,11 +148,15 @@ postList: none
     <div class="card-list">
         <a href="https://www.xigexb.com?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#102863;--random-color:#102863;color:#FFFFFF;">
             <img src="img/sponsor/xigexiaobao.jpg" class="no-zoom"> 
-            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。</p></div>
+            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。<br/>&nbsp;</p></div>
         </a>
         <a href="https://7bu.top?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#c6ddff;--random-color:#c6ddff;color:#000000;">
             <img src="img/sponsor/7bu.ico" class="no-zoom"> 
-            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。</p></div>
+            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。<br/>&nbsp;</p></div>
+        </a>
+        <a href="http://doc.zyplayer.com/#/integrate/zyplayer-doc?utm=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#486898;--random-color:#c6ddff;color:#FFFFFF;">
+            <img src="img/sponsor/zyplayer-doc.png" class="no-zoom"> 
+            <div><p class="name">zyplayer-doc</p> <p class="desc">私有化部署的企业级文档管理与知识库AI问答平台。</p></div>
         </a>
     </div>
 </div>

neutrino-proxy-vuepress/package.json

@@ -4,8 +4,8 @@
   "scripts": {
     "dev": "vuepress dev docs",
     "build": "vuepress build docs",
-    "buildAndDeploy": "vuepress build docs && bash deploy.sh",
-    "deploy": "bash deploy.sh",
+    "buildAndDeploy": "vuepress build docs && bash deploy/deploy1.sh",
+    "deploy": "bash deploy/deploy1.sh",
     "updateTheme": "yarn remove vuepress-theme-vdoing && rm -rf node_modules && yarn && yarn add vuepress-theme-vdoing -D",
     "editFm": "node utils/editFrontmatter.js"
   },

pom.xml

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

scripts/docker-compose/README.md

@@ -0,0 +1,35 @@
+## 项目简介
+- [中微子代理(neutrino-proxy)](https://gitee.com/dromara/neutrino-proxy) 是一款基于Solon、Netty的内网穿透神器。该项目采用最为宽松的MIT协议，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
+- 市面上基于内网穿透的常见产品有：花生壳、TeamView、cpolar等。
+- 常见的使用场景：
+    - 本地开发调试第三方回调
+    - 本地开发异地接口连调
+    - 远程登录内网windows机器
+    - 将本地服务映射到外网，用于演示
+- Gitee仓库：https://gitee.com/dromara/neutrino-proxy
+- GitCode仓库：https://gitcode.com/dromara/neutrino-proxy
+- GitHub仓库：https://github.com/dromara/neutrino-proxy
+- 官网地址: https://neutrino-proxy.dromara.org
+
+## 主要特点：
+- 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协议，免去你的后顾之忧
+
+## 镜像版本&地址
+- 版本：当前最新版本为`2.0.1`，可直接使用`latest`拉取最新镜像
+- neutrino-proxy-server
+	- DockerHub镜像地址：aoshiguchen/neutrino-proxy-server:latest
+	- 阿里云镜像地址：neutrino-proxy registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
+- neutrino-proxy-client
+	- DockerHub镜像地址：aoshiguchen/neutrino-proxy-client:latest
+	- 阿里云镜像地址：registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy-client:latest

scripts/docker-compose/neutrino-proxy-client/config/app.yml

@@ -1,39 +1,29 @@
-server:
-  port: 8201
-spring:
-  application:
-    name: neutrino-proxy-client
+solon.logging.logger:
+  "root":
+    level: info
+
 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}
+      key-store-password: 123456
+      jks-path: classpath:/test.jks
       # 服务端IP
-      server-ip: ${SERVER_IP:}
+      server-ip: host.docker.internal
       # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
-      server-port: ${SERVER_PORT:9002}
+      server-port: 9002
       # 是否启用SSL(注意：该配置必须和server-port对应上)
-      ssl-enable: ${SSL_ENABLE:true}
+      ssl-enable: true
       # 客户端连接唯一凭证
-      license-key: ${LICENSE_KEY:}
+      license-key: b0a907332b474b25897c4dcb31fc7eb6
       # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
-      client-id: ${CLIENT_ID:}
+      client-id:
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
-      transfer-log-enable: ${CLIENT_LOG:false}
+      transfer-log-enable: false
       # 是否开启心跳日志
-      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
+      heartbeat-log-enable: false
       # 重连设置
       reconnection:
         # 重连间隔（秒）
@@ -48,14 +38,4 @@ neutrino:
         # 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:
-
+        transfer-log-enable: false

scripts/docker-compose/neutrino-proxy-client/docker-compose.yaml

@@ -0,0 +1,21 @@
+version: '3.8'
+
+networks:
+  npClient:
+    driver: bridge
+services:
+  npClient:
+    image: aoshiguchen/neutrino-proxy-client:latest
+    container_name: compose-npClient
+    hostname: npClient
+    restart: always
+    environment:
+        TZ: Asia/Shanghai
+        LANG: zh_CN.UTF-8
+    volumes:
+      - ./config:/root/neutrino-proxy/config
+      - ./logs:/root/neutrino-proxy/logs
+    ports:
+      - "10000-10500:10000-10500/udp"
+    networks:
+      - npClient

scripts/docker-compose/neutrino-proxy-server-h2/config/app.yml

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

scripts/docker-compose/neutrino-proxy-server-h2/docker-compose.yaml

@@ -0,0 +1,25 @@
+version: '3.8'
+
+networks:
+  npServer:
+    driver: bridge
+services:
+  npServer:
+    image: aoshiguchen/neutrino-proxy-server:latest
+    container_name: compose-npServer
+    hostname: npServer
+    restart: always
+    environment:
+        TZ: Asia/Shanghai
+        LANG: zh_CN.UTF-8
+    volumes:
+      - ./config:/root/neutrino-proxy/config
+      - ./data:/root/neutrino-proxy/data
+      - ./logs:/root/neutrino-proxy/logs
+    ports:
+      - "8888:8888"
+      - "9000:9000"
+      - "9002:9002"
+      - "9101-9120:9101-9120"
+    networks:
+      - npServer

scripts/docker-compose/neutrino-proxy-server-mysql/config/app.yml

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

scripts/docker-compose/neutrino-proxy-server-mysql/config/sql/schema.sql

@@ -0,0 +1,21 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+-- this file works for MySQL.
+
+set names utf8mb4;
+create database if not exists `neutrino-proxy` default charset utf8mb4 collate utf8mb4_general_ci;
+commit;

scripts/docker-compose/neutrino-proxy-server-mysql/docker-compose.yaml

@@ -0,0 +1,48 @@
+version: '3.8'
+
+networks:
+  npServer:
+    driver: bridge
+services:
+  mysql:
+    image: mysql:8
+    container_name: compose-mysql
+    hostname: mysql
+    restart: always
+    healthcheck:
+      test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --silent']
+      interval: 3s
+      retries: 5
+      start_period: 3m
+    ports:
+      - "3308:3306"
+    environment:
+      TZ: Asia/Shanghai
+      MYSQL_ROOT_PASSWORD: 123456
+    volumes:
+      - ./data/mysqldata:/var/lib/mysql/
+      - ./config/sql:/docker-entrypoint-initdb.d/
+    networks:
+      - npServer
+  npServer:
+    image: aoshiguchen/neutrino-proxy-server:latest
+    container_name: compose-npServer
+    hostname: npServer
+    restart: always
+    environment:
+        TZ: Asia/Shanghai
+        LANG: zh_CN.UTF-8
+    depends_on:
+      mysql:
+        condition: service_healthy
+    volumes:
+      - ./config:/root/neutrino-proxy/config
+      - ./data:/root/neutrino-proxy/data
+      - ./logs:/root/neutrino-proxy/logs
+    ports:
+      - "8888:8888"
+      - "9000:9000"
+      - "9002:9002"
+      - "9101-9120:9101-9120"
+    networks:
+      - npServer

scripts/unix/client_docker_build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # 镜像版本，每次更新版本时需要调整
-ImageVer=2.0.0
+ImageVer=2.0.2
 ImageName=neutrino-proxy-client
 DockerFilePath=$PWD/../../neutrino-proxy-client
 

scripts/unix/client_native_build.sh

@@ -5,9 +5,11 @@ export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
+MODULE_NAME=neutrino-proxy-client
 deployDir="deploy"
 clientDeployDir=$deployDir"/client"
 machine=macos
+VER=2.0.3
 
 #切到项目根目录
 cd ../..
@@ -15,38 +17,38 @@ cd ../..
 mkdir -p $clientDeployDir
 
 # 删除原来的编译文件
-rm -rf $clientDeployDir/neutrino-proxy-client.jar
-rm -rf $clientDeployDir/neutrino-proxy-client
-rm -rf $clientDeployDir/neutrino-proxy-client-jar
-rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
-rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native
-rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native.zip
+rm -rf $clientDeployDir/$MODULE_NAME.jar
+rm -rf $clientDeployDir/$MODULE_NAME
+rm -rf $clientDeployDir/$MODULE_NAME-jdk21-$VER-jar
+rm -rf $clientDeployDir/$MODULE_NAME-jdk21-$VER-jar.zip
+rm -rf $clientDeployDir/$MODULE_NAME-$machine-$VER-native
+rm -rf $clientDeployDir/$MODULE_NAME-$machine-$VER-native.zip
 
 #客户端打包
-mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
-cd neutrino-proxy-client
+mvn clean install -U -pl $MODULE_NAME -am -Dmaven.test.skip=true
+cd $MODULE_NAME
 mvn clean native:compile -P native -DskipTests
 cd ..
 
 # 给执行权限
-chmod +x ./neutrino-proxy-client/target/neutrino-proxy-client
+chmod +x ./$MODULE_NAME/target/$MODULE_NAME
 
 # 拷贝到deploy目录下
-cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
-cp ./neutrino-proxy-client/target/neutrino-proxy-client $clientDeployDir/neutrino-proxy-client
+cp ./$MODULE_NAME/target/$MODULE_NAME.jar $clientDeployDir/$MODULE_NAME.jar
+cp ./$MODULE_NAME/target/$MODULE_NAME $clientDeployDir/$MODULE_NAME
 
 #打zip包，用于发版
 cd $clientDeployDir
 ## jar
-mkdir neutrino-proxy-client-jar
-cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
-cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml
-zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
-rm -rf ./neutrino-proxy-client-jar
+mkdir $MODULE_NAME-jdk21-$VER-jar
+cp ../../$MODULE_NAME/target/$MODULE_NAME.jar ./$MODULE_NAME-jdk21-$VER-jar/$MODULE_NAME.jar
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-jdk21-$VER-jar/app.yml
+zip -r $MODULE_NAME-jdk21-$VER-jar.zip ./$MODULE_NAME-jdk21-$VER-jar
+rm -rf ./$MODULE_NAME-jdk21-$VER-jar
 
 ## native
-mkdir neutrino-proxy-client-${machine}-native
-cp ../../neutrino-proxy-client/target/neutrino-proxy-client ./neutrino-proxy-client-${machine}-native/neutrino-proxy-client
-cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-${machine}-native/app.yml
-zip -r neutrino-proxy-client-${machine}-native.zip ./neutrino-proxy-client-${machine}-native
-rm -rf ./neutrino-proxy-client-${machine}-native
+mkdir $MODULE_NAME-$machine-$VER-native
+cp ../../$MODULE_NAME/target/$MODULE_NAME ./$MODULE_NAME-$machine-$VER-native/$MODULE_NAME
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-$machine-$VER-native/app.yml
+zip -r $MODULE_NAME-$machine-$VER-native.zip ./$MODULE_NAME-$machine-$VER-native
+rm -rf ./$MODULE_NAME-$machine-$VER-native

scripts/unix/server_docker_build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # 镜像版本，每次更新版本时需要调整
-ImageVer=2.0.0
+ImageVer=2.0.2
 ImageName=neutrino-proxy
 DockerFilePath=$PWD/../../neutrino-proxy-server
 

scripts/unix/server_native_build.sh

@@ -5,9 +5,11 @@ export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
+MODULE_NAME=neutrino-proxy-server
 deployDir="deploy"
 serverDeployDir=$deployDir"/server"
 machine=macos
+VER=2.0.3
 
 #切到项目根目录
 cd ../..
@@ -15,12 +17,12 @@ cd ../..
 mkdir -p $serverDeployDir
 
 # 删除原来的编译文件
-rm -rf $serverDeployDir/neutrino-proxy-server.jar
-rm -rf $serverDeployDir/neutrino-proxy-server
-rm -rf $serverDeployDir/neutrino-proxy-server-jar
-rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
-rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native
-rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
+rm -rf $serverDeployDir/$MODULE_NAME.jar
+rm -rf $serverDeployDir/$MODULE_NAME
+rm -rf $serverDeployDir/$MODULE_NAME-jdk21-$VER-jar
+rm -rf $serverDeployDir/$MODULE_NAME-jdk21-$VER-jar.zip
+rm -rf $serverDeployDir/$MODULE_NAME-$machine-$VER-native
+rm -rf $serverDeployDir/$MODULE_NAME-$machine-$VER-native.zip
 
 # 不需要每次都重新编译一次前端代码，如果前端代码有变更，编译前需要手动执行`admin_build_docker.sh`
 ##前端页面打包
@@ -32,30 +34,30 @@ rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
 #cp -rf ./neutrino-proxy-admin/dist/ ./neutrino-proxy-server/src/main/resources/static
 
 #服务端打包
-mvn clean install -U -pl neutrino-proxy-server -am -Dmaven.test.skip=true
-cd neutrino-proxy-server
+mvn clean install -U -pl $MODULE_NAME -am -Dmaven.test.skip=true
+cd $MODULE_NAME
 mvn clean native:compile -P native -DskipTests
 cd ..
 
 # 给执行权限
-chmod +x ./neutrino-proxy-server/target/neutrino-proxy-server
+chmod +x ./$MODULE_NAME/target/$MODULE_NAME
 
 # 拷贝到deploy目录下
-cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
-cp ./neutrino-proxy-server/target/neutrino-proxy-server $serverDeployDir/neutrino-proxy-server
+cp ./$MODULE_NAME/target/$MODULE_NAME.jar $serverDeployDir/$MODULE_NAME.jar
+cp ./$MODULE_NAME/target/$MODULE_NAME $serverDeployDir/$MODULE_NAME
 
 #打zip包，用于发版
 cd $serverDeployDir
 ## jar
-mkdir neutrino-proxy-server-jar
-cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
-cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml
-zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
-rm -rf ./neutrino-proxy-server-jar
+mkdir $MODULE_NAME-jdk21-$VER-jar
+cp ../../$MODULE_NAME/target/$MODULE_NAME.jar ./$MODULE_NAME-jdk21-$VER-jar/$MODULE_NAME.jar
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-jdk21-$VER-jar/app.yml
+zip -r $MODULE_NAME-jdk21-$VER-jar.zip ./$MODULE_NAME-jdk21-$VER-jar
+rm -rf ./$MODULE_NAME-jdk21-$VER-jar
 
 ## native
-mkdir neutrino-proxy-server-${machine}-native
-cp ../../neutrino-proxy-server/target/neutrino-proxy-server ./neutrino-proxy-server-${machine}-native/neutrino-proxy-server
-cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-${machine}-native/app.yml
-zip -r neutrino-proxy-server-${machine}-native.zip ./neutrino-proxy-server-${machine}-native
-rm -rf ./neutrino-proxy-server-${machine}-native
+mkdir $MODULE_NAME-$machine-$VER-native
+cp ../../$MODULE_NAME/target/$MODULE_NAME ./$MODULE_NAME-$machine-$VER-native/$MODULE_NAME
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-$machine-$VER-native/app.yml
+zip -r $MODULE_NAME-$machine-$VER-native.zip ./$MODULE_NAME-$machine-$VER-native
+rm -rf ./$MODULE_NAME-$machine-$VER-native

scripts/win/admin_build_dev.bat

@@ -1,29 +0,0 @@
-@echo off
-@rem  basic params
-set ENV=dev
-set NODE_VERSION=v13.12.0
-set MODULE_NAME=neutrino-proxy-admin
-@rem  判断当前node版本是否符合，如果不符合切换node版本
-for /f "tokens=1" %%v in ('node -v') do set v=%%v
-if not "%v%" == "%NODE_VERSION%" (
-  echo Node.js version is not %NODE_VERSION%.
-  @rem  判断是否安装nvm
-  set "nvm_home=%NVM_HOME%"
-  set "nvm_symlink=%NVM_SYMLINK%"
-  if not defined nvm_home (
-    echo nvm is not installed,then use nvm to install node %NODE_VERSION%.
-  ) else if not defined nvm_symlink (
-    echo nvm is not installed,then use nvm to install node %NODE_VERSION%.
-  ) else (
-    echo nvm is installed.
-    nvm use %NODE_VERSION%
-  )
-)
-cd %~dp0 && cd ../../%MODULE_NAME%
-@rem 检查dist文件夹是否存在，存在就删除，/s选项表示将目录及其所有子目录一起删除，/q选项表示不需要确认操作
-if exist dist (
-  rmdir /s /q dist
-)
-@rem 等待npm执行完毕
-call npm install
-npm run build:%ENV% && pause

scripts/win/admin_build_docker.bat

@@ -24,6 +24,17 @@ cd %~dp0 && cd ../../%MODULE_NAME%
 if exist dist (
   rmdir /s /q dist
 )
-@rem 等待npm执行完毕
+@rem 编译
 call npm install
-npm run build:%ENV% && pause
+call npm run build:%ENV%
+
+echo 开始拷贝
+@rem 拷贝
+cd ..
+del /Q /F .\neutrino-proxy-server\src\main\resources\static
+rd /S /Q  .\neutrino-proxy-server\src\main\resources\static
+mkdir .\neutrino-proxy-server\src\main\resources\static
+xcopy /S /E  neutrino-proxy-admin\dist neutrino-proxy-server\src\main\resources\static
+
+@rem 回到脚本目录
+cd scripts\win

scripts/win/client_native_build.bat

@@ -0,0 +1,63 @@
+@echo off
+@rem console output code changed to UTF-8
+chcp 65001
+@rem  basic params
+set MODULE_NAME=neutrino-proxy-client
+@rem  step
+cd %~dp0 && cd ../../
+
+SET VS_HOME=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519
+SET JAVA_HOME=C:\my\package\jdk\graalvm-community-openjdk-21.0.2
+SET MAVEN_HOME=C:\my\package\maven\apache-maven-3.9.6
+SET WIN_RAR_HOME=C:\Program Files\WinRAR
+SET PATH=%PATH%;%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%VS_HOME%\bin;%WIN_RAR_HOME%
+SET INCLUDE=%INCLUDE%;%VS_HOME%\include;
+SET LIB=%LIB%;%VS_HOME%\lib;
+
+SET deployDir=deploy
+SET clientDeployDir=%deployDir%\client
+SET machine=windows
+SET VER=2.0.1
+
+@rem 初始化文件夹
+mkdir -p %clientDeployDir%
+
+@rem 删除原来的编译文件
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%.jar
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%.exe
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar.zip
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native.zip
+rd /S /Q %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+rd /S /Q  %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+
+@rem 客户端打包
+call mvn clean install -U -pl %MODULE_NAME% -am -Dmaven.test.skip=true
+cd %MODULE_NAME%
+call mvn clean native:compile -P native -DskipTests
+cd ..
+
+@rem 拷贝到deploy目录下
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.jar .\%clientDeployDir%\%MODULE_NAME%.jar
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.exe .\%clientDeployDir%\%MODULE_NAME%.exe
+
+@rem 打zip包，用于发版
+cd %clientDeployDir%
+@rem jar
+mkdir %MODULE_NAME%-jdk21-%VER%-jar
+copy %MODULE_NAME%.jar %MODULE_NAME%-jdk21-%VER%-jar
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-jdk21-%VER%-jar\app.yml
+Rar a %MODULE_NAME%-jdk21-%VER%-jar.zip %MODULE_NAME%-jdk21-%VER%-jar
+
+@rem native
+mkdir %MODULE_NAME%-%machine%-%VER%-native
+copy %MODULE_NAME%.exe %MODULE_NAME%-%machine%-%VER%-native
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-%machine%-%VER%-native\app.yml
+Rar a %MODULE_NAME%-%machine%-%VER%-native.zip %MODULE_NAME%-%machine%-%VER%-native
+
+@rem 删除临时文件
+
+
+@rem 回到脚本目录
+cd ..\..\scripts\win

scripts/win/server_native_build.bat

@@ -0,0 +1,63 @@
+@echo off
+@rem console output code changed to UTF-8
+chcp 65001
+@rem  basic params
+set MODULE_NAME=neutrino-proxy-server
+@rem  step
+cd %~dp0 && cd ../../
+
+SET VS_HOME=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519
+SET JAVA_HOME=C:\my\package\jdk\graalvm-community-openjdk-21.0.2
+SET MAVEN_HOME=C:\my\package\maven\apache-maven-3.9.6
+SET WIN_RAR_HOME=C:\Program Files\WinRAR
+SET PATH=%PATH%;%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%VS_HOME%\bin;%WIN_RAR_HOME%
+SET INCLUDE=%INCLUDE%;%VS_HOME%\include;
+SET LIB=%LIB%;%VS_HOME%\lib;
+
+SET deployDir=deploy
+SET serverDeployDir=%deployDir%\server
+SET machine=windows
+SET VER=2.0.1
+
+@rem 初始化文件夹
+mkdir -p %serverDeployDir%
+
+@rem 删除原来的编译文件
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%.jar
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%.exe
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar.zip
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native.zip
+rd /S /Q %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+rd /S /Q  %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+
+@rem 服务端打包
+call mvn clean install -U -pl %MODULE_NAME% -am -Dmaven.test.skip=true
+cd %MODULE_NAME%
+call mvn clean native:compile -P native -DskipTests
+cd ..
+
+@rem 拷贝到deploy目录下
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.jar .\%serverDeployDir%\%MODULE_NAME%.jar
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.exe .\%serverDeployDir%\%MODULE_NAME%.exe
+
+@rem 打zip包，用于发版
+cd %serverDeployDir%
+@rem jar
+mkdir %MODULE_NAME%-jdk21-%VER%-jar
+copy %MODULE_NAME%.jar %MODULE_NAME%-jdk21-%VER%-jar
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-jdk21-%VER%-jar\app.yml
+Rar a %MODULE_NAME%-jdk21-%VER%-jar.zip %MODULE_NAME%-jdk21-%VER%-jar
+
+@rem native
+mkdir %MODULE_NAME%-%machine%-%VER%-native
+copy %MODULE_NAME%.exe %MODULE_NAME%-%machine%-%VER%-native
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-%machine%-%VER%-native\app.yml
+Rar a %MODULE_NAME%-%machine%-%VER%-native.zip %MODULE_NAME%-%machine%-%VER%-native
+
+@rem 删除临时文件
+
+
+@rem 回到脚本目录
+cd ..\..\scripts\win