联调

src/views/Login/components/LoginForm.vue

@@ -9,16 +9,16 @@
     label-width="120px"
     size="large"
   >
-    <el-row style="maring-left: -10px; maring-right: -10px">
+    <el-row style="margin-left: -10px; margin-right: -10px">
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item>
           <LoginFormTitle style="width: 100%" />
         </el-form-item>
       </el-col>
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
-        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
+        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantId">
           <el-input
-            v-model="loginData.loginForm.tenantName"
+            v-model="loginData.loginForm.tenantId"
             :placeholder="t('login.tenantNamePlaceholder')"
             :prefix-icon="iconHouse"
             type="primary"
@@ -58,9 +58,9 @@
                 {{ t('login.remember') }}
               </el-checkbox>
             </el-col>
-            <el-col :offset="6" :span="12">
+            <!-- <el-col :offset="6" :span="12">
               <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form-item>
       </el-col>
@@ -133,7 +133,6 @@ const captchaType = ref('blockPuzzle') // blockPuzzle 滑块 clickWord 点击文
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
 
 const LoginRules = {
-  tenantName: [required],
   username: [required],
   password: [required]
 }
@@ -142,11 +141,12 @@ const loginData = reactive({
   captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
   tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
   loginForm: {
-    tenantName: '莳松',
+    tenantId: undefined,
+    instanceId: undefined,
     username: 'admin',
     password: 'admin123',
     captchaVerification: '',
-    rememberMe: false
+    rememberMe: true
   }
 })
 
@@ -161,13 +161,6 @@ const getCode = async () => {
     verify.value.show()
   }
 }
-//获取租户ID
-const getTenantId = async () => {
-  if (loginData.tenantEnable === 'true') {
-    const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
-    authUtil.setTenantId(res)
-  }
-}
 // 记住我
 const getCookie = () => {
   const loginForm = authUtil.getLoginForm()
@@ -177,15 +170,22 @@ const getCookie = () => {
       username: loginForm.username ? loginForm.username : loginData.loginForm.username,
       password: loginForm.password ? loginForm.password : loginData.loginForm.password,
       rememberMe: loginForm.rememberMe ? true : false,
-      tenantName: loginForm.tenantName ? loginForm.tenantName : loginData.loginForm.tenantName
+      tenantId: loginForm.tenantId ? loginForm.tenantId : loginData.loginForm.tenantId
     }
   }
 }
+
+function getTenantId() {
+  loginData.loginForm.tenantId = authUtil.getTenantId()
+
+  loginData.loginForm.instanceId = authUtil.getAppId()
+}
+
 // 登录
 const handleLogin = async (params) => {
   loginLoading.value = true
   try {
-    await getTenantId()
+    getTenantId()
     const data = await validForm()
     if (!data) {
       return