You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by kr...@apache.org on 2022/12/11 10:40:13 UTC
[incubator-streampark] branch dev updated: [Improve] i18n improve (#2150)
This is an automated email from the ASF dual-hosted git repository.
kriszu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 22c88e71e [Improve] i18n improve (#2150)
22c88e71e is described below
commit 22c88e71eb576f369751f3e7a83535a10c2f930c
Author: benjobs <be...@apache.org>
AuthorDate: Sun Dec 11 18:40:08 2022 +0800
[Improve] i18n improve (#2150)
---
.../console/core/entity/ApplicationConfig.java | 5 +++--
.../console/core/service/impl/ProjectServiceImpl.java | 3 +++
.../src/locales/lang/en/flink/app.ts | 2 ++
.../src/locales/lang/zh-CN/flink/app.ts | 16 +++++++++-------
.../src/views/flink/app/hooks/useCreateAndEditSchema.ts | 10 +++++++---
.../src/views/flink/app/hooks/useFlinkSchema.ts | 10 +++++++---
6 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationConfig.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationConfig.java
index 2b41bd3a0..aa8e5d044 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationConfig.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/ApplicationConfig.java
@@ -30,6 +30,7 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import java.util.Base64;
+import java.util.Collections;
import java.util.Date;
import java.util.Map;
@@ -86,10 +87,10 @@ public class ApplicationConfig {
case HOCON:
return PropertiesUtils.fromHoconTextAsJava(DeflaterUtils.unzipString(this.content));
default:
- break;
+ return Collections.emptyMap();
}
}
- return null;
+ return Collections.emptyMap();
}
}
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index 0b7eafda6..3f333c912 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -221,6 +221,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project>
@Override
public List<String> jars(Project project) {
List<String> list = new ArrayList<>(0);
+ if (project.getModule() == null) {
+ throw new ApiAlertException("project module can not be null, please check");
+ }
File apps = new File(project.getDistHome(), project.getModule());
for (File file : Objects.requireNonNull(apps.listFiles())) {
if (file.getName().endsWith(".jar")) {
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
index 22da4eb9f..679af03de 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/en/flink/app.ts
@@ -202,6 +202,8 @@ export default {
'The application name is already exists in Kubernetes,cannot be repeated. Please check',
appNameNotValid:
'The application name is invalid.characters must be (Chinese|English|"-"|"_"),two consecutive spaces cannot appear.Please check',
+ flinkClusterIsRequiredMessage: 'Flink Cluster is required',
+ flinkSqlIsRequiredMessage: 'Flink SQL is required',
tagsPlaceholder: 'Please enter tags,if more than one, separate them with commas(,)',
parallelismPlaceholder: 'The parallelism with which to run the program',
slotsOfPerTaskManagerPlaceholder: 'Number of slots per TaskManager',
diff --git a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
index 955de01cb..a70b863fe 100644
--- a/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
+++ b/streampark-console/streampark-console-webapp/src/locales/lang/zh-CN/flink/app.ts
@@ -175,21 +175,21 @@ export default {
},
addAppTips: {
developmentModePlaceholder: '请选择开发模式',
- developmentModeIsRequiredMessage: '开发模式必选',
+ developmentModeIsRequiredMessage: '开发模式必填',
executionModePlaceholder: '请选择执行模式',
- executionModeIsRequiredMessage: '执行模式必选',
+ executionModeIsRequiredMessage: '执行模式必填',
hadoopEnvInitMessage: 'hadoop环境检查失败, 请检查配置',
- resourceFromMessage: '资源来源必选',
+ resourceFromMessage: '资源来源必填',
mainClassPlaceholder: '请输入程序入口类',
mainClassIsRequiredMessage: '入程序入口类必填',
projectPlaceholder: '请选择项目',
- projectIsRequiredMessage: '项目必选',
+ projectIsRequiredMessage: '项目必填',
projectModulePlaceholder: '请选择项目的模块',
appTypePlaceholder: '请选择作业类型',
- appTypeIsRequiredMessage: '作业类型必选',
- programJarIsRequiredMessage: '程序jar文件必选',
+ appTypeIsRequiredMessage: '作业类型必填',
+ programJarIsRequiredMessage: '程序jar文件必填',
useSysHadoopConf: '使用系统hadoop配置',
- flinkVersionIsRequiredMessage: 'Flink版本必选',
+ flinkVersionIsRequiredMessage: 'Flink版本必填',
appNamePlaceholder: '请输入作业名称',
appNameIsRequiredMessage: '作业名称必填',
appNameNotUniqueMessage: '作业名称必须唯一, 输入的作业名称已经存在',
@@ -197,6 +197,8 @@ export default {
appNameExistsInK8sMessage: '该应用程序名称已经在K8S集群中存在，不能重复。请检查',
appNameNotValid:
'应用程序名称无效。字符必须是(中文|英文|"-"|"_")，不能出现两个连续的空格，请检查',
+ flinkClusterIsRequiredMessage: 'Flink集群必填',
+ flinkSqlIsRequiredMessage: 'Flink SQL必填',
tagsPlaceholder: '请输入标签，如果超过一个，用逗号（，）分隔',
parallelismPlaceholder: '运行程序的并行度',
slotsOfPerTaskManagerPlaceholder: '每个TaskManager的插槽数',
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
index 50c7b55d0..0ff23cffa 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useCreateAndEditSchema.ts
@@ -115,7 +115,7 @@ export const useCreateAndEditSchema = (
return values?.jobType == 'sql';
}
},
- rules: [{ required: true, message: 'Flink SQL is required' }],
+ rules: [{ required: true, message: t('flink.app.addAppTips.flinkSqlIsRequiredMessage') }],
},
{
field: 'dependency',
@@ -218,7 +218,9 @@ export const useCreateAndEditSchema = (
options: getExecutionCluster(ExecModeEnum.REMOTE, 'id'),
},
ifShow: ({ values }) => values.executionMode == ExecModeEnum.REMOTE,
- rules: [{ required: true, message: 'Flink Cluster is required' }],
+ rules: [
+ { required: true, message: t('flink.app.addAppTips.flinkClusterIsRequiredMessage') },
+ ],
},
{
field: 'flinkClusterId',
@@ -229,7 +231,9 @@ export const useCreateAndEditSchema = (
options: getExecutionCluster(ExecModeEnum.YARN_SESSION, 'id'),
},
ifShow: ({ values }) => values.executionMode == ExecModeEnum.YARN_SESSION,
- rules: [{ required: true, message: 'Flink Cluster is required' }],
+ rules: [
+ { required: true, message: t('flink.app.addAppTips.flinkClusterIsRequiredMessage') },
+ ],
},
{
field: 'k8sNamespace',
diff --git a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkSchema.ts b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkSchema.ts
index 76f81eec9..ce2a4899e 100644
--- a/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkSchema.ts
+++ b/streampark-console/streampark-console-webapp/src/views/flink/app/hooks/useFlinkSchema.ts
@@ -82,7 +82,9 @@ export const useFlinkSchema = (editModel?: string) => {
};
},
ifShow: ({ values }) => values.executionMode == ExecModeEnum.REMOTE,
- rules: [{ required: true, message: 'Flink Cluster is required' }],
+ rules: [
+ { required: true, message: t('flink.app.addAppTips.flinkClusterIsRequiredMessage') },
+ ],
},
{
field: 'flinkClusterId',
@@ -96,7 +98,9 @@ export const useFlinkSchema = (editModel?: string) => {
};
},
ifShow: ({ values }) => values.executionMode == ExecModeEnum.YARN_SESSION,
- rules: [{ required: true, message: 'Flink Cluster is required' }],
+ rules: [
+ { required: true, message: t('flink.app.addAppTips.flinkClusterIsRequiredMessage') },
+ ],
},
{
field: 'k8sNamespace',
@@ -420,7 +424,7 @@ export const useFlinkSchema = (editModel?: string) => {
return values?.jobType == 'sql';
}
},
- rules: [{ required: true, message: 'Flink SQL is required' }],
+ rules: [{ required: true, message: t('flink.app.addAppTips.flinkSqlIsRequiredMessage') }],
},
{
field: 'dependency',