更新配置

新增限速功能
修正文案
2023-12-15 17:15:06 +08:00 · 2023-12-15 17:09:16 +08:00 · 2023-12-15 11:49:32 +08:00 · 2023-12-15 10:25:21 +08:00 · 2023-12-14 16:21:35 +08:00 · 2023-12-14 15:54:44 +08:00
80 changed files with 1577 additions and 513 deletions
@@ -32,10 +32,10 @@ jobs:
        npm install
        npm run build:docker·
        cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
-    - name: GitHub Action for GraalVM JDK 17
+    - name: GitHub Action for GraalVM JDK 21
      uses: graalvm/setup-graalvm@v1
      with:
-        java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17
+        java-version: '21.0.1' # for a specific JDK 21
        distribution: 'graalvm' # New 'distribution' option
        github-token: ${{ secrets.GITHUB_TOKEN }}
    - name: Cache local Maven repository
@@ -31,10 +31,10 @@ jobs:
        npm install
        npm run build:docker
        cp -r ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
-    - name: GitHub Action for GraalVM JDK 17
+    - name: GitHub Action for GraalVM JDK 21
      uses: graalvm/setup-graalvm@v1
      with:
-        java-version: '21.0.1' # for a specific JDK 17; or '17' for the latest JDK 17
+        java-version: '21.0.1' # for a specific JDK 21;
        distribution: 'graalvm' # New 'distribution' option
        github-token: ${{ secrets.GITHUB_TOKEN }}
    - name: Cache local Maven repository
@@ -88,6 +88,9 @@
 <a href="https://gitee.com/songyinyin" target="_blank">
 <img src="assets/developer/songyinyin.png" width="11%">
 </a>
+<a href="https://gitee.com/nichenxyx" target="_blank">
+<img src="assets/developer/NichenFly.jpg" width="11%">
+</a>
 </p>

 #  ❤️ 感谢
@@ -76,3 +76,6 @@
 ## 2.0.1
 - jdk版本升级为21
 - native部署，后台新增提交到后端，数据库乱码问题
+- 解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- [ ] 支持被代理服务获取访问者真实ip
+- [ ] 支持对用户、license限速
@@ -1,68 +1,82 @@
 import request from '@/utils/request'

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

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

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

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

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

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

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

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

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

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

-export function enableRule(ruleId) {
+export function updateRuleEnableStatus(id, enable) {
  return request({
-    url: `${baseUri}/rule/enable?ruleId=${ruleId}`,
-    method: 'post'
+    url: '/security/rule/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
  })
 }
-
-export function disableRule(ruleId) {
-  return request({
-    url: `${baseUri}/rule/disable?ruleId=${ruleId}`,
-    method: 'post'
-  })
-}
@@ -36,6 +36,11 @@
          <span>{{scope.row.key}}</span>
        </template>
      </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
        <template slot-scope="scope">
          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
@@ -85,6 +90,12 @@
        <el-form-item :label="$t('License名称')" prop="name">
          <el-input v-model="temp.name"></el-input>
        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
@@ -39,17 +39,17 @@
          <span>{{ scope.row.userName }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.licenseName')" width="130">
+      <el-table-column align="center" :label="$t('table.licenseName')" width="120">
        <template slot-scope="scope">
          <span>{{ scope.row.licenseName }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.protocalName')" width="100">
+      <el-table-column align="center" :label="$t('table.protocalName')" width="80">
        <template slot-scope="scope">
          <span>{{ scope.row.protocal }}</span>
        </template>
      </el-table-column>
-      <el-table-column align="center" :label="$t('table.domainName')" width="200">
+      <el-table-column align="center" :label="$t('table.domainName')" width="180">
        <template slot-scope="scope">
          <span>{{ scope.row.domain }}</span>
        </template>
@@ -64,17 +64,22 @@
          <span>{{ scope.row.clientIp }}:{{ scope.row.clientPort }}</span>
        </template>
      </el-table-column>
+      <el-table-column align="center" :label="$t('限速')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.upLimitRate ? scope.row.upLimitRate : '--'}} / {{scope.row.downLimitRate ? scope.row.downLimitRate : '--'}}</span>
+        </template>
+      </el-table-column>
      <el-table-column align="center" :label="$t('table.desc')" width="120">
        <template slot-scope="scope">
          <span>{{ scope.row.description }}</span>
        </template>
      </el-table-column>

-      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
-        <template slot-scope="scope">
-          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column width="150px" align="center" :label="$t('table.createTime')">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
        <template slot-scope="scope">
          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
@@ -99,8 +104,7 @@
        <template slot-scope="scope">
          <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{ $t('table.edit') }}</el-button>
          <el-button v-if="scope.row.enable == '1'" size="mini" type="danger" @click="handleModifyStatus(scope.row, 2)">{{$t('table.disable')}}</el-button>
-          <el-button v-if="scope.row.enable == '2'" size="mini" type="success"
-            @click="handleModifyStatus(scope.row, 1)">{{ $t('table.enable') }}</el-button>
+          <el-button 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" />

@@ -182,6 +186,12 @@
            </el-option>
          </el-select>
        </el-form-item>
+        <el-form-item :label="$t('上传限速')" prop="upLimitRate">
+          <el-input v-model="temp.upLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('下载限速')" prop="downLimitRate">
+          <el-input v-model="temp.downLimitRate" placeholder="如：10240B、500K、1M"></el-input>
+        </el-form-item>
        <el-form-item :label="$t('描述')" prop="description">
          <el-input v-model="temp.description"></el-input>
        </el-form-item>
@@ -1,6 +1,17 @@
 <template>
  <div class="app-container calendar-list-container">
    <div class="filter-container">
+      <el-input v-model="listQuery.name" style="width:145px;margin-right:10px" placeholder="请输入名称" />
+      <el-input v-model="listQuery.description" style="width:145px;margin-right:10px" placeholder="请输入描述" />
+      <el-select v-model="listQuery.defaultPassType" placeholder="请选择默认放行类型" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.passType" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-select v-model="listQuery.enable" placeholder="请选择启用状态" clearable style="width:145px;margin-right:10px">
+        <el-option v-for="item in selectObj.statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{
+          $t('table.search') }}
+      </el-button>
      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
    </div>

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

+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-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]" :visible.sync="dialogFormVisible">
      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="120px" style='width: 500px; margin-left:10px;'>
        <el-form-item :label="$t('table.name')" prop="name">
@@ -107,34 +123,34 @@
    </el-dialog>

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

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

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

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

+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-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]" :visible.sync="dialogFormVisible" top="4vh">
      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="right" label-width="100px" style='margin-left:50px;margin-right: 150px'>
        <el-form-item :label="$t('table.name')" prop="name">
@@ -93,7 +109,7 @@
            <div>每个类型中间以英文逗号分隔,形如 192.168.1.1,192.168.3.0/24 是正确的 </div>
          </div>
        </el-form-item>
-        
+

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

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

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

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

+    AttributeKey<Integer> SERVER_PORT = AttributeKey.newInstance("serverPort");
+
+    AttributeKey<Boolean> FLOW_LIMITER_FLAG = AttributeKey.newInstance("flowLimiterFlag");
+

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

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

 import java.net.InetSocketAddress;

@@ -15,4 +17,20 @@ public class IpUtil extends org.noear.solon.core.util.IpUtil {
        return remoteAddress;
    }

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

 import lombok.extern.slf4j.Slf4j;
 import org.dromara.solonplugins.job.annotation.EnableJob;
-import org.noear.snack.core.utils.StringUtil;
 import org.noear.solon.Solon;
 import org.noear.solon.Utils;
 import org.noear.solon.annotation.SolonMain;
@@ -26,6 +25,7 @@ public class ProxyServer {
            if (Utils.isNotEmpty(loglevel)) {
                app.cfg().put("solon.logging.logger.root.level", loglevel);
            }
+            log.info("NeutrinoProxy Server ：{}", app.cfg().get("solon.app.version"));
 		});
 	}
 }
@@ -3,28 +3,8 @@ package org.dromara.neutrinoproxy.server.base;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.base.rest.ResponseBody;
 import org.dromara.neutrinoproxy.server.controller.res.report.HomeDataView;
-import org.dromara.neutrinoproxy.server.dal.ClientConnectRecordMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportDayMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportHourMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportMinuteMapper;
-import org.dromara.neutrinoproxy.server.dal.FlowReportMonthMapper;
-import org.dromara.neutrinoproxy.server.dal.JobInfoMapper;
-import org.dromara.neutrinoproxy.server.dal.LicenseMapper;
-import org.dromara.neutrinoproxy.server.dal.PortMappingMapper;
-import org.dromara.neutrinoproxy.server.dal.PortPoolMapper;
-import org.dromara.neutrinoproxy.server.dal.UserLoginRecordMapper;
-import org.dromara.neutrinoproxy.server.dal.UserMapper;
-import org.dromara.neutrinoproxy.server.dal.UserTokenMapper;
-import org.dromara.neutrinoproxy.server.service.ClientConnectRecordService;
-import org.dromara.neutrinoproxy.server.service.JobInfoService;
-import org.dromara.neutrinoproxy.server.service.JobLogService;
-import org.dromara.neutrinoproxy.server.service.LicenseService;
-import org.dromara.neutrinoproxy.server.service.PortGroupService;
-import org.dromara.neutrinoproxy.server.service.PortMappingService;
-import org.dromara.neutrinoproxy.server.service.PortPoolService;
-import org.dromara.neutrinoproxy.server.service.ReportService;
-import org.dromara.neutrinoproxy.server.service.UserLoginRecordService;
-import org.dromara.neutrinoproxy.server.service.UserService;
+import org.dromara.neutrinoproxy.server.dal.*;
+import org.dromara.neutrinoproxy.server.service.*;
 import org.dromara.solonplugins.job.JobBean;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.aot.RuntimeNativeMetadata;
@@ -56,6 +36,8 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
        metadata.registerLambdaSerialization(ReportService.class);
        metadata.registerLambdaSerialization(UserLoginRecordService.class);
        metadata.registerLambdaSerialization(UserService.class);
+        metadata.registerLambdaSerialization(SecurityGroupService.class);
+

        metadata.registerLambdaSerialization(LicenseMapper.class);
        metadata.registerLambdaSerialization(ClientConnectRecordMapper.class);
@@ -69,6 +51,9 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
        metadata.registerLambdaSerialization(UserLoginRecordMapper.class);
        metadata.registerLambdaSerialization(UserMapper.class);
        metadata.registerLambdaSerialization(UserTokenMapper.class);
+        metadata.registerLambdaSerialization(SecurityGroupMapper.class);
+        metadata.registerLambdaSerialization(SecurityRuleMapper.class);
+

        metadata.registerReflection(HomeDataView.class, MemberCategory.DECLARED_FIELDS);
        metadata.registerReflection(HomeDataView.Last7dFlow.class, MemberCategory.DECLARED_FIELDS);
@@ -20,6 +20,9 @@ import io.netty.channel.nio.NioEventLoopGroup;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.TcpVisitorChannelHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.UdpVisitorChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.TcpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.UdpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
 import org.noear.solon.annotation.Configuration;
@@ -74,6 +77,8 @@ public class ProxyConfiguration implements LifecycleBean {
            }
            ch.pipeline().addFirst(new BytesMetricsHandler());
 //            ch.pipeline().addLast(new ChannelTrafficShapingHandler(1024 * 1024 * 20, 1024 * 1024 * 20, 100, 20000));
+            ch.pipeline().addLast("security", new TcpVisitorSecurityChannelHandler());
+            ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler());
            ch.pipeline().addLast(new TcpVisitorChannelHandler());
            }
        });
@@ -111,6 +116,8 @@ public class ProxyConfiguration implements LifecycleBean {
                    if (null != proxyConfig.getServer().getUdp().getTransferLogEnable() && proxyConfig.getServer().getUdp().getTransferLogEnable()) {
                        ch.pipeline().addFirst(new LoggingHandler(UdpVisitorChannelHandler.class));
                    }
+                    pipeline.addLast(udpServerWorkerGroup, "security", new UdpVisitorSecurityChannelHandler());
+                    ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler());
                    pipeline.addLast(udpServerWorkerGroup, new UdpVisitorChannelHandler());
                }
            });
@@ -40,8 +40,8 @@ public enum ExceptionConstant {
 	NO_PERMISSION_VISIT(5, "当前用户无权访问该资源"),
 	PARAMS_NOT_NULL(10, "参数[{}]不能为空"),
 	PARAMS_NOT_EMPTY(11, "参数[{}]不能为空"),
-
 	FILED_LENGTH_OUT(12 ,"{}不能超出长度{}"),
+    BYTES_DESC_INVALID(13, "参数[{}]字节描述不合法"),

 	// 用户管理(11000)
 	// license管理(12000)
@@ -67,7 +67,12 @@ public enum ExceptionConstant {

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

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

-    private final Integer code;
+    private final Integer type;
    private final String desc;
 }
@@ -70,6 +70,8 @@ public class LicenseController {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotEmpty(req.getName(), "name");
 		ParamCheckUtil.checkNotNull(req.getUserId(), "userId");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");

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

 		return licenseService.update(req);
 	}
@@ -43,6 +43,8 @@ public class PortMappingController {
        ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
        ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
        if (StringUtils.isBlank(req.getClientIp())) {
            // 没传客户端ip，默认为127.0.0.1
            req.setClientIp("127.0.0.1");
@@ -60,6 +62,9 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }

 		return portMappingService.create(req);
 	}
@@ -73,6 +78,8 @@ public class PortMappingController {
 		ParamCheckUtil.checkNotNull(req.getClientPort(), "clientPort");
 		ParamCheckUtil.checkNotEmpty(req.getProtocal(), "protocal");
 		ParamCheckUtil.checkMaxLength(req.getDescription(), 50, "描述", "50");
+        ParamCheckUtil.checkBytesDesc(req.getUpLimitRate(), "upLimitRate");
+        ParamCheckUtil.checkBytesDesc(req.getDownLimitRate(), "downLimitRate");
 		if (StringUtils.isBlank(req.getClientIp())) {
 			// 没传客户端ip，默认为127.0.0.1
 			req.setClientIp("127.0.0.1");
@@ -90,6 +97,9 @@ public class PortMappingController {
 		if (null == req.getProxyTimeoutMs()) {
 			req.setProxyTimeoutMs(0L);
 		}
+        if (null == req.getSecurityGroupId()) {
+            req.setSecurityGroupId(0);
+        }

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

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

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

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

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

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

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

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

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

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


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

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

 }
@@ -38,4 +38,12 @@ public class LicenseCreateReq {
 	 * 用户ID
 	 */
 	private Integer userId;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }
@@ -38,4 +38,12 @@ public class LicenseUpdateReq {
 	 * license名称
 	 */
 	private String name;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 }
@@ -54,6 +54,14 @@ public class PortMappingCreateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -58,6 +58,14 @@ public class PortMappingUpdateReq {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 代理响应数量（响应数据包数量，如果没有拆包则等于数据条数）
 	 */
@@ -18,6 +18,6 @@ public class SecurityGroupCreateReq {
    /**
     * 通过类型
     */
-    private SecurityRulePassTypeEnum defaultPassType;
+    private Integer defaultPassType;

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

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

    /**
     * 优先级，数字越小，优先级越高
@@ -32,6 +32,14 @@ public class LicenseListRes {
 	 * 用户名
 	 */
 	private String userName;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 是否在线
 	 * {@link OnlineStatusEnum}
@@ -75,6 +75,14 @@ public class PortMappingListRes {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 客户端端口
 	 */
@@ -5,11 +5,9 @@ import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;

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

    private Integer id;

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

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

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

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

    private Integer id;

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

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

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

 }
@@ -0,0 +1,8 @@
+package org.dromara.neutrinoproxy.server.controller.res.system;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/10
+ */
+public class SecurityRuleUpdateEnableStatueRes {
+}
@@ -89,14 +89,6 @@ public interface LicenseMapper extends BaseMapper<LicenseDO> {
        return this.selectById(id);
    }

-    default void update(Integer id, String name, Date updateTime) {
-        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-                .eq(LicenseDO::getId, id)
-                .set(LicenseDO::getName, name)
-                .set(LicenseDO::getUpdateTime, updateTime)
-        );
-    }
-
    default List<LicenseDO> findByIds(Set<Integer> ids) {
        return selectBatchIds(ids);
    }
@@ -1,7 +1,25 @@
 package org.dromara.neutrinoproxy.server.dal;

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

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

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

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

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

    public LicenseListRes toRes() {
        LicenseListRes res = new LicenseListRes();
-        res.setId(id);
-        res.setName(name);
-        res.setKey(key);
-        res.setUserId(userId);
-        res.setIsOnline(isOnline);
-        res.setEnable(enable);
-        res.setCreateTime(createTime);
-        res.setUpdateTime(updateTime);
+        BeanUtil.copyProperties(this, res);
        return res;
    }
 }
@@ -70,6 +70,14 @@ public class PortMappingDO {
 	 * 客户端端口
 	 */
 	private Integer clientPort;
+    /**
+     * 上传限速
+     */
+    private String upLimitRate;
+    /**
+     * 下载限速
+     */
+    private String downLimitRate;
 	/**
 	 * 描述
 	 */
@@ -11,7 +11,8 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
-import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupDetailRes;
+import org.dromara.neutrinoproxy.server.controller.res.system.SecurityGroupListRes;

 import java.util.Date;

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

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

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

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

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

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

 import java.util.Date;

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

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

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

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

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

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

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

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

 import java.net.InetSocketAddress;

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

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

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

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

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

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

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

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

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

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

-//        String visitorId = ProxyUtil.getVisitorIdByChannel(ctx.channel());
-//        if (StringUtils.isNotBlank(visitorId)) {
-//            // UDP代理隧道已就绪，直接转发
-//            proxyAttachment.execute();
-//            return;
-//        }
        Channel proxyChannel = ctx.channel().attr(Constants.NEXT_CHANNEL).get();
        if (null != proxyChannel && proxyChannel.isActive()) {
            // UDP代理隧道已就绪，直接转发
@@ -11,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
@@ -46,7 +48,9 @@ public class HttpProxy implements EventListener<AppLoadEndEvent> {
                                ch.pipeline().addFirst(new LoggingHandler(HttpProxy.class));
                            }
                            ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast("security", new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler());
+                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
                        }
                    });
            bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpProxyPort()).sync();
@@ -1,6 +1,5 @@
 package org.dromara.neutrinoproxy.server.proxy.enhance;

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

 import java.net.InetSocketAddress;

@@ -30,26 +25,8 @@ import java.net.InetSocketAddress;
@Slf4j
 public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteBuf> {

-    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
-
-    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
-
-    /**
-     * 域名
-     */
-    private String domainName;
-
-    public HttpVisitorChannelHandler(String domainName) {
-        this.domainName = domainName;
-    }
-
    @Override
    protected void channelRead0(ChannelHandlerContext ctx, ByteBuf byteBuf) throws Exception {
-        if (StrUtil.isBlank(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-
        byte[] bytes = new byte[byteBuf.readableBytes()];
        byteBuf.readBytes(bytes);
        byteBuf.resetReaderIndex();
@@ -77,33 +54,9 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
        // 用户连接到代理服务器时，设置用户连接不可读，等待代理后端服务器连接成功后再改变为可读状态
        ctx.channel().config().setOption(ChannelOption.AUTO_READ, false);

-        String host = getHost(bytes);
-        log.debug("HttpProxy host: {}", host);
-        if (StringUtils.isBlank(host)) {
-            ctx.channel().close();
-            return;
-        }
-        if (!host.endsWith(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-        int index = host.lastIndexOf("." + domainName);
-        String subdomain = host.substring(0, index);

        // 根据域名拿到绑定的映射对应的cmdChannel
-        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
-        if (null == serverPort) {
-            ctx.channel().close();
-            return;
-        }
-
-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
-        }
-
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
        Channel cmdChannel = ProxyUtil.getCmdChannelByServerPort(serverPort);
        if (null == cmdChannel) {
            ctx.channel().close();
@@ -167,23 +120,15 @@ public class HttpVisitorChannelHandler extends SimpleChannelInboundHandler<ByteB
        ctx.close();
    }

-    private String getHost(byte[] buf) {
-        String req = new String(buf);
-        String[] lines = req.split("\r\n");
-        String firstLine = lines[0];
-        if (!(firstLine.endsWith("HTTP/1.1") || firstLine.endsWith("HTTP/1.0"))) {
-            return null;
+    @Override
+    public void channelWritabilityChanged(ChannelHandlerContext ctx) throws Exception {
+
+        // 通知代理客户端
+        Channel visitorChannel = ctx.channel();
+        Channel proxyChannel = visitorChannel.attr(Constants.NEXT_CHANNEL).get();
+        if (null != proxyChannel) {
+            proxyChannel.config().setOption(ChannelOption.AUTO_READ, visitorChannel.isWritable());
        }
-        for (int i = 1; i < lines.length; i++) {
-            String line = lines[i];
-            if (!line.startsWith("Host: ")) {
-                continue;
-            }
-            // 域名
-            String domain = line.substring(6);
-            // 去掉域名后面的端口号
-            return domain.replaceAll(":.*", "");
-        }
-        return null;
+        super.channelWritabilityChanged(ctx);
    }
 }
@@ -14,6 +14,8 @@ import org.dromara.neutrinoproxy.core.util.FileUtil;
 import org.dromara.neutrinoproxy.server.base.proxy.ProxyConfig;
 import org.dromara.neutrinoproxy.server.proxy.core.BytesMetricsHandler;
 import org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelServer;
+import org.dromara.neutrinoproxy.server.proxy.security.HttpVisitorSecurityChannelHandler;
+import org.dromara.neutrinoproxy.server.proxy.security.VisitorFlowLimiterChannelHandler;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.event.AppLoadEndEvent;
@@ -55,7 +57,9 @@ public class HttpsProxy implements EventListener<AppLoadEndEvent> {
                            }
                            ch.pipeline().addLast(createSslHandler());
                            ch.pipeline().addFirst(new BytesMetricsHandler());
-                            ch.pipeline().addLast(new HttpVisitorChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast("security", new HttpVisitorSecurityChannelHandler(proxyConfig.getServer().getTcp().getDomainName()));
+                            ch.pipeline().addLast(new VisitorFlowLimiterChannelHandler());
+                            ch.pipeline().addLast(new HttpVisitorChannelHandler());
                        }
                    });
            bootstrap.bind("0.0.0.0", proxyConfig.getServer().getTcp().getHttpsProxyPort()).sync();
@@ -90,7 +90,7 @@ public class ProxyMessageAuthHandler implements ProxyMessageHandler {

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

 		// 获取代理附加对象
@@ -0,0 +1,87 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import cn.hutool.core.util.StrUtil;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.HttpUtil;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.noear.solon.Solon;
+
+/**
+ * @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 String domainName;
+
+    public HttpVisitorSecurityChannelHandler(String domainName) {
+        this.domainName = domainName;
+    }
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        // 未配置域名则不支持通过域名访问
+        if (StrUtil.isBlank(domainName)) {
+            ctx.channel().close();
+            return;
+        }
+
+        ByteBuf buf = (ByteBuf) msg;
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);
+
+        // 获取Host请求头
+        String httpContent = new String(bytes);
+        String host = HttpUtil.getHostIgnorePort(httpContent);
+
+        log.debug("HttpProxy host: {}", host);
+        if (StringUtils.isBlank(host)) {
+            ctx.channel().close();
+            return;
+        }
+
+        // 根据Host匹配端口映射
+        if (!host.endsWith(domainName)) {
+            ctx.channel().close();
+            return;
+        }
+        int index = host.lastIndexOf("." + domainName);
+        String subdomain = host.substring(0, index);
+
+        // 根据域名拿到绑定的映射对应的cmdChannel
+        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+        if (null == serverPort) {
+            ctx.channel().close();
+            return;
+        }
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        String ip = IpUtil.getRealRemoteIp(httpContent);
+        if (ip == null) {
+            ip = IpUtil.getRemoteIp(ctx);
+        }
+        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+}
@@ -0,0 +1,68 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.core.util.IpUtil;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class TcpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+
+        ByteBuf buf = (ByteBuf) msg;
+        byte[] bytes = new byte[buf.readableBytes()];
+        buf.readBytes(bytes);
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        String ip = IpUtil.getRealRemoteIp(new String(bytes));
+        if (StringUtils.isEmpty(ip)) {
+            ip = IpUtil.getRemoteIp(ctx);
+        }
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        buf.resetReaderIndex();
+        ctx.fireChannelRead(buf);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(IpUtil.getRemoteIp(ctx), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            // 不在安全组规则放行范围内
+            ctx.channel().close();
+            return;
+        }
+
+        // 继续传播
+        ctx.fireChannelActive();
+    }
+
+}
@@ -0,0 +1,39 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.socket.DatagramPacket;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.noear.solon.Solon;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/14
+ */
+@Slf4j
+public class UdpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdapter {
+    private final SecurityGroupService securityGroupService = Solon.context().getBean(SecurityGroupService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Channel visitorChannel = ctx.channel();
+        InetSocketAddress sa = (InetSocketAddress) visitorChannel.localAddress();
+        DatagramPacket datagramPacket = (DatagramPacket) msg;
+
+        // 判断IP是否在该端口绑定的安全组允许的规则内
+        if (!securityGroupService.judgeAllow(datagramPacket.sender().getAddress().getHostAddress(), portMappingService.getSecurityGroupIdByMappingPort(sa.getPort()))) {
+            return;
+        }
+
+        // 继续传播
+        ctx.channel().attr(Constants.SERVER_PORT).set(sa.getPort());
+        ctx.fireChannelRead(msg);
+    }
+}
@@ -0,0 +1,52 @@
+package org.dromara.neutrinoproxy.server.proxy.security;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.traffic.ChannelTrafficShapingHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.neutrinoproxy.core.Constants;
+import org.dromara.neutrinoproxy.server.service.LicenseService;
+import org.dromara.neutrinoproxy.server.service.PortMappingService;
+import org.dromara.neutrinoproxy.server.service.SecurityGroupService;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
+import org.noear.solon.Solon;
+
+/**
+ * 访问者流量限制器
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Slf4j
+public class VisitorFlowLimiterChannelHandler extends ChannelInboundHandlerAdapter {
+
+    private final LicenseService licenseService = Solon.context().getBean(LicenseService.class);
+    private final PortMappingService portMappingService = Solon.context().getBean(PortMappingService.class);
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+        Boolean flowLimiterFlag = ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).get();
+
+        if (null == flowLimiterFlag || !flowLimiterFlag) {
+            Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
+            Long upLimitRate = null;
+            Long downLimitRate = null;
+            // 先获取端口映射上的限速设置
+            FlowLimitBO flowLimitBO = portMappingService.getFlowLimitByServerPort(serverPort);
+            if (null != flowLimitBO) {
+                upLimitRate = flowLimitBO.getUpLimitRate();
+                downLimitRate = flowLimitBO.getDownLimitRate();
+            }
+            if (null != upLimitRate || null != downLimitRate) {
+                // 如果不全为空，则需要做限速
+                ctx.pipeline().addAfter("security", "trafficShaping", new ChannelTrafficShapingHandler(downLimitRate == null ? 0 : downLimitRate, upLimitRate == null ? 0 : upLimitRate, 100, 600000));
+            }
+
+            // 每个连接第一次处理之后。无论是否限速，该连接后续都不在处理，避免频繁执行影响性能
+            ctx.channel().attr(Constants.FLOW_LIMITER_FLAG).set(Boolean.TRUE);
+        }
+
+        // 继续传播
+        ctx.fireChannelRead(msg);
+    }
+
+}
@@ -1,7 +1,10 @@
 package org.dromara.neutrinoproxy.server.service;

+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import com.google.common.collect.Sets;
@@ -29,7 +32,9 @@ import org.dromara.neutrinoproxy.server.dal.UserMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.LicenseDO;
 import org.dromara.neutrinoproxy.server.dal.entity.PortMappingDO;
 import org.dromara.neutrinoproxy.server.dal.entity.UserDO;
+import org.dromara.neutrinoproxy.server.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
@@ -63,6 +68,8 @@ public class LicenseService implements LifecycleBean {
    private VisitorChannelService visitorChannelService;
    @Inject
    private DBInitialize dbInitialize;
+    // 流量限制缓存
+    private final Cache<Integer, FlowLimitBO> flowLimitCache = CacheUtil.newLRUCache(200, 1000 * 60 * 5);

    public PageInfo<LicenseListRes> page(PageQuery pageQuery, LicenseListReq req) {
        Page<LicenseDO> page = licenseMapper.selectPage(new Page<>(pageQuery.getCurrent(), pageQuery.getSize()), new LambdaQueryWrapper<LicenseDO>()
@@ -128,15 +135,21 @@ public class LicenseService implements LifecycleBean {
        String key = UUID.randomUUID().toString().replaceAll("-", "");
        Date now = new Date();

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

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

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

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

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


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

@@ -1,9 +1,12 @@
 package org.dromara.neutrinoproxy.server.service;

+import cn.hutool.cache.Cache;
+import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -36,19 +39,17 @@ 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.service.bo.FlowLimitBO;
 import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.dromara.neutrinoproxy.server.util.ProxyUtil;
+import org.dromara.neutrinoproxy.server.util.StringUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.bean.LifecycleBean;
 import org.noear.solon.core.runtime.NativeDetector;

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

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

    public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq req) {
        if (StringUtils.isNotEmpty(req.getDescription())) {
@@ -153,6 +162,8 @@ public class PortMappingService implements LifecycleBean {
        portMappingDO.setServerPort(req.getServerPort());
        portMappingDO.setClientIp(req.getClientIp());
        portMappingDO.setClientPort(req.getClientPort());
+        portMappingDO.setUpLimitRate(req.getUpLimitRate());
+        portMappingDO.setDownLimitRate(req.getDownLimitRate());
        portMappingDO.setProxyResponses(req.getProxyResponses());
        portMappingDO.setProxyTimeoutMs(req.getProxyTimeoutMs());
        portMappingDO.setDescription(req.getDescription());
@@ -170,6 +181,13 @@ public class PortMappingService implements LifecycleBean {

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

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

@@ -189,15 +207,25 @@ public class PortMappingService implements LifecycleBean {
        PortMappingDO oldPortMappingDO = portMappingMapper.findById(req.getId());
        ParamCheckUtil.checkNotNull(oldPortMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);

-        PortMappingDO portMappingDO = new PortMappingDO();
-        BeanUtil.copyProperties(req, portMappingDO);
-        if (req.getSecurityGroupId() == null) {
-            portMappingDO.setSecurityGroupId(0);
-        }
-        portMappingDO.setUpdateTime(new Date());
-        portMappingDO.setEnable(EnableStatusEnum.ENABLE.getStatus());
-        portMappingMapper.updateById(portMappingDO);
+        // 更新端口映射
+        portMappingMapper.update(null, new LambdaUpdateWrapper<PortMappingDO>()
+            .eq(PortMappingDO::getId, req.getId())
+            .set(PortMappingDO::getProtocal, req.getProtocal())
+            .set(PortMappingDO::getSubdomain, req.getSubdomain())
+            .set(PortMappingDO::getServerPort, req.getServerPort())
+            .set(PortMappingDO::getClientIp, req.getClientIp())
+            .set(PortMappingDO::getClientPort, req.getClientPort())
+            .set(PortMappingDO::getUpLimitRate, req.getUpLimitRate())
+            .set(PortMappingDO::getDownLimitRate, req.getDownLimitRate())
+            .set(PortMappingDO::getProxyTimeoutMs, req.getProxyTimeoutMs())
+            .set(PortMappingDO::getProxyResponses, req.getProxyResponses())
+            .set(PortMappingDO::getSecurityGroupId, req.getSecurityGroupId())
+            .set(PortMappingDO::getDescription, req.getDescription())
+            .set(PortMappingDO::getUpdateTime, new Date())
+        );
+
        // 更新VisitorChannel
+        PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
        visitorChannelService.updateVisitorChannelByPortMapping(oldPortMappingDO, portMappingDO);
        // 删除老的域名映射
        if (NetworkProtocolEnum.isHttp(oldPortMappingDO.getProtocal()) && StrUtil.isNotBlank(oldPortMappingDO.getSubdomain())) {
@@ -209,6 +237,13 @@ public class PortMappingService implements LifecycleBean {
        }

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

    public PortMappingDetailRes detail(Integer id) {
@@ -285,6 +320,11 @@ public class PortMappingService implements LifecycleBean {
        }

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

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

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

        // 未配置域名，则不需要处理域名映射逻辑
@@ -350,7 +397,6 @@ public class PortMappingService implements LifecycleBean {
        List<PortMappingDO> portMappingDOList = allMappingDOList.stream()
            .filter(item -> NetworkProtocolEnum.HTTP.getDesc().equals(item.getProtocal()) && item.getSubdomain() != null)
            .collect(Collectors.toList());
-//      List<PortMappingDO> portMappingDOList =  portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>().eq(PortMappingDO::getProtocal, NetworkProtocolEnum.HTTP.getDesc()).isNotNull(PortMappingDO::getSubdomain));
        if (CollectionUtil.isEmpty(portMappingDOList)) {
            return;
        }
@@ -363,6 +409,84 @@ public class PortMappingService implements LifecycleBean {
        });
    }

+    /**
+     * 刷新流量限制缓存
+     * @param id
+     * @param upLimitRate
+     * @param downLimitRate
+     */
+    private void refreshFlowLimitCache(Integer id, String upLimitRate, String downLimitRate) {
+        if (null == id) {
+            return;
+        }
+        flowLimitCache.put(id, new FlowLimitBO()
+            .setUpLimitRate(StringUtil.parseBytes(upLimitRate))
+            .setDownLimitRate(StringUtil.parseBytes(downLimitRate))
+        );
+    }
+
+    /**
+     * 获取license的流量限制
+     * @param id
+     * @return
+     */
+    public FlowLimitBO getFlowLimit(Integer id) {
+        FlowLimitBO res = flowLimitCache.get(id);
+        if (null == res) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                refreshFlowLimitCache(id, portMappingDO.getUpLimitRate(), portMappingDO.getDownLimitRate());
+                res = flowLimitCache.get(id);
+            }
+        }
+        return res;
+    }
+
+    public Integer getPortMappingIdByServerPort(Integer serverPort) {
+        if (null == serverPort) {
+            return null;
+        }
+        Integer id = serverPortToPortMappingIdCache.get(serverPort);
+        if (null != id) {
+            return id;
+        }
+        List<PortMappingDO> portMappingDOList = portMappingMapper.findListByServerPort(serverPort);
+        // 不存在 或者 有多条记录，都不处理
+        if (CollectionUtils.isEmpty(portMappingDOList) || portMappingDOList.size() > 1) {
+            return null;
+        }
+        id = portMappingDOList.get(0).getId();
+        serverPortToPortMappingIdCache.put(serverPort, id);
+        return id;
+    }
+
+    public Integer getLicenseIdById(Integer id) {
+        Integer licenseId = idToLicenseIdCache.get(id);
+        if (null == licenseId) {
+            PortMappingDO portMappingDO = portMappingMapper.findById(id);
+            if (null != portMappingDO) {
+                licenseId = portMappingDO.getLicenseId();
+                idToLicenseIdCache.put(id, licenseId);
+            }
+        }
+        return licenseId;
+    }
+
+    public FlowLimitBO getFlowLimitByServerPort(Integer serverPort) {
+        Integer id = getPortMappingIdByServerPort(serverPort);
+        if (null == id) {
+            return null;
+        }
+        FlowLimitBO res = getFlowLimit(id);
+        if (null == res || (null == res.getUpLimitRate() && null == res.getDownLimitRate())) {
+            Integer licenseId = getLicenseIdById(id);
+            if (null != licenseId) {
+                res = licenseService.getFlowLimit(licenseId);
+            }
+        }
+        return res;
+    }
+
    private void updateMappingPortToSecurityGroupMap(Integer serverPort, Integer securityGroupId) {
        if (securityGroupId == null || securityGroupId == 0) {
            mappingPortToSecurityGroupMap.remove(serverPort);
@@ -23,7 +23,7 @@ public class ProtocalService {
    public List<ProtocalListRes> list() {
        return Lists.newArrayList(
                new ProtocalListRes().setName("TCP").setEnable(Boolean.TRUE).setRemark("支持一切TCP之上的协议"),
-                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于时使用TCP。 若配置了证书，则同时支持HTTPS。"),
+                new ProtocalListRes().setName("HTTP(S)").setEnable(Boolean.TRUE).setRemark("支持绑定子域名，未绑定时等价于使用TCP。 若配置了证书，则同时支持HTTPS。"),
                new ProtocalListRes().setName("UDP").setEnable(Boolean.TRUE).setRemark("支持UDP转发、响应。需要配合响应数、超时时间使用")
        );
    }
@@ -4,29 +4,36 @@ import cn.hutool.cache.Cache;
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import jdk.jshell.Snippet;
+import com.baomidou.mybatisplus.solon.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.solon.annotation.Db;
+import org.dromara.neutrinoproxy.server.base.page.PageInfo;
+import org.dromara.neutrinoproxy.server.base.page.PageQuery;
 import org.dromara.neutrinoproxy.server.base.rest.SystemContextHolder;
 import org.dromara.neutrinoproxy.server.constant.EnableStatusEnum;
+import org.dromara.neutrinoproxy.server.constant.ExceptionConstant;
 import org.dromara.neutrinoproxy.server.constant.SecurityRulePassTypeEnum;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityGroupUpdateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleCreateReq;
-import org.dromara.neutrinoproxy.server.controller.req.system.SecurityRuleUpdateReq;
+import org.dromara.neutrinoproxy.server.controller.req.system.*;
+import org.dromara.neutrinoproxy.server.controller.res.system.*;
 import org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper;
 import org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO;
 import org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO;
+import org.dromara.neutrinoproxy.server.util.ParamCheckUtil;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Init;
 import org.noear.solon.core.runtime.NativeDetector;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        ipAllowControlCache.put(judgeAllowMapKey, allow);
@@ -0,0 +1,15 @@
+package org.dromara.neutrinoproxy.server.service.bo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+@Accessors(chain = true)
+@Data
+public class FlowLimitBO {
+    private Long upLimitRate;
+    private Long downLimitRate;
+}
@@ -103,4 +103,20 @@ public class ParamCheckUtil {
        }
    }

+    /**
+     * 校验字节描述
+     * @param str
+     * @param params
+     */
+    public static void checkBytesDesc(String str, Object... params) {
+        // 允许为空
+        if (StrUtil.isEmpty(str)) {
+            return;
+        }
+        Long bytes = StringUtil.parseBytes(str);
+        if (null == bytes || bytes <= 0) {
+            throw ServiceException.create(ExceptionConstant.BYTES_DESC_INVALID, params);
+        }
+    }
+
 }
@@ -0,0 +1,75 @@
+package org.dromara.neutrinoproxy.server.util;
+
+import cn.hutool.core.util.StrUtil;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2023/12/15
+ */
+public class StringUtil {
+    private static final Integer BYTES_MUL_KB = 1024;
+    private static final Integer BYTES_MUL_MB = BYTES_MUL_KB * 1024;
+    private static final Integer BYTES_MUL_GB = BYTES_MUL_MB * 1024;
+    private static final String[] BYTES_UNIT_STR = {"B", "K", "KB", "M", "MB", "G", "GB"};
+    private static final Integer[] BYTES_UNIT_MUL = {1, BYTES_MUL_KB, BYTES_MUL_KB, BYTES_MUL_MB, BYTES_MUL_MB, BYTES_MUL_GB, BYTES_MUL_GB};
+    private static final String BYTES_DESC_REGEX = "\\s*(\\d+)\\s*(B|K|KB|M|MB|G|GB)\\s*";
+    private static final Pattern BYTES_DESC_PATTERN = Pattern.compile(BYTES_DESC_REGEX);
+
+    /**
+     * 校验是否符合字节描述
+     * @param desc
+     * @return
+     */
+    public static boolean isBytesDesc(String desc) {
+        if (StrUtil.isBlank(desc)) {
+            return false;
+        }
+        return desc.toUpperCase().matches(BYTES_DESC_REGEX);
+    }
+
+    /**
+     * 解析字节数
+     * 支持B、K、KB、M、MB、G、GB 忽略大小写、忽略首尾空格、忽略数字与单位之间的空格
+     * @param desc
+     * @return
+     */
+    public static Long parseBytes(String desc) {
+        try {
+            if (!isBytesDesc(desc)) {
+                return null;
+            }
+            Matcher matcher = BYTES_DESC_PATTERN.matcher(desc.toUpperCase());
+            boolean found = matcher.find();
+            if (!found) {
+                return null;
+            }
+            Integer n = Integer.parseInt(matcher.group(1));
+            String unit = matcher.group(2);
+            Integer unitIndex = getBytesUnitIndex(unit);
+            if (null == unitIndex) {
+                return null;
+            }
+
+            return (long)n * BYTES_UNIT_MUL[unitIndex];
+        } catch (Exception e) {
+            // ignore
+        }
+
+        return null;
+    }
+
+    private static Integer getBytesUnitIndex(String unit) {
+        if (StrUtil.isBlank(unit)) {
+            return null;
+        }
+        for (int i = 0; i < BYTES_UNIT_STR.length; i++) {
+            if (unit.equals(BYTES_UNIT_STR[i])) {
+                return i;
+            }
+        }
+        return null;
+    }
+}
@@ -18,46 +18,46 @@ neutrino:
      boss-thread-count: 2
      work-thread-count: 10
      # 隧道非SSL端口
-      port: ${OPEN_PORT:9000}
+      port: 9000
      # 隧道SSL端口
-      ssl-port: ${SSL_PORT:9002}
+      ssl-port: 9002
      # 隧道SSL证书配置
-      key-store-password: ${STORE_PASS:123456}
-      key-manager-password: ${MGR_PASS:123456}
-      jks-path: ${JKS_PATH:classpath:/test.jks}
+      key-store-password: 123456
+      key-manager-password: 123456
+      jks-path: classpath:/test.jks
      # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)
-      transfer-log-enable: ${TUNNEL_LOG:false}
+      transfer-log-enable: false
      # 是否开启心跳日志
-      heartbeat-log-enable: ${HEARTBEAT_LOG:false}
+      heartbeat-log-enable: false
    server:
      tcp:
        # 线程池相关配置，用于技术调优，可忽略
        boss-thread-count: 5
        work-thread-count: 20
        # http代理端口，默认80
-        http-proxy-port: ${HTTP_PROXY_PORT:80}
+        http-proxy-port: 80
        # https代理端口，默认443 （需要配置域名、证书）
-        https-proxy-port: ${HTTPS_PROXY_PORT:443}
+        https-proxy-port: 443
        # 如果不配置，则不支持域名映射
-        domain-name: ${DOMAIN_NAME:}
+        domain-name:
        # https证书配置
-        key-store-password: ${HTTPS_STORE_PASS:}
-        jks-path: ${HTTPS_JKS_PATH:}
+        key-store-password:
+        jks-path:
        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
-        transfer-log-enable: ${SERVER_LOG:false}
+        transfer-log-enable: false
      udp:
        # 线程池相关配置，用于技术调优，可忽略
        boss-thread-count: 5
        work-thread-count: 20
        # 是否开启代理服务报文日志(日志级别为debug时开启才有效)
-        transfer-log-enable: ${SERVER_LOG:false}
+        transfer-log-enable: false
  data:
    db:
      # 数据库类型，目前支持h2、mysql、mariadb
-      type: ${DB_TYPE:h2}
+      type: h2
      # 数据库连接URL
-      url: ${DB_URL:jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE}
+      url: jdbc:h2:file:./data/db;MODE=MySQL;AUTO_SERVER=TRUE
      # 数据库用户名
-      username: ${DB_USER:}
+      username:
      # 数据库密码
-      password: ${DB_PASSWORD:}
+      password:
@@ -5,7 +5,7 @@ server:
 solon:
  app:
    name: neutrino-proxy-server
-    version: @revision@
+    version: 2.0.1
  config:
    add: ./app.yml
 # 日志级别
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityGroupMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityGroupDO">
+        SELECT sg.* from security_group sg
+        <where>
+            <if test="req.name != null and req.name != '' ">
+                AND sg.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sg.description like #{req.description}
+            </if>
+            <if test="req.defaultPassType != null">
+                AND sg.default_pass_type like #{req.defaultPassType}
+            </if>
+            <if test="req.enable != null">
+                AND sg.enable like #{req.enable}
+            </if>
+        </where>
+        order by sg.id DESC
+    </select>
+</mapper>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.neutrinoproxy.server.dal.SecurityRuleMapper">
+
+    <select id="selectByCondition" resultType="org.dromara.neutrinoproxy.server.dal.entity.SecurityRuleDO">
+        SELECT sr.* from security_rule sr
+        <where>
+            <if test="req.groupId != null">
+                AND sr.group_id = ${req.groupId}
+            </if>
+            <if test="req.name != null and req.name != '' ">
+                AND sr.name like #{req.name}
+            </if>
+            <if test="req.description != null and req.description != '' ">
+                AND sr.description like #{req.description}
+            </if>
+            <if test="req.passType != null">
+                AND sr.pass_type like #{req.passType}
+            </if>
+            <if test="req.enable != null">
+                AND sr.enable like #{req.enable}
+            </if>
+        </where>
+        order by sr.id DESC
+    </select>
+</mapper>
@@ -52,8 +52,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255),
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
-    `default_pass_type` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
+    `default_pass_type` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
@@ -66,10 +66,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255) NOT NULL,
    `rule` text NOT NULL,
-    `pass_type` VARCHAR(20) NOT NULL,
+    `pass_type` INTEGER NOT NULL,
    `priority` INTEGER NOT NULL,
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
@@ -83,6 +83,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` VARCHAR(50) NOT NULL,
    `key` VARCHAR(100) NOT NULL,
    `user_id` INTEGER NOT NULL,
+    `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+    `down_limit_rate` VARCHAR(20) DEFAULT NULL,
    `is_online` INTEGER(2) NOT NULL,
    `enable` INTEGER(2) NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
@@ -99,6 +101,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
  `server_port` INTEGER NOT NULL,
  `client_ip` VARCHAR(20) NOT NULL,
  `client_port` INTEGER NOT NULL,
+  `up_limit_rate` VARCHAR(20) DEFAULT NULL,
+  `down_limit_rate` VARCHAR(20) DEFAULT NULL,
  `is_online` INTEGER(2) NOT NULL,
  `description` VARCHAR(100) DEFAULT NULL,
  `proxy_responses` INTEGER(20) NOT NULL DEFAULT 0,
@@ -167,8 +171,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_minute` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -183,8 +187,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_hour` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -199,8 +203,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_day` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -215,8 +219,8 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
    `id` INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
    `user_id` INTEGER(20) NOT NULL,
    `license_id` INTEGER(20) NOT NULL,
-    `write_bytes` INTEGER(20) NOT NULL,
-    `read_bytes` INTEGER(20) NOT NULL,
+    `write_bytes` bigint NOT NULL,
+    `read_bytes` bigint NOT NULL,
    `date` TIMESTAMP NOT NULL,
    `date_str` VARCHAR(20) NOT NULL,
    `create_time` TIMESTAMP NOT NULL
@@ -4,8 +4,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255),
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
-    `default_pass_type` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
+    `default_pass_type` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
@@ -18,13 +18,21 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` VARCHAR(20) NOT NULL,
    `description` VARCHAR(255) NOT NULL,
    `rule` text NOT NULL,
-    `pass_type` VARCHAR(20) NOT NULL,
+    `pass_type` INTEGER NOT NULL,
    `priority` INTEGER NOT NULL,
    `user_id` INTEGER NOT NULL,
-    `enable` VARCHAR(20) NOT NULL,
+    `enable` INTEGER NOT NULL,
    `create_time` TIMESTAMP NOT NULL,
    `update_time` TIMESTAMP NOT NULL,
    PRIMARY KEY (`id`)
 );
 CREATE INDEX IF NOT EXISTS I_security_rule_group_id ON security_rule(group_id);
-ALTER TABLE `port_mapping` ADD COLUMN IF NOT EXISTS `security_group_id` INTEGER DEFAULT 0;
+
+# 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;
@@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` varchar(20) NOT NULL COMMENT '安全组名称',
    `description` varchar(255) COMMENT '安全组描述',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`)
@@ -70,10 +70,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` varchar(20) NOT NULL COMMENT '规则名称',
    `description` varchar(255) NOT NULL COMMENT '规则描述',
    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
+    `pass_type` int NOT NULL COMMENT '放行类型',
    `priority` int(1) NOT NULL COMMENT '优先级',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
@@ -87,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` varchar(50) NOT NULL COMMENT 'license名称',
    `key` varchar(100) NOT NULL COMMENT 'license key',
    `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -104,6 +106,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
    `server_port` int NOT NULL COMMENT '服务端端口',
    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
    `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `description` varchar(100) DEFAULT NULL COMMENT '描述',
    `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
@@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` varchar(20) NOT NULL COMMENT '安全组名称',
    `description` varchar(255) COMMENT '安全组描述',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`)
@@ -70,10 +70,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` varchar(20) NOT NULL COMMENT '规则名称',
    `description` varchar(255) NOT NULL COMMENT '规则描述',
    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
+    `pass_type` int NOT NULL COMMENT '放行类型',
    `priority` int(1) NOT NULL COMMENT '优先级',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
@@ -87,6 +87,8 @@ CREATE TABLE IF NOT EXISTS `license` (
    `name` varchar(50) NOT NULL COMMENT 'license名称',
    `key` varchar(100) NOT NULL COMMENT 'license key',
    `user_id` int NOT NULL COMMENT '用户ID',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
@@ -104,6 +106,8 @@ CREATE TABLE IF NOT EXISTS `port_mapping` (
    `server_port` int NOT NULL COMMENT '服务端端口',
    `client_ip` varchar(20) NOT NULL COMMENT '客户端IP',
    `client_port` int NOT NULL COMMENT '客户端端口',
+    `up_limit_rate` varchar(20) DEFAULT NULL COMMENT '上传限速',
+    `down_limit_rate` varchar(20) DEFAULT NULL COMMENT '下载限速',
    `is_online` int NOT NULL COMMENT '是否在线（1、在线 2、离线）',
    `description` varchar(100) DEFAULT NULL COMMENT '描述',
    `proxy_responses` int NOT NULL DEFAULT 0 COMMENT '代理响应数据包数量',
@@ -4,8 +4,8 @@ CREATE TABLE IF NOT EXISTS `security_group` (
    `name` varchar(20) NOT NULL COMMENT '安全组名称',
    `description` varchar(255) COMMENT '安全组描述',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
-    `default_pass_type` varchar(20) NOT NULL COMMENT '默认放行类型',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+    `default_pass_type` int NOT NULL COMMENT '默认放行类型',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`)
@@ -18,10 +18,10 @@ CREATE TABLE IF NOT EXISTS `security_rule` (
    `name` varchar(20) NOT NULL COMMENT '规则名称',
    `description` varchar(255) NOT NULL COMMENT '规则描述',
    `rule` text NOT NULL COMMENT '规则内容',
-    `pass_type` varchar(20) NOT NULL COMMENT '放行类型',
+    `pass_type`int NOT NULL COMMENT '放行类型',
    `priority` int(1) NOT NULL COMMENT '优先级',
    `user_id` int NOT NULL COMMENT '用户ID',
-    `enable` varchar(20) NOT NULL COMMENT '启用状态',
+    `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
    `create_time` datetime(3) NOT NULL COMMENT '创建时间',
    `update_time` datetime(3) NOT NULL COMMENT '更新时间',
    PRIMARY KEY (`id`),
@@ -30,3 +30,9 @@ CREATE TABLE IF NOT EXISTS `security_rule` (

 # 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 '下载限速';
@@ -12,7 +12,7 @@ docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 \
 -v /root/neutrino-proxy-server/config:/root/neutrino-proxy/config \
 -v /root/neutrino-proxy-server/data:/root/neutrino-proxy/data \
 -v /root/neutrino-proxy-server/logs:/root/neutrino-proxy/logs \
-registry.cn-hangzhou.aliyuncs.com/asgc/neutrino-proxy:latest
+aoshiguchen/neutrino-proxy-server:latest
 ```

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

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

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

 export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-21.0.1+12.1/Contents/Home
+#export JAVA_HOME=/Users/yangwen/my/service/jdk/jdk17/jdk-17.0.4.1.jdk/Contents/Home
 export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1
 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
Author	SHA1	Message	Date
aoshiguchen	e44f6e195c	更新配置	2023-12-15 17:15:06 +08:00
aoshiguchen	5db0bf94cb	新增限速功能	2023-12-15 17:09:16 +08:00
aoshiguchen	99c79f612a	修正文案	2023-12-15 11:49:32 +08:00
aoshiguchen	4890b8783f	更新官网docker部署文档	2023-12-15 10:25:21 +08:00
aoshiguchen	8e150c7696	更新客户端验证失败提示文案	2023-12-14 16:21:35 +08:00
aoshiguchen	051a36a43e	安全组拦截的逻辑从代理转发逻辑中剥离.	2023-12-14 15:54:44 +08:00
aoshiguchen	46bcc8a25d	安全组拦截的逻辑从代理转发逻辑中剥离	2023-12-14 15:48:54 +08:00
aoshiguchen	6c3d195afc	1、解决原生编译报错 2、启动日志增加版本号输出	2023-12-14 14:18:35 +08:00
aoshiguchen	00de9ee464	README更新贡献者列表	2023-12-14 13:34:13 +08:00
aoshiguchen	a1608ba1be	解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题	2023-12-14 12:03:08 +08:00
aoshiguchen	e7bdd4a631	安全组相关代码优化.	2023-12-14 11:36:53 +08:00
aoshiguchen	67c42a19bb	安全组相关代码优化	2023-12-11 10:12:05 +08:00
aoshiguchen	d3c658fa4d	安全组相关代码优化.	2023-12-10 22:43:59 +08:00
aoshiguchen	bb96caca64	安全组相关代码优化.	2023-12-10 20:43:23 +08:00
aoshiguchen	306cd66034	1、jdk版本改为21，对应的打包脚本调整 2、安全组相关代码优化.	2023-12-10 16:55:50 +08:00
aoshiguchen	5ccf0d1936	1、jdk版本改为21，对应的打包脚本调整 2、安全组相关代码优化	2023-12-10 16:42:52 +08:00
aoshiguchen	1ad80a6d8b	jdk版本降为17，解决jdk21打包后启动客户端连接报错的问题	2023-12-10 12:50:25 +08:00
aoshiguchen	faf5ec9bdc	安全组相关接口url调整	2023-12-10 12:07:17 +08:00
aoshiguchen	a369ee1a15	日志调整.	2023-12-10 11:38:21 +08:00
aoshiguchen	9121ff37bb	日志调整.	2023-12-10 11:37:42 +08:00
aoshiguchen	5e1a2f5620	tcp代理，针对安全组获取真实ip逻辑优化	2023-12-09 23:40:02 +08:00
aoshiguchen	7530fd7d9f	http域名访问时，安全组获取真实ip逻辑调整	2023-12-09 23:27:46 +08:00
傲世孤尘	57339dc56c	!52 修改TcpVisitorHandler获取真实IP地址的方式 Merge pull request !52 from NichenFly/dev	2023-12-09 14:35:26 +00:00
az	d072c05d31	修改TcpVisitorHandler获取真实IP地址的方式	2023-12-09 22:30:31 +08:00
az	a21a786884	修改TcpVisitorHandler获取真实IP地址的方式	2023-12-09 22:30:07 +08:00