From a89dd39ebce29be8a57ad7f1abd3a979acf73ee7 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 1 Sep 2022 22:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=8B=89=E7=AB=AF=E5=8F=A3=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=B0=83=E9=80=9A.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/portPool.js              |  7 +++++++
 neutrino-proxy-admin/src/views/proxy/portMapping.vue  | 11 +++++++++--
 .../proxy/server/controller/res/PortPoolListRes.java  |  1 -
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/portPool.js b/neutrino-proxy-admin/src/api/portPool.js
index 79883386..0d6115c8 100644
--- a/neutrino-proxy-admin/src/api/portPool.js
+++ b/neutrino-proxy-admin/src/api/portPool.js
@@ -8,6 +8,13 @@ export function fetchList(query) {
   })
 }
 
+export function portPoolList() {
+  return request({
+    url: '/port-pool/list',
+    method: 'get'
+  })
+}
+
 export function updateEnableStatus(id, enable) {
   return request({
     url: '/port-pool/update/enable-status',
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index d6429a0b..9bf99431 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -79,7 +79,7 @@
         </el-form-item>
         <el-form-item :label="$t('服务端端口')" prop="serverPort">
           <el-select style="width: 280px;" class="filter-item" v-model="temp.serverPort" placeholder="请选择">
-            <el-option v-for="item in serverPortList" :key="item" :label="item" :value="item">
+            <el-option v-for="item in serverPortList" :key="item.port" :label="item.port" :value="item.port">
             </el-option>
           </el-select>
         </el-form-item>
@@ -112,6 +112,7 @@
 
 <script>
   import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
+  import { portPoolList } from '@/api/portPool'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
   import ButtonPopover from '../../components/Button/buttonPopover'
@@ -158,7 +159,7 @@
           { id: 1, name: '我的Mac' },
           { id: 2, name: '我的台式机' }
         ],
-        serverPortList: [9101, 9102, 9103, 9104],
+        serverPortList: [],
         showReviewer: false,
         temp: {
           id: undefined,
@@ -212,6 +213,7 @@
     },
     created() {
       this.getList()
+      this.getPortPoolList()
     },
     methods: {
       getList() {
@@ -222,6 +224,11 @@
           this.listLoading = false
         })
       },
+      getPortPoolList() {
+        portPoolList().then(response => {
+          this.serverPortList = response.data.data
+        })
+      },
       handleFilter() {
         this.listQuery.currentPage = 1
         this.getList()
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 6abf2fce..48e9f73e 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
@@ -21,7 +21,6 @@
  */
 package fun.asgc.neutrino.proxy.server.controller.res;
 
-import fun.asgc.neutrino.core.db.annotation.Id;
 import lombok.Data;
 
 import java.util.Date;