From 4d380dbdf3cf3fc199797daf03d6ad180a7e06ae Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 22 Sep 2023 20:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E6=98=A0=E5=B0=84=E6=97=B6=E7=AB=AF=E5=8F=A3=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E6=A3=80=E6=B5=8B=E5=8A=9F=E8=83=BD=E5=B1=8F=E8=94=BD?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3docker=E4=B8=8B=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=90=84=E7=A7=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/views/proxy/portMapping.vue | 5 +++--
 todolist.MD                                          | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index f83883d3..c120ac41 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -196,7 +196,7 @@
 
 <script>
 import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
-import { portPoolList, availablePortList, portAvailable } from '@/api/portPool'
+import { availablePortList, portAvailable } from '@/api/portPool'
 import { licenseList, licenseAuthList } from '@/api/license'
 import { protocalList } from '@/api/protocal'
 import { userList } from '@/api/user'
@@ -298,7 +298,8 @@ export default {
       rules: {
         licenseId: [{ required: true, message: '请选择License', trigger: 'blur,change' }],
         serverPort: [{ required: true, message: '请输入服务端端口', trigger: 'blur' },
-          { validator: isPortAvailable, trigger: 'change' }],
+          // { validator: isPortAvailable, trigger: 'change' }
+        ],
         clientIp: [{ required: true, message: '请输入客户端IP', trigger: 'blur' }],
         clientPort: [{ required: true, message: '请输入客户端端口', trigger: 'blur' }],
         protocal: [{ required: true, message: '请选择协议', trigger: 'blur' }]
diff --git a/todolist.MD b/todolist.MD
index 9017982a..88df48fc 100644
--- a/todolist.MD
+++ b/todolist.MD
@@ -30,6 +30,8 @@
     - 原`neutrino.proxy.server`配置移到`neutrino.proxy.server.tcp`下
   - 客户端
     - 原`neutrino.proxy.client`配置移到`neutrino.proxy.tunnel`下
+- [x] 端口映射HTTP(S)新增打开网页按钮，优先使用域名打开
+- [x] 新增/编辑端口映射时端口占用检测功能屏蔽，解决docker下使用的各种问题
 
 # Bug
 - 指令通达被close的问题，org.dromara.neutrinoproxy.server.proxy.core.ProxyTunnelChannelHandler.channelInactive