add tenant to login request header

src/api/login.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 登录方法
-export function login(username, password, code, uuid) {
+export function login(username, password, code, uuid, tenant) {
     const data = {
         username,
         password,
@@ -11,7 +11,8 @@ export function login(username, password, code, uuid) {
     return request({
         url: '/login',
         headers: {
-      isToken: false
+            isToken: false,
+            tenant
         },
         method: 'post',
         data: data

src/store/modules/user.js

@@ -1,5 +1,5 @@
-import { login, logout, getInfo } from '@/api/login'
+import {getInfo, login, logout} from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
+import {getToken, removeToken, setToken} from '@/utils/auth'
 import defAva from '@/assets/images/profile.jpg'
 
 const useUserStore = defineStore(
@@ -17,10 +17,11 @@ const useUserStore = defineStore(
             login(userInfo) {
                 const username = userInfo.username.trim()
                 const password = userInfo.password
+                const tenant = userInfo.tenant
                 const code = userInfo.code
                 const uuid = userInfo.uuid
                 return new Promise((resolve, reject) => {
-          login(username, password, code, uuid).then(res => {
+                    login(username, password, code, uuid, tenant).then(res => {
                         setToken(res.token)
                         this.token = res.token
                         resolve()

src/views/login.vue

@@ -2,42 +2,61 @@
     <div class="login">
         <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
             <h3 class="title">若依后台管理系统</h3>
+            <el-form-item prop="tenant">
+                <el-input
+                        v-model="loginForm.tenant"
+                        auto-complete="off"
+                        placeholder="租户"
+                        size="large"
+                        type="text"
+                >
+                    <template #prefix>
+                        <svg-icon class="el-input__icon input-icon" icon-class="user"/>
+                    </template>
+                </el-input>
+            </el-form-item>
             <el-form-item prop="username">
                 <el-input
                         v-model="loginForm.username"
-          type="text"
-          size="large"
                         auto-complete="off"
                         placeholder="账号"
+                        size="large"
+                        type="text"
                 >
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+                    <template #prefix>
+                        <svg-icon class="el-input__icon input-icon" icon-class="user"/>
+                    </template>
                 </el-input>
             </el-form-item>
             <el-form-item prop="password">
                 <el-input
                         v-model="loginForm.password"
-          type="password"
-          size="large"
                         auto-complete="off"
                         placeholder="密码"
+                        size="large"
+                        type="password"
                         @keyup.enter="handleLogin"
                 >
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+                    <template #prefix>
+                        <svg-icon class="el-input__icon input-icon" icon-class="password"/>
+                    </template>
                 </el-input>
             </el-form-item>
-      <el-form-item prop="code" v-if="captchaEnabled">
+            <el-form-item v-if="captchaEnabled" prop="code">
                 <el-input
                         v-model="loginForm.code"
-          size="large"
                         auto-complete="off"
                         placeholder="验证码"
+                        size="large"
                         style="width: 63%"
                         @keyup.enter="handleLogin"
                 >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+                    <template #prefix>
+                        <svg-icon class="el-input__icon input-icon" icon-class="validCode"/>
+                    </template>
                 </el-input>
                 <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+                    <img :src="codeUrl" class="login-code-img" @click="getCode"/>
                 </div>
             </el-form-item>
             <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
@@ -45,15 +64,15 @@
                 <el-button
                         :loading="loading"
                         size="large"
-          type="primary"
                         style="width:100%;"
+                        type="primary"
                         @click.prevent="handleLogin"
                 >
                     <span v-if="!loading">登 录</span>
                     <span v-else>登 录 中...</span>
                 </el-button>
-        <div style="float: right;" v-if="register">
+                <div v-if="register" style="float: right;">
-          <router-link class="link-type" :to="'/register'">立即注册</router-link>
+                    <router-link :to="'/register'" class="link-type">立即注册</router-link>
                 </div>
             </el-form-item>
         </el-form>
@@ -67,7 +86,7 @@
 <script setup>
 import {getCodeImg} from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
+import {decrypt, encrypt} from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'
 
 const userStore = useUserStore()
@@ -75,6 +94,7 @@ const router = useRouter();
 const {proxy} = getCurrentInstance();
 
 const loginForm = ref({
+    tenant: "",
     username: "admin",
     password: "admin123",
     rememberMe: false,
@@ -83,6 +103,7 @@ const loginForm = ref({
 });
 
 const loginRules = {
+    tenant: [{required: true, trigger: "blur", message: "请输入租户"}],
     username: [{required: true, trigger: "blur", message: "请输入您的账号"}],
     password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
     code: [{required: true, trigger: "change", message: "请输入验证码"}]
@@ -102,11 +123,13 @@ function handleLogin() {
             loading.value = true;
             // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
             if (loginForm.value.rememberMe) {
+                Cookies.set("tenant", loginForm.value.tenant, {expires: 30});
                 Cookies.set("username", loginForm.value.username, {expires: 30});
                 Cookies.set("password", encrypt(loginForm.value.password), {expires: 30});
                 Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
             } else {
                 // 否则移除
+                Cookies.remove("tenant");
                 Cookies.remove("username");
                 Cookies.remove("password");
                 Cookies.remove("rememberMe");
@@ -159,6 +182,7 @@ getCookie();
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -170,32 +194,39 @@ getCookie();
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 40px;
+
     input {
       height: 40px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 0px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 40px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -208,6 +239,7 @@ getCookie();
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 40px;
   padding-left: 12px;