liuyg
2021-07-17 398a2b8433870adebda2f0e3cc0f675096d4153b
开发免登入按钮
3 files modified
86 ■■■■ changed files
src/permission.js 77 ●●●● patch | view | raw | blame | history
src/store/modules/user.js 4 ●●● patch | view | raw | blame | history
vue.config.js 5 ●●●●● patch | view | raw | blame | history
src/permission.js
@@ -2,15 +2,17 @@
 * 全站权限配置
 *
 */
import router from './router/router'
import store from './store'
import md5 from 'js-md5'
import request from '@/router/axios';
import { Message } from 'element-ui'
import router from './router/router'
import store from './store'
import { validatenull } from '@/util/validate'
import { getToken } from '@/util/auth'
import NProgress from 'nprogress' // progress bar
import 'nprogress/nprogress.css' // progress bar style
import cons from 'consolidate';
NProgress.configure({ showSpinner: false });
const lockPage = store.getters.website.lockPage; //锁屏页
router.beforeEach((to, from, next) => {
@@ -60,18 +62,18 @@
    if (meta.isAuth === false) {
      next()
    } else {
      console.log(to, from);
      // console.log(to, from);
      next();
      if (to.path == '/wel') {
        var a = to.query.main;
        var a = to.query.securitySupervisionSystem;
        if (typeof a == "string") {
          console.log(to.query.main, 'main');
          console.log("有main");
          console.log(to.query.securitySupervisionSystem, 'securitySupervisionSystem');
          // console.log("有main");
          var obj = JSON.parse(a);
          console.log(obj, "obj");
          if (typeof obj == "object" && obj) {
            console.log("自动登入");
            // console.log("自动登入");
            var data = {
              tenantId: obj.data.dip,
              username: obj.data.rese,
@@ -80,41 +82,34 @@
              scope: 'all',
              type: 'account'
            };
            console.log(data, "自动ssss");
            // request({
            //   url: '/api/blade-auth/oauth/token',
            //   method: 'post',
            //   headers: {
            //     'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
            //     "Tenant-Id": "000000"
            //   },
            //   params: data
            // }).then(res => {
            //   console.log(res, 'res')
            // })
            // this.loginForm.username = obj.data.rese;
            // this.loginForm.password = obj.data.admin;
            // this.loginForm.tenantId = obj.data.dip;
            // console.log(this.loginForm1·);
            // const loading = this.$loading({
            //   lock: true,
            //   text: "登录中,请稍后。。。",
            //   spinner: "el-icon-loading",
            // });
            // this.$store
            //   .dispatch("LoginByUsername", data)
            //   .then(() => {
            //     this.$router.push({ path: "/wel" });
            //     loading.close();
            //   })
            //   .catch(() => {
            //     loading.close();
            //     this.refreshCode();
            //   });
            // console.log(data, "自动ssss");
            request({
              url: 'http://192.168.109:80/blade-auth/oauth/token',
              method: 'post',
              headers: {
                'Authorization': 'Basic c2FiZXI6c2FiZXJfc2VjcmV0',
                "Tenant-Id": "000000"
              },
              params: data
            }).then(res => {
              const data = res.data;
              if (data.error_description) {
                Message({
                  message: data.error_description,
                  type: 'error'
                })
              } else {
                store.commit('SET_TOKEN', data.access_token);
                store.commit('SET_REFRESH_TOKEN', data.refresh_token);
                store.commit('SET_TENANT_ID', data.tenant_id);
                store.commit('SET_USER_INFO', data);
                store.commit('DEL_ALL_TAG');
                store.commit('CLEAR_LOCK');
              }
            })
            return true;
          } else {
            console.log("手动登入main不是JSON对象");
            // console.log("手动登入main不是JSON对象");
            return false;
          }
src/store/modules/user.js
@@ -49,8 +49,9 @@
    LoginByUsername({ commit }, userInfo) {
      return new Promise((resolve, reject) => {
        loginByUsername(userInfo.tenantId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, userInfo.code).then(res => {
          console.log(res, 'res');
          const data = res.data;
          console.log(data, '获取到token');
          console.log(data, 'data');
          if (data.error_description) {
            Message({
              message: data.error_description,
@@ -63,6 +64,7 @@
            commit('SET_USER_INFO', data);
            commit('DEL_ALL_TAG');
            commit('CLEAR_LOCK');
            console.log(data.access_token, data.refresh_toke, data.tenant_id, data, 'usedatas');
          }
          resolve();
        }).catch(error => {
vue.config.js
@@ -27,10 +27,9 @@
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://192.168.0.104',
        target: 'http://192.168.109:80',
        // target: 'http://192.168.0.109:1',
        //远程演示服务地址,可用于直接启动项目
        // target: 'http://2h3f861221.wicp.vip:58646',
        target: 'http://2h3f861221.wicp.vip:58646',
        ws: true,
        pathRewrite: {
          '^/api': '/'