This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 3420ffb3e [Improve] docker|email settings i18n improvement
3420ffb3e is described below
commit 3420ffb3eb3f9b12df7d9afbb78e20407f62956b
Author: benjobs <[email protected]>
AuthorDate: Sat Mar 2 14:22:16 2024 +0800
[Improve] docker|email settings i18n improvement
---
.../streampark-console-config/logback-spring.xml | 1 +
.../src/main/resources/logback-spring.xml | 1 +
.../src/locales/lang/en/setting/system.ts | 18 +++++++++++++
.../src/locales/lang/zh-CN/setting/system.ts | 22 +++++++++++++--
.../src/views/setting/System/SettingList.vue | 31 ++++++++++++++++++++--
5 files changed, 69 insertions(+), 4 deletions(-)
diff --git a/helm/streampark/conf/streampark-console-config/logback-spring.xml
b/helm/streampark/conf/streampark-console-config/logback-spring.xml
index 9242cb81c..27334797a 100755
--- a/helm/streampark/conf/streampark-console-config/logback-spring.xml
+++ b/helm/streampark/conf/streampark-console-config/logback-spring.xml
@@ -107,6 +107,7 @@
</appender>
<root level="INFO">
+ <appender-ref ref="STDOUT"/>
<appender-ref ref="INFO"/>
<appender-ref ref="WARN"/>
<appender-ref ref="ERROR"/>
diff --git
a/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
b/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
index 9242cb81c..27334797a 100644
---
a/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
+++
b/streampark-console/streampark-console-service/src/main/resources/logback-spring.xml
@@ -107,6 +107,7 @@
</appender>
<root level="INFO">
+ <appender-ref ref="STDOUT"/>
<appender-ref ref="INFO"/>
<appender-ref ref="WARN"/>
<appender-ref ref="ERROR"/>
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
index eff1a3573..065cdae1f 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/en/setting/system.ts
@@ -37,6 +37,24 @@ export default {
success: 'Setting updated successfully',
dockerNotStart: 'Please make sure your Docker service has been started. 🙂',
},
+ title: {
+ mavenSettings: 'Maven Settings File Path',
+ mavenRepository: 'Maven Central Repository',
+ mavenUser: 'Maven Central Repository Auth User',
+ mavenPassword: 'Maven Central Repository Auth Password',
+ docker: 'Docker Setting',
+ email: 'Alert Mailbox Setting',
+ ingress: 'Ingress domain address Setting',
+ },
+ desc: {
+ mavenSettings: 'Specify the full path to the local maven settings.xml',
+ mavenRepository: 'Maven central repository, Specify a repository address
for maven.',
+ mavenUser: 'Maven central repository authentication username',
+ mavenPassword: 'Maven central repository authentication password',
+ docker: 'Docker container service settings',
+ email: 'Alert Mailbox settings used to sent alert email',
+ ingress: 'Automatically generate an nginx-based ingress by passing in a
domain name',
+ },
docker: {
address: {
label: 'Docker Address',
diff --git
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
index 9875fdbaf..b1e5232aa 100644
---
a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
+++
b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/setting/system.ts
@@ -18,10 +18,10 @@ export default {
systemSetting: '系统设置',
systemSettingItems: {
mavenSetting: {
- name: 'Maven配置',
+ name: 'Maven 配置',
},
dockerSetting: {
- name: 'Docker环境配置',
+ name: 'Docker 环境配置',
},
emailSetting: {
name: '邮箱配置',
@@ -37,6 +37,24 @@ export default {
success: '设置更新成功！',
dockerNotStart: '依赖你本地的Docker服务，请确保本地Docker已启动. 🙂',
},
+ title: {
+ mavenSettings: 'Maven Settings 文件路径',
+ mavenRepository: 'Maven 仓库',
+ mavenUser: 'Maven 仓库访问用户',
+ mavenPassword: 'Maven 仓库访问密码',
+ docker: 'Docker 容器服务设置',
+ email: '告警邮箱设置',
+ ingress: 'Ingress 域名设置',
+ },
+ desc: {
+ mavenSettings: '指定本地 maven 的 settings.xml 文件完成路径',
+ mavenRepository: '设置 maven 的仓库地址，可以是 maven 私服的地址或者阿里云等 maven 私服地址',
+ mavenUser: '访问 maven 私服所需的认证用户名(如需要)',
+ mavenPassword: '访问 maven 私服所需的认证密码(如需要)',
+ docker: '设置 docker 容器服务的注册信息',
+ email: '设置用于发送告警的 email 发送者信息',
+ ingress: 'ingress 设置，通过传入域名自动生成基于 nginx 的 ingress',
+ },
docker: {
address: {
label: 'Docker 地址',
diff --git
a/streampark-console/streampark-console-webapp/src/views/setting/System/SettingList.vue
b/streampark-console/streampark-console-webapp/src/views/setting/System/SettingList.vue
index 0a8c3db3d..cb2b45778 100644
---
a/streampark-console/streampark-console-webapp/src/views/setting/System/SettingList.vue
+++
b/streampark-console/streampark-console-webapp/src/views/setting/System/SettingList.vue
@@ -30,6 +30,8 @@
import { useI18n } from '/@/hooks/web/useI18n';
import SettingForm from './SettingForm.vue';
+ const { t } = useI18n();
+
const AvatarMap = {
'streampark.maven.settings': 'settings2',
'streampark.maven.central.repository': 'maven',
@@ -40,10 +42,29 @@
'ingress.mode.default': 'nginx',
};
+ const settingTitles = {
+ 'streampark.maven.settings': t('setting.system.title.mavenSettings'),
+ 'streampark.maven.central.repository':
t('setting.system.title.mavenRepository'),
+ 'streampark.maven.auth.user': t('setting.system.title.mavenUser'),
+ 'streampark.maven.auth.password': t('setting.system.title.mavenPassword'),
+ 'docker.register.address': t('setting.system.title.docker'),
+ 'alert.email.from': t('setting.system.title.email'),
+ 'ingress.mode.default': t('setting.system.title.ingress'),
+ };
+
+ const settingDesc = {
+ 'streampark.maven.settings': t('setting.system.desc.mavenSettings'),
+ 'streampark.maven.central.repository':
t('setting.system.desc.mavenRepository'),
+ 'streampark.maven.auth.user': t('setting.system.desc.mavenUser'),
+ 'streampark.maven.auth.password': t('setting.system.desc.mavenPassword'),
+ 'docker.register.address': t('setting.system.desc.docker'),
+ 'alert.email.from': t('setting.system.desc.email'),
+ 'ingress.mode.default': t('setting.system.desc.ingress'),
+ };
+
const ListItem = List.Item;
const ListItemMeta = ListItem.Meta;
- const { t } = useI18n();
const emits = defineEmits(['updateValue', 'reload']);
defineProps({
data: {
@@ -95,7 +116,13 @@
<List>
<template v-for="item in data">
<ListItem v-if="AvatarMap[item.settingKey]" :key="item.settingKey">
- <ListItemMeta :title="item.settingName"
:description="item.description" style="width: 50%">
+ <ListItemMeta style="width: 50%">
+ <template #title>
+ {{ settingTitles[item.settingKey] }}
+ </template>
+ <template #description>
+ {{ settingDesc[item.settingKey] }}
+ </template>
<template #avatar>
<div class="avatar">
<SvgIcon :name="AvatarMap[item.settingKey]" />
