From 1be0e0d38952f47efb5c75ffffa4eb5aa8679ac9 Mon Sep 17 00:00:00 2001
From: xuefm <321766987@qq.com>
Date: Fri, 17 Mar 2023 21:41:48 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/config/dev.env.js        |   2 +-
 neutrino-proxy-admin/src/api/portGroup.js     |  45 +++
 neutrino-proxy-admin/src/api/portPool.js      |   9 +
 neutrino-proxy-admin/src/lang/zh.js           |   6 +
 neutrino-proxy-admin/src/router/index.js      |   1 +
 .../src/views/proxy/portMapping.vue           |  19 +-
 .../src/views/system/portGroup.vue            | 346 ++++++++++++++++++
 .../src/views/system/portPool.vue             |  26 +-
 .../server/constant/ExceptionConstant.java    |   4 +
 .../controller/PortGroupController.java       |  73 ++++
 .../server/controller/PortPoolController.java |  34 +-
 .../controller/req/AvailablePortListReq.java  |  15 +
 .../controller/req/PortGroupCreateReq.java    |  27 ++
 .../controller/req/PortGroupDeleteReq.java    |  11 +
 .../controller/req/PortGroupListReq.java      |  27 ++
 .../req/PortGroupUpdateEnableStatusReq.java   |  13 +
 .../controller/req/PortPoolCreateReq.java     |   2 +
 .../req/PortPoolUpdateGroupReq.java           |  17 +
 .../controller/res/AvailablePortListRes.java  |   7 +
 .../controller/res/PortGroupCreateRes.java    |   4 +
 .../controller/res/PortGroupListRes.java      |  50 +++
 .../res/PortGroupUpdateEnableStatusRes.java   |   7 +
 .../controller/res/PortPoolListRes.java       |  10 +
 .../res/PortPoolUpdateGroupRes.java           |   4 +
 .../proxy/server/dal/PortGroupMapper.java     |  27 ++
 .../proxy/server/dal/PortPoolMapper.java      |  16 +
 .../proxy/server/dal/entity/PortGroupDO.java  |  57 +++
 .../proxy/server/dal/entity/PortPoolDO.java   |   6 +
 .../server/service/PortGroupService.java      | 103 ++++++
 .../proxy/server/service/PortPoolService.java | 148 +++++---
 .../src/main/resources/app.yml                |  15 +-
 .../main/resources/mapper/PortGroupMapper.xml |  19 +
 .../main/resources/mapper/PortPoolMapper.xml  |  32 ++
 .../resources/sql/mysql/init-structure.sql    |  13 +-
 .../resources/sql/mysql/port_group.data.sql   |   2 +
 35 files changed, 1118 insertions(+), 79 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/api/portGroup.js
 create mode 100644 neutrino-proxy-admin/src/views/system/portGroup.vue
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java
 create mode 100644 neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml
 create mode 100644 neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
 create mode 100644 neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql

diff --git a/neutrino-proxy-admin/config/dev.env.js b/neutrino-proxy-admin/config/dev.env.js
index f812fea4..f18b5d35 100644
--- a/neutrino-proxy-admin/config/dev.env.js
+++ b/neutrino-proxy-admin/config/dev.env.js
@@ -1,5 +1,5 @@
 module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
-	BASE_API: '"http://103.163.47.16:8888"'
+	BASE_API: '"http://127.0.0.1:8888"'
 }
diff --git a/neutrino-proxy-admin/src/api/portGroup.js b/neutrino-proxy-admin/src/api/portGroup.js
new file mode 100644
index 00000000..c7d5d81b
--- /dev/null
+++ b/neutrino-proxy-admin/src/api/portGroup.js
@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/port-group/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function portGroupList() {
+  return request({
+    url: '/port-group/list',
+    method: 'get'
+  })
+}
+
+export function updateEnableStatus(id, enable) {
+  return request({
+    url: '/port-group/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
+  })
+}
+
+export function createPortGroup(data) {
+  return request({
+    url: '/port-group/create',
+    method: 'post',
+    data
+  })
+}
+
+export function deleteGroup(id) {
+  return request({
+    url: '/port-group/delete',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/neutrino-proxy-admin/src/api/portPool.js b/neutrino-proxy-admin/src/api/portPool.js
index 0d6115c8..7dc48ba3 100644
--- a/neutrino-proxy-admin/src/api/portPool.js
+++ b/neutrino-proxy-admin/src/api/portPool.js
@@ -14,6 +14,15 @@ export function portPoolList() {
     method: 'get'
   })
 }
+export function availablePortList(licenseId) {
+  return request({
+    url: '/port-pool/get-available-port-list',
+    method: 'get',
+    params: {
+      licenseId: licenseId
+    }
+  })
+}
 
 export function updateEnableStatus(id, enable) {
   return request({
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index e021cbf8..92d042cf 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -48,6 +48,7 @@ export default {
     user: '用户管理',
     system: '系统管理',
     portPool: '端口池管理',
+    portGroup: '端口分组管理',
     proxy: '代理配置',
     license: 'License管理',
     portMapping: '端口映射',
@@ -118,6 +119,11 @@ export default {
     confirm: '确 定',
     userId: '用户ID',
     userName: '用户名',
+    group: '分组',
+    groupName: '分组名称',
+    groupPossessor: '分组所属',
+    possessorType: '所属类',
+    possessorId: '分组所属',
     license: 'License',
     createTime: '创建时间',
     updateTime: '更新时间',
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index 7e44c8d4..020c9374 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -75,6 +75,7 @@ export const asyncRouterMap = [
     },
     children: [
       { path: 'user', component: _import('system/user'), name: 'user', meta: { title: 'user' }},
+      { path: 'portGroup', component: _import('system/portGroup'), name: 'portGroup', meta: { title: 'portGroup' }},
       { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
       { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
     ]
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index 67e84497..e8623dfe 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -79,7 +79,7 @@
 <!--          </el-select>-->
 <!--        </el-form-item>-->
 
-        <el-form-item :label="$t('License')" prop="licenseId">
+        <el-form-item :label="$t('License')" prop="licenseId" >
           <DropdownTable
             v-model="temp.licenseId"
             :name.sync="temp.licenseName"
@@ -135,7 +135,7 @@
 
 <script>
   import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
-  import { portPoolList } from '@/api/portPool'
+  import { portPoolList, availablePortList } from '@/api/portPool'
   import { licenseList } from '@/api/license'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
@@ -241,7 +241,7 @@
     },
     created() {
       this.getList()
-      this.getPortPoolList()
+      // this.getPortPoolList()
       this.getLicenseList()
     },
     methods: {
@@ -258,6 +258,11 @@
           this.serverPortList = response.data.data
         })
       },
+      getAvailablePortList(licenseId) {
+        availablePortList(licenseId).then(response => {
+          this.serverPortList = response.data.data
+        })
+      },
       getLicenseList() {
         licenseList().then(response => {
           this.licenseList = response.data.data
@@ -356,8 +361,12 @@
         })
       },
       selectedFeeItem(row, list) {
-        this.temp.licenseId = row.id
-        this.temp.licenseName = row.name
+        if (this.temp.licenseId !== row.id) {
+          this.temp.licenseId = row.id
+          this.temp.licenseName = row.name
+          this.getAvailablePortList(row.id)
+          this.temp.serverPort = null
+        }
       },
       handleDelete(row) {
         this.$confirm('确定要删除吗？', '提示', {
diff --git a/neutrino-proxy-admin/src/views/system/portGroup.vue b/neutrino-proxy-admin/src/views/system/portGroup.vue
new file mode 100644
index 00000000..39053591
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/system/portGroup.vue
@@ -0,0 +1,346 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container">
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">
+        {{ $t('table.search') }}
+      </el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary"
+                 icon="el-icon-edit">{{ $t('table.add') }}
+      </el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit
+              highlight-current-row
+              style="width: 100%">
+      <el-table-column align="center" :label="$t('table.id')" width="120">
+        <template slot-scope="scope">
+          <span>{{ scope.row.id }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.groupName')" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.groupPossessor')" width="200">
+        <template slot-scope="scope">
+          <span>{{ scope.row.possessorType == 1 ? "用户:" : (scope.row.possessorType == 2 ? "License:" : "全局") }} {{ scope.row.possessor }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="200" 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="200" align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{ scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="150">
+        <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="250" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <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.status!='deleted'" size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
+          <ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px"/>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                     :current-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="left" label-width="70px"
+               style='width: 400px; margin-left:50px;'>
+        <el-form-item style="width: 350px" class="filter-item" :label="$t('table.groupName')" prop="name">
+          <el-input v-model="temp.name"></el-input>
+        </el-form-item>
+
+        <el-form-item :label="$t('table.possessorType')" prop="possessorType">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.possessorType" placeholder="请选择"
+                     :disabled="dialogStatus=='update'">
+            <el-option v-for="item in  possessorTypeList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+
+        <el-form-item v-show="temp.possessorType==1" :label="$t('table.userName')" prop="possessorId">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.possessorId" placeholder="请选择"
+                     :disabled="dialogStatus=='update'">
+            <el-option v-for="item in  userList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item v-show="temp.possessorType==2" :label="$t('table.license')" prop="possessorId">
+          <el-select style="width: 280px" class="filter-item" v-model="temp.possessorId" placeholder="请选择"
+                     :disabled="dialogStatus=='update'">
+            <el-option v-for="item in  licenseList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{ $t('table.cancel') }}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{ $t('table.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"></el-table-column>
+        <el-table-column prop="pv" label="Pv"></el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{ $t('table.confirm') }}</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { fetchList, updateEnableStatus, createPortGroup, deleteGroup } from '@/api/portGroup'
+import waves from '@/directive/waves' // 水波纹指令
+import { parseTime } from '@/utils'
+import { userList } from '@/api/user'
+import ButtonPopover from '../../components/Button/buttonPopover'
+import { licenseList } from '../../api/license'
+
+const calendarTypeOptions = [
+  { key: 'CN', display_name: 'China' },
+  { key: 'US', display_name: 'USA' },
+  { key: 'JP', display_name: 'Japan' },
+  { key: 'EU', display_name: 'Eurozone' }
+]
+
+// arr to obj ,such as { CN : "China", US : "USA" }
+const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+  acc[cur.key] = cur.display_name
+  return acc
+}, {})
+
+export default {
+  name: 'complexTable',
+  directives: {
+    waves
+  },
+  components: {
+    ButtonPopover
+  },
+  data() {
+    return {
+      tableKey: 0,
+      list: null,
+      total: null,
+      listLoading: true,
+      listQuery: {
+        current: 1,
+        size: 10,
+        importance: undefined,
+        title: undefined,
+        type: undefined
+      },
+      importanceOptions: [1, 2, 3],
+      calendarTypeOptions,
+      sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+      statusOptions: ['published', 'draft', 'deleted'],
+      showReviewer: false,
+      userList: [],
+      licenseList: [],
+      possessorTypeList: [
+        {
+          'id': 1,
+          'name': '用户'
+        },
+        {
+          'id': 2,
+          'name': '通道'
+        }
+      ],
+      temp: {
+        name: '',
+        possessorType: 1,
+        possessorId: 1
+
+      },
+      dialogFormVisible: false,
+      dialogStatus: '',
+      textMap: {
+        update: '编辑',
+        create: '新建'
+      },
+      dialogPvVisible: false,
+      pvData: [],
+      rules: {
+        port: [{ required: true, message: '端口必填', trigger: 'blur' }]
+      },
+      downloadLoading: false
+    }
+  },
+  filters: {
+    statusName(status) {
+      const statusMap = {
+        1: '启用',
+        2: '禁用'
+      }
+      return statusMap[status]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        1: 'success',
+        2: 'danger'
+      }
+      return statusMap[status]
+    },
+    typeFilter(type) {
+      return calendarTypeKeyValue[type]
+    }
+  },
+  created() {
+    this.getList()
+    this.getUserList()
+    this.getLicenseList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      fetchList(this.listQuery).then(response => {
+        this.list = response.data.data.records
+        this.total = response.data.data.total
+        this.listLoading = false
+      })
+    },
+    getUserList() {
+      userList().then(response => {
+        this.userList = response.data.data
+      })
+    },
+    getLicenseList() {
+      licenseList().then(response => {
+        this.licenseList = response.data.data
+      })
+    },
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.listQuery.size = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.listQuery.current = val
+      this.getList()
+    },
+    handleModifyStatus(row, enable) {
+      console.log('route', this.$route)
+      updateEnableStatus(row.id, enable).then(response => {
+        if (response.data.data.code === 0) {
+          this.$message({
+            message: '操作成功',
+            type: 'success'
+          })
+        }
+        this.getList()
+      })
+    },
+    resetTemp() {
+      this.temp = {
+        id: undefined,
+        importance: 1,
+        remark: '',
+        timestamp: new Date(),
+        title: '',
+        status: 'published',
+        type: ''
+      }
+    },
+    handleCreate() {
+      this.resetTemp()
+      this.dialogStatus = 'create'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    createData() {
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          createPortGroup(this.temp).then(response => {
+            if (response.data.code === 0) {
+              this.dialogFormVisible = false
+              this.$notify({
+                title: '成功',
+                message: '创建成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.getList()
+            }
+          })
+        }
+      })
+    },
+    handleUpdate(row) {
+      this.temp = Object.assign({}, row) // copy obj
+      this.temp.timestamp = new Date(this.temp.timestamp)
+      this.dialogStatus = 'update'
+      this.dialogFormVisible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+    },
+    handleDelete(row) {
+      deleteGroup(row.id).then(response => {
+        if (response.data.code === 0) {
+          this.$notify({
+            title: '成功',
+            message: '删除成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.getList()
+        }
+      })
+    },
+    handleDownload() {
+      this.downloadLoading = true
+      import('@/vendor/Export2Excel').then(excel => {
+        const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+        const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+        const data = this.formatJson(filterVal, this.list)
+        excel.export_json_to_excel(tHeader, data, 'table-list')
+        this.downloadLoading = false
+      })
+    },
+    formatJson(filterVal, jsonData) {
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'timestamp') {
+          return parseTime(v[j])
+        } else {
+          return v[j]
+        }
+      }))
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 108cfa35..377d27d3 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -17,6 +17,11 @@
           <span>{{scope.row.port}}</span>
         </template>
       </el-table-column>
+      <el-table-column align="center" :label="$t('table.groupName')" width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.groupName}}</span>
+        </template>
+      </el-table-column>
       <el-table-column width="200" align="center" :label="$t('table.createTime')">
         <template slot-scope="scope">
           <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
@@ -53,6 +58,15 @@
         <el-form-item :label="$t('table.port')" prop="port">
           <el-input v-model="temp.port"></el-input>
         </el-form-item>
+
+        <el-form-item  :label="$t('table.group')" prop="group">
+          <el-select style="width: 330px" class="filter-item" v-model="temp.groupId" placeholder="请选择"
+                     :disabled="dialogStatus=='update'">
+            <el-option v-for="item in  portGroupList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
@@ -75,6 +89,7 @@
 
 <script>
   import { fetchList, updateEnableStatus, createPortPool, deletePortPool } from '@/api/portPool'
+  import { portGroupList } from '@/api/portGroup'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
   import ButtonPopover from '../../components/Button/buttonPopover'
@@ -119,6 +134,7 @@
         statusOptions: ['published', 'draft', 'deleted'],
         showReviewer: false,
         temp: {
+          groupId: 1,
           id: undefined,
           importance: 1,
           remark: '',
@@ -133,6 +149,7 @@
           update: '编辑',
           create: '新建'
         },
+        portGroupList: [],
         dialogPvVisible: false,
         pvData: [],
         rules: {
@@ -161,7 +178,9 @@
       }
     },
     created() {
-      this.getList()
+      // eslint-disable-next-line no-sequences
+      this.getList(),
+      this.getPortGroupList()
     },
     methods: {
       getList() {
@@ -172,6 +191,11 @@
           this.listLoading = false
         })
       },
+      getPortGroupList() {
+        portGroupList().then(response => {
+          this.portGroupList = response.data.data
+        })
+      },
       handleFilter() {
         this.listQuery.current = 1
         this.getList()
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
index 672ac778..6161c807 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
@@ -57,6 +57,10 @@ public enum ExceptionConstant {
 	// 调度管理(15000)
 	JOB_INFO_NOT_EXIST(15000, "调度管理记录不存在"),
 	SYSTEM_ERROR(500, "系统异常"),
+
+	PORT_GROUP_NAME_ALREADY_EXIST(16000,"端口分组名称[{}]已经存在"),
+	PORT_GROUP_NAME_DOES_NOT_EXIST(16001,"端口分组不存在"),
+	DEFAULT_GROUP_FORBID_DELETE(16002,"默认分组禁止删除")
 	;
 
 	private int code;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java
new file mode 100644
index 00000000..6c65a0ca
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortGroupController.java
@@ -0,0 +1,73 @@
+package fun.asgc.neutrino.proxy.server.controller;
+
+import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
+import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
+import fun.asgc.neutrino.proxy.server.base.rest.Authorization;
+import fun.asgc.neutrino.proxy.server.controller.req.*;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
+import fun.asgc.neutrino.proxy.server.service.PortGroupService;
+import fun.asgc.neutrino.proxy.server.service.PortPoolService;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.noear.solon.annotation.*;
+
+import java.util.List;
+
+/**
+ * 端口分组控制层
+ */
+@Mapping("/port-group")
+@Controller
+public class PortGroupController {
+
+    @Inject
+    private PortGroupService portGroupService;
+
+    @Post
+    @Mapping("/create")
+    public PortGroupCreateRes create(PortGroupCreateReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotEmpty(req.getName(), "name");
+        ParamCheckUtil.checkNotNull(req.getPossessorType(), "possessorType");
+        ParamCheckUtil.checkNotNull(req.getPossessorId(), "possessorId");
+
+        return portGroupService.create(req);
+    }
+
+    @Get
+    @Mapping("/page")
+    public PageInfo<PortGroupListRes> page(PageQuery pageQuery, PortGroupListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+        return portGroupService.page(pageQuery, req);
+    }
+
+    @Get
+    @Mapping("/list")
+    public List<PortGroupListRes> list(PortGroupListReq req) {
+        return portGroupService.list(req);
+    }
+
+    @Post
+    @Mapping("/update/enable-status")
+    public PortGroupUpdateEnableStatusRes updateEnableStatus(PortGroupUpdateEnableStatusReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
+
+        return portGroupService.updateEnableStatus(req);
+    }
+
+    @Post
+    @Mapping("/delete")
+    @Authorization(onlyAdmin = true)
+    public void delete(PortGroupDeleteReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+
+        portGroupService.delete(req.getId());
+    }
+
+
+
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java
index 12afab87..296db41a 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/PortPoolController.java
@@ -24,13 +24,8 @@ package fun.asgc.neutrino.proxy.server.controller;
 import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
 import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
 import fun.asgc.neutrino.proxy.server.base.rest.Authorization;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolCreateReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolDeleteReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolUpdateEnableStatusReq;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolCreateRes;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.controller.req.*;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.service.PortPoolService;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import org.noear.solon.annotation.*;
@@ -68,6 +63,7 @@ public class PortPoolController {
 	public PortPoolCreateRes create(PortPoolCreateReq req) {
 		ParamCheckUtil.checkNotNull(req, "req");
 		ParamCheckUtil.checkNotNull(req.getPort(), "port");
+		ParamCheckUtil.checkNotNull(req.getGroupId(), "groupId");
 
 		return portPoolService.create(req);
 	}
@@ -92,4 +88,28 @@ public class PortPoolController {
 
 		portPoolService.delete(req.getId());
 	}
+
+	@Get
+	@Mapping("/get-available-port-list")
+	public List<PortPoolListRes> getAvailablePortList(AvailablePortListReq req) {
+		ParamCheckUtil.checkNotNull(req, "req");
+		ParamCheckUtil.checkNotNull(req.getLicenseId(), "licenseId");
+		return portPoolService.getAvailablePortList(req);
+	}
+
+
+	@Get
+	@Mapping("/get-by-group")
+	public List<PortPoolListRes> portListByGroupId(String groupId) {
+		return portPoolService.portListByGroupId(groupId);
+	}
+
+	@Put
+	@Mapping("/update-group")
+	public PortPoolUpdateGroupRes updateGroup(PortPoolUpdateGroupReq req) {
+		ParamCheckUtil.checkNotNull(req, "req");
+		ParamCheckUtil.checkNotNull(req.getGroupId(), "groupId");
+		ParamCheckUtil.checkNotEmpty(req.getPortIdList(), "portIdList");
+		return portPoolService.updateGroup(req);
+	}
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java
new file mode 100644
index 00000000..47cf5d51
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/AvailablePortListReq.java
@@ -0,0 +1,15 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 获取可用端口请求
+ */
+@Data
+public class AvailablePortListReq {
+
+    /**
+     * licenseId
+     */
+    private Integer licenseId;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java
new file mode 100644
index 00000000..3d8a2e92
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupCreateReq.java
@@ -0,0 +1,27 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 端口分组创建请求
+ *
+ *
+ */
+@Data
+public class PortGroupCreateReq {
+
+	/**
+	 * 分组名称
+	 */
+	private String name ;
+
+	/**
+	 * 所有者类型 (0、全局共享 1、用户所有 2License所有)
+	 */
+	private Integer possessorType ;
+
+	/**
+	 * 所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)
+	 */
+	private Integer possessorId ;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java
new file mode 100644
index 00000000..533c575e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupDeleteReq.java
@@ -0,0 +1,11 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 删除端口分组请求
+ */
+@Data
+public class PortGroupDeleteReq {
+    private Integer id;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java
new file mode 100644
index 00000000..39eb2883
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupListReq.java
@@ -0,0 +1,27 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 端口分组查询请求
+ *
+ *
+ */
+@Data
+public class PortGroupListReq {
+
+	/**
+     * 分组名称
+	 */
+	private String name ;
+
+	/**
+     * 所有者类型 (0、全局共享 1、用户所有 2License所有)
+	 */
+	private Integer possessorType ;
+
+    /**
+     * 所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)
+	 */
+	private Integer possessorId ;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java
new file mode 100644
index 00000000..80a4d453
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortGroupUpdateEnableStatusReq.java
@@ -0,0 +1,13 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 修改端口分组请求
+ */
+@Data
+public class PortGroupUpdateEnableStatusReq {
+
+    private Integer id;
+    private Integer enable;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java
index f23a7d98..18cc84b8 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolCreateReq.java
@@ -31,4 +31,6 @@ import lombok.Data;
 @Data
 public class PortPoolCreateReq {
 	private Integer port;
+
+	private Integer groupId;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java
new file mode 100644
index 00000000..ee14f0a6
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/PortPoolUpdateGroupReq.java
@@ -0,0 +1,17 @@
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 批量修改端口分组请求
+ */
+@Data
+public class PortPoolUpdateGroupReq {
+
+    private String groupId;
+
+    private List<Integer> portIdList;
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java
new file mode 100644
index 00000000..fcea0690
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/AvailablePortListRes.java
@@ -0,0 +1,7 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+@Data
+public class AvailablePortListRes {
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java
new file mode 100644
index 00000000..cf88c064
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupCreateRes.java
@@ -0,0 +1,4 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+public class PortGroupCreateRes {
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java
new file mode 100644
index 00000000..fca18ea5
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupListRes.java
@@ -0,0 +1,50 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.util.Date;
+
+public class PortGroupListRes {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 所有者类型 (0、全局共享 1、用户所有 2License所有)
+     */
+    private Integer possessorType;
+
+    /**
+     * 所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)
+     */
+    private Integer possessorId;
+
+    /**
+     * 是否启用(1、启用 2、禁用)
+     */
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 来源
+     */
+    private String possessor;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java
new file mode 100644
index 00000000..55587dbe
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortGroupUpdateEnableStatusRes.java
@@ -0,0 +1,7 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+@Data
+public class PortGroupUpdateEnableStatusRes {
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java
index 48e9f73e..2eadd4ef 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolListRes.java
@@ -49,4 +49,14 @@ public class PortPoolListRes {
 	 * 更新时间
 	 */
 	private Date updateTime;
+
+	/**
+	 * 分组类型
+	 */
+	private Integer possessorType;
+
+	/**
+	 * 分组
+	 */
+	private String groupName;
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java
new file mode 100644
index 00000000..99928db3
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/PortPoolUpdateGroupRes.java
@@ -0,0 +1,4 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+public class PortPoolUpdateGroupRes {
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java
new file mode 100644
index 00000000..88ae3900
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortGroupMapper.java
@@ -0,0 +1,27 @@
+package fun.asgc.neutrino.proxy.server.dal;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import fun.asgc.neutrino.proxy.server.controller.req.PortGroupListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.PortGroupListRes;
+import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Date;
+import java.util.List;
+
+
+@Mapper
+public interface PortGroupMapper extends BaseMapper<PortGroupDO> {
+
+    List<PortGroupListRes> selectPortGroupListResList(PortGroupListReq res);
+
+
+   default void updateEnableStatus(Integer id, Integer enable, Date now){
+       this.update(null, Wrappers.lambdaUpdate(PortGroupDO.class)
+               .eq(PortGroupDO::getId,id)
+               .set(PortGroupDO::getEnable,enable)
+               .set(PortGroupDO::getUpdateTime,now)
+       );
+   }
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
index 2bdbc3b5..0e2c7fa6 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortPoolMapper.java
@@ -24,10 +24,15 @@ package fun.asgc.neutrino.proxy.server.dal;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.AvailablePortListRes;
+import fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes;
 import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -53,4 +58,15 @@ public interface PortPoolMapper extends BaseMapper<PortPoolDO> {
 	default PortPoolDO findById(Integer id) {
 		return this.selectById(id);
 	}
+
+	default List<PortPoolDO> getByGroupId(String groupId){
+		return this.selectList(
+				new LambdaQueryWrapper<PortPoolDO>()
+						.eq(PortPoolDO::getGroupId, groupId)
+		);
+	}
+
+	List<PortPoolListRes> selectResList(PortPoolListReq req);
+
+    List<PortPoolListRes> getAvailablePortList(@Param("licenseId") Integer licenseId,@Param("userId") Integer userId);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java
new file mode 100644
index 00000000..62b6ecc8
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortGroupDO.java
@@ -0,0 +1,57 @@
+package fun.asgc.neutrino.proxy.server.dal.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 端口组
+ */
+@ToString
+@Accessors(chain = true)
+@Data
+@TableName("port_group")
+public class PortGroupDO {
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 所有者类型 (0、全局共享 1、用户所有 2License所有)
+     */
+    private Integer possessorType;
+
+    /**
+     * 所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)
+     */
+    private Integer possessorId;
+
+    /**
+     * 是否启用(1、启用 2、禁用)
+     */
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java
index 9f55dde4..2d74dcad 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/PortPoolDO.java
@@ -42,6 +42,12 @@ import java.util.Date;
 public class PortPoolDO {
 	@TableId(type = IdType.AUTO)
 	private Integer id;
+
+	/**
+	 * 分组id
+	 */
+	private Integer groupId;
+
 	/**
 	 * 端口
 	 */
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java
new file mode 100644
index 00000000..846d0d40
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortGroupService.java
@@ -0,0 +1,103 @@
+package fun.asgc.neutrino.proxy.server.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
+import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
+import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
+import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
+import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
+import fun.asgc.neutrino.proxy.server.controller.req.PortGroupCreateReq;
+import fun.asgc.neutrino.proxy.server.controller.req.PortGroupListReq;
+import fun.asgc.neutrino.proxy.server.controller.req.PortGroupUpdateEnableStatusReq;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
+import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper;
+import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
+import ma.glasnost.orika.MapperFacade;
+import org.apache.ibatis.solon.annotation.Db;
+import org.noear.solon.annotation.Component;
+import org.noear.solon.annotation.Inject;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 端口分组服务
+ */
+@Component
+public class PortGroupService {
+
+    @Inject
+    private MapperFacade mapperFacade;
+
+    @Db
+    private PortGroupMapper portGroupMapper;
+
+    @Db
+    private PortPoolMapper portPoolMapper;
+
+    public PortGroupCreateRes create(PortGroupCreateReq req) {
+        PortGroupDO portGroupDO = portGroupMapper.selectOne(Wrappers.lambdaQuery(PortGroupDO.class)
+                .eq(PortGroupDO::getName, req.getName()));
+        if (Objects.nonNull(portGroupDO)) {
+            throw ServiceException.create(ExceptionConstant.PORT_GROUP_NAME_ALREADY_EXIST, req.getName());
+        }
+        Date now = new Date();
+        portGroupDO = new PortGroupDO();
+        portGroupDO.setName(req.getName());
+        portGroupDO.setPossessorType(req.getPossessorType());
+        portGroupDO.setPossessorId(req.getPossessorId());
+        portGroupDO.setEnable(1);
+        portGroupDO.setCreateTime(now);
+        portGroupDO.setUpdateTime(now);
+        portGroupMapper.insert(portGroupDO);
+        return new PortGroupCreateRes();
+    }
+
+    public PageInfo<PortGroupListRes> page(PageQuery pageQuery, PortGroupListReq req) {
+        Page<PortGroupListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
+        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(req);
+
+        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
+
+    public List<PortGroupListRes> list(PortGroupListReq req) {
+        List<PortGroupListRes> list = portGroupMapper.selectPortGroupListResList(req);
+        return list;
+    }
+
+
+    public PortGroupUpdateEnableStatusRes updateEnableStatus(PortGroupUpdateEnableStatusReq req) {
+        PortGroupDO portGroupDO = portGroupMapper.selectById(req.getId());
+        ParamCheckUtil.checkNotNull(portGroupDO, ExceptionConstant.PORT_GROUP_NAME_DOES_NOT_EXIST);
+        if (!SystemContextHolder.isAdmin()) {
+            ParamCheckUtil.checkExpression(false, ExceptionConstant.NO_PERMISSION_VISIT);
+        }
+        portGroupMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        return new PortGroupUpdateEnableStatusRes();
+    }
+
+    public void delete(Integer id) {
+        if (id == 1) {
+            throw ServiceException.create(ExceptionConstant.DEFAULT_GROUP_FORBID_DELETE);
+        }
+        PortGroupDO portGroupDO = portGroupMapper.selectById(id);
+        //检验分组是否存在
+        ParamCheckUtil.checkNotNull(portGroupDO, ExceptionConstant.PORT_GROUP_NAME_DOES_NOT_EXIST);
+        //删除
+        portGroupMapper.deleteById(id);
+        //修改绑定此分组的端口到默认分组
+        portPoolMapper.update(null, Wrappers.lambdaUpdate(PortPoolDO.class)
+                .eq(PortPoolDO::getGroupId, portGroupDO.getId())
+                .set(PortPoolDO::getGroupId, 1)
+                .set(PortPoolDO::getUpdateTime, new Date())
+        );
+    }
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
index 29623474..a8768ea2 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
@@ -1,16 +1,16 @@
 /**
  * Copyright (c) 2022 aoshiguchen
- *
+ * <p>
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- *
+ * <p>
  * The above copyright notice and this permission notice shall be included in all
  * copies or substantial portions of the Software.
- *
+ * <p>
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -22,96 +22,126 @@
 package fun.asgc.neutrino.proxy.server.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import fun.asgc.neutrino.proxy.server.base.page.PageInfo;
 import fun.asgc.neutrino.proxy.server.base.page.PageQuery;
+import fun.asgc.neutrino.proxy.server.base.rest.ServiceException;
+import fun.asgc.neutrino.proxy.server.base.rest.SystemContextHolder;
 import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolCreateReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolListReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortPoolUpdateEnableStatusReq;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolCreateRes;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes;
-import fun.asgc.neutrino.proxy.server.controller.res.PortPoolUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.controller.req.*;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
+import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper;
 import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.PortGroupDO;
 import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.ibatis.solon.annotation.Db;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
- *
  * @author: aoshiguchen
  * @date: 2022/8/7
  */
 @Component
 public class PortPoolService {
-	@Inject
-	private MapperFacade mapperFacade;
-	@Db
-	private PortPoolMapper portPoolMapper;
-	@Inject
-	private VisitorChannelService visitorChannelService;
+    @Inject
+    private MapperFacade mapperFacade;
+    @Db
+    private PortPoolMapper portPoolMapper;
+    @Inject
+    private VisitorChannelService visitorChannelService;
 
-	public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
-		Page<PortPoolListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
-		List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
-				.orderByAsc(PortPoolDO::getId)
-		);
-		List<PortPoolListRes> respList = mapperFacade.mapAsList(list, PortPoolListRes.class);
-		return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
-	}
+    @Db
+    private PortGroupMapper portGroupMapper;
 
-	public List<PortPoolListRes> list(PortPoolListReq req) {
-		List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
-				.eq(PortPoolDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
-		);
-		return mapperFacade.mapAsList(list, PortPoolListRes.class);
-	}
+    public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
+        Page<PortPoolListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
 
-	public PortPoolCreateRes create(PortPoolCreateReq req) {
-		PortPoolDO oldPortPoolDO = portPoolMapper.findByPort(req.getPort());
-		ParamCheckUtil.checkMustNull(oldPortPoolDO, ExceptionConstant.PORT_CANNOT_REPEAT);
+        List<PortPoolListRes> list = portPoolMapper.selectResList(req);
+        return PageInfo.of(list, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
+    }
 
-		Date now = new Date();
+    public List<PortPoolListRes> list(PortPoolListReq req) {
+        List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
+                .eq(PortPoolDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
+        );
+        return mapperFacade.mapAsList(list, PortPoolListRes.class);
+    }
 
-		portPoolMapper.insert(new PortPoolDO()
-			.setPort(req.getPort())
-			.setEnable(EnableStatusEnum.ENABLE.getStatus())
-			.setCreateTime(now)
-			.setUpdateTime(now)
-		);
-		// 更新visitorChannel
-		visitorChannelService.updateVisitorChannelByPortPool(req.getPort(), EnableStatusEnum.ENABLE.getStatus());
+    public PortPoolCreateRes create(PortPoolCreateReq req) {
+        PortPoolDO oldPortPoolDO = portPoolMapper.findByPort(req.getPort());
+        ParamCheckUtil.checkMustNull(oldPortPoolDO, ExceptionConstant.PORT_CANNOT_REPEAT);
+        PortGroupDO portGroupDO = portGroupMapper.selectById(req.getGroupId());
+        ParamCheckUtil.checkNotNull(portGroupDO, ExceptionConstant.PORT_GROUP_NAME_DOES_NOT_EXIST);
 
-		return new PortPoolCreateRes();
-	}
+        Date now = new Date();
 
-	public PortPoolUpdateEnableStatusRes updateEnableStatus(PortPoolUpdateEnableStatusReq req) {
-		PortPoolDO portPoolDO = portPoolMapper.findById(req.getId());
-		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
-		portPoolMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        portPoolMapper.insert(new PortPoolDO()
+                .setPort(req.getPort())
+                .setGroupId(req.getGroupId())
+                .setEnable(EnableStatusEnum.ENABLE.getStatus())
+                .setCreateTime(now)
+                .setUpdateTime(now)
+        );
+        // 更新visitorChannel
+        visitorChannelService.updateVisitorChannelByPortPool(req.getPort(), EnableStatusEnum.ENABLE.getStatus());
 
-		// 更新visitorChannel
-		visitorChannelService.updateVisitorChannelByPortPool(portPoolDO.getPort(), req.getEnable());
+        return new PortPoolCreateRes();
+    }
 
-		return new PortPoolUpdateEnableStatusRes();
-	}
+    public PortPoolUpdateEnableStatusRes updateEnableStatus(PortPoolUpdateEnableStatusReq req) {
+        PortPoolDO portPoolDO = portPoolMapper.findById(req.getId());
+        ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
+        portPoolMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
 
-	public void delete(Integer id) {
-		PortPoolDO portPoolDO = portPoolMapper.findById(id);
-		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
+        // 更新visitorChannel
+        visitorChannelService.updateVisitorChannelByPortPool(portPoolDO.getPort(), req.getEnable());
 
-		portPoolMapper.deleteById(id);
+        return new PortPoolUpdateEnableStatusRes();
+    }
 
-		// 更新visitorChannel
-		visitorChannelService.updateVisitorChannelByPortPool(portPoolDO.getPort(), EnableStatusEnum.DISABLE.getStatus());
-	}
+    public void delete(Integer id) {
+        PortPoolDO portPoolDO = portPoolMapper.findById(id);
+        ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
 
+        portPoolMapper.deleteById(id);
+
+        // 更新visitorChannel
+        visitorChannelService.updateVisitorChannelByPortPool(portPoolDO.getPort(), EnableStatusEnum.DISABLE.getStatus());
+    }
+
+    public List<PortPoolListRes> portListByGroupId(String groupId) {
+        List<PortPoolDO> portPoolDOList = portPoolMapper.getByGroupId(groupId);
+        List<PortPoolListRes> portPoolListReList = mapperFacade.mapAsList(portPoolDOList, PortPoolListRes.class);
+        return portPoolListReList;
+    }
+
+    public PortPoolUpdateGroupRes updateGroup(PortPoolUpdateGroupReq req) {
+        PortGroupDO portGroupDO = portGroupMapper.selectById(req.getGroupId());
+        if (Objects.isNull(portGroupDO)) {
+            throw ServiceException.create(ExceptionConstant.PARAMS_INVALID);
+        }
+        portPoolMapper.update(null, Wrappers.lambdaUpdate(PortPoolDO.class)
+                .in(PortPoolDO::getId, req.getPortIdList())
+                .set(PortPoolDO::getGroupId, req.getGroupId())
+                .set(PortPoolDO::getUpdateTime, new Date())
+        );
+        return new PortPoolUpdateGroupRes();
+    }
+
+    public List<PortPoolListRes> getAvailablePortList(AvailablePortListReq req) {
+        UserDO user = SystemContextHolder.getUser();
+        return portPoolMapper.getAvailablePortList(req.getLicenseId(), user.getId());
+    }
 }
diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml
index 4cca73c3..019c09a4 100644
--- a/neutrino-proxy-server/src/main/resources/app.yml
+++ b/neutrino-proxy-server/src/main/resources/app.yml
@@ -22,11 +22,16 @@ neutrino:
       jks-path: classpath:/test.jks
   data:
     db:
-      type: sqlite
-      url: jdbc:sqlite:data.db
-      driver-class: org.sqlite.JDBC
-      username:
-      password:
+#      type: sqlite
+#      url: jdbc:sqlite:data.db
+#      driver-class: org.sqlite.JDBC
+#      username:
+#      password:
+      type: mysql
+      url: jdbc:mysql://101.43.231.172:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false
+      driver-class: com.mysql.jdbc.Driver
+      username: root
+      password: expect
 
 #添加MIME印射（如果有需要？）
 #是否启用静态文件服务。（可不配，默认为启用）
diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml
new file mode 100644
index 00000000..a88f0263
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/mapper/PortGroupMapper.xml
@@ -0,0 +1,19 @@
+<?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="fun.asgc.neutrino.proxy.server.dal.PortGroupMapper">
+
+<select id="selectPortGroupListResList" resultType="fun.asgc.neutrino.proxy.server.controller.res.PortGroupListRes">
+    SELECT g.*,
+           CASE
+               WHEN g.possessor_type = 1 THEN
+                   u.`name`
+               WHEN g.possessor_type = 2 THEN
+                   l.`name`
+               ELSE ""
+               END possessor
+    FROM port_group g
+             LEFT JOIN `user` u ON g.possessor_id = u.id
+             LEFT JOIN license l ON g.possessor_id = l.id
+    ORDER BY g.id
+</select>
+</mapper>
diff --git a/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
new file mode 100644
index 00000000..a238f04a
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/mapper/PortPoolMapper.xml
@@ -0,0 +1,32 @@
+<?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="fun.asgc.neutrino.proxy.server.dal.PortPoolMapper">
+
+    <select id="selectResList" resultType="fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes">
+        SELECT p.*,
+               g.possessor_type,
+               g.`name` group_name
+        FROM port_pool p
+                 LEFT JOIN port_group g ON p.group_id = g.id
+        ORDER BY p.id
+    </select>
+
+    <select id="getAvailablePortList" resultType="fun.asgc.neutrino.proxy.server.controller.res.PortPoolListRes">
+        SELECT
+            *
+        FROM
+            port_pool
+        WHERE
+            `port` NOT IN ( SELECT server_port FROM port_mapping )
+          AND group_id IN (
+            SELECT
+                id
+            FROM
+                port_group
+            WHERE
+                possessor_type = 0
+               OR ( possessor_type = 1 AND possessor_id = #{userId,jdbcType=INTEGER} )
+               OR ( possessor_type = 2 AND possessor_id = #{licenseId,jdbcType=INTEGER} )
+        )
+    </select>
+</mapper>
diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
index 60c8eab5..915d6f37 100644
--- a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
@@ -189,4 +189,15 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     KEY `I_flow_report_month_date` (`date`) USING BTREE,
     KEY `I_flow_report_month_user_id` (`user_id`),
     KEY `I_flow_report_month_license_id` (`license_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+#端口分组
+CREATE TABLE `port_group` (
+                              `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+                              `name` varchar(255) NOT NULL COMMENT '分组名称',
+                              `possessor_type` int NOT NULL DEFAULT '0' COMMENT '所有者类型 (0、全局共享 1、用户所有 2License所有) ',
+                              `possessor_id` int NOT NULL DEFAULT '-1' COMMENT '所有者id(当type为0时 固定为-1、当type为1时为用户id 、当type为2时为licenseid)',
+                              `enable` int NOT NULL COMMENT '是否启用(1、启用 2、禁用)',
+                              `create_time` datetime(3) NOT NULL COMMENT '创建时间',
+                              `update_time` datetime(3) NOT NULL COMMENT '更新时间',
+                              PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='端口分组';
\ No newline at end of file
diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql
new file mode 100644
index 00000000..aa2893f5
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/sql/mysql/port_group.data.sql
@@ -0,0 +1,2 @@
+#port_group
+INSERT INTO `port_group` VALUES (1, '全局(默认)', 0, -1, 1, now(), now());

From df01e93c646d71f7ed877595132e43db0e290e7b Mon Sep 17 00:00:00 2001
From: xuefm <321766987@qq.com>
Date: Fri, 17 Mar 2023 22:01:43 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/sql/mysql/init-structure.sql             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
index 915d6f37..78fd65cd 100644
--- a/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/mysql/init-structure.sql
@@ -191,7 +191,7 @@ CREATE TABLE IF NOT EXISTS `flow_report_month` (
     KEY `I_flow_report_month_license_id` (`license_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 #端口分组
-CREATE TABLE `port_group` (
+CREATE TABLE IF NOT EXISTS `port_group` (
                               `id` int NOT NULL AUTO_INCREMENT COMMENT '主键ID',
                               `name` varchar(255) NOT NULL COMMENT '分组名称',
                               `possessor_type` int NOT NULL DEFAULT '0' COMMENT '所有者类型 (0、全局共享 1、用户所有 2License所有) ',

From 3d6c83a11b417a826f425f667e8a2fc96acd9eab Mon Sep 17 00:00:00 2001
From: xuefm <321766987@qq.com>
Date: Fri, 17 Mar 2023 22:03:32 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/src/main/resources/app.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml
index 019c09a4..4cca73c3 100644
--- a/neutrino-proxy-server/src/main/resources/app.yml
+++ b/neutrino-proxy-server/src/main/resources/app.yml
@@ -22,16 +22,11 @@ neutrino:
       jks-path: classpath:/test.jks
   data:
     db:
-#      type: sqlite
-#      url: jdbc:sqlite:data.db
-#      driver-class: org.sqlite.JDBC
-#      username:
-#      password:
-      type: mysql
-      url: jdbc:mysql://101.43.231.172:3306/neutrino-proxy?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&useAffectedRows=true&useSSL=false
-      driver-class: com.mysql.jdbc.Driver
-      username: root
-      password: expect
+      type: sqlite
+      url: jdbc:sqlite:data.db
+      driver-class: org.sqlite.JDBC
+      username:
+      password:
 
 #添加MIME印射（如果有需要？）
 #是否启用静态文件服务。（可不配，默认为启用）

From 78cf5d95e5b227c4111a0287dd35efba74b656d7 Mon Sep 17 00:00:00 2001
From: xuefm <321766987@qq.com>
Date: Fri, 17 Mar 2023 22:38:51 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/portGroup.vue            | 22 +++++++++----------
 .../src/views/system/portPool.vue             |  3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/system/portGroup.vue b/neutrino-proxy-admin/src/views/system/portGroup.vue
index 39053591..74c7fe62 100644
--- a/neutrino-proxy-admin/src/views/system/portGroup.vue
+++ b/neutrino-proxy-admin/src/views/system/portGroup.vue
@@ -37,19 +37,19 @@
           <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="scope.row.enable | statusFilter">{{ scope.row.enable | statusName }}</el-tag>
-        </template>
-      </el-table-column>
+<!--      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="150">-->
+<!--        <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="250" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <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 =='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.status!='deleted'" size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
           <ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px"/>
         </template>
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue
index 377d27d3..98dd69ee 100644
--- a/neutrino-proxy-admin/src/views/system/portPool.vue
+++ b/neutrino-proxy-admin/src/views/system/portPool.vue
@@ -60,7 +60,7 @@
         </el-form-item>
 
         <el-form-item  :label="$t('table.group')" prop="group">
-          <el-select style="width: 330px" class="filter-item" v-model="temp.groupId" placeholder="请选择"
+          <el-select style="width: 330px" class="filter-item" v-model="temp.groupId"
                      :disabled="dialogStatus=='update'">
             <el-option v-for="item in  portGroupList" :key="item.id" :label="item.name" :value="item.id">
             </el-option>
@@ -235,6 +235,7 @@
         this.resetTemp()
         this.dialogStatus = 'create'
         this.dialogFormVisible = true
+        this.temp.groupId = 1
         this.$nextTick(() => {
           this.$refs['dataForm'].clearValidate()
         })