更新

vue/src/store/modules/user.js

@@ -1,6 +1,5 @@
-import {login, logout, getInfo, bindLogin, bindRegister, redirectLogin} from '@/api/login'
-import {bindUser} from '@/api/iot/platform'
-import {getToken, setToken, removeToken} from '@/utils/auth'
+import { login, logout, getInfo } from '@/api/login';
+import { getToken, setToken, removeToken, setUserId, removeUserId } from '@/utils/auth';
 
 const user = {
   state: {
@@ -8,127 +7,103 @@ const user = {
     name: '',
     avatar: '',
     roles: [],
-    permissions: []
+    permissions: [],
   },
 
   mutations: {
     SET_TOKEN: (state, token) => {
-      state.token = token
+      state.token = token;
     },
     SET_NAME: (state, name) => {
-      state.name = name
-    },
-    SET_USERID: (state, userId) => {
-      state.userId = userId
+      state.name = name;
     },
     SET_AVATAR: (state, avatar) => {
-      state.avatar = avatar
+      state.avatar = avatar;
     },
     SET_ROLES: (state, roles) => {
-      state.roles = roles
+      state.roles = roles;
     },
     SET_PERMISSIONS: (state, permissions) => {
-      state.permissions = permissions
-    }
+      state.permissions = permissions;
+    },
+    SET_MQTT: (state, mqtt) => {
+      state.mqtt = mqtt;
+    },
   },
 
   actions: {
     // 登录
-    Login({commit}, userInfo) {
-      const username = userInfo.username.trim()
-      const password = userInfo.password
-      const code = userInfo.code
-      const uuid = userInfo.uuid
-      const bindId = userInfo.bindId;
+    Login({ commit }, userInfo) {
+      const username = userInfo.username.trim();
+      const password = userInfo.password;
+      const code = userInfo.code;
+      const uuid = userInfo.uuid;
       return new Promise((resolve, reject) => {
-        if (bindId === undefined || bindId === "") {
-          login(username, password, code, uuid).then(res => {
-            setToken(res.token)
-            commit('SET_TOKEN', res.token)
-            resolve()
-          }).catch(error => {
-            reject(error)
+        login(username, password, code, uuid)
+          .then((res) => {
+            setToken(res.token);
+            commit('SET_TOKEN', res.token);
+            resolve();
           })
-        } else {
-          bindLogin(username, password, code, uuid, bindId).then(res => {
-            setToken(res.token)
-            commit('SET_TOKEN', res.token)
-            resolve()
-          }).catch(error => {
-            reject(error)
-          })
-        }
-      })
-    },
-
-    RedirectLogin({commit}, loginId) {
-      return new Promise((resolve, reject) => {
-        redirectLogin(loginId).then(res => {
-          setToken(res.token)
-          commit('SET_TOKEN', res.token)
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
-    },
-
-    BindUser({commit}, bindId) {
-      return new Promise((resolve, reject) => {
-        bindUser(bindId).then(res => {
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 获取用户信息
-    GetInfo({commit, state}) {
+    GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo().then(res => {
-          const user = res.user
-          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
-          } else {
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          }
-          commit('SET_NAME', user.userName)
-          commit('SET_AVATAR', avatar)
-          commit('SET_USERID', user.userId)
-          resolve(res)
-        }).catch(error => {
-          reject(error)
-        })
-      })
+        getInfo()
+          .then((res) => {
+            const user = res.user;
+            const avatar = user.avatar === '' || user.avatar == null ? require('@/assets/images/profile.jpg') : process.env.VUE_APP_BASE_API + user.avatar;
+            if (res.roles && res.roles.length > 0) {
+              // 验证返回的roles是否是一个非空数组
+              commit('SET_ROLES', res.roles);
+              commit('SET_PERMISSIONS', res.permissions);
+            } else {
+              commit('SET_ROLES', ['ROLE_DEFAULT']);
+            }
+            commit('SET_NAME', user.userName);
+            commit('SET_AVATAR', avatar);
+            commit('SET_MQTT', res.mqtt);
+            setUserId(user.userId);
+            resolve(res);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 退出系统
-    LogOut({commit, state}) {
+    LogOut({ commit, state }) {
       return new Promise((resolve, reject) => {
-        logout(state.token).then(() => {
-          commit('SET_TOKEN', '')
-          commit('SET_ROLES', [])
-          commit('SET_PERMISSIONS', [])
-          removeToken()
-          resolve()
-        }).catch(error => {
-          reject(error)
-        })
-      })
+        logout(state.token)
+          .then(() => {
+            commit('SET_TOKEN', '');
+            commit('SET_ROLES', []);
+            commit('SET_PERMISSIONS', []);
+            removeToken();
+            removeUserId();
+            resolve();
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
     },
 
     // 前端 登出
-    FedLogOut({commit}) {
-      return new Promise(resolve => {
-        commit('SET_TOKEN', '')
-        removeToken()
-        resolve()
-      })
-    }
-  }
-}
+    FedLogOut({ commit }) {
+      return new Promise((resolve) => {
+        commit('SET_TOKEN', '');
+        removeToken();
+        resolve();
+      });
+    },
+  },
+};
 
-export default user
+export default user;