修改

src/api/system/tenant.js

@@ -1,9 +1,9 @@
 import request from '@/utils/request'
 
-// 使用租户名，获得租户编号
+// 使用用户名，获得租户编号
 export function getTenantIdByName(name) {
   return request({
-    url: '/system/tenant/get-id-by-name',
+    url: '/system/auth/getCurrentTenantIdByUsername',
     method: 'get',
     params: {
       name

src/views/login.vue

@@ -37,7 +37,7 @@
                     <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon"/>
                   </el-input>
                 </el-form-item>
-                <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">下次自动登录</el-checkbox>
+                <el-checkbox v-model="loginForm.rememberMe" style="margin:0 0 25px 0;">记住密码</el-checkbox>
                 <a class="forget-password" href="/password/forget">忘记密码?</a>
               </div>
 
@@ -76,33 +76,11 @@
                 没有账号？
                 <span class="register-btn" @click="doRegister()">免费注册</span>
               </div>
-              <!--  社交登录 -->
-             <!-- <el-form-item style="width:100%;">
-                  <div class="oauth-login" style="display:flex">
-                    <div class="oauth-login-item" v-for="item in SysUserSocialTypeEnum" :key="item.type" @click="doSocialLogin(item)">
-                      <img :src="item.img" height="25px" width="25px" alt="登录" >
-                      <span>{{item.title}}</span>
-                    </div>
-                </div>
-              </el-form-item> -->
-
-              <!-- 教程说明 -->
-              <!-- <el-form-item style="width:100%; margin-top:-25px">
-                <el-link href="https://doc.iocoder.cn/" target="_blank">📚开发指南</el-link>
-                <el-link href="https://doc.iocoder.cn/video/" target="_blank" style="padding-left: 10px">🔥视频教程</el-link>
-                <el-link href="https://www.iocoder.cn/Interview/good-collection/" target="_blank" style="padding-left: 10px">⚡面试手册</el-link>
-                <el-link href="http://static.yudao.iocoder.cn/mp/Aix9975.jpeg" target="_blank" style="padding-left: 10px">🤝外包咨询</el-link>
-              </el-form-item> -->
             </el-form>
           </div>
         </div>
       </div>
     </div>
-
-    <!-- 图形验证码 -->
-    <!-- <Verify ref="verify" :captcha-type="'blockPuzzle'" :img-size="{width:'400px',height:'200px'}"
-            @success="handleLogin" /> -->
-
     <!-- footer -->
     <!-- <div class="footer">
       Copyright © 2020-2022 iocoder.cn All Rights Reserved.
@@ -111,49 +89,58 @@
 </template>
 
 <script>
-import {sendSmsCode, socialAuthRedirect} from "@/api/login";
+import {sendSmsCode} from "@/api/login";
 import {getTenantIdByName} from "@/api/system/tenant";
-import {SystemUserSocialTypeEnum} from "@/utils/constants";
-import {getCaptchaEnable, getTenantEnable} from "@/utils/ruoyi";
 import {
   getPassword,
-  getRememberMe, getTenantName,
+  getRememberMe, 
   getUsername,
-  removePassword, removeRememberMe, removeTenantName,
+  removePassword, 
+  removeRememberMe, 
   removeUsername,
-  setPassword, setRememberMe, setTenantId, setTenantName,
+  setPassword, 
+  setRememberMe, 
+  setTenantId, 
   setUsername
 } from "@/utils/auth";
 
-import Verify from '@/components/Verifition/Verify';
-
 export default {
   name: "Login",
-  components: {
-    Verify
-  },
   data() {
     return {
-      captchaEnable: true,
-      tenantEnable: true,
       mobileCodeTimer: 0,
       loginForm: {
         loginType: "uname",
-        username: "admin",
-        password: "admin123",
-        // username: "",
-        // password: "",
-        captchaVerification: "",
+        username: "13613885046",
+        password: "13613885046aA",
         mobile: "",
         mobileCode: "",
         rememberMe: false,
-        tenantName: "芋道源码",
       },
       scene: 1,
 
       LoginRules: {
         username: [
-          {required: true, trigger: "blur", message: "用户名不能为空"}
+          {required: true, trigger: "blur", message: "手机号不能为空"},
+          {
+            validator: (rule, value, callback) => {
+              if (/^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/.test(value) === false) {
+                callback(new Error("手机号格式错误"));
+              } else {
+                getTenantIdByName(value).then(res => {
+                  const tenantId = res.data;
+                  if (tenantId && tenantId >= 0) {
+                    setTenantId(tenantId)
+                    callback();
+                  } else {
+                    callback('该手机号未创建账号,请重新输入');
+                  }
+                });
+              }
+           
+            },
+            trigger: 'blur'
+          }
         ],
         password: [
           {required: true, trigger: "blur", message: "密码不能为空"}
@@ -170,47 +157,11 @@ export default {
             }, trigger: "blur"
           }
         ],
-        tenantName: [
-          {required: true, trigger: "blur", message: "租户不能为空"},
-          {
-            validator: (rule, value, callback) => {
-              // debugger
-              getTenantIdByName(value).then(res => {
-                const tenantId = res.data;
-                if (tenantId && tenantId >= 0) {
-                  // 设置租户
-                  setTenantId(tenantId)
-                  callback();
-                } else {
-                  callback('租户不存在');
-                }
-              });
-            },
-            trigger: 'blur'
-          }
-        ]
       },
       loading: false,
-      redirect: undefined,
-      // 枚举
-      SysUserSocialTypeEnum: SystemUserSocialTypeEnum,
     };
   },
   created() {
-    // 租户开关
-    // this.tenantEnable = getTenantEnable();
-    // if (this.tenantEnable) {
-    //   getTenantIdByName(this.loginForm.tenantName).then(res => { // 设置租户
-    //     const tenantId = res.data;
-    //     if (tenantId && tenantId >= 0) {
-    //       setTenantId(tenantId)
-    //     }
-    //   });
-    // }
-    // 验证码开关
-    this.captchaEnable = getCaptchaEnable();
-    // 重定向地址
-    this.redirect = this.$route.query.redirect ? decodeURIComponent(this.$route.query.redirect) : undefined;
     this.getCookie();
   },
   methods: {
@@ -219,48 +170,33 @@ export default {
       this.$router.push({path: '/register'})
     },
     getCode() {
-      // 情况一，未开启：则直接登录
-      if (!this.captchaEnable) {
-        this.handleLogin({})
-        return;
-      }
-
-      // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录
-      // 弹出验证码
-      this.$refs.verify.show()
+      this.handleLogin({})
     },
     getCookie() {
       const username = getUsername();
       const password = getPassword();
       const rememberMe = getRememberMe();
-      const tenantName = getTenantName();
       this.loginForm = {
         ...this.loginForm,
         username: username ? username : this.loginForm.username,
         password: password ? password : this.loginForm.password,
         rememberMe: rememberMe ? getRememberMe() : false,
-        tenantName: tenantName ? tenantName : this.loginForm.tenantName,
       };
     },
-    handleLogin(captchaParams) {
+    handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          // 设置 Cookie
-          if (this.loginForm.rememberMe) {
+           // 设置 Cookie
+           if (this.loginForm.rememberMe) {
             setUsername(this.loginForm.username)
             setPassword(this.loginForm.password)
             setRememberMe(this.loginForm.rememberMe)
-            setTenantName(this.loginForm.tenantName)
           } else {
             removeUsername()
             removePassword()
             removeRememberMe()
-            removeTenantName()
           }
-          this.loginForm.captchaVerification = captchaParams.captchaVerification
-          // 发起登陆
-          // console.log("发起登录", this.loginForm);
           this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => {
             this.$router.push({path: "/"}).catch(() => {
             });
@@ -270,44 +206,6 @@ export default {
         }
       });
     },
-    async doSocialLogin(socialTypeEnum) {
-      // 设置登录中
-      this.loading = true;
-      let tenant = false;
-      if (this.tenantEnable) {
-        await this.$prompt('请输入租户名称', "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消"
-        }).then(async ({value}) => {
-          await getTenantIdByName(value).then(res => {
-            const tenantId = res.data;
-            tenant = true
-            if (tenantId && tenantId >= 0) {
-              setTenantId(tenantId)
-            }
-          });
-        }).catch(() => {
-          // 取消登录按钮 loading状态
-          this.loading = false;
-
-          return false
-        });
-      } else {
-        tenant = true
-      }
-     if(tenant){
-       // 计算 redirectUri
-       const redirectUri = location.origin + '/social-login?'
-         + encodeURIComponent('type=' + socialTypeEnum.type + '&redirect=' + (this.redirect || "/")); // 重定向不能丢
-       // const redirectUri = 'http://127.0.0.1:48080/api/gitee/callback';
-       // const redirectUri = 'http://127.0.0.1:48080/api/dingtalk/callback';
-       // 进行跳转
-       socialAuthRedirect(socialTypeEnum.type, encodeURIComponent(redirectUri)).then((res) => {
-         // console.log(res.url);
-         window.location.href = res.data;
-       });
-     }
-    },
     /** ========== 以下为升级短信登录 ========== */
     getSmsCode() {
       if (this.mobileCodeTimer > 0) return;

src/views/register.vue

@@ -15,13 +15,6 @@
         <!-- 表单 -->
         <div class="form-cont">
           <div class="login-title">账号注册</div>
-          <!-- <div class="form" style=" float:none;margin-bottom: 20px;">
-            <el-steps :active="loginForm.loginType" simple>
-              <el-step title="注册账号" icon="el-icon-user"></el-step>
-              <el-step title="创建团队" icon="el-icon-edit"></el-step>
-            </el-steps>
-          </div> -->
-
           <div style="width: 320px;">
             <el-form ref="loginForm" :model="loginForm" :rules="LoginRules" class="login-form">
 
@@ -73,7 +66,7 @@
 
 <script>
 import { sendSmsCode } from "@/api/login";
-
+import {setTenantId} from "@/utils/auth";
 export default {
   data() {
     return {
@@ -115,8 +108,8 @@ export default {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          // 发起登陆
-          // console.log("发起登录", this.loginForm);
+          //设置默认租户
+          setTenantId(1)
           this.$store.dispatch("SmsRegister", this.loginForm).then(() => {
             this.$router.push({ path: "/" }).catch(() => {
             });