From 1a48301cee27a9e81b3086ea6bd69c7b61aa9e0b Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 4 Sep 2022 12:18:12 +0800 Subject: [PATCH] =?UTF-8?q?vue2=20=E9=AA=8C=E8=AF=81=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=85=B3=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AF=B9=E7=A4=BE=E4=BA=A4=E7=99=BB=E5=BD=95=E7=9A=84=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/.env.demo1024 | 3 ++ yudao-ui-admin/.env.dev | 3 ++ yudao-ui-admin/.env.local | 3 ++ yudao-ui-admin/.env.prod | 3 ++ yudao-ui-admin/.env.stage | 3 ++ yudao-ui-admin/src/utils/ruoyi.js | 13 ++++++ yudao-ui-admin/src/views/login.vue | 24 +++++++----- yudao-ui-admin/src/views/socialLogin.vue | 50 +++++++++++------------- 8 files changed, 65 insertions(+), 37 deletions(-) diff --git a/yudao-ui-admin/.env.demo1024 b/yudao-ui-admin/.env.demo1024 index 93ee78843..18efd38d3 100644 --- a/yudao-ui-admin/.env.demo1024 +++ b/yudao-ui-admin/.env.demo1024 @@ -17,6 +17,9 @@ VUE_APP_APP_NAME ='/admin-ui/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true +# 验证码的开关 +VUE_APP_CAPTCHA_ENABLE = true + # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/yudao-ui-admin/.env.dev b/yudao-ui-admin/.env.dev index db9e33854..cbe967efd 100644 --- a/yudao-ui-admin/.env.dev +++ b/yudao-ui-admin/.env.dev @@ -13,6 +13,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true +# 验证码的开关 +VUE_APP_CAPTCHA_ENABLE = true + # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/yudao-ui-admin/.env.local b/yudao-ui-admin/.env.local index 58029b662..9b294e2b7 100644 --- a/yudao-ui-admin/.env.local +++ b/yudao-ui-admin/.env.local @@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true # 多租户的开关 VUE_APP_TENANT_ENABLE = true +# 验证码的开关 +VUE_APP_CAPTCHA_ENABLE = true + # 文档的开关 VUE_APP_DOC_ENABLE = true diff --git a/yudao-ui-admin/.env.prod b/yudao-ui-admin/.env.prod index 5deaf75fc..a1415ed39 100644 --- a/yudao-ui-admin/.env.prod +++ b/yudao-ui-admin/.env.prod @@ -15,6 +15,9 @@ VUE_APP_APP_NAME ='yudao-admin' # 多租户的开关 VUE_APP_TENANT_ENABLE = true +# 验证码的开关 +VUE_APP_CAPTCHA_ENABLE = true + # 文档的开关 VUE_APP_DOC_ENABLE = false diff --git a/yudao-ui-admin/.env.stage b/yudao-ui-admin/.env.stage index 7526f2680..5942b3c6d 100644 --- a/yudao-ui-admin/.env.stage +++ b/yudao-ui-admin/.env.stage @@ -15,6 +15,9 @@ PUBLIC_PATH = 'http://static.yudao.iocoder.cn/' # 多租户的开关 VUE_APP_TENANT_ENABLE = true +# 验证码的开关 +VUE_APP_CAPTCHA_ENABLE = true + # 文档的开关 VUE_APP_DOC_ENABLE = false diff --git a/yudao-ui-admin/src/utils/ruoyi.js b/yudao-ui-admin/src/utils/ruoyi.js index 7096e1fdc..a05266d67 100644 --- a/yudao-ui-admin/src/utils/ruoyi.js +++ b/yudao-ui-admin/src/utils/ruoyi.js @@ -185,6 +185,19 @@ export function getTenantEnable() { return process.env.VUE_APP_TENANT_ENABLE || true; } +/** + * 获得验证码功能是否开启 + */ +export function getCaptchaEnable() { + if (process.env.VUE_APP_CAPTCHA_ENABLE === "true") { + return true; + } + if (process.env.VUE_APP_CAPTCHA_ENABLE === "false") { + return false; + } + return process.env.VUE_APP_CAPTCHA_ENABLE || true; +} + /** * 获得文档是否开启 */ diff --git a/yudao-ui-admin/src/views/login.vue b/yudao-ui-admin/src/views/login.vue index 6e8578b0f..1024577b6 100644 --- a/yudao-ui-admin/src/views/login.vue +++ b/yudao-ui-admin/src/views/login.vue @@ -87,12 +87,11 @@ - + + + +
Copyright © 2020-2022 iocoder.cn All Rights Reserved. @@ -104,7 +103,7 @@ import {sendSmsCode, socialAuthRedirect} from "@/api/login"; import {getTenantIdByName} from "@/api/system/tenant"; import {SystemUserSocialTypeEnum} from "@/utils/constants"; -import {getTenantEnable} from "@/utils/ruoyi"; +import {getCaptchaEnable, getTenantEnable} from "@/utils/ruoyi"; import { getPassword, getRememberMe, getTenantName, @@ -188,16 +187,21 @@ export default { created() { // 租户开关 this.tenantEnable = getTenantEnable(); + // 验证码开关 + this.captchaEnable = getCaptchaEnable(); // 重定向地址 this.redirect = this.$route.query.redirect; this.getCookie(); }, methods: { getCode() { - // 只有开启的状态，才加载验证码。默认开启 + // 情况一，未开启：则直接登录 if (!this.captchaEnable) { + this.handleLogin({}) return; } + + // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录 // 弹出验证码 this.$refs.verify.show() }, @@ -214,7 +218,7 @@ export default { tenantName: tenantName ? tenantName : this.loginForm.tenantName, }; }, - handleLogin(params) { + handleLogin(captchaParams) { this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true; @@ -230,7 +234,7 @@ export default { removeRememberMe() removeTenantName() } - this.loginForm.captchaVerification = params.captchaVerification + this.loginForm.captchaVerification = captchaParams.captchaVerification // 发起登陆 // console.log("发起登录", this.loginForm); this.$store.dispatch(this.loginForm.loginType === "sms" ? "SmsLogin" : "Login", this.loginForm).then(() => { diff --git a/yudao-ui-admin/src/views/socialLogin.vue b/yudao-ui-admin/src/views/socialLogin.vue index 765aef91f..d3463ad66 100644 --- a/yudao-ui-admin/src/views/socialLogin.vue +++ b/yudao-ui-admin/src/views/socialLogin.vue @@ -32,20 +32,11 @@ - - - - - - 记住密码 + @click.native.prevent="getCode"> 登 录 登 录 中... @@ -55,6 +46,11 @@
+ + + +
Copyright © 2020-2022 iocoder.cn All Rights Reserved. @@ -72,10 +68,15 @@ import { setRememberMe, setUsername } from "@/utils/auth"; -import {getCodeImg} from "@/api/login"; + +import Verify from '@/components/Verifition/Verify'; +import {getCaptchaEnable} from "@/utils/ruoyi"; export default { name: "ThirdLogin", + components: { + Verify + }, data() { return { codeUrl: "", @@ -85,8 +86,7 @@ export default { username: "admin", password: "admin123", rememberMe: false, - code: "", - uuid: "", + captchaVerification: "", }, loginRules: { username: [ @@ -114,9 +114,10 @@ export default { // }, created() { this.getCookie(); + // 验证码开关 + this.captchaEnable = getCaptchaEnable(); // 重定向地址 this.redirect = this.$route.query.redirect; - this.getCode(); // 社交登录相关 this.type = this.$route.query.type; this.code = this.$route.query.code; @@ -133,19 +134,15 @@ export default { }, methods: { getCode() { - // 只有开启的状态，才加载验证码。默认开启 + // 情况一，未开启：则直接登录 if (!this.captchaEnable) { + this.handleLogin({}) return; } - // 请求远程，获得验证码 - getCodeImg().then(res => { - res = res.data; - this.captchaEnable = res.enable; - if (this.captchaEnable) { - this.codeUrl = "data:image/gif;base64," + res.img; - this.loginForm.uuid = res.uuid; - } - }); + + // 情况二，已开启：则展示验证码；只有完成验证码的情况，才进行登录 + // 弹出验证码 + this.$refs.verify.show() }, getCookie() { const username = getUsername(); @@ -158,7 +155,7 @@ export default { loginType: this.loginForm.loginType, }; }, - handleLogin() { + handleLogin(captchaParams) { this.$refs.loginForm.validate(valid => { if (valid) { this.loading = true; @@ -177,8 +174,7 @@ export default { // 账号密码登录 username: this.loginForm.username, password: this.loginForm.password, - code: this.loginForm.code, - uuid: this.loginForm.uuid, + captchaVerification: captchaParams.captchaVerification }).then(() => { this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); }).catch(() => {