!63 新增【域名解析】功能

Merge pull request !63 from 欧阳绝风/master-domain
无需部署客户端待完成
2024-09-19 00:11:43 +00:00 · 2024-06-25 10:12:38 +08:00 · 2024-06-25 02:10:26 +00:00 · 2024-06-25 02:09:28 +00:00 · 2024-06-25 02:07:35 +00:00 · 2024-05-08 18:45:20 +08:00
187 changed files with 3647 additions and 1357 deletions
@@ -12,7 +12,7 @@ jobs:
      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', 'macos-12']
        os: ['ubuntu-20.04']
    name: build - ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
@@ -30,12 +30,12 @@ jobs:
      run: |
        cd neutrino-proxy-admin
        npm install
-        npm run build:docker·
+        npm run build:docker
        cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
-    - name: GitHub Action for GraalVM JDK 17
+    - name: GitHub Action for GraalVM JDK 21
      uses: graalvm/setup-graalvm@v1
      with:
-        java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17
+        java-version: '21.0.1' # for a specific JDK 21
        distribution: 'graalvm' # New 'distribution' option
        github-token: ${{ secrets.GITHUB_TOKEN }}
    - name: Cache local Maven repository
@@ -45,34 +45,55 @@ jobs:
        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
        restore-keys: |
          ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
    - name: Build with Maven (neutrino-proxy-server)
      run: |
        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
        cd neutrino-proxy-server 
        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
        chmod +x target/neutrino-proxy-server
-        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ github.ref_name }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ github.ref_name }}/app.yml
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
    - name: Archive zip (neutrino-proxy-server)
      uses: thedoctor0/zip-release@master
      with:
        type: 'zip'
-        path: 'neutrino-proxy-server-${{ github.ref_name }}'
-        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
    - name: Build with Maven (neutrino-proxy-client)
      run: |
        cd neutrino-proxy-client
        mvn clean package --file pom.xml --no-transfer-progress
        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
        chmod +x target/neutrino-proxy-client
-        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ github.ref_name }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ github.ref_name }}/app.yml
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
    - name: Archive zip (neutrino-proxy-client)
      uses: thedoctor0/zip-release@master
      with:
        type: 'zip'
-        path: 'neutrino-proxy-client-${{ github.ref_name }}'
-        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
    # GitHub 上创建 release
    - name: Release
      uses: softprops/action-gh-release@v1
@@ -81,7 +102,7 @@ jobs:
        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
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
        prerelease: true
        token: ${{ secrets.GITHUB_TOKEN }}
@@ -31,10 +31,10 @@ jobs:
        npm install
        npm run build:docker
        cp -r ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
-    - name: GitHub Action for GraalVM JDK 17
+    - name: GitHub Action for GraalVM JDK 21
      uses: graalvm/setup-graalvm@v1
      with:
-        java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17
+        java-version: '21.0.1' # for a specific JDK 21;
        distribution: 'graalvm' # New 'distribution' option
        github-token: ${{ secrets.GITHUB_TOKEN }}
    - name: Cache local Maven repository
@@ -44,32 +44,55 @@ jobs:
        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
        restore-keys: |
          ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
    - name: Build with Maven (neutrino-proxy-server)
      run: |
        set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
        mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
        cd neutrino-proxy-server
        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server.exe
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
    - name: Archive zip (neutrino-proxy-server)
      uses: thedoctor0/zip-release@master
      with:
        type: 'zip'
-        path: 'neutrino-proxy-server.exe'
-        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
    - name: Build with Maven (neutrino-proxy-client)
      run: |
        set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
        cd neutrino-proxy-client
        mvn clean package --file pom.xml --no-transfer-progress
        mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client.exe
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
    - name: Archive zip (neutrino-proxy-client)
      uses: thedoctor0/zip-release@master
      with:
        type: 'zip'
-        path: 'neutrino-proxy-client.exe'
-        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
    # GitHub 上创建 release
    - name: Release
      uses: softprops/action-gh-release@v1
@@ -78,7 +101,7 @@ jobs:
        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
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
        prerelease: true
        token: ${{ secrets.GITHUB_TOKEN }}
@@ -54,9 +54,11 @@ hs_err_pid*

 **/memo/**

+neutrino-proxy-vuepress/deploy
 neutrino-proxy-vuepress/deploy.sh
 .NEUTRINO_PROXY_CLIENT_ID
 logs
 data
 **/cert/**
 neutrino-proxy-server/src/main/resources/static/**
+/neutrino-proxy-server/src/main/resources/static/
@@ -14,3 +14,5 @@
 - 2023-09-07 1.8.6版本发布，后台若干细节优化
 - 2023-09-22 1.9.0版本发布，端口映射支持UDP协议
 - 2023-09-25 中微子代理Gitee Star数突破1000
+- 2023-10-31 2.0.0版本发布，升级jdk版本至jdk17、支持原生编译、去掉sqlite改为默认H2数据库
+- 2023-12-21 2.0.1版本发布，jdk版本升级到21，支持安全组(黑/白名单IP限制)、限速
@@ -1,11 +1,19 @@
+
+
+# what is new? 在原版的基础上新增了【域名解析】功能，域名解析【无需】绑定【本地端口】
+<p>
+<a href="https://gitee.com/zcans" target="_blank">
+<img src="assets/run-example/domain.png" >
+</a>
+
 <p align="center">
 	<img src="assets/logo/logo-text-vertical.png" width="45%">
 </p>
 <p align="center">
  <a href='https://gitee.com/dromara/neutrino-proxy/stargazers'><img src='https://gitee.com/dromara/neutrino-proxy/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/dromara/neutrino-proxy/members'><img src='https://gitee.com/dromara/neutrino-proxy/badge/fork.svg?theme=dark' alt='fork'></img></a>
-<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk17-downloads.html">
-    <img src="https://img.shields.io/badge/JDK-17+-red.svg" />
+<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk21-downloads.html">
+    <img src="https://img.shields.io/badge/JDK-21+-red.svg" />
 </a>
 <a href="./LICENSE">
    <img src="https://img.shields.io/badge/license-MIT-red" alt="license MIT">
@@ -18,6 +26,7 @@
 - 遵循MIT许可，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
 - 官网地址1：https://neutrino-proxy.dromara.org
 - 官网地址2：https://dromara.gitee.io/neutrino-proxy
+- 官网地址3：https://neutrino-proxy-docs.asgc.fun
 - 快速上手请[点击这里](https://dromara.gitee.io/neutrino-proxy/pages/793dcb)

 # 2、名称由来
@@ -88,6 +97,9 @@
 <a href="https://gitee.com/songyinyin" target="_blank">
 <img src="assets/developer/songyinyin.png" width="11%">
 </a>
+<a href="https://gitee.com/nichenxyx" target="_blank">
+<img src="assets/developer/NichenFly.jpg" width="11%">
+</a>
 </p>

 #  ❤️ 感谢
@@ -75,4 +75,7 @@

 ## 2.0.1
 - jdk版本升级为21
- native部署，后台新增提交到后端，数据库乱码问题
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
@@ -20,7 +20,7 @@
 > 从1.9.0之前的版本升级需要注意：
 - 在项目`neutrino-proxy-server/src/main/resources/sql`目录下找到mysql/sqlite的增量sql文件`UPDATE-20230922.SQL`,执行更新自己的中微子代理数据库
 - 参照[官网服务端配置](https://dromara.gitee.io/neutrino-proxy/pages/f2d0f1)调整现有的服务端配置
- 参照[官网客户端配置](https://dromara.gitee.io/neutrino-proxy/pages/50ce10)吊证现有的客户端配置
+- 参照[官网客户端配置](https://dromara.gitee.io/neutrino-proxy/pages/50ce10)调整现有的客户端配置
 - 从[仓库发行版](https://gitee.com/dromara/neutrino-proxy/releases)下载最新版本的客户端(neutrino-proxy-client.jar)、服务端(neutrino-proxy-server.jar、 neutrino-proxy-admin.zip)部署文件。若为服务端是docker镜像部署，则更新镜像重启即可

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

-function resolve (dir) {
-  return path.join(__dirname, '..', dir)
+function resolve(dir) {
+  return path.join(__dirname, "..", dir);
 }

-const HOST = process.env.HOST
-const PORT = process.env.PORT && Number(process.env.PORT)
+const HOST = process.env.HOST;
+const PORT = process.env.PORT && Number(process.env.PORT);

 const devWebpackConfig = merge(baseWebpackConfig, {
  module: {
-    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
+    rules: utils.styleLoaders({
+      sourceMap: config.dev.cssSourceMap,
+      usePostCSS: true
+    })
  },
  // cheap-module-eval-source-map is faster for development
  devtool: config.dev.devtool,
-
  // these devServer options should be customized in /config/index.js
  devServer: {
-    clientLogLevel: 'warning',
+    clientLogLevel: "warning",
    historyApiFallback: true,
    hot: true,
    compress: true,
    host: HOST || config.dev.host,
    port: PORT || config.dev.port,
+    allowedHosts: ["localhost", "server.com", ".server.com"],
    open: config.dev.autoOpenBrowser,
    overlay: config.dev.errorOverlay
      ? { warnings: false, errors: true }
@@ -39,50 +42,54 @@ const devWebpackConfig = merge(baseWebpackConfig, {
    proxy: config.dev.proxyTable,
    quiet: true, // necessary for FriendlyErrorsPlugin
    watchOptions: {
-      poll: config.dev.poll,
+      poll: config.dev.poll
    }
  },
  plugins: [
    new webpack.DefinePlugin({
-      'process.env': require('../config/local.env')
+      "process.env": require("../config/local.env")
    }),
    new webpack.HotModuleReplacementPlugin(),
    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
    new webpack.NoEmitOnErrorsPlugin(),
    // https://github.com/ampedandwired/html-webpack-plugin
    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
+      filename: "index.html",
+      template: "index.html",
      inject: true,
-      favicon: resolve('favicon.ico'),
-      title: 'vue-element-admin',
+      favicon: resolve("favicon.ico"),
+      title: "vue-element-admin",
      path: config.dev.assetsPublicPath + config.dev.assetsSubDirectory
-    }),
+    })
  ]
-})
+});

 module.exports = new Promise((resolve, reject) => {
-  portfinder.basePort = process.env.PORT || config.dev.port
+  portfinder.basePort = process.env.PORT || config.dev.port;
  portfinder.getPort((err, port) => {
    if (err) {
-      reject(err)
+      reject(err);
    } else {
      // publish the new Port, necessary for e2e tests
-      process.env.PORT = port
+      process.env.PORT = port;
      // add port to devServer config
-      devWebpackConfig.devServer.port = port
-
+      devWebpackConfig.devServer.port = port;
+      console.log('devWebpackConfig', devWebpackConfig)
      // Add FriendlyErrorsPlugin
-      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
-        compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
-        },
-        onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
-      }))
+      devWebpackConfig.plugins.push(
+        new FriendlyErrorsPlugin({
+          compilationSuccessInfo: {
+            messages: [
+              `Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`
+            ]
+          },
+          onErrors: config.dev.notifyOnErrors
+            ? utils.createNotifierCallback()
+            : undefined
+        })
+      );

-      resolve(devWebpackConfig)
+      resolve(devWebpackConfig);
    }
-  })
-})
+  });
+});
@@ -1,7 +1,7 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-	BASE_API: '"https://neutrino-proxy.asgc.fun/neutrino-proxy-server"',
+	BASE_API: '"http://localhost:8888/neutrino-proxy-server"',
  USER_NAME: '"visitor"',
  USER_PWD: '"123456"'
 }
@@ -11,7 +11,6 @@ module.exports = {
    assetsSubDirectory: 'static',
    assetsPublicPath: '/',
    proxyTable: {},
-
    // Various Dev Server settings
    host: 'localhost', // can be overwritten by process.env.HOST
    port: 9527, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
@@ -56,8 +55,8 @@ module.exports = {
    assetsRoot: path.resolve(__dirname, '../dist'),
    assetsSubDirectory: 'static',

-    // you can set by youself according to actual condition
-    assetsPublicPath: './',
+    // you can set by youself according to actual condition 
+    assetsPublicPath: '/',

    /**
     * Source Maps
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
-	BASE_API: '"https://api-prod"'
+	BASE_API: '"http://np.myone.cc"' // 后端访问地址与 server配置一致
 }
@@ -36,7 +36,7 @@
    "showdown": "1.8.5",
    "simplemde": "1.11.2",
    "sortablejs": "1.7.0",
-    "vue": "2.5.10",
+    "vue": "2.5.17",
    "vue-count-to": "1.0.13",
    "vue-i18n": "7.3.2",
    "vue-multiselect": "2.0.8",
@@ -70,7 +70,7 @@
    "friendly-errors-webpack-plugin": "1.6.1",
    "html-webpack-plugin": "2.30.1",
    "node-notifier": "5.1.2",
-    "node-sass": "^9.0.0",
+    "node-sass": "4.13.1",
    "optimize-css-assets-webpack-plugin": "3.2.0",
    "ora": "1.3.0",
    "portfinder": "1.0.13",
@@ -88,7 +88,7 @@
    "url-loader": "0.6.2",
    "vue-loader": "13.5.0",
    "vue-style-loader": "3.0.3",
-    "vue-template-compiler": "2.5.10",
+    "vue-template-compiler": "2.5.17",
    "webpack": "3.10.0",
    "webpack-bundle-analyzer": "2.9.1",
    "webpack-dev-server": "2.9.7",
@@ -1,8 +1,61 @@
 import request from '@/utils/request'

-export function domainNameBindInfo(query) {
+
+export function fetchList(query) {
  return request({
-    url: '/domain-name/bind-info',
+    url: '/domain/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function mappingModify(data) {
+  return request({
+    url: '/domain/modify',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteMapping(id) {
+  return request({
+    url: '/domain/delete/' + id,
+    method: 'get'
+  })
+}
+
+export function updateEnableStatus(id, enable) {
+  return request({
+    url: '/domain/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
+  })
+}
+
+export function portMappingBindSecurityGroup(id, securityGroupId) {
+  return request({
+    url: '/domain/bind/security-group',
+    method: 'post',
+    data: {
+      id: id,
+      securityGroupId: securityGroupId
+    }
+  })
+}
+
+export function portMappingUnbindSecurityGroup(id) {
+  return request({
+    url: `/domain/unbind/security-group?id=${id}`,
+    method: 'post'
+  })
+}
+
+export function domainAvailable(query) {
+  return request({
+    url: '/domain/available',
    method: 'get',
    params: query
  })
@@ -1,68 +1,82 @@
 import request from '@/utils/request'

-const baseUri = '/security';
+export function fetchGroupPage(query) {
+  return request({
+    url: '/security/group/page',
+    method: 'get',
+    params: query
+  })
+}

 export function fetchGroupList() {
  return request({
-    url: `${baseUri}/group/s`,
+    url: '/security/group/list',
    method: 'get'
  })
 }

-export function fetchGroupOne(groupId) {
+export function fetchGroupDetail(query) {
  return request({
-    url: `${baseUri}/group/getOne?groupId=${groupId}`,
-    method: 'get'
+    url: '/security/group/detail',
+    method: 'get',
+    params: query
  })
 }

 export function createGroup(data) {
  return request({
-    url: `${baseUri}/group/create`,
+    url: `/security/group/create`,
    method: 'post',
    data
  })
 }

-export function updateGroup(data) {
+export function updateGroup(query) {
  return request({
-    url: `${baseUri}/group/update`,
+    url: `/security/group/update`,
+    method: 'post',
+    params: query
+  })
+}
+
+export function deleteGroup(data) {
+  return request({
+    url: '/security/group/delete',
    method: 'post',
    data
  })
 }

-export function deleteGroup(groupId) {
+export function updateGroupEnableStatus(id, enable) {
  return request({
-    url: `${baseUri}/group/delete?groupId=${groupId}`,
-    method: 'post'
+    url: '/security/group/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
  })
 }

-export function enableGroup(groupId) {
+export function fetchRulePage(query) {
  return request({
-    url: `${baseUri}/group/enable?groupId=${groupId}`,
-    method: 'post'
+    url: '/security/rule/page',
+    method: 'get',
+    params: query
  })
 }

-export function disableGroup(groupId) {
+export function fetchRuleList(query) {
  return request({
-    url: `${baseUri}/group/disable?groupId=${groupId}`,
-    method: 'post'
-  })
-}
-
-export function fetchRuleList(groupId) {
-  return request({
-    url: `${baseUri}/rule/s?groupId=${groupId}`,
-    method: 'get'
+    url: '/security/rule/list',
+    method: 'get',
+    params: query
  })
 }

 export function createRule(data) {
  return request({
-    url: `${baseUri}/rule/create`,
+    url: `/security/rule/create`,
    method: 'post',
    data
  })
@@ -70,28 +84,26 @@ export function createRule(data) {

 export function updateRule(data) {
  return request({
-    url: `${baseUri}/rule/update`,
+    url: `/security/rule/update`,
    method: 'post',
    data
  })
 }
-export function deleteRule(ruleId) {
+export function deleteRule(query) {
  return request({
-    url: `${baseUri}/rule/delete?ruleId=${ruleId}`,
-    method: 'post'
+    url: '/security/rule/delete',
+    method: 'post',
+    params: query
  })
 }

-export function enableRule(ruleId) {
+export function updateRuleEnableStatus(id, enable) {
  return request({
-    url: `${baseUri}/rule/enable?ruleId=${ruleId}`,
-    method: 'post'
+    url: '/security/rule/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
  })
 }
-
-export function disableRule(ruleId) {
-  return request({
-    url: `${baseUri}/rule/disable?ruleId=${ruleId}`,
-    method: 'post'
-  })
-}
@@ -54,6 +54,24 @@
            prop: 'name',
            label: 'License',
            align: 'center'
+          },
+          {
+            prop: 'isOnline',
+            label: 'isOnline',
+            align: 'center',
+            render: (h, params) => {
+              switch (params.row.isOnline) {
+                case 1:
+                  return h('el-tag', {
+                    props: {type: 'success'}
+                  }, '在线')
+              
+                case 2:
+                  return h('el-tag', {props:{type: 'danger'}}, '离线')
+                default:
+                return h('el-tag', {props:{type: 'danger'}}, '离线')
+              }
+            }
          }
        ],
        popVisible: false,
@@ -50,7 +50,7 @@
        :hide-on-single-pageInfo="false"
        @size-change="handleSizeChange"
        @current-change="handleCurrentChange"
-        :current-pageInfo="PaginationData.currentPage"
+        :current-page="PaginationData.currentPage"
        :pageInfo-sizes="[10, 20, 50, 100]"
        :pageInfo-size="PaginationData.pageSize"
        layout="total, sizes, prev, pager, next, jumper"
@@ -55,6 +55,7 @@ export default {
    proxy: '代理配置',
    license: 'License管理',
    portMapping: '端口映射',
+    domainMapping: '域名解析',
    jobManager: '调度管理',
    jobLog: '调度日志',
    log: '日志管理',
@@ -61,7 +61,8 @@ export const asyncRouterMap = [
    },
    children: [
      { path: 'license', component: _import('proxy/license'), name: 'license', meta: { title: 'license' }},
-      { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }}
+      { path: 'portMapping', component: _import('proxy/portMapping'), name: 'portMapping', meta: { title: 'portMapping' }},
+      { path: 'domainMapping', component: _import('proxy/domainMapping'), name: 'domainMapping', meta: { title: 'domainMapping' }}
    ]
  },
  {
@@ -51,7 +51,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -46,7 +46,7 @@
      </el-table-column>-->
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -31,7 +31,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -0,0 +1,408 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container" style="display:flex">
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable style="margin-right:10px;width: 120px;">
+        <el-option v-for="item in userList" :key="item.loginName" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-model="listQuery.licenseId" placeholder="请选择license" filterable clearable style="margin-right:10px;width: 135px;">
+        <el-option v-for="item in licenseList" :key="item.key" :label="item.name" :value="item.id" />
+      </el-select>
+      <!-- <el-select v-model="listQuery.protocal" placeholder="请选择协议" clearable style="margin-right:10px;width: 120px;">
+        <el-option v-for="item in protocalList" :key="item.name" :label="item.name" :value="item.name" :disabled="!item.enable" />
+      </el-select> -->
+      <el-input v-model="listQuery.domain" type="text" style="width:145px;margin-right:10px" class="filter-item" placeholder="请输入域名关键词" />
+      <el-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="(value, key) in onlineOptions" :key="key" :label="value" :value="key" />
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="(value, key) in statusOptions" :key="key" :label="value" :value="key" />
+      </el-select>
+      <el-input v-model="listQuery.description" type="text" style="width:145px;margin-right:10px" class="filter-item" placeholder="请输入描述详情" show-word-limit />
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+        $t('table.search') }}</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{ $t('table.add') }}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
+      <el-table-column align="center" :label="$t('table.id')" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.userName')" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.userName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.licenseName')" width="140">
+        <template slot-scope="scope">
+          <span>{{ scope.row.licenseName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.protocalName')" width="80">
+        <template slot-scope="scope">
+          <span>{{ scope.row.protocal }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.desc')" width="180">
+        <template slot-scope="scope">
+          <span>{{ scope.row.description }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="left" :label="$t('table.domainName')" width="180">
+        <template slot-scope="scope">
+          <el-link target="_blank" @click="handleOpenWebPage(scope.row)">http(s)://{{ scope.row.domain }}</el-link>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('目标路径')" width="240">
+        <template slot-scope="scope">
+          <span v-html="scope.row.targetPath.replace(/(\n\r|\r\n|\r|\n)/g, '<br/>')"> </span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="160">
+        <template slot-scope="scope">
+          <span>{{ scope.row.upLimitRate ? scope.row.upLimitRate : '--' }} / {{ scope.row.downLimitRate ? scope.row.downLimitRate : '--' }}</span>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column width="150px" align="center" :label="$t('table.createTime')">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="colorOption[scope.row.enable]">{{ statusOptions[scope.row.enable] }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.isOnline')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="colorOption[scope.row.isOnline]">{{ onlineOptions[scope.row.isOnline] }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" width="320" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button type="primary" size="mini" @click="toModify(scope.row)">{{ $t('table.edit') }}</el-button>
+          <el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{ $t('table.disable') }}</el-button>
+          <el-button v-if="scope.row.enable == '2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{ $t('table.delete') }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]"
+        :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <el-dialog :title="textMap[dialogStatus]" :close-on-click-modal="false" :visible.sync="dialogFormVisible" top="20px">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="110px">
+        <el-form-item :label="$t('License')" prop="licenseId">
+          <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList" @selectedData="selectedFeeItem" placeholder="请选择" :width="500" />
+        </el-form-item>
+        <el-form-item :label="$t('域名')" prop="domain">
+          <el-input v-model="temp.domain">
+            <template slot="prepend">http(s)://</template>
+          </el-input>
+        </el-form-item>
+        <el-form-item :label="$t('目标地址')" prop="targetPath">
+          <el-input type="textarea" v-model="temp.targetPath" rows="3" placeholder="请输入目标地址,多个可实现负载均衡，如:
+127.0.0.1:80
+127.0.0.1:90"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('描述')" prop="description">
+          <el-input v-model="temp.description" type="textarea" placeholder="请输入描述"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('请求头部信息')" prop="requestHeader">
+          <el-input v-model="temp.requestHeader" type="textarea" placeholder="请输入请求头如：Cache-Control: no-cache"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('table.securityGroup')" prop="securityGroup">
+          <el-select style="width: 280px;" class="filter-item" v-model="temp.securityGroupId" clearable>
+            <el-option v-for="item in securityGroupList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{ $t('table.cancel') }}</el-button>
+        <el-button v-if="dialogStatus == 'create'" type="primary" @click="modifyData">{{ $t('table.confirm')
+          }}</el-button>
+        <el-button v-else type="primary" @click="modifyData">{{ $t('table.confirm') }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{ $t('table.confirm') }}</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { fetchList, mappingModify, updateEnableStatus, deleteMapping, domainAvailable } from '@/api/domain'
+import { fetchGroupList } from '@/api/securityGroup'
+import { licenseList, licenseAuthList } from '@/api/license'
+import { userList } from '@/api/user'
+import waves from '@/directive/waves' // 水波纹指令
+import { parseTime } from '@/utils'
+import ButtonPopover from '../../components/Button/buttonPopover'
+import DropdownTable from '../../components/Dropdown/DropdownTable'
+export default {
+  name: 'DmainMaping',
+  directives: {
+    waves
+  },
+  components: {
+    DropdownTable,
+    ButtonPopover
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: null,
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 10,
+        domain: null,
+        title: undefined,
+        type: undefined,
+        userId: undefined,
+        license: undefined,
+        port: undefined,
+        isOnline: undefined,
+        enable: undefined,
+        description: undefined
+      },
+      userList: [],
+      licenseList: [],
+      licenseAuthList: [],
+      showReviewer: false,
+      temp: {
+        id: undefined,
+        licenseId: undefined,
+        licenseName: undefined,
+        domain: undefined,
+        targetPath: undefined,
+        requestHeader: undefined
+      },
+      statusOptions: {
+        1: '启用',
+        2: '禁用',
+      },
+      onlineOptions: {
+        1: '在线',
+        2: '离线'
+      },
+      colorOption: {
+        1: 'success',
+        2: 'danger'
+      },
+      dialogFormVisible: false,
+      dialogStatus: '',
+      textMap: {
+        update: '编辑',
+        create: '新增'
+      },
+      dialogPvVisible: false,
+      pvData: [],
+      rules: {
+        licenseId: [{ required: true, message: '请选择License', trigger: 'blur,change' }],
+        domain: [{ required: true, message: '请输入域名', trigger: 'blur' },
+        { pattern: '^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$', message: '域名格式不正确，请检查后重试', trigger: 'blur' },
+        { validator: this.isDomainAvailable, trigger: 'blur' }
+        ],
+        targetPath: [{ required: true, message: '请输入目标地址', trigger: 'blur' }],
+      },
+      more: true,
+      securityGroupList: []
+    }
+  },
+  // filters: {
+  // },
+  created() {
+    this.getDataList()
+    this.getLicenseList()
+    this.getLicenseAuthList()
+    this.fetchSecurityGroupList()
+  },
+  methods: {
+    isDomainAvailable(rule, value, callback) {
+      if (value != null) {
+        const param = { domain: value, id: this.temp.id }
+        domainAvailable(param).then(res => {
+          console.log(res)
+          if (!res.data.data) {
+            return callback(new Error('域名已被占用'))
+          } else {
+            callback()
+          }
+        })
+      }
+    },
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.data.records
+        this.total = response.data.data.total
+        this.listLoading = false
+      })
+    },
+    getDataList() {
+      const loginName = this.$store.state.user.loginName
+      userList().then(response => {
+        this.userList = response.data.data
+        const curUser = this.userList.find((val) => val.loginName === loginName)
+        if (curUser) {
+          this.listQuery.userId = curUser.id
+        }
+        this.getList()
+      })
+    },
+    fetchSecurityGroupList() {
+      fetchGroupList().then(res => {
+        if (res.data.code == 0) {
+          this.securityGroupList = res.data.data
+        }
+      })
+    },
+    getAllUserList() {
+      userList().then(response => {
+        this.userList = response.data.data
+      })
+    },
+    getLicenseList() {
+      licenseList().then(response => {
+        this.licenseList = response.data.data
+      })
+    },
+    getLicenseAuthList() {
+      licenseAuthList().then(response => {
+        this.licenseAuthList = response.data.data
+      })
+    },
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.listQuery.size = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.listQuery.current = val
+      this.getList()
+    },
+    handleModifyStatus(row, enable) {
+      console.log('route', this.$route)
+      updateEnableStatus(row.id, enable).then(response => {
+        if (response.data.data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+        }
+        this.getList()
+      })
+    },
+    resetTemp() {
+      this.temp = {
+        id: undefined,
+        licenseId: undefined,
+        licenseName: undefined,
+        clientIp: '127.0.0.1',
+        clientPort: undefined,
+        userId: undefined,
+        proxyResponses: undefined,
+        proxyTimeoutMs: undefined
+      }
+      this.more = true;
+    },
+    handleCreate() {
+      this.resetTemp()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    modifyData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          mappingModify(this.temp).then(response => {
+            if (response.data.code === 0) {
+              this.dialogFormVisible = false
+              this.$notify({
+                title: '成功',
+                message: '操作成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.getList()
+            }
+          })
+        }
+      })
+    },
+    handleOpenWebPage(row) {
+      open(location.protocol + '//' + row.domain)
+    },
+    toModify(row) {
+      this.temp = Object.assign({}, row) // copy obj
+      if (row.securityGroupId === 0) {
+        this.temp.securityGroupId = null
+      }
+      this.temp.timestamp = new Date(this.temp.timestamp)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    selectedFeeItem(row, list) {
+      if (this.temp.licenseId !== row.id) {
+        this.temp.licenseId = row.id
+        this.temp.licenseName = row.name
+        this.temp.serverPort = null
+      }
+    },
+    handleDelete(row) {
+      this.$confirm('确定要删除吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteMapping(row.id).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
+      }).catch(() => { })
+    },
+  }
+}
+</script>
@@ -36,6 +36,11 @@
          <span>{{scope.row.key}}</span>
        </template>
      </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
        <template slot-scope="scope">
          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
@@ -58,18 +63,19 @@
      </el-table-column>
      <el-table-column align="center" :label="$t('table.actions')" width="330" class-name="small-padding fixed-width">
        <template slot-scope="scope">
+          <!-- v-if="scope.row.id != 1"  -->
          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{$t('table.edit')}}</el-button>
          <el-button size="mini" type="primary" @click="handleReset(scope.row)">{{$t('table.resetKey')}}</el-button>
          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>
-          <!--          <el-button size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
-          <ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px"/>
+          <!-- v-if="scope.row.id != 1"  -->
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{$t('table.delete')}}</el-button>
        </template>
      </el-table-column>
    </el-table>

    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -85,6 +91,12 @@
        <el-form-item :label="$t('License名称')" prop="name">
          <el-input v-model="temp.name"></el-input>
        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
@@ -111,20 +123,6 @@
  import { userList } from '@/api/user'
  import waves from '@/directive/waves' // 水波纹指令
  import { parseTime } from '@/utils'
-  import ButtonPopover from '../../components/Button/buttonPopover'
-
-  const calendarTypeOptions = [
-    { key: 'CN', display_name: 'China' },
-    { key: 'US', display_name: 'USA' },
-    { key: 'JP', display_name: 'Japan' },
-    { key: 'EU', display_name: 'Eurozone' }
-  ]
-
-  // arr to obj ,such as { CN : "China", US : "USA" }
-  const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
-    acc[cur.key] = cur.display_name
-    return acc
-  }, {})

  export default {
    name: 'complexTable',
@@ -132,7 +130,6 @@
      waves
    },
    components: {
-      ButtonPopover
    },
    data() {
      return {
@@ -148,7 +145,6 @@
          userId: null
        },
        importanceOptions: [1, 2, 3],
-        calendarTypeOptions,
        userList: [],
        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
        statusOptions: ['published', 'draft', 'deleted'],
@@ -203,9 +199,6 @@
        }
        return statusMap[status]
      },
-      typeFilter(type) {
-        return calendarTypeKeyValue[type]
-      }
    },
    created() {
      this.getDataList()
@@ -357,19 +350,6 @@
          })
        }).catch(() => {})
      },
-      handleDelete2(row) {
-        deleteLicense(row.id).then(response => {
-          if (response.data.code === 0) {
-            this.$notify({
-              title: '成功',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000
-            })
-            this.getList()
-          }
-        })
-      },
      handleDownload() {
        this.downloadLoading = true
        import('@/vendor/Export2Excel').then(excel => {
@@ -39,21 +39,21 @@
          <span>{{ scope.row.userName }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.licenseName')" width="130">
+      <el-table-column align="center" :label="$t('table.licenseName')" width="120">
        <template slot-scope="scope">
          <span>{{ scope.row.licenseName }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.protocalName')" width="100">
+      <el-table-column align="center" :label="$t('table.protocalName')" width="80">
        <template slot-scope="scope">
          <span>{{ scope.row.protocal }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.domainName')" width="200">
+      <!-- <el-table-column align="center" :label="$t('table.domainName')" width="180">
        <template slot-scope="scope">
          <span>{{ scope.row.domain }}</span>
        </template>
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column align="center" :label="$t('table.serverPort')" width="80">
        <template slot-scope="scope">
          <span>{{ scope.row.serverPort }}</span>
@@ -64,17 +64,22 @@
          <span>{{ scope.row.clientIp }}:{{ scope.row.clientPort }}</span>
        </template>
      </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
      <el-table-column align="center" :label="$t('table.desc')" width="120">
        <template slot-scope="scope">
          <span>{{ scope.row.description }}</span>
        </template>
      </el-table-column>

-      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column width="150px" align="center" :label="$t('table.createTime')">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
        <template slot-scope="scope">
          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
@@ -99,55 +104,35 @@
        <template slot-scope="scope">
          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
          <el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{$t('table.disable')}}</el-button>
-          <el-button v-if="scope.row.enable == '2'" size="mini" type="success"
-            @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
-          <!--          <el-button size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
-          <ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px" />
-
+          <el-button v-if="scope.row.enable == '2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
+          <el-button size="mini" type="danger" @click="handleDelete(scope.row)">{{$t('table.delete')}}</el-button>
        </template>
      </el-table-column>
    </el-table>

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

-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px"
-        style='width: 400px; margin-left:50px;'>
-        <!--        <el-form-item :label="$t('License')" prop="licenseId">-->
-        <!--          <el-select style="width: 280px;" class="filter-item" v-model="temp.licenseId" placeholder="请选择" :disabled="dialogStatus=='update'">-->
-        <!--            <el-option v-for="item in licenseList" :key="item.id" :label="item.name" :value="item.id">-->
-        <!--            </el-option>-->
-        <!--          </el-select>-->
-        <!--        </el-form-item>-->
-
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" top="20px">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="120px"
+        style='width:500px;margin-left:50px;'>
        <el-form-item :label="$t('License')" prop="licenseId">
          <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList"
-            @selectedData="selectedFeeItem" placeholder="请选择" :width="280" :disabled="dialogStatus === 'update'" />
-          <!--          <DropdownTable
-            :columns="countryColumns"
-            :data="licenseList"
-            v-model="temp.licenseId"
-            :value="temp.licenseName"
-            @rowClick="selectedFeeItem"
-            disabled
-            :disabled="dialogStatus==='update'"
-            style="width: 280px"
-          />-->
+            @selectedData="selectedFeeItem" placeholder="请选择" :width="500" :disabled="dialogStatus === 'update'" />
        </el-form-item>
        <el-form-item :label="$t('协议')" prop="protocal">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.protocal" placeholder="请选择">
+          <el-select style="width: 380px;" class="filter-item" v-model="temp.protocal" placeholder="请选择">
            <el-option v-for="item in protocalList" :key="item.name" :label="item.name" :value="item.name"
              :disabled="!item.enable">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('服务端端口')" prop="serverPort" >
-          <load-select style="width: 280px;" class="filter-item"
+          <load-select style="width: 380px;" class="filter-item"
            v-model="temp.serverPort"
            :data="serverPortList"
            :page="loadServerPortQuery.page"
@@ -161,13 +146,13 @@
          <el-input v-model="temp.clientIp"></el-input>
        </el-form-item>
        <el-form-item :label="$t('客户端端口')" prop="clientPort">
-          <el-input v-model="temp.clientPort"></el-input>
+          <el-input v-model="temp.clientPort" type="number" :step="1" controls-position="right" ></el-input>
        </el-form-item>
-        <el-form-item :label="$t('域名')" prop="subdomain" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainName && domainName != ''">
+        <!-- <el-form-item :label="$t('域名')" prop="subdomain" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainName && domainName != ''">
          <el-input v-model="temp.subdomain">
            <template slot="append">.{{ domainName }}</template>
          </el-input>
-        </el-form-item>
+        </el-form-item> -->
        <el-form-item :label="$t('响应数量')" prop="proxyResponses" v-if="temp.protocal === 'UDP'">
          <el-input v-model="temp.proxyResponses"></el-input>
        </el-form-item>
@@ -177,11 +162,17 @@
          </el-input>
        </el-form-item>
        <el-form-item  :label="$t('table.securityGroup')" prop="securityGroup">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.securityGroupId" clearable >
+          <el-select style="width: 380px;" class="filter-item" v-model="temp.securityGroupId" clearable >
            <el-option v-for="item in securityGroupList" :key="item.id" :label="item.name" :value="item.id">
            </el-option>
          </el-select>
        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
        <el-form-item :label="$t('描述')" prop="description">
          <el-input v-model="temp.description"></el-input>
        </el-form-item>
@@ -215,27 +206,12 @@ import { availablePortList, portAvailable } from '@/api/portPool'
 import { licenseList, licenseAuthList } from '@/api/license'
 import { protocalList } from '@/api/protocal'
 import { userList } from '@/api/user'
-import { domainNameBindInfo } from '@/api/domain'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
 import ButtonPopover from '../../components/Button/buttonPopover'
 import DropdownTable from '../../components/Dropdown/DropdownTable'
 // 下拉选择加载组件
 import loadSelect from "@/components/Select/SelectLoadMore";
-
-const calendarTypeOptions = [
-  { key: 'CN', display_name: 'China' },
-  { key: 'US', display_name: 'USA' },
-  { key: 'JP', display_name: 'Japan' },
-  { key: 'EU', display_name: 'Eurozone' }
-]
-
-// arr to obj ,such as { CN : "China", US : "USA" }
-const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
-  acc[cur.key] = cur.display_name
-  return acc
-}, {})
-
 export default {
  name: 'complexTable',
  directives: {
@@ -267,7 +243,6 @@ export default {
      listQuery: {
        current: 1,
        size: 10,
-        importance: undefined,
        title: undefined,
        type: undefined,
        userId: undefined,
@@ -278,8 +253,6 @@ export default {
        description: undefined

      },
-      importanceOptions: [1, 2, 3],
-      calendarTypeOptions,
      sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
      statusOptions: ['published', 'draft', 'deleted'],
      userList: [],
@@ -318,7 +291,9 @@ export default {
          // { validator: isPortAvailable, trigger: 'change' }
        ],
        clientIp: [{ required: true, message: '请输入客户端IP', trigger: 'blur' }],
-        clientPort: [{ required: true, message: '请输入客户端端口', trigger: 'blur' }],
+        clientPort: [{ required: true, message: '请输入客户端端口', trigger: 'blur' },
+          { pattern: /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/,message: '端口号请选择0-65535间的数字',trigger: 'blur'}
+        ],
        protocal: [{ required: true, message: '请选择协议', trigger: 'blur' }]
      },
      downloadLoading: false,
@@ -357,12 +332,8 @@ export default {
      }
      return statusMap[status]
    },
-    typeFilter(type) {
-      return calendarTypeKeyValue[type]
-    }
  },
  created() {
-    this.getDomainNameBindInfo()
    this.getDataList()
    this.getLicenseList()
    this.getLicenseAuthList()
@@ -396,11 +367,6 @@ export default {
        }
      })
    },
-    getDomainNameBindInfo() {
-      domainNameBindInfo().then(response => {
-        this.domainName = response.data.data
-      })
-    },
    getAvailablePortList(licenseId) {
      this.loadServerPortQuery.licenseId = licenseId;
      this.serverPortList = []; //清掉数据
@@ -561,29 +527,6 @@ export default {
        })
      }).catch(() => { })
    },
-    handleDelete2(row) {
-      deletePortMapping(row.id).then(response => {
-        if (response.data.code === 0) {
-          this.$notify({
-            title: '成功',
-            message: '删除成功',
-            type: 'success',
-            duration: 2000
-          })
-          this.getList()
-        }
-      })
-    },
-    handleDownload() {
-      this.downloadLoading = true
-      import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-        const data = this.formatJson(filterVal, this.list)
-        excel.export_json_to_excel(tHeader, data, 'table-list')
-        this.downloadLoading = false
-      })
-    },
    formatJson(filterVal, jsonData) {
      return jsonData.map(v => filterVal.map(j => {
        if (j === 'timestamp') {
@@ -44,7 +44,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -41,7 +41,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -36,7 +36,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -37,7 +37,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -51,7 +51,7 @@
      </el-table-column>
    </el-table>
    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -58,7 +58,7 @@

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

    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -63,7 +63,8 @@
    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
        <el-form-item :label="$t('table.port')" prop="port">
-          <el-input :placeholder="$t('table.portOrRange')" v-model="temp.port" :disabled="dialogStatus=='update'"></el-input>
+          <!-- <el-input :placeholder="$t('table.portOrRange')" v-model="temp.port" :disabled="dialogStatus=='update'"></el-input> -->
+          <el-input :placeholder="$t('table.portOrRange')" type="number" v-model="temp.port" :step="1" controls-position="right" :disabled="dialogStatus=='update'"></el-input>
        </el-form-item>

        <el-form-item  :label="$t('table.group')" prop="group">
@@ -158,7 +159,10 @@ const calendarTypeOptions = [
        dialogPvVisible: false,
        pvData: [],
        rules: {
-          port: [{ required: true, message: '端口必填', trigger: 'blur' }]
+          port: [
+            { required: true, message: '端口必填', trigger: 'blur' },
+            { pattern: /^([0-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/,message: '端口号请选择0-65535间的数字',trigger: 'blur'}
+          ]
        },
        downloadLoading: false,
        checkBoxData:[], //表单勾选的行
@@ -28,7 +28,7 @@

    <div class="pagination-container">
      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current"
+                     :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size"
                     layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
@@ -1,6 +1,17 @@
 <template>
  <div class="app-container calendar-list-container">
    <div class="filter-container">
+      <el-input v-model="listQuery.name" style="width:145px;margin-right:10px" placeholder="请输入名称" />
+      <el-input v-model="listQuery.description" style="width:145px;margin-right:10px" placeholder="请输入描述" />
+      <el-select v-model="listQuery.defaultPassType" placeholder="请选择默认放行类型" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.passType" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+          $t('table.search') }}
+      </el-button>
      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
    </div>

@@ -24,24 +35,22 @@
      </el-table-column>
      <el-table-column align="center" :label="$t('table.defaultPassType')">
        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.defaultPassType == 'allow'">允许</el-tag>
-          <el-tag type="info" v-if="scope.row.defaultPassType == 'deny'">拒绝</el-tag>
+          <el-tag :type="scope.row.defaultPassType | passTypeFilter">{{ scope.row.defaultPassType | passTypeName }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column align="center" :label="$t('table.createTime')">
        <template slot-scope="scope">
-          <span>{{scope.row.createTime}}</span>
+          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column align="center" :label="$t('table.updateTime')">
        <template slot-scope="scope">
-          <span>{{scope.row.updateTime}}</span>
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column class-name="status-col" :label="$t('table.enableStatus')">
        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.enable == '启用'">{{scope.row.enable}}</el-tag>
-          <el-tag type="danger" v-if="scope.row.enable == '禁用'">{{scope.row.enable}}</el-tag>
+          <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column align="center" :label="$t('table.actions')"  class-name="small-padding fixed-width" style="display:flex;justify-content:center">
@@ -49,8 +58,8 @@
          <div >
            <el-link :underline="false" type="primary" size="mini" @click="handleGoRulePage(scope.row)" style="font-size: 12px">{{$t('table.ruleConfig')}}</el-link>
            <el-link :underline="false" type="primary" size="mini" @click="handleUpdate(scope.row)" style="font-size: 12px">{{$t('table.edit')}}</el-link>
-            <el-link :underline="false" v-if="scope.row.enable =='启用'" size="mini" type="warning" @click="handleDisableStatus(scope.row)" style="font-size: 12px">{{$t('table.disable')}}</el-link>
-            <el-link :underline="false" v-if="scope.row.enable =='禁用'" size="mini" type="success" @click="handleEnableStatus(scope.row)" style="font-size: 12px">{{$t('table.enable')}}</el-link>
+            <el-link :underline="false" v-if="scope.row.enable =='1'" size="mini" type="warning" @click="handleModifyStatus(scope.row, 2)" style="font-size: 12px">{{$t('table.disable')}}</el-link>
+            <el-link :underline="false" v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)" style="font-size: 12px">{{$t('table.enable')}}</el-link>
          </div>
          <el-dropdown>
            <span class="el-dropdown-link" style="font-size: 12px">
@@ -69,6 +78,13 @@
      </el-table-column>
    </el-table>

+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="120px" style='width: 500px; margin-left:10px;'>
        <el-form-item :label="$t('table.name')" prop="name">
@@ -107,34 +123,34 @@
    </el-dialog>

    <el-dialog :title="$t('table.securityGroupBindPortMapping')+'---'+forBindProtMappingSecurityGroup.name+'安全组'" :visible.sync="dialogBindPortMappingVisible" width="90%">
-      <el-table :key='tableKey' :data="portMappingList" v-loading="listLoading" element-loading-text="给我一点时间" border fit align="center" width="100%"
+      <el-table :key='tableKey' :data="portMappingList" v-loading="listLoading" element-loading-text="给我一点时间" border width="100%"
        highlight-current-row style="width: 100%">
        <el-table-column align="center" :label="$t('table.id')" width="50">
          <template slot-scope="scope">
            <span>{{ scope.row.id }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.licenseName')" width="130">
+        <el-table-column align="center" :label="$t('table.licenseName')">
          <template slot-scope="scope">
            <span>{{ scope.row.licenseName }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.protocalName')" width="100">
+        <el-table-column align="center" :label="$t('table.protocalName')" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.protocal }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.domainName')" width="200">
+        <el-table-column align="center" :label="$t('table.domainName')">
          <template slot-scope="scope">
            <span>{{ scope.row.domain }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.serverPort')" width="80">
+        <el-table-column align="center" :label="$t('table.serverPort')" width="100">
          <template slot-scope="scope">
            <span>{{ scope.row.serverPort }}</span>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.proxyClient')" width="120">
+        <el-table-column align="center" :label="$t('table.proxyClient')" width="200">
          <template slot-scope="scope">
            <span>{{ scope.row.clientIp }}:{{ scope.row.clientPort }}</span>
          </template>
@@ -144,12 +160,12 @@
            <span>{{ scope.row.description }}</span>
          </template>
        </el-table-column>
-        <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="100">
+        <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="120">
          <template slot-scope="scope">
            <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
          </template>
        </el-table-column>
-        <el-table-column align="center" :label="$t('table.actions')" width="120" class-name="small-padding fixed-width">
+        <el-table-column align="center" :label="$t('table.actions')" width="150" class-name="small-padding fixed-width">
          <template slot-scope="scope">
            <el-button type="primary" size="mini" v-if="!scope.row.securityGroupId" @click="handleBind(scope.row)">{{$t('table.bind')}}</el-button>
            <el-button type="danger" size="mini" v-if="scope.row.securityGroupId && scope.row.securityGroupId == forBindProtMappingSecurityGroup.id" @click="handleUnbind(scope.row)">{{$t('table.unbind')}}</el-button>
@@ -160,7 +176,7 @@

      <div class="pagination-container">
        <el-pagination background @size-change="handlePortMappingSizeChange" @current-change="handlePortMappingCurrentChange"
-          :current-pageInfo.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
+          :current-page.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
          layout="total, sizes, prev, pager, next, jumper" :total="portMappingTotal">
        </el-pagination>
      </div>
@@ -170,7 +186,7 @@
 </template>

 <script>
-import {fetchGroupList, createGroup, updateGroup, deleteGroup, enableGroup, disableGroup} from '@/api/securityGroup'
+import {fetchGroupPage, createGroup, updateGroup, deleteGroup, updateGroupEnableStatus} from '@/api/securityGroup'
 import { fetchList as fetchPortMappingList, portMappingBindSecurityGroup, portMappingUnbindSecurityGroup} from '@/api/portMapping'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
@@ -188,6 +204,15 @@ import LinkPopover from '../../components/Link/linkPopover'
      return {
        tableKey: 0,
        list: [],
+        total: null,
+        listQuery: {
+          current: 1,
+          size: 10,
+          name: undefined,
+          description: undefined,
+          defaultPassType: undefined,
+          enable: undefined
+        },
        listLoading: true,
        temp: {
          id: undefined,
@@ -195,6 +220,12 @@ import LinkPopover from '../../components/Link/linkPopover'
          description: '',
          defaultPassType: undefined
        },
+        selectObj: {
+          statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+          onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }],
+          passType: [{ label: '允许', value: 1 }, { label: '拒绝', value: 0 }]
+
+        },
        dialogFormVisible: false,
        dialogStatus: '',
        textMap: {
@@ -231,6 +262,20 @@ import LinkPopover from '../../components/Link/linkPopover'
      }
    },
    filters: {
+      passTypeName(type) {
+        const statusMap = {
+          1: '允许',
+          0: '拒绝'
+        }
+        return statusMap[type]
+      },
+      passTypeFilter(type) {
+        const statusMap = {
+          1: 'success',
+          0: 'danger'
+        }
+        return statusMap[type]
+      },
      statusName(status) {
        const statusMap = {
          1: '启用',
@@ -257,11 +302,24 @@ import LinkPopover from '../../components/Link/linkPopover'
    methods: {
      getList() {
        this.listLoading = true
-        fetchGroupList().then(response => {
-          this.list = response.data.data
+        fetchGroupPage(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
          this.listLoading = false
        })
      },
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.current = val
+        this.getList()
+      },
      getPortMappingList() {
        this.portMappingListLoading = true
        fetchPortMappingList(this.portMappingListQuery).then(response => {
@@ -270,27 +328,16 @@ import LinkPopover from '../../components/Link/linkPopover'
          this.portMappingListQuery.current = response.data.data.current
          this.portMappingListLoading = false
        })
-    },
-      handleEnableStatus(row) {
-        enableGroup(row.id).then(response => {
-          if (response.data.code === 0) {
-            this.$message({
-              message: '操作成功',
-              type: 'success'
-            })
-            this.getList()
-          }
-        })
      },
-      handleDisableStatus(row) {
-        disableGroup(row.id).then(response => {
-          if (response.data.code === 0) {
+      handleModifyStatus(row, enable) {
+        updateGroupEnableStatus(row.id, enable).then(response => {
+          if (response.data.data.code === 0) {
            this.$message({
              message: '操作成功',
              type: 'success'
            })
-            this.getList()
          }
+          this.getList()
        })
      },
      resetTemp() {
@@ -329,8 +376,7 @@ import LinkPopover from '../../components/Link/linkPopover'
      },
      handleUpdate(row) {
        this.temp = Object.assign({}, row) // copy obj
-        this.temp.defaultPassType = row.defaultPassType == 'allow' ? 1 : 0
-        this.temp.timestamp = new Date(this.temp.timestamp)
+        // this.temp.timestamp = new Date(this.temp.timestamp)
        this.dialogStatus = 'update'
        this.dialogFormVisible = true
        this.$nextTick(() => {
@@ -357,7 +403,7 @@ import LinkPopover from '../../components/Link/linkPopover'
        })
      },
      handleDelete(row) {
-        deleteGroup(row.id).then(response => {
+        deleteGroup({groupId: row.id}).then(response => {
          if (response.data.code === 0) {
            this.$notify({
              title: '成功',
@@ -370,7 +416,9 @@ import LinkPopover from '../../components/Link/linkPopover'
        })
      },
      handleGoRulePage (row) {
-        this.$router.push(`/system/securityRule?groupId=${row.id}`)
+        this.$router.push({ path: '/system/securityRule', query: { groupId: row.id }})
+
+        // this.$router.push(`/system/securityRule?groupId=${row.id}`)
      },
      handlePortMapping(row) {
        this.dialogBindPortMappingVisible = true
@@ -413,8 +461,3 @@ import LinkPopover from '../../components/Link/linkPopover'
    }
  }
 </script>
-<style>
-  .filter-container {
-    text-align: right;
-  }
-</style>
@@ -6,7 +6,18 @@
      <div style="text-align: center;font-size:14px; color: #606266">{{group.description}}</div>
    </div>

-    <div class="filter-container" align="right">
+    <div class="filter-container">
+      <el-input v-model="listQuery.name" style="width:145px;margin-right:10px" placeholder="请输入名称" />
+      <el-input v-model="listQuery.description" style="width:145px;margin-right:10px" placeholder="请输入描述" />
+<!--      <el-select v-model="listQuery.passType" placeholder="请选择默认放行类型" clearable style="width:145px;margin-right:10px">-->
+<!--          <el-option v-for="item in selectObj.passType" :key="item.value" :label="item.label" :value="item.value" />-->
+<!--      </el-select>-->
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+          <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+          $t('table.search') }}
+      </el-button>
      <el-button class="filter-item" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
    </div>

@@ -35,41 +46,46 @@
      </el-table-column>
      <el-table-column align="center" :label="$t('table.passType')">
        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.passType == 'allow'" effect="dark">允许</el-tag>
-          <el-tag type="info" v-if="scope.row.passType == 'deny'" effect="dark">拒绝</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" :label="$t('table.priority')">
-        <template slot-scope="scope">
-          <span>{{scope.row.priority}}</span>
+          <el-tag :type="scope.row.passType | passTypeFilter">{{ scope.row.passType | passTypeName }}</el-tag>
        </template>
      </el-table-column>
+<!--      <el-table-column align="center" :label="$t('table.priority')">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{scope.row.priority}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
      <el-table-column align="center" :label="$t('table.createTime')">
        <template slot-scope="scope">
-          <span>{{scope.row.createTime}}</span>
+          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column align="center" :label="$t('table.updateTime')">
        <template slot-scope="scope">
-          <span>{{scope.row.updateTime}}</span>
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
        </template>
      </el-table-column>
      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="150">
        <template slot-scope="scope">
-          <el-tag type="success" v-if="scope.row.enable == '启用'">{{scope.row.enable}}</el-tag>
-          <el-tag type="warning" v-if="scope.row.enable == '禁用'">{{scope.row.enable}}</el-tag>
+          <el-tag :type="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
        </template>
      </el-table-column>
      <el-table-column align="center" :label="$t('table.actions')" width="250" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-link type="primary" :underline="false" size="mini" @click="handleUpdate(scope.row)" style="font-size:12px">{{$t('table.edit')}}</el-link>
-          <el-link :underline="false" v-if="scope.row.enable =='启用'" size="mini" type="warning" @click="handleDisableStatus(scope.row)" style="font-size:12px">{{$t('table.disable')}}</el-link>
-          <el-link :underline="false" v-if="scope.row.enable =='禁用'" size="mini" type="success" @click="handleEnableStatus(scope.row)" style="font-size:12px">{{$t('table.enable')}}</el-link>
+          <el-link :underline="false" v-if="scope.row.enable =='1'" size="mini" type="warning" @click="handleModifyStatus(scope.row, 2)" style="font-size:12px">{{$t('table.disable')}}</el-link>
+          <el-link :underline="false" v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row, 1)" style="font-size:12px">{{$t('table.enable')}}</el-link>
          <LinkPopover @handleCommitClick="handleDelete(scope.row)"/>
        </template>
      </el-table-column>
    </el-table>

+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" top="4vh">
      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="100px" style='margin-left:50px;margin-right: 150px'>
        <el-form-item :label="$t('table.name')" prop="name">
@@ -93,7 +109,7 @@
            <div>每个类型中间以英文逗号分隔,形如 192.168.1.1,192.168.3.0/24 是正确的 </div>
          </div>
        </el-form-item>
-        
+

        <el-form-item  :label="$t('table.passType')" prop="passType">
          <el-tooltip class="item" effect="dark" :content="temp.passTypeTooltip" placement="right">
@@ -103,7 +119,7 @@
              </el-option>
            </el-select>
          </el-tooltip>
-         
+
        </el-form-item>

        <!-- <el-form-item :label="$t('table.priority')" prop="priority">
@@ -132,7 +148,7 @@
 </template>

 <script>
-import {fetchGroupOne, fetchRuleList, createRule, updateRule, deleteRule, enableRule, disableRule} from '@/api/securityGroup'
+import {fetchGroupDetail, fetchRulePage, createRule, updateRule, deleteRule, updateRuleEnableStatus} from '@/api/securityGroup'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
 import LinkPopover from '../../components/Link/linkPopover'
@@ -151,6 +167,16 @@ import LinkPopover from '../../components/Link/linkPopover'
        group: {},
        tableKey: 0,
        list: [],
+        total: null,
+        listQuery: {
+          current: 1,
+          size: 10,
+          groupId: undefined,
+          name: undefined,
+          description: undefined,
+          passType: undefined,
+          enable: undefined
+        },
        listLoading: true,
        temp: {
          id: undefined,
@@ -162,6 +188,12 @@ import LinkPopover from '../../components/Link/linkPopover'
          passTypeTooltip: '',
          priority: 1
        },
+        selectObj: {
+            statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
+            onlineOptions: [{ label: '在线', value: 1 }, { label: '离线', value: 2 }],
+            passType: [{ label: '允许', value: 1 }, { label: '拒绝', value: 2 }]
+
+        },
        dialogFormVisible: false,
        dialogStatus: '',
        textMap: {
@@ -182,6 +214,20 @@ import LinkPopover from '../../components/Link/linkPopover'
      }
    },
    filters: {
+      passTypeName(type) {
+        const statusMap = {
+          1: '允许',
+          0: '拒绝'
+        }
+        return statusMap[type]
+      },
+      passTypeFilter(type) {
+        const statusMap = {
+          1: 'success',
+          0: 'danger'
+        }
+        return statusMap[type]
+      },
      statusName(status) {
        const statusMap = {
          1: '启用',
@@ -202,39 +248,29 @@ import LinkPopover from '../../components/Link/linkPopover'
    },
    created() {
      // eslint-disable-next-line no-sequences
-      const queryParam = this.$route.query
-      if (queryParam && typeof queryParam === 'object' && queryParam.groupId) {
-        this.groupId = queryParam.groupId
-        localStorage.setItem('groupId', this.groupId)
-        this.getGroupOne()
-        this.getList()
-        return
+      if (this.$route.query.groupId) {
+          this.listQuery.groupId = this.$route.query.groupId
+      } else {
+          this.$notify({
+              title: '错误',
+              message: '没有获取到安全组信息',
+              type: 'error',
+              duration: 3000
+          })
+          this.$router.push(`/system/securityGroup`)
+          return
      }
-
-      const groupId = localStorage.getItem('groupId')
-      if (groupId) {
-        this.groupId = parseInt(groupId)
-        this.getGroupOne()
-        this.getList()
-        return
-      } 
-      
-      this.$notify({
-          title: '错误',
-          message: '没有获取到安全组信息',
-          type: 'error',
-          duration: 3000
-        })
-      this.$router.push(`/system/securityGroup`)
+      this.getGroupDetail()
+      this.getList()
    },
    methods: {
-      getGroupOne () {
-        fetchGroupOne(this.groupId).then(response => {
+      getGroupDetail () {
+        fetchGroupDetail({id: this.listQuery.groupId}).then(response => {
          this.group = response.data.data
        })
      },
      getList() {
-        if (!this.groupId) {
+        if (!this.listQuery.groupId) {
          this.$notify({
              title: '错误',
              message: '没有获取到安全组信息',
@@ -244,11 +280,24 @@ import LinkPopover from '../../components/Link/linkPopover'
          return
        }
        this.listLoading = true
-        fetchRuleList(this.groupId).then(response => {
-          this.list = response.data.data
+        fetchRulePage(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
          this.listLoading = false
        })
      },
+      handleFilter() {
+        this.listQuery.current = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.size = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.current = val
+        this.getList()
+      },
      handleEnableStatus(row) {
        enableRule(row.id).then(response => {
          if (response.data.code === 0) {
@@ -271,15 +320,26 @@ import LinkPopover from '../../components/Link/linkPopover'
          }
        })
      },
+      handleModifyStatus(row, enable) {
+        updateRuleEnableStatus(row.id, enable).then(response => {
+          if (response.data.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+          this.getList()
+        })
+      },
      resetTemp() {
        this.temp = {
          id: undefined,
-          groupId: this.groupId,
+          groupId: this.listQuery.groupId,
          name: '',
          description: '',
          rule: '',
-          passType: this.group.defaultPassType == 'allow' ? 0 : 1,
-          passTypeTooltip: `安全组已设置默认${(this.group.defaultPassType == 'allow' ? '允许' : '拒绝')}`,
+          passType: this.group.defaultPassType == 1 ? 0 : 1,
+          passTypeTooltip: `安全组已设置默认${(this.group.defaultPassType == 1 ? '允许' : '拒绝')}`,
          priority: 1
        }
      },
@@ -294,7 +354,7 @@ import LinkPopover from '../../components/Link/linkPopover'
      createData() {
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
-            this.temp.groupId = this.groupId
+            this.temp.groupId = this.listQuery.groupId
            createRule(this.temp).then(response => {
              if (response.data.code === 0) {
                this.dialogFormVisible = false
@@ -312,8 +372,8 @@ import LinkPopover from '../../components/Link/linkPopover'
      },
      handleUpdate(row) {
        this.temp = Object.assign({}, row) // copy obj
-        this.temp.passType = row.passType == 'allow' ? 1 : 0
-        this.temp.passTypeTooltip = `安全组已设置默认${(this.group.defaultPassType == 'allow' ? '允许' : '拒绝')}`,
+        this.temp.passType = row.passType
+        this.temp.passTypeTooltip = `安全组已设置默认${(this.group.defaultPassType == 1 ? '允许' : '拒绝')}`,
        this.temp.timestamp = new Date(this.temp.timestamp)
        this.dialogStatus = 'update'
        this.dialogFormVisible = true
@@ -325,7 +385,7 @@ import LinkPopover from '../../components/Link/linkPopover'
        this.$refs['dataForm'].validate((valid) => {
          if (valid) {
            const tempData = Object.assign({}, this.temp)
-            tempData.groupId = this.groupId
+            tempData.groupId = this.listQuery.groupId
            updateRule(tempData).then(response => {
              if (response.data.code === 0) {
                this.$notify({
@@ -342,7 +402,7 @@ import LinkPopover from '../../components/Link/linkPopover'
        })
      },
      handleDelete(row) {
-        deleteRule(row.id).then(response => {
+        deleteRule({ruleId: row.id}).then(response => {
          if (response.data.code === 0) {
            this.$notify({
              title: '成功',
@@ -50,7 +50,7 @@
    </el-table>

    <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                     :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
      </el-pagination>
    </div>
@@ -28,7 +28,9 @@ public class ProxyClient {
 			setAlias("neutrino.proxy.tunnel.jks-path", "jksPath");
 			setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword");
 			setAlias("neutrino.proxy.tunnel.license-key", "licenseKey");
-		});
+
+            log.info("NeutrinoProxy Client ：{}", app.cfg().get("solon.app.version"));
+        });
 	}

 	/**
@@ -43,7 +43,6 @@ public class CmdChannelHandler extends SimpleChannelInboundHandler<ProxyMessage>
        if (realServerChannel != null) {
            realServerChannel.config().setOption(ChannelOption.AUTO_READ, ctx.channel().isWritable());
        }
-
        super.channelWritabilityChanged(ctx);
    }

@@ -67,11 +67,18 @@ public class RealServerChannelHandler extends SimpleChannelInboundHandler<ByteBu
        }
    }

+    /**
+     * 通道激活时触发，当客户端connect成功后，服务端就会接收到这个事件，从而可以把客户端的Channel记录下来，供后面复用
+     * @param ctx
+     * @throws Exception
+     */
    @Override
    public void channelActive(ChannelHandlerContext ctx) throws Exception {
        super.channelActive(ctx);
    }
-
+    /**
+     * 客户端 失去连接
+     */
    @Override
    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
        Channel realServerChannel = ctx.channel();
@@ -33,7 +33,8 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 		final Channel cmdChannel = ctx.channel();
 		final String visitorId = proxyMessage.getInfo();
 		String[] serverInfo = new String(proxyMessage.getData()).split(":");
-		String ip = serverInfo[0];
+		// @todo 在这里 处理负载均恒
+        String ip = serverInfo[0];
 		int port = Integer.parseInt(serverInfo[1]);
 		// 连接真实的、被代理的服务
 		realServerBootstrap.connect(ip, port).addListener(new ChannelFutureListener() {
@@ -44,7 +45,6 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 				// 连接后端服务器成功
 				if (future.isSuccess()) {
 					final Channel realServerChannel = future.channel();
-
 					realServerChannel.config().setOption(ChannelOption.AUTO_READ, false);

 					// 获取连接
@@ -8,8 +8,8 @@ neutrino:
      # 线程池相关配置，用于技术调优，可忽略
      thread-count: 50
      # 隧道SSL证书配置
-      key-store-password: ${STORE_PASS:123456}
-      jks-path: ${JKS_PATH:classpath:/test.jks}
+      key-store-password: 123456
+      jks-path: classpath:/test.jks
      # 服务端IP
      server-ip: ${SERVER_IP:localhost}
      # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
@@ -19,11 +19,11 @@ neutrino:
      # 客户端连接唯一凭证
      license-key: ${LICENSE_KEY:}
      # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
-      client-id: ${CLIENT_ID:}
+      client-id:
      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
-      transfer-log-enable: ${CLIENT_LOG:false}
+      transfer-log-enable: false
      # 是否开启心跳日志
-      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
+      heartbeat-log-enable: false
      # 重连设置
      reconnection:
        # 重连间隔（秒）
@@ -38,4 +38,4 @@ neutrino:
        # udp傀儡端口范围
        puppet-port-range: 10000-10500
        # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
-        transfer-log-enable: ${CLIENT_LOG:false}
+        transfer-log-enable: false
@@ -3,7 +3,7 @@ solon:
    add: ./app.yml
  app:
    name: neutrino-proxy-client
-    version: @revision@
+    version: 2.0.1
 # 日志级别
 solon.logging.appender:
  console:
@@ -44,7 +44,7 @@ neutrino:
      # 是否启用SSL(注意：该配置必须和server-port对应上)
      ssl-enable: ${SSL_ENABLE:true}
      # 客户端连接唯一凭证
-      license-key: ${LICENSE_KEY:}
+      license-key: ${LICENSE_KEY:ce554b47de80495b9d1996cd62084973}
      # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
      client-id: ${CLIENT_ID:}
      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
@@ -49,6 +49,15 @@ public interface Constants {
    AttributeKey<Boolean> IS_UDP_KEY =  AttributeKey.newInstance("isUdp");
    AttributeKey<InetSocketAddress> SENDER = AttributeKey.newInstance("sender");

+    AttributeKey<Integer> SERVER_PORT = AttributeKey.newInstance("serverPort");
+
+    AttributeKey<String> DOMAIN = AttributeKey.newInstance("domain");
+
+    AttributeKey<String> REAL_REMOTE_IP = AttributeKey.newInstance("realRemoteIp");
+
+
+    AttributeKey<Boolean> FLOW_LIMITER_FLAG = AttributeKey.newInstance("flowLimiterFlag");
+

    int HEADER_SIZE = 4;
    int TYPE_SIZE = 1;
@@ -8,6 +8,7 @@ import org.noear.solon.aot.RuntimeNativeRegistrar;
 import org.noear.solon.aot.hint.MemberCategory;
 import org.noear.solon.core.AppContext;

+import java.nio.ByteBuffer;
 import java.util.Set;

 /**
@@ -22,6 +23,11 @@ public class NeutrinoCoreRuntimeNativeRegistrar implements RuntimeNativeRegistra
            metadata.registerReflection(clazz, MemberCategory.INVOKE_DECLARED_METHODS);
        }

+        Set<Class<?>> byteBufferClasses = ClassUtil.scanPackageBySuper("java", ByteBuffer.class);
+        for (Class<?> clazz : byteBufferClasses) {
+            metadata.registerReflection(clazz, MemberCategory.INVOKE_DECLARED_METHODS);
+        }
+
        metadata.registerReflection(ProxyMessage.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
        metadata.registerReflection(ProxyMessage.UdpBaseInfo.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);

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

+import cn.hutool.core.net.Ipv4Util;
 import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;

 import java.net.InetSocketAddress;

+@Slf4j
 public class IpUtil extends org.noear.solon.core.util.IpUtil {

    public static String getRemoteIp(ChannelHandlerContext ctx) {
@@ -15,4 +19,21 @@ public class IpUtil extends org.noear.solon.core.util.IpUtil {
        return remoteAddress;
    }

+    /**
+     * 工作原理为从http协议的header中找公网地址，此主要用于处理nginx转发时塞进去的真实IP的header，找不到返回null
+     * @param httpContent http协议文档内容
+     * @return 返回找到的第一个公网地址
+     */
+    public static String getRealRemoteIp(String httpContent) {
+        String ip = HttpUtil.getHeaderValue(httpContent, "X-Forwarded-For");
+        if (StringUtils.isEmpty(ip)) {
+            ip = HttpUtil.getHeaderValue(httpContent, "X-Real-IP");
+        }
+        if (StringUtils.isNotEmpty(ip)) {
+            log.debug("obtain http header ip：{}", ip);
+            return ip;
+        }
+        return null;
+    }
+
 }
@@ -2,7 +2,6 @@ package org.dromara.neutrinoproxy.server;

 import lombok.extern.slf4j.Slf4j;
 import org.dromara.solonplugins.job.annotation.EnableJob;
-import org.noear.snack.core.utils.StringUtil;
 import org.noear.solon.Solon;
 import org.noear.solon.Utils;
 import org.noear.solon.annotation.SolonMain;
@@ -26,6 +25,7 @@ public class ProxyServer {
            if (Utils.isNotEmpty(loglevel)) {
                app.cfg().put("solon.logging.logger.root.level", loglevel);
            }
+            log.info("NeutrinoProxy Server ：{}", app.cfg().get("solon.app.version"));
 		});
 	}
 }
@@ -1,30 +1,11 @@
 package org.dromara.neutrinoproxy.server.base;

+import org.apache.ibatis.type.SimpleTypeRegistry;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.base.rest.ResponseBody;
 import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
-import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper;
-import org.dromara.neutrinoproxy.server.dal.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.neutrinoproxy.server.dal.*;
+import org.dromara.neutrinoproxy.server.service.*;
 import org.dromara.solonplugins.job.JobBean;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.aot.RuntimeNativeMetadata;
@@ -56,6 +37,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
        metadata.registerLambdaSerialization(ReportService.class);
        metadata.registerLambdaSerialization(UserLoginRecordService.class);
        metadata.registerLambdaSerialization(UserService.class);
+        metadata.registerLambdaSerialization(SecurityGroupService.class);
+

        metadata.registerLambdaSerialization(LicenseMapper.class);
        metadata.registerLambdaSerialization(ClientConnectRecordMapper.class);
@@ -64,11 +47,17 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
        metadata.registerLambdaSerialization(FlowReportMinuteMapper.class);
        metadata.registerLambdaSerialization(FlowReportMonthMapper.class);
        metadata.registerLambdaSerialization(JobInfoMapper.class);
+        metadata.registerLambdaSerialization(JobLogMapper.class);
        metadata.registerLambdaSerialization(PortMappingMapper.class);
+        metadata.registerLambdaSerialization(PortGroupMapper.class);
+        metadata.registerLambdaSerialization(ReportMapper.class);
        metadata.registerLambdaSerialization(PortPoolMapper.class);
        metadata.registerLambdaSerialization(UserLoginRecordMapper.class);
        metadata.registerLambdaSerialization(UserMapper.class);
        metadata.registerLambdaSerialization(UserTokenMapper.class);
+        metadata.registerLambdaSerialization(SecurityGroupMapper.class);
+        metadata.registerLambdaSerialization(SecurityRuleMapper.class);
+

        metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS);
        metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS);
@@ -90,6 +79,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist

        metadata.registerReflection(JobBean.class, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS);

+        // 解决mybatis调用deleteBatchIds报错“java.lang.ClassNotFoundException: Cannot find class: org.apache.ibatis.type.SimpleTypeRegistry”
+        metadata.registerReflection(SimpleTypeRegistry.class, MemberCategory.DECLARED_FIELDS, MemberCategory.INVOKE_PUBLIC_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS);
    }

 }
@@ -109,7 +109,6 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 		}
 		for (String tableName : initDataTableNameList) {
 			// 表里没有数据的时候，才进行初始化操作
-
 			Object result = dbContext.exe(String.format("select count(1) from `%s`", tableName));
 			if (result != null && ((Number) result).intValue() > 0) {
 				continue;
@@ -63,7 +63,6 @@ public class ProxyConfig {
 	public static class Tcp {
 		private Integer bossThreadCount;
 		private Integer workThreadCount;
-		private String domainName;
 		private Integer httpProxyPort;
 		private Integer httpsProxyPort;
 		private String keyStorePassword;
@@ -20,6 +20,9 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.TcpVisitorChannelHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.UdpVisitorChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.TcpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.UdpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
 import org.noear.solon.annotation.Configuration;
@@ -74,6 +77,8 @@ public class ProxyConfiguration implements LifecycleBean {
            }
            ch.pipeline().addFirst(new BytesMetricsHandler());
 //            ch.pipeline().addLast(new ChannelTrafficShapingHandler(1024 * 1024 * 20, 1024 * 1024 * 20, 100, 20000));
+            ch.pipeline().addLast(new TcpVisitorSecurityChannelHandler());
+            ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler());
            ch.pipeline().addLast(new TcpVisitorChannelHandler());
            }
        });
@@ -111,6 +116,8 @@ public class ProxyConfiguration implements LifecycleBean {
                    if (null != proxyConfig.getServer().getUdp().getTransferLogEnable() && proxyConfig.getServer().getUdp().getTransferLogEnable()) {
                        ch.pipeline().addFirst(new LoggingHandler(UdpVisitorChannelHandler.class));
                    }
+                    pipeline.addLast(udpServerWorkerGroup, new UdpVisitorSecurityChannelHandler());
+                    ch.pipeline().addLast("flowLimiter", new VisitorFlowLimiterChannelHandler());
                    pipeline.addLast(udpServerWorkerGroup, new UdpVisitorChannelHandler());
                }
            });
@@ -16,6 +16,7 @@ import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Handler;
 import org.noear.solon.core.route.RouterInterceptor;
 import org.noear.solon.core.route.RouterInterceptorChain;
+import org.noear.solon.validation.ValidatorException;

 import java.lang.reflect.Method;

@@ -81,8 +82,12 @@ public class BaseAuthInterceptor implements RouterInterceptor {
                return new ResponseBody<>()
                        .setCode(exception.getCode())
                        .setMsg(exception.getMsg());
+            } else if (result instanceof ValidatorException) {
+                return new ResponseBody<>()
+                    .setCode(ExceptionConstant.DONAME_PATTEN_ERROR.getCode())
+                    .setMsg(ExceptionConstant.DONAME_PATTEN_ERROR.getMsg())
+                    .setStack(ExceptionUtils.getStackTrace((Throwable) result));
            }
-
            return new ResponseBody<>()
                    .setCode(ExceptionConstant.SYSTEM_ERROR.getCode())
                    .setMsg(ExceptionConstant.SYSTEM_ERROR.getMsg())
@@ -9,6 +9,7 @@ import org.noear.solon.annotation.Component;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Filter;
 import org.noear.solon.core.handle.FilterChain;
+import org.noear.solon.validation.ValidatorException;

 /**
 * @author: aoshiguchen
@@ -22,9 +23,13 @@ public class GlobalExceptionFilter implements Filter {
    public void doFilter(Context ctx, FilterChain chain) throws Throwable {
        try {
            chain.doFilter(ctx);
-        } catch (Throwable e) {
+        } catch(ValidatorException ve){
+            ctx.render(new ResponseBody<>()
+                .setCode(ExceptionConstant.DONAME_PATTEN_ERROR.getCode())
+                .setMsg(ExceptionConstant.DONAME_PATTEN_ERROR.getMsg())
+                .setStack(ExceptionUtils.getStackTrace(ve)));
+        } catch(Throwable e) {
            log.error("global error", e);
-
            if (e instanceof ServiceException) {
                ServiceException serviceException = (ServiceException) e;
                ctx.render(new ResponseBody<>()
@@ -32,7 +37,6 @@ public class GlobalExceptionFilter implements Filter {
                        .setMsg(serviceException.getMsg()));
                return;
            }
-
            ctx.render(new ResponseBody<>()
                    .setCode(ExceptionConstant.SYSTEM_ERROR.getCode())
                    .setMsg(ExceptionConstant.SYSTEM_ERROR.getMsg())
@@ -40,8 +40,8 @@ public enum ExceptionConstant {
 	NO_PERMISSION_VISIT(5, "当前用户无权访问该资源"),
 	PARAMS_NOT_NULL(10, "参数[{}]不能为空"),
 	PARAMS_NOT_EMPTY(11, "参数[{}]不能为空"),
-
 	FILED_LENGTH_OUT(12 ,"{}不能超出长度{}"),
+    BYTES_DESC_INVALID(13, "参数[{}]字节描述不合法"),

 	// 用户管理(11000)
 	// license管理(12000)
@@ -61,13 +61,21 @@ public enum ExceptionConstant {
 	AN_UNSUPPORTED_PROTOCOL(14002, "不支持的协议[{}]！"),
 	PORT_MAPPING_SUBDONAME_CONNOT_REPEAT(14003, "子域名不能重复使用！"),

+    DONAME_CONNOT_REPEAT(14004, "域名不能重复解析！"),
+
+    DONAME_PATTEN_ERROR(14005, "域名格式不正确！"),
 	// 调度管理(15000)
 	JOB_INFO_NOT_EXIST(15000, "调度管理记录不存在"),
 	SYSTEM_ERROR(500, "系统异常"),

 	PORT_GROUP_NAME_ALREADY_EXIST(16000,"端口分组名称[{}]已经存在"),
 	PORT_GROUP_NAME_DOES_NOT_EXIST(16001,"端口分组不存在"),
-	DEFAULT_GROUP_FORBID_DELETE(16002,"默认分组禁止删除")
+	DEFAULT_GROUP_FORBID_DELETE(16002,"默认分组禁止删除"),
+
+    // 安全组管理(17000)
+    SECURITY_GROUP_NOT_EXIST(17000, "安全组不存在"),
+	SECURITY_RULE_NOT_EXIST(17001, "安全规则不存在"),
+
 	;

 	private int code;
@@ -11,6 +11,6 @@ public enum SecurityRulePassTypeEnum {
    NONE(-1, "none")
    ;

-    private final Integer code;
+    private final Integer type;
    private final String desc;
 }
@@ -0,0 +1,105 @@
+package org.dromara.neutrinoproxy.server.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
+import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
+import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.*;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainMappingDO;
+import org.dromara.neutrinoproxy.server.service.DomainMappingService;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.noear.solon.annotation.*;
+import org.noear.solon.validation.annotation.NotBlank;
+import org.noear.solon.validation.annotation.Valid;
+import org.noear.solon.validation.annotation.Validated;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/4/2
+ */
+@Slf4j
+@Valid
+@Mapping("/domain")
+@Controller
+public class DomainController {
+    @Inject
+    private ProxyConfig proxyConfig;
+
+    @Inject
+    private DomainMappingService domainMappingService;
+
+    @Get
+    @Mapping("/page")
+    public PageInfo<DomainMappingDto> page(PageQuery pageQuery, DomainMappingDto req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+        return domainMappingService.page(pageQuery, req);
+    }
+
+    @Post
+    @Mapping("/modify")
+    public PortMappingCreateRes modify(@Validated DomainMappingDO req) {
+        if (StringUtils.isBlank(req.getTargetPath())) {// targetPath，默认为127.0.0.1
+            req.setTargetPath("127.0.0.1");
+        }
+        req.setProtocal(NetworkProtocolEnum.HTTP.getDesc());
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }
+        return domainMappingService.modify(req);
+    }
+
+    @Get
+    @Mapping("/one/{id}")
+    public DomainMappingDto one(Integer id) {
+        return domainMappingService.one(id);
+    }
+
+    @Post
+    @Mapping("/update/enable-status")
+    public PortMappingUpdateEnableStatusRes updateEnableStatus(PortMappingUpdateEnableStatusReq req) {
+        return domainMappingService.updateEnableStatus(req);
+    }
+
+    @Get
+    @Mapping("/delete/{id}")
+    public void delete(Integer id) {
+        domainMappingService.delete(id);
+    }
+
+    /**
+     * 绑定安全组
+     * @param req portMappingId和securityGroupId
+     */
+    @Post
+    @Mapping("/bind/security-group")
+    public void bindSecurityGroup(PortMappingBindSecurityGroupReq req) {
+        domainMappingService.domainBindSecurityGroup(req.getId(), req.getSecurityGroupId());
+    }
+
+    /**
+     * 安全组解绑
+     * @param id 端口映射Id
+     */
+    @Post
+    @Mapping("/unbind/security-group")
+    public void unbindSecurityGroup(Integer id) {
+        domainMappingService.domainUnbindSecurityGroup(id);
+    }
+
+
+
+    /**
+     * 绑定安全组
+     * @param domain
+     */
+    @Get
+    @Mapping("/available")
+    public boolean exitDomain(@NotBlank String domain, Integer id) {
+       return domainMappingService.exitDomain(domain, id);
+    }
+
+}
@@ -1,27 +0,0 @@
-package org.dromara.neutrinoproxy.server.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
-import org.noear.solon.annotation.Controller;
-import org.noear.solon.annotation.Get;
-import org.noear.solon.annotation.Inject;
-import org.noear.solon.annotation.Mapping;
-
-/**
- * @author: aoshiguchen
- * @date: 2023/4/2
- */
-@Slf4j
-@Mapping("/domain-name")
-@Controller
-public class DomainNameController {
-    @Inject
-    private ProxyConfig proxyConfig;
-
-    @Get
-    @Mapping("/bind-info")
-    public String bindInfo () {
-        return proxyConfig.getServer().getTcp().getDomainName();
-    }
-
-}
@@ -31,6 +31,8 @@ import org.dromara.neutrinoproxy.server.controller.res.proxy.*;
 import org.dromara.neutrinoproxy.server.service.LicenseService;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.noear.solon.annotation.*;
+import org.noear.solon.validation.annotation.Valid;
+import org.noear.solon.validation.annotation.Validated;

 import java.util.List;

@@ -39,6 +41,8 @@ import java.util.List;
 * @author: aoshiguchen
 * @date: 2022/8/6
 */
+
+@Valid
@Mapping("/license")
@Controller
 public class LicenseController {
@@ -70,6 +74,8 @@ public class LicenseController {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotEmpty(req.getName(), "name");
 		ParamCheckUtil.checkNotNull(req.getUserId(), "userId");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");

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

 		return licenseService.update(req);
 	}
@@ -97,18 +105,14 @@ public class LicenseController {
 	@Post
 	@Mapping("/update/enable-status")
 	@Authorization(onlyAdmin = true)
-	public LicenseUpdateEnableStatusRes updateEnableStatus(LicenseUpdateEnableStatusReq req) {
-		ParamCheckUtil.checkNotNull(req, "req");
-		ParamCheckUtil.checkNotNull(req.getId(), "id");
-		ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
-
+	public LicenseUpdateEnableStatusRes updateEnableStatus(@Validated LicenseUpdateEnableStatusReq req) {
 		return licenseService.updateEnableStatus(req);
 	}

 	@Post
 	@Mapping("/delete")
 	@Authorization(onlyAdmin = true)
-	public void delete(LicenseDeleteReq req) {
+	public void delete(@Validated LicenseDeleteReq req) {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotNull(req.getId(), "id");

@@ -43,16 +43,15 @@ public class PortMappingController {
        ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
        ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
        if (StringUtils.isBlank(req.getClientIp())) {
            // 没传客户端ip，默认为127.0.0.1
            req.setClientIp("127.0.0.1");
        }
        NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(req.getProtocal());
        ParamCheckUtil.checkNotNull(networkProtocolEnum, ExceptionConstant.AN_UNSUPPORTED_PROTOCOL, req.getProtocal());
-        if (networkProtocolEnum != NetworkProtocolEnum.HTTP) {
-            // 目前仅HTTP支持绑定域名
-			req.setSubdomain(null);
-        }
+
 		req.setProtocal(networkProtocolEnum.getDesc());
 		if (null == req.getProxyResponses()) {
 			req.setProxyResponses(0);
@@ -60,6 +59,9 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }

 		return portMappingService.create(req);
 	}
@@ -73,16 +75,15 @@ public class PortMappingController {
 		ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
 		ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
 		if (StringUtils.isBlank(req.getClientIp())) {
 			// 没传客户端ip，默认为127.0.0.1
 			req.setClientIp("127.0.0.1");
 		}
 		NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(req.getProtocal());
 		ParamCheckUtil.checkNotNull(networkProtocolEnum, ExceptionConstant.AN_UNSUPPORTED_PROTOCOL, req.getProtocal());
-		if (networkProtocolEnum != NetworkProtocolEnum.HTTP) {
-			// 目前仅HTTP支持绑定域名
-			req.setSubdomain(null);
-		}
+
 		req.setProtocal(networkProtocolEnum.getDesc());
 		if (null == req.getProxyResponses()) {
 			req.setProxyResponses(0);
@@ -90,6 +91,9 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }

        portMappingService.update(req);
 	}
@@ -1,20 +1,15 @@
 package org.dromara.neutrinoproxy.server.controller;

-import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupRes;
-import org.dromara.neutrinoproxy.server.controller.res.system.SecurityRuleRes;
-import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
-import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.controller.req.system.*;
+import org.dromara.neutrinoproxy.server.controller.res.system.*;
 import org.dromara.neutrinoproxy.server.service.PortMappingService;
 import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.noear.solon.annotation.*;

 import java.util.List;
-import java.util.stream.Collectors;

@Controller
@Mapping("/security")
@@ -30,16 +25,26 @@ public class SecurityController {
     * 获取当前用户权限下的安全组
     */
    @Get
-    @Mapping("/group/s")
-    public List<SecurityGroupRes> getGroups() {
-        List<SecurityGroupDO> groupDOList = groupService.queryGroupList();
-        return groupDOList.stream().map(SecurityGroupDO::toRes).collect(Collectors.toList());
+    @Mapping("/group/page")
+    public PageInfo<SecurityGroupListRes> groupPage(PageQuery pageQuery, SecurityGroupListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return groupService.groupPage(pageQuery, req);
    }

    @Get
-    @Mapping("/group/getOne")
-    public SecurityGroupRes getGroupOne(Integer groupId) {
-        return groupService.queryGroupOne(groupId).toRes();
+    @Mapping("/group/list")
+    public List<SecurityGroupListRes> groupList() {
+        return groupService.groupList();
+    }
+
+    @Get
+    @Mapping("/group/detail")
+    public SecurityGroupDetailRes groupDetail(SecurityGroupDetailReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+
+        return groupService.groupDetail(req);
    }

    @Post
@@ -61,26 +66,33 @@ public class SecurityController {
    @Post
    @Mapping("/group/delete")
    public void deleteGroup(Integer groupId) {
+        ParamCheckUtil.checkNotNull(groupId, "groupId");
+
        groupService.deleteGroup(groupId);
    }

    @Post
-    @Mapping("/group/enable")
-    public void enableGroup(Integer groupId) {
-        groupService.setGroupStatus(groupId, EnableStatusEnum.ENABLE);
-    }
+    @Mapping("/group/update/enable-status")
+    public SecurityGroupUpdateEnableStatueRes updateGroupEnableStatueReq(SecurityGroupUpdateEnableStatueReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");

-    @Post
-    @Mapping("/group/disable")
-    public void disableGroup(Integer groupId) {
-        groupService.setGroupStatus(groupId, EnableStatusEnum.DISABLE);
+        return groupService.updateGroupEnableStatueReq(req);
    }

    @Get
-    @Mapping("/rule/s")
-    public List<SecurityRuleRes> getRulesByGroupId(Integer groupId) {
-        List<SecurityRuleDO> ruleDOList = groupService.queryRuleListByGroupId(groupId);
-        return ruleDOList.stream().map(SecurityRuleDO::toRes).collect(Collectors.toList());
+    @Mapping("/rule/page")
+    public PageInfo<SecurityRuleListRes> rulePage(PageQuery pageQuery, SecurityRuleListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+
+        return groupService.rulePage(pageQuery, req);
+    }
+
+    @Get
+    @Mapping("/rule/list")
+    public List<SecurityRuleListRes> getRuleListByGroupId(SecurityRuleListReq req) {
+        return groupService.ruleList(req);
    }

    @Post
@@ -103,15 +115,13 @@ public class SecurityController {


    @Post
-    @Mapping("/rule/enable")
-    public void enableRule(Integer ruleId) {
-        groupService.setRuleStatus(ruleId, EnableStatusEnum.ENABLE);
-    }
+    @Mapping("/rule/update/enable-status")
+    public SecurityRuleUpdateEnableStatueRes updateRuleEnableStatueReq(SecurityRuleUpdateEnableStatueReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");

-    @Post
-    @Mapping("/rule/disable")
-    public void disableRule(Integer ruleId) {
-        groupService.setRuleStatus(ruleId, EnableStatusEnum.DISABLE);
+        return groupService.updateRuleEnableStatueReq(req);
    }

 }
@@ -38,4 +38,12 @@ public class LicenseCreateReq {
 	 * 用户ID
 	 */
 	private Integer userId;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }
@@ -1,6 +1,8 @@
 package org.dromara.neutrinoproxy.server.controller.req.proxy;

 import lombok.Data;
+import org.noear.solon.validation.annotation.Min;
+import org.noear.solon.validation.annotation.NotNull;

 /**
 * license删除请求
@@ -9,5 +11,7 @@ import lombok.Data;
 */
@Data
 public class LicenseDeleteReq {
+    @NotNull
+    @Min(value=2, message="服务端禁止删除")
    private Integer id;
 }
@@ -23,6 +23,7 @@ package org.dromara.neutrinoproxy.server.controller.req.proxy;

 import lombok.Data;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.noear.solon.validation.annotation.NotNull;

 /**
 * 更新启用状态请求
@@ -31,13 +32,15 @@ import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 */
@Data
 public class LicenseUpdateEnableStatusReq {
-	/**
-	 * id
-	 */
-	private Integer id;
+        /**
+         * id
+         */
+    @NotNull
+    private Integer id;
 	/**
 	 * 启用状态
 	 * {@link EnableStatusEnum}
 	 */
-	private Integer enable;
+    @NotNull
+    private Integer enable;
 }
@@ -38,4 +38,12 @@ public class LicenseUpdateReq {
 	 * license名称
 	 */
 	private String name;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }
@@ -38,10 +38,6 @@ public class PortMappingCreateReq {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */
@@ -54,6 +50,14 @@ public class PortMappingCreateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -22,6 +22,7 @@
 package org.dromara.neutrinoproxy.server.controller.req.proxy;

 import lombok.Data;
+import lombok.NonNull;

 /**
 * 端口映射更新启用状态请求
@@ -34,10 +35,12 @@ public class PortMappingUpdateEnableStatusReq {
 	/**
 	 * id
 	 */
+    @NonNull
 	private Integer id;
 	/**
 	 * 启用状态
 	 */
+    @NonNull
 	private Integer enable;

 }
@@ -42,10 +42,6 @@ public class PortMappingUpdateReq {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */
@@ -58,6 +54,14 @@ public class PortMappingUpdateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -18,6 +18,6 @@ public class SecurityGroupCreateReq {
    /**
     * 通过类型
     */
-    private SecurityRulePassTypeEnum defaultPassType;
+    private Integer defaultPassType;

 }
@@ -0,0 +1,12 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupDetailReq {
+    private Integer id;
+}
@@ -0,0 +1,22 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
+
+/**
+ * @author: wen.y
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupListReq {
+    private String name;
+    /**
+     * 描述
+     */
+    private String description;
+    /**
+     * 通过类型
+     */
+    private Integer defaultPassType;
+    private Integer enable;
+}
@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityGroupUpdateEnableStatueReq {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+}
@@ -47,7 +47,7 @@ public class SecurityRuleCreateReq {
     * 放行类型，reject 或 allow
     * {@link SecurityRulePassTypeEnum}
     */
-    private SecurityRulePassTypeEnum passType;
+    private Integer passType;

    /**
     * 优先级，数字越小，优先级越高
@@ -0,0 +1,16 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityRuleListReq {
+    private String groupId;
+    private String name;
+    private String description;
+    private Integer passType;
+    private Integer enable;
+}
@@ -0,0 +1,19 @@
+package org.dromara.neutrinoproxy.server.controller.req.system;
+
+import lombok.Data;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+@Data
+public class SecurityRuleUpdateEnableStatueReq {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 启用状态
+     */
+    private Integer enable;
+}
@@ -41,7 +41,7 @@ public class SecurityRuleUpdateReq {
     * 放行类型，reject 或 allow
     * {@link SecurityRulePassTypeEnum}
     */
-    private SecurityRulePassTypeEnum passType;
+    private Integer passType;

    /**
     * 优先级，数字越小，优先级越高
@@ -0,0 +1,31 @@
+package org.dromara.neutrinoproxy.server.controller.res.proxy;
+
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainMappingDO;
+
+/**
+ *
+ * @author xiaojie
+ * @date
+ */
+@Accessors(chain = true)
+@Data
+public class DomainMappingDto extends DomainMappingDO {
+
+    /**
+     * licenseId
+     */
+    private String licenseName;
+
+    /**
+     * 用户ID
+     */
+    private Integer userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+}
@@ -32,6 +32,14 @@ public class LicenseListRes {
 	 * 用户名
 	 */
 	private String userName;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 是否在线
 	 * {@link OnlineStatusEnum}
@@ -43,10 +43,6 @@ public class PortMappingListRes {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 域名
 	 */
@@ -75,6 +71,14 @@ public class PortMappingListRes {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 客户端端口
 	 */
@@ -5,11 +5,9 @@ import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;

-import java.util.Date;
-
@Data
@Accessors(chain = true)
-public class SecurityGroupRes {
+public class SecurityGroupDetailRes {

    private Integer id;

@@ -27,13 +25,13 @@ public class SecurityGroupRes {
     * 启用状态
     * {@link EnableStatusEnum}
     */
-    private String enable;
+    private Integer enable;

    /**
     * 默认放行类型
     * {@link SecurityRulePassTypeEnum}
     */
-    private String defaultPassType;
+    private Integer defaultPassType;

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

 import java.util.Date;
@@ -11,7 +10,7 @@ import java.util.Date;
@Data
@ToString
@Accessors(chain = true)
-public class SecurityRuleRes {
+public class SecurityRuleListRes {

    private Integer id;

@@ -44,7 +43,7 @@ public class SecurityRuleRes {
     * 放行类型，reject 或 allow
     * {@link SecurityRulePassTypeEnum}
     */
-    private String passType;
+    private Integer passType;

    /**
     * 优先级，数字越小，优先级越高
@@ -54,15 +53,15 @@ public class SecurityRuleRes {
    /**
     * 启用状态
     */
-    private String enable;
+    private Integer enable;

    /**
     * 创建时间
     */
-    private String createTime;
+    private Date createTime;
    /**
     * 更新时间
     */
-    private String updateTime;
+    private Date updateTime;

 }
@@ -0,0 +1,8 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+public class SecurityRuleUpdateEnableStatueRes {
+}
@@ -0,0 +1,79 @@
+package org.dromara.neutrinoproxy.server.dal;
+
+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.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainMappingDto;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainMappingDO;
+import org.dromara.neutrinoproxy.server.dal.entity.DomainMappingDO;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+
+/**
+ *
+ * @author: aoshiguchen
+ * @date: 2022/8/8
+ */
+@Mapper
+public interface DomainMappingMapper extends BaseMapper<DomainMappingDO> {
+
+	default DomainMappingDO findById(Integer id) {
+		return this.selectById(id);
+	}
+
+	default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+		this.update(null, new LambdaUpdateWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getId, id)
+				.set(DomainMappingDO::getEnable, enable)
+				.set(DomainMappingDO::getUpdateTime, updateTime)
+		);
+	}
+
+	default DomainMappingDO findByDomain(String domain, Set<Integer> excludeIds) {
+		return this.selectOne(new LambdaQueryWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getDomain, domain)
+				.notIn(!CollectionUtil.isEmpty(excludeIds), DomainMappingDO::getId, excludeIds)
+				.last("limit 1")
+		);
+	}
+
+
+	default List<DomainMappingDO> findEnableListByLicenseId(Integer licenseId) {
+		return this.selectList(new LambdaQueryWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getLicenseId, licenseId)
+				.eq(DomainMappingDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
+		);
+	}
+
+	default List<DomainMappingDO> findListByServerPort(String domain) {
+		return this.selectList(new LambdaQueryWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getDomain, domain)
+		);
+	}
+
+	default List<DomainMappingDO> findListByLicenseId(Integer licenseId) {
+		return this.selectList(new LambdaQueryWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getLicenseId, licenseId)
+		);
+	}
+
+	default DomainMappingDO findByLicenseIdAndServerPort(Integer licenseId, String domain) {
+		return this.selectOne(new LambdaQueryWrapper<DomainMappingDO>()
+				.eq(DomainMappingDO::getLicenseId, licenseId)
+				.eq(DomainMappingDO::getDomain, domain)
+				.last("limit 1")
+		);
+	}
+
+
+	List<DomainMappingDO> selectDomainMappingByCondition(IPage<DomainMappingDO> page, @Param("req") DomainMappingDto req);
+}
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;

 import java.util.Date;
 import java.util.List;
@@ -64,16 +65,18 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {

    default void updateOnlineStatus(Integer id, Integer isOnline, Date updateTime) {
        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-                .eq(LicenseDO::getId, id)
-                .set(LicenseDO::getIsOnline, isOnline)
-                .set(LicenseDO::getUpdateTime, updateTime)
+            .eq(LicenseDO::getId, id)
+            .set(LicenseDO::getIsOnline, isOnline)
+            .set(LicenseDO::getUpdateTime, updateTime)
        );
    }

+
+//            .ne(LicenseDO::getId, 1)
    default void updateOnlineStatus(Integer isOnline, Date updateTime) {
        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-                .set(LicenseDO::getIsOnline, isOnline)
-                .set(LicenseDO::getUpdateTime, updateTime)
+            .set(LicenseDO::getIsOnline, isOnline)
+            .set(LicenseDO::getUpdateTime, updateTime)
        );
    }

@@ -89,14 +92,6 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
        return this.selectById(id);
    }

-    default void update(Integer id, String name, Date updateTime) {
-        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-                .eq(LicenseDO::getId, id)
-                .set(LicenseDO::getName, name)
-                .set(LicenseDO::getUpdateTime, updateTime)
-        );
-    }
-
    default List<LicenseDO> findByIds(Set<Integer> ids) {
        return selectBatchIds(ids);
    }
@@ -123,4 +118,8 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
                .eq(LicenseDO::getKey, licenseKey)
        );
    }
+
+    List<ProxyMapping> findEnableProxyMappingListByLicenseId(Integer licenseId);
+
+    List<ProxyMapping> findAllProxyMappingListByLicenseId(Integer licenseId);
 }
@@ -44,18 +44,6 @@ public interface PortMappingMapper extends BaseMapper<PortMappingDO> {
 		);
 	}

-	/**
-	 * 校验子域名是否重复
-	 * @param subdomain
-	 * @return
-	 */
-	default Boolean checkRepeatBySubdomain(String subdomain, Set<Integer> excludeIds) {
-		return StringUtils.isEmpty(subdomain)? Boolean.FALSE : this.selectCount(new LambdaQueryWrapper<PortMappingDO>()
-				.eq(PortMappingDO::getSubdomain, subdomain)
-				.notIn(!CollectionUtil.isEmpty(excludeIds), PortMappingDO::getId, excludeIds)
-		).intValue() > 0;
-	}
-
 	default List<PortMappingDO> findEnableListByLicenseId(Integer licenseId) {
 		return this.selectList(new LambdaQueryWrapper<PortMappingDO>()
 				.eq(PortMappingDO::getLicenseId, licenseId)
@@ -1,7 +1,25 @@
 package org.dromara.neutrinoproxy.server.dal;

+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupListReq;
+import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;

+import java.util.Date;
+import java.util.List;
+
 public interface SecurityGroupMapper extends BaseMapper<SecurityGroupDO> {
+    List<SecurityGroupDO> selectByCondition(IPage<SecurityGroupDO> page, @Param("req") SecurityGroupListReq req);
+
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<SecurityGroupDO>()
+            .eq(SecurityGroupDO::getId, id)
+            .set(SecurityGroupDO::getEnable, enable)
+            .set(SecurityGroupDO::getUpdateTime, updateTime)
+        );
+    }
 }
@@ -1,7 +1,25 @@
 package org.dromara.neutrinoproxy.server.dal;

+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupListReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleListReq;
+import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;

+import java.util.Date;
+import java.util.List;
+
 public interface SecurityRuleMapper extends BaseMapper<SecurityRuleDO> {
+    List<SecurityRuleDO> selectByCondition(IPage<SecurityRuleDO> page, @Param("req") SecurityRuleListReq req);
+
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<SecurityRuleDO>()
+                .eq(SecurityRuleDO::getId, id)
+                .set(SecurityRuleDO::getEnable, enable)
+                .set(SecurityRuleDO::getUpdateTime, updateTime)
+        );
+    }
 }
@@ -0,0 +1,120 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.dromara.neutrinoproxy.server.dal.entity;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainMappingDto;
+import org.noear.solon.validation.annotation.NotBlank;
+import org.noear.solon.validation.annotation.NotNull;
+import org.noear.solon.validation.annotation.Pattern;
+
+import java.util.Date;
+
+/**
+ * 端口映射
+ * @author: aoshiguchen
+ * @date: 2022/8/8
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@TableName("domain_mapping")
+public class DomainMappingDO {
+	@TableId(type = IdType.AUTO)
+	private Integer id;
+	/**
+	 * licenseId
+	 */
+    @NotNull
+	private Integer licenseId;
+	/**
+	 * 协议
+	 */
+	private String protocal;
+	/**
+	 * 域名 /^(\w+\.{1}\w+)$/g
+	 */
+    @NotBlank
+    @Pattern("^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$")
+	private String domain;
+    /**
+     * 描述
+     */
+    private String description;
+	/**
+	 * 目标地址（licenseId客户端，ip:port）
+	 */
+    @NotBlank
+    private String targetPath;
+
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
+
+	/**
+	 * 是否在线
+	 * {@link OnlineStatusEnum}
+	 */
+    @TableField(exist=false)
+	private Integer isOnline;
+
+	/**
+	 * 启用状态
+	 * {@link EnableStatusEnum}
+	 */
+	private Integer enable;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId = 0; // 设置为null不生效，不知道为啥
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+
+    public DomainMappingDto toRes() {
+        DomainMappingDto dto = new DomainMappingDto();
+        BeanUtil.copyProperties(this, dto);
+        return dto;
+    }
+
+}
@@ -21,6 +21,7 @@
 */
 package org.dromara.neutrinoproxy.server.dal.entity;

+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -59,6 +60,14 @@ public class LicenseDO {
 	 * 用户ID
 	 */
 	private Integer userId;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 是否在线
 	 * {@link OnlineStatusEnum}
@@ -78,16 +87,26 @@ public class LicenseDO {
 	 */
 	private Date updateTime;

+
+    public LicenseDO() {
+    }
+
+    public LicenseDO(Integer id, String name, String key, Integer userId, String upLimitRate, String downLimitRate, Integer isOnline, Integer enable, Date createTime, Date updateTime) {
+        this.id = id;
+        this.name = name;
+        this.key = key;
+        this.userId = userId;
+        this.upLimitRate = upLimitRate;
+        this.downLimitRate = downLimitRate;
+        this.isOnline = isOnline;
+        this.enable = enable;
+        this.createTime = createTime;
+        this.updateTime = 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);
+        BeanUtil.copyProperties(this, res);
        return res;
    }
 }
@@ -31,6 +31,7 @@ import lombok.Data;
 import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
+import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;

 import java.util.Date;

@@ -54,10 +55,6 @@ public class PortMappingDO {
 	 * 协议
 	 */
 	private String protocal;
-	/**
-	 * 子域名
-	 */
-	private String subdomain;
 	/**
 	 * 服务端端口
 	 */
@@ -70,6 +67,14 @@ public class PortMappingDO {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 描述
 	 */
@@ -113,4 +118,5 @@ public class PortMappingDO {
        BeanUtil.copyProperties(this, res);
        return res;
    }
+
 }
@@ -11,7 +11,8 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
-import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupDetailRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupListRes;

 import java.util.Date;

@@ -38,18 +39,17 @@ public class SecurityGroupDO {
     * 用户id
     */
    private Integer userId;
-
    /**
     * 启用状态
     * {@link EnableStatusEnum}
     */
-    private EnableStatusEnum enable;
+    private Integer enable;

    /**
     * 默认放行类型
     * {@link SecurityRulePassTypeEnum}
     */
-    private SecurityRulePassTypeEnum defaultPassType;
+    private Integer defaultPassType;

    /**
     * 创建时间
@@ -60,15 +60,15 @@ public class SecurityGroupDO {
     */
    private Date updateTime;

-    public SecurityGroupRes toRes() {
-        SecurityGroupRes res = new SecurityGroupRes();
+    public SecurityGroupListRes toListRes() {
+        SecurityGroupListRes res = new SecurityGroupListRes();
        BeanUtil.copyProperties(this, res);
-        res.setEnable(enable.getDesc())
-            .setDefaultPassType(defaultPassType.getDesc())
-            .setCreateTime(DateUtil.format(this.getCreateTime(), DatePattern.NORM_DATETIME_FORMAT))
-            .setUpdateTime(DateUtil.format(this.getUpdateTime(), DatePattern.NORM_DATETIME_FORMAT));
        return res;
    }

-
+    public SecurityGroupDetailRes toDetailRes() {
+        SecurityGroupDetailRes res = new SecurityGroupDetailRes();
+        BeanUtil.copyProperties(this, res);
+        return res;
+    }
 }
@@ -1,8 +1,6 @@
 package org.dromara.neutrinoproxy.server.dal.entity;

 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.net.Ipv4Util;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -13,7 +11,7 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
-import org.dromara.neutrinoproxy.server.controller.res.system.SecurityRuleRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityRuleListRes;

 import java.util.Date;

@@ -55,7 +53,7 @@ public class SecurityRuleDO {
     * 放行类型，reject 或 allow
     * {@link SecurityRulePassTypeEnum}
     */
-    private SecurityRulePassTypeEnum passType;
+    private Integer passType;

    /**
     * 优先级，数字越小，优先级越高
@@ -71,7 +69,7 @@ public class SecurityRuleDO {
     * 启用状态
     * {@link EnableStatusEnum}
     */
-    private EnableStatusEnum enable;
+    private Integer enable;
    /**
     * 创建时间
     */
@@ -113,7 +111,7 @@ public class SecurityRuleDO {
            // 单个ip,ipv6在此步已处理，后面不需要额外判断ipv6的情况
            if (rule.matches("(\\d+\\.){3}\\d+") || isIpv6) {
                if (rule.equalsIgnoreCase(ip)) {
-                    return passType == SecurityRulePassTypeEnum.ALLOW ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
                }
            }

@@ -121,7 +119,7 @@ public class SecurityRuleDO {
            if (rule.matches("(\\d+\\.){3}\\d+-(\\d+\\.){3}\\d+")) {
                String[] ipRange = rule.split("-");
                if (ipRange[0].compareTo(ip) <= 0 && ip.compareTo(ipRange[1]) <= 0) {
-                    return passType == SecurityRulePassTypeEnum.ALLOW ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
                }
            }

@@ -131,12 +129,12 @@ public class SecurityRuleDO {
                Long beginIp = Ipv4Util.getBeginIpLong(netIp[0], Integer.parseInt(netIp[1]));
                Long endIp = Ipv4Util.getEndIpLong(netIp[0], Integer.parseInt(netIp[1]));
                if (beginIp <= ipLong && ipLong <= endIp) {
-                    return passType == SecurityRulePassTypeEnum.ALLOW ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                    return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
                }
            }

            if (rule.equalsIgnoreCase("ALL") || rule.equals("0.0.0.0") || rule.equals("0.0.0.0/0")) {
-                return passType == SecurityRulePassTypeEnum.ALLOW ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
+                return SecurityRulePassTypeEnum.ALLOW.getType().equals(passType) ? SecurityRulePassTypeEnum.ALLOW : SecurityRulePassTypeEnum.DENY;
            }

        }
@@ -145,14 +143,9 @@ public class SecurityRuleDO {
        return SecurityRulePassTypeEnum.NONE;
    }

-    public SecurityRuleRes toRes() {
-        SecurityRuleRes res = new SecurityRuleRes();
+    public SecurityRuleListRes toListRes() {
+        SecurityRuleListRes res = new SecurityRuleListRes();
        BeanUtil.copyProperties(this, res);
-        res.setPassType(this.passType.getDesc())
-            .setEnable(this.getEnable().getDesc())
-            .setCreateTime(DateUtil.format(this.getCreateTime(), DatePattern.NORM_DATETIME_FORMAT))
-            .setUpdateTime(DateUtil.format(this.getUpdateTime(), DatePattern.NORM_DATETIME_FORMAT))
-        ;
        return res;
    }

@@ -13,7 +13,7 @@ import org.noear.solon.annotation.Component;
@Slf4j
@Component
@JobHandler(name = "DemoJob", cron = "0/10 * * * * ?", param = "{\"a\":1}")
-public class DemoJob implements IJobHandler {
+public class  DemoJob implements IJobHandler {

 	@Override
 	public void execute(String param) throws Exception {
@@ -63,9 +63,9 @@ public class ProxyTunnelServer implements EventListener<AppLoadEndEvent> {
 		});
 		try {
 			bootstrap.bind(proxyConfig.getTunnel().getPort()).sync();
-			log.info("proxy server started，port：{}", proxyConfig.getTunnel().getPort());
+			log.info("ProxyTunnelServer，port：{}", proxyConfig.getTunnel().getPort());
 		} catch (Exception e) {
-			log.error("proxy server error", e);
+			log.error("ProxyTunnelServer error", e);
 		}
 	}

@@ -84,9 +84,9 @@ public class ProxyTunnelServer implements EventListener<AppLoadEndEvent> {
 		});
 		try {
 			bootstrap.bind(proxyConfig.getTunnel().getSslPort()).sync();
-			log.info("proxy server started，SSL port： {}", proxyConfig.getTunnel().getSslPort());
+			log.info("ProxyTunnelServer，SSL port： {}", proxyConfig.getTunnel().getSslPort());
 		} catch (Exception e) {
-			log.error("proxy server error", e);
+			log.error("ProxyTunnelServer error", e);
 		}
 	}

@@ -9,15 +9,11 @@ import io.netty.channel.SimpleChannelInboundHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.util.IpUtil;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
 import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
-import org.dromara.neutrinoproxy.server.service.PortMappingService;
-import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.noear.solon.Solon;
-import org.noear.solon.annotation.Inject;

 import java.net.InetSocketAddress;

@@ -29,10 +25,6 @@ import java.net.InetSocketAddress;
@Slf4j
 public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {

-    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
-
-    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
-
    @Override
    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
        // 当出现异常就关闭连接
@@ -51,21 +43,13 @@ public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBu
            ctx.channel().close();
            return;
        }
-
-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
-        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
-        }
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);

        // 代理通道可写，则设置访问通道可读。代理通道不可写，则设置访问通道不可读
        visitorChannel.config().setAutoRead(proxyChannel.isWritable());

        // 转发代理数据
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.readBytes(bytes);
        String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
        proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(visitorId, bytes));

@@ -79,13 +63,6 @@ public class TcpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBu
        Channel visitorChannel = ctx.channel();
        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();

-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
-        }
-
        Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(sa.getPort());
        if (null == cmdChannel) {
            // 该端口还没有代理客户端
@@ -7,22 +7,16 @@ import io.netty.channel.ChannelOption;
 import io.netty.channel.SimpleChannelInboundHandler;
 import io.netty.channel.socket.DatagramPacket;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.util.IpUtil;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
 import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
 import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
-import org.dromara.neutrinoproxy.server.service.PortMappingService;
-import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.noear.solon.Solon;
-import org.noear.solon.annotation.Inject;

 import java.net.InetSocketAddress;
-import java.nio.charset.StandardCharsets;

 /**
 * @author: aoshiguchen
@@ -31,21 +25,11 @@ import java.nio.charset.StandardCharsets;
@Slf4j
 public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler<DatagramPacket> {

-    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
-
-    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
-
    @Override
    protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket datagramPacket) throws Exception {
-        log.debug("chid>>>{}", ctx.channel().id().asLongText());
        Channel visitorChannel = ctx.channel();
        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();

-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        if (!securityGroupService.judgeAllow(datagramPacket.sender().getAddress().getHostAddress(), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
-            return;
-        }
-
        byte[] bytes = new byte[datagramPacket.content().readableBytes()];
        datagramPacket.content().readBytes(bytes);
        datagramPacket.content().resetReaderIndex();
@@ -81,12 +65,6 @@ public class UdpVisitorChannelHandler extends SimpleChannelInboundHandler<Datagr
            Solon.context().getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), bytes.length);
        });

-//        String visitorId = ProxyUtil.getVisitorIdByChannel(ctx.channel());
-//        if (StringUtils.isNotBlank(visitorId)) {
-//            // UDP代理隧道已就绪，直接转发
-//            proxyAttachment.execute();
-//            return;
-//        }
        Channel proxyChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
        if (null != proxyChannel && proxyChannel.isActive()) {
            // UDP代理隧道已就绪，直接转发
@@ -0,0 +1,39 @@
+package org.dromara.neutrinoproxy.server.proxy.domain;
+
+import lombok.Data;
+
+/**
+ * @author xiaojie
+ * @date
+ */
+@Data
+public class DomainMapping {
+
+    /**
+     * domainMapping 主键id
+     */
+    private Integer id;
+    /**
+     * License
+     */
+    private Integer licenseId;
+    /**
+     * 客户端信息 IP:port
+     */
+    private String domain;
+    /**
+     * 目标地址（其中含有\n隔离多个 目标地址）
+     */
+    private String targetPath;
+
+
+    public DomainMapping() {
+    }
+
+    public DomainMapping(Integer id, Integer licenseId, String domain, String targetPath) {
+        this.id = id;
+        this.licenseId = licenseId;
+        this.domain = domain;
+        this.targetPath = targetPath;
+    }
+}
@@ -16,6 +16,10 @@ import java.util.List;
@Accessors(chain = true)
@Data
 public class ProxyMapping {
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
 	/**
 	 * 服务端端口
 	 */
@@ -24,8 +28,23 @@ public class ProxyMapping {
 	 * 客户端信息 IP:port
 	 */
 	private String lanInfo;
+    /**
+     * 协议
+     */
+    private String protocal;

-	public static List<ProxyMapping> buildList(List<PortMappingDO> portMappingList) {
+
+    public ProxyMapping() {
+    }
+
+    public ProxyMapping(Integer licenseId, Integer serverPort, String lanInfo, String protocal) {
+        this.licenseId = licenseId;
+        this.serverPort = serverPort;
+        this.lanInfo = lanInfo;
+        this.protocal = protocal;
+    }
+
+    public static List<ProxyMapping> buildList(List<PortMappingDO> portMappingList) {
 		List<ProxyMapping> list = new ArrayList<>();
 		if (CollectionUtil.isEmpty(portMappingList)) {
 			return list;
@@ -38,8 +57,13 @@ public class ProxyMapping {

 	public static ProxyMapping build(PortMappingDO portMappingDO) {
 		return new ProxyMapping()
-				.setServerPort(portMappingDO.getServerPort())
-				.setLanInfo(String.format("%s:%s", portMappingDO.getClientIp(), portMappingDO.getClientPort()));
+            .setLicenseId(portMappingDO.getLicenseId())
+            .setServerPort(portMappingDO.getServerPort())
+            .setLanInfo(String.format("%s:%s", portMappingDO.getClientIp(), portMappingDO.getClientPort()))
+            .setProtocal(portMappingDO.getProtocal());
 	}
+
+
+
 }

@@ -1,8 +1,9 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;

-import cn.hutool.core.util.StrUtil;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
@@ -10,14 +11,16 @@ import io.netty.handler.logging.LoggingHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
-import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;

 /**
- * HTTP代理
+ * 应用加载完成事件（即启动完成）- 判断是否配置域名-配置了域名则启动HTTP代理
+ * 默认端口 80
 * @author: aoshiguchen
 * @date: 2023/4/2
 */
@@ -26,33 +29,55 @@ import org.noear.solon.core.event.EventListener;
 public class HttpProxy implements EventListener<AppLoadEndEvent> {
    @Inject
    private ProxyConfig proxyConfig;
+
+    /**
+     * NioServerSocketChannel对应的future
+     */
+    protected ChannelFuture httpFuture;
    @Override
    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName()) || null == proxyConfig.getServer().getTcp().getHttpProxyPort()) {
+        if (null == proxyConfig.getServer().getTcp().getHttpProxyPort()) {
            log.info("no config domain name,nonsupport http proxy.");
            return;
        }
+
        this.start();
    }

    private void start() {
+        // 处理网络连接---接受请求
+        EventLoopGroup bossGroup = new NioEventLoopGroup(1);
+        // 进行socketChannel的网络读写
+        EventLoopGroup workerGroup = new NioEventLoopGroup();
        try {
            ServerBootstrap bootstrap = new ServerBootstrap();
-            bootstrap.group(new NioEventLoopGroup(1), new NioEventLoopGroup())
-                    .channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
-                        @Override
-                        public void initChannel(SocketChannel ch) throws Exception {
-                            if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
-                                ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
-                            }
-                            ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
-                        }
-                    });
-            bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync();
-            log.info("Http proxy server start success！port:{}", proxyConfig.getServer().getTcp().getHttpProxyPort());
+            bootstrap.group(bossGroup, workerGroup)
+                .channel(NioServerSocketChannel.class)
+                .childHandler(new ChannelInitializer<SocketChannel>() {
+                    @Override
+                    public void initChannel(SocketChannel ch) throws Exception {
+                    if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() &&
+                        proxyConfig.getServer().getTcp().getTransferLogEnable()) {
+                        ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
+                    }
+                    ch.pipeline().addFirst(new BytesMetricsHandler())
+                        .addLast(new HttpVisitorSecurityChannelHandler())
+                        .addLast("flowLimiter",new VisitorFlowLimiterChannelHandler())
+                        .addLast(new HttpVisitorChannelHandler());
+                    }
+                });
+            httpFuture = bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync();
+            log.info("Http proxy server started success！port:{}", proxyConfig.getServer().getTcp().getHttpProxyPort());
+            //添加关闭重启的监听器，3秒后尝试重启
+//            httpFuture.channel().closeFuture().addListener(genericFutureListener);
+//            httpFuture.channel().closeFuture().sync();
        } catch (Exception e) {
            log.error("http proxy start err!", e);
+        } finally {
+//            bossGroup.shutdownGracefully();
+//            workerGroup.shutdownGracefully();
+//            httpFuture.channel().close();
        }
    }
+
 }
@@ -1,6 +1,5 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;

-import cn.hutool.core.util.StrUtil;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
@@ -10,49 +9,29 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.ProxyMessage;
-import org.dromara.neutrinoproxy.core.util.IpUtil;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
 import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
 import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
 import org.dromara.neutrinoproxy.server.service.FlowReportService;
-import org.dromara.neutrinoproxy.server.service.PortMappingService;
-import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.noear.solon.Solon;
-import org.noear.solon.annotation.Inject;

 import java.net.InetSocketAddress;

 /**
+ * HTTP 访客处理器
 * @author: aoshiguchen
 * @date: 2023/5/27
 */
@Slf4j
 public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {

-    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
-
-    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
-
-    /**
-     * 域名
-     */
-    private String domainName;
-
-    public HttpVisitorChannelHandler(String domainName) {
-        this.domainName = domainName;
-    }
-
    @Override
    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
-        if (StrUtil.isBlank(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-
        byte[] bytes = new byte[byteBuf.readableBytes()];
        byteBuf.readBytes(bytes);
        byteBuf.resetReaderIndex();
+
        ProxyAttachment proxyAttachment = new ProxyAttachment(ctx.channel(), bytes, (channel, buf) -> {
            Channel proxyChannel = channel.attr(Constants.NEXT_CHANNEL).get();
            if (null == proxyChannel) {
@@ -60,14 +39,11 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
                ctx.channel().close();
                return;
            }
-
            proxyChannel.writeAndFlush(ProxyMessage.buildTransferMessage(ProxyUtil.getVisitorIdByChannel(channel), bytes));
-
            // 增加流量计数
            VisitorChannelAttachInfo visitorChannelAttachInfo = ProxyUtil.getAttachInfo(channel);
            Solon.context().getBean(FlowReportService.class).addWriteByte(visitorChannelAttachInfo.getLicenseId(), bytes.length);
        });
-
        String visitorId = ProxyUtil.getVisitorIdByChannel(ctx.channel());
        if (StringUtils.isNotBlank(visitorId)) {
            proxyAttachment.execute();
@@ -76,35 +52,10 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB

        // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
        ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);
-
-        String host = getHost(bytes);
-        log.debug("HttpProxy host: {}", host);
-        if (StringUtils.isBlank(host)) {
-            ctx.channel().close();
-            return;
-        }
-        if (!host.endsWith(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-        int index = host.lastIndexOf("." + domainName);
-        String subdomain = host.substring(0, index);
-
        // 根据域名拿到绑定的映射对应的cmdChannel
-        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
-        if (null == serverPort) {
-            ctx.channel().close();
-            return;
-        }
-
-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
-        }
-
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
        Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(serverPort);
+
        if (null == cmdChannel) {
            ctx.channel().close();
            return;
@@ -114,7 +65,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
            ctx.channel().close();
            return;
        }
-
        visitorId = ProxyUtil.newVisitorId();
        ProxyUtil.addVisitorChannelToCmdChannel(NetworkProtocolEnum.HTTP, cmdChannel, visitorId, ctx.channel(), serverPort);
        ProxyUtil.addProxyConnectAttachment(visitorId, proxyAttachment);
@@ -123,7 +73,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB

    @Override
    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-
        // 通知代理客户端
        Channel visitorChannel = ctx.channel();
        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
@@ -133,7 +82,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
            // 该端口还没有代理客户端
            ctx.channel().close();
        } else {
-
            // 用户连接断开，从控制连接中移除
            String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
            ProxyUtil.removeVisitorChannelFromCmdChannel(cmdChannel, visitorId);
@@ -167,23 +115,15 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
        ctx.close();
    }

-    private String getHost(byte[] buf) {
-        String req = new String(buf);
-        String[] lines = req.split("\r\n");
-        String firstLine = lines[0];
-        if (!(firstLine.endsWith("HTTP/1.1") || firstLine.endsWith("HTTP/1.0"))) {
-            return null;
+    @Override
+    public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
+
+        // 通知代理客户端
+        Channel visitorChannel = ctx.channel();
+        Channel proxyChannel = visitorChannel.attr(Constants.NEXT_CHANNEL).get();
+        if (null != proxyChannel) {
+            proxyChannel.config().setOption(ChannelOption.AUTO_READ, visitorChannel.isWritable());
        }
-        for (int i = 1; i < lines.length; i++) {
-            String line = lines[i];
-            if (!line.startsWith("Host: ")) {
-                continue;
-            }
-            // 域名
-            String domain = line.substring(6);
-            // 去掉域名后面的端口号
-            return domain.replaceAll(":.*", "");
-        }
-        return null;
+        super.channelWritabilityChanged(ctx);
    }
 }
@@ -1,8 +1,10 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;

-import cn.hutool.core.util.StrUtil;
 import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.*;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
@@ -13,18 +15,23 @@ import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
-import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;

-import javax.net.ssl.*;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
 import java.io.InputStream;
 import java.security.KeyStore;

 /**
- * HTTPS代理
+ * 应用加载完成事件（即启动完成）- 判断是否配置域名-配置了域名则启动HTTPS代理
+ * 默认端口 443
 * @author: aoshiguchen
 * @date: 2023/4/2
 */
@@ -33,10 +40,15 @@ import java.security.KeyStore;
 public class HttpsProxy implements EventListener<AppLoadEndEvent> {
    @Inject
    private ProxyConfig proxyConfig;
+    /**
+     * NioServerSocketChannel对应的future
+     */
+    private ChannelFuture httpsFuture;
    @Override
    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName()) || null == proxyConfig.getServer().getTcp().getHttpsProxyPort() ||
-                StringUtils.isEmpty(proxyConfig.getServer().getTcp().getJksPath()) || StringUtils.isEmpty(proxyConfig.getServer().getTcp().getKeyStorePassword())) {
+        if (null == proxyConfig.getServer().getTcp().getHttpsProxyPort() ||
+            StringUtils.isEmpty(proxyConfig.getServer().getTcp().getJksPath()) ||
+            StringUtils.isEmpty(proxyConfig.getServer().getTcp().getKeyStorePassword())) {
            log.info("no config domain name,nonsupport https proxy.");
            return;
        }
@@ -44,24 +56,38 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
    }

    private void start() {
+        // 处理网络连接---接受请求
+        EventLoopGroup bossGroup = new NioEventLoopGroup(1);
+        // 进行socketChannel的网络读写
+        EventLoopGroup workerGroup = new NioEventLoopGroup();
        try {
            ServerBootstrap bootstrap = new ServerBootstrap();
-            bootstrap.group(new NioEventLoopGroup(1), new NioEventLoopGroup())
-                    .channel(NioServerSocketChannel.class).childHandler(new ChannelInitializer<SocketChannel>() {
-                        @Override
-                        public void initChannel(SocketChannel ch) throws Exception {
-                            if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
-                                ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class));
-                            }
-                            ch.pipeline().addLast(createSslHandler());
-                            ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
-                        }
-                    });
-            bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync();
+            bootstrap.group(bossGroup, workerGroup);
+            bootstrap.channel(NioServerSocketChannel.class);
+            bootstrap.childHandler(new ChannelInitializer<SocketChannel>() {
+                @Override
+                public void initChannel(SocketChannel ch) throws Exception {
+                    if (null != proxyConfig.getServer().getTcp().getTransferLogEnable() && proxyConfig.getServer().getTcp().getTransferLogEnable()) {
+                        ch.pipeline().addFirst(new LoggingHandler(HttpsProxy.class));
+                    }
+                    ch.pipeline().addLast(createSslHandler())
+                        .addFirst(new BytesMetricsHandler())
+                        .addLast(new HttpVisitorSecurityChannelHandler())
+                        .addLast("flowLimiter", new VisitorFlowLimiterChannelHandler())
+                        .addLast(new HttpVisitorChannelHandler());
+                }
+            });
+            httpsFuture = bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync();
            log.info("Https proxy server started！port:{}", proxyConfig.getServer().getTcp().getHttpsProxyPort());
+            //添加关闭重启的监听器，3秒后尝试重启
+//            httpsFuture.channel().closeFuture().addListener(genericFutureListener);
+//            httpsFuture.channel().closeFuture().sync();
        } catch (Exception e) {
            log.error("https proxy start err!", e);
+        } finally {
+//            bossGroup.shutdownGracefully();
+//            workerGroup.shutdownGracefully();
+//            httpsFuture.channel().close();
        }
    }

@@ -24,7 +24,6 @@ package org.dromara.neutrinoproxy.server.proxy.handler;

 import cn.hutool.core.util.StrUtil;
 import org.dromara.neutrinoproxy.core.*;
-import org.dromara.neutrinoproxy.core.*;
 import org.dromara.neutrinoproxy.core.dispatcher.Match;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.constant.ClientConnectTypeEnum;
@@ -90,7 +89,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {

 		if (StrUtil.isEmpty(licenseKey)) {
 			log.warn("[client connection] license cannot empty info:{} ", info);
-			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不能为空!", licenseKey));
+			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license cannot be empty!", licenseKey));
 			ctx.channel().close();
 			clientConnectRecordService.add(new ClientConnectRecordDO()
 					.setIp(ip)
@@ -105,7 +104,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {
 		LicenseDO licenseDO = licenseService.findByKey(licenseKey);
 		if (null == licenseDO) {
 			log.warn("[client connection] license notfound info:{} ", info);
-			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license不存在!", licenseKey));
+			ctx.channel().writeAndFlush(ProxyMessage.buildAuthResultMessage(ExceptionEnum.AUTH_FAILED.getCode(), "license not found!", licenseKey));
 			ctx.channel().close();
 			clientConnectRecordService.add(new ClientConnectRecordDO()
 					.setIp(ip)
@@ -82,7 +82,8 @@ public class ProxyMessageConnectHandler implements ProxyMessageHandler {
 		ctx.channel().attr(Constants.LICENSE_ID).set(licenseDO.getId());
 		ctx.channel().attr(Constants.NEXT_CHANNEL).set(visitorChannel);
 		visitorChannel.attr(Constants.NEXT_CHANNEL).set(ctx.channel());
-		// 代理客户端与后端服务器连接成功，修改用户连接为可读状态
+        visitorChannel.attr(Constants.LICENSE_ID).set(licenseDO.getId());
+        // 代理客户端与后端服务器连接成功，修改用户连接为可读状态
 		visitorChannel.config().setOption(ChannelOption.AUTO_READ, true);

 		// 获取代理附加对象
@@ -0,0 +1,71 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.HttpUtil;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.proxy.domain.DomainMapping;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.solon.Solon;
+
+/**
+ * HTTP 访问安全检测
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        ByteBuf buf = (ByteBuf) msg;
+
+        Integer domainId = ctx.channel().attr(Constants.SERVER_PORT).get();
+        if (null == domainId) {
+            // 获取Host请求头
+            byte[] bytes = new byte[buf.readableBytes()];
+            buf.readBytes(bytes);
+            String httpContent = new String(bytes);
+            String domain = HttpUtil.getHostIgnorePort(httpContent);
+
+            log.debug("HttpProxy host: {}", domain);
+            if (StringUtils.isBlank(domain)) {
+                ctx.channel().close();
+                return;
+            }
+            // 未配置域名解析，不再解析
+            if (!ProxyUtil.domainMapingMap.containsKey(domain)) {
+                ctx.channel().close();
+                return;
+            }
+            DomainMapping dm = ProxyUtil.domainMapingMap.get(domain);
+
+            // 判断IP是否在该端口绑定的安全组允许的规则内
+            String ip = IpUtil.getRealRemoteIp(httpContent);
+            if (ip == null) {
+                ip = IpUtil.getRemoteIp(ctx);
+            }
+            if (null==dm.getId() || !securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(dm.getId()))) {
+                // 不在安全组规则放行范围内
+                ctx.channel().close();
+                return;
+            }
+            ctx.channel().attr(Constants.REAL_REMOTE_IP).set(ip);
+            ctx.channel().attr(Constants.SERVER_PORT).set(dm.getId());
+            ctx.channel().attr(Constants.LICENSE_ID).set(dm.getLicenseId());
+        }
+
+        // 继续传播
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+}
@@ -0,0 +1,68 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class TcpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+
+        ByteBuf buf = (ByteBuf) msg;
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        String ip = IpUtil.getRealRemoteIp(new String(bytes));
+        if (StringUtils.isEmpty(ip)) {
+            ip = IpUtil.getRemoteIp(ctx);
+        }
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.fireChannelActive();
+    }
+
+}
@@ -0,0 +1,38 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.socket.DatagramPacket;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class UdpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        DatagramPacket datagramPacket = (DatagramPacket) msg;
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(datagramPacket.sender().getAddress().getHostAddress(), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            return;
+        }
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        ctx.fireChannelRead(msg);
+    }
+}
@@ -0,0 +1,50 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.traffic.ChannelTrafficShapingHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.LicenseService;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
+import org.noear.solon.Solon;
+
+/**
+ * 访问者流量限制器
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Slf4j
+public class VisitorFlowLimiterChannelHandler extends ChannelInboundHandlerAdapter {
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Boolean flowLimiterFlag = ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).get();
+
+        if (null == flowLimiterFlag || !flowLimiterFlag) {
+            Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
+            Long upLimitRate = null;
+            Long downLimitRate = null;
+            // 先获取端口映射上的限速设置
+            FlowLimitBO flowLimitBO = portMappingService.getFlowLimitByServerPort(serverPort);
+            if (null != flowLimitBO) {
+                upLimitRate = flowLimitBO.getUpLimitRate();
+                downLimitRate = flowLimitBO.getDownLimitRate();
+            }
+            if (null != upLimitRate || null != downLimitRate) {
+                // 如果不全为空，则需要做限速
+                ctx.pipeline().addAfter("flowLimiter", "trafficShaping", new ChannelTrafficShapingHandler(downLimitRate == null ? 0 : downLimitRate, upLimitRate == null ? 0 : upLimitRate, 100, 600000));
+            }
+
+            // 每个连接第一次处理之后。无论是否限速，该连接后续都不在处理，避免频繁执行影响性能
+            ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).set(Boolean.TRUE);
+        }
+
+        // 继续传播
+        ctx.fireChannelRead(msg);
+    }
+
+}
@@ -0,0 +1,298 @@
+package org.dromara.neutrinoproxy.server.service;
+
+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
+import com.google.common.collect.Sets;
+import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.db.DBInitialize;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
+import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
+import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
+import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
+import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
+import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
+import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingCreateReq;
+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.dal.DomainMappingMapper;
+import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
+import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
+import org.dromara.neutrinoproxy.server.dal.UserMapper;
+import org.dromara.neutrinoproxy.server.dal.entity.*;
+import org.dromara.neutrinoproxy.server.proxy.domain.DomainMapping;
+import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.dromara.neutrinoproxy.server.util.PortAvailableUtil;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Init;
+import org.noear.solon.annotation.Inject;
+import org.noear.solon.core.bean.LifecycleBean;
+import org.noear.solon.core.runtime.NativeDetector;
+import org.noear.solon.data.annotation.Tran;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ *
+ *  域名解析 service
+ *  author xiaojie
+ */
+@Component
+public class DomainMappingService implements LifecycleBean {
+    @Db
+    private DomainMappingMapper domainMappingMapper;
+    @Db
+    private LicenseMapper licenseMapper;
+    @Db
+    private UserMapper userMapper;
+    @Db
+    private PortPoolMapper portPoolMapper;
+    @Inject
+    private VisitorChannelService visitorChannelService;
+
+    @Inject
+    private PortPoolService portPoolService;
+    @Inject
+    private ProxyConfig proxyConfig;
+    @Inject
+    private DBInitialize dbInitialize;
+    @Inject
+    private LicenseService licenseService;
+
+
+    public PageInfo<DomainMappingDto> page(PageQuery pageQuery, DomainMappingDto req) {
+        if (StringUtils.isNotEmpty(req.getDescription())) {
+            //描述字段为模糊查询，在应用层处理，否则sqlite不支持
+            req.setDescription("%" + req.getDescription() + "%");
+        }
+
+        // 协议名称转换
+        if (StringUtils.isNotBlank(req.getProtocal())) {
+            NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(req.getProtocal());
+            req.setProtocal(networkProtocolEnum.getDesc());
+        }
+
+        Page<DomainMappingDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<DomainMappingDO> list = domainMappingMapper.selectDomainMappingByCondition(page, req);
+        List<DomainMappingDto> respList = list.stream().map(DomainMappingDO::toRes).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(list)) {
+            return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        }
+
+        Set<Integer> licenseIds = respList.stream().map(DomainMappingDto::getLicenseId).collect(Collectors.toSet());
+        List<LicenseDO> licenseList = licenseMapper.findByIds(licenseIds);
+        if (CollectionUtil.isEmpty(licenseList)) {
+            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);
+        Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
+        Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
+
+        respList.forEach(item -> {
+            LicenseDO license = licenseMap.get(item.getLicenseId());
+            if (null == license) {
+                return;
+            }
+            item.setLicenseName(license.getName());
+            item.setUserId(license.getUserId());
+            UserDO user = userMap.get(license.getUserId());
+            if (null == user) {
+                return;
+            }
+            item.setUserName(user.getName());
+            if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) {
+                item.setProtocal("HTTP(S)");
+            }
+        });
+        //sorted [userId asc] [licenseId asc] [createTime asc]
+        respList = respList.stream()
+            .filter(e -> null != e.getUserId())
+            .sorted(Comparator.comparing(DomainMappingDto::getUserId).thenComparing(DomainMappingDto::getLicenseId).thenComparing(DomainMappingDto::getCreateTime)).collect(Collectors.toList());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
+
+    @Tran
+    public PortMappingCreateRes modify(DomainMappingDO dmd) {
+        LicenseDO licenseDO = licenseMapper.findById(dmd.getLicenseId());
+        ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+        if (!SystemContextHolder.isAdmin()) {
+            // 临时处理，如果当前用户不是管理员，则操作userId不能为1
+            ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
+        }
+        if (null != dmd.getId()) { // 编辑
+            Date now = new Date();
+            dmd.setEnable(EnableStatusEnum.ENABLE.getStatus());
+            dmd.setUpdateTime(now);
+            domainMappingMapper.updateById(dmd);
+            // 更新VisitorChannel
+            DomainMappingDO oldDmd = domainMappingMapper.findById(dmd.getId());
+            ParamCheckUtil.checkNotNull(oldDmd, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+            ProxyMapping oldProxy = new ProxyMapping(oldDmd.getLicenseId(),oldDmd.getId(),oldDmd.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc());
+            visitorChannelService.updateVisitorChannelByProxyMapping(oldProxy, new ProxyMapping(dmd.getLicenseId(),dmd.getId(),dmd.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc()));
+        } else { // 新增
+            Date now = new Date();
+            dmd.setEnable(EnableStatusEnum.ENABLE.getStatus());
+            dmd.setCreateTime(now);
+            dmd.setUpdateTime(now);
+            domainMappingMapper.insert(dmd);
+            // 新增
+            visitorChannelService.addVisitorChannelByProxyMapping(new ProxyMapping(dmd.getLicenseId(),dmd.getId(),dmd.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc()));
+        }
+        // 更新域名映射
+        ProxyUtil.domainMapingMap.put(dmd.getDomain(), new DomainMapping(dmd.getId(), dmd.getLicenseId(), dmd.getDomain(), dmd.getTargetPath()));
+
+        return new PortMappingCreateRes();
+    }
+    @Tran
+    public PortMappingUpdateEnableStatusRes updateEnableStatus(PortMappingUpdateEnableStatusReq req) {
+        DomainMappingDO domainMappingDO = domainMappingMapper.findById(req.getId());
+        ParamCheckUtil.checkNotNull(domainMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+
+        LicenseDO licenseDO = licenseMapper.findById(domainMappingDO.getLicenseId());
+        ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+        if (!SystemContextHolder.isAdmin()) {
+            ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
+        }
+
+        domainMappingMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+
+        // 更新VisitorChannel
+        domainMappingDO.setEnable(req.getEnable());
+        if (EnableStatusEnum.ENABLE == EnableStatusEnum.of(req.getEnable())) {
+            visitorChannelService.addVisitorChannelByProxyMapping(new ProxyMapping(domainMappingDO.getLicenseId(),domainMappingDO.getId(),domainMappingDO.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc()));
+        } else {
+            visitorChannelService.removeVisitorChannelByProxyMapping(new ProxyMapping(domainMappingDO.getLicenseId(),domainMappingDO.getId(),domainMappingDO.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc()));
+        }
+
+        return new PortMappingUpdateEnableStatusRes();
+    }
+
+    public void delete(Integer id) {
+        DomainMappingDO domain = domainMappingMapper.findById(id);
+        ParamCheckUtil.checkNotNull(domain, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+
+        LicenseDO licenseDO = licenseMapper.findById(domain.getLicenseId());
+        if (null != licenseDO && !SystemContextHolder.isAdmin()) {
+            // 临时处理，如果当前用户不是管理员，则操作userId不能为1
+            ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
+        }
+        domainMappingMapper.deleteById(id);
+
+        // 更新VisitorChannel
+        visitorChannelService.removeVisitorChannelByProxyMapping(new ProxyMapping(domain.getLicenseId(),domain.getId(),domain.getTargetPath(), NetworkProtocolEnum.HTTP.getDesc()));
+    }
+
+    public void domainBindSecurityGroup(Integer portMappingId, Integer groupId) {
+        DomainMappingDO mappingDO = domainMappingMapper.findById(portMappingId);
+        if (mappingDO == null) {
+            throw new RuntimeException("指定的端口映射不存在");
+        }
+        mappingDO.setSecurityGroupId(groupId);
+        mappingDO.setUpdateTime(new Date());
+        domainMappingMapper.updateById(mappingDO);
+    }
+
+    public void domainUnbindSecurityGroup(Integer portMappingId) {
+        DomainMappingDO mappingDO = domainMappingMapper.findById(portMappingId);
+        if (mappingDO == null) {
+            throw new RuntimeException("指定的端口映射不存在");
+        }
+        mappingDO.setSecurityGroupId(0);
+        mappingDO.setUpdateTime(new Date());
+        domainMappingMapper.updateById(mappingDO);
+    }
+
+    /**
+     * 根据license查询可用的端口映射列表
+     *
+     * @param licenseId
+     * @return
+     */
+    public List<DomainMappingDO> findEnableListByLicenseId(Integer licenseId) {
+        return domainMappingMapper.findEnableListByLicenseId(licenseId);
+    }
+
+
+    /**
+     * 服务端项目停止、启动时，更新在线状态为离线
+     */
+    @Init
+    public void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
+        List<DomainMappingDO> allMappingDOList = domainMappingMapper.selectList(Wrappers.lambdaQuery(DomainMappingDO.class));
+        if(CollectionUtil.isNotEmpty(allMappingDOList)) {
+            allMappingDOList.forEach(domain -> {
+                ProxyUtil.domainMapingMap.put(domain.getDomain(),
+                    new DomainMapping(domain.getId(), domain.getLicenseId(), domain.getDomain(), domain.getTargetPath()));
+            });
+        }
+    }
+
+
+
+    @Override
+    public void start() throws Throwable {
+
+    }
+
+    /**
+     * 服务端项目停止、启动时，更新在线状态为离线
+     */
+    @Override
+    public void stop() throws Throwable {
+//        domainMappingMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
+    }
+
+    public DomainMappingDto one(Integer id) {
+        DomainMappingDO domainMappingDO = domainMappingMapper.findById(id);
+        if (null == domainMappingDO) {
+            return null;
+        }
+        DomainMappingDto res = (DomainMappingDto)domainMappingDO;
+
+        LicenseDO license = licenseMapper.findById(domainMappingDO.getLicenseId());
+        if (null != license) {
+            res.setLicenseName(license.getName());
+            res.setUserId(license.getUserId());
+            UserDO user = userMapper.findById(license.getUserId());
+            if (null != user) {
+                res.setUserName(user.getName());
+            }
+        }
+        return res;
+    }
+
+    /**
+     * 检查端口是否被占用
+     * 端口映射编辑时，如果端口号没有变动，则不验证。避免出现端口映射正在使用时，无法更新端口映射其他信息的问题
+     * @param domain
+     * @return
+     */
+    public boolean exitDomain(String domain, Integer id) {
+        DomainMappingDO domainMappingDO = domainMappingMapper.findByDomain(domain, ObjectUtil.isNotNull(id) ? new HashSet<>(){{add(id);}} : new HashSet());
+        if (null == domainMappingDO) return Boolean.TRUE;
+        return Boolean.FALSE;
+    }
+}
@@ -1,7 +1,10 @@
 package org.dromara.neutrinoproxy.server.service;

+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
@@ -29,12 +32,15 @@ import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
 import org.noear.solon.core.runtime.NativeDetector;
+import org.noear.solon.data.annotation.Tran;

 import java.util.Arrays;
 import java.util.Date;
@@ -63,6 +69,8 @@ public class LicenseService implements LifecycleBean {
    private VisitorChannelService visitorChannelService;
    @Inject
    private DBInitialize dbInitialize;
+    // 流量限制缓存
+    private final Cache<Integer, FlowLimitBO> flowLimitCache = CacheUtil.newLRUCache(200, 1000 * 60 * 5);

    public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
        Page<LicenseDO> page = licenseMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<LicenseDO>()
@@ -100,17 +108,16 @@ public class LicenseService implements LifecycleBean {

    private List<LicenseListRes> assembleConvertLicenses(List<LicenseDO> list) {
        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);
-            Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
-            for (LicenseListRes item : licenseList) {
-                UserDO userDO = userMap.get(item.getUserId());
-                if (null != userDO) {
-                    item.setUserName(userDO.getName());
-                }
-                item.setKey(desensitization(item.getUserId(), item.getKey()));
+        // 插入用户名
+        Set<Integer> userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
+        List<UserDO> userList = userMapper.findByIds(userIds);
+        Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
+        for (LicenseListRes item : licenseList) {
+            UserDO userDO = userMap.get(item.getUserId());
+            if (null != userDO) {
+                item.setUserName(userDO.getName());
            }
+            item.setKey(desensitization(item.getUserId(), item.getKey()));
        }
        return licenseList;
    }
@@ -128,15 +135,21 @@ public class LicenseService implements LifecycleBean {
        String key = UUID.randomUUID().toString().replaceAll("-", "");
        Date now = new Date();

-        licenseMapper.insert(new LicenseDO()
-                .setName(req.getName())
-                .setKey(key)
-                .setUserId(req.getUserId())
-                .setIsOnline(OnlineStatusEnum.OFFLINE.getStatus())
-                .setEnable(EnableStatusEnum.ENABLE.getStatus())
-                .setCreateTime(now)
-                .setUpdateTime(now)
-        );
+        licenseDO = new LicenseDO()
+            .setName(req.getName())
+            .setKey(key)
+            .setUserId(req.getUserId())
+            .setUpLimitRate(req.getUpLimitRate())
+            .setDownLimitRate(req.getDownLimitRate())
+            .setIsOnline(OnlineStatusEnum.OFFLINE.getStatus())
+            .setEnable(EnableStatusEnum.ENABLE.getStatus())
+            .setCreateTime(now)
+            .setUpdateTime(now);
+
+        licenseMapper.insert(licenseDO);
+
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(licenseDO.getId(), licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
        return new LicenseCreateRes();
    }

@@ -147,7 +160,17 @@ public class LicenseService implements LifecycleBean {
        LicenseDO licenseCheck = licenseMapper.checkRepeat(oldLicenseDO.getUserId(), req.getName(), Sets.newHashSet(oldLicenseDO.getId()));
        ParamCheckUtil.checkMustNull(licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);

-        licenseMapper.update(req.getId(), req.getName(), new Date());
+        licenseMapper.update(null, new LambdaUpdateWrapper<LicenseDO>()
+            .eq(LicenseDO::getId, req.getId())
+            .set(LicenseDO::getName, req.getName())
+            .set(LicenseDO::getUpLimitRate, req.getUpLimitRate())
+            .set(LicenseDO::getDownLimitRate, req.getDownLimitRate())
+            .set(LicenseDO::getUpdateTime, new Date())
+        );
+
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(req.getId(), req.getUpLimitRate(), req.getDownLimitRate());
+
        return new LicenseUpdateRes();
    }

@@ -180,10 +203,20 @@ public class LicenseService implements LifecycleBean {
     * @param req
     * @return
     */
+    @Tran
    public LicenseUpdateEnableStatusRes updateEnableStatus(LicenseUpdateEnableStatusReq req) {
-        licenseMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
-        // 更新VisitorChannel
-        visitorChannelService.updateVisitorChannelByLicenseId(req.getId(), req.getEnable());
+        // 服务端免通道 直接转发，所以无需建立客户端通道。启用即在线，禁用即离线 20240311 设计取消
+//        if (req.getId() == 1) {
+//            licenseMapper.update(null, new LambdaUpdateWrapper<LicenseDO>()
+//                .eq(LicenseDO::getId, req.getId())
+//                .set(LicenseDO::getEnable, req.getEnable())
+//                .set(LicenseDO::getIsOnline, req.getEnable())
+//                .set(LicenseDO::getUpdateTime, new Date()));
+//        } else {
+            licenseMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+            // 更新VisitorChannel
+            visitorChannelService.updateVisitorChannelByLicenseId(req.getId(), req.getEnable());
+//        }
        return new LicenseUpdateEnableStatusRes();
    }

@@ -200,6 +233,8 @@ public class LicenseService implements LifecycleBean {
        licenseMapper.deleteById(id);
        // 更新VisitorChannel
        visitorChannelService.updateVisitorChannelByLicenseId(id, EnableStatusEnum.DISABLE.getStatus());
+        // 删除流量限制缓存
+        flowLimitCache.remove(id);
    }

    /**
@@ -243,10 +278,51 @@ public class LicenseService implements LifecycleBean {
        if (NativeDetector.isAotRuntime()) {
            return;
        }
+        // 服务刚启动，所以默认所有license都是离线状态。解决服务突然关闭，在线状态来不及更新的问题
        licenseMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
+        // 刷新流量限制缓存
+        List<LicenseDO> licenseDOList = licenseMapper.listAll();
+        if (CollectionUtils.isEmpty(licenseDOList)) {
+            for (LicenseDO licenseDO : licenseDOList) {
+                refreshFlowLimitCache(licenseDO.getId(), licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
+            }
+        }
    }


+    /**
+     * 刷新流量限制缓存
+     * @param id
+     * @param upLimitRate
+     * @param downLimitRate
+     */
+    private void refreshFlowLimitCache(Integer id, String upLimitRate, String downLimitRate) {
+        if (null == id) {
+            return;
+        }
+        flowLimitCache.put(id, new FlowLimitBO()
+            .setUpLimitRate(StringUtil.parseBytes(upLimitRate))
+            .setDownLimitRate(StringUtil.parseBytes(downLimitRate))
+        );
+    }
+
+    /**
+     * 获取license的流量限制
+     * @param licenseId
+     * @return
+     */
+    public FlowLimitBO getFlowLimit(Integer licenseId) {
+        FlowLimitBO res = flowLimitCache.get(licenseId);
+        if (null == res) {
+            LicenseDO licenseDO = licenseMapper.queryById(licenseId);
+            if (null != licenseDO) {
+                refreshFlowLimitCache(licenseId, licenseDO.getUpLimitRate(), licenseDO.getDownLimitRate());
+                res = flowLimitCache.get(licenseId);
+            }
+        }
+        return res;
+    }
+
    @Override
    public void start() throws Throwable {

@@ -272,6 +348,7 @@ public class LicenseService implements LifecycleBean {
                .eq(LicenseDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
                .eq(LicenseDO::getUserId, SystemContextHolder.getUserId())
        );
+        if (CollectionUtil.isEmpty(list)) return null;
        List<LicenseListRes> licenseList = assembleConvertLicenses(list);
        return licenseList;
    }
@@ -1,9 +1,12 @@
 package org.dromara.neutrinoproxy.server.service;

+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -36,19 +39,18 @@ import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
 import org.noear.solon.core.runtime.NativeDetector;

-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -76,9 +78,17 @@ public class PortMappingService implements LifecycleBean {
    private ProxyConfig proxyConfig;
    @Inject
    private DBInitialize dbInitialize;
+    @Inject
+    private LicenseService licenseService;

    /** 端口到安全组Id的映射 */
    private final Map<Integer, Integer> mappingPortToSecurityGroupMap = new ConcurrentHashMap<>();
+    // 服务端端口到端口映射id的映射
+    private final Cache<Integer, Integer> serverPortToPortMappingIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
+    // 端口映射id到licenseId
+    private final Cache<Integer, Integer> idToLicenseIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
+    // 流量限制缓存
+    private final Cache<Integer, FlowLimitBO> flowLimitCache = CacheUtil.newLRUCache(500, 1000 * 60 * 5);

    public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
        if (StringUtils.isNotEmpty(req.getDescription())) {
@@ -121,15 +131,14 @@ public class PortMappingService implements LifecycleBean {
                return;
            }
            item.setUserName(user.getName());
-            if (StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(item.getSubdomain())) {
-                item.setDomain(item.getSubdomain() + "." + proxyConfig.getServer().getTcp().getDomainName());
-            }
            if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) {
                item.setProtocal("HTTP(S)");
            }
        });
        //sorted [userId asc] [licenseId asc] [createTime asc]
-        respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
+        respList = respList.stream()
+            .filter(e -> null != e.getUserId())
+            .sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
    }

@@ -143,16 +152,16 @@ public class PortMappingService implements LifecycleBean {
        PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
        ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
        ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), null), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
-        ParamCheckUtil.checkExpression(!portMappingMapper.checkRepeatBySubdomain(req.getSubdomain(), null), ExceptionConstant.PORT_MAPPING_SUBDONAME_CONNOT_REPEAT);

        Date now = new Date();
        PortMappingDO portMappingDO = new PortMappingDO();
        portMappingDO.setLicenseId(req.getLicenseId());
        portMappingDO.setProtocal(req.getProtocal());
-        portMappingDO.setSubdomain(req.getSubdomain());
        portMappingDO.setServerPort(req.getServerPort());
        portMappingDO.setClientIp(req.getClientIp());
        portMappingDO.setClientPort(req.getClientPort());
+        portMappingDO.setUpLimitRate(req.getUpLimitRate());
+        portMappingDO.setDownLimitRate(req.getDownLimitRate());
        portMappingDO.setProxyResponses(req.getProxyResponses());
        portMappingDO.setProxyTimeoutMs(req.getProxyTimeoutMs());
        portMappingDO.setDescription(req.getDescription());
@@ -162,14 +171,17 @@ public class PortMappingService implements LifecycleBean {
        portMappingDO.setUpdateTime(now);
        portMappingMapper.insert(portMappingDO);
        // 更新VisitorChannel
-        visitorChannelService.addVisitorChannelByPortMapping(portMappingDO);
-        // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
-        }
+        visitorChannelService.addVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));

        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());

+        // 更新端口到映射的缓存
+        serverPortToPortMappingIdCache.put(req.getServerPort(), portMappingDO.getId());
+        // 更新端口映射到licenseId的缓存
+        idToLicenseIdCache.put(portMappingDO.getId(), portMappingDO.getLicenseId());
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(portMappingDO.getId(), portMappingDO.getUpLimitRate(), portMappingDO.getDownLimitRate());
+
        return new PortMappingCreateRes();
    }

@@ -183,32 +195,39 @@ public class PortMappingService implements LifecycleBean {
        PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
        ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
        ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
-        ParamCheckUtil.checkExpression(!portMappingMapper.checkRepeatBySubdomain(req.getSubdomain(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_MAPPING_SUBDONAME_CONNOT_REPEAT);

        // 查询原端口映射
        PortMappingDO oldPortMappingDO = portMappingMapper.findById(req.getId());
        ParamCheckUtil.checkNotNull(oldPortMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);

-        PortMappingDO portMappingDO = new PortMappingDO();
-        BeanUtil.copyProperties(req, portMappingDO);
-        if (req.getSecurityGroupId() == null) {
-            portMappingDO.setSecurityGroupId(0);
-        }
-        portMappingDO.setUpdateTime(new Date());
-        portMappingDO.setEnable(EnableStatusEnum.ENABLE.getStatus());
-        portMappingMapper.updateById(portMappingDO);
+        // 更新端口映射
+        portMappingMapper.update(null, new LambdaUpdateWrapper<PortMappingDO>()
+            .eq(PortMappingDO::getId, req.getId())
+            .set(PortMappingDO::getProtocal, req.getProtocal())
+            .set(PortMappingDO::getServerPort, req.getServerPort())
+            .set(PortMappingDO::getClientIp, req.getClientIp())
+            .set(PortMappingDO::getClientPort, req.getClientPort())
+            .set(PortMappingDO::getUpLimitRate, req.getUpLimitRate())
+            .set(PortMappingDO::getDownLimitRate, req.getDownLimitRate())
+            .set(PortMappingDO::getProxyTimeoutMs, req.getProxyTimeoutMs())
+            .set(PortMappingDO::getProxyResponses, req.getProxyResponses())
+            .set(PortMappingDO::getSecurityGroupId, req.getSecurityGroupId())
+            .set(PortMappingDO::getDescription, req.getDescription())
+            .set(PortMappingDO::getUpdateTime, new Date())
+        );
+
        // 更新VisitorChannel
-        visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
-        // 删除老的域名映射
-        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal()) && StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
-            ProxyUtil.removeSubdomainToServerPort(oldPortMappingDO.getSubdomain());
-        }
-        // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(proxyConfig.getServer().getTcp().getDomainName()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.setSubdomainToServerPort(portMappingDO.getSubdomain(), portMappingDO.getServerPort());
-        }
+        PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
+        visitorChannelService.updateVisitorChannelByProxyMapping(ProxyMapping.build(oldPortMappingDO), ProxyMapping.build(portMappingDO));

        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
+
+        // 更新端口到映射的缓存
+        serverPortToPortMappingIdCache.put(req.getServerPort(), req.getId());
+        // 更新端口映射到licenseId的缓存
+        idToLicenseIdCache.put(portMappingDO.getId(), portMappingDO.getLicenseId());
+        // 刷新流量限制缓存
+        refreshFlowLimitCache(req.getId(), req.getUpLimitRate(), req.getDownLimitRate());
    }

    public PortMappingDetailRes detail(Integer id) {
@@ -257,9 +276,9 @@ public class PortMappingService implements LifecycleBean {
        // 更新VisitorChannel
        portMappingDO.setEnable(req.getEnable());
        if (EnableStatusEnum.ENABLE == EnableStatusEnum.of(req.getEnable())) {
-            visitorChannelService.addVisitorChannelByPortMapping(portMappingDO);
+            visitorChannelService.addVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
        } else {
-            visitorChannelService.removeVisitorChannelByPortMapping(portMappingDO);
+            visitorChannelService.removeVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
        }

        return new PortMappingUpdateEnableStatusRes();
@@ -278,13 +297,15 @@ public class PortMappingService implements LifecycleBean {
        portMappingMapper.deleteById(id);

        // 更新VisitorChannel
-        visitorChannelService.removeVisitorChannelByPortMapping(portMappingDO);
+        visitorChannelService.removeVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
        // 更新域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && StrUtil.isNotBlank(portMappingDO.getSubdomain())) {
-            ProxyUtil.removeSubdomainToServerPort(portMappingDO.getSubdomain());
-        }

        updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), null);
+
+        // 删除id到licenseId的映射
+        idToLicenseIdCache.remove(id);
+        // 删除流量限制缓存
+        flowLimitCache.remove(id);
    }

    public void portBindSecurityGroup(Integer portMappingId, Integer groupId) {
@@ -333,6 +354,7 @@ public class PortMappingService implements LifecycleBean {
        if (NativeDetector.isAotRuntime()) {
            return;
        }
+        // 服务刚启动，所以默认所有license都是离线状态。解决服务突然关闭，在线状态来不及更新的问题
        portMappingMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());

        List<PortMappingDO> allMappingDOList = portMappingMapper.selectList(Wrappers.lambdaQuery(PortMappingDO.class));
@@ -341,26 +363,92 @@ public class PortMappingService implements LifecycleBean {
            if (securityGroupId != null && securityGroupId > 0) {
                updateMappingPortToSecurityGroupMap(item.getServerPort(), item.getSecurityGroupId());
            }
+            // 更新端口到映射的缓存
+            serverPortToPortMappingIdCache.put(item.getServerPort(), item.getId());
+            // 更新端口映射到licenseId的缓存
+            idToLicenseIdCache.put(item.getId(), item.getLicenseId());
+            // 刷新流量限制缓存
+            refreshFlowLimitCache(item.getId(), item.getUpLimitRate(), item.getDownLimitRate());
        });

-        // 未配置域名，则不需要处理域名映射逻辑
-        if (StrUtil.isBlank(proxyConfig.getServer().getTcp().getDomainName())) {
+    }
+
+    /**
+     * 刷新流量限制缓存
+     * @param id
+     * @param upLimitRate
+     * @param downLimitRate
+     */
+    private void refreshFlowLimitCache(Integer id, String upLimitRate, String downLimitRate) {
+        if (null == id) {
            return;
        }
-        List<PortMappingDO> portMappingDOList = allMappingDOList.stream()
-            .filter(item -> NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal()) && item.getSubdomain() != null)
-            .collect(Collectors.toList());
-//      List<PortMappingDO> portMappingDOList =  portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>().eq(PortMappingDO::getProtocal, NetworkProtocolEnum.HTTP.getDesc()).isNotNull(PortMappingDO::getSubdomain));
-        if (CollectionUtil.isEmpty(portMappingDOList)) {
-            return;
-        }
-        portMappingDOList.forEach(item -> {
-            if (StrUtil.isBlank(item.getSubdomain())) {
-                return;
+        flowLimitCache.put(id, new FlowLimitBO()
+            .setUpLimitRate(StringUtil.parseBytes(upLimitRate))
+            .setDownLimitRate(StringUtil.parseBytes(downLimitRate))
+        );
+    }
+
+    /**
+     * 获取license的流量限制
+     * @param id
+     * @return
+     */
+    public FlowLimitBO getFlowLimit(Integer id) {
+        FlowLimitBO res = flowLimitCache.get(id);
+        if (null == res) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                refreshFlowLimitCache(id, portMappingDO.getUpLimitRate(), portMappingDO.getDownLimitRate());
+                res = flowLimitCache.get(id);
            }
-            ProxyUtil.setSubdomainToServerPort(item.getSubdomain(), item.getServerPort());
+        }
+        return res;
+    }

-        });
+    public Integer getPortMappingIdByServerPort(Integer serverPort) {
+        if (null == serverPort) {
+            return null;
+        }
+        Integer id = serverPortToPortMappingIdCache.get(serverPort);
+        if (null != id) {
+            return id;
+        }
+        List<PortMappingDO> portMappingDOList = portMappingMapper.findListByServerPort(serverPort);
+        // 不存在 或者 有多条记录，都不处理
+        if (CollectionUtils.isEmpty(portMappingDOList) || portMappingDOList.size() > 1) {
+            return null;
+        }
+        id = portMappingDOList.get(0).getId();
+        serverPortToPortMappingIdCache.put(serverPort, id);
+        return id;
+    }
+
+    public Integer getLicenseIdById(Integer id) {
+        Integer licenseId = idToLicenseIdCache.get(id);
+        if (null == licenseId) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                licenseId = portMappingDO.getLicenseId();
+                idToLicenseIdCache.put(id, licenseId);
+            }
+        }
+        return licenseId;
+    }
+
+    public FlowLimitBO getFlowLimitByServerPort(Integer serverPort) {
+        Integer id = getPortMappingIdByServerPort(serverPort);
+        if (null == id) {
+            return null;
+        }
+        FlowLimitBO res = getFlowLimit(id);
+        if (null == res || (null == res.getUpLimitRate() && null == res.getDownLimitRate())) {
+            Integer licenseId = getLicenseIdById(id);
+            if (null != licenseId) {
+                res = licenseService.getFlowLimit(licenseId);
+            }
+        }
+        return res;
    }

    private void updateMappingPortToSecurityGroupMap(Integer serverPort, Integer securityGroupId) {
@@ -130,6 +130,7 @@ public class PortPoolService {
                    log.warn("bulk add port err:{}",e.getMessage());
                }
            }
+
        }else{
            throw ServiceException.create(PORT_RANGE_FAIL);
        }
@@ -23,7 +23,7 @@ public class ProtocalService {
    public List<ProtocalListRes> list() {
        return Lists.newArrayList(
                new ProtocalListRes().setName("TCP").setEnable(Boolean.TRUE).setRemark("支持一切TCP之上的协议"),
-                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于时使用TCP。 若配置了证书，则同时支持HTTPS。"),
+                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于使用TCP。 若配置了证书，则同时支持HTTPS。"),
                new ProtocalListRes().setName("UDP").setEnable(Boolean.TRUE).setRemark("支持UDP转发、响应。需要配合响应数、超时时间使用")
        );
    }
@@ -4,29 +4,36 @@ import cn.hutool.cache.Cache;
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import jdk.jshell.Snippet;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
 import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleUpdateReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.*;
+import org.dromara.neutrinoproxy.server.controller.res.system.*;
 import org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper;
 import org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.core.runtime.NativeDetector;

+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;

@Component
@Slf4j
@@ -45,9 +52,13 @@ public class SecurityGroupService {

    @Init(index = 100)
    public synchronized void init() {
+        // aot 阶段，不初始化
+        if (NativeDetector.isAotRuntime()) {
+            return;
+        }
        securityGroupMap.clear();
        List<SecurityGroupDO> groupDOList = securityGroupMapper.selectList(Wrappers.lambdaQuery(SecurityGroupDO.class)
-            .eq(SecurityGroupDO::getEnable, EnableStatusEnum.ENABLE));
+            .eq(SecurityGroupDO::getEnable, EnableStatusEnum.ENABLE.getStatus()));
        groupDOList.forEach(securityGroupDO -> securityGroupMap.put(securityGroupDO.getId(), securityGroupDO));
        ipAllowControlCache.clear();
    }
@@ -56,19 +67,45 @@ public class SecurityGroupService {
        ipAllowControlCache.clear();
    }

-    public List<SecurityGroupDO> queryGroupList() {
-        return securityGroupMapper.selectList(Wrappers.lambdaQuery(SecurityGroupDO.class)
-            .eq(SecurityGroupDO::getUserId, SystemContextHolder.getUserId()));
+    public PageInfo<SecurityGroupListRes> groupPage(PageQuery pageQuery, SecurityGroupListReq req) {
+        if (StringUtils.isNotEmpty(req.getName())) {
+            //在应用层处理，否则sqlite不支持
+            req.setName("%" + req.getName() + "%");
+        }
+        if (StringUtils.isNotEmpty(req.getDescription())) {
+            //在应用层处理，否则sqlite不支持
+            req.setDescription("%" + req.getDescription() + "%");
+        }
+        Page<SecurityGroupDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<SecurityGroupDO> list = securityGroupMapper.selectByCondition(page, req);
+        if (CollectionUtils.isEmpty(list)) {
+            return PageInfo.of(null, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        }
+        List<SecurityGroupListRes> respList = list.stream().map(SecurityGroupDO::toListRes).collect(Collectors.toList());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
    }

-    public SecurityGroupDO queryGroupOne(Integer groupId) {
-        return securityGroupMapper.selectById(groupId);
+    public List<SecurityGroupListRes> groupList() {
+        List<SecurityGroupDO> list = securityGroupMapper.selectList(Wrappers.lambdaQuery(SecurityGroupDO.class)
+            .eq(SecurityGroupDO::getUserId, SystemContextHolder.getUserId()));
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(SecurityGroupDO::toListRes).collect(Collectors.toList());
+    }
+
+    public SecurityGroupDetailRes groupDetail(SecurityGroupDetailReq req) {
+        SecurityGroupDO securityGroupDO = securityGroupMapper.selectById(req.getId());
+        if (null != securityGroupDO) {
+            return securityGroupDO.toDetailRes();
+        }
+        return null;
    }

    public void createGroup(SecurityGroupCreateReq req) {
        SecurityGroupDO groupDO = new SecurityGroupDO();
        BeanUtil.copyProperties(req, groupDO);
-        groupDO.setEnable(EnableStatusEnum.ENABLE)
+        groupDO.setEnable(EnableStatusEnum.ENABLE.getStatus())
            .setUserId(SystemContextHolder.getUserId())
            .setCreateTime(new Date())
            .setUpdateTime(new Date());
@@ -87,16 +124,6 @@ public class SecurityGroupService {
        init();
    }

-    public void setGroupStatus(Integer groupId, EnableStatusEnum statusEnum) {
-        SecurityGroupDO groupDO = securityGroupMapper.selectById(groupId);
-        if (groupDO == null) {
-            throw new RuntimeException("指定的安全组不存在");
-        }
-        groupDO.setEnable(statusEnum);
-        securityGroupMapper.updateById(groupDO);
-        init();
-    }
-
    /**
     * 删除安全组，并级联删除安全组下的规则，删除后，需缓存
     * @param groupId 安全组Id
@@ -108,11 +135,41 @@ public class SecurityGroupService {
        init();
    }

-    public List<SecurityRuleDO> queryRuleListByGroupId(Integer groupId) {
-        return securityRuleMapper.selectList(Wrappers.lambdaQuery(SecurityRuleDO.class)
-            .eq(SecurityRuleDO::getGroupId, groupId)
-            .orderByAsc(SecurityRuleDO::getPriority)
+    public SecurityGroupUpdateEnableStatueRes updateGroupEnableStatueReq(SecurityGroupUpdateEnableStatueReq req) {
+        SecurityGroupDO groupDO = securityGroupMapper.selectById(req.getId());
+        ParamCheckUtil.checkNotNull(groupDO, ExceptionConstant.SECURITY_GROUP_NOT_EXIST);
+
+        securityGroupMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        init();
+        return new SecurityGroupUpdateEnableStatueRes();
+    }
+
+    public PageInfo<SecurityRuleListRes> rulePage(PageQuery pageQuery, SecurityRuleListReq req) {
+        if (StringUtils.isNotEmpty(req.getName())) {
+            //在应用层处理，否则sqlite不支持
+            req.setName("%" + req.getName() + "%");
+        }
+        if (StringUtils.isNotEmpty(req.getDescription())) {
+            //在应用层处理，否则sqlite不支持
+            req.setDescription("%" + req.getDescription() + "%");
+        }
+        Page<SecurityRuleDO> page = new Page<>(pageQuery.getCurrent(), pageQuery.getSize());
+        List<SecurityRuleDO> list = securityRuleMapper.selectByCondition(page, req);
+        if (CollectionUtils.isEmpty(list)) {
+            return PageInfo.of(null, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+        }
+        List<SecurityRuleListRes> respList = list.stream().map(SecurityRuleDO::toListRes).collect(Collectors.toList());
+        return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
+
+    public List<SecurityRuleListRes> ruleList(SecurityRuleListReq req) {
+        List<SecurityRuleDO> list = securityRuleMapper.selectList(new LambdaQueryWrapper<SecurityRuleDO>()
+                .eq(null != req.getGroupId(), SecurityRuleDO::getGroupId, req.getGroupId())
        );
+        if (CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(SecurityRuleDO::toListRes).collect(Collectors.toList());
    }

    public void createRule(SecurityRuleCreateReq req) {
@@ -120,7 +177,7 @@ public class SecurityGroupService {
        BeanUtil.copyProperties(req, ruleDO);
        ruleDO.setUserId(SystemContextHolder.getUserId())
                .setCreateTime(new Date())
-                .setEnable(EnableStatusEnum.ENABLE)
+                .setEnable(EnableStatusEnum.ENABLE.getStatus())
                .setUpdateTime(new Date());
        securityRuleMapper.insert(ruleDO);
        clearCache();
@@ -138,12 +195,13 @@ public class SecurityGroupService {
        clearCache();
    }

-    public void setRuleStatus(Integer ruleId, EnableStatusEnum statusEnum) {
-        SecurityRuleDO ruleDO = securityRuleMapper.selectById(ruleId);
-        ruleDO.setEnable(statusEnum);
-        ruleDO.setUpdateTime(new Date());
-        securityRuleMapper.updateById(ruleDO);
+    public SecurityRuleUpdateEnableStatueRes updateRuleEnableStatueReq(SecurityRuleUpdateEnableStatueReq req) {
+        SecurityRuleDO ruleDO = securityRuleMapper.selectById(req.getId());
+        ParamCheckUtil.checkNotNull(ruleDO, ExceptionConstant.SECURITY_RULE_NOT_EXIST);
+
+        securityRuleMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
        clearCache();
+        return new SecurityRuleUpdateEnableStatueRes();
    }

    /**
@@ -156,18 +214,16 @@ public class SecurityGroupService {
        ip = ip.toLowerCase();
        // 不能判断当前连接的IP，保守处理，拒绝放行
        if (StrUtil.isEmpty(ip)) {
-            log.debug("【安全组】不能正确获取到IP地址，保守处理，拒绝放行");
+            log.debug("[SecurityGroup] cannot get remote ip,this pack be reject");
            return false;
        }

        // 黑名单规则，没有该安全组，则放行
        if (groupId == null) {
-            log.debug("【安全组】{}：该IP访问的端口映射没有绑定安全组（1）， 放行", ip);
            return true;
        }
        SecurityGroupDO groupDO = securityGroupMap.get(groupId);
        if (groupDO == null) {
-            log.debug("【安全组】{}：该IP访问的端口映射没有绑定安全组（2）， 放行", ip);
            return true;
        }

@@ -175,33 +231,33 @@ public class SecurityGroupService {
        String judgeAllowMapKey = ip + groupId;
        if (ipAllowControlCache.containsKey(judgeAllowMapKey)) {
            allow = ipAllowControlCache.get(judgeAllowMapKey);
-            log.debug("【安全组】{}-安全组{}：该IP在缓存中，缓存策略为{}", ip, groupId, allow ? "允许" : "拒绝");
+            log.debug("[SecurityGroup] ip:{} groupId:{} cached security strategy:{}", ip, groupId, allow ? "allow" : "reject");
            return allow;
        }

        List<SecurityRuleDO>  ruleDOList = securityRuleMapper.selectList(Wrappers.lambdaQuery(SecurityRuleDO.class)
            .eq(SecurityRuleDO::getGroupId, groupId)
-            .eq(SecurityRuleDO::getEnable, EnableStatusEnum.ENABLE)
+            .eq(SecurityRuleDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
            .orderByAsc(SecurityRuleDO::getPriority)
        );
        for (SecurityRuleDO ruleDO : ruleDOList) {
            SecurityRulePassTypeEnum passType = ruleDO.judge(ip);
            if (passType == SecurityRulePassTypeEnum.ALLOW) {
                allow = true;
-                log.debug("【安全组】{}-安全组{}：匹配到安全规则{}行为：{}", ip, groupId, ruleDO.getId(), "允许");
+                log.debug("[SecurityGroup] ip:{} groupId:{} ruleId:{} security strategy:{}", ip, groupId, ruleDO.getId(), "allow");
                break;
            }
            if (passType == SecurityRulePassTypeEnum.DENY) {
                allow = false;
-                log.info("【安全组】{}-安全组{}：匹配到安全规则{}行为：{}", ip, groupId, ruleDO.getId(), "拒绝");
+                log.info("[SecurityGroup] ip:{} groupId:{} ruleId:{} security strategy:{}", ip, groupId, ruleDO.getId(), "reject");
                break;
            }
        }

        // 当前IP没有匹配到任何一条规则，则使用安全组默认规则
        if (allow == null) {
-            allow = groupDO.getDefaultPassType() == SecurityRulePassTypeEnum.ALLOW;
-            log.debug("【安全组】{}-安全组{}：使用安全组默认放行类型：{}", ip, groupId, allow ? "允许" : "拒绝");
+            allow = SecurityRulePassTypeEnum.ALLOW.getType().equals(groupDO.getDefaultPassType());
+            log.debug("[SecurityGroup] ip:{} groupId{} use security group default strategy:{}", ip, groupId, allow ? "allow" : "reject");
        }

        ipAllowControlCache.put(judgeAllowMapKey, allow);
@@ -59,17 +59,18 @@ public class VisitorChannelService {
    private PortPoolMapper portPoolMapper;

    /**
-     * 初始化
+     * 初始化 - 域名id/端口号，客户端通道绑定初始化
     * @param licenseId
     */
    public void initVisitorChannel(Integer licenseId, Channel cmdChannel) {
-        List<PortMappingDO> portMappingList = portMappingMapper.findEnableListByLicenseId(licenseId);
+//        List<PortMappingDO> portMappingList = portMappingMapper.findEnableListByLicenseId(licenseId);
+        List<ProxyMapping> proxyMappingList = licenseMapper.findEnableProxyMappingListByLicenseId(licenseId);
        // 没有端口映射仍然保持连接
-        ProxyUtil.initProxyInfo(licenseId, ProxyMapping.buildList(portMappingList));
+        ProxyUtil.initProxyInfo(licenseId, proxyMappingList); //ProxyMapping.buildList(portMappingList));

-        ProxyUtil.addCmdChannel(licenseId, cmdChannel, portMappingList.stream().map(PortMappingDO::getServerPort).collect(Collectors.toSet()));
+        ProxyUtil.addCmdChannel(licenseId, cmdChannel, proxyMappingList.stream().map(ProxyMapping::getServerPort).collect(Collectors.toSet()));

-        startUserPortServer(ProxyUtil.getAttachInfo(cmdChannel), portMappingList);
+        startUserPortServer(ProxyUtil.getAttachInfo(cmdChannel), proxyMappingList); // portMappingList
    }

    /**
@@ -89,9 +90,9 @@ public class VisitorChannelService {
        EnableStatusEnum enableStatusEnum = EnableStatusEnum.of(enable);
        for (PortMappingDO portMappingDO : portMappingDOList) {
            if (EnableStatusEnum.DISABLE == enableStatusEnum) {
-                removeVisitorChannelByPortMapping(portMappingDO);
+                removeVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
            } else if (EnableStatusEnum.ENABLE == EnableStatusEnum.of(portMappingDO.getEnable())) {
-                addVisitorChannelByPortMapping(portMappingDO);
+                addVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
            }
        }
    }
@@ -130,82 +131,82 @@ public class VisitorChannelService {
            return;
        }
        EnableStatusEnum enableStatusEnum = EnableStatusEnum.of(enable);
-        List<PortMappingDO> portMappingDOList = portMappingMapper.findListByLicenseId(licenseId);
-        if (!CollectionUtil.isEmpty(portMappingDOList)) {
-            for (PortMappingDO portMappingDO : portMappingDOList) {
-                if (EnableStatusEnum.DISABLE == enableStatusEnum) {
-                    removeVisitorChannelByPortMapping(portMappingDO);
-                } else if (EnableStatusEnum.ENABLE == EnableStatusEnum.of(portMappingDO.getEnable())) {
-                    addVisitorChannelByPortMapping(portMappingDO);
-                }
+        if (EnableStatusEnum.DISABLE == enableStatusEnum) { // 禁用删除,关闭所有链接及配置
+            List<ProxyMapping> allProxyMappingList = licenseMapper.findAllProxyMappingListByLicenseId(licenseId);
+            for (ProxyMapping proxy : allProxyMappingList) {
+                removeVisitorChannelByProxyMapping(proxy);
+            }
+        } else { // if (EnableStatusEnum.ENABLE == enableStatusEnum) 如果实启用，则开启所有
+            List<ProxyMapping> enableProxyMappingList = licenseMapper.findEnableProxyMappingListByLicenseId(licenseId);
+            for (ProxyMapping eproxy : enableProxyMappingList) {
+                addVisitorChannelByProxyMapping(eproxy);
            }
        }
    }
-
    /**
     * 更新
     * 触发时机：修改端口映射
-     * @param oldPortMappingDO
-     * @param newPortMappingDO
+     * @param oldProxyMapping
+     * @param newProxyMapping
     */
-    public void updateVisitorChannelByPortMapping(PortMappingDO oldPortMappingDO, PortMappingDO newPortMappingDO) {
-        if (null == oldPortMappingDO || null == newPortMappingDO) {
+    public void updateVisitorChannelByProxyMapping(ProxyMapping oldProxyMapping, ProxyMapping newProxyMapping) {
+        if (null == oldProxyMapping || null == newProxyMapping) {
            return;
        }
-        removeVisitorChannelByPortMapping(oldPortMappingDO);
-        addVisitorChannelByPortMapping(newPortMappingDO);
+        removeVisitorChannelByProxyMapping(oldProxyMapping);
+        addVisitorChannelByProxyMapping(newProxyMapping);
    }

    /**
     * 新增VisitorChannel
     * 触发时机：新增端口映射、启用端口映射
-     * @param portMappingDO
+     * @param proxyMapping
     */
-    public void addVisitorChannelByPortMapping(PortMappingDO portMappingDO) {
-        if (null == portMappingDO) {
+    public void addVisitorChannelByProxyMapping(ProxyMapping proxyMapping) {
+        if (null == proxyMapping) {
            return;
        }
-        Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(portMappingDO.getLicenseId());
+        Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(proxyMapping.getLicenseId());
        if (null == cmdChannel) {
            // 如果不存在有效的cmdChannel，则无需更新VisitorChannel
            return;
        }
        // 判断端口映射是否启用
-        if (EnableStatusEnum.DISABLE != EnableStatusEnum.of(portMappingDO.getEnable())) {
-            LicenseDO licenseDO = licenseMapper.findById(portMappingDO.getLicenseId());
+//        if (EnableStatusEnum.DISABLE != EnableStatusEnum.of(portMappingDO.getEnable())) {
+            LicenseDO licenseDO = licenseMapper.findById(proxyMapping.getLicenseId());
            // 判断license是否启用
            if (null != licenseDO && EnableStatusEnum.ENABLE == EnableStatusEnum.of(licenseDO.getEnable())) {
                UserDO userDO = userMapper.findById(licenseDO.getUserId());
                // 判断用户是否启用
                if (null != userDO && EnableStatusEnum.ENABLE == EnableStatusEnum.of(userDO.getEnable())) {
-                    PortPoolDO portPoolDO = portPoolMapper.findByPort(portMappingDO.getServerPort());
-                    // 判断端口池是否启用
-                    if (null != portPoolDO && EnableStatusEnum.ENABLE == EnableStatusEnum.of(portPoolDO.getEnable())) {
+                    PortPoolDO portPoolDO = portPoolMapper.findByPort(proxyMapping.getServerPort());
+                    // 端口池大于65535 为域名解析，小于65535为端口映射，端口映射要判断端口池是否启用
+                    if (proxyMapping.getServerPort() > 65535 || (null != portPoolDO && EnableStatusEnum.ENABLE == EnableStatusEnum.of(portPoolDO.getEnable()))) {
                        // 未删除且未禁用，则开启代理
-                        ProxyUtil.addProxyInfo(portMappingDO.getLicenseId(), ProxyMapping.build(portMappingDO));
-                        ProxyUtil.addCmdChannel(portMappingDO.getLicenseId(), cmdChannel, Sets.newHashSet(portMappingDO.getServerPort()));
-                        startUserPortServer(ProxyUtil.getAttachInfo(cmdChannel), Lists.newArrayList(portMappingDO));
+                        ProxyUtil.addProxyInfo(proxyMapping.getLicenseId(), proxyMapping);
+                        ProxyUtil.addCmdChannel(proxyMapping.getLicenseId(), cmdChannel, Sets.newHashSet(proxyMapping.getServerPort()));
+                        startUserPortServer(ProxyUtil.getAttachInfo(cmdChannel), Lists.newArrayList(proxyMapping));
                    }
                }
            }
-        }
+//        }
    }

    /**
     * 删除VisitorChannel
     * 触发时机：删除端口映射、禁用端口映射
-     * @param portMappingDO
+     * @param proxyMapping
     */
-    public void removeVisitorChannelByPortMapping(PortMappingDO portMappingDO) {
-        if (null == portMappingDO) {
+    public void removeVisitorChannelByProxyMapping(ProxyMapping proxyMapping) {
+        if (null == proxyMapping) {
            return;
        }
-        Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(portMappingDO.getLicenseId());
+        Channel cmdChannel = ProxyUtil.getCmdChannelByLicenseId(proxyMapping.getLicenseId());
        if (null == cmdChannel) {
            // 如果不存在有效的cmdChannel，则无需更新VisitorChannel
            return;
        }
-        Channel visitorChannel = ProxyUtil.getVisitorChannelByServerPort(portMappingDO.getServerPort());
+        Channel visitorChannel = ProxyUtil.getVisitorChannelByServerPort(proxyMapping.getServerPort());
        if (null != visitorChannel) {
            Channel proxyChannel = visitorChannel.attr(Constants.NEXT_CHANNEL).get();
            if (null != proxyChannel) {
@@ -214,29 +215,28 @@ public class VisitorChannelService {
            // TODO 此处如果时UDP的visitorChannel,则不能close，后续重构考虑
 //            visitorChannel.close();
        }
-        ProxyUtil.removeProxyInfo(portMappingDO.getServerPort());
+        ProxyUtil.removeProxyInfo(proxyMapping.getServerPort());
    }

-    private void startUserPortServer(CmdChannelAttachInfo cmdChannelAttachInfo, List<PortMappingDO> portMappingList) {
-        if (CollectionUtil.isEmpty(portMappingList)) {
+    private void startUserPortServer(CmdChannelAttachInfo cmdChannelAttachInfo, List<ProxyMapping> proxyMappingList) {
+        if (CollectionUtil.isEmpty(proxyMappingList)) {
            return;
        }
-
-        for (PortMappingDO portMapping : portMappingList) {
-            if (EnableStatusEnum.DISABLE.getStatus().equals(portMapping.getEnable())) {
-                // 端口映射被禁用了，忽略 TODO 映射没被禁用，但端口被禁用了也需要处理
-                continue;
-            }
+        for (ProxyMapping proxyMapping : proxyMappingList) {
+//            if (EnableStatusEnum.DISABLE.getStatus().equals(proxyMapping.getEnable())) {
+//                // 端口映射被禁用了，忽略 TODO 映射没被禁用，但端口被禁用了也需要处理  修改方案 20240306查询时就处理了【端口禁用】和【端口映射禁用】的情况，待验证
+//                continue;
+//            }
            try {
-                proxyMutualService.bindServerPort(cmdChannelAttachInfo, portMapping.getServerPort());
+                proxyMutualService.bindServerPort(cmdChannelAttachInfo, proxyMapping.getServerPort());

-                NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(portMapping.getProtocal());
+                NetworkProtocolEnum networkProtocolEnum = NetworkProtocolEnum.of(proxyMapping.getProtocal());
                if (networkProtocolEnum == NetworkProtocolEnum.UDP) {
-                    udpServerBootstrap.bind(portMapping.getServerPort()).get();
-                    log.info("bind UDP user port： {}", portMapping.getServerPort());
-                } else {
-                    tcpServerBootstrap.bind(portMapping.getServerPort()).get();
-                    log.info("bind TCP user port： {}", portMapping.getServerPort());
+                    udpServerBootstrap.bind(proxyMapping.getServerPort()).get();
+                    log.info("bind UDP user port： {}", proxyMapping.getServerPort());
+                } else if (proxyMapping.getServerPort() <= 65535){// 大于65535 的端口号是域名解析无需绑定服务端端口号
+                    tcpServerBootstrap.bind(proxyMapping.getServerPort()).get();
+                    log.info("bind TCP ServerPort： {}", proxyMapping.getServerPort());
                }
            } catch (Exception ex) {
                // BindException表示该端口已经绑定过
@@ -0,0 +1,15 @@
+package org.dromara.neutrinoproxy.server.service.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Accessors(chain = true)
+@Data
+public class FlowLimitBO {
+    private Long upLimitRate;
+    private Long downLimitRate;
+}
@@ -103,4 +103,20 @@ public class ParamCheckUtil {
        }
    }

+    /**
+     * 校验字节描述
+     * @param str
+     * @param params
+     */
+    public static void checkBytesDesc(String str, Object... params) {
+        // 允许为空
+        if (StrUtil.isEmpty(str)) {
+            return;
+        }
+        Long bytes = StringUtil.parseBytes(str);
+        if (null == bytes || bytes <= 0) {
+            throw ServiceException.create(ExceptionConstant.BYTES_DESC_INVALID, params);
+        }
+    }
+
 }
@@ -5,13 +5,13 @@ import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.ChannelAttribute;
 import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.constant.NetworkProtocolEnum;
-import org.dromara.neutrinoproxy.server.proxy.domain.CmdChannelAttachInfo;
-import org.dromara.neutrinoproxy.server.proxy.domain.ProxyAttachment;
-import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;
-import org.dromara.neutrinoproxy.server.proxy.domain.VisitorChannelAttachInfo;
+import org.dromara.neutrinoproxy.server.proxy.domain.*;
 import io.netty.channel.Channel;
 import io.netty.util.AttributeKey;
+import org.dromara.neutrinoproxy.server.service.DomainMappingService;
+import org.noear.solon.annotation.Inject;

 import java.net.InetSocketAddress;
 import java.util.*;
@@ -60,15 +60,19 @@ public class ProxyUtil {
 	 * 代理 - connect附加映射
 	 */
 	private static Map<String, ProxyAttachment> proxyConnectAttachmentMap = new HashMap<>();
-	/**
-	 * 子域名 - 服务端端口映射
-	 */
-	private static Map<String, Integer> subdomainToServerPort = new HashMap<>();
+
+
+    /**
+     * 域名 解析 映射
+     */
+    public static final Map<String, DomainMapping> domainMapingMap = new HashMap<>();
+
 	/**
 	 * licenseId - 客户端Id映射
 	 */
 	private static Map<Integer, String> licenseIdToClientIdMap = new HashMap<>();
-
+    @Inject
+    private DomainMappingService domainMappingService;
 	/**
 	 * 初始化代理信息
 	 * @param licenseId licenseId
@@ -79,6 +83,7 @@ public class ProxyUtil {
 		addProxyInfo(licenseId, proxyMappingList);
 	}

+
 	public static void addProxyInfo(Integer licenseId, List<ProxyMapping> proxyMappingList) {
 		if (!CollectionUtil.isEmpty(proxyMappingList)) {
 			for (ProxyMapping proxyMapping : proxyMappingList) {
@@ -338,31 +343,6 @@ public class ProxyUtil {
 		proxyConnectAttachmentMap.remove(visitorId);
 	}

-	/**
-	 * 设置子域名到服务端端口的映射
-	 * @param subdomain
-	 * @param serverPort
-	 */
-	public static void setSubdomainToServerPort(String subdomain, Integer serverPort) {
-		subdomainToServerPort.put(subdomain, serverPort);
-	}
-
-	/**
-	 * 删除子域名到服务端端口的映射
-	 * @param subdomain
-	 */
-	public static void removeSubdomainToServerPort(String subdomain) {
-		subdomainToServerPort.remove(subdomain);
-	}
-
-	/**
-	 * 根据子域名获取外网端口
-	 * @param subdomain
-	 * @return
-	 */
-	public static Integer getServerPortBySubdomain(String subdomain) {
-		return subdomainToServerPort.get(subdomain);
-	}

 	/**
 	 * 关闭http响应channel
@@ -0,0 +1,75 @@
+package org.dromara.neutrinoproxy.server.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+public class StringUtil {
+    private static final Integer BYTES_MUL_KB = 1024;
+    private static final Integer BYTES_MUL_MB = BYTES_MUL_KB * 1024;
+    private static final Integer BYTES_MUL_GB = BYTES_MUL_MB * 1024;
+    private static final String[] BYTES_UNIT_STR = {"B", "K", "KB", "M", "MB", "G", "GB"};
+    private static final Integer[] BYTES_UNIT_MUL = {1, BYTES_MUL_KB, BYTES_MUL_KB, BYTES_MUL_MB, BYTES_MUL_MB, BYTES_MUL_GB, BYTES_MUL_GB};
+    private static final String BYTES_DESC_REGEX = "\\s*(\\d+\\.*\\d*)\\s*(B|K|KB|M|MB|G|GB)\\s*";
+    private static final Pattern BYTES_DESC_PATTERN = Pattern.compile(BYTES_DESC_REGEX);
+
+    /**
+     * 校验是否符合字节描述
+     * @param desc
+     * @return
+     */
+    public static boolean isBytesDesc(String desc) {
+        if (StrUtil.isBlank(desc)) {
+            return false;
+        }
+        return desc.toUpperCase().matches(BYTES_DESC_REGEX);
+    }
+
+    /**
+     * 解析字节数
+     * 支持B、K、KB、M、MB、G、GB 忽略大小写、忽略首尾空格、忽略数字与单位之间的空格
+     * @param desc
+     * @return
+     */
+    public static Long parseBytes(String desc) {
+        try {
+            if (!isBytesDesc(desc)) {
+                return null;
+            }
+            Matcher matcher = BYTES_DESC_PATTERN.matcher(desc.toUpperCase());
+            boolean found = matcher.find();
+            if (!found) {
+                return null;
+            }
+            Double n = Double.parseDouble(matcher.group(1));
+            String unit = matcher.group(2);
+            Integer unitIndex = getBytesUnitIndex(unit);
+            if (null == unitIndex) {
+                return null;
+            }
+
+            return (long)(n * BYTES_UNIT_MUL[unitIndex]);
+        } catch (Exception e) {
+            // ignore
+        }
+
+        return null;
+    }
+
+    private static Integer getBytesUnitIndex(String unit) {
+        if (StrUtil.isBlank(unit)) {
+            return null;
+        }
+        for (int i = 0; i < BYTES_UNIT_STR.length; i++) {
+            if (unit.equals(BYTES_UNIT_STR[i])) {
+                return i;
+            }
+        }
+        return null;
+    }
+}
@@ -18,46 +18,46 @@ neutrino:
      boss-thread-count: 2
      work-thread-count: 10
      # 隧道非SSL端口
-      port: ${OPEN_PORT:9000}
+      port: 9000
      # 隧道SSL端口
-      ssl-port: ${SSL_PORT:9002}
+      ssl-port: 9002
      # 隧道SSL证书配置
-      key-store-password: ${STORE_PASS:123456}
-      key-manager-password: ${MGR_PASS:123456}
-      jks-path: ${JKS_PATH:classpath:/test.jks}
+      key-store-password: 123456
+      key-manager-password: 123456
+      jks-path: classpath:/test.jks
      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
-      transfer-log-enable: ${TUNNEL_LOG:false}
+      transfer-log-enable: false
      # 是否开启心跳日志
-      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
+      heartbeat-log-enable: false
    server:
      tcp:
        # 线程池相关配置，用于技术调优，可忽略
        boss-thread-count: 5
        work-thread-count: 20
        # http代理端口，默认80
-        http-proxy-port: ${HTTP_PROXY_PORT:80}
+        http-proxy-port: 80
        # https代理端口，默认443 （需要配置域名、证书）
-        https-proxy-port: ${HTTPS_PROXY_PORT:443}
+        https-proxy-port: 443
        # 如果不配置，则不支持域名映射
-        domain-name: ${DOMAIN_NAME:}
+        domain-name:
        # https证书配置
-        key-store-password: ${HTTPS_STORE_PASS:}
-        jks-path: ${HTTPS_JKS_PATH:}
+        key-store-password:
+        jks-path:
        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
-        transfer-log-enable: ${SERVER_LOG:false}
+        transfer-log-enable: false
      udp:
        # 线程池相关配置，用于技术调优，可忽略
        boss-thread-count: 5
        work-thread-count: 20
        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
-        transfer-log-enable: ${SERVER_LOG:false}
+        transfer-log-enable: false
  data:
    db:
      # 数据库类型，目前支持h2、mysql、mariadb
-      type: ${DB_TYPE:h2}
+      type: h2
      # 数据库连接URL
-      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
+      url: jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE
      # 数据库用户名
-      username: ${DB_USER:}
+      username:
      # 数据库密码
-      password: ${DB_PASSWORD:}
+      password:
@@ -5,7 +5,7 @@ server:
 solon:
  app:
    name: neutrino-proxy-server
-    version: @revision@
+    version: 2.0.1
  config:
    add: ./app.yml
 # 日志级别
@@ -55,14 +55,14 @@ neutrino:
        boss-thread-count: 5
        work-thread-count: 20
        # http代理端口，默认80
-        http-proxy-port: ${HTTP_PROXY_PORT:80}
+        http-proxy-port: ${HTTP_PR0OXY_PORT:80}
        # https代理端口，默认443 （需要配置域名、证书）
        https-proxy-port: ${HTTPS_PROXY_PORT:443}
        # 如果不配置，则不支持域名映射
-        domain-name: ${DOMAIN_NAME:}
+        domain-name: ${DOMAIN_NAME:server.com}
        # https证书配置
-        key-store-password: ${HTTPS_STORE_PASS:}
-        jks-path: ${HTTPS_JKS_PATH:}
+        key-store-password: ${HTTPS_STORE_PASS:123456}
+        jks-path: ${HTTPS_JKS_PATH:classpath:/test.jks}
        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
        transfer-log-enable: ${SERVER_LOG:false}
      udp:
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.DomainMappingMapper">
+    
+    <select id="selectDomainMappingByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.DomainMappingDO">
+        SELECT pm.*,l.is_online as isOnline
+        FROM domain_mapping  pm
+        LEFT JOIN license l ON pm.license_id = l.`id`
+        <where>
+            <if test="req.userId != null">
+                AND l.user_id = #{req.userId}
+            </if>
+            <if test="req.licenseId != null">
+                AND pm.license_id = #{req.licenseId}
+            </if>
+            <if test="req.domain != null">
+                AND pm.domain = #{req.domain}
+            </if>
+            <if test="req.isOnline != null">
+                AND l.is_online = #{req.isOnline}
+            </if>
+            <if test="req.enable != null">
+                AND pm.enable = #{req.enable}
+            </if>
+            <if test="req.protocal != null and req.protocal != ''">
+                AND pm.protocal = #{req.protocal}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND pm.description like #{req.description}
+            </if>
+        </where>
+        order by pm.id asc
+    </select>
+</mapper>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.LicenseMapper">
+
+<select id="findEnableProxyMappingListByLicenseId" resultType="org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping">
+    SELECT pm.license_id as licenseId, pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
+    FROM port_mapping pm
+    LEFT JOIN port_pool pp on pm.server_port = pp.port
+    WHERE pm.enable = 1 AND pm.is_online = 1 AND pp.enable = 1 AND pm.license_id = #{licenseId}
+    UNION ALL
+    SELECT dm.license_id as licenseId, dm.id as serverPort,dm.target_path as lanInfo, 'HTTP' as protocal
+    FROM domain_mapping dm
+    LEFT JOIN license l on dm.license_id = l.`id`
+    WHERE dm.enable = 1 AND l.is_online = 1 AND dm.license_id = #{licenseId}
+</select>
+
+<select id="findAllProxyMappingListByLicenseId" resultType="org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping">
+    SELECT pm.license_id as licenseId, pm.server_port as serverPort,CONCAT(pm.client_ip, ':', pm.client_port) as lanInfo, pm.protocal as protocal
+    FROM port_mapping pm
+    LEFT JOIN port_pool pp on pm.server_port = pp.port
+    WHERE pm.license_id = #{licenseId}
+    UNION ALL
+    SELECT dm.id as serverPort,dm.target_path as lanInfo, 'HTTP' as protocal
+    FROM domain_mapping dm
+    LEFT JOIN license l on dm.license_id = l.`id`
+    WHERE dm.license_id = #{licenseId}
+</select>
+</mapper>
@@ -48,7 +48,7 @@
        LEFT JOIN `user` u ON l.user_id = u.id
        LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_month GROUP BY license_id) frm ON l.id = frm.license_id
        LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_day
-        WHERE date >= #{curMonthBeginDate} AND #{curDayBeginDate}
+        WHERE date >= #{curMonthBeginDate} AND date &lt;= #{curDayBeginDate}
        GROUP BY license_id) frd ON l.id = frd.license_id
        LEFT JOIN (SELECT license_id,sum(write_bytes) write_bytes,sum(read_bytes) read_bytes from flow_report_minute
        WHERE date >= #{curDayBeginDate} AND date &lt;= #{curDate}
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO">
+        SELECT sg.* from security_group sg
+        <where>
+            <if test="req.name != null and req.name != '' ">
+                AND sg.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sg.description like #{req.description}
+            </if>
+            <if test="req.defaultPassType != null">
+                AND sg.default_pass_type like #{req.defaultPassType}
+            </if>
+            <if test="req.enable != null">
+                AND sg.enable like #{req.enable}
+            </if>
+        </where>
+        order by sg.id DESC
+    </select>
+</mapper>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO">
+        SELECT sr.* from security_rule sr
+        <where>
+            <if test="req.groupId != null">
+                AND sr.group_id = ${req.groupId}
+            </if>
+            <if test="req.name != null and req.name != '' ">
+                AND sr.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sr.description like #{req.description}
+            </if>
+            <if test="req.passType != null">
+                AND sr.pass_type like #{req.passType}
+            </if>
+            <if test="req.enable != null">
+                AND sr.enable like #{req.enable}
+            </if>
+        </where>
+        order by sr.id DESC
+    </select>
+</mapper>
@@ -52,8 +52,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255),
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
-    `default_pass_type` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
+    `default_pass_type` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
@@ -66,10 +66,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255) NOT NULL,
    `rule` text NOT NULL,
-    `pass_type` VARCHAR(20) NOT NULL,
+    `pass_type` INTEGER NOT NULL,
    `priority` INTEGER NOT NULL,
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
@@ -83,6 +83,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` VARCHAR(50) NOT NULL,
    `key` VARCHAR(100) NOT NULL,
    `user_id` INTEGER NOT NULL,
+    `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+    `down_limit_rate` VARCHAR(20) DEFAULT NULL,
    `is_online` INTEGER(2) NOT NULL,
    `enable` INTEGER(2) NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
@@ -95,10 +97,11 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
  `license_id` INTEGER(20) NOT NULL,
  `protocal` VARCHAR(10) NOT NULL DEFAULT 'TCP',
-  `subdomain` VARCHAR(50) DEFAULT NULL,
  `server_port` INTEGER NOT NULL,
  `client_ip` VARCHAR(20) NOT NULL,
  `client_port` INTEGER NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
  `is_online` INTEGER(2) NOT NULL,
  `description` VARCHAR(100) DEFAULT NULL,
  `proxy_responses` INTEGER(20) NOT NULL DEFAULT 0,
@@ -167,8 +170,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -183,8 +186,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -199,8 +202,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -215,8 +218,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -225,3 +228,21 @@ CREATE INDEX IF NOT EXISTS I_flow_report_month_create_time ON flow_report_month(
 CREATE INDEX IF NOT EXISTS I_flow_report_month_date ON flow_report_month(`date`);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_user_id ON flow_report_month(`user_id`);
 CREATE INDEX IF NOT EXISTS I_flow_report_month_license_id ON flow_report_month(`license_id`);
+
+# 域名 映射表 AUTO_INCREMENT 设置65550 避开端口号0-65535，减少域名解析代码修改
+CREATE TABLE IF NOT EXISTS `domain_mapping` (
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `license_id` INTEGER(20) NOT NULL,
+  `protocal` VARCHAR(10) NOT NULL DEFAULT 'HTTP',
+  `domain` VARCHAR(50) DEFAULT NULL,
+  `target_path` VARCHAR(50) NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `description` VARCHAR(100) DEFAULT NULL,
+  `request_header` INTEGER(20) NOT NULL DEFAULT 0,
+  `enable` INTEGER(2) NOT NULL,
+  `security_group_id` INTEGER(20) NOT NULL DEFAULT 0,
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
+) AUTO_INCREMENT = 65550;
+CREATE UNIQUE INDEX IF NOT EXISTS I_domain_mapping_domain ON domain_mapping (`domain` ASC);
@@ -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, now(), now());
+(1, '测试客户端', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());
@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1,'test3', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1,'test3', now(), now());
@@ -9,33 +9,3 @@ INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update
 (4, 1, 9104, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (5, 1, 9105, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(6, 1, 9106, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(7, 1, 9107, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(8, 1, 9108, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(9, 1, 9109, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(10, 1, 9110, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(11, 1, 9111, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(12, 1, 9112, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(13, 1, 9113, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(14, 1, 9114, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(15, 1, 9115, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(16, 1, 9116, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(17, 1, 9117, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(18, 1, 9118, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(19, 1, 9119, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(20, 1, 9120, 1, now(), now());
@@ -1,12 +0,0 @@
-ALTER TABLE port_pool ADD group_id INTEGER NOT NULL DEFAULT 1;
-
-#端口分组
-CREATE TABLE IF NOT EXISTS `port_group` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-    `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
-);
@@ -1,3 +0,0 @@
-ALTER TABLE port_mapping ADD `protocal` varchar(10) NOT NULL DEFAULT 'TCP';
-ALTER TABLE port_mapping ADD `subdomain` varchar(50) DEFAULT NULL;
-ALTER TABLE port_mapping ADD `description` varchar(100);
@@ -1,2 +0,0 @@
-ALTER TABLE port_mapping ADD `proxy_responses` INTEGER(20) NOT NULL DEFAULT 0;
-ALTER TABLE port_mapping ADD `proxy_timeout_ms` INTEGER(20) NOT NULL DEFAULT 0;
@@ -1,30 +0,0 @@
-#安全组
-CREATE TABLE IF NOT EXISTS `security_group` (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `name` VARCHAR(20) NOT NULL,
-    `description` VARCHAR(255),
-    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
-    `default_pass_type` VARCHAR(20) NOT NULL,
-    `create_time` TIMESTAMP NOT NULL,
-    `update_time` TIMESTAMP NOT NULL,
-    PRIMARY KEY (`id`)
-);
-
-#安全组规则
-CREATE TABLE IF NOT EXISTS `security_rule` (
-    `id` INTEGER NOT NULL AUTO_INCREMENT,
-    `group_id` INTEGER NOT NULL,
-    `name` VARCHAR(20) NOT NULL,
-    `description` VARCHAR(255) NOT NULL,
-    `rule` text NOT NULL,
-    `pass_type` VARCHAR(20) NOT NULL,
-    `priority` INTEGER NOT NULL,
-    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
-    `create_time` TIMESTAMP NOT NULL,
-    `update_time` TIMESTAMP NOT NULL,
-    PRIMARY KEY (`id`)
-);
-CREATE INDEX IF NOT EXISTS I_security_rule_group_id ON security_rule(group_id);
-ALTER TABLE `port_mapping` ADD COLUMN IF NOT EXISTS `security_group_id` INTEGER DEFAULT 0;
@@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` varchar(20) NOT NULL COMMENT '安全组名称',
    `description` varchar(255) COMMENT '安全组描述',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`)
@@ -70,10 +70,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` varchar(20) NOT NULL COMMENT '规则名称',
    `description` varchar(255) NOT NULL COMMENT '规则描述',
    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
+    `pass_type` int NOT NULL COMMENT '放行类型',
    `priority` int(1) NOT NULL COMMENT '优先级',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
@@ -87,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` varchar(50) NOT NULL COMMENT 'license名称',
    `key` varchar(100) NOT NULL COMMENT 'license key',
    `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -100,10 +102,11 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
    `license_id` int NOT NULL COMMENT 'licenseID',
    `protocal` varchar(10) NOT NULL DEFAULT 'TCP' COMMENT '协议',
-    `subdomain` varchar(50) DEFAULT NULL COMMENT '子域名（仅HTTP时有效）',
    `server_port` int NOT NULL COMMENT '服务端端口',
    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
    `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `description` varchar(100) DEFAULT NULL COMMENT '描述',
    `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
@@ -238,3 +241,22 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
    KEY `I_flow_report_month_user_id` (`user_id`),
    KEY `I_flow_report_month_license_id` (`license_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+# 域名 映射表 AUTO_INCREMENT 设置65550 避开端口号0-65535，减少域名解析代码修改
+CREATE TABLE IF NOT EXISTS `domain_mapping` (
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `license_id` INTEGER(20) NOT NULL,
+  `protocal` VARCHAR(10) NOT NULL DEFAULT 'HTTP',
+  `domain` VARCHAR(50) DEFAULT NULL,
+  `target_path` VARCHAR(50) NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `description` VARCHAR(100) DEFAULT NULL,
+  `request_header` INTEGER(20) NOT NULL DEFAULT 0,
+  `enable` INTEGER(2) NOT NULL,
+  `security_group_id` INTEGER(20) NOT NULL DEFAULT 0,
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
+) AUTO_INCREMENT = 65550;
+CREATE UNIQUE INDEX IF NOT EXISTS I_domain_mapping_domain ON domain_mapping (`domain` ASC);
@@ -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, now(), now());
+(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());
@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1,'test3', now(), now());
@@ -9,33 +9,3 @@ INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update
 (4, 1, 9104, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (5, 1, 9105, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(6, 1, 9106, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(7, 1, 9107, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(8, 1, 9108, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(9, 1, 9109, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(10, 1, 9110, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(11, 1, 9111, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(12, 1, 9112, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(13, 1, 9113, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(14, 1, 9114, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(15, 1,  9115, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(16, 1,  9116, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(17, 1,  9117, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(18, 1,  9118, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(19, 1,  9119, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(20, 1,  9120, 1, now(), now());
@@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` varchar(20) NOT NULL COMMENT '安全组名称',
    `description` varchar(255) COMMENT '安全组描述',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`)
@@ -70,10 +70,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` varchar(20) NOT NULL COMMENT '规则名称',
    `description` varchar(255) NOT NULL COMMENT '规则描述',
    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
+    `pass_type` int NOT NULL COMMENT '放行类型',
    `priority` int(1) NOT NULL COMMENT '优先级',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
@@ -87,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` varchar(50) NOT NULL COMMENT 'license名称',
    `key` varchar(100) NOT NULL COMMENT 'license key',
    `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -100,10 +102,11 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
    `license_id` int NOT NULL COMMENT 'licenseID',
    `protocal` varchar(10) NOT NULL DEFAULT 'TCP' COMMENT '协议',
-    `subdomain` varchar(50) DEFAULT NULL COMMENT '子域名（仅HTTP时有效）',
    `server_port` int NOT NULL COMMENT '服务端端口',
    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
    `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `description` varchar(100) DEFAULT NULL COMMENT '描述',
    `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
@@ -239,3 +242,20 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
    KEY `I_flow_report_month_license_id` (`license_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

+# 域名 映射表 AUTO_INCREMENT 设置65550 避开端口号0-65535，减少域名解析代码修改
+CREATE TABLE IF NOT EXISTS `domain_mapping` (
+  `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  `license_id` INTEGER(20) NOT NULL,
+  `protocal` VARCHAR(10) NOT NULL DEFAULT 'HTTP',
+  `domain` VARCHAR(50) DEFAULT NULL,
+  `target_path` VARCHAR(50) NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `description` VARCHAR(100) DEFAULT NULL,
+  `request_header` INTEGER(20) NOT NULL DEFAULT 0,
+  `enable` INTEGER(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+  `security_group_id` INTEGER(20) NOT NULL DEFAULT 0,
+  `create_time` TIMESTAMP NOT NULL,
+  `update_time` TIMESTAMP NOT NULL
+) AUTO_INCREMENT = 65550;
+CREATE UNIQUE INDEX IF NOT EXISTS I_domain_mapping_domain ON domain_mapping (`domain` ASC);
@@ -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, now(), now());
+(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());
@@ -1,7 +1,7 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, 1, 9101, 'HTTP', 'test1', '127.0.0.1', 8080, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(2, 1, 9102, 'TCP', '', '127.0.0.1', 3306, 2, 1, now(), now());
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `subdomain`, `client_ip`, `client_port`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(3, 1, 9103, 'HTTP', 'test2', '127.0.0.1', 8081, 2, 1, now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
+(1, 1, 9101, 'HTTP', '127.0.0.1', 8080, 2, 1,'test1', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(2, 1, 9102, 'TCP', '127.0.0.1', 3306, 2, 1,'test2', now(), now());
+INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`, `client_ip`, `client_port`, `is_online`, `enable`,`description`, `create_time`, `update_time`) VALUES
+(3, 1, 9103, 'HTTP', '127.0.0.1', 8081, 2, 1,'test3', now(), now());
@@ -9,33 +9,3 @@ INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update
 (4, 1, 9104, 1, now(), now());
 INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
 (5, 1, 9105, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(6, 1, 9106, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(7, 1, 9107, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(8, 1, 9108, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(9, 1, 9109, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(10, 1, 9110, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(11, 1, 9111, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(12, 1, 9112, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(13, 1, 9113, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(14, 1, 9114, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(15, 1,  9115, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(16, 1,  9116, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(17, 1,  9117, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(18, 1,  9118, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(19, 1,  9119, 1, now(), now());
-INSERT INTO port_pool(`id`, `group_id`, `port`, `enable`, `create_time`, `update_time`) VALUES
-(20, 1,  9120, 1, now(), now());
@@ -1,13 +0,0 @@
-ALTER TABLE port_pool ADD group_id INT NOT NULL DEFAULT 1 COMMENT "分组ID";
-
-#端口分组
-CREATE TABLE IF NOT EXISTS `port_group` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `name` varchar(255) NOT NULL COMMENT '分组名称',
-    `possessor_type` int NOT NULL DEFAULT '0' COMMENT '所有者类型 (0、全局共享 1、用户所有 2License所有) ',
-    `possessor_id` int NOT NULL DEFAULT '-1' COMMENT '所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)',
-    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
-    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
-    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='端口分组';
@@ -1,3 +0,0 @@
-ALTER TABLE port_mapping ADD `protocal` varchar(10) NOT NULL DEFAULT 'TCP' COMMENT '协议';
-ALTER TABLE port_mapping ADD `subdomain` varchar(50) DEFAULT NULL COMMENT '子域名（仅HTTP时有效）';
-ALTER TABLE port_mapping ADD `description` varchar(100) DEFAULT NULL COMMENT '描述';
@@ -1,2 +0,0 @@
-ALTER TABLE port_mapping ADD `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量';
-ALTER TABLE port_mapping ADD `proxy_timeout_ms` int NOT NULL DEFAULT 0 COMMENT '代理超时毫秒数';
@@ -1,8 +0,0 @@
-ALTER TABLE `flow_report_minute` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
-ALTER TABLE `flow_report_minute` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
-ALTER TABLE `flow_report_hour` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
-ALTER TABLE `flow_report_hour` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
-ALTER TABLE `flow_report_day` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
-ALTER TABLE `flow_report_day` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
-ALTER TABLE `flow_report_month` MODIFY COLUMN `read_bytes` BIGINT NOT NULL COMMENT '读取流量';
-ALTER TABLE `flow_report_month` MODIFY COLUMN `write_bytes` BIGINT NOT NULL COMMENT '写入流量';
@@ -1,32 +0,0 @@
-#安全组
-CREATE TABLE IF NOT EXISTS `security_group` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `name` varchar(20) NOT NULL COMMENT '安全组名称',
-    `description` varchar(255) COMMENT '安全组描述',
-    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
-    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
-    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-#安全组规则
-CREATE TABLE IF NOT EXISTS `security_rule` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `group_id` int NOT NULL COMMENT '关联安全组',
-    `name` varchar(20) NOT NULL COMMENT '规则名称',
-    `description` varchar(255) NOT NULL COMMENT '规则描述',
-    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
-    `priority` int(1) NOT NULL COMMENT '优先级',
-    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
-    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    KEY `I_security_rule_group_id_priority` (`group_id`, `priority`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-# port_mapping表增加字段
-ALTER TABLE `port_mapping` ADD COLUMN `security_group_id` int DEFAULT 0 COMMENT '安全组Id';
@@ -1,19 +0,0 @@
-package org.dromara.neutrinoproxy.server;
-
-import org.dromara.neutrinoproxy.core.util.NeutrinoProxyVersion;
-import org.dromara.neutrinoproxy.server.app.AppBaseTest;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:51
- */
-public class VersionTest extends AppBaseTest {
-
-    @Test
-    public void testVersion() {
-        Assert.assertNotNull(NeutrinoProxyVersion.getVersion());
-        System.out.println("version: " + NeutrinoProxyVersion.getVersion());
-    }
-}
@@ -1,15 +0,0 @@
-package org.dromara.neutrinoproxy.server.app;
-
-import org.dromara.neutrinoproxy.server.ProxyServer;
-import org.junit.runner.RunWith;
-import org.noear.solon.test.SolonJUnit4ClassRunner;
-import org.noear.solon.test.SolonTest;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:56
- */
-@SolonTest(value = ProxyServer.class, properties = "server.port=18888")
-@RunWith(SolonJUnit4ClassRunner.class)
-public class AppBaseTest {
-}
@@ -6,13 +6,7 @@ article: false
 ---

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

 ## 1、快速上手须知
@@ -5,13 +5,13 @@ permalink: /pages/eebea1/
 ---

 ## 1、环境准备
- 首先确保已安装Java17运行环境
- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jar.zip`、`neutrino-proxy-client-jar.zip`
+- 首先确保已安装Java21运行环境
+- 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载最新的release包：`neutrino-proxy-server-jdk21-2.0.1-jar.zip`、`neutrino-proxy-client-jdk21-2.0.1-jar.zip`


 ## 2、部署服务端
 - 在服务器上新建部署目录：`/work/projects/neutrino-proxy-server`
- 将`neutrino-proxy-server-jar.zip`上传至服务器部署目录,并解压
+- 将`neutrino-proxy-server-jdk21-2.0.1-jar.zip`上传至服务器部署目录,并解压
 - 执行命令`java -Dfile.encoding=utf-8 -jar neutrino-proxy-server.jar`启动服务端完成部署，默认使用h2数据库。
 - 若需要指定自己的mysql数据库，则需要在当前目录下的`app.yml`文件中，修改数据库配置如下：

@@ -32,7 +32,7 @@ neutrino:
 - 可参照 https://gitee.com/dromara/neutrino-proxy/blob/master/scripts/unix/server_start.sh 使用shell脚本启动服务端。

 ## 3、部署客户端
- 本地解压`neutrino-proxy-client-jar.zip`文件
+- 本地解压`neutrino-proxy-client-jdk21-2.0.1-jar.zip`文件
 - 修改`app.yml`文件中的server-ip为服务器公网ip，并配置license-key，以下是相关的部分配置：
 ```yml
 neutrino:
@@ -12,7 +12,7 @@ docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
 -v /root/neutrino-proxy-server/config:/root/neutrino-proxy/config \
 -v /root/neutrino-proxy-server/data:/root/neutrino-proxy/data \
 -v /root/neutrino-proxy-server/logs:/root/neutrino-proxy/logs \
-registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
+aoshiguchen/neutrino-proxy-server:latest
 ```

 ### 指定自己的mysql数据库
@@ -18,7 +18,7 @@ permalink: /pages/69699a/

 ## 1、安装包下载
 - 打开[发行版页面](https://gitee.com/dromara/neutrino-proxy/releases)，下载所需的最新的release包：
- 比如服务器为linux则可下载`neutrino-proxy-server-ubuntu-20.04-native.zip`文件，客户端为windows则可下载`neutrino-proxy-client-windows-2022-native.zip`
+- 比如服务器为linux则可下载`neutrino-proxy-server-linux-2.0.1-native.zip`文件，客户端为windows则可下载`neutrino-proxy-client-windows-2.0.1-native.zip`

 ## 2、部署服务端
 - 将服务端安装包上传至服务器，并解压
@@ -17,8 +17,22 @@ article: false
 # 代理配置
 - License管理：License是客户端连接服务端的唯一合法凭证。一个License同时只能被一个客户端使用，一个License可以维护多条端口映射
 - 端口映射：服务端IP+端口 -> 客户端IP+端口的四元组映射(因目前服务端单节点只有一个公网IP，所以不体现出来)，是内网穿透的基本单元。
+- 限速：
+  - 默认所有代理没有限速
+  - 对License限速，将使得License下的所有端口映射都被限速
+  - 若License设置了限速，License下的某条映射也设置了限速，则对于该映射优先采用端口映射上的限速规则
+
+<img :src="$withBase('/img/run-example/license2.png')"></img>
+<img :src="$withBase('/img/run-example/port-mapping2.png')"></img>
+
+# 安全组
+一个端口映射可绑定一个安全组，通过安全组的默认放行类型 + 安全组下的安全规则 控制该端口映射的安全访问规则。
+- 场景1: 内部服务，穿透出来自己使用，不希望被其他人访问。端口映射可关联一个默认放行类型为“拒绝”的安全组，安全组下新增安全规则，将本地的出口ip添加到允许放行规则中。
+- 场景2：公网服务，穿透出来开放给大家使用，但是希望拒绝某些IP访问。端口映射可关联一个默认放行类型为“允许”的安全组，安全组下新增安全规则，将黑名单ip添加到拒绝放行规则中。
+
+<img :src="$withBase('/img/run-example/security-group1.png')"></img>
+<img :src="$withBase('/img/run-example/security-rule1.png')"></img>

-<img :src="$withBase('/img/run-example/license1.png')"></img>

 # 系统管理
 - 用户管理：支持多用户，一个用户可持有多个License。由于项目目前主推个人版，所以暂是没有权限这一套，管理员之外的所有用户都属于游客。对于绝大多数操作，游客仅有只读权限。
@@ -44,4 +58,4 @@ article: false
 - 登录日志：管理后端登录、退出登录的日志
 - 客户端连接日志：客户端连接、断开的日志

-<img :src="$withBase('/img/run-example/login-log1.png')"></img>
+<img :src="$withBase('/img/run-example/login-log1.png')"></img>
@@ -11,9 +11,9 @@ permalink: /pages/1ab20b/
 |:-----|:-----|:----------------------|
 | 任意金额 | -    | 您将获得赞助者列表的永久留名。       |
 | 30   | 一个月  | 您在群内反馈的问题将优先得到作者响应    |
-| 80   | 三个月  | 获得微信一对一的咨询服务          |
-| 180  | 三个月  | 获得官网首页特别赞助席位一个，一次远程协助 |
-| 更多金额 |-| 您将获得私人定制服务            |
+| 120  | 三个月  | 获得微信一对一的咨询服务          |
+| 399  | 六个月  | 获得官网首页特别赞助席位一个，一次远程协助 |
+| 更多金额 | -    | 您将获得私人定制服务            |

 > 注意1：服务项目是逐级叠加：如，您赞赏的金额是 80 员那么您将享受：任意金额、一个月、三个月的服务内容

@@ -6,6 +6,15 @@ permalink: /pages/cded59/

 | 日期         | 渠道 | 金额   |昵称| 备注               |
 |:-----------|:---|:-----|:-|:-----------------|
+|2023-12-28|微信红包|50|雪猫|请大佬吃肯德基|
+|2023-12-27|微信红包|50|D|请大佬喝杯茶|
+|2023-12-25|微信赞赏码|30|Simen|伟大的项目，尽点绵薄之力|
+|2023-12-25|微信红包|50|KAI|大佬加油|
+|2023-12-22|微信赞赏|30|walking|好东西必须支持一下|
+|2023-12-21|微信红包|100|洗最大的碗|中微子越来越强大，雨哥越来越富有|
+|2023-12-15|Gitee捐助|10|一杯香梨||
+|2023-12-12|微信红包|50|喜鸽小宝||
+|2023-11-30|支付宝收款码|30|*平|大佬继续加油|
 |2023-11-30|Gitee捐助|10|26263|感谢您的开源项目！|
 |2023-11-30|微信红包|10|姫野永遠||
 | 2023-11-26 |微信转账|180|Teacher Du||
@@ -0,0 +1,20 @@
+---
+title: 2024年
+date: 2024-04-16 19:22:05
+permalink: /pages/acdf0a/
+---
+
+
+| 日期         | 渠道 | 金额   |昵称| 备注                                    |
+|:-----------|:---|:-----|:-|:--------------------------------------|
+| 2024-04-16 |微信转账|100|暮光：城中城|                                       |
+| 2024-04-03 |微信转账|100|仲秀| 大神，非常感谢                               |
+| 2024-03-24 |Gitee捐助|10|include|
+| 2024-03-24 |微信赞赏码|9|宗| 麻烦了，最好能加一个返回公网IP。<br/>不知道有没有几乎通用的方案   |
+| 2024-03-22 |微信红包|20|不允| 请你吃外卖                                 |
+| 2024-03-12 |微信红包|50|喜鸽小宝|
+| 2024-02-12 |微信红包|50|喜鸽小宝|
+| 2024-02-02 |微信红包|38.88|不请自来君|
+| 2024-01-24 |Gitee捐助|30|唐吉诃德| 感谢您的开源项目！是一个不错的项目！<br/>希望继续完善界面UI的设计。 |
+| 2024-01-20 |微信红包|shiyongsway|8.88|
+| 2024-01-17 |微信红包|50|喜鸽小宝|                                       |
@@ -4,6 +4,16 @@ date: 2023-10-26 17:43:43
 permalink: /pages/ff3519/
 ---

+## 2.0.1
+- jdk版本升级为21
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题
+- 升级须知：
+  - jdk版本升级为了jdk21，jar部署时请注意
+  - 涉及到表结构变更，执行[增量SQL](https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20231215.SQL)
+
 ## 2.0.0
 - solon版本升级为`2.5.11`
 - jdk版本升级为17
@@ -3,7 +3,7 @@ title: 里程碑
 date: 2023-10-26 17:41:26
 permalink: /pages/e406dd/
 ---
-
+- 2023-12-21 2.0.1版本发布，jdk版本升级到21，支持安全组(黑/白名单IP限制)、限速
 - 2023-10-31 2.0.0版本发布，升级jdk版本至jdk17、支持原生编译、去掉sqlite改为默认H2数据库
 - 2023-09-25 中微子代理Gitee Star数突破1000
 - 2023-09-22 1.9.0版本发布，端口映射支持UDP协议
@@ -13,12 +13,12 @@ features: # 可选的
    details: 首页图表、报表管理多维度流量监控。全方位掌握实时、历史代理数据。
  - title: 域名映射
    details: HTTP代理绑定子域名，开发调试三方回调更方便。
-  - title: 用户/License
-    details: 支持多用户、多客户端使用。后台禁用实时生效。
-  - title: 端口池
-    details: 对外端口统一管理，支持用户、License独占端口。
-  - title: 端口映射
-    details: 新增、编辑、删除、禁用实时生效。
+  - title: 管理后台
+    details: 使用端口池统一管理对外代理端口，支持多用户、多客户端使用。端口/用户/License/端口映射在后台禁用实时生效。
+  - title: 安全组
+    details: 安全组模块支持黑/白名单IP访问限制。
+  - title: 限速
+    details: 支持对License、端口映射限制上传、下载速率
  - title: Docker
    details: 服务端/客户端支持Docker一键部署。
  - title: 隧道SSL加密
@@ -148,11 +148,15 @@ postList: none
    <div class="card-list">
        <a href="https://www.xigexb.com?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#102863;--random-color:#102863;color:#FFFFFF;">
            <img src="img/sponsor/xigexiaobao.jpg" class="no-zoom"> 
-            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。</p></div>
+            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。<br/>&nbsp;</p></div>
        </a>
        <a href="https://7bu.top?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#c6ddff;--random-color:#c6ddff;color:#000000;">
            <img src="img/sponsor/7bu.ico" class="no-zoom"> 
-            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。</p></div>
+            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。<br/>&nbsp;</p></div>
+        </a>
+        <a href="http://doc.zyplayer.com/#/integrate/zyplayer-doc?utm=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#486898;--random-color:#c6ddff;color:#FFFFFF;">
+            <img src="img/sponsor/zyplayer-doc.png" class="no-zoom"> 
+            <div><p class="name">zyplayer-doc</p> <p class="desc">私有化部署的企业级文档管理与知识库AI问答平台。</p></div>
        </a>
    </div>
 </div>
@@ -4,8 +4,8 @@
  "scripts": {
    "dev": "vuepress dev docs",
    "build": "vuepress build docs",
-    "buildAndDeploy": "vuepress build docs && bash deploy.sh",
-    "deploy": "bash deploy.sh",
+    "buildAndDeploy": "vuepress build docs && bash deploy/deploy2.sh",
+    "deploy": "bash deploy/deploy2.sh",
    "updateTheme": "yarn remove vuepress-theme-vdoing && rm -rf node_modules && yarn && yarn add vuepress-theme-vdoing -D",
    "editFm": "node utils/editFrontmatter.js"
  },
@@ -7,7 +7,7 @@
    <parent>
        <groupId>org.noear</groupId>
        <artifactId>solon-parent</artifactId>
-        <version>2.5.12</version>
+        <version>2.7.6</version>
        <relativePath />
    </parent>

@@ -26,7 +26,7 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <revision>2.0.1-SNAPSHOT</revision>
+        <revision>2.0.1</revision>

        <native.version>0.9.28</native.version>

@@ -2,6 +2,7 @@
 # 中微子代理客户端编译打包脚本，基础参数请自行修改

 export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
+#export JAVA_HOME=/Users/yangwen/my/service/jdk/jdk17/jdk-17.0.4.1.jdk/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin

@@ -5,9 +5,11 @@ export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin

+MODULE_NAME=neutrino-proxy-client
 deployDir="deploy"
 clientDeployDir=$deployDir"/client"
 machine=macos
+VER=2.0.1

 #切到项目根目录
 cd ../..
@@ -15,38 +17,38 @@ cd ../..
 mkdir -p $clientDeployDir

 # 删除原来的编译文件
-rm -rf $clientDeployDir/neutrino-proxy-client.jar
-rm -rf $clientDeployDir/neutrino-proxy-client
-rm -rf $clientDeployDir/neutrino-proxy-client-jar
-rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
-rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native
-rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native.zip
+rm -rf $clientDeployDir/$MODULE_NAME.jar
+rm -rf $clientDeployDir/$MODULE_NAME
+rm -rf $clientDeployDir/$MODULE_NAME-jdk21-$VER-jar
+rm -rf $clientDeployDir/$MODULE_NAME-jdk21-$VER-jar.zip
+rm -rf $clientDeployDir/$MODULE_NAME-$machine-$VER-native
+rm -rf $clientDeployDir/$MODULE_NAME-$machine-$VER-native.zip

 #客户端打包
-mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
-cd neutrino-proxy-client
+mvn clean install -U -pl $MODULE_NAME -am -Dmaven.test.skip=true
+cd $MODULE_NAME
 mvn clean native:compile -P native -DskipTests
 cd ..

 # 给执行权限
-chmod +x ./neutrino-proxy-client/target/neutrino-proxy-client
+chmod +x ./$MODULE_NAME/target/$MODULE_NAME

 # 拷贝到deploy目录下
-cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
-cp ./neutrino-proxy-client/target/neutrino-proxy-client $clientDeployDir/neutrino-proxy-client
+cp ./$MODULE_NAME/target/$MODULE_NAME.jar $clientDeployDir/$MODULE_NAME.jar
+cp ./$MODULE_NAME/target/$MODULE_NAME $clientDeployDir/$MODULE_NAME

 #打zip包，用于发版
 cd $clientDeployDir
 ## jar
-mkdir neutrino-proxy-client-jar
-cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
-cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-jar/app.yml
-zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
-rm -rf ./neutrino-proxy-client-jar
+mkdir $MODULE_NAME-jdk21-$VER-jar
+cp ../../$MODULE_NAME/target/$MODULE_NAME.jar ./$MODULE_NAME-jdk21-$VER-jar/$MODULE_NAME.jar
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-jdk21-$VER-jar/app.yml
+zip -r $MODULE_NAME-jdk21-$VER-jar.zip ./$MODULE_NAME-jdk21-$VER-jar
+rm -rf ./$MODULE_NAME-jdk21-$VER-jar

 ## native
-mkdir neutrino-proxy-client-${machine}-native
-cp ../../neutrino-proxy-client/target/neutrino-proxy-client ./neutrino-proxy-client-${machine}-native/neutrino-proxy-client
-cp ../../neutrino-proxy-client/src/main/resources/app-copy.yml ./neutrino-proxy-client-${machine}-native/app.yml
-zip -r neutrino-proxy-client-${machine}-native.zip ./neutrino-proxy-client-${machine}-native
-rm -rf ./neutrino-proxy-client-${machine}-native
+mkdir $MODULE_NAME-$machine-$VER-native
+cp ../../$MODULE_NAME/target/$MODULE_NAME ./$MODULE_NAME-$machine-$VER-native/$MODULE_NAME
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-$machine-$VER-native/app.yml
+zip -r $MODULE_NAME-$machine-$VER-native.zip ./$MODULE_NAME-$machine-$VER-native
+rm -rf ./$MODULE_NAME-$machine-$VER-native
@@ -2,6 +2,7 @@
 # 中微子代理服务端编译打包脚本，基础参数请自行修改

 export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
+#export JAVA_HOME=/Users/yangwen/my/service/jdk/jdk17/jdk-17.0.4.1.jdk/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin

@@ -5,9 +5,11 @@ export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin

+MODULE_NAME=neutrino-proxy-server
 deployDir="deploy"
 serverDeployDir=$deployDir"/server"
 machine=macos
+VER=2.0.1

 #切到项目根目录
 cd ../..
@@ -15,12 +17,12 @@ cd ../..
 mkdir -p $serverDeployDir

 # 删除原来的编译文件
-rm -rf $serverDeployDir/neutrino-proxy-server.jar
-rm -rf $serverDeployDir/neutrino-proxy-server
-rm -rf $serverDeployDir/neutrino-proxy-server-jar
-rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
-rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native
-rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
+rm -rf $serverDeployDir/$MODULE_NAME.jar
+rm -rf $serverDeployDir/$MODULE_NAME
+rm -rf $serverDeployDir/$MODULE_NAME-jdk21-$VER-jar
+rm -rf $serverDeployDir/$MODULE_NAME-jdk21-$VER-jar.zip
+rm -rf $serverDeployDir/$MODULE_NAME-$machine-$VER-native
+rm -rf $serverDeployDir/$MODULE_NAME-$machine-$VER-native.zip

 # 不需要每次都重新编译一次前端代码，如果前端代码有变更，编译前需要手动执行`admin_build_docker.sh`
 ##前端页面打包
@@ -32,30 +34,30 @@ rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
 #cp -rf ./neutrino-proxy-admin/dist/ ./neutrino-proxy-server/src/main/resources/static

 #服务端打包
-mvn clean install -U -pl neutrino-proxy-server -am -Dmaven.test.skip=true
-cd neutrino-proxy-server
+mvn clean install -U -pl $MODULE_NAME -am -Dmaven.test.skip=true
+cd $MODULE_NAME
 mvn clean native:compile -P native -DskipTests
 cd ..

 # 给执行权限
-chmod +x ./neutrino-proxy-server/target/neutrino-proxy-server
+chmod +x ./$MODULE_NAME/target/$MODULE_NAME

 # 拷贝到deploy目录下
-cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
-cp ./neutrino-proxy-server/target/neutrino-proxy-server $serverDeployDir/neutrino-proxy-server
+cp ./$MODULE_NAME/target/$MODULE_NAME.jar $serverDeployDir/$MODULE_NAME.jar
+cp ./$MODULE_NAME/target/$MODULE_NAME $serverDeployDir/$MODULE_NAME

 #打zip包，用于发版
 cd $serverDeployDir
 ## jar
-mkdir neutrino-proxy-server-jar
-cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
-cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-jar/app.yml
-zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
-rm -rf ./neutrino-proxy-server-jar
+mkdir $MODULE_NAME-jdk21-$VER-jar
+cp ../../$MODULE_NAME/target/$MODULE_NAME.jar ./$MODULE_NAME-jdk21-$VER-jar/$MODULE_NAME.jar
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-jdk21-$VER-jar/app.yml
+zip -r $MODULE_NAME-jdk21-$VER-jar.zip ./$MODULE_NAME-jdk21-$VER-jar
+rm -rf ./$MODULE_NAME-jdk21-$VER-jar

 ## native
-mkdir neutrino-proxy-server-${machine}-native
-cp ../../neutrino-proxy-server/target/neutrino-proxy-server ./neutrino-proxy-server-${machine}-native/neutrino-proxy-server
-cp ../../neutrino-proxy-server/src/main/resources/app-copy.yml ./neutrino-proxy-server-${machine}-native/app.yml
-zip -r neutrino-proxy-server-${machine}-native.zip ./neutrino-proxy-server-${machine}-native
-rm -rf ./neutrino-proxy-server-${machine}-native
+mkdir $MODULE_NAME-$machine-$VER-native
+cp ../../$MODULE_NAME/target/$MODULE_NAME ./$MODULE_NAME-$machine-$VER-native/$MODULE_NAME
+cp ../../$MODULE_NAME/src/main/resources/app-copy.yml ./$MODULE_NAME-$machine-$VER-native/app.yml
+zip -r $MODULE_NAME-$machine-$VER-native.zip ./$MODULE_NAME-$machine-$VER-native
+rm -rf ./$MODULE_NAME-$machine-$VER-native
@@ -1,29 +0,0 @@
-@echo off
-@rem  basic params
-set ENV=dev
-set NODE_VERSION=v13.12.0
-set MODULE_NAME=neutrino-proxy-admin
-@rem  判断当前node版本是否符合，如果不符合切换node版本
-for /f "tokens=1" %%v in ('node -v') do set v=%%v
-if not "%v%" == "%NODE_VERSION%" (
-  echo Node.js version is not %NODE_VERSION%.
-  @rem  判断是否安装nvm
-  set "nvm_home=%NVM_HOME%"
-  set "nvm_symlink=%NVM_SYMLINK%"
-  if not defined nvm_home (
-    echo nvm is not installed,then use nvm to install node %NODE_VERSION%.
-  ) else if not defined nvm_symlink (
-    echo nvm is not installed,then use nvm to install node %NODE_VERSION%.
-  ) else (
-    echo nvm is installed.
-    nvm use %NODE_VERSION%
-  )
-)
-cd %~dp0 && cd ../../%MODULE_NAME%
-@rem 检查dist文件夹是否存在，存在就删除，/s选项表示将目录及其所有子目录一起删除，/q选项表示不需要确认操作
-if exist dist (
-  rmdir /s /q dist
-)
-@rem 等待npm执行完毕
-call npm install
-npm run build:%ENV% && pause
@@ -24,6 +24,17 @@ cd %~dp0 && cd ../../%MODULE_NAME%
 if exist dist (
  rmdir /s /q dist
 )
-@rem 等待npm执行完毕
+@rem 编译
 call npm install
-npm run build:%ENV% && pause
+call npm run build:%ENV%
+
+echo 开始拷贝
+@rem 拷贝
+cd ..
+del /Q /F .\neutrino-proxy-server\src\main\resources\static
+rd /S /Q  .\neutrino-proxy-server\src\main\resources\static
+mkdir .\neutrino-proxy-server\src\main\resources\static
+xcopy /S /E  neutrino-proxy-admin\dist neutrino-proxy-server\src\main\resources\static
+
+@rem 回到脚本目录
+cd scripts\win
@@ -0,0 +1,63 @@
+@echo off
+@rem console output code changed to UTF-8
+chcp 65001
+@rem  basic params
+set MODULE_NAME=neutrino-proxy-client
+@rem  step
+cd %~dp0 && cd ../../
+
+SET VS_HOME=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519
+SET JAVA_HOME=C:\my\package\jdk\graalvm-community-openjdk-21.0.2
+SET MAVEN_HOME=C:\my\package\maven\apache-maven-3.9.6
+SET WIN_RAR_HOME=C:\Program Files\WinRAR
+SET PATH=%PATH%;%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%VS_HOME%\bin;%WIN_RAR_HOME%
+SET INCLUDE=%INCLUDE%;%VS_HOME%\include;
+SET LIB=%LIB%;%VS_HOME%\lib;
+
+SET deployDir=deploy
+SET clientDeployDir=%deployDir%\client
+SET machine=windows
+SET VER=2.0.1
+
+@rem 初始化文件夹
+mkdir -p %clientDeployDir%
+
+@rem 删除原来的编译文件
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%.jar
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%.exe
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar.zip
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+del /S /Q /F %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native.zip
+rd /S /Q %clientDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+rd /S /Q  %clientDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+
+@rem 客户端打包
+call mvn clean install -U -pl %MODULE_NAME% -am -Dmaven.test.skip=true
+cd %MODULE_NAME%
+call mvn clean native:compile -P native -DskipTests
+cd ..
+
+@rem 拷贝到deploy目录下
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.jar .\%clientDeployDir%\%MODULE_NAME%.jar
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.exe .\%clientDeployDir%\%MODULE_NAME%.exe
+
+@rem 打zip包，用于发版
+cd %clientDeployDir%
+@rem jar
+mkdir %MODULE_NAME%-jdk21-%VER%-jar
+copy %MODULE_NAME%.jar %MODULE_NAME%-jdk21-%VER%-jar
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-jdk21-%VER%-jar\app.yml
+Rar a %MODULE_NAME%-jdk21-%VER%-jar.zip %MODULE_NAME%-jdk21-%VER%-jar
+
+@rem native
+mkdir %MODULE_NAME%-%machine%-%VER%-native
+copy %MODULE_NAME%.exe %MODULE_NAME%-%machine%-%VER%-native
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-%machine%-%VER%-native\app.yml
+Rar a %MODULE_NAME%-%machine%-%VER%-native.zip %MODULE_NAME%-%machine%-%VER%-native
+
+@rem 删除临时文件
+
+
+@rem 回到脚本目录
+cd ..\..\scripts\win
@@ -0,0 +1,63 @@
+@echo off
+@rem console output code changed to UTF-8
+chcp 65001
+@rem  basic params
+set MODULE_NAME=neutrino-proxy-server
+@rem  step
+cd %~dp0 && cd ../../
+
+SET VS_HOME=C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519
+SET JAVA_HOME=C:\my\package\jdk\graalvm-community-openjdk-21.0.2
+SET MAVEN_HOME=C:\my\package\maven\apache-maven-3.9.6
+SET WIN_RAR_HOME=C:\Program Files\WinRAR
+SET PATH=%PATH%;%JAVA_HOME%\bin;%MAVEN_HOME%\bin;%VS_HOME%\bin;%WIN_RAR_HOME%
+SET INCLUDE=%INCLUDE%;%VS_HOME%\include;
+SET LIB=%LIB%;%VS_HOME%\lib;
+
+SET deployDir=deploy
+SET serverDeployDir=%deployDir%\server
+SET machine=windows
+SET VER=2.0.1
+
+@rem 初始化文件夹
+mkdir -p %serverDeployDir%
+
+@rem 删除原来的编译文件
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%.jar
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%.exe
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar.zip
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+del /S /Q /F %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native.zip
+rd /S /Q %serverDeployDir%\%MODULE_NAME%-jdk21-%VER%-jar
+rd /S /Q  %serverDeployDir%\%MODULE_NAME%-%machine%-%VER%-native
+
+@rem 服务端打包
+call mvn clean install -U -pl %MODULE_NAME% -am -Dmaven.test.skip=true
+cd %MODULE_NAME%
+call mvn clean native:compile -P native -DskipTests
+cd ..
+
+@rem 拷贝到deploy目录下
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.jar .\%serverDeployDir%\%MODULE_NAME%.jar
+copy .\%MODULE_NAME%\target\%MODULE_NAME%.exe .\%serverDeployDir%\%MODULE_NAME%.exe
+
+@rem 打zip包，用于发版
+cd %serverDeployDir%
+@rem jar
+mkdir %MODULE_NAME%-jdk21-%VER%-jar
+copy %MODULE_NAME%.jar %MODULE_NAME%-jdk21-%VER%-jar
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-jdk21-%VER%-jar\app.yml
+Rar a %MODULE_NAME%-jdk21-%VER%-jar.zip %MODULE_NAME%-jdk21-%VER%-jar
+
+@rem native
+mkdir %MODULE_NAME%-%machine%-%VER%-native
+copy %MODULE_NAME%.exe %MODULE_NAME%-%machine%-%VER%-native
+copy ..\..\%MODULE_NAME%\src\main\resources\app-copy.yml %MODULE_NAME%-%machine%-%VER%-native\app.yml
+Rar a %MODULE_NAME%-%machine%-%VER%-native.zip %MODULE_NAME%-%machine%-%VER%-native
+
+@rem 删除临时文件
+
+
+@rem 回到脚本目录
+cd ..\..\scripts\win
Author	SHA1	Message	Date
傲世孤尘	e75be739f4	!63 新增【域名解析】功能 Merge pull request !63 from 欧阳绝风/master-domain	2024-09-19 00:11:43 +00:00
xiaojie	f0a61a1d30	无需部署客户端待完成服务端直接转发功能后续将通过集成nginx来实现服务端转发	2024-06-25 10:12:38 +08:00
欧阳绝风	26ec45b3f9	update README.md. Signed-off-by: 欧阳绝风 <[email protected]>	2024-06-25 02:10:26 +00:00
欧阳绝风	550bc1cf9b	update README.md. Signed-off-by: 欧阳绝风 <[email protected]>	2024-06-25 02:09:28 +00:00
欧阳绝风	d1b09eda64	新增了域名解析功能新增了域名解析功能- 域名解析无需绑定本地接口 Signed-off-by: 欧阳绝风 <[email protected]>	2024-06-25 02:07:35 +00:00
aoshiguchen	2955ad1a26	更新solon依赖版本	2024-05-08 18:45:20 +08:00
aoshiguchen	aa298c61b6	更新打包脚本	2024-05-08 14:21:33 +08:00
aoshiguchen	63bcd32a2a	新增win下的服务端打包脚本.	2024-05-08 13:37:14 +08:00
aoshiguchen	179904c3fe	新增win下的admin打包脚本.	2024-05-08 13:16:49 +08:00
aoshiguchen	00e37e0a27	新增win下的客户端native打包脚本.	2024-05-08 11:57:50 +08:00
aoshiguchen	5838481358	新增win下的客户端native打包脚本.	2024-05-08 10:59:38 +08:00
aoshiguchen	88baeb3f33	新增win下的客户端native打包脚本	2024-05-07 22:31:07 +08:00
aoshiguchen	2fc1754161	新增win下的客户端native打包脚本.	2024-05-07 22:17:18 +08:00
aoshiguchen	dd27a6609d	Merge remote-tracking branch 'origin/dev' into dev	2024-05-07 18:36:27 +08:00
aoshiguchen	d8d4fbf6a6	新增win下的客户端native打包脚本	2024-05-07 18:36:04 +08:00
aoshiguchen	c7c7afa8af	更新README	2024-05-06 17:35:20 +08:00
aoshiguchen	fe9dc46796	更新官网打包脚本	2024-05-06 17:26:41 +08:00
aoshiguchen	21c5dcb053	Merge remote-tracking branch 'origin/master' into dev	2024-05-06 15:14:46 +08:00
傲世孤尘	482214529e	!61 update README.md. Merge pull request !61 from WuName/N/A	2024-05-06 07:12:59 +00:00
WuName	5998fb8785	update README.md. 发现readme的jdk还是17，修改为21 Signed-off-by: WuName <[email protected]>	2024-05-05 02:11:54 +00:00
aoshiguchen	6411b8759d	更新赞助列表、首页特别赞助	2024-04-16 20:06:44 +08:00
aoshiguchen	da173f2005	Revert "解决后台分页查询的已知问题"	2024-04-09 12:00:36 +08:00
aoshiguchen	c427213dfb	服务端解决native下清理日志报错的问题	2024-03-15 18:31:31 +08:00
xj	446390743c	服务端直接转发到服务端端口待完成	2024-03-10 23:02:46 +08:00
xiaojie	e2c6490fae	服务端直接转发，无需部署客户端待完成	2024-03-08 17:32:28 +08:00
xj	7fb5a91f2f	域名解析完成不通过客户端，服务端直接转发到服务端端口待完成	2024-03-08 00:03:29 +08:00
xiaojie	9f82faee71	域名解析-服务端直接转发，无需部署客户端待完成	2024-03-07 17:37:25 +08:00
xj	0b77b8ae1b	域名解析待完成	2024-03-06 23:34:21 +08:00
xiaojie	d8f2e79d70	部分修改	2024-03-06 17:36:30 +08:00
xj	be4e3b4bae	域名解析	2024-03-04 23:20:41 +08:00
xj	aca5fb847b	域名解析	2024-03-04 21:35:03 +08:00
xiaojie	6d26c58843	部分修改	2024-03-04 17:38:52 +08:00
xj	6f6a57eda5	域名解析	2024-03-03 22:36:04 +08:00
xiaojie	3ffba1744f	部分修改	2024-03-01 17:34:47 +08:00
aoshiguchen	bf6b1767b3	解决客户端docker环境变量指定参数不生效的问题	2024-02-19 18:19:44 +08:00
aoshiguchen	223ab4a447	修正文档中的错误	2024-01-09 10:29:03 +08:00
aoshiguchen	b91910b61c	解决分页后点击搜索，页面上页码显示错误的问题	2024-01-04 21:58:33 +08:00
aoshiguchen	b01864e362	更新官网赞赏列表.	2023-12-29 13:32:03 +08:00
aoshiguchen	a5df904f9a	更新官网赞赏列表.	2023-12-27 17:23:56 +08:00
aoshiguchen	3d250b6833	更新官网赞赏列表	2023-12-26 14:11:20 +08:00
aoshiguchen	889817e484	解决native编译后，端口池批量删除报错的问题	2023-12-26 12:45:50 +08:00
aoshiguchen	665ec3a708	更新官网赞助列表	2023-12-21 17:56:15 +08:00
aoshiguchen	fe5c2fe3ef	代码优化.解决映射域名访问因ipv6报错的问题.	2023-12-21 16:15:11 +08:00
aoshiguchen	744335b433	代码优化.解决映射域名访问因ipv6报错的问题	2023-12-21 16:07:30 +08:00
aoshiguchen	66e803d14e	Merge branch 'dev'	2023-12-20 17:05:55 +08:00
aoshiguchen	8b84d281e7	.	2023-12-20 17:05:45 +08:00
aoshiguchen	b5d30e227c	新增2.0.1发版文章.	2023-12-20 10:05:38 +08:00
aoshiguchen	88790c7f36	新增2.0.1发版文章	2023-12-19 18:01:29 +08:00
aoshiguchen	c30755c663	更新官网安装部署文档	2023-12-19 15:44:37 +08:00
aoshiguchen	2e81bfbe2c	更新官网里程碑	2023-12-19 15:26:41 +08:00
aoshiguchen	f49898b9b0	更新官网管理后台文档.	2023-12-19 14:56:12 +08:00
aoshiguchen	74d36fc5d1	更新官网赞赏列表	2023-12-19 14:13:33 +08:00
aoshiguchen	fb5980e577	新增运行示例截图	2023-12-19 14:07:58 +08:00
aoshiguchen	b9277d142c	更新官网首页	2023-12-19 11:32:44 +08:00
aoshiguchen	81b0a28e2c	更新官网里程碑、版本记录	2023-12-19 11:09:17 +08:00
aoshiguchen	59d47e6bf1	更新revision	2023-12-19 10:46:33 +08:00
aoshiguchen	7255701084	workflow调整	2023-12-18 22:31:26 +08:00
aoshiguchen	99b3b673f1	workflow调整.	2023-12-18 21:45:26 +08:00
aoshiguchen	f6f6017f8a	更新版本日志	2023-12-18 19:20:22 +08:00
aoshiguchen	fc0830acfe	解决使用映射域名上传文件连接断开的问题	2023-12-18 18:39:23 +08:00
aoshiguchen	9baee2c909	调整workflow.	2023-12-18 16:43:19 +08:00
aoshiguchen	6558a8c327	调整workflow	2023-12-18 16:27:22 +08:00
aoshiguchen	ffa8ee502c	Merge remote-tracking branch 'origin/dev' into dev	2023-12-18 15:44:29 +08:00
aoshiguchen	4c993316de	.	2023-12-18 15:44:21 +08:00
songyinyin	d451424de8	Github Action: fix 前端打包	2023-12-18 15:35:49 +08:00
songyinyin	754070e795	Github Action: 临时上传构建物	2023-12-18 14:43:54 +08:00
aoshiguchen	b21fd8e2d9	注释无用测试类.	2023-12-18 13:50:28 +08:00
aoshiguchen	4f5fc5dfbc	注释无用测试类	2023-12-18 13:39:06 +08:00
aoshiguchen	d1eba19cb9	注释无用测试类	2023-12-18 13:38:37 +08:00
songyinyin	efb3a7015d	Merge remote-tracking branch 'origin/dev' into dev	2023-12-18 12:00:16 +08:00
songyinyin	47efe37a0e	Github Action: 构建物的版本号使用 pom 文件中定义的	2023-12-18 12:00:06 +08:00
aoshiguchen	0ad05e7dc8	端口映射分页优化，解决license被删除后，端口映射分页报错的问题	2023-12-18 11:53:44 +08:00
aoshiguchen	9576707660	限速描述支持小数，如1.5M、3.7M	2023-12-18 11:36:27 +08:00
aoshiguchen	168acd6bfe	更新版本日志.	2023-12-18 11:30:09 +08:00
aoshiguchen	ad32e36ba2	.	2023-12-18 10:47:55 +08:00
aoshiguchen	00fd0bab84	限速相关处理优化	2023-12-16 16:07:47 +08:00
songyinyin	8f90cf461d	原生编译：注册 netty 在 jdk 21 中新使用的类	2023-12-15 18:18:00 +08:00
aoshiguchen	e44f6e195c	更新配置	2023-12-15 17:15:06 +08:00
aoshiguchen	5db0bf94cb	新增限速功能	2023-12-15 17:09:16 +08:00
aoshiguchen	99c79f612a	修正文案	2023-12-15 11:49:32 +08:00
aoshiguchen	4890b8783f	更新官网docker部署文档	2023-12-15 10:25:21 +08:00
aoshiguchen	8e150c7696	更新客户端验证失败提示文案	2023-12-14 16:21:35 +08:00
aoshiguchen	051a36a43e	安全组拦截的逻辑从代理转发逻辑中剥离.	2023-12-14 15:54:44 +08:00
aoshiguchen	46bcc8a25d	安全组拦截的逻辑从代理转发逻辑中剥离	2023-12-14 15:48:54 +08:00
aoshiguchen	6c3d195afc	1、解决原生编译报错 2、启动日志增加版本号输出	2023-12-14 14:18:35 +08:00
aoshiguchen	00de9ee464	README更新贡献者列表	2023-12-14 13:34:13 +08:00
aoshiguchen	a1608ba1be	解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题	2023-12-14 12:03:08 +08:00
aoshiguchen	e7bdd4a631	安全组相关代码优化.	2023-12-14 11:36:53 +08:00
aoshiguchen	67c42a19bb	安全组相关代码优化	2023-12-11 10:12:05 +08:00
aoshiguchen	d3c658fa4d	安全组相关代码优化.	2023-12-10 22:43:59 +08:00
aoshiguchen	bb96caca64	安全组相关代码优化.	2023-12-10 20:43:23 +08:00
aoshiguchen	306cd66034	1、jdk版本改为21，对应的打包脚本调整 2、安全组相关代码优化.	2023-12-10 16:55:50 +08:00
aoshiguchen	5ccf0d1936	1、jdk版本改为21，对应的打包脚本调整 2、安全组相关代码优化	2023-12-10 16:42:52 +08:00
aoshiguchen	1ad80a6d8b	jdk版本降为17，解决jdk21打包后启动客户端连接报错的问题	2023-12-10 12:50:25 +08:00
aoshiguchen	faf5ec9bdc	安全组相关接口url调整	2023-12-10 12:07:17 +08:00
aoshiguchen	a369ee1a15	日志调整.	2023-12-10 11:38:21 +08:00
aoshiguchen	9121ff37bb	日志调整.	2023-12-10 11:37:42 +08:00
aoshiguchen	5e1a2f5620	tcp代理，针对安全组获取真实ip逻辑优化	2023-12-09 23:40:02 +08:00
aoshiguchen	7530fd7d9f	http域名访问时，安全组获取真实ip逻辑调整	2023-12-09 23:27:46 +08:00
傲世孤尘	57339dc56c	!52 修改TcpVisitorHandler获取真实IP地址的方式 Merge pull request !52 from NichenFly/dev	2023-12-09 14:35:26 +00:00
az	d072c05d31	修改TcpVisitorHandler获取真实IP地址的方式	2023-12-09 22:30:31 +08:00
az	a21a786884	修改TcpVisitorHandler获取真实IP地址的方式	2023-12-09 22:30:07 +08:00