From b071104e1700a83a4127eab59eb468f2f041f96f Mon Sep 17 00:00:00 2001
From: yxh <yxh1103@qq.com>
Date: Sat, 8 Jun 2024 23:22:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8id=E5=A4=84=E7=90=86=EF=BC=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B7=E6=96=B0token=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/personal/index.ts               |  7 ++++++-
 src/utils/websocket.ts                         | 18 +++++++++++++++++-
 src/views/system/role/component/dataScope.vue  |  4 ++--
 .../tools/gen/component/tableColumns.vue       |  3 ++-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/api/system/personal/index.ts b/src/api/system/personal/index.ts
index 24eb1f6..3b23cbd 100644
--- a/src/api/system/personal/index.ts
+++ b/src/api/system/personal/index.ts
@@ -25,4 +25,9 @@ export function resetPwdPersonal(data:object) {
     })
 }
 
-
+export function refreshToken() {
+    return request({
+        url: '/api/v1/system/personal/refreshToken',
+        method: 'get'
+    })
+}
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 7d0ac03..cb70efa 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -1,5 +1,8 @@
-import {getToken} from "/@/utils/gfast"
+import {getToken, getUpFileUrl} from "/@/utils/gfast"
 import {noticeStore} from "/@/stores/noticeStore";
+import {refreshToken} from "/@/api/system/personal";
+import {Session} from "/@/utils/storage";
+import {useUserInfo} from "/@/stores/userInfo";
 const noticeStoreAct = noticeStore()
 const webSocketURL = import.meta.env.VITE_WEBSOCKET_URL
 let socket: WebSocket;
@@ -139,6 +142,19 @@ export default (onMessage: Function) => {
         noticeStoreAct.setMessages(message.data)
         return;
       }
+      //更新token
+      if(message.event == 'tokenUpdated'){
+        refreshToken().then((res:any)=>{
+          const userInfo = res.data.userInfo
+          userInfo.avatar = getUpFileUrl(userInfo.avatar)
+          // 存储 token 到浏览器缓存
+          Session.set('token', res.data.token);
+          // 存储用户信息到浏览器缓存
+          Session.set('userInfo', userInfo);
+          useUserInfo().setUserInfos();
+        })
+        return;
+      }
       if (onMessage && !isHeart) {
         onMessage.call(null, event);
       }
diff --git a/src/views/system/role/component/dataScope.vue b/src/views/system/role/component/dataScope.vue
index 6e2bc03..2726353 100644
--- a/src/views/system/role/component/dataScope.vue
+++ b/src/views/system/role/component/dataScope.vue
@@ -33,7 +33,7 @@
           <template #header>
               <el-radio-group v-model="optionsActionValue" @change="setOptionsActionValueHandle">
                 <template v-for="item in dataScopeOptions" :key="item.value">
-                  <el-radio v-if="item.value!='2'" :label="item.value" >{{item.label}}</el-radio>
+                  <el-radio v-if="item.value!='2'" :value="item.value" >{{item.label}}</el-radio>
                 </template>
               </el-radio-group>
           </template>
@@ -41,7 +41,7 @@
             <div class="option-con">
               <el-radio-group v-model="menuAuthData[scope.row.id]">
                 <template v-for="item in dataScopeOptions" :key="item.value">
-                  <el-radio :label="item.value" @change="setOptionsItemHandle(item.value,scope.row.id)">
+                  <el-radio :value="item.value" @change="setOptionsItemHandle(item.value,scope.row.id)">
                     <el-badge v-if="item.value=='2' && menuAuthData[scope.row.id]=='2'" type="success" :value="getDeptLen(scope.row.id)" :max="99" class="item" :show-zero="false">{{item.label}}</el-badge>
                     <span v-else>{{item.label}}</span>
                   </el-radio>
diff --git a/src/views/system/tools/gen/component/tableColumns.vue b/src/views/system/tools/gen/component/tableColumns.vue
index c591468..63be1a9 100644
--- a/src/views/system/tools/gen/component/tableColumns.vue
+++ b/src/views/system/tools/gen/component/tableColumns.vue
@@ -59,6 +59,7 @@
               :disabled="
                 scope.row.isPk == '1' ||
                 scope.row.columnName == 'created_at' ||
+                scope.row.columnName == 'dept_id' ||
                 scope.row.columnName == 'created_by' ||
                 scope.row.columnName == 'updated_by'
               "
@@ -164,7 +165,7 @@
         </el-table-column>
         <el-table-column label="详情起新行" width="50">
           <template #default="scope">
-            <el-checkbox true-label="1" v-model="scope.row.isRowStart"></el-checkbox>
+            <el-checkbox true-value="1" v-model="scope.row.isRowStart"></el-checkbox>
           </template>
         </el-table-column>
         <el-table-column label="字典类型" width="160">