From 85996acf714fcc826c35ef4967d0cd0791f156e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 28 Jun 2022 14:17:44 +0800
Subject: [PATCH] up

---
 src/api/user.js                         |  9 +++++++
 src/layout/components/Sidebar/index.vue |  1 -
 src/settings.js                         |  2 +-
 src/store/modules/user.js               | 31 ++++++++++++++++++++++-
 src/utils/auth.js                       | 33 ++++++++++++++++---------
 src/views/login/index.vue               | 17 +++++++++++++
 vue.config.js                           |  4 +--
 7 files changed, 80 insertions(+), 17 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index e12d073..ba40eb1 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -8,6 +8,15 @@ export function login(data) {
   })
 }
 
+
+export function loginOss(data) {
+  return request({
+    url: '/api/admin/auth/oss-login',
+    method: 'post',
+    data
+  })
+}
+
 export function getInfo(token) {
   return request({
     url: '/api/admin/auth/me',
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 2695834..59b28da 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -9,7 +9,6 @@
 
       </el-menu>
     </el-scrollbar>
-    <el-tag @click="logout()">退出</el-tag>
     <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
   </div>
diff --git a/src/settings.js b/src/settings.js
index bcea8ab..0c82169 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -12,5 +12,5 @@ module.exports = {
    * @type {boolean} true | false
    * @description Whether show the logo in sidebar
    */
-  sidebarLogo: true
+  sidebarLogo: false
 }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c288974..383c7d7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,7 +1,8 @@
 import {
   login,
   logout,
-  getInfo
+  getInfo,
+  loginOss
 } from '@/api/user'
 import {
   getToken,
@@ -42,6 +43,34 @@ const mutations = {
 }
 
 const actions = {
+  loginskip({
+    commit
+  }, userInfo) {
+    const {
+      token,
+      tp
+    } = userInfo
+
+    return new Promise((resolve, reject) => {
+      loginOss({
+        token: token,
+        tp: tp
+      }).then(response => {
+
+        //console.log(response)
+        
+        const {
+          data
+        } = response;
+        console.log(response.access_token)
+        commit('SET_TOKEN', response.access_token)
+        setToken(response.access_token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
   // user login
   login({
     commit
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 21900ef..4c4f315 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,15 +1,24 @@
 import Cookies from 'js-cookie'
 
 const TokenKey = 'XunChaYanghu_token'
-
-export function getToken() {
-  return Cookies.get(TokenKey)
-}
-
-export function setToken(token) {
-  return Cookies.set(TokenKey, token)
-}
-
-export function removeToken() {
-  return Cookies.remove(TokenKey)
-}
+
+export function getToken() {
+  //return Cookies.get(TokenKey)
+
+  if (Cookies.get(TokenKey)) {
+    return Cookies.get(TokenKey)
+  } else {
+    return sessionStorage.getItem(TokenKey);
+  }
+}
+
+export function setToken(token) {
+  sessionStorage.setItem(TokenKey, token);
+  return Cookies.set(TokenKey, token)
+}
+
+export function removeToken() {
+  sessionStorage.clear();
+  return Cookies.remove(TokenKey)
+
+}
\ No newline at end of file
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 4898c00..3f37148 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -84,6 +84,23 @@
         },
         immediate: true
       }
+    },created() {
+      var query = this.$route.query;
+      if (query.token && query.userid && query.tp) {
+        this.loading = true
+        this.$store.dispatch('user/loginskip', {
+          token: query.token,
+          tp: query.tp
+        }).then(() => {
+          this.$router.push({
+            path: "/"
+          })
+          this.loading = false
+        }).catch((error) => {
+          console.log(error)
+          this.loading = false
+        })
+      }
     },
     methods: {
       showPwd() {
diff --git a/vue.config.js b/vue.config.js
index ba0bf49..8f6bab5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -46,8 +46,8 @@ module.exports = {
     //before: require('./mock/mock-server.js')
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        //target: 'http://192.168.60.100:9001/',
-        target: 'http://patrol.115.langye.net/',
+        target: 'http://192.168.60.100:9001/',
+        //target: 'http://patrol.115.langye.net/',
         changeOrigin: true, //配置跨域
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''