diff --git a/src/defaultSettings.js b/src/defaultSettings.js index 4d39b6e..81398ba 100644 --- a/src/defaultSettings.js +++ b/src/defaultSettings.js @@ -3,6 +3,7 @@ module.exports = { clientId: 'sword', // 客户端id clientSecret: 'sword_secret', // 客户端密钥 tenantMode: true, // 开启租户模式 + captchaMode: true, // 开启验证码模式 navTheme: 'dark', // theme for nav menu primaryColor: '#1890FF', // primary color of ant design layout: 'sidemenu', // nav menu position: sidemenu or topmenu diff --git a/src/pages/Login/Login.js b/src/pages/Login/Login.js index 4715e4b..fef01a0 100644 --- a/src/pages/Login/Login.js +++ b/src/pages/Login/Login.js @@ -4,7 +4,7 @@ import { formatMessage, FormattedMessage } from 'umi/locale'; import { Checkbox, Alert } from 'antd'; import Login from '../../components/Login'; import styles from './Login.less'; -import { tenantMode } from '../../defaultSettings'; +import { tenantMode, captchaMode } from '../../defaultSettings'; const { Tab, TenantId, UserName, Password, Captcha, Submit } = Login; @@ -117,7 +117,7 @@ class LoginPage extends Component { ]} onPressEnter={() => this.loginForm.validateFields(this.handleSubmit)} /> - + {captchaMode ? : null}
diff --git a/src/services/user.js b/src/services/user.js index d1ec2f7..377a5af 100644 --- a/src/services/user.js +++ b/src/services/user.js @@ -2,12 +2,13 @@ import { stringify } from 'qs'; import request from '../utils/request'; import func from '../utils/Func'; import { getCaptchaKey } from '../utils/authority'; +import { captchaMode } from '../defaultSettings'; // =====================用户=========================== export async function accountLogin(params) { const values = params; - values.grantType = 'captcha'; + values.grantType = captchaMode ? 'captcha' : 'password'; values.scope = 'all'; return request('/api/blade-auth/token', { headers: {