diff --git a/README.md b/README.md index eb1186e..e5f2fb3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-
+
@@ -56,8 +56,9 @@ SpringBlade
* 官网地址:[https://bladex.vip](https://bladex.vip)
* 问答社区:[https://sns.bladex.vip](https://sns.bladex.vip)
* 会员计划:[SpringBlade会员计划](https://gitee.com/smallc/SpringBlade/wikis/SpringBlade会员计划)
-* 交流一群:`477853168`
-* 交流二群:`751253339`
+* 交流一群:`477853168`(满)
+* 交流二群:`751253339`(满)
+* 交流三群:`784729540`
## 在线演示
* Saber-基于Vue:[https://saber.bladex.vip](https://saber.bladex.vip)
diff --git a/package.json b/package.json
index 224f255..f7120e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saber-admin",
- "version": "2.5.4",
+ "version": "2.6.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
diff --git a/src/api/user.js b/src/api/user.js
index 9dda3d1..943ca37 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -1,16 +1,21 @@
import request from '@/router/axios';
import {baseUrl} from '@/config/env';
-export const loginByUsername = (tenantId, account, password, type) => request({
+export const loginByUsername = (tenantId, account, password, type, key, code) => request({
url: '/api/blade-auth/token',
method: 'post',
+ headers: {
+ 'Captcha-Key': key,
+ 'Captcha-Code': code,
+ },
params: {
+ grantType: 'captcha',
tenantId,
account,
password,
type
}
-})
+});
export const getButtons = () => request({
url: '/api/blade-system/menu/buttons',
@@ -32,6 +37,11 @@ export const getMenu = () => request({
method: 'get'
});
+export const getCaptcha = () => request({
+ url: '/api/blade-auth/captcha',
+ method: 'get'
+});
+
export const getTopMenu = () => request({
url: baseUrl + '/user/getTopMenu',
method: 'get'
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 61495c2..9e2ed04 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -39,18 +39,39 @@
class="icon-mima">
+