From cfd079279fa5fdd0104d5b2c5e4815a63690be34 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 19 Dec 2022 10:18:59 +0800
Subject: [PATCH] =?UTF-8?q?license=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AEkey=E7=9A=84=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/license.js       | 10 ++++++++
 neutrino-proxy-admin/src/lang/zh.js           |  3 ++-
 .../src/views/proxy/license.vue               | 25 ++++++++++++++++---
 .../proxy/server/dal/LicenseMapper.java       |  2 +-
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/license.js b/neutrino-proxy-admin/src/api/license.js
index 7069e9c6..d9aa0d90 100644
--- a/neutrino-proxy-admin/src/api/license.js
+++ b/neutrino-proxy-admin/src/api/license.js
@@ -51,3 +51,13 @@ export function deleteLicense(id) {
     }
   })
 }
+
+export function resetLicense(id) {
+  return request({
+    url: '/license/reset',
+    method: 'post',
+    params: {
+      id: id
+    }
+  })
+}
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index 573807de..e021cbf8 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -146,7 +146,8 @@ export default {
     updatePwd: '修改密码',
     msg: '消息',
     outcome: '结果',
-    err: '异常信息'
+    err: '异常信息',
+    resetKey: '重置Key'
   },
   button: {
     lookOver: '查看'
diff --git a/neutrino-proxy-admin/src/views/proxy/license.vue b/neutrino-proxy-admin/src/views/proxy/license.vue
index 64c0bb39..ab759ded 100644
--- a/neutrino-proxy-admin/src/views/proxy/license.vue
+++ b/neutrino-proxy-admin/src/views/proxy/license.vue
@@ -47,14 +47,14 @@
           <el-tag :type="scope.row.isOnline | statusFilter">{{scope.row.isOnline | isOnlineName}}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
+      <el-table-column align="center" :label="$t('table.actions')" width="330" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="primary" size="mini" @click="handleUpdate(scope.row)">{{$t('table.edit')}}</el-button>
+          <el-button size="mini" type="primary" @click="handleReset(scope.row)">{{$t('table.resetKey')}}</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 size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
           <ButtonPopover @handleCommitClick="handleDelete2(scope.row)" style="margin-left: 10px"/>
-
         </template>
       </el-table-column>
     </el-table>
@@ -98,7 +98,7 @@
 </template>
 
 <script>
-  import { fetchList, createLicense, updateLicense, updateEnableStatus, deleteLicense } from '@/api/license'
+  import { fetchList, createLicense, updateLicense, updateEnableStatus, deleteLicense, resetLicense } from '@/api/license'
   import { userList } from '@/api/user'
   import waves from '@/directive/waves' // 水波纹指令
   import { parseTime } from '@/utils'
@@ -277,6 +277,25 @@
           this.$refs['dataForm'].clearValidate()
         })
       },
+      handleReset(row) {
+        this.$confirm('确定重置吗？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'info'
+        }).then(() => {
+          resetLicense(row.id).then(response => {
+            if (response.data.code === 0) {
+              this.$notify({
+                title: '成功',
+                message: '重置成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.getList()
+            }
+          })
+        }).catch(() => {})
+      },
       updateData() {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
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 03af06e4..49bcfc27 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
@@ -77,7 +77,7 @@ public interface LicenseMapper extends SqlMapper {
 	@Update("update `license` set is_online = :isOnline, update_time = :updateTime")
 	void updateOnlineStatus(@Param("isOnline") Integer isOnline, @Param("updateTime") Date updateTime);
 
-	@Update("update `license` set key = :key,update_time = :updateTime where id = :id")
+	@Update("update `license` set `key` = :key,update_time = :updateTime where id = :id")
 	void reset(@Param("id") Integer id, @Param("key") String key, @Param("updateTime") Date updateTime);
 
 	@Delete("delete from `license` where id = ?")