gitee
/
eiam
mirror of https://gitee.com/topiam/eiam
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

⚡ 优化消息配置

Browse Source
pull/82/head^2
awenes 8 months ago
parent 4f86c9700d
commit 289da3e46a
4 changed files with 205 additions and 179 deletions
Show Stats Download Patch File Download Diff File

12
eiam-console/src/main/console-fe/src/constant.ts
Unescape View File

@ -51,6 +51,15 @@ export enum GEO_IP_PROVIDER {
DEFAULT = 'default',
}
export enum EMAIL_PROVIDER {
CUSTOMIZE = 'customize',
ALIYUN = 'aliyun',
TENCENT = 'tencent',
NET_EASE = 'netease',
}
/**
* 应用类型
*/
@ -65,12 +74,9 @@ export enum AppType {
* App Protocol
*/
export enum AppProtocolType {
saml2 = 'saml2',
oidc = 'oidc',
cas = 'cas',
jwt = 'jwt',
form = 'form',
oauth2 = 'oauth2',
}
export enum PolicyEffectType {

87
eiam-console/src/main/console-fe/src/pages/setting/Message/components/MailProvider/MailProvider.tsx
Unescape View File

@ -16,16 +16,17 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { Container } from '@/components/Container';
import { SMS_PROVIDER } from '@/constant';
import { EMAIL_PROVIDER } from '@/constant';
import { disableMailProvider, getMailProviderConfig, saveMailProvider } from '../../service';
import { EyeInvisibleOutlined, EyeTwoTone, WarningOutlined } from '@ant-design/icons';
import {
ProCard,
ProForm,
ProFormDependency,
ProFormDigit,
ProFormRadio,
ProFormSelect,
ProFormSegmented,
ProFormSwitch,
ProFormText,
} from '@ant-design/pro-components';
@ -63,12 +64,11 @@ const tailFormItemLayout = {
},
},
};
const defaultProvider = 'customize';
export default (props: { visible: boolean }) => {
const [form] = Form.useForm();
const { message, modal } = App.useApp();
const { visible } = props;
const [provider, setProvider] = useState<string>(defaultProvider);
const [loading, setLoading] = useState<boolean>(false);
const [enabled, setEnabled] = useState<boolean>(false);
const intl = useIntl();
@ -79,12 +79,9 @@ export default (props: { visible: boolean }) => {
const { success, result } = await getMailProviderConfig();
if (success && result && result.enabled) {
setEnabled(result.enabled);
setProvider(result.provider);
form.setFieldsValue({
...result,
});
} else {
form.setFieldsValue({ provider: provider });
}
setLoading(false);
return;
@ -126,11 +123,7 @@ export default (props: { visible: boolean }) => {
if (success) {
setEnabled(checked);
message.success(intl.formatMessage({ id: 'app.operation_success' }));
setProvider(defaultProvider);
form.resetFields();
form.setFieldsValue({
provider: defaultProvider,
});
return;
}
},
@ -148,16 +141,15 @@ export default (props: { visible: boolean }) => {
<ProForm
form={form}
scrollToFirstError
initialValues={{ safetyType: 'ssl', provider: defaultProvider }}
initialValues={{ safetyType: 'ssl', provider: 'customize' }}
onReset={() => {
form.resetFields();
form.setFieldsValue({ provider });
}}
{...layout}
layout={'horizontal'}
labelAlign={'right'}
submitter={{
render: (p, dom) => {
render: (_p, dom) => {
return (
<Form.Item {...tailFormItemLayout}>
<Space>{dom}</Space>
@ -194,56 +186,61 @@ export default (props: { visible: boolean }) => {
}
}}
>
<ProFormSelect
<ProFormSegmented
name="provider"
label={intl.formatMessage({ id: 'pages.setting.message.mail_provider.provider' })}
rules={[{ required: true }]}
fieldProps={{
onChange: async (value: string) => {
setLoading(true);
setProvider(value);
form.resetFields();
form.setFieldsValue({
provider: value,
});
const { success, result } = await getMailProviderConfig();
if (success && result && result.enabled && value === result.provider) {
setEnabled(result.enabled);
form.setFieldsValue({
...result,
});
}
setLoading(false);
},
}}
options={[
request={async () => {
return [
{
value: 'customize',
value: EMAIL_PROVIDER.CUSTOMIZE,
label: intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.customize',
}),
},
{
value: SMS_PROVIDER.ALIYUN,
value: EMAIL_PROVIDER.ALIYUN,
label: intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.aliyun',
}),
},
{
value: SMS_PROVIDER.TENCENT,
value: EMAIL_PROVIDER.TENCENT,
label: intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.tencent',
}),
},
{
value: SMS_PROVIDER.NET_EASE,
value: EMAIL_PROVIDER.NET_EASE,
label: intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.net_ease',
}),
},
]}
];
}}
fieldProps={{
onChange: async (value) => {
setLoading(true);
form.resetFields();
form.setFieldsValue({
provider: value,
});
const { success, result } = await getMailProviderConfig();
if (success && result && result.enabled && value === result.provider) {
setEnabled(result.enabled);
form.setFieldsValue({
...result,
});
}
setLoading(false);
},
}}
/>
{provider === 'customize' && (
<ProFormDependency name={['provider']}>
{({ provider }) => {
return (
<>
{provider === EMAIL_PROVIDER.CUSTOMIZE && (
<>
<ProFormText
name="smtpUrl"
@ -304,7 +301,7 @@ export default (props: { visible: boolean }) => {
<ProFormText
name="username"
label={
provider === defaultProvider
provider === EMAIL_PROVIDER.CUSTOMIZE
? intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.username',
})
@ -313,7 +310,7 @@ export default (props: { visible: boolean }) => {
})
}
placeholder={
provider === defaultProvider
provider === EMAIL_PROVIDER.CUSTOMIZE
? intl.formatMessage({
id: 'pages.setting.message.mail_provider.provider.username.placeholder',
})
@ -322,7 +319,7 @@ export default (props: { visible: boolean }) => {
})
}
rules={
provider === defaultProvider
provider === EMAIL_PROVIDER.CUSTOMIZE
? [
{
required: true,
@ -348,6 +345,10 @@ export default (props: { visible: boolean }) => {
}
fieldProps={{ autoComplete: 'off' }}
/>
</>
);
}}
</ProFormDependency>
<ProFormText.Password
name="secret"
label={intl.formatMessage({

22
eiam-console/src/main/console-fe/src/pages/setting/Message/components/SmsProvider/SmsProvider.tsx
Unescape View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import { SMS_PROVIDER } from '@/constant';
import { Language } from '../../constant';
import { Language } from '@/pages/setting/Storage/constant';
import {
disableSmsProvider,
getSmsProviderConfig,
@ -33,7 +33,7 @@ import {
ModalForm,
ProCard,
ProForm,
ProFormSelect,
ProFormSegmented,
ProFormSwitch,
ProFormText,
} from '@ant-design/pro-components';
@ -84,7 +84,7 @@ const TestModal = (props: {
modalProps={{ onCancel: onCancel, destroyOnClose: true }}
labelAlign={'left'}
labelCol={{ span: 4 }}
wrapperCol={{ span: 19 }}
wrapperCol={{ span: 20 }}
key={data.type}
title={intl.formatMessage({ id: 'pages.setting.message.sms_provider.send_scene.modal.from' })}
initialValues={{ type: data.type, name: data.name, content: data.content }}
@ -376,14 +376,14 @@ export default (props: { visible: boolean }) => {
}
}}
>
<ProFormSelect
<ProFormSegmented
name="provider"
label={intl.formatMessage({ id: 'pages.setting.message.sms_provider.provider' })}
rules={[{ required: true }]}
fieldProps={{
onChange: async (value: string) => {
onChange: async (value) => {
setLoading(true);
setProvider(value);
setProvider(value as string);
//清理
form.resetFields();
form.setFieldsValue({ provider: value });
@ -394,7 +394,7 @@ export default (props: { visible: boolean }) => {
form.setFieldsValue({ ...result.config });
setLanguage(result.language);
//获取模板
await fetchSmsTemplateList(result.language, value);
await fetchSmsTemplateList(result.language, value as string);
result.templates?.forEach((i: { type: any; code: any }) => {
editorFormRef.current?.setFieldsValue({ [i.type]: { code: i.code } });
});
@ -402,12 +402,13 @@ export default (props: { visible: boolean }) => {
//已配置和选中配置不一致，走初始化流程
if (success && result && result.provider !== value) {
setLanguage(Language.ZH);
await fetchSmsTemplateList(Language.ZH, value);
await fetchSmsTemplateList(Language.ZH, value as string);
}
setLoading(false);
},
}}
options={[
request={async () => {
return [
{
value: SMS_PROVIDER.ALIYUN,
label: intl.formatMessage({
@ -426,7 +427,8 @@ export default (props: { visible: boolean }) => {
id: 'pages.setting.message.sms_provider.provider.qi_niu',
}),
},
]}
];
}}
/>
{provider === SMS_PROVIDER.ALIYUN && <AliCloud />}
{provider === SMS_PROVIDER.TENCENT && <Tencent />}

17
eiam-console/src/main/console-fe/src/pages/setting/Message/locales/zh-CN.ts
Unescape View File

@ -78,6 +78,23 @@ export default {
'请输入阿里云短信签名',
'pages.setting.message.sms_provider.provider.aliyun.sign_name.rule.0.message':
'阿里云短信签名为必填项',
'pages.setting.storage_provider.provider.s3': 'S3',
'pages.setting.storage_provider.provider.s3.endpoint': 'S3域名',
'pages.setting.storage_provider.provider.s3.endpoint.placeholder': '请输入 S3域名',
'pages.setting.storage_provider.provider.s3.endpoint.rule.0.message': 'S3域名为必填项',
'pages.setting.storage_provider.provider.s3.domain': '外链域名',
'pages.setting.storage_provider.provider.s3.domain.placeholder': '请输入S3 外链域名',
'pages.setting.storage_provider.provider.s3.domain.rule.0.message': 'S3 外链域名为必填项',
'pages.setting.storage_provider.provider.s3.access_key_id.placeholder': '请输入S3 AccessKeyId',
'pages.setting.storage_provider.provider.s3.access_key_id.rule.0.message':
'S3 AccessKeyId为必填项',
'pages.setting.storage_provider.provider.s3.secret_access_key.placeholder':
'请输入S3 SecretAccessKey',
'pages.setting.storage_provider.provider.s3.secret_access_key.rule.0.message':
'S3 SecretAccessKey为必填项',
'pages.setting.storage_provider.provider.s3.region.placeholder': '请输入S3 Region',
'pages.setting.storage_provider.provider.s3.bucket.placeholder': '请输入S3 Bucket',
'pages.setting.storage_provider.provider.s3.bucket.rule.0.message': 'S3 Bucket为必填项',
'pages.setting.message.sms_provider.provider.tencent': '腾讯云',
'pages.setting.message.sms_provider.provider.tencent.region': '地域',
'pages.setting.message.sms_provider.provider.tencent.region.placeholder': '请选择地域配置',

Write Preview
Loading…
Cancel
Save