From 559c6bd5f548a109cbaeaeefee6ee4e2a0b1f964 Mon Sep 17 00:00:00 2001
From: Yohanes <y0hanes@outlook.com>
Date: Tue, 21 Mar 2023 18:07:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AB=AF=E5=8F=A3=E6=98=A0?=
 =?UTF-8?q?=E5=B0=84=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/license.js       |   6 +
 .../src/views/proxy/portMapping.vue           |  21 ++-
 .../server/controller/LicenseController.java  |   5 +
 .../proxy/server/dal/LicenseMapper.java       | 147 +++++++++---------
 .../proxy/server/service/LicenseService.java  |  23 +++
 .../proxy/server/service/PortPoolService.java |  44 +++---
 6 files changed, 148 insertions(+), 98 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/license.js b/neutrino-proxy-admin/src/api/license.js
index d9aa0d90..859a422d 100644
--- a/neutrino-proxy-admin/src/api/license.js
+++ b/neutrino-proxy-admin/src/api/license.js
@@ -14,6 +14,12 @@ export function licenseList() {
     method: 'get'
   })
 }
+export function licenseAuthList() {
+  return request({
+    url: '/license/auth-list',
+    method: 'get'
+  })
+}
 
 export function createLicense(data) {
   return request({
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index c5315e1a..4336c7fd 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="app-container calendar-list-container">
     <div class="filter-container" style="display:flex">
-      <el-select v-model="listQuery.userId" placeholder="请选择用户" clearable style="margin-right:10px" @change="refrech">
+      <el-select v-model="listQuery.userId" placeholder="请选择用户" clearable style="margin-right:10px">
         <el-option v-for="item in userList" :key="item.loginName" :label="item.name" :value="item.id" />
       </el-select>
-      <el-select v-model="listQuery.license" placeholder="请选择license" clearable style="margin-right:10px">
+      <el-select v-model="listQuery.licenseId" placeholder="请选择license" clearable style="margin-right:10px">
         <el-option v-for="item in licenseList" :key="item.key" :label="item.name" :value="item.id" />
       </el-select>
       <el-input v-model="listQuery.serverPort" type="text" style="width:150px;margin-right:10px" class="filter-item"
@@ -100,7 +100,7 @@
         <!--        </el-form-item>-->
 
         <el-form-item :label="$t('License')" prop="licenseId">
-          <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseList"
+          <DropdownTable v-model="temp.licenseId" :name.sync="temp.licenseName" :tableData="licenseAuthList"
             @selectedData="selectedFeeItem" placeholder="请选择" :width="280" :disabled="dialogStatus === 'update'" />
           <!--          <DropdownTable
             :columns="countryColumns"
@@ -151,7 +151,7 @@
 <script>
 import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
 import { portPoolList, availablePortList } from '@/api/portPool'
-import { licenseList } from '@/api/license'
+import { licenseList, licenseAuthList } from '@/api/license'
 import { userList } from '@/api/user'
 import waves from '@/directive/waves' // 水波纹指令
 import { parseTime } from '@/utils'
@@ -192,7 +192,7 @@ export default {
         importance: undefined,
         title: undefined,
         type: undefined,
-        userid: undefined,
+        userId: undefined,
         license: undefined,
         port: undefined,
         isOnline: undefined,
@@ -205,6 +205,7 @@ export default {
       statusOptions: ['published', 'draft', 'deleted'],
       userList: [],
       licenseList: [],
+      licenseAuthList: [],
       serverPortList: [],
       showReviewer: false,
       temp: {
@@ -269,11 +270,9 @@ export default {
   created() {
     this.getDataList()
     this.getLicenseList()
+    this.getLicenseAuthList()
   },
   methods: {
-    refrech(val) {
-      this.$forceUpdate()
-    },
     getList() {
       this.listLoading = true
       fetchList(this.listQuery).then(response => {
@@ -313,6 +312,11 @@ export default {
         this.licenseList = response.data.data
       })
     },
+    getLicenseAuthList() {
+      licenseAuthList().then(response => {
+        this.licenseAuthList = response.data.data
+      })
+    },
     handleFilter() {
       this.listQuery.current = 1
       this.getList()
@@ -347,6 +351,7 @@ export default {
         clientPort: undefined,
         userId: undefined
       }
+      this.serverPortList = []
     },
     handleCreate() {
       this.resetTemp()
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java
index f332e785..04999837 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/LicenseController.java
@@ -56,6 +56,11 @@ public class LicenseController {
 		return licenseService.list(req);
 	}
 
+	@Mapping("/auth-list")
+	public List<LicenseListRes> queryCurUserLicense(LicenseListReq req) {
+		return licenseService.queryCurUserLicense(req);
+	}
+
 	@Post
 	@Mapping("/create")
 	@Authorization(onlyAdmin = true)
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
index 4006bd80..99d10df9 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/LicenseMapper.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
@@ -39,83 +39,88 @@ import java.util.Set;
 @Mapper
 public interface LicenseMapper extends BaseMapper<LicenseDO> {
 
-	default List<LicenseDO> listAll() {
-		return this.selectList(new LambdaQueryWrapper<>());
-	}
+    default List<LicenseDO> listAll() {
+        return this.selectList(new LambdaQueryWrapper<>());
+    }
 
-	default List<LicenseDO> listByUserId(Integer userId) {
-		return this.selectList(new LambdaQueryWrapper<LicenseDO>()
-				.eq(LicenseDO::getUserId, userId)
-		);
-	}
+    default List<LicenseDO> listByUserId(Integer userId) {
+        return this.selectList(new LambdaQueryWrapper<LicenseDO>()
+                .eq(LicenseDO::getUserId, userId)
+        );
+    }
 
-	default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
-		this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-				.eq(LicenseDO::getId, id)
-				.set(LicenseDO::getEnable, enable)
-				.set(LicenseDO::getUpdateTime, updateTime)
-		);
-	}
+    default LicenseDO queryById(Integer licenseId) {
+        return this.selectOne(new LambdaQueryWrapper<LicenseDO>()
+                .eq(LicenseDO::getId, licenseId));
+    }
 
-	default void updateOnlineStatus(Integer id, Integer isOnline, Date updateTime) {
-		this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-				.eq(LicenseDO::getId, id)
-				.set(LicenseDO::getIsOnline, isOnline)
-				.set(LicenseDO::getUpdateTime, updateTime)
-		);
-	}
+    default void updateEnableStatus(Integer id, Integer enable, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
+                .eq(LicenseDO::getId, id)
+                .set(LicenseDO::getEnable, enable)
+                .set(LicenseDO::getUpdateTime, updateTime)
+        );
+    }
 
-	default void updateOnlineStatus(Integer isOnline, Date updateTime) {
-		this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-				.set(LicenseDO::getIsOnline, updateTime)
-				.set(LicenseDO::getUpdateTime, updateTime)
-		);
-	}
+    default void updateOnlineStatus(Integer id, Integer isOnline, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
+                .eq(LicenseDO::getId, id)
+                .set(LicenseDO::getIsOnline, isOnline)
+                .set(LicenseDO::getUpdateTime, updateTime)
+        );
+    }
 
-	default void reset(Integer id, String key, Date updateTime) {
-		this.update(null, new LambdaUpdateWrapper<LicenseDO>()
-				.eq(LicenseDO::getId, id)
-				.set(LicenseDO::getKey, key)
-				.set(LicenseDO::getUpdateTime, updateTime)
-		);
-	}
+    default void updateOnlineStatus(Integer isOnline, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
+                .set(LicenseDO::getIsOnline, updateTime)
+                .set(LicenseDO::getUpdateTime, updateTime)
+        );
+    }
 
-	default LicenseDO findById(Integer id) {
-		return this.selectById(id);
-	}
+    default void reset(Integer id, String key, Date updateTime) {
+        this.update(null, new LambdaUpdateWrapper<LicenseDO>()
+                .eq(LicenseDO::getId, id)
+                .set(LicenseDO::getKey, key)
+                .set(LicenseDO::getUpdateTime, updateTime)
+        );
+    }
 
-	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 LicenseDO findById(Integer id) {
+        return this.selectById(id);
+    }
 
-	default List<LicenseDO> findByIds(Set<Integer> ids) {
-		return selectBatchIds(ids);
-	}
+    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 LicenseDO checkRepeat(Integer userId, String name) {
-		return this.selectOne(new LambdaQueryWrapper<LicenseDO>()
-				.eq(LicenseDO::getUserId, userId)
-				.eq(LicenseDO::getName, name)
-				.last("limit 1")
-		);
-	}
+    default List<LicenseDO> findByIds(Set<Integer> ids) {
+        return selectBatchIds(ids);
+    }
 
-	default LicenseDO checkRepeat(Integer userId, String name, Set<Integer> excludeIds) {
-		return this.selectOne(new LambdaQueryWrapper<LicenseDO>()
-				.eq(LicenseDO::getUserId, userId)
-				.eq(LicenseDO::getName, name)
-				.notIn(LicenseDO::getId, excludeIds)
-				.last("limit 1")
-		);
-	}
+    default LicenseDO checkRepeat(Integer userId, String name) {
+        return this.selectOne(new LambdaQueryWrapper<LicenseDO>()
+                .eq(LicenseDO::getUserId, userId)
+                .eq(LicenseDO::getName, name)
+                .last("limit 1")
+        );
+    }
 
-	default LicenseDO findByKey(String licenseKey) {
-		return selectOne(new LambdaQueryWrapper<LicenseDO>()
-				.eq(LicenseDO::getKey, licenseKey)
-		);
-	}
+    default LicenseDO checkRepeat(Integer userId, String name, Set<Integer> excludeIds) {
+        return this.selectOne(new LambdaQueryWrapper<LicenseDO>()
+                .eq(LicenseDO::getUserId, userId)
+                .eq(LicenseDO::getName, name)
+                .notIn(LicenseDO::getId, excludeIds)
+                .last("limit 1")
+        );
+    }
+
+    default LicenseDO findByKey(String licenseKey) {
+        return selectOne(new LambdaQueryWrapper<LicenseDO>()
+                .eq(LicenseDO::getKey, licenseKey)
+        );
+    }
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
index c9db420a..e2a1a362 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
@@ -24,6 +24,7 @@ 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.jetbrains.annotations.Nullable;
 import org.noear.solon.annotation.Component;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.Lifecycle;
@@ -79,6 +80,12 @@ public class LicenseService implements Lifecycle {
 		List<LicenseDO> list = licenseMapper.selectList(new LambdaQueryWrapper<LicenseDO>()
 				.eq(LicenseDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
 		);
+		List<LicenseListRes> licenseList = assembleConvertLicenses(list);
+		return licenseList;
+	}
+
+	@Nullable
+	private List<LicenseListRes> assembleConvertLicenses(List<LicenseDO> list) {
 		List<LicenseListRes> licenseList = mapperFacade.mapAsList(list, LicenseListRes.class);
 		if (!CollectionUtil.isEmpty(licenseList)) {
 			Set<Integer> userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet());
@@ -220,4 +227,20 @@ public class LicenseService implements Lifecycle {
 	public void stop() throws Throwable {
 		licenseMapper.updateOnlineStatus(OnlineStatusEnum.OFFLINE.getStatus(), new Date());
 	}
+
+	/**
+	 * 查询当前角色下的license，若为管理员 则返回全部license
+	 */
+	public List<LicenseListRes> queryCurUserLicense(LicenseListReq req) {
+		if(SystemContextHolder.isAdmin()){
+			return this.list(req);
+		}
+
+		List<LicenseDO> list = licenseMapper.selectList(new LambdaQueryWrapper<LicenseDO>()
+				.eq(LicenseDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
+				.eq(LicenseDO::getUserId,SystemContextHolder.getUserId())
+		);
+		List<LicenseListRes> licenseList = assembleConvertLicenses(list);
+		return licenseList;
+	}
 }
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 d3b583f3..c02103f3 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
@@ -33,13 +33,11 @@ import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.controller.req.*;
 import fun.asgc.neutrino.proxy.server.controller.res.*;
+import fun.asgc.neutrino.proxy.server.dal.LicenseMapper;
 import fun.asgc.neutrino.proxy.server.dal.PortGroupMapper;
 import fun.asgc.neutrino.proxy.server.dal.PortMappingMapper;
 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.PortMappingDO;
-import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO;
-import fun.asgc.neutrino.proxy.server.dal.entity.UserDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.*;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.ibatis.solon.annotation.Db;
@@ -68,8 +66,10 @@ public class PortPoolService {
 
     @Db
     private PortGroupMapper portGroupMapper;
-	@Db
-	private PortMappingMapper portMappingMapper;
+    @Db
+    private PortMappingMapper portMappingMapper;
+    @Db
+    private LicenseMapper licenseMapper;
 
     public PageInfo<PortPoolListRes> page(PageQuery pageQuery, PortPoolListReq req) {
         Page<PortPoolListRes> result = PageHelper.startPage(pageQuery.getCurrent(), pageQuery.getSize());
@@ -82,19 +82,20 @@ public class PortPoolService {
         List<PortPoolDO> list = portPoolMapper.selectList(new LambdaQueryWrapper<PortPoolDO>()
                 .eq(PortPoolDO::getEnable, EnableStatusEnum.ENABLE.getStatus())
         );
-		return mapperFacade.mapAsList(this.filterUsedPorts(list), PortPoolListRes.class);
+        return mapperFacade.mapAsList(this.filterUsedPorts(list), PortPoolListRes.class);
     }
-	private List<PortPoolDO> filterUsedPorts(List<PortPoolDO> list) {
-		//Gets the used ports
-		List<PortMappingDO> usePorts = portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>().orderByAsc(PortMappingDO::getId));
 
-		List<Integer> serverPorts = usePorts.stream().map(item -> item.getServerPort()).collect(Collectors.toList());
+    private List<PortPoolDO> filterUsedPorts(List<PortPoolDO> list) {
+        //Gets the used ports
+        List<PortMappingDO> usePorts = portMappingMapper.selectList(new LambdaQueryWrapper<PortMappingDO>().orderByAsc(PortMappingDO::getId));
 
-		return list.stream().filter(item -> !serverPorts.contains(item.getPort())).collect(Collectors.toList());
-	}
+        List<Integer> serverPorts = usePorts.stream().map(item -> item.getServerPort()).collect(Collectors.toList());
+
+        return list.stream().filter(item -> !serverPorts.contains(item.getPort())).collect(Collectors.toList());
+    }
 
 
-	public PortPoolCreateRes create(PortPoolCreateReq req) {
+    public PortPoolCreateRes create(PortPoolCreateReq req) {
         PortPoolDO oldPortPoolDO = portPoolMapper.findByPort(req.getPort());
         ParamCheckUtil.checkMustNull(oldPortPoolDO, ExceptionConstant.PORT_CANNOT_REPEAT);
         PortGroupDO portGroupDO = portGroupMapper.selectById(req.getGroupId());
@@ -155,8 +156,13 @@ public class PortPoolService {
         return new PortPoolUpdateGroupRes();
     }
 
+    /**
+     * 管理员： 全局端口 + 当前选择的用户独占端口 + 当前选择license独占端口
+     * 游客：全局端口 + 当前选择用户独占端口 + 当前选择license独占端口
+     * 非管理员身份时：下拉选择license，只能选当前用户下的LICENSE
+     */
     public List<PortPoolListRes> getAvailablePortList(AvailablePortListReq req) {
-        UserDO user = SystemContextHolder.getUser();
-        return portPoolMapper.getAvailablePortList(req.getLicenseId(), user.getId());
+        LicenseDO licenseDO = licenseMapper.queryById(req.getLicenseId());
+        return portPoolMapper.getAvailablePortList(req.getLicenseId(), licenseDO.getUserId());
     }
 }