11

src/api/user.js

@@ -1,30 +1,36 @@
 import request from '@/utils/request'
 // eslint-disable-next-line no-unused-vars
 import qs from 'qs'
-
+let tokens = window.sessionStorage.getItem('tokenValue')
 // 登录
 export function doLogin(data) {
     return request({
         url: '/sysuser/doLogin',
         method: 'post',
         data: data,
-    headers: { 'Content-Type': 'application/json' }
+        headers: {
+            'Content-Type': 'application/json',
+            'token': tokens
+        }
     })
 }
 // 获取登录人员信息
- export function getUserById(sid) {
+export function getUserById(sid) {
     return request({
         url: '/cyf/sys/getUserById/' + sid
     })
 
- } 
+}
 // 登录
 export function login(data) {
     return request({
         url: '/portal/v1/sysuser/login',
         method: 'post',
         data: data,
-    headers: { 'Content-Type': 'application/json' }
+        headers: {
+            'Content-Type': 'application/json',
+            'token': tokens
+        }
     })
 }
 
@@ -34,7 +40,10 @@ export function registUser(data) {
         url: '/system/user/save',
         method: 'post',
         data,
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded;' }
+        headers: {
+            'Content-Type': 'application/json',
+            'token': tokens
+        }
     })
 }
 
@@ -65,8 +74,12 @@ export function getInfo(token) {
 
 export function logout(data) { // 退出
     return request({
-    url: '/portal/v1/sysuser/signOut',
-    method: 'post',
-    data: qs.stringify(data)
+        url: '/sysuser/signOut',
+        method: 'get',
+        params: data,
+        headers: {
+            'Content-Type': 'application/json',
+            'token': tokens
+        }
     })
 }

src/layout/components/Navbar.vue

@@ -18,6 +18,9 @@
 </template>
 
 <script>
+    import {
+        logout,
+    } from '@/api/user.js'
     export default {
         data() {
             return {
@@ -37,10 +40,23 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(() => {
-                    // this.$store.commit('user/SET_UESRINFO', '')
+
+                    var params = {
+                        loginId: window.sessionStorage.getItem('loginId')
+                    }
+
+                    logout(params).then((response) => {
+
+                        if (response.success) {
+                            window.sessionStorage.clear()
                             this.$router.push({
                                 path: '/login'
                             })
+                            // location.reload()
+                        }
+                    })
+
+
                 })
             },
         }

src/utils/auth.js

@@ -1,14 +1,17 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'token'
-const sessionKey = 'token'
+const TokenKey = 'tokenName'
+const sessionKey = 'tokenValue'
 
 export function getToken() {
     return Cookies.get(TokenKey)
 }
 
 export function setToken(token) {
-  return Cookies.set(TokenKey, token, { expires: 7, path: '/' })
+    return Cookies.set(TokenKey, token, {
+        expires: 7,
+        path: '/'
+    })
 }
 
 export function removeToken() {
@@ -16,12 +19,12 @@ export function removeToken() {
 }
 
 export function getStorage() {
-  return sessionStorage.getItem('token')
+    return sessionStorage.getItem('tokenName')
     // return 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyTm8iOiI0MjdhMmZiMC02MGM1LTQwOWYtYmVhNC00ZWI0NDEwNDFhZTYiLCJpc3MiOiJXQksiLCJleHAiOjE2NzQ2NzU5Mzl9.1P6VgCk3sXxWkl1364y7xhfc4ifdg6uGkzkF6uEmhIo'
 }
 
 export function setStorage(session) {
-  return sessionStorage.setItem('token', session)
+    return sessionStorage.setItem('tokenName', session)
 }
 
 export function setDefaultOrgPathName(data) {
@@ -33,5 +36,5 @@ export function setDefaultOrgPath(data) {
 }
 
 export function removeStorage() {
-  return sessionStorage.removeItem('token')
+    return sessionStorage.removeItem('tokenName')
 }

src/views/index.vue

@@ -6,36 +6,38 @@
 </template>
 
 <script>
-	import {login1} from '@/api/system/user/login.js'
+    import {
+        login1
+    } from '@/api/system/user/login.js'
     export default {
         name: '',
         data() {
             return {
-      	token1:'',
-      	token2:''
+                token1: '',
+                token2: ''
             }
 
         },
         created() {
-        this.token1 = window.sessionStorage.getItem('tokenName');
-        this.token2 = window.sessionStorage.getItem('tokenValue');
-        console.log("tokenName2222", this.token1)
-        console.log("tokenValue222222", this.token2)
+            // this.token1 = window.sessionStorage.getItem('tokenName');
+            // this.token2 = window.sessionStorage.getItem('tokenValue');
+            // console.log("tokenName2222", this.token1)
+            // console.log("tokenValue222222", this.token2)
         },
-    methods:{
-//  	getToken(){
-//  		let params = {
-//  			password: "329653",
-//					roleSid: "",
-//					token: "",
-//					userName: "15097329653",
-//					verifyCode: ""
-//  		}
-//  		login1(params).then(res => {
-//  			this.token = res.data.token
-//  			window.sessionStorage.setItem('token', res.data.token)
-//        })
-//  	}
+        methods: {
+            //  	getToken(){
+            //  		let params = {
+            //  			password: "329653",
+            //					roleSid: "",
+            //					token: "",
+            //					userName: "15097329653",
+            //					verifyCode: ""
+            //  		}
+            //  		login1(params).then(res => {
+            //  			this.token = res.data.token
+            //  			window.sessionStorage.setItem('token', res.data.token)
+            //        })
+            //  	}
         }
     }
 </script>
@@ -44,8 +46,8 @@
     .imgDemo {
         width: 100%;
         height: 100%;
-    background: radial-gradient(#fff,#f5f7f4, #fff);
-  }
-  canvas {
+        background: radial-gradient(#fff, #f5f7f4, #fff);
     }
+
+    canvas {}
 </style>

src/views/login/login.vue

@@ -10,12 +10,13 @@
                 <el-form ref="loginForm" :model="loginForm" class="login-form">
                     <h3 class="title1">用户登录</h3>
                     <el-form-item>
-            <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号" prefix-icon="el-icon-user">
+                        <el-input v-model="loginForm.userName" autocomplete="off" placeholder="请输入账号"
+                            prefix-icon="el-icon-user">
                         </el-input>
                     </el-form-item>
                     <el-form-item>
-            <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码" prefix-icon="el-icon-lock"
-              show-password>
+                        <el-input v-model="loginForm.password" autocomplete="off" placeholder="请输入密码"
+                            prefix-icon="el-icon-lock" show-password>
                         </el-input>
                         <!-- <span class="nopsw register" @click="forgetPwd = true">忘记密码 ？</span> -->
                     </el-form-item>
@@ -99,8 +100,8 @@
                         })
                         this.loading = true
                         // this.getUserInfo(response.data.loginId)
-            window.sessionStorage.setItem('tokenName', response.data.tokenName)
-            window.sessionStorage.setItem('tokenValue', response.data.tokenValue)
+                        window.sessionStorage.setItem('tokenName', response.data.tokenValue)
+                        window.sessionStorage.setItem('loginId', response.data.loginId)
                     }
 
                 }).catch(() => {
@@ -119,8 +120,7 @@
                         window.sessionStorage.setItem('userName', user.userName)
                     }
 
-        }).catch(() => {
-        })
+                }).catch(() => {})
 
             },
             codeShow() {
@@ -179,7 +179,7 @@
             border-radius: 20px;
             position: absolute;
             right: 15%;
-	  top:35%;
+            top: 35%;
 
             .content {
                 position: relative;