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

Merge pull request !63 from 欧阳绝风/master-domain

.gitignore

@@ -61,3 +61,4 @@ logs
 data
 **/cert/**
 neutrino-proxy-server/src/main/resources/static/**
+/neutrino-proxy-server/src/main/resources/static/

README.md

@@ -1,3 +1,11 @@
+
+
+# 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>

docs/如何贡献.MD

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

docs/快速使用.MD

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

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

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

neutrino-proxy-admin/build/webpack.local.conf.js

@@ -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);
     }
-  })
-})
+  });
+});

neutrino-proxy-admin/config/dev.env.js

@@ -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"'
 }

neutrino-proxy-admin/config/index.js

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

neutrino-proxy-admin/config/prod.env.js

@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"production"',
 	ENV_CONFIG: '"prod"',
-	BASE_API: '"https://api-prod"'
+	BASE_API: '"http://np.myone.cc"' // 后端访问地址与 server配置一致
 }

neutrino-proxy-admin/package.json

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

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

@@ -1,12 +1,6 @@
 import request from '@/utils/request'
 
-export function domainNameBindInfo(query) {
-  return request({
-    url: '/domain-name/bind-info',
-    method: 'get',
-    params: query
-  })
-}
+
 export function fetchList(query) {
   return request({
     url: '/domain/page',
@@ -15,61 +9,54 @@ export function fetchList(query) {
   })
 }
 
-export function fetchAvailableDomainList(query) {
+export function mappingModify(data) {
   return request({
-    url: '/domain/all',
-    method: 'get',
-    params: query
+    url: '/domain/modify',
+    method: 'post',
+    data
   })
 }
 
-export function updateEnableStatus(id, enable, domain) {
+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,
-      domain: domain,
+      enable: enable
     }
   })
 }
 
-export function createDomain(data) {
+export function portMappingBindSecurityGroup(id, securityGroupId) {
   return request({
-    url: '/domain/create',
-    method: 'post',
-    data
-  })
-}
-
-export function updateDomain(data) {
-  return request({
-    url: '/domain/update',
-    method: 'post',
-    data
-  })
-}
-
-export function deleteDomain(id) {
-  return request({
-    url: '/domain/delete',
-    method: 'post',
-    params: {
-      id: id
-    }
-  })
-}
-
-export function updateDefaultStatus(id, isDefault) {
-  return request({
-    url: '/domain/update/default-status',
+    url: '/domain/bind/security-group',
     method: 'post',
     data: {
       id: id,
-      isDefault: isDefault
+      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
+  })
+}

neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue

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

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

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

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

@@ -62,7 +62,7 @@ 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: 'domainManagement', component: _import('proxy/domain'), name: 'domainManagement', meta: { title: 'domainManagement' }}
+      { path: 'domainMapping', component: _import('proxy/domainMapping'), name: 'domainMapping', meta: { title: 'domainMapping' }}
     ]
   },
   {
@@ -79,7 +79,7 @@ export const asyncRouterMap = [
       { path: 'portGroup', component: _import('system/portGroup'), name: 'portGroup', meta: { title: 'portGroup' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
       { path: 'securityGroup', component: _import('system/securityGroup'), name: 'securityGroup', meta: { title: 'securityGroup' }},
-      { path: 'securityRule', component: _import('system/securityRule'), name: 'securityRule', meta: { title: 'securityRule' }, hidden: true },
+      { path: 'securityRule', component: _import('system/securityRule'), name: 'securityRule', meta: { title: 'securityRule' }, hidden: true},
       { path: 'protocal', component: _import('system/protocal'), name: 'protocal', meta: { title: 'protocal' }},
       { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
     ]

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

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

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

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

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

@@ -1,13 +1,13 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container">
-      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable style="margin-right:10px;width: 120px;">
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" filterable clearable>
         <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"/>
       </el-select>
-      <el-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable style="width:145px;margin-right:10px">
+      <el-select v-model="listQuery.isOnline" placeholder="请选择在线状态" clearable>
         <el-option v-for="item in selectObj.onlineOptions" :key="item.value" :label="item.label" :value="item.value"/>
       </el-select>
-      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable>
         <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>
@@ -63,12 +63,13 @@
       </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>
@@ -122,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',
@@ -143,7 +130,6 @@
       waves
     },
     components: {
-      ButtonPopover
     },
     data() {
       return {
@@ -159,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'],
@@ -214,9 +199,6 @@
         }
         return statusMap[status]
       },
-      typeFilter(type) {
-        return calendarTypeKeyValue[type]
-      }
     },
     created() {
       this.getDataList()
@@ -368,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 => {

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

@@ -49,13 +49,11 @@
           <span>{{ scope.row.protocal }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.domainName')" width="190">
+      <!-- <el-table-column align="center" :label="$t('table.domainName')" width="180">
         <template slot-scope="scope">
-          <div v-for="(domain, index) in scope.row.allFullDomainList" :key="index">
-            <span>{{ domain }}</span>
-          </div>
+          <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>
@@ -107,9 +105,7 @@
           <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 size="mini" type="danger" @click="handleDelete(scope.row)">{{$t('table.delete')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -121,39 +117,22 @@
       </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"
@@ -167,21 +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-form-item>
-        <el-form-item :label="$t('域名')" prop="domainMappings" v-if="(temp.protocal === 'HTTP' || temp.protocal === 'HTTP(S)') && domainList != null && domainList.length > 0" >
-          <div v-for="(domain, index) in temp.domainMappings" :key="index" class="domain-mapping">
-            <el-input v-model="domain.subdomain">
-              <template slot="append">
-                <el-select v-model="domain.domainId" placeholder="请选择主域名" style="width: 130px;">
-                  <el-option v-for="tmp in domainList" :key="tmp.id" :label="'.'+tmp.domain" :value="tmp.id"></el-option>
-                </el-select>
-                <el-button type="danger" @click="removeDomainMapping(index)" style="margin-left: 10px;">删除</el-button>
-              </template>
-            </el-input>
-          </div>
-          <el-button type="primary" @click="addDomainMapping" style="margin-top: 10px;">添加域名</el-button>
+          <el-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-input v-model="temp.subdomain">
+            <template slot="append">.{{ domainName }}</template>
+          </el-input>
+        </el-form-item> -->
         <el-form-item :label="$t('响应数量')" prop="proxyResponses" v-if="temp.protocal === 'UDP'">
           <el-input v-model="temp.proxyResponses"></el-input>
         </el-form-item>
@@ -191,7 +162,7 @@
           </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>
@@ -241,21 +212,6 @@ import ButtonPopover from '../../components/Button/buttonPopover'
 import DropdownTable from '../../components/Dropdown/DropdownTable'
 // 下拉选择加载组件
 import loadSelect from "@/components/Select/SelectLoadMore";
-import {fetchAvailableDomainList} from "../../api/domain";
-
-const calendarTypeOptions = [
-  { key: 'CN', display_name: 'China' },
-  { 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: {
@@ -287,7 +243,6 @@ export default {
       listQuery: {
         current: 1,
         size: 10,
-        importance: undefined,
         title: undefined,
         type: undefined,
         userId: undefined,
@@ -298,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: [],
@@ -307,7 +260,7 @@ export default {
       protocalList: [],
       licenseAuthList: [],
       serverPortList: [],
-      domainList: [{ 'name': 'link.com', 'id': '1' }],
+      domainName: '',
       showReviewer: false,
       temp: {
         id: undefined,
@@ -318,8 +271,7 @@ export default {
         clientPort: undefined,
         protocal: undefined,
         proxyResponses: undefined,
-        proxyTimeoutMs: undefined,
-        domainMappings: []
+        proxyTimeoutMs: undefined
       },
       selectObj: {
         statusOptions: [{ label: '启用', value: 1 }, { label: '禁用', value: 2 }],
@@ -334,27 +286,14 @@ export default {
       dialogPvVisible: false,
       pvData: [],
       rules: {
-        domainMappings: [
-          {
-            validator: (rule, value, callback) => {
-              if (value && value.length > 0) {
-                for (let i = 0; i < value.length; i++) {
-                  if (!value[i].subdomain || !value[i].domainId) {
-                    return callback(new Error(`子域名和主域名都不能为空`));
-                  }
-                }
-              }
-              callback(); // 验证通过
-            },
-            trigger: ''
-          }
-        ],
         licenseId: [{ required: true, message: '请选择License', trigger: 'blur,change' }],
         serverPort: [{ required: true, message: '请输入服务端端口', trigger: 'blur' },
           // { 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,
@@ -393,9 +332,6 @@ export default {
       }
       return statusMap[status]
     },
-    typeFilter(type) {
-      return calendarTypeKeyValue[type]
-    }
   },
   created() {
     this.getDataList()
@@ -403,59 +339,12 @@ export default {
     this.getLicenseAuthList()
     this.getProtocalList()
     this.fetchSecurityGroupList()
-    this.getAvailableDomainList()
   },
   methods: {
-    // 添加新的域名映射
-    addDomainMapping() {
-      let defaultDomainId = this.domainList[0].id
-      this.domainList.forEach(item => {
-        if (item.isDefault === 1) {
-          defaultDomainId = item.id
-        }
-      })
-      this.temp.domainMappings.push({
-        subdomain: undefined,
-        domain: undefined,
-        domainId: defaultDomainId
-      });
-      console.log(this.list)
-    },
-    // 删除指定的域名映射
-    removeDomainMapping(index) {
-      this.temp.domainMappings.splice(index, 1);
-    },
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
-        this.list = response.data.data.records.map(item => {
-          // 初始化 domainMappings 字段
-          item.domainMappings = [];
-          // 检查是否存在 subdomain 和 domain 字段
-          if (item.fullDomainMappings && Array.isArray(item.fullDomainMappings)) {
-            let allFullDomainList = []
-            for (const fullDomainMapping of item.fullDomainMappings) {
-              item.domainMappings.push({
-                id: fullDomainMapping.id || '',
-                subdomain: fullDomainMapping.subdomain || '', // 使用 || '' 保证字段非空
-                domainId: fullDomainMapping.domainNameId || '',
-                domain: fullDomainMapping.domain || ''
-              });
-              // 拼接完整的域名
-              let fullDomain = null;
-              if (fullDomainMapping.forceHttps == 1) {
-                fullDomain = `https://` + `${fullDomainMapping.subdomain}.${fullDomainMapping.domain}`;
-              } else {
-                fullDomain = `http://` + `${fullDomainMapping.subdomain}.${fullDomainMapping.domain}`;
-              }
-              // 将拼接后的域名添加到
-              allFullDomainList.push(fullDomain);
-            }
-            item.allFullDomainList = allFullDomainList
-          }
-          return item;
-        });
-        // console.log(this.list)
+        this.list = response.data.data.records
         this.total = response.data.data.total
         this.listLoading = false
       })
@@ -482,11 +371,6 @@ export default {
       this.loadServerPortQuery.licenseId = licenseId;
       this.serverPortList = []; //清掉数据
     },
-    getAvailableDomainList() {
-      fetchAvailableDomainList({}).then(response => {
-        this.domainList = response.data.data
-      })
-    },
     getAllUserList() {
       userList().then(response => {
         this.userList = response.data.data
@@ -541,10 +425,9 @@ export default {
         clientPort: undefined,
         userId: undefined,
         proxyResponses: undefined,
-        proxyTimeoutMs: undefined,
-        domainMappings: []
-      };
-      this.serverPortList = [];
+        proxyTimeoutMs: undefined
+      }
+      this.serverPortList = []
       this.loadServerPortQuery.licenseId = null;
       this.more = true;
     },
@@ -559,7 +442,6 @@ export default {
     createData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          // console.log(this.temp)
           createUserPortMapping(this.temp).then(response => {
             if (response.data.code === 0) {
               this.dialogFormVisible = false
@@ -577,16 +459,13 @@ export default {
     },
     handleOpenWebPage(row) {
       let url = location.protocol + '//' + location.hostname + ':' + row.serverPort
-      if (row.allFullDomainList && row.allFullDomainList.length > 0) {
-        url = row.allFullDomainList[0]
+      if (row.domain) {
+        url = location.protocol + '//' + row.domain
       }
       open(url)
     },
     handleUpdate(row) {
-      this.resetTemp()
-      console.log(this.temp)
-      this.temp = JSON.parse(JSON.stringify(row))
-      console.log(this.temp)
+      this.temp = Object.assign({}, row) // copy obj
       if (row.securityGroupId === 0) {
         this.temp.securityGroupId = null
       }
@@ -648,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') {

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

@@ -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:[], //表单勾选的行

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

@@ -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);
     }
 

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

@@ -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();

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

@@ -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);
 
 					// 获取连接

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

@@ -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时开启才有效)

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

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

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

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

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

@@ -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;

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

@@ -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())

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

@@ -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())

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

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

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

@@ -59,6 +59,11 @@ public enum ExceptionConstant {
 	PORT_MAPPING_NOT_EXIST(14000, "端口映射记录不存在"),
 	PORT_CANNOT_REPEAT_MAPPING(14001, "服务端口[{}]不能重复映射"),
 	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, "系统异常"),
@@ -70,12 +75,7 @@ public enum ExceptionConstant {
     // 安全组管理(17000)
     SECURITY_GROUP_NOT_EXIST(17000, "安全组不存在"),
 	SECURITY_RULE_NOT_EXIST(17001, "安全规则不存在"),
-    // 域名映射管理(18000)
-    DOMAIN_NAME_CANNOT_REPEAT(18000, "域名不能重复"),
-    DOMAIN_NAME_NOT_EXIST(18001, "域名不存在"),
-    DOMAIN_NAME_IS_DISABLE(18002, "当前域名[{}]被禁用"),
-    SUDOMAIN_NAME_CANNOT_REPEAT(18003, "子域名不能重复"),
-    DOMAIN_NAME_IS_USED(18002, "当前域名正在使用"),
+
 	;
 
 	private int code;

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

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

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

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

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

@@ -1,91 +1,105 @@
 package org.dromara.neutrinoproxy.server.controller;
 
-import cn.hutool.core.util.StrUtil;
+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.rest.Authorization;
+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.DomainListRes;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateDefaultStatusRes;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.DomainUpdateEnableStatusRes;
+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.dromara.neutrinoproxy.server.service.DomainService;
-import org.noear.solon.core.handle.Context;
-import org.noear.solon.core.handle.UploadedFile;
-import org.noear.solon.lang.Nullable;
-
-import javax.sound.midi.Soundbank;
-import java.io.IOException;
-import java.util.List;
+import org.noear.solon.validation.annotation.NotBlank;
+import org.noear.solon.validation.annotation.Valid;
+import org.noear.solon.validation.annotation.Validated;
 
 /**
- * @author Mirac
- * @date 21/7/2024
+ * @author: aoshiguchen
+ * @date: 2023/4/2
  */
+@Slf4j
+@Valid
 @Mapping("/domain")
 @Controller
 public class DomainController {
     @Inject
-    private DomainService domainService;
+    private ProxyConfig proxyConfig;
+
+    @Inject
+    private DomainMappingService domainMappingService;
 
     @Get
     @Mapping("/page")
-    public PageInfo<DomainListRes> page(PageQuery pageQuery, DomainListReq req) {
-        return domainService.page(pageQuery, req);
+    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("/all")
-    public List<DomainListRes> all(DomainListReq req) {
-        ParamCheckUtil.checkNotNull(req, "req");
-        return domainService.all(req);
+    @Mapping("/one/{id}")
+    public DomainMappingDto one(Integer id) {
+        return domainMappingService.one(id);
     }
 
     @Post
-    @Mapping(path = "/create")
-    @Authorization(onlyAdmin = true)
-    public void create(DomainCreateReq req, UploadedFile jks) throws IOException {
-        ParamCheckUtil.checkNotNull(req, "req");
-        ParamCheckUtil.checkNotEmpty(req.getDomain(), "domain");
-        domainService.create(req, jks);
+    @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(path = "/update")
-    @Authorization(onlyAdmin = true)
-    public void update(DomainUpdateReq req, UploadedFile jks) throws IOException {
-        ParamCheckUtil.checkNotNull(req, "req");
-        ParamCheckUtil.checkNotEmpty(req.getDomain(), "domain");
-        domainService.update(req, jks);
+    @Mapping("/bind/security-group")
+    public void bindSecurityGroup(PortMappingBindSecurityGroupReq req) {
+        domainMappingService.domainBindSecurityGroup(req.getId(), req.getSecurityGroupId());
     }
 
+    /**
+     * 安全组解绑
+     * @param id 端口映射Id
+     */
     @Post
-    @Mapping(path = "/update/enable-status")
-    @Authorization(onlyAdmin = true)
-    public DomainUpdateEnableStatusRes updateEnableStatus(DomainUpdateEnableStatusReq req){
-        ParamCheckUtil.checkNotNull(req, "req");
-        ParamCheckUtil.checkNotNull(req.getId(), "id");
-        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
-        return domainService.updateEnableStatus(req);
+    @Mapping("/unbind/security-group")
+    public void unbindSecurityGroup(Integer id) {
+        domainMappingService.domainUnbindSecurityGroup(id);
     }
 
-    @Post
-    @Mapping(path = "/delete")
-    @Authorization(onlyAdmin = true)
-    public void delete(DomainDeleteReq req) {
-        ParamCheckUtil.checkNotNull(req, "req");
-        ParamCheckUtil.checkNotNull(req.getId(), "id");
 
-        domainService.delete(req.getId());
+
+    /**
+     * 绑定安全组
+     * @param domain
+     */
+    @Get
+    @Mapping("/available")
+    public boolean exitDomain(@NotBlank String domain, Integer id) {
+       return domainMappingService.exitDomain(domain, id);
     }
 
-    @Post
-    @Mapping(path = "/update/default-status")
-    @Authorization(onlyAdmin = true)
-    public DomainUpdateDefaultStatusRes updateDefaultStatus(DomainUpdateDefaultStatusReq req){
-        ParamCheckUtil.checkNotNull(req, "req");
-        ParamCheckUtil.checkNotNull(req.getId(), "id");
-        ParamCheckUtil.checkNotNull(req.getIsDefault(), "isDefault");
-        return domainService.updateDefaultStatus(req.getId(), req.getIsDefault());
-    }
 }

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

@@ -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 {
@@ -101,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");
 

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

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

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

@@ -1,34 +0,0 @@
-package org.dromara.neutrinoproxy.server.controller.req.proxy;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import org.dromara.neutrinoproxy.server.constant.DefaultDomainStatusEnum;
-import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
-import org.dromara.neutrinoproxy.server.constant.HttpsStatusEnum;
-import org.noear.solon.core.handle.UploadedFile;
-import org.noear.solon.lang.Nullable;
-
-import java.util.Date;
-
-/**
- * @author Mirac
- * @date 21/7/2024
- */
-@Data
-public class DomainCreateReq {
-    /**
-     * 主域名
-     */
-    private String domain;
-
-    /**
-     * KeyStore密码
-     */
-    private String keyStorePassword;
-
-    /**
-     * 强制Https
-     */
-    private Integer forceHttps;
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -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;
 }

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

@@ -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;
 }

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

@@ -23,8 +23,6 @@ package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * 端口映射创建请求
  * @author: aoshiguchen
@@ -78,15 +76,4 @@ public class PortMappingCreateReq {
 	 * 描述
 	 */
 	private String description;
-
-    /**
-     * 域名映射列表
-     */
-    private List<DomainMapping> domainMappings;
-
-    @Data
-    public class DomainMapping {
-        private Integer domainId;
-        private String subdomain;
-    }
 }

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

@@ -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;
 
 }

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

@@ -23,8 +23,6 @@ package org.dromara.neutrinoproxy.server.controller.req.proxy;
 
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * 端口映射更新请求
  * @author: aoshiguchen
@@ -82,16 +80,4 @@ public class PortMappingUpdateReq {
 	 * 描述
 	 */
 	private String description;
-
-    /**
-     * 域名映射列表
-     */
-    private List<DomainMapping> domainMappings;
-
-    @Data
-    public class DomainMapping {
-        private Integer id;
-        private Integer domainId;
-        private String subdomain;
-    }
 }

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

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

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

@@ -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;
+}

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

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

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

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

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

@@ -21,13 +21,11 @@
  */
 package org.dromara.neutrinoproxy.server.controller.res.proxy;
 
-import lombok.Data;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
-import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
+import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 端口映射列表响应
@@ -45,10 +43,10 @@ public class PortMappingListRes {
 	 * 协议
 	 */
 	private String protocal;
-    /**
-     * 完整域名映射
-     */
-    private List<FullDomainNameBO> fullDomainMappings;
+	/**
+	 * 域名
+	 */
+	private String domain;
 	/**
 	 * license名称
 	 */

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

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

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

@@ -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);
+}

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

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

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

@@ -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)
         );
     }
 
@@ -115,4 +118,8 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
                 .eq(LicenseDO::getKey, licenseKey)
         );
     }
+
+    List<ProxyMapping> findEnableProxyMappingListByLicenseId(Integer licenseId);
+
+    List<ProxyMapping> findAllProxyMappingListByLicenseId(Integer licenseId);
 }

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

@@ -11,7 +11,6 @@ import org.dromara.neutrinoproxy.server.controller.req.proxy.PortMappingListReq;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 
 import java.util.Date;
 import java.util.List;

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

@@ -23,6 +23,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;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -30,35 +31,90 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.OnlineStatusEnum;
-import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
+import 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: Mirac
- * @date: 2024/8/24
+ * 端口映射
+ * @author: aoshiguchen
+ * @date: 2022/8/8
  */
 @ToString
 @Accessors(chain = true)
 @Data
-@TableName("domain_port_mapping")
-public class DomainPortMappingDO {
+@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;
 
     /**
-     * 主键
+     * 上传限速
      */
-    @TableId(type = IdType.AUTO)
-    private Integer id;
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
+
 	/**
-	 * 端口映射id
+	 * 是否在线
+	 * {@link OnlineStatusEnum}
 	 */
-	private Integer portMappingId;
+    @TableField(exist=false)
+	private Integer isOnline;
+
 	/**
-	 * 域名id
+	 * 启用状态
+	 * {@link EnableStatusEnum}
 	 */
-	private Integer domainNameId;
+	private Integer enable;
+
+    /**
+     * 安全组Id
+     */
+    private Integer securityGroupId = 0; // 设置为null不生效，不知道为啥
+
 	/**
-	 * 子域名
+	 * 创建时间
 	 */
-	private String subdomain;
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+
+    public DomainMappingDto toRes() {
+        DomainMappingDto dto = new DomainMappingDto();
+        BeanUtil.copyProperties(this, dto);
+        return dto;
+    }
+
 }

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

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

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

@@ -87,6 +87,23 @@ 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();
         BeanUtil.copyProperties(this, res);

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

@@ -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;
 
@@ -117,4 +118,5 @@ public class PortMappingDO {
         BeanUtil.copyProperties(this, res);
         return res;
     }
+
 }

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

@@ -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 {

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

@@ -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);
 		}
 	}
 

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

@@ -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;
+    }
+}

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

@@ -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());
 	}
+
+
+
 }
 

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

@@ -1,7 +1,9 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;
 
 import io.netty.bootstrap.ServerBootstrap;
+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;
@@ -17,7 +19,8 @@ import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;
 
 /**
- * HTTP代理
+ * 应用加载完成事件（即启动完成）- 判断是否配置域名-配置了域名则启动HTTP代理
+ * 默认端口 80
  * @author: aoshiguchen
  * @date: 2023/4/2
  */
@@ -26,35 +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 (null == proxyConfig.getServer().getTcp().getHttpProxyPort()) {
-            log.info("no config http proxy port, nonsupport http proxy.");
+            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 HttpVisitorSecurityChannelHandler(false));
-                            ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
-                        }
-                    });
-            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();
         }
     }
+
 }

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

@@ -19,6 +19,7 @@ import org.noear.solon.Solon;
 import java.net.InetSocketAddress;
 
 /**
+ * HTTP 访客处理器
  * @author: aoshiguchen
  * @date: 2023/5/27
  */
@@ -30,6 +31,7 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
         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) {
@@ -37,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();
@@ -53,11 +52,10 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
 
         // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
         ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);
-
-
         // 根据域名拿到绑定的映射对应的cmdChannel
         Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
         Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(serverPort);
+
         if (null == cmdChannel) {
             ctx.channel().close();
             return;
@@ -67,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);
@@ -76,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();
@@ -86,7 +82,6 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
             // 该端口还没有代理客户端
             ctx.channel().close();
         } else {
-
             // 用户连接断开，从控制连接中移除
             String visitorId = ProxyUtil.getVisitorIdByChannel(visitorChannel);
             ProxyUtil.removeVisitorChannelFromCmdChannel(cmdChannel, visitorId);

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

@@ -1,14 +1,18 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;
 
 import io.netty.bootstrap.ServerBootstrap;
+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;
 import io.netty.handler.logging.LoggingHandler;
-import io.netty.handler.ssl.SniHandler;
-import io.netty.handler.ssl.SslContext;
+import io.netty.handler.ssl.SslHandler;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
@@ -18,8 +22,16 @@ import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
 import org.noear.solon.core.event.EventListener;
 
+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
  */
@@ -28,55 +40,77 @@ import org.noear.solon.core.event.EventListener;
 public class HttpsProxy implements EventListener<AppLoadEndEvent> {
     @Inject
     private ProxyConfig proxyConfig;
-    @Inject
-    private SslContextManager sslContextManager;
-
+    /**
+     * NioServerSocketChannel对应的future
+     */
+    private ChannelFuture httpsFuture;
     @Override
-    public void onEvent(AppLoadEndEvent appLoadEndEvent) {
-        if (null == proxyConfig.getServer().getTcp().getHttpsProxyPort()) {
-            log.info("no config https proxy port, nonsupport http proxy.");
+    public void onEvent(AppLoadEndEvent appLoadEndEvent) throws Throwable {
+        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;
         }
         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(HttpsProxy.class));
-                            }
-                            ch.pipeline().addLast(createSniHandler());
-                            ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorSecurityChannelHandler(true));
-                            ch.pipeline().addLast("flowLimiter",new VisitorFlowLimiterChannelHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
-                        }
-                    });
-            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();
         }
     }
 
-    public SniHandler createSniHandler() {
+    private ChannelHandler createSslHandler() {
         try {
-            return new SniHandler(domainName -> {
-                SslContext sslContext = sslContextManager.getSslContextByFullDomain(domainName);
-                if (sslContext != null) {
-                    return sslContext;
-                } else {
-                    log.info("No SSL context available for domain: {}", domainName);
-                    return null;
-                }
-            });
+            InputStream jksInputStream = FileUtil.getInputStream(proxyConfig.getServer().getTcp().getJksPath());
+            SSLContext serverContext = SSLContext.getInstance("TLS");
+            final KeyStore ks = KeyStore.getInstance("JKS");
+
+            ks.load(jksInputStream, proxyConfig.getServer().getTcp().getKeyStorePassword().toCharArray());
+            final KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+            kmf.init(ks, proxyConfig.getServer().getTcp().getKeyStorePassword().toCharArray());
+            TrustManager[] trustManagers = null;
+
+            serverContext.init(kmf.getKeyManagers(), trustManagers, null);
+
+            SSLEngine sslEngine = serverContext.createSSLEngine();
+            sslEngine.setUseClientMode(false);
+            sslEngine.setNeedClientAuth(false);
+
+            return new SslHandler(sslEngine);
         } catch (Exception e) {
-            log.info("create SSL handler failed", e);
+            log.error("create SSL handler failed", e);
             e.printStackTrace();
         }
         return null;

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

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

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

@@ -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;

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

@@ -8,78 +8,59 @@ import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.Constants;
 import org.dromara.neutrinoproxy.core.util.HttpUtil;
 import org.dromara.neutrinoproxy.core.util.IpUtil;
-import org.dromara.neutrinoproxy.server.service.DomainService;
+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 final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
-    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
-    private final DomainService domainService = Solon.context().getBean(DomainService.class);
-    /**
-     * 域名
-     */
-    private Boolean isHttps;
+    private SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
 
-    public HttpVisitorSecurityChannelHandler(Boolean isHttps) {
-        this.isHttps = isHttps;
-    }
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
         ByteBuf buf = (ByteBuf) msg;
 
-        // 获取Host请求头
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.readBytes(bytes);
-        String httpContent = new String(bytes);
-        String host = HttpUtil.getHostIgnorePort(httpContent); //test1.asgc.fun
+        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: {}", host);
-        if (StringUtils.isBlank(host)) {
-            ctx.channel().close();
-            return;
-        }
-        // 判断域名是否被禁用或删除
-        Integer domainNameId = ProxyUtil.getDomainNameIdByFullDomain(host);
-        if (domainNameId == null) {
-            ctx.channel().close();
-            return;
-        }
-        // 域名映射强制https验证
-        if (!isHttps && domainService.isOnlyHttps(domainNameId)) {
-            ctx.channel().close();
-            return;
-        }
-
-        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
-        if (null == serverPort) {
-            // channel没有服务器端口信息，尝试根据完整域名拿到服务端端口
-            serverPort = ProxyUtil.getServerPortByFullDomain(host);
-            if (null == serverPort) {
+            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 (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
+            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(serverPort);
+            ctx.channel().attr(Constants.SERVER_PORT).set(dm.getId());
+            ctx.channel().attr(Constants.LICENSE_ID).set(dm.getLicenseId());
         }
 
         // 继续传播

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

@@ -31,7 +31,6 @@ public class UdpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapt
         if (!securityGroupService.judgeAllow(datagramPacket.sender().getAddress().getHostAddress(), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
             return;
         }
-
         // 继续传播
         ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
         ctx.fireChannelRead(msg);

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

@@ -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;
+    }
+}

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

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

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

@@ -40,6 +40,7 @@ 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;
@@ -107,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;
     }
@@ -203,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();
     }
 
@@ -338,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;
     }

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

@@ -2,8 +2,8 @@ package org.dromara.neutrinoproxy.server.service;
 
 import cn.hutool.cache.Cache;
 import cn.hutool.cache.CacheUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -30,10 +30,17 @@ import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingCreateRe
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingDetailRes;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingListRes;
 import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingUpdateEnableStatusRes;
-import org.dromara.neutrinoproxy.server.dal.*;
-import org.dromara.neutrinoproxy.server.dal.entity.*;
+import org.dromara.neutrinoproxy.server.controller.res.proxy.PortMappingUpdateRes;
+import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
+import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
+import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
+import org.dromara.neutrinoproxy.server.dal.UserMapper;
+import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
+import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
+import org.dromara.neutrinoproxy.server.dal.entity.PortPoolDO;
+import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.proxy.domain.ProxyMapping;
 import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
-import org.dromara.neutrinoproxy.server.service.bo.FullDomainNameBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
 import org.dromara.neutrinoproxy.server.util.StringUtil;
@@ -62,10 +69,6 @@ public class PortMappingService implements LifecycleBean {
     private UserMapper userMapper;
     @Db
     private PortPoolMapper portPoolMapper;
-    @Db
-    private DomainMapper domainMapper;
-    @Db
-    private DomainPortMappingMapper domainPortMappingMapper;
     @Inject
     private VisitorChannelService visitorChannelService;
 
@@ -80,6 +83,7 @@ public class PortMappingService implements LifecycleBean {
 
     /** 端口到安全组Id的映射 */
     private final Map<Integer, Integer> mappingPortToSecurityGroupMap = new ConcurrentHashMap<>();
+    // 服务端端口到端口映射id的映射
     private final Cache<Integer, Integer> serverPortToPortMappingIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
     // 端口映射id到licenseId
     private final Cache<Integer, Integer> idToLicenseIdCache = CacheUtil.newLRUCache(500, 1000 * 60 * 10);
@@ -115,11 +119,6 @@ public class PortMappingService implements LifecycleBean {
         Map<Integer, LicenseDO> licenseMap = licenseList.stream().collect(Collectors.toMap(LicenseDO::getId, Function.identity()));
         Map<Integer, UserDO> userMap = userList.stream().collect(Collectors.toMap(UserDO::getId, Function.identity()));
 
-        //域名相关
-        Set<Integer> portMappingIds = respList.stream().map(PortMappingListRes::getId).collect(Collectors.toSet());
-        List<FullDomainNameBO> fullDomainNameBOS = domainMapper.selectFullDomainNameListByPortMappingIds(portMappingIds);
-        Map<Integer, List<FullDomainNameBO>> fullDomainNameBOMap = fullDomainNameBOS.stream().collect(Collectors.groupingBy(FullDomainNameBO::getPortMappingId));
-
         respList.forEach(item -> {
             LicenseDO license = licenseMap.get(item.getLicenseId());
             if (null == license) {
@@ -132,8 +131,6 @@ public class PortMappingService implements LifecycleBean {
                 return;
             }
             item.setUserName(user.getName());
-            //域名映射
-            item.setFullDomainMappings(fullDomainNameBOMap.get(item.getId()));
             if (NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal())) {
                 item.setProtocal("HTTP(S)");
             }
@@ -155,21 +152,7 @@ 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());
-        //验证域名映射相关参数条件
-        if (NetworkProtocolEnum.isHttp(req.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
-            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
-            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
-            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
 
-            req.getDomainMappings().forEach(item -> {
-                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
-                ParamCheckUtil.checkNotNull(domainNameDO, ExceptionConstant.DOMAIN_NAME_NOT_EXIST);
-                //检查当前域名是否被禁用
-                //ParamCheckUtil.checkExpression(Objects.equals(EnableStatusEnum.ENABLE.getStatus(), domainNameDO.getEnable()), ExceptionConstant.DOMAIN_NAME_IS_DISABLE, domainNameDO.getDomain());
-                //检查子域名是否重复
-                ParamCheckUtil.checkExpression(!domainPortMappingMapper.checkRepeatBySubdomain(item.getSubdomain(), item.getDomainId(), null), ExceptionConstant.SUDOMAIN_NAME_CANNOT_REPEAT);
-            });
-        }
         Date now = new Date();
         PortMappingDO portMappingDO = new PortMappingDO();
         portMappingDO.setLicenseId(req.getLicenseId());
@@ -188,26 +171,7 @@ public class PortMappingService implements LifecycleBean {
         portMappingDO.setUpdateTime(now);
         portMappingMapper.insert(portMappingDO);
         // 更新VisitorChannel
-        visitorChannelService.addVisitorChannelByPortMapping(portMappingDO);
-
-        // 更新域名映射，添加新的域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
-            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
-            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
-            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
-
-            req.getDomainMappings().forEach(item -> {
-                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
-                //创建域名映射
-                DomainPortMappingDO domainPortMappingDO = new DomainPortMappingDO();
-                domainPortMappingDO.setDomainNameId(item.getDomainId());
-                domainPortMappingDO.setSubdomain(item.getSubdomain());
-                domainPortMappingDO.setPortMappingId(portMappingDO.getId());
-                domainPortMappingMapper.insert(domainPortMappingDO);
-                //设置完整域名到服务端端口的映射
-                ProxyUtil.setFullDomainToServerPort(StrUtil.join(StrPool.DOT, item.getSubdomain(), domainNameDO.getDomain()), portMappingDO.getServerPort());
-            });
-        }
+        visitorChannelService.addVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
 
@@ -231,25 +195,11 @@ 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());
+
         // 查询原端口映射
         PortMappingDO oldPortMappingDO = portMappingMapper.findById(req.getId());
         ParamCheckUtil.checkNotNull(oldPortMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
-        //验证域名映射相关参数条件
-        if (NetworkProtocolEnum.isHttp(req.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
-            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
-            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
-            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
-
-            req.getDomainMappings().forEach(item -> {
-                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
-                ParamCheckUtil.checkNotNull(domainNameDO, ExceptionConstant.DOMAIN_NAME_NOT_EXIST);
-                //检查子域名是否重复
-                boolean b = !domainPortMappingMapper.checkRepeatBySubdomain(item.getSubdomain(), item.getDomainId(), item.getId());
-                ParamCheckUtil.checkExpression(b,
-                    ExceptionConstant.SUDOMAIN_NAME_CANNOT_REPEAT);
-            });
-        }
         // 更新端口映射
         portMappingMapper.update(null, new LambdaUpdateWrapper<PortMappingDO>()
             .eq(PortMappingDO::getId, req.getId())
@@ -268,36 +218,7 @@ public class PortMappingService implements LifecycleBean {
 
         // 更新VisitorChannel
         PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
-        visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
-
-        // 更新域名映射
-        // 删除老的域名映射
-        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal())) {
-            //删除完整域名到服务端端口的映射
-            ProxyUtil.removeFullDomainToServerPortByServerPort(oldPortMappingDO.getServerPort());
-            //删除旧的域名映射
-            LambdaQueryWrapper<DomainPortMappingDO> lambdaQueryWrapper = Wrappers.<DomainPortMappingDO>lambdaQuery()
-                .eq(DomainPortMappingDO::getPortMappingId, oldPortMappingDO.getId());
-            domainPortMappingMapper.delete(lambdaQueryWrapper);
-        }
-        // 添加新的域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal()) && CollectionUtil.isNotEmpty(req.getDomainMappings())) {
-            Set<Integer> domainIds = req.getDomainMappings().stream().map(item -> item.getDomainId()).collect(Collectors.toSet());
-            List<DomainNameDO> domainNameDOS = domainMapper.selectBatchIds(domainIds);
-            Map<Integer, DomainNameDO> domainNameDOMap = domainNameDOS.stream().collect(Collectors.toMap(DomainNameDO::getId, Function.identity()));
-
-            req.getDomainMappings().forEach(item -> {
-                DomainNameDO domainNameDO = domainNameDOMap.get(item.getDomainId());
-                //创建域名映射
-                DomainPortMappingDO domainPortMappingDO = new DomainPortMappingDO();
-                domainPortMappingDO.setDomainNameId(item.getDomainId());
-                domainPortMappingDO.setSubdomain(item.getSubdomain());
-                domainPortMappingDO.setPortMappingId(portMappingDO.getId());
-                domainPortMappingMapper.insert(domainPortMappingDO);
-                //设置完整域名到服务端端口的映射
-                ProxyUtil.setFullDomainToServerPort(StrUtil.join(StrPool.DOT, item.getSubdomain(), domainNameDO.getDomain()), portMappingDO.getServerPort());
-            });
-        }
+        visitorChannelService.updateVisitorChannelByProxyMapping(ProxyMapping.build(oldPortMappingDO), ProxyMapping.build(portMappingDO));
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), req.getSecurityGroupId());
 
@@ -355,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();
@@ -376,17 +297,8 @@ public class PortMappingService implements LifecycleBean {
         portMappingMapper.deleteById(id);
 
         // 更新VisitorChannel
-        visitorChannelService.removeVisitorChannelByPortMapping(portMappingDO);
-
-        // 删除域名映射
-        if (NetworkProtocolEnum.isHttp(portMappingDO.getProtocal())) {
-            //删除完整域名到服务端端口的映射
-            ProxyUtil.removeFullDomainToServerPortByServerPort(portMappingDO.getServerPort());
-            //删除旧的域名映射
-            LambdaQueryWrapper<DomainPortMappingDO> lambdaQueryWrapper = Wrappers.<DomainPortMappingDO>lambdaQuery()
-                .eq(DomainPortMappingDO::getPortMappingId, portMappingDO.getId());
-            domainPortMappingMapper.delete(lambdaQueryWrapper);
-        }
+        visitorChannelService.removeVisitorChannelByProxyMapping(ProxyMapping.build(portMappingDO));
+        // 更新域名映射
 
         updateMappingPortToSecurityGroupMap(portMappingDO.getServerPort(), null);
 
@@ -458,6 +370,7 @@ public class PortMappingService implements LifecycleBean {
             // 刷新流量限制缓存
             refreshFlowLimitCache(item.getId(), item.getUpLimitRate(), item.getDownLimitRate());
         });
+
     }
 
     /**

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

@@ -130,6 +130,7 @@ public class PortPoolService {
                     log.warn("bulk add port err:{}",e.getMessage());
                 }
             }
+
         }else{
             throw ServiceException.create(PORT_RANGE_FAIL);
         }

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

@@ -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表示该端口已经绑定过

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

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

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

@@ -4,13 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.StringUtils;
 import org.dromara.neutrinoproxy.core.ChannelAttribute;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.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.*;
@@ -18,7 +19,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.stream.Collectors;
 
 /**
  *
@@ -32,7 +32,7 @@ public class ProxyUtil {
 	 */
 	private static final Map<Integer, Set<Integer>> licenseToServerPortMap = new HashMap<>();
 	/**
-	 * 代理信息映射 e.g.: 9104 -> 127.0.0.1:8848
+	 * 代理信息映射
 	 */
 	private static final Map<Integer, String> proxyInfoMap = new ConcurrentHashMap<>();
 	/**
@@ -60,19 +60,19 @@ public class ProxyUtil {
 	 * 代理 - connect附加映射
 	 */
 	private static Map<String, ProxyAttachment> proxyConnectAttachmentMap = new HashMap<>();
-	/**
-	 * 完整域名 - 服务端端口映射
-	 */
-	private static Map<String, Integer> fullDomainToServerPortMap = new ConcurrentHashMap<>();
+
+
     /**
-     * 主域名 - 域名id映射
+     * 域名 解析 映射
      */
-    private static Map<String, Integer> domainToDomainNameIdMap = new ConcurrentHashMap<>();
+    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
@@ -83,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) {
@@ -342,86 +343,8 @@ public class ProxyUtil {
 		proxyConnectAttachmentMap.remove(visitorId);
 	}
 
-	/**
-	 * 设置完整域名到服务端端口的映射
-	 * @param fullDomain
-	 * @param serverPort
-	 */
-	public static void setFullDomainToServerPort(String fullDomain, Integer serverPort) {
-        fullDomainToServerPortMap.put(fullDomain, serverPort);
-	}
 
 	/**
-	 * 删除完整域名到服务端端口的映射
-	 * @param fullDomain
-	 */
-	public static void removeFullDomainToServerPort(String fullDomain) {
-        fullDomainToServerPortMap.remove(fullDomain);
-	}
-
-    /**
-     * 通过服务器端口删除完整域名到服务端端口的映射
-     * @param serverPort
-     */
-    public static void removeFullDomainToServerPortByServerPort(Integer serverPort) {
-        fullDomainToServerPortMap.entrySet().removeIf(entry -> Objects.equals(entry.getValue(), serverPort));
-    }
-
-	/**
-	 * 根据完整域名获取外网端口
-	 * @param fullDomain
-	 * @return
-	 */
-	public static Integer getServerPortByFullDomain(String fullDomain) {
-		return fullDomainToServerPortMap.get(fullDomain);
-	}
-
-    /**
-     * 添加域名到域名id的映射
-     */
-    public static void setDomainToDomainNameId(String domain, Integer domainNameId) {
-        domainToDomainNameIdMap.put(domain, domainNameId);
-    }
-
-    /**
-     * 删除域名到域名id的映射
-     */
-    public static void removeDomainToDomainNameId(String domain) {
-        domainToDomainNameIdMap.remove(domain);
-    }
-
-    /**
-     * 通过主域名获取域名id
-     */
-    public static Integer getDomainNameIdByDomain(String domain) {
-        return domainToDomainNameIdMap.get(domain);
-    }
-
-    /**
-     * 通过完整域名获取域名id
-     */
-    public static Integer getDomainNameIdByFullDomain(String fullDomain) {
-        List<String> domains = domainToDomainNameIdMap.keySet().stream().filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList());
-        // 不存在 或者 有多条记录，返回null
-        if (CollectionUtil.isEmpty(domains) || domains.size() > 1) {
-            return null;
-        }
-        return getDomainNameIdByDomain(domains.get(0));
-    }
-
-    /**
-     * 通过完整域名获取域名
-     */
-    public static String getDomainNameByFullDomain(String fullDomain) {
-        List<String> domains = domainToDomainNameIdMap.keySet().stream().filter(item -> fullDomain.endsWith(item)).collect(Collectors.toList());
-        // 不存在 或者 有多条记录，返回null
-        if (CollectionUtil.isEmpty(domains) || domains.size() > 1) {
-            return null;
-        }
-        return domains.getFirst();
-    }
-
-    /**
 	 * 关闭http响应channel
 	 * @param channel
 	 * @return

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -113,32 +113,6 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
 );
 CREATE UNIQUE INDEX IF NOT EXISTS I_port_mapping_server_port ON port_mapping (server_port ASC);
 
-#域名表
-CREATE TABLE IF NOT EXISTS `domain_name` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    `domain` VARCHAR(50) NOT NULL,
-    `user_id` INTEGER NOT NULL,
-    `jks` BLOB DEFAULT NULL,
-    `key_store_password` varchar(255) DEFAULT NULL,
-    `is_default` INTEGER(2) NOT NULL,
-    `force_https` INTEGER(2) NOT NULL,
-    `enable` INTEGER(2) NOT NULL,
-    `create_time` TIMESTAMP NOT NULL,
-    `update_time` TIMESTAMP NOT NULL
-);
-CREATE UNIQUE INDEX IF NOT EXISTS I_domain_name_domain ON domain_name (`domain` ASC);
-
-#域名映射中间表
-CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
-    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
-    `subdomain` VARCHAR(50) NOT NULL,
-    `domain_name_id` INTEGER NOT NULL,
-    `port_mapping_id` INTEGER NOT NULL
-);
-CREATE UNIQUE INDEX IF NOT EXISTS I_unique_domain_port_mapping ON domain_port_mapping (`domain_name_id` ASC, `subdomain` ASC);
-CREATE INDEX IF NOT EXISTS I_domain_port_mapping_domain_name_id ON domain_port_mapping (`domain_name_id` ASC);
-CREATE INDEX IF NOT EXISTS I_domain_port_mapping_port_mapping_id ON domain_port_mapping (`port_mapping_id` ASC);
-
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (
@@ -254,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);

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

@@ -1,3 +1,3 @@
 #license
 INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
+(1, '测试客户端', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());

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

@@ -1,5 +1,5 @@
 #port_mapping
-INSERT INTO port_mapping(`id`, `license_id`, `server_port`,  `protocal`,`client_ip`, `client_port`, `is_online`, `enable`,`description`,`create_time`, `update_time`) VALUES
+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());

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

@@ -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());

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

@@ -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
-);

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

@@ -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);

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

@@ -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;

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

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

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

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

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

@@ -118,34 +118,6 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     PRIMARY KEY (`id`),
     KEY `I_port_mapping_server_port` (`server_port`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-#域名表
-CREATE TABLE IF NOT EXISTS `domain_name` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `domain` varchar(50) NOT NULL COMMENT '域名',
-    `user_id` int NOT NULL COMMENT '用户Id',
-    `jks` BLOB DEFAULT NULL COMMENT 'jks文件',
-    `key_store_password` varchar(255) DEFAULT NULL COMMENT 'jks密码',
-    `is_default` int(2) NOT NULL COMMENT '是否开启默认域名（1、开启 2、关闭）',
-    `force_https` int(2) NOT NULL COMMENT '是否启用强制https（1、开启 2、关闭）',
-    `enable` int(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
-    `create_time` datetime NOT NULL COMMENT '创建时间',
-    `update_time` datetime NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    UNIQUE INDEX `I_domain_name_domain` (`domain` ASC)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-#域名映射中间表
-CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '创建时间',
-    `subdomain` varchar(50) NOT NULL COMMENT '子域名',
-    `domain_name_id` int NOT NULL COMMENT '域名Id',
-    `port_mapping_id` int NOT NULL COMMENT '端口映射Id',
-    PRIMARY KEY (`id`),
-    UNIQUE INDEX `I_unique_domain_port_mapping` (`domain_name_id` ASC, `subdomain` ASC),
-    INDEX `I_domain_port_mapping_domain_name_id` (`domain_name_id` ASC),
-    INDEX `I_domain_port_mapping_port_mapping_id` (`port_mapping_id` ASC)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (
@@ -269,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);

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

@@ -1,3 +1,3 @@
 #license
 INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
+(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());

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

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

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

@@ -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());

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

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

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

@@ -118,34 +118,6 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
     PRIMARY KEY (`id`),
     KEY `I_port_mapping_server_port` (`server_port`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-#域名表
-CREATE TABLE IF NOT EXISTS `domain_name` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
-    `domain` varchar(50) NOT NULL COMMENT '域名',
-    `user_id` int NOT NULL COMMENT '用户Id',
-    `jks` BLOB DEFAULT NULL COMMENT 'jks文件',
-    `key_store_password` varchar(255) DEFAULT NULL COMMENT 'jks密码',
-    `is_default` int(2) NOT NULL COMMENT '是否开启默认域名（1、开启 2、关闭）',
-    `force_https` int(2) NOT NULL COMMENT '是否启用强制https（1、开启 2、关闭）',
-    `enable` int(2) NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
-    `create_time` datetime NOT NULL COMMENT '创建时间',
-    `update_time` datetime NOT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`),
-    UNIQUE INDEX `I_domain_name_domain` (`domain` ASC)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-#域名映射中间表
-CREATE TABLE IF NOT EXISTS `domain_port_mapping` (
-    `id` int NOT NULL AUTO_INCREMENT COMMENT '创建时间',
-    `subdomain` varchar(50) NOT NULL COMMENT '子域名',
-    `domain_name_id` int NOT NULL COMMENT '域名Id',
-    `port_mapping_id` int NOT NULL COMMENT '端口映射Id',
-    PRIMARY KEY (`id`),
-    UNIQUE INDEX `I_unique_domain_port_mapping` (`domain_name_id` ASC, `subdomain` ASC),
-    INDEX `I_domain_port_mapping_domain_name_id` (`domain_name_id` ASC),
-    INDEX `I_domain_port_mapping_port_mapping_id` (`port_mapping_id` ASC)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 #############################日志管理相关表#############################
 #用户登录记录表
 CREATE TABLE IF NOT EXISTS `user_login_record` (
@@ -270,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);

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

@@ -1,3 +1,3 @@
 #license
 INSERT INTO license(`id`, `name`, `key`, `user_id`, `is_online`, `enable`, `create_time`, `update_time`) VALUES
-(1, '我的mac', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 2, 1, now(), now());
+(1, '服务端(不可编辑删除，可禁用)', 'b0a907332b474b25897c4dcb31fc7eb6', 1, 1, 1, now(), now());

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

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

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

@@ -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());

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

@@ -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='端口分组';

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

@@ -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 '描述';

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

@@ -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 '代理超时毫秒数';

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

@@ -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 '写入流量';

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

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

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

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

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

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

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

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

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

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

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

@@ -1,12 +1,12 @@
 ---
 title: 服务端配置
-date: 2024-09-22 11:41:44
+date: 2023-05-27 11:41:44
 permalink: /pages/f2d0f1/
 ---
 
 ::: tip
 
-2.0.2版本，服务端配置格式有所调整。从之前的版本升级的，需要注意
+1.9.0版本，服务端配置格式有所调整。从之前的版本升级的，需要注意
 
 :::
 
@@ -16,37 +16,13 @@ permalink: /pages/f2d0f1/
 server:
   # 服务端web端口，用于支持HTTP接口，管理后台页面访问
   port: ${WEB_PORT:8888}
-  context-path: /neutrino-proxy-server
-solon:
-  app:
-    name: neutrino-proxy-server
-    version: 2.0.1
-  config:
-    add: ./app.yml
 # 日志级别
-solon.logging.appender:
-  console:
-    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight(%-5level) %magenta(${PID:-}) --- %-15([%15.15thread]) %-56(%cyan(%-40.40logger{39}%L)) : %msg%n"
-  file:
-    enable: true
-    pattern: "%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level ${PID:-} --- %-15([%15.15thread]) %-56(%-40.40logger{39}%L) : %msg%n"
-    name: "logs/${solon.app.name}"
-    rolling: "logs/${solon.app.name}_%d{yyyy-MM-dd}_%i.log"
 solon.logging.logger:
   "root":
     level: info
 
 neutrino:
   proxy:
-    protocol:
-      max-frame-length: ${MAX_FRAME_LENGTH:2097152}
-      length-field-offset: 0
-      length-field-length: 4
-      initial-bytes-to-strip: 0
-      length-adjustment: 0
-      read-idle-time: 120
-      write-idle-time: 20
-      all-idle-time-seconds: 0
     # 隧道相关配置-用于维持服务端与客户端的通信
     tunnel:
       # 线程池相关配置，用于技术调优，可忽略
@@ -69,10 +45,15 @@ neutrino:
         # 线程池相关配置，用于技术调优，可忽略
         boss-thread-count: 5
         work-thread-count: 20
-        # http代理端口，默认80（不配置不支持）
+        # http代理端口，默认80
         http-proxy-port: ${HTTP_PROXY_PORT:80}
-        # https代理端口，默认443 （不配置不支持，同时需要配置域名、证书）
+        # https代理端口，默认443 （需要配置域名、证书）
         https-proxy-port: ${HTTPS_PROXY_PORT:443}
+        # 如果不配置，则不支持域名映射
+        domain-name: ${DOMAIN_NAME:}
+        # https证书配置
+        key-store-password: ${HTTPS_STORE_PASS:}
+        jks-path: ${HTTPS_JKS_PATH:}
         # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
         transfer-log-enable: ${SERVER_LOG:false}
       udp:
@@ -91,26 +72,4 @@ neutrino:
       username: ${DB_USER:}
       # 数据库密码
       password: ${DB_PASSWORD:}
-
-#添加MIME印射（如果有需要？）
-#是否启用静态文件服务。（可不配，默认为启用）
-solon.staticfiles.enable: true
-#静态文件的304缓存时长。（可不配，默认为10分钟）
-solon.staticfiles.maxAge: 600
-#添加静态目录映射。（按需选择）#v1.11.0 后支持
-solon.staticfiles.mappings:
-  - path: "/"
-    repository: "./neutrino-proxy-admin/dist/" #2.添加资源路径（仓库只能是目录）
-
-mybatis.db:
-  typeAliases:    #支持包名 或 类名（大写开头 或 *）//支持 ** 或 * 占位符
-    - "org.dromara.neutrinoproxy.server.dal.entity"
-  mappers:        #支持包名 或 类名（大写开头 或 *）或 xml（.xml结尾）//支持 ** 或 * 占位符
-    - "classpath:mapper/*.xml"
-    - "org.dromara.neutrinoproxy.server.dal"
-  configuration:   #扩展配置（要与 MybatisConfiguration 类的属性一一对应）
-    cacheEnabled: false
-    mapUnderscoreToCamelCase: true
-  globalConfig:    #全局配置（要与 GlobalConfig 类的属性一一对应）
-    banner: true
 ```

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

@@ -3,15 +3,6 @@ title: 2.x
 date: 2023-10-26 17:43:43
 permalink: /pages/ff3519/
 ---
-## 2.0.2
-- 新增后台域名管理，⽀持新增、修改、删除、禁⽤主域名，支持添加多级域名。
-- 新增页面上传域名对应的SSL证书、⽀持设置强制HTTPS、⽀持域名映射⾃动加载对应的服务器证书。
-- 新增端⼝映射选择切换不同的主域名，⽀持绑定多个⼦域名，单个端⼝⽀持绑定多个不同的主域名。
-- 升级须知：
-  - **域名和SSL证书的配置由配置文件配置改为后台域名管理页面配置。**
-  - 去掉了配置文件声明服务器端域名和证书的方式，该为通过页面进行管理。请注意代码更新和数据迁移。
-  - 数据库新增`域名表`和`域名映射中间表`，修改了`端口映射表`，涉及到表结构变更，执行[增量SQL](https://gitee.com/dromara/neutrino-proxy/blob/master/neutrino-proxy-server/src/main/resources/sql/mysql/update/UPDATE-20240808.SQL)
-  - 配置文件做了较大调整，请参照官网使用须知中的`服务端配置`、`客户端配置`进行更新
 
 ## 2.0.1
 - jdk版本升级为21