diff --git a/src/permission.js b/src/permission.js
index 7816c64..74371d4 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,10 +40,17 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
+      debugger
+      const token = to.query.sid
+      console.log('==============')
+      console.log(to.query.sid)
       // 直接调用登录接口
-      store.dispatch('AppLogin').then(() => {
+      store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        next()
+        console.log(getToken())
+        alert(getToken())
+        next({ path: '/' })
+        // next()
       }).catch(() => {
         Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页

diff --git a/src/permission.js b/src/permission.js
index 7816c64..74371d4 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -40,10 +40,17 @@
     if (whiteList.indexOf(to.path) !== -1) { // 免登录白名单，直接进入
       next()
     } else {
+      debugger
+      const token = to.query.sid
+      console.log('==============')
+      console.log(to.query.sid)
       // 直接调用登录接口
-      store.dispatch('AppLogin').then(() => {
+      store.dispatch('AppLogin', token).then(() => {
         Message.success('自动登录成功')
-        next()
+        console.log(getToken())
+        alert(getToken())
+        next({ path: '/' })
+        // next()
       }).catch(() => {
         Message.error('自动登录失败')
         next(`/login`) // 否则全部重定向到登录页
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 8ff9a57..bb8eaa0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -76,20 +76,28 @@
       })
     },
     // 登录
-    AppLogin({ commit }, userInfo) {
+    AppLogin({ commit }, token) {
       return new Promise((resolve, reject) => {
-        applogin(userInfo).then(response => {
-          if (response.code === 200) {
-            const data = response.data
-            setToken(data.token)
-            commit('SET_TOKEN', data.token)
-            resolve()
-          } else {
-            reject(response.message)
-          }
-        }).catch(error => {
-          reject(error)
-        })
+        if (token) {
+          debugger
+          setToken(token)
+          commit('SET_TOKEN', token)
+          resolve()
+        } else {
+          window.location.href = 'http://10.18.0.50:8086/platform-sso-server/login?service=' + process.env.BASE_API + '/app/caslogin'
+          // applogin().then(response => {
+          //   if (response.code === 200) {
+          //     const data = response.data
+          //     setToken(data.token)
+          //     commit('SET_TOKEN', data.token)
+          //     resolve()
+          //   } else {
+          //     reject(response.message)
+          //   }
+          // }).catch(error => {
+          //   reject(error)
+          // })
+        }
       })
     },
     // 获取用户信息