diff --git a/src/api/user.js b/src/api/user.js
index 1147fa1..c2efcc2 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,4 +1,5 @@
import request from '@/router/axios';
+import website from "@/config/website";
export const loginByUsername = (tenantId, username, password, type, key, code) => request({
url: '/api/blade-auth/oauth/token',
@@ -12,7 +13,7 @@ export const loginByUsername = (tenantId, username, password, type, key, code) =
tenantId,
username,
password,
- grant_type: "captcha",
+ grant_type: (website.captchaMode ? "captcha" : "password"),
scope: "all",
type
}
diff --git a/src/config/website.js b/src/config/website.js
index 3f0a89d..4698015 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -9,6 +9,7 @@ export default {
clientId: 'saber', // 客户端id
clientSecret: 'saber_secret', // 客户端密钥
tenantMode: true, // 是否开启租户模式
+ captchaMode: true, // 是否开启验证码模式
lockPage: '/lock',
tokenTime: 3000,
//http的status默认放行不才用统一处理的,
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index cae24bc..e74a472 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -34,7 +34,7 @@
-
+
import {mapGetters} from "vuex";
- import website from '@/config/website';
import {info} from "@/api/system/tenant";
import {getCaptcha} from "@/api/user";
@@ -73,7 +72,7 @@
name: "userlogin",
data() {
return {
- tenantMode: website.tenantMode,
+ tenantMode: this.website.tenantMode,
loginForm: {
//租户ID
tenantId: "000000",