安全证书功能完善

2024-12-10 14:02:08 +08:00 · 2024-12-10 14:02:08 +08:00 · d36ec65fed
parent 6e1893f596
commit d36ec65fed
6 changed files with 198 additions and 136 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -9,6 +9,7 @@
 import ThemePicker from "@/components/ThemePicker";
 import { mapActions } from "vuex";
 import { get } from "@/utils/config";
+import { setToken } from "@/utils/auth";

 // import AlertNotification from "@/views/warning/AlertNotification.vue";

@ -17,6 +18,13 @@ export default {
  components: { ThemePicker },
  created() {
    get();
+    const originHref = window.location.href;
+    console.log(originHref, "originHref----");
+    if (originHref.indexOf("token") !== -1) {
+      const token = originHref.split("token");
+      setToken(token[1].slice(1));
+      this.$router.push({ path: "/" });
+    }
  },
  metaInfo() {
    return {
--- a/src/permission.js
+++ b/src/permission.js
@ -50,7 +50,7 @@ router.beforeEach((to, from, next) => {
      // 在免登录白名单，直接进入
      next();
    } else {
-      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
+      next(`/glweb/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
      NProgress.done();
    }
  }
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,10 +1,10 @@
-import Vue from 'vue'
-import Router from 'vue-router'
+import Vue from "vue";
+import Router from "vue-router";

-Vue.use(Router)
+Vue.use(Router);

 /* Layout */
-import Layout from '@/layout'
+import Layout from "@/layout";

 /**
 * Note: 路由配置项
@ -31,158 +31,159 @@ import Layout from '@/layout'
 // 公共路由
 export const constantRoutes = [
  {
-    path: '/redirect',
+    path: "/redirect",
    component: Layout,
    hidden: true,
    children: [
      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
-      }
-    ]
+        path: "/redirect/:path(.*)",
+        component: () => import("@/views/redirect"),
+      },
+    ],
  },
  {
-    path: '/login',
-    component: () => import('@/views/login1'),
-    hidden: true
+    path: "/login",
+    component: () => import("@/views/login1"),
+    hidden: true,
  },
  {
-    path: '/register',
-    component: () => import('@/views/register1'),
-    hidden: true
+    path: "/register",
+    component: () => import("@/views/register1"),
+    hidden: true,
  },
  {
-    path: '/404',
-    component: () => import('@/views/error/404'),
-    hidden: true
+    path: "/404",
+    component: () => import("@/views/error/404"),
+    hidden: true,
  },
  {
-    path: '/401',
-    component: () => import('@/views/error/401'),
-    hidden: true
+    path: "/401",
+    component: () => import("@/views/error/401"),
+    hidden: true,
  },
  {
-    path: '',
+    path: "",
    component: Layout,
-    redirect: 'index',
+    redirect: "index",
    children: [
      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
-      }
-    ]
+        path: "index",
+        component: () => import("@/views/index"),
+        name: "Index",
+        meta: { title: "首页", icon: "dashboard", affix: true },
+      },
+    ],
  },
  {
-    path: '/qrCode/qrCodePage',
-    component: () => import('@/views/qrCode/qrCode'),
-    hidden: true
+    path: "/qrCode/qrCodePage",
+    component: () => import("@/views/qrCode/qrCode"),
+    hidden: true,
  },
  {
-    path: '/user',
+    path: "/user",
    component: Layout,
    hidden: true,
-    redirect: 'noredirect',
+    redirect: "noredirect",
    children: [
      {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
-      }
-    ]
-  }
-]
+        path: "profile",
+        component: () => import("@/views/system/user/profile/index"),
+        name: "Profile",
+        meta: { title: "个人中心", icon: "user" },
+      },
+    ],
+  },
+];

 // 动态路由，基于用户权限动态去加载
 export const dynamicRoutes = [
  {
-    path: '/system/user-auth',
+    path: "/system/user-auth",
    component: Layout,
    hidden: true,
-    permissions: ['system:user:edit'],
+    permissions: ["system:user:edit"],
    children: [
      {
-        path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
-      }
-    ]
+        path: "role/:userId(\\d+)",
+        component: () => import("@/views/system/user/authRole"),
+        name: "AuthRole",
+        meta: { title: "分配角色", activeMenu: "/system/user" },
+      },
+    ],
  },
  {
-    path: '/system/role-auth',
+    path: "/system/role-auth",
    component: Layout,
    hidden: true,
-    permissions: ['system:role:edit'],
+    permissions: ["system:role:edit"],
    children: [
      {
-        path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
-      }
-    ]
+        path: "user/:roleId(\\d+)",
+        component: () => import("@/views/system/role/authUser"),
+        name: "AuthUser",
+        meta: { title: "分配用户", activeMenu: "/system/role" },
+      },
+    ],
  },
  {
-    path: '/system/dict-data',
+    path: "/system/dict-data",
    component: Layout,
    hidden: true,
-    permissions: ['system:dict:list'],
+    permissions: ["system:dict:list"],
    children: [
      {
-        path: 'index/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
-      }
-    ]
+        path: "index/:dictId(\\d+)",
+        component: () => import("@/views/system/dict/data"),
+        name: "Data",
+        meta: { title: "字典数据", activeMenu: "/system/dict" },
+      },
+    ],
  },
  {
-    path: '/monitor/job-log',
+    path: "/monitor/job-log",
    component: Layout,
    hidden: true,
-    permissions: ['monitor:job:list'],
+    permissions: ["monitor:job:list"],
    children: [
      {
-        path: 'index/:jobId(\\d+)',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
-      }
-    ]
+        path: "index/:jobId(\\d+)",
+        component: () => import("@/views/monitor/job/log"),
+        name: "JobLog",
+        meta: { title: "调度日志", activeMenu: "/monitor/job" },
+      },
+    ],
  },
  {
-    path: '/tool/gen-edit',
+    path: "/tool/gen-edit",
    component: Layout,
    hidden: true,
-    permissions: ['tool:gen:edit'],
+    permissions: ["tool:gen:edit"],
    children: [
      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  }
-]
+        path: "index/:tableId(\\d+)",
+        component: () => import("@/views/tool/gen/editTable"),
+        name: "GenEdit",
+        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
+      },
+    ],
+  },
+];

 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
 let routerReplace = Router.prototype.replace;
 // push
 Router.prototype.push = function push(location) {
-  return routerPush.call(this, location).catch(err => err)
-}
+  return routerPush.call(this, location).catch((err) => err);
+};
 // replace
 Router.prototype.replace = function push(location) {
-  return routerReplace.call(this, location).catch(err => err)
-}
+  return routerReplace.call(this, location).catch((err) => err);
+};

 export default new Router({
-  mode: 'history', // 去掉url中的#
+  mode: "history", // 去掉url中的#
  scrollBehavior: () => ({ y: 0 }),
-  routes: constantRoutes
-})
+  routes: constantRoutes,
+  base: "/glweb",
+});
--- a/src/utils/config.js
+++ b/src/utils/config.js
@ -1,11 +1,11 @@
-import { getConfig } from '@/api/config';
+import { getConfig } from "@/api/config";
 export function get() {
  getConfig()
-    .then(response => {
-      console.log(response)
-      localStorage.setItem('systemConfig', JSON.stringify(response.data));
+    .then((response) => {
+      console.log(response);
+      localStorage.setItem("systemConfig", JSON.stringify(response.data));
    })
-    .catch(error => {
-      console.error('Failed to fetch config:', error);
+    .catch((error) => {
+      console.error("Failed to fetch config:", error);
    });
 }
--- a/src/views/register.vue
+++ b/src/views/register.vue
@ -1,10 +1,24 @@
 <template>
  <div class="register">
-    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
+    <el-form
+      ref="registerForm"
+      :model="registerForm"
+      :rules="registerRules"
+      class="register-form"
+    >
      <h3 class="title">安徽机械化施工装备平台</h3>
      <el-form-item prop="username">
-        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
-          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        <el-input
+          v-model="registerForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+        >
+          <svg-icon
+            slot="prefix"
+            icon-class="user"
+            class="el-input__icon input-icon"
+          />
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
@ -15,7 +29,11 @@
          placeholder="密码"
          @keyup.enter.native="handleRegister"
        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
        </el-input>
      </el-form-item>
      <el-form-item prop="confirmPassword">
@ -26,7 +44,11 @@
          placeholder="确认密码"
          @keyup.enter.native="handleRegister"
        >
-          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="password"
+            class="el-input__icon input-icon"
+          />
        </el-input>
      </el-form-item>
      <el-form-item prop="code" v-if="captchaEnabled">
@ -37,25 +59,31 @@
          style="width: 63%"
          @keyup.enter.native="handleRegister"
        >
-          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+          <svg-icon
+            slot="prefix"
+            icon-class="validCode"
+            class="el-input__icon input-icon"
+          />
        </el-input>
        <div class="register-code">
-          <img :src="codeUrl" @click="getCode" class="register-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="register-code-img" />
        </div>
      </el-form-item>
-      <el-form-item style="width:100%;">
+      <el-form-item style="width: 100%">
        <el-button
          :loading="loading"
          size="medium"
          type="primary"
-          style="width:100%;"
+          style="width: 100%"
          @click.native.prevent="handleRegister"
        >
          <span v-if="!loading">注 册</span>
          <span v-else>注 册 中...</span>
        </el-button>
-        <div style="float: right;">
-          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+        <div style="float: right">
+          <router-link class="link-type" :to="'/glweb/login'"
+            >使用已有账户登录</router-link
+          >
        </div>
      </el-form-item>
    </el-form>
@ -86,26 +114,40 @@ export default {
        password: "",
        confirmPassword: "",
        code: "",
-        uuid: ""
+        uuid: "",
      },
      registerRules: {
        username: [
          { required: true, trigger: "blur", message: "请输入您的账号" },
-          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+          {
+            min: 2,
+            max: 20,
+            message: "用户账号长度必须介于 2 和 20 之间",
+            trigger: "blur",
+          },
        ],
        password: [
          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          {
+            min: 5,
+            max: 20,
+            message: "用户密码长度必须介于 5 和 20 之间",
+            trigger: "blur",
+          },
+          {
+            pattern: /^[^<>"'|\\]+$/,
+            message: "不能包含非法字符：< > \" ' \\\ |",
+            trigger: "blur",
+          },
        ],
        confirmPassword: [
          { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, validator: equalToPassword, trigger: "blur" },
        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: "change", message: "请输入验证码" }],
      },
      loading: false,
-      captchaEnabled: true
+      captchaEnabled: true,
    };
  },
  created() {
@ -113,8 +155,9 @@ export default {
  },
  methods: {
    getCode() {
-      getCodeImg().then(res => {
-        this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+      getCodeImg().then((res) => {
+        this.captchaEnabled =
+          res.captchaEnabled === undefined ? true : res.captchaEnabled;
        if (this.captchaEnabled) {
          this.codeUrl = "data:image/gif;base64," + res.img;
          this.registerForm.uuid = res.uuid;
@ -122,27 +165,37 @@ export default {
      });
    },
    handleRegister() {
-      this.$refs.registerForm.validate(valid => {
+      this.$refs.registerForm.validate((valid) => {
        if (valid) {
          this.loading = true;
-          register(this.registerForm).then(res => {
-            const username = this.registerForm.username;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
-              dangerouslyUseHTMLString: true,
-              type: 'success'
-            }).then(() => {
-              this.$router.push("/login");
-            }).catch(() => {});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          })
+          register(this.registerForm)
+            .then((res) => {
+              const username = this.registerForm.username;
+              this.$alert(
+                "<font color='red'>恭喜你，您的账号 " +
+                  username +
+                  " 注册成功！</font>",
+                "系统提示",
+                {
+                  dangerouslyUseHTMLString: true,
+                  type: "success",
+                }
+              )
+                .then(() => {
+                  this.$router.push("/login");
+                })
+                .catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
        }
      });
-    }
-  }
+    },
+  },
 };
 </script>

--- a/vue.config.js
+++ b/vue.config.js
@ -18,7 +18,7 @@ module.exports = {
  // 部署生产环境和开发环境下的URL。
  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
  // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/glweb/" : "/",
  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
  outputDir: "dist",
  // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）