From 84d72b613fb8ca3baa36b18f05371145647cf039 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 1 Sep 2022 23:27:25 +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/license.js       |  7 ++++
 .../src/components/Dropdown/DropdownTable.vue | 18 +++-------
 .../src/views/proxy/portMapping.vue           | 36 ++++++++++---------
 .../proxy/server/dal/LicenseMapper.java       |  2 ++
 .../proxy/server/dal/PortMappingMapper.java   |  2 ++
 .../proxy/server/dal/PortPoolMapper.java      |  2 ++
 .../server/dal/UserConnectRecordMapper.java   |  2 ++
 .../server/dal/UserLoginRecordMapper.java     |  2 ++
 .../neutrino/proxy/server/dal/UserMapper.java |  2 ++
 .../proxy/server/dal/UserTokenMapper.java     |  2 ++
 .../proxy/server/service/LicenseService.java  |  2 ++
 .../server/service/PortMappingService.java    |  2 ++
 .../proxy/server/service/PortPoolService.java |  2 ++
 .../proxy/server/service/UserService.java     |  2 ++
 .../src/main/resources/logback.xml            |  2 +-
 15 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/license.js b/neutrino-proxy-admin/src/api/license.js
index be7fed0f..7069e9c6 100644
--- a/neutrino-proxy-admin/src/api/license.js
+++ b/neutrino-proxy-admin/src/api/license.js
@@ -8,6 +8,13 @@ export function fetchList(query) {
   })
 }
 
+export function licenseList() {
+  return request({
+    url: '/license/list',
+    method: 'get'
+  })
+}
+
 export function createLicense(data) {
   return request({
     url: '/license/create',
diff --git a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue
index bacd260a..ca670ba1 100644
--- a/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue
+++ b/neutrino-proxy-admin/src/components/Dropdown/DropdownTable.vue
@@ -42,23 +42,13 @@
       return {
         countryColumns: [
           {
-            prop: 'NameCn',
-            label: '中文名',
+            prop: 'userName',
+            label: '用户名',
             align: 'center'
           },
           {
-            prop: 'NameEn',
-            label: '英文名',
-            align: 'center'
-          },
-          {
-            prop: 'FeeItemCode',
-            label: '费用项编码',
-            align: 'center'
-          },
-          {
-            prop: 'FeeItemTypeStr',
-            label: '费用类型',
+            prop: 'name',
+            label: 'License',
             align: 'center'
           }
         ],
diff --git a/neutrino-proxy-admin/src/views/proxy/portMapping.vue b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
index e677e5f2..acd1e676 100644
--- a/neutrino-proxy-admin/src/views/proxy/portMapping.vue
+++ b/neutrino-proxy-admin/src/views/proxy/portMapping.vue
@@ -71,12 +71,12 @@
 
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
       <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="120px" style='width: 400px; margin-left:50px;'>
-        <el-form-item :label="$t('License')" prop="licenseId">
-          <el-select style="width: 280px;" class="filter-item" v-model="temp.licenseId" 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-item :label="$t('License')" prop="licenseId">-->
+<!--          <el-select style="width: 280px;" class="filter-item" v-model="temp.licenseId" 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-item :label="$t('License')" prop="licenseId">
           <DropdownTable
@@ -85,6 +85,7 @@
             :tableData= "licenseList"
             @selectedData="selectedFeeItem"
             placeholder="请选择"
+            :width="280"
           />
 
         </el-form-item>
@@ -124,6 +125,7 @@
 <script>
   import { fetchList, createUserPortMapping, updateUserPortMapping, updateEnableStatus, deletePortMapping } from '@/api/portMapping'
   import { portPoolList } from '@/api/portPool'
+  import { licenseList } from '@/api/license'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
   import ButtonPopover from '../../components/Button/buttonPopover'
@@ -168,10 +170,7 @@
         calendarTypeOptions,
         sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
         statusOptions: ['published', 'draft', 'deleted'],
-        licenseList: [
-          { id: 1, name: '我的Mac' },
-          { id: 2, name: '我的台式机' }
-        ],
+        licenseList: [],
         serverPortList: [],
         showReviewer: false,
         temp: {
@@ -228,6 +227,7 @@
     created() {
       this.getList()
       this.getPortPoolList()
+      this.getLicenseList()
     },
     methods: {
       getList() {
@@ -243,6 +243,11 @@
           this.serverPortList = response.data.data
         })
       },
+      getLicenseList() {
+        licenseList().then(response => {
+          this.licenseList = response.data.data
+        })
+      },
       handleFilter() {
         this.listQuery.currentPage = 1
         this.getList()
@@ -270,12 +275,11 @@
       resetTemp() {
         this.temp = {
           id: undefined,
-          importance: 1,
-          remark: '',
-          timestamp: new Date(),
-          title: '',
-          status: 'published',
-          type: ''
+          licenseId: undefined,
+          licenseName: undefined,
+          serverPort: undefined,
+          clientIp: undefined,
+          clientPort: undefined
         }
       },
       handleCreate() {
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 61943acb..782d6901 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
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.ResultType;
 import fun.asgc.neutrino.core.db.annotation.Select;
@@ -43,6 +44,7 @@ import java.util.Set;
  * @author: aoshiguchen
  * @date: 2022/8/6
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface LicenseMapper extends SqlMapper {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
index 00558a9c..4e3545b5 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/PortMappingMapper.java
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.ResultType;
 import fun.asgc.neutrino.core.db.annotation.Select;
@@ -41,6 +42,7 @@ import java.util.Set;
  * @author: aoshiguchen
  * @date: 2022/8/8
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface PortMappingMapper extends SqlMapper {
 
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 bc6c0a68..035aefd9 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
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.*;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.core.db.page.Page;
@@ -38,6 +39,7 @@ import java.util.List;
  * @author: aoshiguchen
  * @date: 2022/8/7
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface PortPoolMapper extends SqlMapper {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserConnectRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserConnectRecordMapper.java
index 649c26c5..4fb6569e 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserConnectRecordMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserConnectRecordMapper.java
@@ -22,6 +22,7 @@
 package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 
 /**
@@ -29,6 +30,7 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper;
  * @author: aoshiguchen
  * @date: 2022/8/31
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface UserConnectRecordMapper extends SqlMapper {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
index 33af0fb9..61154085 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserLoginRecordMapper.java
@@ -22,6 +22,7 @@
 package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
@@ -31,6 +32,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO;
  * @author: aoshiguchen
  * @date: 2022/8/2
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface UserLoginRecordMapper extends SqlMapper {
 	/**
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
index 35a48f44..4335ac5e 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserMapper.java
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.*;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 import fun.asgc.neutrino.core.db.page.Page;
@@ -40,6 +41,7 @@ import java.util.Set;
  * @author: aoshiguchen
  * @date: 2022/8/1
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface UserMapper extends SqlMapper {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
index c7e4229c..c672e9c0 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/UserTokenMapper.java
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Param;
+import fun.asgc.neutrino.core.aop.Intercept;
 import fun.asgc.neutrino.core.db.annotation.Delete;
 import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.annotation.Select;
@@ -37,6 +38,7 @@ import java.util.Date;
  * @author: aoshiguchen
  * @date: 2022/8/1
  */
+@Intercept(ignoreGlobal = true)
 @Component
 public interface UserTokenMapper extends SqlMapper {
 	/**
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 eed77b70..7a4c5215 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 @@ package fun.asgc.neutrino.proxy.server.service;
 import com.google.common.collect.Sets;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.CollectionUtil;
@@ -51,6 +52,7 @@ import java.util.stream.Collectors;
  * @author: aoshiguchen
  * @date: 2022/8/6
  */
+@NonIntercept
 @Component
 public class LicenseService {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index 3c507d5d..32cd32ab 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -24,6 +24,7 @@ package fun.asgc.neutrino.proxy.server.service;
 import com.google.common.collect.Sets;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.CollectionUtil;
@@ -58,6 +59,7 @@ import java.util.stream.Collectors;
  * @author: aoshiguchen
  * @date: 2022/8/8
  */
+@NonIntercept
 @Component
 public class PortMappingService {
 	@Autowired
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 c956edb3..e4166fa0 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
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.service;
 
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
@@ -45,6 +46,7 @@ import java.util.List;
  * @author: aoshiguchen
  * @date: 2022/8/7
  */
+@NonIntercept
 @Component
 public class PortPoolService {
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
index d0ed0497..bd6d827b 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java
@@ -23,6 +23,7 @@ package fun.asgc.neutrino.proxy.server.service;
 
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.util.DateUtil;
@@ -50,6 +51,7 @@ import java.util.UUID;
  * @author: aoshiguchen
  * @date: 2022/7/31
  */
+@NonIntercept
 @Component
 public class UserService {
 	private static final String DEFAULT_PASSWORD = "123456";
diff --git a/neutrino-proxy-server/src/main/resources/logback.xml b/neutrino-proxy-server/src/main/resources/logback.xml
index 1dc705e4..a39d6bc7 100644
--- a/neutrino-proxy-server/src/main/resources/logback.xml
+++ b/neutrino-proxy-server/src/main/resources/logback.xml
@@ -26,7 +26,7 @@
         </encoder>
     </appender>
 
-    <root level="DEBUG">
+    <root level="INFO">
         <appender-ref ref="console"/>
         <appender-ref ref="file"/>
     </root>