test github action v25

2、客户端启动参数处理逻辑调整

.editorconfig

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

.github/workflows/linux_mac_native.yml

@@ -0,0 +1,83 @@
+name: jar release
+
+on:
+  workflow_dispatch: 
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
+#        os: ['ubuntu-20.04', 'macos-12']
+        os: ['ubuntu-20.04']
+    name: build - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: setup node v13.12.0
+      uses: actions/setup-node@v3
+      with:
+        node-version: 13.12.0
+        # cache: 'npm' # 使用缓存需要把 package-lock.json 也上传到 git 上
+    - name: build neutrino-proxy-admin
+      run: |
+        cd neutrino-proxy-admin
+        npm install
+        npm run build:docker
+        cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
+    - name: GitHub Action for GraalVM JDK 17
+      uses: graalvm/setup-graalvm@v1
+      with:
+        java-version: '17.0.7' # for a specific JDK 17; or '17' for the latest JDK 17
+        distribution: 'graalvm' # New 'distribution' option
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven (neutrino-proxy-server)
+      run: |
+        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
+        cd neutrino-proxy-server
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ github.ref_name }}
+    - name: Archive zip (neutrino-proxy-server)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-server-${{ github.ref_name }}'
+        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+    - name: Build with Maven (neutrino-proxy-client)
+      run: |
+        cd neutrino-proxy-client
+        mvn clean package --file pom.xml --no-transfer-progress
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ github.ref_name }}
+    - name: Archive zip (neutrino-proxy-client)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-client-${{ github.ref_name }}'
+        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+    # GitHub 上创建 release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+          neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        prerelease: true
+        token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-native.yml

@@ -0,0 +1,83 @@
+name: jar release
+
+on:
+  workflow_dispatch: 
+  push:
+    tags:
+      - 'win*'
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
+#        os: ['ubuntu-20.04', 'windows-latest', 'macos-latest']
+        os: ['windows-2022']
+    name: build - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v3
+    - name: setup node v13.12.0
+      uses: actions/setup-node@v3
+      with:
+        node-version: 13.12.0
+        # cache: 'npm' # 使用缓存需要把 package-lock.json 也上传到 git 上
+    - name: build neutrino-proxy-admin
+      run: |
+        cd neutrino-proxy-admin
+        npm install
+        npm run build:docker
+        cp -r ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
+    - name: GitHub Action for GraalVM JDK 17
+      uses: graalvm/setup-graalvm@v1
+      with:
+        java-version: '17.0.7' # for a specific JDK 17; or '17' for the latest JDK 17
+        distribution: 'graalvm' # New 'distribution' option
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Cache local Maven repository
+      uses: actions/cache@v2
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Build with Maven (neutrino-proxy-server)
+      run: |
+        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
+        cd neutrino-proxy-server
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        cp target/neutrino-proxy-server.exe .
+    - name: Archive zip (neutrino-proxy-server)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-server.exe'
+        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+    - name: Build with Maven (neutrino-proxy-client)
+      run: |
+        cd neutrino-proxy-client
+        mvn clean package --file pom.xml --no-transfer-progress
+        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
+        cp target/neutrino-proxy-client.exe .
+    - name: Archive zip (neutrino-proxy-client)
+      uses: thedoctor0/zip-release@master
+      with:
+        type: 'zip'
+        path: 'neutrino-proxy-client.exe'
+        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+    # GitHub 上创建 release
+    - name: Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+          neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        prerelease: true
+        token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -57,4 +57,6 @@ hs_err_pid*
 neutrino-proxy-vuepress/deploy.sh
 .NEUTRINO_PROXY_CLIENT_ID
 logs
-**/ixxxk.com/**
+data
+**/cert/**
+neutrino-proxy-server/src/main/resources/static/**

Milestone.md

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

Native测试.txt

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

README.md

@@ -4,8 +4,8 @@
 <p align="center">
   <a href='https://gitee.com/dromara/neutrino-proxy/stargazers'><img src='https://gitee.com/dromara/neutrino-proxy/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/dromara/neutrino-proxy/members'><img src='https://gitee.com/dromara/neutrino-proxy/badge/fork.svg?theme=dark' alt='fork'></img></a>
-<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk8-downloads.html">
-    <img src="https://img.shields.io/badge/JDK-8+-red.svg" />
+<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>
 <a href="./LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-red" alt="license MIT">
@@ -37,58 +37,56 @@
 # 4、代理示意图
 ![代理流程](assets/design/neutrino-proxy-process.jpg)
 
-# 5、演示环境
-> 可使用分配好的游客license试用。服务器带宽较低，仅供学习使用！
-- 管理后台地址：http://103.163.47.16:9527
-- 游客账号：visitor/123456
-
-# 6、联系我们
+# 5、联系我们
 - 微信: yuyunshize
 - Gitee: https://gitee.com/asgc/neutrino-proxy
 
-# 7、贡献者列表
+# 6、贡献者列表
 <p>
 <a href="https://gitee.com/zcans" target="_blank">
-<img src="assets/developer/zcans.png" width="12%">
+<img src="assets/developer/zcans.png" width="11%">
 </a>
 <a href="https://gitee.com/bmlt" target="_blank">
-<img src="assets/developer/jiuye.png" width="12%">
+<img src="assets/developer/jiuye.png" width="11%">
 </a>
 <a href="https://gitee.com/wangke666" target="_blank">
-<img src="assets/developer/keke.png" width="12%">
+<img src="assets/developer/keke.png" width="11%">
 </a>
 <a href="https://gitee.com/xue-fangming" target="_blank">
-<img src="assets/developer/fangming.png" width="12%">
+<img src="assets/developer/fangming.png" width="11%">
 </a>
 <a href="https://gitee.com/y0hanes" target="_blank">
-<img src="assets/developer/yohanes.png" width="12%">
+<img src="assets/developer/yohanes.png" width="11%">
 </a>
 <a href="https://gitee.com/noear_admin" target="_blank">
-<img src="assets/developer/near.png" width="12%">
+<img src="assets/developer/near.png" width="11%">
 </a>
 <a href="https://gitee.com/westboy" target="_blank">
-<img src="assets/developer/westboy.jpg" width="12%">
+<img src="assets/developer/westboy.jpg" width="11%">
 </a>
 <a href="https://gitee.com/liugddx" target="_blank">
-<img src="assets/developer/liugddx.png" width="12%">
+<img src="assets/developer/liugddx.png" width="11%">
 </a>
 <a href="https://gitee.com/DianZiFaPiao" target="_blank">
 <img src="assets/developer/tan90.png" width="12%">
 </a>
 <a href="https://gitee.com/dearsny" target="_blank">
-<img src="assets/developer/pingon.png" width="12%">
+<img src="assets/developer/pingon.png" width="11%">
 </a>
 <a href="https://gitee.com/ixxxk" target="_blank">
-<img src="assets/developer/tany.png" width="12%">
+<img src="assets/developer/tany.png" width="11%">
 </a>
 <a href="https://gitee.com/zoo-plus" target="_blank">
-<img src="assets/developer/zoo-plus.png" width="12%">
+<img src="assets/developer/zoo-plus.png" width="11%">
 </a>
 <a href="https://gitee.com/MetalXingxing" target="_blank">
-<img src="assets/developer/metal.png" width="12%">
+<img src="assets/developer/metal.png" width="11%">
 </a>
 <a href="https://gitee.com/click33" target="_blank">
-<img src="assets/developer/click33.png" width="12%">
+<img src="assets/developer/click33.png" width="11%">
+</a>
+<a href="https://gitee.com/songyinyin" target="_blank">
+<img src="assets/developer/songyinyin.png" width="11%">
 </a>
 </p>
 

VLog.md

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

docs/开发问题汇总.MD

@@ -1,3 +1,13 @@
+# native 打包
+```shell
+mvn clean install -pl neutrino-proxy-core -am -DskipTests
+
+cd neutrino-proxy-server
+
+mvn clean native:compile -P native -DskipTests
+
+```
+
 # 管理后台问题汇总
 ## 问题1...
 > 描述、解决方式

neutrino-proxy-client/Dockerfile

@@ -1,12 +1,12 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-jdk-alpine
 #同步时间
 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
 RUN mkdir -p /root/neutrino-proxy/config
 WORKDIR /root/neutrino-proxy
-COPY ../neutrino-proxy-client/target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
-COPY ../neutrino-proxy-client/src/main/resources/app.yml /root/neutrino-proxy/config
+COPY ./target/neutrino-proxy-client.jar /root/neutrino-proxy/neutrino-proxy-client.jar
+COPY ./src/main/resources/app.yml /root/neutrino-proxy/config
 #VOLUME ["/root/neutrino-proxy"]
 ENTRYPOINT ["java","-jar","neutrino-proxy-client.jar","config=./config/app.yml"]
 

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

@@ -1,15 +1,9 @@
 package org.dromara.neutrinoproxy.client;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
 import cn.hutool.core.util.StrUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.noear.solon.Solon;
-import org.noear.solon.SolonApp;
 import org.noear.solon.annotation.SolonMain;
-import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -22,14 +16,12 @@ public class ProxyClient {
 
 	public static void main(String[] args) {
 		Solon.start(ProxyClient.class, args, app -> {
-			setAlias("neutrino.proxy.tunnel.serverIp", "serverIp");
-			setAlias("neutrino.proxy.tunnel.serverPort", "serverPort");
-			setAlias("neutrino.proxy.tunnel.sslEnable", "sslEnable");
-			setAlias("neutrino.proxy.tunnel.jksPath", "jksPath");
-			setAlias("neutrino.proxy.tunnel.keyStorePassword", "keyStorePassword");
-			setAlias("neutrino.proxy.tunnel.licenseKey", "licenseKey");
-			// 设置日志级别
-			setLogLevel(app);
+			setAlias("neutrino.proxy.tunnel.server-ip", "serverIp");
+			setAlias("neutrino.proxy.tunnel.server-port", "serverPort");
+			setAlias("neutrino.proxy.tunnel.ssl-enable", "sslEnable");
+			setAlias("neutrino.proxy.tunnel.jks-path", "jksPath");
+			setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword");
+			setAlias("neutrino.proxy.tunnel.license-key", "licenseKey");
 		});
 	}
 
@@ -45,20 +37,4 @@ public class ProxyClient {
 		}
 	}
 
-	private static void setLogLevel(SolonApp app) {
-		String loggerLevel = app.cfg().get("neutrino.proxy.logger.level");
-		if (StringUtils.isBlank(loggerLevel)) {
-			return;
-		}
-
-		try {
-			Level level = Level.toLevel(loggerLevel);
-			LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-			for (Logger logger : loggerContext.getLoggerList()) {
-				logger.setLevel(level);
-			}
-		} catch (Exception e) {
-			log.error("logger level set failed", e);
-		}
-	}
 }

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

@@ -0,0 +1,26 @@
+package org.dromara.neutrinoproxy.client.config;
+
+import org.noear.solon.annotation.Component;
+import org.noear.solon.aot.RuntimeNativeMetadata;
+import org.noear.solon.aot.RuntimeNativeRegistrar;
+import org.noear.solon.aot.hint.MemberCategory;
+import org.noear.solon.core.AppContext;
+
+/**
+ * @author songyinyin
+ * @since 2023/10/21 22:50
+ */
+@Component
+public class NeutrinoClientRuntimeNativeRegistrar implements RuntimeNativeRegistrar {
+    @Override
+    public void register(AppContext context, RuntimeNativeMetadata metadata) {
+        metadata.registerResourceInclude("test.jks");
+
+        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);
+    }
+}

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

@@ -12,6 +12,7 @@ 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;
@@ -130,7 +131,7 @@ public class ProxyConfiguration implements LifecycleBean {
     }
 
     @Bean("udpProxyTunnelBootstrap")
-    private Bootstrap udpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig,
+    public Bootstrap udpProxyTunnelBootstrap(@Inject ProxyConfig proxyConfig,
                                               @Inject("tunnelWorkGroup") NioEventLoopGroup tunnelWorkGroup) {
         Bootstrap bootstrap = new Bootstrap();
         bootstrap.group(tunnelWorkGroup);
@@ -204,4 +205,9 @@ public class ProxyConfiguration implements LifecycleBean {
         return bootstrap;
     }
 
+    @Bean
+    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar() {
+        return new NeutrinoCoreRuntimeNativeRegistrar();
+    }
+
 }

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

@@ -1,14 +1,14 @@
 package org.dromara.neutrinoproxy.client.handler;
 
-import com.alibaba.fastjson.JSONObject;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
 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 io.netty.channel.ChannelHandlerContext;
-import lombok.extern.slf4j.Slf4j;
+import org.noear.snack.ONode;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
@@ -27,8 +27,8 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 	@Override
 	public void handle(ChannelHandlerContext context, ProxyMessage proxyMessage) {
 		String info = proxyMessage.getInfo();
-		JSONObject data = JSONObject.parseObject(info);
-		Integer code = data.getInteger("code");
+        ONode load = ONode.load(info);
+        Integer code = load.get("code").getInt();
 		log.info("Auth result:{}", info);
 		if (ExceptionEnum.AUTH_FAILED.getCode().equals(code)) {
 			// 客户端认证失败，直接停止服务

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

@@ -1,11 +1,14 @@
 package org.dromara.neutrinoproxy.client.handler;
 
-import com.alibaba.fastjson.JSONObject;
-import org.dromara.neutrinoproxy.core.*;
-import org.dromara.neutrinoproxy.core.*;
-import org.dromara.neutrinoproxy.core.dispatcher.Match;
 import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.ExceptionEnum;
+import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
+import org.dromara.neutrinoproxy.core.dispatcher.Match;
+import org.noear.snack.ONode;
 import org.noear.solon.annotation.Component;
 
 /**
@@ -21,8 +24,8 @@ public class ProxyMessageErrorHandler implements ProxyMessageHandler {
 	@Override
 	public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
 		log.info("error: {}", proxyMessage.getInfo());
-		JSONObject data = JSONObject.parseObject(proxyMessage.getInfo());
-		Integer code = data.getInteger("code");
+        ONode load = ONode.load(proxyMessage.getInfo());
+        Integer code = load.get("code").getInt();
 		if (ExceptionEnum.AUTH_FAILED.getCode().equals(code)) {
 			System.exit(0);
 		}

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

@@ -1,6 +1,5 @@
 package org.dromara.neutrinoproxy.client.handler;
 
-import com.alibaba.fastjson.JSONObject;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -13,6 +12,7 @@ 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;
 
@@ -32,7 +32,7 @@ public class UdpProxyMessageConnectHandler implements ProxyMessageHandler {
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
         final Channel cmdChannel = ctx.channel();
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONObject.parseObject(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
+        final ProxyMessage.UdpBaseInfo udpBaseInfo = ONode.deserialize(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
         log.info("[UDP connect]info:{}", proxyMessage.getInfo());
 
         // 获取连接

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

@@ -1,6 +1,5 @@
 package org.dromara.neutrinoproxy.client.handler;
 
-import com.alibaba.fastjson.JSONObject;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -13,10 +12,10 @@ 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;
-import java.nio.charset.StandardCharsets;
 
 /**
  * @author: aoshiguchen
@@ -29,7 +28,7 @@ public class UdpProxyMessageTransferHandler implements ProxyMessageHandler {
 
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONObject.parseObject(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) {

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

@@ -11,6 +11,7 @@ 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 org.noear.solon.core.runtime.NativeDetector;
 
 import java.util.*;
 import java.util.concurrent.*;
@@ -46,6 +47,10 @@ public class UdpServerUtil {
      * @param proxyConfig
      */
     public static void initCache(ProxyConfig proxyConfig, Bootstrap udpServerBootstrap) {
+        // aot 阶段，不初始化UDP服务
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
         if (null == proxyConfig.getClient().getUdp() || StringUtils.isEmpty(proxyConfig.getClient().getUdp().getPuppetPortRange())) {
             return;
         }

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

@@ -1,3 +1,16 @@
+# 日志级别
+solon.logging.appender:
+  console:
+    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(${PID:-}) --- %-15([%15.15thread]) %-56(%cyan(%-40.40logger{39}%L)) : %msg%n"
+  file:
+    enable: false
+    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- %-15([%15.15thread]) %-56(%-40.40logger{39}%L) : %msg%n"
+    name: "logs/${neutrino.application.name}"
+    rolling: "logs/${neutrino.application.name}_%d{yyyy-MM-dd}_%i.log.gz"
+solon.logging.logger:
+  "root":
+    #    level: ${LOG_LEVEL:info}
+    level: info
 neutrino:
   application:
     name: neutrino-proxy-client
@@ -12,9 +25,6 @@ neutrino:
       read-idle-time: 120
       write-idle-time: 20
       all-idle-time-seconds: 0
-    logger:
-      # 日志级别
-      level: ${LOG_LEVEL:info}
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
       thread-count: 50

neutrino-proxy-client/src/main/resources/logback.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <property name="LOG_FILE" value="./logs/neutrino-proxy-client.log"/>
-    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n"/>
-<!--    <property name="ENCODE" value="utf8" />-->
-
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
-        <encoder>
-            <pattern>${LOG_PATTERN}</pattern>
-<!--            <charset>${ENCODE}</charset>-->
-        </encoder>
-    </appender>
-
-    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <maxHistory>7</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${LOG_PATTERN}</pattern>
-<!--            <charset>${ENCODE}</charset>-->
-        </encoder>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
-    </root>
-
-    <logger name="com.example.logback" level="warn"/>
-    <logger name="io.netty" level="warn"/>
-</configuration>

neutrino-proxy-core/pom.xml

@@ -13,6 +13,13 @@
     <artifactId>neutrino-proxy-core</artifactId>
 
     <dependencies>
+        <!--solon aot start（用于 aot 时注册 native 元信息）-->
+        <dependency>
+            <groupId>org.noear</groupId>
+            <artifactId>solon.aot</artifactId>
+        </dependency>
+        <!--solon aot end-->
+
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
@@ -30,4 +37,17 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+
+                <includes>
+                    <include>META-INF/native-image/neutrino-proxy-core/*.json</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
 </project>

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

@@ -22,9 +22,9 @@
 
 package org.dromara.neutrinoproxy.core;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.noear.snack.ONode;
 
 import java.util.Arrays;
 
@@ -118,12 +118,12 @@ public class ProxyMessage {
     }
 
     public static ProxyMessage buildAuthResultMessage(Integer code, String msg, String licenseKey) {
-        JSONObject data = new JSONObject();
-        data.put("code", code);
-        data.put("msg", msg);
-        data.put("licenseKey", licenseKey);
+        ONode data = ONode.newObject();
+        data.set("code", code);
+        data.set("msg", msg);
+        data.set("licenseKey", licenseKey);
         return create().setType(TYPE_AUTH)
-            .setInfo(data.toJSONString());
+            .setInfo(data.toJson());
     }
 
     public static ProxyMessage buildConnectMessage(String visitorId) {
@@ -158,12 +158,12 @@ public class ProxyMessage {
     }
 
     public static ProxyMessage buildErrMessage(ExceptionEnum exceptionEnum, String info) {
-        JSONObject data = new JSONObject();
-        data.put("code", exceptionEnum.getCode());
-        data.put("msg", exceptionEnum.getMsg());
-        data.put("info", info);
+        ONode data = ONode.newObject();
+        data.set("code", exceptionEnum.getCode());
+        data.set("msg", exceptionEnum.getMsg());
+        data.set("info", info);
         return create().setType(TYPE_ERROR)
-            .setInfo(data.toJSONString());
+            .setInfo(data.toJson());
     }
 
     public static ProxyMessage buildErrMessage(ExceptionEnum exceptionEnum) {
@@ -188,7 +188,7 @@ public class ProxyMessage {
          */
         private long proxyTimeoutMs;
         public String toJsonString() {
-            return JSONObject.toJSONString(this);
+            return ONode.serialize(this);
         }
     }
 }

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

@@ -0,0 +1,30 @@
+package org.dromara.neutrinoproxy.core.aot;
+
+import cn.hutool.core.util.ClassUtil;
+import io.netty.channel.SimpleChannelInboundHandler;
+import org.dromara.neutrinoproxy.core.ProxyMessage;
+import org.noear.solon.aot.RuntimeNativeMetadata;
+import org.noear.solon.aot.RuntimeNativeRegistrar;
+import org.noear.solon.aot.hint.MemberCategory;
+import org.noear.solon.core.AppContext;
+
+import java.util.Set;
+
+/**
+ * @author songyinyin
+ * @since 2023/10/23 21:33
+ */
+public class NeutrinoCoreRuntimeNativeRegistrar implements RuntimeNativeRegistrar {
+    @Override
+    public void register(AppContext context, RuntimeNativeMetadata metadata) {
+        Set<Class<?>> channelInboundClasses = ClassUtil.scanPackageBySuper("org.dromara.neutrinoproxy", SimpleChannelInboundHandler.class);
+        for (Class<?> clazz : channelInboundClasses) {
+            metadata.registerReflection(clazz, MemberCategory.INVOKE_DECLARED_METHODS);
+        }
+
+        metadata.registerReflection(ProxyMessage.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+        metadata.registerReflection(ProxyMessage.UdpBaseInfo.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+
+        metadata.registerArg("--add-opens java.base/java.lang.invoke=ALL-UNNAMED --add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
+    }
+}

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

@@ -3,9 +3,9 @@ package org.dromara.neutrinoproxy.core.dispatcher;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
-import org.dromara.neutrinoproxy.core.util.TypeUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.util.TypeUtil;
+import org.noear.snack.ONode;
 
 import java.util.HashMap;
 import java.util.List;
@@ -71,7 +71,7 @@ public class DefaultDispatcher<Context, Data> implements Dispatcher<Context, Dat
 		}
 		String type = matcher.apply(data);
 		if (null == type) {
-			log.warn("{} get match type failed data:{}", this.name, JSONObject.toJSONString(data));
+			log.warn("{} get match type failed data:{}", this.name, ONode.serialize(data));
 			return;
 		}
 		Handler<Context,Data> handler = handlerMap.get(type);

neutrino-proxy-core/src/main/resources/META-INF/native-image/neutrino-proxy-core/reflect-config.json

@@ -0,0 +1,18 @@
+[
+  {
+    "name": "java.nio.channels.spi.SelectorProvider",
+    "allDeclaredMethods": true
+  },
+  {
+    "name": "sun.nio.ch.KQueueSelectorProvider",
+    "allDeclaredMethods": true
+  },
+  {
+    "name": "sun.nio.ch.PollSelectorProvider",
+    "allDeclaredMethods": true
+  },
+  {
+    "name": "sun.nio.ch.SelectorProviderImpl",
+    "allDeclaredMethods": true
+  }
+]

neutrino-proxy-server/Dockerfile

@@ -1,15 +1,13 @@
-FROM openjdk:8-jdk-alpine
+FROM openjdk:17-jdk-alpine
 #同步时间
 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
 RUN mkdir -p /root/neutrino-proxy/config
-RUN mkdir -p /root/neutrino-proxy/neutrino-proxy-admin
 WORKDIR /root/neutrino-proxy
-COPY ../neutrino-proxy-server/target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar
-COPY ../neutrino-proxy-server/src/main/resources/app.yml /root/neutrino-proxy/config
-COPY ../neutrino-proxy-admin/dist /root/neutrino-proxy/neutrino-proxy-admin/dist
+COPY ./target/neutrino-proxy-server.jar /root/neutrino-proxy/neutrino-proxy-server.jar
+COPY ./src/main/resources/app.yml /root/neutrino-proxy/config
 #VOLUME ["/root/neutrino-proxy"]
 ENTRYPOINT ["java","-jar","neutrino-proxy-server.jar","config=./config/app.yml"]
 
-#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7
+#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7

neutrino-proxy-server/pom.xml

@@ -24,28 +24,24 @@
         </dependency>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>mybatis-pagehelper-solon-plugin</artifactId>
+            <artifactId>mybatis-plus-extension-solon-plugin</artifactId>
         </dependency>
         <dependency>
             <groupId>org.noear</groupId>
-            <artifactId>activerecord-solon-plugin</artifactId>
+            <artifactId>wood-solon-plugin</artifactId>
         </dependency>
         <dependency>
             <groupId>org.dromara.solon-plugins</groupId>
             <artifactId>job-solon-plugin</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.dromara.solon-plugins</groupId>
-            <artifactId>orika-solon-plugin</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.dromara.neutrino-proxy</groupId>
             <artifactId>neutrino-proxy-core</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>
-            <groupId>org.xerial</groupId>
-            <artifactId>sqlite-jdbc</artifactId>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>

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

@@ -1,18 +1,10 @@
 package org.dromara.neutrinoproxy.server;
 
-import ch.qos.logback.classic.Level;
-import ch.qos.logback.classic.Logger;
-import ch.qos.logback.classic.LoggerContext;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.dromara.solonplugins.job.annotation.EnableJob;
 import org.noear.solon.Solon;
-import org.noear.solon.SolonApp;
 import org.noear.solon.annotation.SolonMain;
 import org.noear.solon.web.cors.CrossFilter;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
 
 /**
  *
@@ -28,25 +20,6 @@ public class ProxyServer {
 		Solon.start(ProxyServer.class, args, app -> {
 			// 跨域支持。加-1 优先级更高
 			app.filter(-1, new CrossFilter().allowedOrigins("*"));
-			// 设置日志级别
-			setLogLevel(app);
 		});
 	}
-
-	private static void setLogLevel(SolonApp app) {
-		String loggerLevel = app.cfg().get("neutrino.proxy.logger.level");
-		if (StringUtils.isBlank(loggerLevel)) {
-			return;
-		}
-
-		try {
-			Level level = Level.toLevel(loggerLevel);
-			LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
-			for (Logger logger : loggerContext.getLoggerList()) {
-				logger.setLevel(level);
-			}
-		} catch (Exception e) {
-			log.error("logger level set failed", e);
-		}
-	}
 }

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

@@ -0,0 +1,95 @@
+package org.dromara.neutrinoproxy.server.base;
+
+import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
+import org.dromara.neutrinoproxy.server.base.rest.ResponseBody;
+import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
+import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportMonthMapper;
+import org.dromara.neutrinoproxy.server.dal.JobInfoMapper;
+import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
+import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
+import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
+import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
+import org.dromara.neutrinoproxy.server.dal.UserMapper;
+import org.dromara.neutrinoproxy.server.dal.UserTokenMapper;
+import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService;
+import org.dromara.neutrinoproxy.server.service.JobInfoService;
+import org.dromara.neutrinoproxy.server.service.JobLogService;
+import org.dromara.neutrinoproxy.server.service.LicenseService;
+import org.dromara.neutrinoproxy.server.service.PortGroupService;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.PortPoolService;
+import org.dromara.neutrinoproxy.server.service.ReportService;
+import org.dromara.neutrinoproxy.server.service.UserLoginRecordService;
+import org.dromara.neutrinoproxy.server.service.UserService;
+import org.dromara.solonplugins.job.JobBean;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.aot.RuntimeNativeMetadata;
+import org.noear.solon.aot.RuntimeNativeRegistrar;
+import org.noear.solon.aot.hint.MemberCategory;
+import org.noear.solon.core.AppContext;
+
+/**
+ * native 打包
+ *
+ * @author songyinyin
+ * @since 2023/10/20 11:24
+ */
+@Component
+public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegistrar {
+    @Override
+    public void register(AppContext context, RuntimeNativeMetadata metadata) {
+        metadata.registerResourceInclude("test.jks");
+        metadata.registerResourceInclude("sql/.*");
+
+        // 使用 MP lambda 的类，需要注册序列化
+        metadata.registerLambdaSerialization(ClientConnectRecordService.class);
+        metadata.registerLambdaSerialization(JobInfoService.class);
+        metadata.registerLambdaSerialization(JobLogService.class);
+        metadata.registerLambdaSerialization(LicenseService.class);
+        metadata.registerLambdaSerialization(PortGroupService.class);
+        metadata.registerLambdaSerialization(PortMappingService.class);
+        metadata.registerLambdaSerialization(PortPoolService.class);
+        metadata.registerLambdaSerialization(ReportService.class);
+        metadata.registerLambdaSerialization(UserLoginRecordService.class);
+        metadata.registerLambdaSerialization(UserService.class);
+
+        metadata.registerLambdaSerialization(LicenseMapper.class);
+        metadata.registerLambdaSerialization(ClientConnectRecordMapper.class);
+        metadata.registerLambdaSerialization(FlowReportDayMapper.class);
+        metadata.registerLambdaSerialization(FlowReportHourMapper.class);
+        metadata.registerLambdaSerialization(FlowReportMinuteMapper.class);
+        metadata.registerLambdaSerialization(FlowReportMonthMapper.class);
+        metadata.registerLambdaSerialization(JobInfoMapper.class);
+        metadata.registerLambdaSerialization(PortMappingMapper.class);
+        metadata.registerLambdaSerialization(PortPoolMapper.class);
+        metadata.registerLambdaSerialization(UserLoginRecordMapper.class);
+        metadata.registerLambdaSerialization(UserMapper.class);
+        metadata.registerLambdaSerialization(UserTokenMapper.class);
+
+        metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.License.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.PortMapping.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.Series.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.SingleDayFlow.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.TodayFlow.class, MemberCategory.DECLARED_FIELDS);
+        metadata.registerReflection(HomeDataView.TotalFlow.class, MemberCategory.DECLARED_FIELDS);
+
+        metadata.registerReflection(ResponseBody.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerSerialization(ResponseBody.class);
+
+        metadata.registerReflection(ProxyConfig.Protocol.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
+        metadata.registerReflection(ProxyConfig.Server.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(JobBean.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);
+
+    }
+
+}

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

@@ -24,16 +24,17 @@ package org.dromara.neutrinoproxy.server.base.db;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
-import com.jfinal.plugin.activerecord.Db;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.core.util.Assert;
 import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.constant.DbTypeEnum;
-import lombok.extern.slf4j.Slf4j;
 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.wood.DbContext;
+import org.noear.wood.annotation.Db;
 
 import java.util.List;
 
@@ -51,6 +52,9 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 
 	private DbTypeEnum dbTypeEnum;
 
+    @Db
+    DbContext dbContext;
+
 	@Init
 	public void init() throws Throwable {
 		Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!");
@@ -83,7 +87,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 			sql += "\r\n" + line.trim();
 			if (sql.endsWith(";")) {
 				log.debug("init database table sql:{}", sql);
-				Db.update(sql);
+                dbContext.exe(sql);
 				sql = "";
 			}
 		}
@@ -101,8 +105,8 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 		for (String tableName : initDataTableNameList) {
 			// 表里没有数据的时候，才进行初始化操作
 
-			int count = Db.queryInt(String.format("select count(1) from `%s`", tableName));
-			if (count > 0) {
+			Object result = dbContext.exe(String.format("select count(1) from `%s`", tableName));
+			if (result != null && ((Number) result).intValue() > 0) {
 				continue;
 			}
 			List<String> lines = FileUtil.readContentAsStringList(String.format("classpath:/sql/%s/%s.data.sql", dbConfig.getType(), tableName));
@@ -117,7 +121,7 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 				sql += "\r\n" + line.trim();
 				if (sql.endsWith(";")) {
 					log.debug("init database data[table={}] sql:{}", tableName, sql);
-					Db.update(sql);
+                    dbContext.exe(sql);
 					sql = "";
 				}
 			}

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

@@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.solon.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.solon.plugins.inner.PaginationInnerInterceptor;
 import com.zaxxer.hikari.HikariDataSource;
 import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.server.constant.DbTypeEnum;
 import org.noear.solon.annotation.Bean;
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
-import org.sqlite.SQLiteConfig;
-import org.sqlite.SQLiteDataSource;
 
 import javax.sql.DataSource;
 
@@ -25,11 +25,8 @@ public class DbConfiguration {
     @Bean(value = "db", typed = true)
     public DataSource dataSource(@Inject DbConfig dbConfig) {
         DbTypeEnum dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
-        if (DbTypeEnum.SQLITE == dbTypeEnum) {
-            SQLiteDataSource dataSource = new SQLiteDataSource();
-            dataSource.setUrl(dbConfig.getUrl());
-            dataSource.setJournalMode(SQLiteConfig.JournalMode.WAL.getValue());
-            return dataSource;
+        if (DbTypeEnum.H2 == dbTypeEnum) {
+            return newHikariDataSource(dbConfig, "org.h2.Driver");
         } else if (DbTypeEnum.MYSQL == dbTypeEnum) {
             String driver = "com.mysql.cj.jdbc.Driver";
             try {
@@ -66,8 +63,12 @@ public class DbConfiguration {
 
     @Bean
     public void db1_ext2(@Db("db") MybatisConfiguration config) {
-        config.getTypeHandlerRegistry().register("fun.asgc.neutrino.proxy.server.dal");
+        config.getTypeHandlerRegistry().register("org.dromara.neutrinoproxy.server.dal.entity");
         config.setDefaultEnumTypeHandler(null);
+
+        MybatisPlusInterceptor plusInterceptor = new MybatisPlusInterceptor();
+        plusInterceptor.addInnerInterceptor(new PaginationInnerInterceptor());
+        config.addInterceptor(plusInterceptor);
     }
 
     @Bean

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

@@ -1,5 +1,6 @@
 package org.dromara.neutrinoproxy.server.base.page;
 
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -101,11 +102,20 @@ public class PageInfo<T> implements Serializable {
 	}
 
 	public static <T> PageInfo<T> of(List<T> records, Long total, Integer current, Integer size) {
-		PageInfo<T> pageInfo = new PageInfo();
+		PageInfo<T> pageInfo = new PageInfo<>();
 		pageInfo.setRecords(records);
 		pageInfo.setTotal(total);
 		pageInfo.setCurrent(current);
 		pageInfo.setSize(size);
 		return pageInfo;
 	}
+
+	public static <T> PageInfo<T> of(List<T> records, Page<?> page) {
+		PageInfo<T> pageInfo = new PageInfo<>();
+		pageInfo.setRecords(records);
+		pageInfo.setTotal(page.getTotal());
+		pageInfo.setCurrent((int) page.getCurrent());
+		pageInfo.setSize((int) page.getSize());
+		return pageInfo;
+	}
 }

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

@@ -9,10 +9,10 @@ import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioDatagramChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.traffic.ChannelTrafficShapingHandler;
 import org.dromara.neutrinoproxy.core.ProxyDataTypeEnum;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
 import org.dromara.neutrinoproxy.core.ProxyMessageHandler;
+import org.dromara.neutrinoproxy.core.aot.NeutrinoCoreRuntimeNativeRegistrar;
 import org.dromara.neutrinoproxy.core.dispatcher.DefaultDispatcher;
 import org.dromara.neutrinoproxy.core.dispatcher.Dispatcher;
 import io.netty.channel.ChannelHandlerContext;
@@ -48,7 +48,9 @@ public class ProxyConfiguration implements LifecycleBean {
 
     @Bean("tcpServerBossGroup")
     public NioEventLoopGroup tcpServerBossGroup(@Inject ProxyConfig proxyConfig) {
-        return new NioEventLoopGroup(proxyConfig.getServer().getTcp().getBossThreadCount());
+        ProxyConfig.Server server = proxyConfig.getServer();
+        ProxyConfig.Tcp tcp = server.getTcp();
+        return new NioEventLoopGroup(tcp.getBossThreadCount());
     }
 
     @Bean("tcpServerWorkerGroup")
@@ -79,12 +81,12 @@ public class ProxyConfiguration implements LifecycleBean {
     }
 
     @Bean("udpServerBossGroup")
-    private NioEventLoopGroup udpServerBossGroup(@Inject ProxyConfig proxyConfig) {
+    public NioEventLoopGroup udpServerBossGroup(@Inject ProxyConfig proxyConfig) {
         return new NioEventLoopGroup(proxyConfig.getServer().getUdp().getBossThreadCount());
     }
 
     @Bean("udpServerWorkerGroup")
-    private NioEventLoopGroup udpServerWorkerGroup(@Inject ProxyConfig proxyConfig) {
+    public NioEventLoopGroup udpServerWorkerGroup(@Inject ProxyConfig proxyConfig) {
         return new NioEventLoopGroup(proxyConfig.getServer().getUdp().getWorkThreadCount());
     }
 
@@ -125,4 +127,9 @@ public class ProxyConfiguration implements LifecycleBean {
         return new NioEventLoopGroup(proxyConfig.getTunnel().getWorkThreadCount());
     }
 
+    @Bean
+    public NeutrinoCoreRuntimeNativeRegistrar neutrinoCoreRuntimeNativeRegistrar() {
+        return new NeutrinoCoreRuntimeNativeRegistrar();
+    }
+
 }

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

@@ -1,7 +1,7 @@
 package org.dromara.neutrinoproxy.server.base.rest.interceptor;
 
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
+import org.noear.snack.ONode;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.core.handle.Action;
 import org.noear.solon.core.handle.Context;
@@ -33,8 +33,8 @@ public class VisitLogInterceptor implements RouterInterceptor {
             long elapsedTime = now.getTime() - startTime.getTime();
             log.debug("\n-----------------------------------------------------------------interface request log：\n{} url:{} elapsed time:{}\nrequest:{}\nresponse:{}\nclient ip:{}\n",
                     ctx.method(), ctx.path(), getElapsedTimeStr(elapsedTime),
-                    JSONObject.toJSONString(ctx.paramMap()),
-                    JSONObject.toJSONString(JSONObject.toJSONString(ctx.result)),
+                    ONode.serialize(ctx.paramMap()),
+                    ONode.serialize(ctx.result),
                     ctx.realIp()
             );
         }

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

@@ -37,7 +37,7 @@ import java.util.stream.Stream;
 @Getter
 @AllArgsConstructor
 public enum DbTypeEnum {
-    SQLITE("sqlite"),
+    H2("h2"),
     MYSQL("mysql"),
     MARIADB("mariadb"),
     ;

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

@@ -1,6 +1,7 @@
 package org.dromara.neutrinoproxy.server.dal;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.neutrinoproxy.server.controller.req.system.PortGroupListReq;
 import org.dromara.neutrinoproxy.server.controller.res.system.PortGroupListRes;
@@ -14,7 +15,7 @@ import java.util.List;
 @Mapper
 public interface PortGroupMapper extends BaseMapper<PortGroupDO> {
 
-    List<PortGroupListRes> selectPortGroupListResList(PortGroupListReq res);
+    List<PortGroupListRes> selectPortGroupListResList(IPage<PortGroupListRes> page, PortGroupListReq res);
 
 
    default void updateEnableStatus(Integer id, Integer enable, Date now){

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
@@ -106,5 +107,5 @@ public interface PortMappingMapper extends BaseMapper<PortMappingDO> {
 		);
 	}
 
-	List<PortMappingDO> selectPortMappingByCondition(@Param("req") PortMappingListReq req);
+	List<PortMappingDO> selectPortMappingByCondition(IPage<PortMappingDO> page, @Param("req") PortMappingListReq req);
 }

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

@@ -24,6 +24,7 @@ package org.dromara.neutrinoproxy.server.dal;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolListReq;
 import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolListRes;
 import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
@@ -65,7 +66,7 @@ public interface PortPoolMapper extends BaseMapper<PortPoolDO> {
 		);
 	}
 
-	List<PortPoolListRes> selectResList(@Param("req") PortPoolListReq req);
+	List<PortPoolListRes> selectResList(IPage<PortPoolListRes> page, @Param("req") PortPoolListReq req);
 
-    List<PortPoolListRes> getAvailablePortList(@Param("licenseId") Integer licenseId,@Param("userId") Integer userId, @Param("keyword") String keyword);
+    List<PortPoolListRes> getAvailablePortList(IPage<PortPoolListRes> page, @Param("licenseId") Integer licenseId,@Param("userId") Integer userId, @Param("keyword") String keyword);
 }

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

@@ -1,5 +1,6 @@
 package org.dromara.neutrinoproxy.server.dal;
 
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import org.dromara.neutrinoproxy.server.controller.res.report.*;
 import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowMonthReportRes;
 import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowReportRes;
@@ -24,26 +25,26 @@ public interface ReportMapper {
      * @param userId
      * @return
      */
-    List<UserFlowReportRes> userFlowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+    List<UserFlowReportRes> userFlowReportList(Page<UserFlowReportRes> page, @Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
     /**
      * 基于License维度的流量报表
      * @param userId
      * @return
      */
-    List<LicenseFlowReportRes> licenseFLowReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+    List<LicenseFlowReportRes> licenseFLowReportList(Page<LicenseFlowReportRes> page, @Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
 
     /**
      * 用户流量月度明细
      * @param userId
      * @return
      */
-    List<UserFlowMonthReportRes> userFlowMonthReportList(@Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+    List<UserFlowMonthReportRes> userFlowMonthReportList(Page<UserFlowMonthReportRes> page, @Param("userId") Integer userId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
     /**
      * License流量月度明细
      * @param userId
      * @return
      */
-    List<LicenseFlowMonthReportRes> licenseFLowMonthReportList(@Param("userId") Integer userId, @Param("licenseId") Integer licenseId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
+    List<LicenseFlowMonthReportRes> licenseFLowMonthReportList(Page<LicenseFlowMonthReportRes> page, @Param("userId") Integer userId, @Param("licenseId") Integer licenseId, @Param("curMonthBeginDate") Date curMonthBeginDate, @Param("curDayBeginDate") Date curDayBeginDate, @Param("curDate") Date curDate);
 
     /**
      * 首页 - 今日流量

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.log.ClientConnectRecordListRes;
 
 import java.util.Date;
 
@@ -34,4 +35,17 @@ public class ClientConnectRecordDO {
      * 创建时间
      */
     private Date createTime;
+
+    public ClientConnectRecordListRes toRes() {
+        ClientConnectRecordListRes res = new ClientConnectRecordListRes();
+        res.setId(id);
+        res.setIp(ip);
+        res.setLicenseId(licenseId);
+        res.setType(type);
+        res.setMsg(msg);
+        res.setCode(code);
+        res.setErr(err);
+        res.setCreateTime(createTime);
+        return res;
+    }
 }

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

@@ -29,6 +29,7 @@ import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoListRes;
 
 import java.util.Date;
 
@@ -64,4 +65,19 @@ public class JobInfoDO {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+    public JobInfoListRes toRes() {
+        JobInfoListRes res = new JobInfoListRes();
+        res.setId(id);
+        res.setCron(cron);
+        res.setDesc(desc);
+        res.setAlarmEmail(alarmEmail);
+        res.setAlarmDing(alarmDing);
+        res.setHandler(handler);
+        res.setParam(param);
+        res.setEnable(enable);
+        res.setCreateTime(createTime);
+        res.setUpdateTime(updateTime);
+        return res;
+    }
 }

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

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.log.JobLogListRes;
 
 import java.util.Date;
 
@@ -52,4 +53,17 @@ public class JobLogDO {
 	 * 创建时间
 	 */
 	private Date createTime;
+
+    public JobLogListRes toRes() {
+        JobLogListRes res = new JobLogListRes();
+        res.setId(id);
+        res.setJobId(jobId);
+        res.setHandler(handler);
+        res.setParam(param);
+        res.setCode(code);
+        res.setMsg(msg);
+        res.setAlarmStatus(alarmStatus);
+        res.setCreateTime(createTime);
+        return res;
+    }
 }

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

@@ -30,6 +30,7 @@ import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseListRes;
 
 import java.util.Date;
 
@@ -76,4 +77,17 @@ public class LicenseDO {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+    public LicenseListRes toRes() {
+        LicenseListRes res = new LicenseListRes();
+        res.setId(id);
+        res.setName(name);
+        res.setKey(key);
+        res.setUserId(userId);
+        res.setIsOnline(isOnline);
+        res.setEnable(enable);
+        res.setCreateTime(createTime);
+        res.setUpdateTime(updateTime);
+        return res;
+    }
 }

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

@@ -29,6 +29,7 @@ import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
 
 import java.util.Date;
 
@@ -99,4 +100,24 @@ public class PortMappingDO {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+
+    public PortMappingListRes toRes() {
+        PortMappingListRes res = new PortMappingListRes();
+        res.setId(id);
+        res.setLicenseId(licenseId);
+        res.setProtocal(protocal);
+        res.setSubdomain(subdomain);
+        res.setServerPort(serverPort);
+        res.setClientIp(clientIp);
+        res.setClientPort(clientPort);
+        res.setDescription(description);
+        res.setIsOnline(isOnline);
+        res.setProxyResponses(proxyResponses);
+        res.setProxyTimeoutMs(proxyTimeoutMs);
+        res.setEnable(enable);
+        res.setCreateTime(createTime);
+        res.setUpdateTime(updateTime);
+        return res;
+    }
 }

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

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolListRes;
 
 import java.util.Date;
 
@@ -64,4 +65,15 @@ public class PortPoolDO {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+    public PortPoolListRes toRes() {
+        PortPoolListRes res = new PortPoolListRes();
+        res.setId(id);
+        res.setGroupId(groupId);
+        res.setPort(port);
+        res.setEnable(enable);
+        res.setCreateTime(createTime);
+        res.setUpdateTime(updateTime);
+        return res;
+    }
 }

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

@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserListRes;
 
 import java.util.Date;
 
@@ -36,7 +37,7 @@ import java.util.Date;
  */
 @ToString
 @Data
-@TableName("user")
+@TableName("`user`")
 public class UserDO {
 	@TableId(type = IdType.AUTO)
 	private Integer id;
@@ -64,4 +65,15 @@ public class UserDO {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+    public UserListRes toRes() {
+        UserListRes res = new UserListRes();
+        res.setId(id);
+        res.setName(name);
+        res.setLoginName(loginName);
+        res.setEnable(enable);
+        res.setCreateTime(createTime);
+        res.setUpdateTime(updateTime);
+        return res;
+    }
 }

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

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.controller.res.log.UserLoginRecordListRes;
 
 import java.util.Date;
 
@@ -62,4 +63,14 @@ public class UserLoginRecordDO {
 	 * 创建时间
 	 */
 	private Date createTime;
+
+    public UserLoginRecordListRes toRes() {
+        UserLoginRecordListRes res = new UserLoginRecordListRes();
+        res.setId(id);
+        res.setUserId(userId);
+        res.setIp(ip);
+        res.setType(type);
+        res.setCreateTime(createTime);
+        return res;
+    }
 }

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

@@ -1,14 +1,19 @@
 package org.dromara.neutrinoproxy.server.job;
 
-import com.alibaba.fastjson.JSONObject;
-import org.dromara.neutrinoproxy.core.util.DateUtil;
-import org.dromara.neutrinoproxy.server.dal.*;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.util.DateUtil;
+import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper;
+import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper;
+import org.dromara.neutrinoproxy.server.dal.JobLogMapper;
+import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
 import org.dromara.solonplugins.job.IJobHandler;
 import org.dromara.solonplugins.job.annotation.JobHandler;
+import org.noear.snack.ONode;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
@@ -108,7 +113,7 @@ public class DataCleanJob implements IJobHandler {
     public static JobParams getParams(String s) {
         try {
             if (StringUtils.isNotBlank(s)) {
-                return JSONObject.parseObject(s, JobParams.class);
+                return ONode.deserialize(s, JobParams.class);
             }
         } catch (Exception e) {
             // ignore

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

@@ -18,6 +18,7 @@ import org.noear.solon.annotation.Component;
 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 javax.net.ssl.SSLContext;
@@ -42,8 +43,11 @@ public class ProxyTunnelServer implements EventListener<AppLoadEndEvent> {
 	private NioEventLoopGroup serverWorkerGroup;
 	@Override
 	public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
-		startProxyServer();
-		startProxyServerForSSL();
+        // aot 阶段，不启动代理服务
+        if (NativeDetector.isNotAotRuntime()) {
+            startProxyServer();
+            startProxyServerForSSL();
+        }
 	}
 	/**
 	 * 启动代理服务

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

@@ -1,11 +1,13 @@
 package org.dromara.neutrinoproxy.server.proxy.handler;
 
-import com.alibaba.fastjson.JSONObject;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelOption;
 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.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
@@ -16,6 +18,7 @@ import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
 import org.dromara.neutrinoproxy.server.service.LicenseService;
 import org.dromara.neutrinoproxy.server.service.UserService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.snack.ONode;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
@@ -36,7 +39,7 @@ public class UdpProxyMessageConnectHandler implements ProxyMessageHandler {
 
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONObject.parseObject(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
+        final ProxyMessage.UdpBaseInfo udpBaseInfo = ONode.deserialize(proxyMessage.getInfo(), ProxyMessage.UdpBaseInfo.class);
         final String licenseKey = new String(proxyMessage.getData());
         log.info("[UDP connect]info:{} licenseKey:{}", proxyMessage.getInfo(), licenseKey);
 

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

@@ -1,7 +1,5 @@
 package org.dromara.neutrinoproxy.server.proxy.handler;
 
-import com.alibaba.fastjson.JSONObject;
-import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -12,9 +10,8 @@ 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.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
-import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.snack.ONode;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Component;
 
@@ -30,7 +27,7 @@ import java.net.InetSocketAddress;
 public class UdpProxyMessageTransferHandler implements ProxyMessageHandler {
     @Override
     public void handle(ChannelHandlerContext ctx, ProxyMessage proxyMessage) {
-        final ProxyMessage.UdpBaseInfo udpBaseInfo = JSONObject.parseObject(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 visitorChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();

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

@@ -3,8 +3,9 @@ package org.dromara.neutrinoproxy.server.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
 import org.dromara.neutrinoproxy.server.base.page.PageQuery;
 import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
@@ -16,11 +17,7 @@ import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.ClientConnectRecordDO;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
-import lombok.extern.slf4j.Slf4j;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 import java.util.List;
 import java.util.Map;
@@ -35,8 +32,6 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class ClientConnectRecordService {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private ClientConnectRecordMapper clientConnectRecordMapper;
     @Db
@@ -49,19 +44,18 @@ public class ClientConnectRecordService {
     }
 
     public PageInfo<ClientConnectRecordListRes> page(PageQuery pageQuery, ClientConnectRecordListReq req) {
-        Page<ClientConnectRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-        List<ClientConnectRecordDO> list = clientConnectRecordMapper.selectList(new LambdaQueryWrapper<ClientConnectRecordDO>()
-                        .eq(null != req.getLicenseId(), ClientConnectRecordDO::getLicenseId, req.getLicenseId())
-                .orderByDesc(ClientConnectRecordDO::getId)
+        Page<ClientConnectRecordDO> pageResult = clientConnectRecordMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<ClientConnectRecordDO>()
+            .eq(null != req.getLicenseId(), ClientConnectRecordDO::getLicenseId, req.getLicenseId())
+            .orderByDesc(ClientConnectRecordDO::getId)
         );
-        List<ClientConnectRecordListRes> respList = mapperFacade.mapAsList(list, ClientConnectRecordListRes.class);
-        if (CollectionUtils.isEmpty(list)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        List<ClientConnectRecordListRes> respList = pageResult.getRecords().stream().map(ClientConnectRecordDO::toRes).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(pageResult.getRecords())) {
+            return PageInfo.of(respList, pageResult.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
         }
         Set<Integer> licenseIds = respList.stream().map(ClientConnectRecordListRes::getLicenseId).collect(Collectors.toSet());
         List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
         if (CollectionUtil.isEmpty(licenseList)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+            return PageInfo.of(respList, pageResult.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
         }
         Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
         List<UserDO> userList = userMapper.findByIds(userIds);
@@ -85,6 +79,6 @@ public class ClientConnectRecordService {
                 item.setMsg("******");
             }
         });
-        return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(respList, pageResult);
     }
 }

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

@@ -2,9 +2,10 @@ package org.dromara.neutrinoproxy.server.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+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.constant.EnableStatusEnum;
@@ -19,11 +20,13 @@ import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateEnabl
 import org.dromara.neutrinoproxy.server.controller.res.system.JobInfoUpdateRes;
 import org.dromara.neutrinoproxy.server.dal.JobInfoMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.JobInfoDO;
-import org.dromara.neutrinoproxy.server.job.*;
+import org.dromara.neutrinoproxy.server.job.DataCleanJob;
+import org.dromara.neutrinoproxy.server.job.DemoJob;
+import org.dromara.neutrinoproxy.server.job.FlowReportForDayJob;
+import org.dromara.neutrinoproxy.server.job.FlowReportForHourJob;
+import org.dromara.neutrinoproxy.server.job.FlowReportForMinuteJob;
+import org.dromara.neutrinoproxy.server.job.FlowReportForMonthJob;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
-import lombok.extern.slf4j.Slf4j;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.solonplugins.job.IJobHandler;
 import org.dromara.solonplugins.job.IJobSource;
 import org.dromara.solonplugins.job.JobInfo;
@@ -37,17 +40,15 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- *
  * @author: aoshiguchen
  * @date: 2022/9/5
  */
 @Slf4j
 @Component
 public class JobInfoService implements IJobSource {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private JobInfoMapper jobInfoMapper;
     @Inject
@@ -66,21 +67,20 @@ public class JobInfoService implements IJobSource {
 
     @Init
     public void init() {
-       jobHandlerMap.put("DataCleanJob", dataCleanJob);
-       jobHandlerMap.put("DemoJob", demoJob);
-       jobHandlerMap.put("FlowReportForDayJob", flowReportForDayJob);
-       jobHandlerMap.put("FlowReportForHourJob", flowReportForHourJob);
-       jobHandlerMap.put("FlowReportForMinuteJob", flowReportForMinuteJob);
-       jobHandlerMap.put("FlowReportForMonthJob", flowReportForMonthJob);
+        jobHandlerMap.put("DataCleanJob", dataCleanJob);
+        jobHandlerMap.put("DemoJob", demoJob);
+        jobHandlerMap.put("FlowReportForDayJob", flowReportForDayJob);
+        jobHandlerMap.put("FlowReportForHourJob", flowReportForHourJob);
+        jobHandlerMap.put("FlowReportForMinuteJob", flowReportForMinuteJob);
+        jobHandlerMap.put("FlowReportForMonthJob", flowReportForMonthJob);
     }
 
     public PageInfo<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
-        Page<JobInfoListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-        List<JobInfoDO> list = jobInfoMapper.selectList(new LambdaQueryWrapper<JobInfoDO>()
-                .orderByAsc(JobInfoDO::getId)
+        Page<JobInfoDO> page = jobInfoMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<JobInfoDO>()
+            .orderByAsc(JobInfoDO::getId)
         );
-        List<JobInfoListRes> respList = mapperFacade.mapAsList(list, JobInfoListRes.class);
-        return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        List<JobInfoListRes> respList = page.getRecords().stream().map(JobInfoDO::toRes).collect(Collectors.toList());
+        return PageInfo.of(respList, page);
     }
 
     public List<JobInfoDO> findList() {
@@ -114,13 +114,13 @@ public class JobInfoService implements IJobSource {
         }
         for (JobInfoDO item : jobInfoDOList) {
             jobInfoList.add(new JobInfo()
-                    .setId(String.valueOf(item.getId()))
-                    .setName(item.getHandler())
-                    .setDesc(item.getDesc())
-                    .setCron(item.getCron())
-                    .setParam(item.getParam())
-                    .setEnable(EnableStatusEnum.ENABLE.getStatus().equals(item.getEnable()))
-                    .setJobHandler(jobHandlerMap.get(item.getHandler()))
+                .setId(String.valueOf(item.getId()))
+                .setName(item.getHandler())
+                .setDesc(item.getDesc())
+                .setCron(item.getCron())
+                .setParam(item.getParam())
+                .setEnable(EnableStatusEnum.ENABLE.getStatus().equals(item.getEnable()))
+                .setJobHandler(jobHandlerMap.get(item.getHandler()))
             );
         }
 
@@ -128,8 +128,8 @@ public class JobInfoService implements IJobSource {
     }
 
     public JobInfoUpdateRes update(JobInfoUpdateReq req) {
-        JobInfoDO  jobInfoDO = jobInfoMapper.findById(req.getId());
-        ParamCheckUtil.checkNotNull( jobInfoDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+        JobInfoDO jobInfoDO = jobInfoMapper.findById(req.getId());
+        ParamCheckUtil.checkNotNull(jobInfoDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
         JobInfoDO jobInfo = new JobInfoDO();
         jobInfo.setId(req.getId());
         jobInfo.setCron(req.getCron());

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

@@ -22,25 +22,23 @@
 package org.dromara.neutrinoproxy.server.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+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.controller.req.log.JobLogListReq;
 import org.dromara.neutrinoproxy.server.controller.res.log.JobLogListRes;
 import org.dromara.neutrinoproxy.server.dal.JobLogMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.JobLogDO;
-import lombok.extern.slf4j.Slf4j;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.solonplugins.job.IJobCallback;
 import org.dromara.solonplugins.job.JobInfo;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -50,8 +48,6 @@ import java.util.List;
 @Slf4j
 @Component
 public class JobLogService implements IJobCallback {
-	@Inject
-	private MapperFacade mapperFacade;
 	@Db
 	private JobLogMapper jobLogMapper;
 
@@ -79,13 +75,12 @@ public class JobLogService implements IJobCallback {
 	}
 
 	public PageInfo<JobLogListRes> page(PageQuery pageQuery, JobLogListReq req) {
-		Page<JobLogListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-		List<JobLogDO> list = jobLogMapper.selectList(new LambdaQueryWrapper<JobLogDO>()
-				.eq(null != req.getJobId(), JobLogDO::getJobId, req.getJobId())
-				.orderByDesc(JobLogDO::getId)
-		);
-		List<JobLogListRes> respList = mapperFacade.mapAsList(list, JobLogListRes.class);
-		return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        Page<JobLogDO> page = jobLogMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<JobLogDO>()
+            .eq(null != req.getJobId(), JobLogDO::getJobId, req.getJobId())
+            .orderByDesc(JobLogDO::getId)
+        );
+        List<JobLogListRes> respList = page.getRecords().stream().map(JobLogDO::toRes).collect(Collectors.toList());
+		return PageInfo.of(respList, page);
 	}
 
 }

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

@@ -3,10 +3,8 @@ package org.dromara.neutrinoproxy.server.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
-import ma.glasnost.orika.MapperFacade;
 import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.server.base.db.DBInitialize;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
@@ -20,7 +18,11 @@ import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseCreateReq;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseListReq;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseUpdateEnableStatusReq;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.LicenseUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseCreateRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseDetailRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseListRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseUpdateEnableStatusRes;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.LicenseUpdateRes;
 import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
 import org.dromara.neutrinoproxy.server.dal.UserMapper;
@@ -33,7 +35,12 @@ import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -45,8 +52,6 @@ import java.util.stream.Collectors;
  */
 @Component
 public class LicenseService implements LifecycleBean {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private LicenseMapper licenseMapper;
     @Db
@@ -59,16 +64,15 @@ public class LicenseService implements LifecycleBean {
     private DBInitialize dbInitialize;
 
     public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
-        Page<LicenseListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-        List<LicenseDO> list = licenseMapper.selectList(new LambdaQueryWrapper<LicenseDO>()
-                .eq(req.getUserId() != null, LicenseDO::getUserId, req.getUserId())
-                .eq(req.getIsOnline() != null, LicenseDO::getIsOnline, req.getIsOnline())
-                .eq(req.getEnable() != null, LicenseDO::getEnable, req.getEnable())
-                .orderByAsc(Arrays.asList(LicenseDO::getUserId, LicenseDO::getId))
+        Page<LicenseDO> page = licenseMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<LicenseDO>()
+            .eq(req.getUserId() != null, LicenseDO::getUserId, req.getUserId())
+            .eq(req.getIsOnline() != null, LicenseDO::getIsOnline, req.getIsOnline())
+            .eq(req.getEnable() != null, LicenseDO::getEnable, req.getEnable())
+            .orderByAsc(Arrays.asList(LicenseDO::getUserId, LicenseDO::getId))
         );
-        List<LicenseListRes> respList = mapperFacade.mapAsList(list, LicenseListRes.class);
-        if (CollectionUtils.isEmpty(list)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        List<LicenseListRes> respList = page.getRecords().stream().map(LicenseDO::toRes).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(page.getRecords())) {
+            return PageInfo.of(respList, page);
         }
         if (!CollectionUtil.isEmpty(respList)) {
             Set<Integer> userIds = respList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
@@ -82,7 +86,7 @@ public class LicenseService implements LifecycleBean {
                 item.setKey(desensitization(item.getUserId(), item.getKey()));
             }
         }
-        return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(respList, page);
     }
 
     public List<LicenseListRes> list(LicenseListReq req) {
@@ -94,7 +98,7 @@ public class LicenseService implements LifecycleBean {
     }
 
     private List<LicenseListRes> assembleConvertLicenses(List<LicenseDO> list) {
-        List<LicenseListRes> licenseList = mapperFacade.mapAsList(list, LicenseListRes.class);
+        List<LicenseListRes> licenseList = list.stream().map(LicenseDO::toRes).collect(Collectors.toList());
         if (!CollectionUtil.isEmpty(licenseList)) {
             Set<Integer> userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
             List<UserDO> userList = userMapper.findByIds(userIds);

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

@@ -1,8 +1,8 @@
 package org.dromara.neutrinoproxy.server.service;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+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.ServiceException;
@@ -21,10 +21,7 @@ import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 import java.util.Date;
 import java.util.List;
@@ -36,9 +33,6 @@ import java.util.Objects;
 @Component
 public class PortGroupService {
 
-    @Inject
-    private MapperFacade mapperFacade;
-
     @Db
     private PortGroupMapper portGroupMapper;
 
@@ -64,14 +58,14 @@ public class PortGroupService {
     }
 
     public PageInfo<PortGroupListRes> page(PageQuery pageQuery, PortGroupListReq req) {
-        Page<PortGroupListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(req);
+        Page<PortGroupListRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(page, req);
 
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(list, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }
 
     public List<PortGroupListRes> list(PortGroupListReq req) {
-        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(req);
+        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(null, req);
         return list;
     }
 

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

@@ -5,10 +5,8 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
-import ma.glasnost.orika.MapperFacade;
 import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.server.base.db.DBInitialize;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
@@ -23,7 +21,11 @@ import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingCreateRe
 import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingUpdateEnableStatusReq;
 import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingCreateRes;
+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;
@@ -39,7 +41,11 @@ import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
 
-import java.util.*;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -49,8 +55,6 @@ import java.util.stream.Collectors;
  */
 @Component
 public class PortMappingService implements LifecycleBean {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private PortMappingMapper portMappingMapper;
     @Db
@@ -70,7 +74,6 @@ public class PortMappingService implements LifecycleBean {
     private DBInitialize dbInitialize;
 
     public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
-        Page<PortMappingListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
         if (StringUtils.isNotEmpty(req.getDescription())) {
             //描述字段为模糊查询，在应用层处理，否则sqlite不支持
             req.setDescription("%" + req.getDescription() + "%");
@@ -82,16 +85,17 @@ public class PortMappingService implements LifecycleBean {
             req.setProtocal(networkProtocolEnum.getDesc());
         }
 
-        List<PortMappingDO> list = portMappingMapper.selectPortMappingByCondition(req);
-        List<PortMappingListRes> respList = mapperFacade.mapAsList(list, PortMappingListRes.class);
+        Page<PortMappingDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<PortMappingDO> list = portMappingMapper.selectPortMappingByCondition(page, req);
+        List<PortMappingListRes> respList = list.stream().map(PortMappingDO::toRes).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(list)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+            return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
         }
 
         Set<Integer> licenseIds = respList.stream().map(PortMappingListRes::getLicenseId).collect(Collectors.toSet());
         List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
         if (CollectionUtil.isEmpty(licenseList)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+            return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
         }
         Set<Integer> userIds = licenseList.stream().map(LicenseDO::getUserId).collect(Collectors.toSet());
         List<UserDO> userList = userMapper.findByIds(userIds);
@@ -119,7 +123,7 @@ public class PortMappingService implements LifecycleBean {
         });
         //sorted [userId asc] [licenseId asc] [createTime asc]
         respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
-        return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }
 
     public PortMappingCreateRes create(PortMappingCreateReq req) {

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

@@ -3,31 +3,35 @@ 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.core.toolkit.Wrappers;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+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.ServiceException;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 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.req.system.AvailablePortListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolCreateReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolUpdateEnableStatusReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolUpdateGroupReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.PortPoolUpdateReq;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolCreateRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolListRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolUpdateEnableStatusRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolUpdateGroupRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.PortPoolUpdateRes;
 import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.PortGroupMapper;
 import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
 import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
-import org.dromara.neutrinoproxy.server.dal.entity.*;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
+import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
-import lombok.extern.slf4j.Slf4j;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.solon.annotation.Db;
-import org.dromara.neutrinoproxy.server.controller.req.system.*;
-import org.dromara.neutrinoproxy.server.controller.res.system.*;
-import org.dromara.neutrinoproxy.server.dal.entity.PortGroupDO;
 import org.dromara.neutrinoproxy.server.util.PortAvailableUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
@@ -38,7 +42,9 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.*;
+import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.PORT_CANNOT_REPEAT;
+import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.PORT_GROUP_NAME_DOES_NOT_EXIST;
+import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.PORT_RANGE_FAIL;
 
 /**
  *
@@ -48,8 +54,6 @@ import static org.dromara.neutrinoproxy.server.constant.ExceptionConstant.*;
 @Slf4j
 @Component
 public class PortPoolService {
-	@Inject
-	private MapperFacade mapperFacade;
 	@Db
 	private PortPoolMapper portPoolMapper;
 	@Inject
@@ -63,17 +67,18 @@ public class PortPoolService {
     private LicenseMapper licenseMapper;
 
     public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
-        Page<PortPoolListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-
-        List<PortPoolListRes> list = portPoolMapper.selectResList(req);
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        Page<PortPoolListRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<PortPoolListRes> list = portPoolMapper.selectResList(page, req);
+        return PageInfo.of(list, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }
 
     public List<PortPoolListRes> list(PortPoolListReq req) {
         List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
                 .eq(PortPoolDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
         );
-        return mapperFacade.mapAsList(this.filterUsedPorts(list), PortPoolListRes.class);
+
+        List<PortPoolDO> resultList = this.filterUsedPorts(list);
+        return resultList.stream().map(PortPoolDO::toRes).collect(Collectors.toList());
     }
 
     private List<PortPoolDO> filterUsedPorts(List<PortPoolDO> list) {
@@ -154,7 +159,7 @@ public class PortPoolService {
 
     public List<PortPoolListRes> portListByGroupId(String groupId) {
         List<PortPoolDO> portPoolDOList = portPoolMapper.getByGroupId(groupId);
-        List<PortPoolListRes> portPoolListReList = mapperFacade.mapAsList(portPoolDOList, PortPoolListRes.class);
+        List<PortPoolListRes> portPoolListReList = portPoolDOList.stream().map(PortPoolDO::toRes).collect(Collectors.toList());
         return portPoolListReList;
     }
 
@@ -183,10 +188,10 @@ public class PortPoolService {
             req.setKeyword(req.getKeyword()+"%");
         }
 
-        Page<PortPoolListRes> result = PageHelper.startPage(req.getPage(), req.getSize());
-        List<PortPoolListRes> portList = portPoolMapper.getAvailablePortList(req.getLicenseId(), licenseDO.getUserId(), req.getKeyword());
+        Page<PortPoolListRes> page = new Page<>(req.getPage(), req.getSize());
+        List<PortPoolListRes> portList = portPoolMapper.getAvailablePortList(page, req.getLicenseId(), licenseDO.getUserId(), req.getKeyword());
 
-        return PageInfo.of(portList, result.getTotal(), req.getPage(), req.getSize());
+        return PageInfo.of(portList, page.getTotal(), req.getPage(), req.getSize());
     }
 
     public void deleteBatch(List<Integer> ids) {

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

@@ -2,9 +2,10 @@ package org.dromara.neutrinoproxy.server.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.core.util.DateUtil;
 import org.dromara.neutrinoproxy.server.base.db.DbConfig;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
@@ -15,7 +16,11 @@ import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowMonthRe
 import org.dromara.neutrinoproxy.server.controller.req.report.LicenseFlowReportReq;
 import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowMonthReportReq;
 import org.dromara.neutrinoproxy.server.controller.req.report.UserFlowReportReq;
-import org.dromara.neutrinoproxy.server.controller.res.report.*;
+import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
+import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowMonthReportRes;
+import org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowReportRes;
+import org.dromara.neutrinoproxy.server.controller.res.report.UserFlowMonthReportRes;
+import org.dromara.neutrinoproxy.server.controller.res.report.UserFlowReportRes;
 import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
 import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
 import org.dromara.neutrinoproxy.server.dal.ReportMapper;
@@ -24,13 +29,16 @@ import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.service.bo.FlowBO;
 import org.dromara.neutrinoproxy.server.service.bo.SingleDayFlowBO;
 import org.dromara.neutrinoproxy.server.util.FormatUtil;
-import lombok.extern.slf4j.Slf4j;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
-import java.util.*;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -40,8 +48,6 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class ReportService {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private ReportMapper reportMapper;
     @Db
@@ -77,17 +83,17 @@ public class ReportService {
         // 今日流量
         Date now = new Date();
         FlowBO todayFlow = reportMapper.homeTodayFlow(DateUtil.getDayBegin(now), now);
-        homeDataView.setTodayFlow(mapperFacade.map(todayFlow, HomeDataView.TodayFlow.class));
+        homeDataView.setTodayFlow(todayFlow.todayFlow());
 
         // 总流量
         FlowBO totalFlow = reportMapper.homeTotalFlow(DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
-        homeDataView.setTotalFlow(mapperFacade.map(totalFlow, HomeDataView.TotalFlow.class));
+        homeDataView.setTotalFlow(totalFlow.totalFlow());
 
         // 最近n日流量
         Integer days = Constants.HOME_FLOW_DAYS;
         List<SingleDayFlowBO> last7dFlowList = reportMapper.homeLast7dFlowList(DateUtil.getDayBegin(DateUtil.addDate(now, Calendar.DATE, -(days - 1))), DateUtil.getDayBegin(now), now);
         homeDataView.setLast7dFlow(new HomeDataView.Last7dFlow());
-        homeDataView.getLast7dFlow().setDataList(mapperFacade.mapAsList(last7dFlowList, HomeDataView.SingleDayFlow.class));
+        homeDataView.getLast7dFlow().setDataList(last7dFlowList.stream().map(SingleDayFlowBO::toSingleDayFlow).collect(Collectors.toList()));
 
         // 数据处理
         fillHomeDataView(homeDataView, now);
@@ -101,11 +107,11 @@ public class ReportService {
      * @return
      */
     public PageInfo<UserFlowReportRes> userFlowReportPage(PageQuery pageQuery, UserFlowReportReq req) {
-        Page<UserFlowReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Page<UserFlowReportRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
         Date now = new Date();
-        List<UserFlowReportRes> list = reportMapper.userFlowReportList(req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
+        List<UserFlowReportRes> list = reportMapper.userFlowReportList(page, req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
         fillUserFlowReport(list);
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(list, page);
     }
 
     /**
@@ -115,11 +121,11 @@ public class ReportService {
      * @return
      */
     public PageInfo<LicenseFlowReportRes> licenseFlowReportPage(PageQuery pageQuery, LicenseFlowReportReq req) {
-        Page<LicenseFlowReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Page<LicenseFlowReportRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
         Date now = new Date();
-        List<LicenseFlowReportRes> list = reportMapper.licenseFLowReportList(req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
+        List<LicenseFlowReportRes> list = reportMapper.licenseFLowReportList(page, req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
         fillLicenseFlowReport(list);
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(list, page);
     }
 
     /**
@@ -129,11 +135,11 @@ public class ReportService {
      * @return
      */
     public PageInfo<UserFlowMonthReportRes> userFlowMonthReportPage(PageQuery pageQuery, UserFlowMonthReportReq req) {
-        Page<UserFlowMonthReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Page<UserFlowMonthReportRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
         Date now = new Date();
-        List<UserFlowMonthReportRes> list = reportMapper.userFlowMonthReportList(req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
+        List<UserFlowMonthReportRes> list = reportMapper.userFlowMonthReportList(page, req.getUserId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
         fillUserFlowMonthReport(list);
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(list, page);
     }
 
     /**
@@ -143,11 +149,11 @@ public class ReportService {
      * @return
      */
     public PageInfo<LicenseFlowMonthReportRes> licenseFlowMonthReportPage(PageQuery pageQuery, LicenseFlowMonthReportReq req) {
-        Page<LicenseFlowMonthReportRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        Page<LicenseFlowMonthReportRes> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
         Date now = new Date();
-        List<LicenseFlowMonthReportRes> list = reportMapper.licenseFLowMonthReportList(req.getUserId(), req.getLicenseId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
+        List<LicenseFlowMonthReportRes> list = reportMapper.licenseFLowMonthReportList(page, req.getUserId(), req.getLicenseId(), DateUtil.getMonthBegin(now), DateUtil.getDayBegin(now), now);
         fillLicenseFlowMonthReport(list);
-        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(list, page);
     }
 
     private void fillUserFlowReport(List<UserFlowReportRes> list) {

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

@@ -3,8 +3,8 @@ package org.dromara.neutrinoproxy.server.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+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.controller.req.log.UserLoginRecordListReq;
@@ -13,10 +13,7 @@ import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
 import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserLoginRecordDO;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
-import org.noear.solon.annotation.Inject;
 
 import java.util.List;
 import java.util.Map;
@@ -31,22 +28,19 @@ import java.util.stream.Collectors;
  */
 @Component
 public class UserLoginRecordService {
-    @Inject
-    private MapperFacade mapperFacade;
     @Db
     private UserLoginRecordMapper userLoginRecordMapper;
     @Db
     private UserMapper userMapper;
 
     public PageInfo<UserLoginRecordListRes> page(PageQuery pageQuery, UserLoginRecordListReq req) {
-        Page<UserLoginRecordListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-        List<UserLoginRecordDO> list = userLoginRecordMapper.selectList(new LambdaQueryWrapper<UserLoginRecordDO>()
-                        .eq(null != req.getUserId(), UserLoginRecordDO::getUserId, req.getUserId())
-                .orderByDesc(UserLoginRecordDO::getCreateTime)
+        Page<UserLoginRecordDO> page = userLoginRecordMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<UserLoginRecordDO>()
+            .eq(null != req.getUserId(), UserLoginRecordDO::getUserId, req.getUserId())
+            .orderByDesc(UserLoginRecordDO::getCreateTime)
         );
-        List<UserLoginRecordListRes> respList = mapperFacade.mapAsList(list, UserLoginRecordListRes.class);
-        if (CollectionUtils.isEmpty(list)) {
-            return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        List<UserLoginRecordListRes> respList = page.getRecords().stream().map(UserLoginRecordDO::toRes).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(page.getRecords())) {
+            return PageInfo.of(respList, page);
         }
 
         if (!CollectionUtil.isEmpty(respList)) {
@@ -60,6 +54,6 @@ public class UserLoginRecordService {
                 }
             }
         }
-        return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        return PageInfo.of(respList, page);
     }
 }

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

@@ -2,8 +2,8 @@ package org.dromara.neutrinoproxy.server.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import org.apache.ibatis.solon.annotation.Db;
 import org.dromara.neutrinoproxy.core.util.DateUtil;
 import org.dromara.neutrinoproxy.server.base.page.PageInfo;
 import org.dromara.neutrinoproxy.server.base.page.PageQuery;
@@ -11,8 +11,20 @@ import org.dromara.neutrinoproxy.server.base.rest.ServiceException;
 import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
-import org.dromara.neutrinoproxy.server.controller.req.system.*;
-import org.dromara.neutrinoproxy.server.controller.res.system.*;
+import org.dromara.neutrinoproxy.server.controller.req.system.LoginReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserCreateReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserInfoReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserUpdateEnableStatusReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserUpdatePasswordReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.UserUpdateReq;
+import org.dromara.neutrinoproxy.server.controller.res.system.LoginRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserCreateRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserInfoRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserListRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserUpdateEnableStatusRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserUpdatePasswordRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.UserUpdateRes;
 import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
 import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.UserTokenMapper;
@@ -21,8 +33,6 @@ import org.dromara.neutrinoproxy.server.dal.entity.UserLoginRecordDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserTokenDO;
 import org.dromara.neutrinoproxy.server.util.Md5Util;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
-import ma.glasnost.orika.MapperFacade;
-import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
@@ -30,6 +40,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  *
@@ -39,8 +50,7 @@ import java.util.UUID;
 @Component
 public class UserService {
 	private static final String DEFAULT_PASSWORD = "123456";
-	@Inject
-	private MapperFacade mapperFacade;
+
 	@Db
 	private UserMapper userMapper;
 	@Db
@@ -120,12 +130,11 @@ public class UserService {
 	}
 
 	public PageInfo<UserListRes> page(PageQuery pageQuery, UserListReq req) {
-		Page<UserListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-		List<UserDO> list = userMapper.selectList(new LambdaQueryWrapper<UserDO>()
-				.orderByAsc(UserDO::getId)
-		);
-		List<UserListRes> respList = mapperFacade.mapAsList(list, UserListRes.class);
-		return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        Page<UserDO> page = userMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<UserDO>()
+            .orderByAsc(UserDO::getId)
+        );
+        List<UserListRes> respList = page.getRecords().stream().map(UserDO::toRes).collect(Collectors.toList());
+		return PageInfo.of(respList, page);
 	}
 
 	public List<UserListRes> list(UserListReq req) {
@@ -133,7 +142,7 @@ public class UserService {
 				.eq(UserDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
 				.orderByAsc(UserDO::getId)
 		);
-		return mapperFacade.mapAsList(userDOList, UserListRes.class);
+		return userDOList.stream().map(UserDO::toRes).collect(Collectors.toList());
 	}
 
 	public UserInfoRes info(UserInfoReq req) {

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

@@ -1,6 +1,7 @@
 package org.dromara.neutrinoproxy.server.service.bo;
 
 import lombok.Data;
+import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
 
 /**
  * @author: aoshiguchen
@@ -16,4 +17,18 @@ public class FlowBO {
      * 下行流量字节数
      */
     private Long downFlowBytes;
+
+    public HomeDataView.TodayFlow todayFlow() {
+        HomeDataView.TodayFlow todayFlow = new HomeDataView.TodayFlow();
+        todayFlow.setUpFlowBytes(upFlowBytes);
+        todayFlow.setDownFlowBytes(downFlowBytes);
+        return todayFlow;
+    }
+
+    public HomeDataView.TotalFlow totalFlow() {
+        HomeDataView.TotalFlow totalFlow = new HomeDataView.TotalFlow();
+        totalFlow.setUpFlowBytes(upFlowBytes);
+        totalFlow.setDownFlowBytes(downFlowBytes);
+        return totalFlow;
+    }
 }

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

@@ -1,6 +1,7 @@
 package org.dromara.neutrinoproxy.server.service.bo;
 
 import lombok.Data;
+import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
 
 import java.util.Date;
 
@@ -23,4 +24,12 @@ public class SingleDayFlowBO {
      * 下行流量字节数
      */
     private Long downFlowBytes;
+
+    public HomeDataView.SingleDayFlow toSingleDayFlow() {
+        HomeDataView.SingleDayFlow singleDayFlow = new HomeDataView.SingleDayFlow();
+        singleDayFlow.setDate(date);
+        singleDayFlow.setUpFlowBytes(upFlowBytes);
+        singleDayFlow.setDownFlowBytes(downFlowBytes);
+        return singleDayFlow;
+    }
 }

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

@@ -2,6 +2,25 @@ server:
   # 服务端web端口，用于支持HTTP接口，管理后台页面访问
   port: ${WEB_PORT:8888}
   context-path: /neutrino-proxy-server
+solon:
+  app:
+    name: neutrino-proxy-server
+#  aot:
+#    jvmArguments: --add-opens java.base/java.lang=ALL-UNNAMED
+# 日志级别
+solon.logging.appender:
+  console:
+    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(${PID:-}) --- %-15([%15.15thread]) %-56(%cyan(%-40.40logger{39}%L)) : %msg%n"
+  file:
+    enable: false
+    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- %-15([%15.15thread]) %-56(%-40.40logger{39}%L) : %msg%n"
+    name: "logs/${solon.app.name}"
+    rolling: "logs/${solon.app.name}_%d{yyyy-MM-dd}_%i.log"
+solon.logging.logger:
+  "root":
+#    level: ${LOG_LEVEL:info}
+    level: info
+
 
 neutrino:
   proxy:
@@ -14,9 +33,6 @@ neutrino:
       read-idle-time: 120
       write-idle-time: 20
       all-idle-time-seconds: 0
-    logger:
-      # 日志级别
-      level: ${LOG_LEVEL:info}
     # 隧道相关配置-用于维持服务端与客户端的通信
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
@@ -58,10 +74,10 @@ neutrino:
         transfer-log-enable: ${SERVER_LOG:false}
   data:
     db:
-      # 数据库类型，目前支持sqlite、mysql、mariadb
-      type: ${DB_TYPE:sqlite}
+      # 数据库类型，目前支持h2、mysql、mariadb
+      type: ${DB_TYPE:h2}
       # 数据库连接URL
-      url: ${DB_URL:jdbc:sqlite:data.db}
+      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
       # 数据库用户名
       username: ${DB_USER:}
       # 数据库密码

neutrino-proxy-server/src/main/resources/logback.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <property name="LOG_FILE" value="./logs/neutrino-proxy-server.log"/>
-    <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n"/>
-<!--    <property name="ENCODE" value="utf8" />-->
-
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
-        </filter>
-        <encoder>
-            <pattern>${LOG_PATTERN}</pattern>
-<!--            <charset>${ENCODE}</charset>-->
-        </encoder>
-    </appender>
-
-    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.zip</fileNamePattern>
-            <maxHistory>7</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${LOG_PATTERN}</pattern>
-<!--            <charset>${ENCODE}</charset>-->
-        </encoder>
-    </appender>
-
-    <root level="DEBUG">
-        <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
-    </root>
-
-    <logger name="com.example.logback" level="warn"/>
-    <logger name="io.netty" level="warn"/>
-</configuration>

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

@@ -4,16 +4,16 @@
 
     <select id="userFlowReportList" resultType="org.dromara.neutrinoproxy.server.controller.res.report.UserFlowReportRes">
         SELECT
-        u.id AS 'userId',
-        u.name AS 'userName',
-        SUM(IFNULL(frm.write_bytes,0) + IFNULL(frd.write_bytes,0) + IFNULL(frm2.write_bytes,0)) AS 'upFlowBytes',
-        SUM(IFNULL(frm.read_bytes,0) + IFNULL(frd.read_bytes,0) + IFNULL(frm2.read_bytes,0)) AS 'downFlowBytes',
-        IFNULL(SUM(frm.write_bytes),0) monthWriteBytes,
-        IFNULL(SUM(frm.read_bytes),0) monthReadBytes,
-        IFNULL(SUM(frd.write_bytes),0) dayWriteBytes,
-        IFNULL(SUM(frd.read_bytes),0) dayReadBytes,
-        IFNULL(SUM(frm2.write_bytes),0) minuteWriteBytes,
-        IFNULL(SUM(frm2.read_bytes),0) minuteReadBytes
+        u.id AS userId,
+        u.name AS userName,
+        SUM(COALESCE(frm.write_bytes,0) + COALESCE(frd.write_bytes,0) + COALESCE(frm2.write_bytes,0)) AS upFlowBytes,
+        SUM(COALESCE(frm.read_bytes,0) + COALESCE(frd.read_bytes,0) + COALESCE(frm2.read_bytes,0)) AS downFlowBytes,
+        COALESCE(SUM(frm.write_bytes),0) monthWriteBytes,
+        COALESCE(SUM(frm.read_bytes),0) monthReadBytes,
+        COALESCE(SUM(frd.write_bytes),0) dayWriteBytes,
+        COALESCE(SUM(frd.read_bytes),0) dayReadBytes,
+        COALESCE(SUM(frm2.write_bytes),0) minuteWriteBytes,
+        COALESCE(SUM(frm2.read_bytes),0) minuteReadBytes
         FROM `user` u
         LEFT JOIN (SELECT user_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_month GROUP BY user_id) frm ON u.id = frm.user_id
         LEFT JOIN (SELECT user_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_day
@@ -32,18 +32,18 @@
 
     <select id="licenseFLowReportList" resultType="org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowReportRes">
         SELECT
-        l.id AS 'licenseId',
-        l.name AS 'licenseName',
-        u.id AS 'userId',
-        u.name AS 'userName',
-        SUM(IFNULL(frm.write_bytes,0) + IFNULL(frd.write_bytes,0) + IFNULL(frm2.write_bytes,0)) AS 'upFlowBytes',
-        SUM(IFNULL(frm.read_bytes,0) + IFNULL(frd.read_bytes,0) + IFNULL(frm2.read_bytes,0)) AS 'downFlowBytes',
-        IFNULL(SUM(frm.write_bytes),0) monthWriteBytes,
-        IFNULL(SUM(frm.read_bytes),0) monthReadBytes,
-        IFNULL(SUM(frd.write_bytes),0) dayWriteBytes,
-        IFNULL(SUM(frd.read_bytes),0) dayReadBytes,
-        IFNULL(SUM(frm2.write_bytes),0) minuteWriteBytes,
-        IFNULL(SUM(frm2.read_bytes),0) minuteReadBytes
+        l.id AS licenseId,
+        l.name AS licenseName,
+        u.id AS userId,
+        u.name AS userName,
+        SUM(COALESCE(frm.write_bytes,0) + COALESCE(frd.write_bytes,0) + COALESCE(frm2.write_bytes,0)) AS upFlowBytes,
+        SUM(COALESCE(frm.read_bytes,0) + COALESCE(frd.read_bytes,0) + COALESCE(frm2.read_bytes,0)) AS downFlowBytes,
+        COALESCE(SUM(frm.write_bytes),0) monthWriteBytes,
+        COALESCE(SUM(frm.read_bytes),0) monthReadBytes,
+        COALESCE(SUM(frd.write_bytes),0) dayWriteBytes,
+        COALESCE(SUM(frd.read_bytes),0) dayReadBytes,
+        COALESCE(SUM(frm2.write_bytes),0) minuteWriteBytes,
+        COALESCE(SUM(frm2.read_bytes),0) minuteReadBytes
         FROM `license` l
         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
@@ -64,7 +64,7 @@
     <select id="userFlowMonthReportList" resultType="org.dromara.neutrinoproxy.server.controller.res.report.UserFlowMonthReportRes">
         SELECT
         T2.user_id,
-        u.name AS 'userName',
+        u.name AS userName,
         T2.date,
         T2.upFlowBytes,
         T2.downFlowBytes
@@ -73,8 +73,8 @@
         SELECT
         frm.user_id,
         frm.date,
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_month frm
         GROUP BY frm.user_id,frm.date
 
@@ -82,16 +82,16 @@
 
         SELECT
         T1.user_id,
-        #{curMonthBeginDate} AS 'date',
-        IFNULL(SUM(T1.upFlowBytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(T1.downFlowBytes),0) AS 'downFlowBytes'
+        #{curMonthBeginDate} AS date,
+        COALESCE(SUM(T1.upFlowBytes),0) AS upFlowBytes,
+        COALESCE(SUM(T1.downFlowBytes),0) AS downFlowBytes
         FROM (
 
         SELECT
         frd.user_id,
         frd.license_id,
-        frd.write_bytes AS 'upFlowBytes',
-        frd.read_bytes AS 'downFlowBytes',
+        frd.write_bytes AS upFlowBytes,
+        frd.read_bytes AS downFlowBytes,
         frd.date
         FROM flow_report_day frd
         WHERE frd.date >= #{curMonthBeginDate} AND frd.date &lt;= #{curDayBeginDate}
@@ -101,9 +101,9 @@
         SELECT
         frm.user_id,
         frm.license_id,
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes',
-        #{curDayBeginDate} AS 'date'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes,
+        #{curDayBeginDate} AS date
         FROM flow_report_minute frm
         WHERE frm.date >= #{curDayBeginDate} AND frm.date &lt;= #{curDate}
         GROUP BY frm.user_id,frm.license_id
@@ -124,9 +124,9 @@
     <select id="licenseFLowMonthReportList" resultType="org.dromara.neutrinoproxy.server.controller.res.report.LicenseFlowMonthReportRes">
         SELECT
         T2.user_id,
-        u.name AS 'userName',
+        u.name AS userName,
         T2.license_id,
-        l.`name` AS 'licenseName',
+        l.`name` AS licenseName,
         T2.date,
         T2.upFlowBytes,
         T2.downFlowBytes
@@ -136,8 +136,8 @@
         frm.user_id,
         frm.license_id,
         frm.date,
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_month frm
         GROUP BY frm.user_id,frm.license_id,frm.date
 
@@ -146,16 +146,16 @@
         SELECT
         T1.user_id,
         T1.license_id,
-        #{curMonthBeginDate} AS 'date',
-        IFNULL(SUM(T1.upFlowBytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(T1.downFlowBytes),0) AS 'downFlowBytes'
+        #{curMonthBeginDate} AS date,
+        COALESCE(SUM(T1.upFlowBytes),0) AS upFlowBytes,
+        COALESCE(SUM(T1.downFlowBytes),0) AS downFlowBytes
         FROM (
 
         SELECT
         frd.user_id,
         frd.license_id,
-        frd.write_bytes AS 'upFlowBytes',
-        frd.read_bytes AS 'downFlowBytes',
+        frd.write_bytes AS upFlowBytes,
+        frd.read_bytes AS downFlowBytes,
         frd.date
         FROM flow_report_day frd
         WHERE frd.date >= #{curMonthBeginDate} AND frd.date &lt;= #{curDayBeginDate}
@@ -165,9 +165,9 @@
         SELECT
         frm.user_id,
         frm.license_id,
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes',
-        #{curDayBeginDate} AS 'date'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes,
+        #{curDayBeginDate} AS date
         FROM flow_report_minute frm
         WHERE frm.date >= #{curDayBeginDate} AND frm.date &lt;= #{curDate}
         GROUP BY frm.user_id,frm.license_id
@@ -191,35 +191,35 @@
 
     <select id="homeTodayFlow" resultType="org.dromara.neutrinoproxy.server.service.bo.FlowBO">
         SELECT
-            IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-            IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+            COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+            COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_minute frm
         WHERE frm.date >= #{curDayBeginDate} AND frm.date &lt;= #{curDate}
     </select>
 
     <select id="homeTotalFlow" resultType="org.dromara.neutrinoproxy.server.service.bo.FlowBO">
         SELECT
-        IFNULL(SUM(T.upFlowBytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(T.downFlowBytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(T.upFlowBytes),0) AS upFlowBytes,
+        COALESCE(SUM(T.downFlowBytes),0) AS downFlowBytes
         FROM (
 
         SELECT
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_month frm
         UNION ALL
 
         SELECT
-        IFNULL(SUM(frd.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frd.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frd.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frd.read_bytes),0) AS downFlowBytes
         FROM flow_report_day frd
         WHERE frd.date >= #{curMonthBeginDate} AND frd.date &lt;= #{curDayBeginDate}
 
         UNION ALL
 
         SELECT
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_minute frm
         WHERE frm.date >= #{curDayBeginDate} AND frm.date &lt;= #{curDate}
 
@@ -233,8 +233,8 @@
 
         SELECT
         frd.date,
-        IFNULL(SUM(frd.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frd.read_bytes),0) AS 'downFlowBytes'
+        COALESCE(SUM(frd.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frd.read_bytes),0) AS downFlowBytes
         FROM flow_report_day frd
         WHERE frd.date >= #{beginDate} AND frd.date &lt;= #{curDayBeginDate}
         GROUP BY frd.date
@@ -242,9 +242,9 @@
         UNION ALL
 
         SELECT
-        #{curDayBeginDate} AS 'date',
-        IFNULL(SUM(frm.write_bytes),0) AS 'upFlowBytes',
-        IFNULL(SUM(frm.read_bytes),0) AS 'downFlowBytes'
+        #{curDayBeginDate} AS date,
+        COALESCE(SUM(frm.write_bytes),0) AS upFlowBytes,
+        COALESCE(SUM(frm.read_bytes),0) AS downFlowBytes
         FROM flow_report_minute frm
         WHERE frm.date >= #{curDayBeginDate} AND frm.date &lt;= #{curDate}
 

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

@@ -1,24 +1,24 @@
 #############################系统管理相关表#############################
 #用户表
 CREATE TABLE IF NOT EXISTS `user` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `name` VARCHAR(50) NOT NULL,
   `login_name` VARCHAR(50) NOT NULL,
   `login_password` VARCHAR(255) NOT NULL,
   `enable` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_user_login_name ON `user` (login_name ASC);
 
 #用户token表
 CREATE TABLE IF NOT EXISTS `user_token` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `token` VARCHAR(50) NOT NULL,
   `user_id` INTEGER NOT NULL,
-  `expiration_time` INTEGER NOT NULL,
-  `create_time` INTEGER NOT NULL,
-  `update_time` INTEGER NOT NULL
+  `expiration_time` TIMESTAMP NOT NULL,
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_user_token_user_id ON user_token(user_id);
 CREATE INDEX IF NOT EXISTS I_user_token_token ON user_token(token);
@@ -26,42 +26,42 @@ CREATE INDEX IF NOT EXISTS I_user_token_expiration_time ON user_token(expiration
 
 #端口池
 CREATE TABLE IF NOT EXISTS `port_pool` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `group_id` INTEGER NOT NULL DEFAULT 1,
   `port` INTEGER NOT NULL,
   `enable` INTEGER(2) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL
+  `update_time` TIMESTAMP NOT NULL,
+  `create_time` TIMESTAMP NOT NULL
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_port_pool_port ON port_pool (port ASC);
 
 #端口分组
 CREATE TABLE IF NOT EXISTS `port_group` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `name` VARCHAR(255) NOT NULL,
     `possessor_type` INTEGER NOT NULL DEFAULT '0',
     `possessor_id` INTEGER NOT NULL DEFAULT '-1',
     `enable` INTEGER NOT NULL,
-    `create_time` datetime(3) NOT NULL,
-    `update_time` datetime(3) NOT NULL
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL
 );
 #############################代理配置相关表#############################
 #license表
 CREATE TABLE IF NOT EXISTS `license` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `name` VARCHAR(50) NOT NULL,
     `key` VARCHAR(100) NOT NULL,
     `user_id` INTEGER NOT NULL,
     `is_online` INTEGER(2) NOT NULL,
     `enable` INTEGER(2) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL,
-    `update_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL,
+    `update_time` TIMESTAMP NOT NULL
     );
 CREATE UNIQUE INDEX IF NOT EXISTS I_license_key ON `license` (`key` ASC);
 
 #端口映射表
 CREATE TABLE IF NOT EXISTS `port_mapping` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `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,
@@ -73,36 +73,36 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
   `proxy_responses` INTEGER(20) NOT NULL DEFAULT 0,
   `proxy_timeout_ms` INTEGER(20) NOT NULL DEFAULT 0,
   `enable` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_port_mapping_server_port ON port_mapping (server_port ASC);
 
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER NOT NULL,
     `ip` VARCHAR(50) NOT NULL,
     `token` VARCHAR(100) NOT NULL,
     `type` INTEGER(2) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 #客户端连接记录表
 CREATE TABLE IF NOT EXISTS `client_connect_record` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `ip` VARCHAR(50) NOT NULL,
     `license_id` INTEGER(20) DEFAULT NULL,
     `type` INTEGER(2) NOT NULL,
     `msg` VARCHAR(512) DEFAULT NULL,
     `code` INTEGER(2) NOT NULL,
     `err` VARCHAR(512) DEFAULT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 #############################调度管理相关表#############################
 #触发器信息表
 CREATE TABLE IF NOT EXISTS `job_info` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `desc` VARCHAR(255) NOT NULL,
   `handler` VARCHAR(255) NOT NULL,
   `cron` VARCHAR(128) NOT NULL ,
@@ -110,21 +110,21 @@ CREATE TABLE IF NOT EXISTS `job_info` (
   `alarm_email` VARCHAR(255) DEFAULT NULL,
   `alarm_ding` VARCHAR(255) DEFAULT NULL,
   `enable` INTEGER(2) NOT NULL,
-  `create_time` INTEGER(20) NOT NULL,
-  `update_time` INTEGER(20) NOT NULL
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_job_info_handler ON `job_info` (`handler` ASC);
 
 #触发器日志表
 CREATE TABLE IF NOT EXISTS `job_log` (
-  `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
   `job_id` INTEGER(20) NOT NULL,
   `handler` VARCHAR(255) NOT NULL,
   `param` VARCHAR(512) DEFAULT NULL,
   `code` INTEGER(20) NOT NULL,
   `msg` TEXT DEFAULT NULL,
   `alarm_status` INTEGER(2) NOT NULL DEFAULT '0',
-  `create_time` INTEGER(20) NOT NULL
+  `create_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_job_log_create_time ON job_log(create_time);
 CREATE INDEX IF NOT EXISTS I_job_log_code ON job_log(code);
@@ -132,14 +132,14 @@ CREATE INDEX IF NOT EXISTS I_job_log_code ON job_log(code);
 #############################报表管理相关表#############################
 #流量统计报表-分钟(保留24小时)
 CREATE TABLE IF NOT EXISTS `flow_report_minute` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` INTEGER(20) NOT NULL,
+    `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_flow_report_minute_create_time ON flow_report_minute(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_minute_date ON flow_report_minute(`date`);
@@ -148,14 +148,14 @@ CREATE INDEX IF NOT EXISTS I_flow_report_minute_license_id ON flow_report_minute
 
 #流量统计报表-小时(保留60天)
 CREATE TABLE IF NOT EXISTS `flow_report_hour` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` INTEGER(20) NOT NULL,
+    `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_create_time ON flow_report_hour(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_hour_date ON flow_report_hour(`date`);
@@ -164,14 +164,14 @@ CREATE INDEX IF NOT EXISTS I_flow_report_hour_license_id ON flow_report_hour(`li
 
 #流量统计报表-天(保留1年)
 CREATE TABLE IF NOT EXISTS `flow_report_day` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` INTEGER(20) NOT NULL,
+    `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_flow_report_day_create_time ON flow_report_day(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_day_date ON flow_report_day(`date`);
@@ -180,14 +180,14 @@ CREATE INDEX IF NOT EXISTS I_flow_report_day_license_id ON flow_report_day(`lice
 
 #流量统计报表-月(全量保留)
 CREATE TABLE IF NOT EXISTS `flow_report_month` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `user_id` INTEGER(20) NOT NULL,
     `license_id` INTEGER(20) NOT NULL,
     `write_bytes` INTEGER(20) NOT NULL,
     `read_bytes` INTEGER(20) NOT NULL,
-    `date` INTEGER(20) NOT NULL,
+    `date` TIMESTAMP NOT NULL,
     `date_str` VARCHAR(20) NOT NULL,
-    `create_time` INTEGER(20) NOT NULL
+    `create_time` TIMESTAMP NOT NULL
 );
 CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month(create_time);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_date ON flow_report_month(`date`);

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

@@ -1,13 +1,13 @@
 #job_qrtz_trigger_info
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, now(), now());
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, now(), now());
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(3, '流量统计报表-分钟', 'FlowReportForMinuteJob', '0 */1 * * * ?', '', 1, now(), now());
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(4, '流量统计报表-小时', 'FlowReportForHourJob', '0 0 */1 * * ?', '', 1, now(), now());
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(5, '流量统计报表-天', 'FlowReportForDayJob', '0 0 1 * * ?', '', 1, now(), now());
 INSERT INTO job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) VALUES
-(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 30 1 1 * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(6, '流量统计报表-月', 'FlowReportForMonthJob', '0 30 1 1 * ?', '', 1, now(), now());

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

@@ -1,3 +1,3 @@
 #license
 INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());

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

@@ -1,3 +1,3 @@
 #port_group
 INSERT INTO `port_group`(`id`,`name`,`possessor_type`,`possessor_id`,`enable`,`create_time`,`update_time`) VALUES
-(1, '全局(默认)', 0, -1, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(1, '全局(默认)', 0, -1, 1, now(), now());

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', STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(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', STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(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', STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1,'test3', now(), now());

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

@@ -1,41 +1,41 @@
 #端口池
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(1, 1, 9101, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(1, 1, 9101, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(2, 1, 9102, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(3, 1, 9103, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(4, 1, 9104, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(4, 1, 9104, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(5, 1, 9105, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(5, 1, 9105, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(6, 1, 9106, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(6, 1, 9106, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(7, 1, 9107, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(7, 1, 9107, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(8, 1, 9108, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(8, 1, 9108, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(9, 1, 9109, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(9, 1, 9109, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(10, 1, 9110, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(10, 1, 9110, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(11, 1, 9111, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(11, 1, 9111, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(12, 1, 9112, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(12, 1, 9112, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(13, 1, 9113, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(13, 1, 9113, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(14, 1, 9114, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(14, 1, 9114, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(15, 1, 9115, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(15, 1, 9115, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(16, 1, 9116, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(16, 1, 9116, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(17, 1, 9117, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(17, 1, 9117, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(18, 1, 9118, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(18, 1, 9118, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(19, 1, 9119, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(19, 1, 9119, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(20, 1, 9120, 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(20, 1, 9120, 1, now(), now());

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

@@ -1,5 +1,5 @@
 #用户表 6613b92b77056faeb72068f184ed4c4f
 INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES
-(1, '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(1, '管理员', 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, now(), now());
 INSERT INTO `user`(`id`, `name`,`login_name`,`login_password`,`enable`,`create_time`, `update_time`) VALUES
-(2, '游客', 'visitor', 'e10adc3949ba59abbe56e057f20f883e', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+(2, '游客', 'visitor', 'e10adc3949ba59abbe56e057f20f883e', 1, now(), now());

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.3.6</version>
+        <version>2.5.11</version>
         <relativePath />
     </parent>
 
@@ -26,12 +26,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <revision>1.0-SNAPSHOT</revision>
+        <revision>1.1-SNAPSHOT</revision>
 
-        <java.version>1.8</java.version>
+        <native.version>0.9.28</native.version>
+
+        <java.version>17</java.version>
         <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
         <maven-flatten.version>1.1.0</maven-flatten.version>
-        <org.projectlombok.version>1.18.4</org.projectlombok.version>
     </properties>
 
     <dependencyManagement>
@@ -39,22 +40,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.1.22.Final</version>
-            </dependency>
-            <dependency>
-                <groupId>org.slf4j</groupId>
-                <artifactId>slf4j-api</artifactId>
-                <version>1.7.25</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>1.2.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>${org.projectlombok.version}</version>
+                <version>4.1.100.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
@@ -72,11 +58,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>3.9</version>
             </dependency>
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>1.2.83</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -88,14 +69,14 @@
                 <version>1.3.1</version>
             </dependency>
             <dependency>
-                <groupId>org.xerial</groupId>
-                <artifactId>sqlite-jdbc</artifactId>
-                <version>3.39.2.1</version>
+                <groupId>com.h2database</groupId>
+                <artifactId>h2</artifactId>
+                <version>2.2.224</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.49</version>
+                <version>8.0.33</version>
             </dependency>
             <dependency>
                 <groupId>org.mariadb.jdbc</groupId>
@@ -110,7 +91,7 @@
             <dependency>
                 <groupId>org.dromara.solon-plugins</groupId>
                 <artifactId>job-solon-plugin</artifactId>
-                <version>0.0.4</version>
+                <version>0.1.1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>cn.hutool</groupId>
@@ -118,26 +99,13 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.dromara.solon-plugins</groupId>
-                <artifactId>orika-solon-plugin</artifactId>
-                <version>0.0.4</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>org.noear</groupId>
+            <artifactId>solon.logging.logback</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -147,14 +115,16 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -176,7 +146,7 @@
                         <path>
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
-                            <version>${org.projectlombok.version}</version>
+                            <version>${lombok.version}</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
@@ -209,5 +179,83 @@
             </plugin>
         </plugins>
     </build>
+
+    <repositories>
+        <repository>
+            <id>tencent</id>
+            <url>https://mirrors.cloud.tencent.com/nexus/repository/maven-public/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <profiles>
+        <profile>
+            <id>native</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.noear</groupId>
+                        <artifactId>solon-maven-plugin</artifactId>
+                        <version>${solon-maven-plugin.version}</version>
+                        <executions>
+                            <execution>
+                                <id>process-aot</id>
+                                <goals>
+                                    <goal>process-aot</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.codehaus.plexus</groupId>
+                                <artifactId>plexus-utils</artifactId>
+                                <version>3.5.1</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>${native.version}</version>
+                        <!-- 使用graalvm提供的可达性元数据，很多第三方库就直接可以构建成可执行文件了 -->
+                        <configuration>
+                            <metadataRepository>
+                                <enabled>true</enabled>
+                            </metadataRepository>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>add-reachability-metadata</id>
+                                <goals>
+                                    <goal>add-reachability-metadata</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
 

scripts/unix/admin_build_dev.sh

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

scripts/unix/admin_build_docker.sh

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

scripts/unix/client_build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # 中微子代理客户端编译打包脚本，基础参数请自行修改
 
-export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
@@ -11,12 +11,13 @@ clientDeployDir=$deployDir"/client"
 #切到项目根目录
 cd ../..
 #初始化文件夹
-if [ ! -d "$deployDir" ];then
-  mkdir $deployDir
-fi
-if [ ! -d "$clientDeployDir" ];then
-  mkdir $clientDeployDir
-fi
+#if [ ! -d "$deployDir" ];then
+#  mkdir $deployDir
+#fi
+#if [ ! -d "$clientDeployDir" ];then
+#  mkdir $clientDeployDir
+#fi
+mkdir -p $clientDeployDir
 rm -rf $clientDeployDir/neutrino-proxy-client.jar
 #客户端打包
 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true

scripts/unix/client_docker_build.sh

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

scripts/unix/client_native_build.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+# 中微子代理客户端编译打包脚本，基础参数请自行修改
+
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home
+export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
+export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
+
+deployDir="deploy"
+clientDeployDir=$deployDir"/client"
+
+#切到项目根目录
+cd ../..
+#初始化文件夹
+mkdir -p $clientDeployDir
+
+# 删除原来的编译文件
+rm -rf $clientDeployDir/neutrino-proxy-client.jar
+rm -rf $clientDeployDir/neutrino-proxy-client
+
+#客户端打包
+mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
+cd neutrino-proxy-client
+mvn clean native:compile -P native -DskipTests
+cd ..
+
+# 拷贝到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
+

scripts/unix/client_start.sh

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

scripts/unix/server_build.sh

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

scripts/unix/server_docker_build.sh

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

scripts/unix/server_native_build.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+# 中微子代理服务端编译打包脚本，基础参数请自行修改
+
+export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home
+export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
+export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
+
+deployDir="deploy"
+serverDeployDir=$deployDir"/server"
+
+#切到项目根目录
+cd ../..
+#初始化文件夹
+mkdir -p $serverDeployDir
+
+# 删除原来的编译文件
+rm -rf $serverDeployDir/neutrino-proxy-server.jar
+rm -rf $serverDeployDir/neutrino-proxy-server
+
+# 不需要每次都重新编译一次前端代码，如果前端代码有变更，编译前需要手动执行`admin_build_docker.sh`
+##前端页面打包
+#rm -rf ./neutrino-proxy-server/src/main/resources/static
+#cd ./scripts/unix
+#sh admin_build_docker.sh
+#cd ../..
+#mkdir -p neutrino-proxy-server/src/main/resources/static
+#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 native:compile -P native -DskipTests
+cd ..
+
+# 拷贝到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
+

scripts/unix/server_start.sh

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