Merge branch 'refresh' into release

src/api/common/login.js

@@ -71,3 +71,11 @@ export function logout() {
   })
 }
 
+
+// 刷新 token 有效期
+export function refreshToken() {
+  return request({
+    url: '/auth/refresh',
+    method: 'post'
+  })
+}

src/assets/styles/element-ui.scss

@@ -46,6 +46,11 @@
   }
 }
 
+// 重写 el-table 的 loading-mask 加载进度蒙层
+.el-loading-mask{
+  z-index: 1 !important;
+}
+
 // to fixed https://github.com/ElemeFE/element/issues/2461
 // 重写 dialog 样式，默认居中显示
 .el-overlay-dialog {

src/layout/components/Navbar.vue

@@ -14,7 +14,7 @@
     <div class="right-menu">
       <template v-if="appStore.device !== 'mobile'">
         <!-- 新版本 -->
-        <!-- <div class="right-menu-item hover-effect new-version"
+        <div class="right-menu-item hover-effect new-version"
           @click="showVersionFn">
           <svg-icon icon-class="new-version" />
         </div>
@@ -22,7 +22,7 @@
         <version-notice v-model="showVersionNoticeVisible"
           :nowVersion="nowVersion"
           :versionList="showVersionList"
-          @confirm="saveNowVersion" /> -->
+          @confirm="saveNowVersion" />
 
         <header-search id="header-search"
           class="right-menu-item" />
@@ -107,12 +107,12 @@ const nowVersion = ref('') // 当前最新版本
 
 // 判断是否有新版本出现
 onMounted(() => {
-  // const oldVersion = proxy.$cache.local.get('version')
-  // const versionObj = versionStore.version[0]
-  // nowVersion.value = versionObj.version
-  // if (oldVersion !== nowVersion.value) {
-  //   handleVersionList()
-  // }
+  const oldVersion = proxy.$cache.local.get('version')
+  const versionObj = versionStore.version[0]
+  nowVersion.value = versionObj.version
+  if (oldVersion !== nowVersion.value) {
+    handleVersionList()
+  }
 })
 // 展示版本通知弹框
 const showVersionFn = () => {

src/store/modules/version.js

@@ -10,12 +10,12 @@ export default defineStore(
       // 获取版本信息
       getVersion() {
         return new Promise((resolve, reject) => {
-          // getVersionAPI().then(res => {
-          //   this.version = res.data
-          //   resolve(res)
-          // }).catch(error => {
-          //   reject(error)
-          // })
+          getVersionAPI().then(res => {
+            this.version = res.data
+            resolve(res)
+          }).catch(error => {
+            reject(error)
+          })
           resolve()
         })
       }

src/utils/request.js

@@ -6,7 +6,7 @@ import { tansParams, blobValidate } from '@/utils/ruoyi'
 import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 import useUserStore from '@/store/modules/user'
-import { fsClientAuth } from '@/api'
+import { fsClientAuth, refreshToken } from '@/api'
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -81,6 +81,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(async res => {
+
   // 未设置状态码则默认成功状态
   const code = res.data.code || 200;
   // 获取错误信息
@@ -100,6 +101,10 @@ service.interceptors.response.use(async res => {
       // 重新发送本次失败的请求
       return service(res.config)
     }
+    // PC/移动端刷新 token 有效期
+    // await refreshToken()
+    // return service(res.config)
+
     if (!isRelogin.show) {
       isRelogin.show = true;
       ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {