diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index e799ddd2..eb964182 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -215,6 +215,10 @@ export default {
'app.settings.global.data_path':"Data Path",
'app.settings.global.log_path':"Log Path",
+ 'app.settings.security.auth2factor_enabled':"Enable 2FA(two-factor) Authentication",
+ 'app.settings.security.audit_enabled':"Enable Audit Logging",
+
+
'app.settings.menuMap.basic': 'Basic Settings',
'app.settings.menuMap.security': 'Security Settings',
'app.settings.menuMap.binding': 'Account Binding',
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index f70ce21b..e19bc5cf 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -219,10 +219,14 @@ export default {
'app.settings.global.site_name':"站点名称",
'app.settings.global.domain':"站点域名",
'app.settings.global.listen_addr':"监听地址",
- 'app.settings.global.is_tls':"是否开启 TLS",
+ 'app.settings.global.is_tls':"开启 TLS",
'app.settings.global.data_path':"数据目录",
'app.settings.global.log_path':"日志目录",
+ 'app.settings.security.auth2factor_enabled':"开启双因子身份认证",
+ 'app.settings.security.audit_enabled':"开启审计日志",
+
+
'app.settings.menuMap.basic': '基本设置',
'app.settings.menuMap.security': '安全设置',
'app.settings.menuMap.binding': '账号绑定',
diff --git a/web/src/pages/Settings/Global/Global.js b/web/src/pages/Settings/Global/Global.js
index ded7ae35..0a831963 100644
--- a/web/src/pages/Settings/Global/Global.js
+++ b/web/src/pages/Settings/Global/Global.js
@@ -96,7 +96,7 @@ class Global extends Component {
rules: [
{
required: true,
- message: "勾选状态",
+ message: formatMessage({id: 'app.settings.global.is_tls-message'}, {}),
},
],
})(
diff --git a/web/src/pages/Settings/Security/General.js b/web/src/pages/Settings/Security/General.js
index bd90ddff..6204ba9e 100644
--- a/web/src/pages/Settings/Security/General.js
+++ b/web/src/pages/Settings/Security/General.js
@@ -1,6 +1,8 @@
import React, {Component, Fragment} from 'react';
import {connect} from 'dva';
-import {Card, Form, Input, Select, Button, message, Divider, Drawer, Descriptions} from 'antd';
+import {Card, Form, Input, Select,Switch, Button, message, Divider, Drawer, Descriptions} from 'antd';
+import { Table, Tag } from 'antd';
+import { Icon } from 'antd';
const {Option} = Select;
import {formatMessage, FormattedMessage} from 'umi/locale';
@@ -60,6 +62,71 @@ class General extends Component {
this.setState({operationkey: key});
};
+ ssoSettings() {
+ const columns = [
+ {
+ title: 'ID',
+ dataIndex: 'key',
+ key: 'key',
+ render: text => {text},
+ },
+ {
+ title: '名称',
+ dataIndex: 'name',
+ key: 'name',
+ },
+ {
+ title: '类型',
+ dataIndex: 'type',
+ key: 'type',
+ },
+ {
+ title: '启用',
+ key: 'enabled',
+ dataIndex: 'enabled',
+ render: text =>