登录修改

3b6eb862 · 郁骅焌 · f0c41576 · 3b6eb862 · 3b6eb862 · 3b6eb862
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
 import { login, logout, getInfo } from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import { isHttp, isEmpty } from "@/utils/validate"
 import defAva from '@/assets/images/profile.jpg'
 const user = {
  state: {
    token: getToken(),
    id: '',
    name: '',
    avatar: '',
    roles: [],
    permissions: []
  },
  mutations: {
    SET_TOKEN: (state, token) => {
      state.token = token
    },
    SET_ID: (state, id) => {
      state.id = id
    },
    SET_NAME: (state, name) => {
      state.name = name
    },
    SET_AVATAR: (state, avatar) => {
      state.avatar = avatar
    },
    SET_ROLES: (state, roles) => {
      state.roles = roles
    },
    SET_PERMISSIONS: (state, permissions) => {
      state.permissions = permissions
    }
  },
  actions: {
    // 登录
    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) => {
        login(username, password, code, uuid).then(res => {
-          setToken(res.token)
+          const { data } = res
-          commit('SET_TOKEN', res.token)
+          setToken(data.token)
-          resolve()
+          commit('SET_TOKEN', data.token)
-        }).catch(error => {
+          resolve()
-          reject(error)
+        }).catch(error => {
-        })
+          reject(error)
-      })
+        })
-    },
+      })
+    },
-    // 获取用户信息
-    GetInfo({ commit, state }) {
+    // 获取用户信息
-      return new Promise((resolve, reject) => {
+    GetInfo({ commit, state }) {
-        getInfo().then(res => {
+      return new Promise((resolve, reject) => {
-          const user = res.user
+        getInfo().then(res => {
-          let avatar = user.avatar || ""
+          const user = res.user
-          if (!isHttp(avatar)) {
+          let avatar = user.avatar || ""
-            avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
+          if (!isHttp(avatar)) {
-          }
+            avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          }
-            commit('SET_ROLES', res.roles)
+          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_PERMISSIONS', res.permissions)
+            commit('SET_ROLES', res.roles)
-          } else {
+            commit('SET_PERMISSIONS', res.permissions)
-            commit('SET_ROLES', ['ROLE_DEFAULT'])
+          } else {
-          }
+            commit('SET_ROLES', ['ROLE_DEFAULT'])
-          commit('SET_ID', user.userId)
+          }
-          commit('SET_NAME', user.userName)
+          commit('SET_ID', user.userId)
-          commit('SET_AVATAR', avatar)
+          commit('SET_NAME', user.userName)
-          resolve(res)
+          commit('SET_AVATAR', avatar)
-        }).catch(error => {
+          resolve(res)
-          reject(error)
+        }).catch(error => {
-        })
+          reject(error)
-      })
+        })
-    },
+      })
+    },
-    // 退出系统
-    LogOut({ commit, state }) {
+    // 退出系统
-      return new Promise((resolve, reject) => {
+    LogOut({ commit, state }) {
-        logout(state.token).then(() => {
+      return new Promise((resolve, reject) => {
-          commit('SET_TOKEN', '')
+        logout(state.token).then(() => {
-          commit('SET_ROLES', [])
+          commit('SET_TOKEN', '')
-          commit('SET_PERMISSIONS', [])
+          commit('SET_ROLES', [])
-          removeToken()
+          commit('SET_PERMISSIONS', [])
-          resolve()
+          removeToken()
-        }).catch(error => {
+          resolve()
-          reject(error)
+        }).catch(error => {
-        })
+          reject(error)
-      })
+        })
-    },
+      })
+    },
-    // 前端 登出
-    FedLogOut({ commit }) {
+    // 前端 登出
-      return new Promise(resolve => {
+    FedLogOut({ commit }) {
-        commit('SET_TOKEN', '')
+      return new Promise(resolve => {
-        removeToken()
+        commit('SET_TOKEN', '')
-        resolve()
+        removeToken()
-      })
+        resolve()
-    }
+      })
-  }
+    }
-}
+  }
+}
-export default user
+export default user
--- a/vue.config.js
+++ b/vue.config.js
 'use strict'
 const path = require('path')
 function resolve(dir) {
  return path.join(__dirname, dir)
 }
 const CompressionPlugin = require('compression-webpack-plugin')
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
 // 这里只列一部分，具体配置参考文档
 module.exports = {
  // 部署生产环境和开发环境下的URL。
  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
  outputDir: 'dist',
  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
  assetsDir: 'static',
  // 是否开启eslint保存检测，有效值：ture | false | 'error'
  lintOnSave: process.env.NODE_ENV === 'development',
  // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
  productionSourceMap: false,
  transpileDependencies: ['quill'],
  // webpack-dev-server 相关配置
  devServer: {
    host: '0.0.0.0',
    port: port,
    open: true,
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://139.196.169.103:9003`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''
        }
      }
    },
    disableHostCheck: true
  },
  css: {
    loaderOptions: {
      sass: {
        sassOptions: { outputStyle: "expanded" }
      }
    }
  },
  configureWebpack: {
    name: name,
    resolve: {
      alias: {
        '@': resolve('src')
      }
    },
    plugins: [
      // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
      new CompressionPlugin({
        cache: false,                                  // 不启用文件缓存
        test: /\.(js|css|html|jpe?g|png|gif|svg)?$/i,  // 压缩文件格式
        filename: '[path][base].gz[query]',            // 压缩后的文件名
        algorithm: 'gzip',                             // 使用gzip压缩
        minRatio: 0.8,                                 // 压缩比例，小于 80% 的文件不会被压缩
        deleteOriginalAssets: false                    // 压缩后删除原文件
      })
    ],
  },
  chainWebpack(config) {
    config.plugins.delete('preload') // TODO: need test
    config.plugins.delete('prefetch') // TODO: need test
    // set svg-sprite-loader
    config.module
      .rule('svg')
      .exclude.add(resolve('src/assets/icons'))
      .end()
    config.module
      .rule('icons')
      .test(/\.svg$/)
      .include.add(resolve('src/assets/icons'))
      .end()
      .use('svg-sprite-loader')
      .loader('svg-sprite-loader')
      .options({
        symbolId: 'icon-[name]'
      })
      .end()
    config.when(process.env.NODE_ENV !== 'development', config => {
          config
            .plugin('ScriptExtHtmlWebpackPlugin')
            .after('html')
            .use('script-ext-html-webpack-plugin', [{
            // `runtime` must same as runtimeChunk name. default is `runtime`
              inline: /runtime\..*\.js$/
            }])
            .end()
          config.optimization.splitChunks({
            chunks: 'all',
            cacheGroups: {
              libs: {
                name: 'chunk-libs',
                test: /[\\/]node_modules[\\/]/,
                priority: 10,
                chunks: 'initial' // only package third parties that are initially dependent
              },
              elementUI: {
                name: 'chunk-elementUI', // split elementUI into a single package
                test: /[\\/]node_modules[\\/]_?element-ui(.*)/, // in order to adapt to cnpm
                priority: 20 // the weight needs to be larger than libs and app or it will be packaged into libs or app
              },
              commons: {
                name: 'chunk-commons',
                test: resolve('src/components'), // can customize your rules
                minChunks: 3, //  minimum common number
                priority: 5,
                reuseExistingChunk: true
              }
            }
          })
          config.optimization.runtimeChunk('single')
    })
  }
 }