Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/App.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: hisense.wuhongjian
+ * @Date: 2022-06-14 09:30:22
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-11 11:06:48
+ * @Description: 告诉大家这是什么
+-->
 <template>
   <transition name="el-fade-in-linear">
     <router-view />

back/src/utils/request.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2022-05-11 20:03:41
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-06-06 13:08:06
+ * @LastEditTime: 2022-11-11 11:07:09
  * @Description: 告诉大家这是什么
  */
 import axios from 'axios'
@@ -102,7 +102,7 @@ http.interceptors.response.use(
     response['Access-Control-Expose-Headers'] = 'redirect'
     const { code, message } = response.data
     if (response.headers.token) {
-      Cookies.set('ucsToken', response.headers.token)
+      Cookies.set('ucsToken', response.headers.token, { expires: 'session' })
     }
     if (response.headers.redirect) {
       window.location.href = response.headers.redirect

back/src/views/pages/login.vue

@@ -115,7 +115,7 @@ export default {
             this.getCaptcha()
             return this.$message.error(res.msg)
           }
-          Cookies.set('ucsToken', res.data.token)
+          Cookies.set('ucsToken', res.data.token, { expires: 'session' })
           this.$router.replace({ path: '/home' })
         }).catch(() => {})
       })

front/public/static/config/basicConfig.js

@@ -2,7 +2,7 @@
  * @Author: hisense.wuhongjian
  * @Date: 2020-07-07 16:03:23
  * @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-27 16:04:46
+ * @LastEditTime: 2022-11-11 19:21:42
  * @Description: 系统静态参数配置
  */
 var _global = {}

front/src/views/personalCenter/components/MyApply.vue

@@ -719,18 +719,16 @@
         }
       )
     } else if (typeName.value == '云资源申请') {
-      getResourceBusinessList({ userAccount: 'qdsdzzwbgsxtaqglc' }).then(
-        (res) => {
+      getResourceBusinessList({ userAccount: userName.value }).then((res) => {
         console.log('数据资源申请===============>', res.data.data)
         contentList.data = res.data.data
         contentList2.data = res.data.data
         num.value = []
         total.value = 0
         showType.value = '云资源'
-        }
-      )
+      })
     } else if (typeName.value == '云视频申请') {
-      getVideoBusinessList({ userAccount: 'zfcxjsjkjc' }).then((res) => {
+      getVideoBusinessList({ userAccount: userName.value }).then((res) => {
         console.log('数据资源申请===============>', res.data.data)
         contentList.data = res.data.data
         contentList2.data = res.data.data