diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java index df361e6383..6f3013ba21 100644 --- a/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java +++ b/dinky-admin/src/main/java/org/dinky/data/dto/APIExplainSqlDTO.java @@ -19,7 +19,7 @@ package org.dinky.data.dto; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.job.JobConfig; import java.util.Map; diff --git a/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java b/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java index ee934e0cb0..d238764fe1 100644 --- a/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java +++ b/dinky-admin/src/main/java/org/dinky/data/dto/StudioMetaStoreDTO.java @@ -19,7 +19,7 @@ package org.dinky.data.dto; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.job.JobConfig; import io.swagger.annotations.ApiModel; diff --git a/dinky-admin/src/main/java/org/dinky/init/EnvInit.java b/dinky-admin/src/main/java/org/dinky/init/EnvInit.java index 4873761069..63bd5b1064 100644 --- a/dinky-admin/src/main/java/org/dinky/init/EnvInit.java +++ b/dinky-admin/src/main/java/org/dinky/init/EnvInit.java @@ -41,7 +41,7 @@ public void run(ApplicationArguments args) throws Exception { ApplicationContext application = SpringUtil.getApplicationContext(); Environment env = application.getEnvironment(); String port = env.getProperty("server.port"); - System.setProperty("dinkyAddr", ipAddress + ":" + port); + System.setProperty("dinkyAddr", "http://" + ipAddress + ":" + port); log.info( "\n----------------------------------------------------------\n\t" + "Application 'Dinky' is running! Access URLs:\n\t" diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java index b30f667cf0..ea474b121d 100644 --- a/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java +++ b/dinky-admin/src/main/java/org/dinky/job/handler/Job2MysqlHandler.java @@ -25,6 +25,7 @@ import org.dinky.daemon.task.DaemonTask; import org.dinky.daemon.task.DaemonTaskConfig; import org.dinky.data.dto.ClusterInstanceDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobStatus; import org.dinky.data.model.ClusterInstance; import org.dinky.data.model.Task; @@ -33,7 +34,6 @@ import org.dinky.data.model.job.JobInstance; import org.dinky.data.model.mapping.ClusterConfigurationMapping; import org.dinky.data.model.mapping.ClusterInstanceMapping; -import org.dinky.gateway.enums.GatewayType; import org.dinky.job.FlinkJobTask; import org.dinky.job.Job; import org.dinky.service.ClusterConfigurationService; diff --git a/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java b/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java index 0f7026146b..9a1057dd12 100644 --- a/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java +++ b/dinky-admin/src/main/java/org/dinky/job/handler/JobRefreshHandler.java @@ -25,6 +25,7 @@ import org.dinky.data.constant.FlinkRestResultConstant; import org.dinky.data.dto.ClusterConfigurationDTO; import org.dinky.data.dto.JobDataDto; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobStatus; import org.dinky.data.flink.backpressure.FlinkJobNodeBackPressure; import org.dinky.data.flink.checkpoint.CheckPointOverView; @@ -37,7 +38,6 @@ import org.dinky.data.model.job.JobInstance; import org.dinky.gateway.Gateway; import org.dinky.gateway.config.GatewayConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.exception.NotSupportGetStatusException; import org.dinky.gateway.model.FlinkClusterConfig; import org.dinky.job.JobConfig; diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java index 5cab6f6538..02b545fd8f 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/CatalogueServiceImpl.java @@ -24,6 +24,7 @@ import org.dinky.assertion.Asserts; import org.dinky.config.Dialect; import org.dinky.data.dto.CatalogueTaskDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobLifeCycle; import org.dinky.data.enums.JobStatus; import org.dinky.data.enums.Status; @@ -36,7 +37,6 @@ import org.dinky.data.model.job.JobHistory; import org.dinky.data.model.job.JobInstance; import org.dinky.data.result.Result; -import org.dinky.gateway.enums.GatewayType; import org.dinky.mapper.CatalogueMapper; import org.dinky.mybatis.service.impl.SuperServiceImpl; import org.dinky.service.CatalogueService; diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java index cf73eb1b07..c814bb44f7 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterConfigurationServiceImpl.java @@ -21,12 +21,12 @@ import org.dinky.assertion.DinkyAssert; import org.dinky.data.dto.ClusterConfigurationDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.Status; import org.dinky.data.exception.BusException; import org.dinky.data.model.ClusterConfiguration; import org.dinky.data.model.Task; import org.dinky.gateway.config.GatewayConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.model.FlinkClusterConfig; import org.dinky.gateway.result.TestResult; import org.dinky.job.JobManager; diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java index 71b89816f0..a23df8d312 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/ClusterInstanceServiceImpl.java @@ -24,6 +24,7 @@ import org.dinky.cluster.FlinkCluster; import org.dinky.cluster.FlinkClusterInfo; import org.dinky.data.dto.ClusterInstanceDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.Status; import org.dinky.data.exception.BusException; import org.dinky.data.exception.DinkyException; @@ -31,7 +32,6 @@ import org.dinky.data.model.ClusterInstance; import org.dinky.data.model.Task; import org.dinky.gateway.config.GatewayConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.exception.GatewayException; import org.dinky.gateway.model.FlinkClusterConfig; import org.dinky.gateway.result.GatewayResult; diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java index e693e2ac47..bd145e58b9 100644 --- a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java +++ b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java @@ -31,6 +31,7 @@ import org.dinky.data.dto.TaskDTO; import org.dinky.data.dto.TaskRollbackVersionDTO; import org.dinky.data.dto.TaskSubmitDto; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobLifeCycle; import org.dinky.data.enums.JobStatus; import org.dinky.data.enums.ProcessStepType; @@ -61,7 +62,6 @@ import org.dinky.function.compiler.CustomStringJavaCompiler; import org.dinky.function.pool.UdfCodePool; import org.dinky.function.util.UDFUtil; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.enums.SavePointStrategy; import org.dinky.gateway.enums.SavePointType; import org.dinky.gateway.model.FlinkClusterConfig; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java index d0aa860d47..6b0af4eaac 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlEnvTask.java @@ -23,10 +23,10 @@ import org.dinky.config.Dialect; import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.exception.NotSupportExecuteExcepition; import org.dinky.data.exception.NotSupportExplainExcepition; import org.dinky.data.result.SqlExplainResult; -import org.dinky.gateway.enums.GatewayType; import org.dinky.job.JobManager; import org.dinky.job.JobResult; import org.dinky.service.TaskService; diff --git a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java index c4f4d1ee1d..481f25fe41 100644 --- a/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java +++ b/dinky-admin/src/main/java/org/dinky/service/task/FlinkSqlTask.java @@ -23,8 +23,8 @@ import org.dinky.config.Dialect; import org.dinky.data.annotations.SupportDialect; import org.dinky.data.dto.TaskDTO; +import org.dinky.data.enums.GatewayType; import org.dinky.data.result.SqlExplainResult; -import org.dinky.gateway.enums.GatewayType; import org.dinky.job.JobManager; import org.dinky.job.JobResult; import org.dinky.service.TaskService; diff --git a/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java b/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java index 6543917aa0..4810400271 100644 --- a/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java +++ b/dinky-admin/src/main/java/org/dinky/utils/FlinkConfigOptionsUtils.java @@ -78,7 +78,6 @@ public static List loadOptionsByClassName(String name) { configList.add(config); } } catch (ClassNotFoundException ignored) { - logger.warning("Could not get config option, class not found: " + name); } return configList; } diff --git a/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass b/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass index 97f5036566..ed0e9a9adc 100644 --- a/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass +++ b/dinky-admin/src/main/resources/dinky-loader/FlinkConfClass @@ -27,6 +27,8 @@ org.apache.flink.configuration.NettyShuffleEnvironmentOptions org.apache.flink.configuration.RestartStrategyOptions org.apache.flink.streaming.api.environment.ExecutionCheckpointingOptions org.apache.flink.yarn.configuration.YarnConfigOptions +org.apache.flink.configuration.YarnConfigOptions org.apache.flink.kubernetes.configuration.KubernetesConfigOptions +org.apache.flink.configuration.KubernetesConfigOptions org.apache.flink.python.PythonOptions -org.dinky.constant.CustomerConfigureOptions +org.dinky.constant.CustomerConfigureOptions \ No newline at end of file diff --git a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java index ddc0ebb93f..a4a979fc3a 100644 --- a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java +++ b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/flinksql/Submitter.java @@ -29,6 +29,7 @@ import org.dinky.constant.FlinkSQLConstant; import org.dinky.data.app.AppParamConfig; import org.dinky.data.app.AppTask; +import org.dinky.data.enums.GatewayType; import org.dinky.data.model.SystemConfiguration; import org.dinky.executor.Executor; import org.dinky.executor.ExecutorConfig; @@ -172,9 +173,9 @@ private static void loadDep(String type, Integer taskId, ExecutorConfig executor return; } - if ("kubernetes-application".equals(type)) { + if (GatewayType.get(type).isKubernetesApplicationMode()) { try { - String httpJar = "http://" + dinkyAddr + "/download/downloadDepJar/" + taskId; + String httpJar = dinkyAddr + "/download/downloadDepJar/" + taskId; log.info("下载依赖 http-url为:{}", httpJar); String flinkHome = System.getenv("FLINK_HOME"); String usrlib = flinkHome + "/usrlib"; @@ -214,7 +215,6 @@ private static void loadDep(String type, Integer taskId, ExecutorConfig executor } } } catch (IOException e) { - log.error(""); throw new RuntimeException(e); } } diff --git a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java index 9ac3c9ffe7..6fcbc883cb 100644 --- a/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java +++ b/dinky-app/dinky-app-base/src/main/java/org/dinky/app/util/FlinkAppUtil.java @@ -107,8 +107,8 @@ public static void monitorFlinkTask(JobClient jobClient, int taskId) { private static void sendHook(int taskId, String jobId, int reTryCount) { String dinkyAddr = SystemConfiguration.getInstances().getDinkyAddr().getValue(); try { - String url = StrFormatter.format( - "http://{}/api/jobInstance/hookJobDone?taskId={}&jobId={}", dinkyAddr, taskId, jobId); + String url = + StrFormatter.format("{}/api/jobInstance/hookJobDone?taskId={}&jobId={}", dinkyAddr, taskId, jobId); String resultStr = HttpUtil.get(url); // TODO 这里应该使用Result实体类,但是Result.class不在comm里,迁移改动太大,暂时不搞 String code = JsonUtils.parseObject(resultStr).get("code").toString(); diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/enums/GatewayType.java b/dinky-common/src/main/java/org/dinky/data/enums/GatewayType.java similarity index 92% rename from dinky-gateway/src/main/java/org/dinky/gateway/enums/GatewayType.java rename to dinky-common/src/main/java/org/dinky/data/enums/GatewayType.java index e207d94af7..3b095c489f 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/enums/GatewayType.java +++ b/dinky-common/src/main/java/org/dinky/data/enums/GatewayType.java @@ -17,7 +17,7 @@ * */ -package org.dinky.gateway.enums; +package org.dinky.data.enums; import org.dinky.assertion.Asserts; @@ -122,4 +122,14 @@ public boolean isApplicationMode() { return false; } } + + public boolean isKubernetesApplicationMode() { + switch (this) { + case KUBERNETES_APPLICATION: + case KUBERNETES_APPLICATION_OPERATOR: + return true; + default: + return false; + } + } } diff --git a/dinky-common/src/main/resources/i18n/messages_en_US.properties b/dinky-common/src/main/resources/i18n/messages_en_US.properties index 7938bec400..3552212a24 100644 --- a/dinky-common/src/main/resources/i18n/messages_en_US.properties +++ b/dinky-common/src/main/resources/i18n/messages_en_US.properties @@ -191,7 +191,7 @@ sys.maven.settings.repositoryPassword.note=Maven private server authentication p sys.env.settings.pythonHome=Python Env variables sys.env.settings.pythonHome.note=Python environment variables, used to submit Python tasks and build Python Udf sys.env.settings.dinkyAddr=Dinky Address -sys.env.settings.dinkyAddr.note=The address must be the same as the address configured in the Dinky Application background url +sys.env.settings.dinkyAddr.note=This address is an accessible Dinky address, such as http://127.0.0.1:8888 sys.env.settings.jobResendDiffSecond=Alert anti-resend interval sys.env.settings.jobResendDiffSecond.note=During this interval, when the Alert information sent reaches the configured value of [Maximum number of alarm resend prevention], after reaching the threshold, the Alert information will no longer be sent; unit: seconds sys.env.settings.diffMinuteMaxSendCount=Maximum number of alarms to prevent resending diff --git a/dinky-common/src/main/resources/i18n/messages_zh_CN.properties b/dinky-common/src/main/resources/i18n/messages_zh_CN.properties index 421b7206d2..52e548f7a9 100644 --- a/dinky-common/src/main/resources/i18n/messages_zh_CN.properties +++ b/dinky-common/src/main/resources/i18n/messages_zh_CN.properties @@ -1,294 +1,294 @@ -test.connection.success=测试连接成功 -assign.menu.failed=分配菜单失败 -ldap.user.autoload.forbaid=未开启自动映射LDAP用户,请联系管理员导入 -cluster.instance.recycle.success=回收成功 -execute.failed=执行失败 -ldap.user.duplicat=ldap匹配到多个用户数据 -git.branch.not.found=获取不到分支信息 -copy.success=复制成功 -user.superadmin.cannot.disable=超级管理员用户不能停用 -user.superadmin.cannot.delete=超级管理员用户不能删除 -ds.work.flow.not.save=请先保存工作流 -schedule.status.unknown=未知状态: {0} -user.binding.role.delete.all=用户绑定角色删除所有 -modify.failed=修改失败 -git.build.success=预更新状态成功,开始执行构建流程 -menu.has.child=存在子菜单 不允许删除 -tenant.already.exists=租户已存在 -save.failed=保存失败 -assign.menu.success=分配菜单成功 -user.disabled.by.admin=当前用户已被管理员停用 -select.menu=请选择菜单 -role.not.exist=角色不存在 -delete.success=删除成功 -clear.success=清除成功 -move.success=移动成功 -ldap.login.forbid=当前用户登录模式不是LDAP,请联系管理员修改,或不使用LDAP登录 -ldap.login.test.success=LDAP 登录测试成功 -request.params.not.valid.error=请求参数[{0}]无效 -change.password.failed=修改密码失败 -menu.name.exist=菜单已存在 -ds.task.type.not.support=海豚调度类型为 [{}] 不支持,非DINKY类型 -datasource.connect.normal=数据源连接正常 -restart.success=重启成功 -test.msg.job.log.url=点击查看该任务的异常日志 -user.assign.role.success=用户分配角色成功 -global.params.check.error.value=字段: {0}, 不合法的值: {1} -change.password.success=修改密码成功 -user.not.exist=用户:{0} 不存在 -refresh.success=刷新成功 -ds.get.node.list.error=节点获取失败 -ldap.default.tenant.nofound=LDAP默认租户不存在 -copy.failed=复制失败 -folder.not.empty=该目录下存在子目录/作业,无法删除 -be.replaced=token 已被顶下线 -datasource.connect.success=数据源连接测试成功 -sign.out.success=退出成功 -added.success=新增成功 -tenant.binding.user=删除租户失败,该租户已绑定用户 -send.test.failed=测试信息发送失败 -delete.failed=删除失败 -role.binding.user=该角色已绑定用户,无法删除 -not.token=未能读取到有效 Token -execute.success=执行成功 -debug.success=调试成功 -debug.failed=调试失败 -publish.success=发布成功 -publish.failed=发布失败 -offline.success=下线成功 -offline.failed=下线失败 -version.rollback.success=版本回滚成功 -version.rollback.failed=版本回滚失败 -token.freezed=token 已被冻结 -menu.has.assign=菜单已分配,不允许删除 -datasource.status.refresh.success=数据源状态刷新成功 -user.not.login=用户未登录 -tenant.assign.user.failed=分配用户失败 -stop.success=已成功停止 -move.failed=移动失败 -get.tenant.failed=获取租户信息失败 -send.test.success=测试信息发送成功 -login.success=登录成功 -login.password.not.null=登录密码不能为空 -unknown.error=未知异常: {0} -stop.failed=停止失败 -role.name.exist=角色已存在 -ldap.filter.incorrect=用户过滤规则不能为空,请填写相关配置 -tenant.assign.user.success=分配用户成功 -ds.add.work.flow.definition.success=添加工作流定义成功 -expired.token=Token 已过期 -refresh.failed=刷新失败 -operate.success=操作成功 -git.project.not.found=获取不到项目信息 -cluster.instance.heartbeat.success=集群实例心跳成功 -ldap.no.user.found=LDAP连接成功,但未匹配到任何用户 -login.failure=用户登录失败 -request.params.error=请求参数错误 -user.not.binding.tenant=用户未绑定租户 -user.assign.role.failed=用户分配角色失败 -rename.failed=重命名失败 -test.msg.job.name=测试任务 -tenant.binding.user.delete.all=该租户绑定的用户已被全部删除 -menu.not.exist=菜单不存在 -test.msg.job.name.title=任务 -ds.task.not.exist=任务不存在 -global.params.check.error=字段: {0}, {1} -test.msg.title=实时告警监控 -user.name.passwd.error=用户名或密码不正确 -no.prefix=未按照指定前缀提交 token -query.success=查询成功 -ds.work.flow.definition.not.exist=工作流定义不存在,你可以添加工作流定义 -ds.work.flow.definition.process.update=工作流定义 [{}] 进行更新,TaskCode: [{}],参数 1: [{}],参数 2: [{}] -tenant.name.exist=租户已存在 -failed=获取失败 -added.failed=新增失败 -task.not.exist=任务不存在 -task.is.online=任务已上线,禁止修改 -task.is.existed=作业已存在 -task.is.publish.cannot.delete=作业已发布,无法删除,请先下线 -task.is.running.cannot.delete=作业正在运行,无法删除,请先停止 -job.alert.max.send.count=你配置了指定时间间隔[{}]秒内最大发送次数为:[{}],当前时间在指定时间间隔前的时间区间内,且已经发送记录数为:[{}],不发送告警消息 -cluster.instance.deploy=部署完成 -clear.failed=清除失败 -rename.success=重命名成功 -job.release.disabled.update=作业已发布,禁止修改 -success=获取成功 -tenant.not.exist=租户不存在 -user.already.exists=用户名已存在 -git.building=此任务正在构建 -ds.work.flow.definition.task.name.exist=工作流定义 [{}] 已存在任务定义 [{}] , 将执行更新操作 -role.already.exists=角色已存在 -internal.server.error.args=服务端异常: {0} -kick.out=token 已被踢下线 -restart.failed=重启失败 -invalid.token=无效的 Token -datasource.not.exist=数据源不存在 -datasource.clear.cache.success=清除库表缓存成功 -datasource.exist.relationship=数据源已存在关联关系,不允许删除 -tenant.admin.already.exists=已存在租户管理员, 租户超管只能有一个 -ds.work.flow.definition.online=工作流定义 [{}] 已经上线 -test.msg.job.url=跳转至该任务 -savepoint.is.null=保存点为空 -git.sort.success=排序成功 -ds.add.task.definition.success=添加任务定义成功 -alert.group.exist=告警组已存在 -alert.group.exist.relationship=告警组已存在关联关系,不允许删除 -alert.template.exist.relationship=告警模板已存在关联关系,不允许删除 -git.sort.failed=排序失败 -query.failed=查询失败 -save.success=保存成功 -cluster.instance.kill=已杀死该进程/集群 -cluster.not.exist=集群不存在 -cluster.instance.exist.relationship=集群实例已存在关联关系,不允许删除 -cluster.instance.local.not.support.kill=Local 模式集群实例暂未实现停止功能 -cluster.instance.not.health=集群实例状态不健康 -cluster.instance.health.not.delete=集群实例为可用状态,不允许删除,请先停止该集群实例 -cluster.config.exist.relationship=集群配置已存在关联关系,不允许删除 -udf.template.exist.relationship=UDF模板已存在关联关系,不允许删除 -operate.failed=操作失败 -test.connection.failed=测试连接失败 -switching.tenant.success=选择租户成功 -tenant.name.not.exist=租户不存在 -job.instance.not.exist=作业实例不存在 -modify.success=修改成功 -user.old.password.incorrect=用户旧密码不正确 -ldap.user.incorrect=LDAP用户名(DN)不正确 -role.binding.row.permission=该角色已绑定行权限,无法删除 +test.connection.success=\u6D4B\u8BD5\u8FDE\u63A5\u6210\u529F +assign.menu.failed=\u5206\u914D\u83DC\u5355\u5931\u8D25 +ldap.user.autoload.forbaid=\u672A\u5F00\u542F\u81EA\u52A8\u6620\u5C04LDAP\u7528\u6237\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u5BFC\u5165 +cluster.instance.recycle.success=\u56DE\u6536\u6210\u529F +execute.failed=\u6267\u884C\u5931\u8D25 +ldap.user.duplicat=ldap\u5339\u914D\u5230\u591A\u4E2A\u7528\u6237\u6570\u636E +git.branch.not.found=\u83B7\u53D6\u4E0D\u5230\u5206\u652F\u4FE1\u606F +copy.success=\u590D\u5236\u6210\u529F +user.superadmin.cannot.disable=\u8D85\u7EA7\u7BA1\u7406\u5458\u7528\u6237\u4E0D\u80FD\u505C\u7528 +user.superadmin.cannot.delete=\u8D85\u7EA7\u7BA1\u7406\u5458\u7528\u6237\u4E0D\u80FD\u5220\u9664 +ds.work.flow.not.save=\u8BF7\u5148\u4FDD\u5B58\u5DE5\u4F5C\u6D41 +schedule.status.unknown=\u672A\u77E5\u72B6\u6001: {0} +user.binding.role.delete.all=\u7528\u6237\u7ED1\u5B9A\u89D2\u8272\u5220\u9664\u6240\u6709 +modify.failed=\u4FEE\u6539\u5931\u8D25 +git.build.success=\u9884\u66F4\u65B0\u72B6\u6001\u6210\u529F,\u5F00\u59CB\u6267\u884C\u6784\u5EFA\u6D41\u7A0B +menu.has.child=\u5B58\u5728\u5B50\u83DC\u5355 \u4E0D\u5141\u8BB8\u5220\u9664 +tenant.already.exists=\u79DF\u6237\u5DF2\u5B58\u5728 +save.failed=\u4FDD\u5B58\u5931\u8D25 +assign.menu.success=\u5206\u914D\u83DC\u5355\u6210\u529F +user.disabled.by.admin=\u5F53\u524D\u7528\u6237\u5DF2\u88AB\u7BA1\u7406\u5458\u505C\u7528 +select.menu=\u8BF7\u9009\u62E9\u83DC\u5355 +role.not.exist=\u89D2\u8272\u4E0D\u5B58\u5728 +delete.success=\u5220\u9664\u6210\u529F +clear.success=\u6E05\u9664\u6210\u529F +move.success=\u79FB\u52A8\u6210\u529F +ldap.login.forbid=\u5F53\u524D\u7528\u6237\u767B\u5F55\u6A21\u5F0F\u4E0D\u662FLDAP\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u4FEE\u6539,\u6216\u4E0D\u4F7F\u7528LDAP\u767B\u5F55 +ldap.login.test.success=LDAP \u767B\u5F55\u6D4B\u8BD5\u6210\u529F +request.params.not.valid.error=\u8BF7\u6C42\u53C2\u6570[{0}]\u65E0\u6548 +change.password.failed=\u4FEE\u6539\u5BC6\u7801\u5931\u8D25 +menu.name.exist=\u83DC\u5355\u5DF2\u5B58\u5728 +ds.task.type.not.support=\u6D77\u8C5A\u8C03\u5EA6\u7C7B\u578B\u4E3A [{}] \u4E0D\u652F\u6301,\u975EDINKY\u7C7B\u578B +datasource.connect.normal=\u6570\u636E\u6E90\u8FDE\u63A5\u6B63\u5E38 +restart.success=\u91CD\u542F\u6210\u529F +test.msg.job.log.url=\u70B9\u51FB\u67E5\u770B\u8BE5\u4EFB\u52A1\u7684\u5F02\u5E38\u65E5\u5FD7 +user.assign.role.success=\u7528\u6237\u5206\u914D\u89D2\u8272\u6210\u529F +global.params.check.error.value=\u5B57\u6BB5: {0}, \u4E0D\u5408\u6CD5\u7684\u503C: {1} +change.password.success=\u4FEE\u6539\u5BC6\u7801\u6210\u529F +user.not.exist=\u7528\u6237:{0} \u4E0D\u5B58\u5728 +refresh.success=\u5237\u65B0\u6210\u529F +ds.get.node.list.error=\u8282\u70B9\u83B7\u53D6\u5931\u8D25 +ldap.default.tenant.nofound=LDAP\u9ED8\u8BA4\u79DF\u6237\u4E0D\u5B58\u5728 +copy.failed=\u590D\u5236\u5931\u8D25 +folder.not.empty=\u8BE5\u76EE\u5F55\u4E0B\u5B58\u5728\u5B50\u76EE\u5F55/\u4F5C\u4E1A\uFF0C\u65E0\u6CD5\u5220\u9664 +be.replaced=token \u5DF2\u88AB\u9876\u4E0B\u7EBF +datasource.connect.success=\u6570\u636E\u6E90\u8FDE\u63A5\u6D4B\u8BD5\u6210\u529F +sign.out.success=\u9000\u51FA\u6210\u529F +added.success=\u65B0\u589E\u6210\u529F +tenant.binding.user=\u5220\u9664\u79DF\u6237\u5931\u8D25\uFF0C\u8BE5\u79DF\u6237\u5DF2\u7ED1\u5B9A\u7528\u6237 +send.test.failed=\u6D4B\u8BD5\u4FE1\u606F\u53D1\u9001\u5931\u8D25 +delete.failed=\u5220\u9664\u5931\u8D25 +role.binding.user=\u8BE5\u89D2\u8272\u5DF2\u7ED1\u5B9A\u7528\u6237\uFF0C\u65E0\u6CD5\u5220\u9664 +not.token=\u672A\u80FD\u8BFB\u53D6\u5230\u6709\u6548 Token +execute.success=\u6267\u884C\u6210\u529F +debug.success=\u8C03\u8BD5\u6210\u529F +debug.failed=\u8C03\u8BD5\u5931\u8D25 +publish.success=\u53D1\u5E03\u6210\u529F +publish.failed=\u53D1\u5E03\u5931\u8D25 +offline.success=\u4E0B\u7EBF\u6210\u529F +offline.failed=\u4E0B\u7EBF\u5931\u8D25 +version.rollback.success=\u7248\u672C\u56DE\u6EDA\u6210\u529F +version.rollback.failed=\u7248\u672C\u56DE\u6EDA\u5931\u8D25 +token.freezed=token \u5DF2\u88AB\u51BB\u7ED3 +menu.has.assign=\u83DC\u5355\u5DF2\u5206\u914D,\u4E0D\u5141\u8BB8\u5220\u9664 +datasource.status.refresh.success=\u6570\u636E\u6E90\u72B6\u6001\u5237\u65B0\u6210\u529F +user.not.login=\u7528\u6237\u672A\u767B\u5F55 +tenant.assign.user.failed=\u5206\u914D\u7528\u6237\u5931\u8D25 +stop.success=\u5DF2\u6210\u529F\u505C\u6B62 +move.failed=\u79FB\u52A8\u5931\u8D25 +get.tenant.failed=\u83B7\u53D6\u79DF\u6237\u4FE1\u606F\u5931\u8D25 +send.test.success=\u6D4B\u8BD5\u4FE1\u606F\u53D1\u9001\u6210\u529F +login.success=\u767B\u5F55\u6210\u529F +login.password.not.null=\u767B\u5F55\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A +unknown.error=\u672A\u77E5\u5F02\u5E38: {0} +stop.failed=\u505C\u6B62\u5931\u8D25 +role.name.exist=\u89D2\u8272\u5DF2\u5B58\u5728 +ldap.filter.incorrect=\u7528\u6237\u8FC7\u6EE4\u89C4\u5219\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u8BF7\u586B\u5199\u76F8\u5173\u914D\u7F6E +tenant.assign.user.success=\u5206\u914D\u7528\u6237\u6210\u529F +ds.add.work.flow.definition.success=\u6DFB\u52A0\u5DE5\u4F5C\u6D41\u5B9A\u4E49\u6210\u529F +expired.token=Token \u5DF2\u8FC7\u671F +refresh.failed=\u5237\u65B0\u5931\u8D25 +operate.success=\u64CD\u4F5C\u6210\u529F +git.project.not.found=\u83B7\u53D6\u4E0D\u5230\u9879\u76EE\u4FE1\u606F +cluster.instance.heartbeat.success=\u96C6\u7FA4\u5B9E\u4F8B\u5FC3\u8DF3\u6210\u529F +ldap.no.user.found=LDAP\u8FDE\u63A5\u6210\u529F\uFF0C\u4F46\u672A\u5339\u914D\u5230\u4EFB\u4F55\u7528\u6237 +login.failure=\u7528\u6237\u767B\u5F55\u5931\u8D25 +request.params.error=\u8BF7\u6C42\u53C2\u6570\u9519\u8BEF +user.not.binding.tenant=\u7528\u6237\u672A\u7ED1\u5B9A\u79DF\u6237 +user.assign.role.failed=\u7528\u6237\u5206\u914D\u89D2\u8272\u5931\u8D25 +rename.failed=\u91CD\u547D\u540D\u5931\u8D25 +test.msg.job.name=\u6D4B\u8BD5\u4EFB\u52A1 +tenant.binding.user.delete.all=\u8BE5\u79DF\u6237\u7ED1\u5B9A\u7684\u7528\u6237\u5DF2\u88AB\u5168\u90E8\u5220\u9664 +menu.not.exist=\u83DC\u5355\u4E0D\u5B58\u5728 +test.msg.job.name.title=\u4EFB\u52A1 +ds.task.not.exist=\u4EFB\u52A1\u4E0D\u5B58\u5728 +global.params.check.error=\u5B57\u6BB5: {0}, {1} +test.msg.title=\u5B9E\u65F6\u544A\u8B66\u76D1\u63A7 +user.name.passwd.error=\u7528\u6237\u540D\u6216\u5BC6\u7801\u4E0D\u6B63\u786E +no.prefix=\u672A\u6309\u7167\u6307\u5B9A\u524D\u7F00\u63D0\u4EA4 token +query.success=\u67E5\u8BE2\u6210\u529F +ds.work.flow.definition.not.exist=\u5DE5\u4F5C\u6D41\u5B9A\u4E49\u4E0D\u5B58\u5728,\u4F60\u53EF\u4EE5\u6DFB\u52A0\u5DE5\u4F5C\u6D41\u5B9A\u4E49 +ds.work.flow.definition.process.update=\u5DE5\u4F5C\u6D41\u5B9A\u4E49 [{}] \u8FDB\u884C\u66F4\u65B0,TaskCode: [{}],\u53C2\u6570 1: [{}],\u53C2\u6570 2: [{}] +tenant.name.exist=\u79DF\u6237\u5DF2\u5B58\u5728 +failed=\u83B7\u53D6\u5931\u8D25 +added.failed=\u65B0\u589E\u5931\u8D25 +task.not.exist=\u4EFB\u52A1\u4E0D\u5B58\u5728 +task.is.online=\u4EFB\u52A1\u5DF2\u4E0A\u7EBF\uFF0C\u7981\u6B62\u4FEE\u6539 +task.is.existed=\u4F5C\u4E1A\u5DF2\u5B58\u5728 +task.is.publish.cannot.delete=\u4F5C\u4E1A\u5DF2\u53D1\u5E03\uFF0C\u65E0\u6CD5\u5220\u9664,\u8BF7\u5148\u4E0B\u7EBF +task.is.running.cannot.delete=\u4F5C\u4E1A\u6B63\u5728\u8FD0\u884C\uFF0C\u65E0\u6CD5\u5220\u9664,\u8BF7\u5148\u505C\u6B62 +job.alert.max.send.count=\u4F60\u914D\u7F6E\u4E86\u6307\u5B9A\u65F6\u95F4\u95F4\u9694[{}]\u79D2\u5185\u6700\u5927\u53D1\u9001\u6B21\u6570\u4E3A\uFF1A[{}]\uFF0C\u5F53\u524D\u65F6\u95F4\u5728\u6307\u5B9A\u65F6\u95F4\u95F4\u9694\u524D\u7684\u65F6\u95F4\u533A\u95F4\u5185\uFF0C\u4E14\u5DF2\u7ECF\u53D1\u9001\u8BB0\u5F55\u6570\u4E3A\uFF1A[{}]\uFF0C\u4E0D\u53D1\u9001\u544A\u8B66\u6D88\u606F +cluster.instance.deploy=\u90E8\u7F72\u5B8C\u6210 +clear.failed=\u6E05\u9664\u5931\u8D25 +rename.success=\u91CD\u547D\u540D\u6210\u529F +job.release.disabled.update=\u4F5C\u4E1A\u5DF2\u53D1\u5E03\uFF0C\u7981\u6B62\u4FEE\u6539 +success=\u83B7\u53D6\u6210\u529F +tenant.not.exist=\u79DF\u6237\u4E0D\u5B58\u5728 +user.already.exists=\u7528\u6237\u540D\u5DF2\u5B58\u5728 +git.building=\u6B64\u4EFB\u52A1\u6B63\u5728\u6784\u5EFA +ds.work.flow.definition.task.name.exist=\u5DE5\u4F5C\u6D41\u5B9A\u4E49 [{}] \u5DF2\u5B58\u5728\u4EFB\u52A1\u5B9A\u4E49 [{}] , \u5C06\u6267\u884C\u66F4\u65B0\u64CD\u4F5C +role.already.exists=\u89D2\u8272\u5DF2\u5B58\u5728 +internal.server.error.args=\u670D\u52A1\u7AEF\u5F02\u5E38: {0} +kick.out=token \u5DF2\u88AB\u8E22\u4E0B\u7EBF +restart.failed=\u91CD\u542F\u5931\u8D25 +invalid.token=\u65E0\u6548\u7684 Token +datasource.not.exist=\u6570\u636E\u6E90\u4E0D\u5B58\u5728 +datasource.clear.cache.success=\u6E05\u9664\u5E93\u8868\u7F13\u5B58\u6210\u529F +datasource.exist.relationship=\u6570\u636E\u6E90\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +tenant.admin.already.exists=\u5DF2\u5B58\u5728\u79DF\u6237\u7BA1\u7406\u5458, \u79DF\u6237\u8D85\u7BA1\u53EA\u80FD\u6709\u4E00\u4E2A +ds.work.flow.definition.online=\u5DE5\u4F5C\u6D41\u5B9A\u4E49 [{}] \u5DF2\u7ECF\u4E0A\u7EBF +test.msg.job.url=\u8DF3\u8F6C\u81F3\u8BE5\u4EFB\u52A1 +savepoint.is.null=\u4FDD\u5B58\u70B9\u4E3A\u7A7A +git.sort.success=\u6392\u5E8F\u6210\u529F +ds.add.task.definition.success=\u6DFB\u52A0\u4EFB\u52A1\u5B9A\u4E49\u6210\u529F +alert.group.exist=\u544A\u8B66\u7EC4\u5DF2\u5B58\u5728 +alert.group.exist.relationship=\u544A\u8B66\u7EC4\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +alert.template.exist.relationship=\u544A\u8B66\u6A21\u677F\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +git.sort.failed=\u6392\u5E8F\u5931\u8D25 +query.failed=\u67E5\u8BE2\u5931\u8D25 +save.success=\u4FDD\u5B58\u6210\u529F +cluster.instance.kill=\u5DF2\u6740\u6B7B\u8BE5\u8FDB\u7A0B/\u96C6\u7FA4 +cluster.not.exist=\u96C6\u7FA4\u4E0D\u5B58\u5728 +cluster.instance.exist.relationship=\u96C6\u7FA4\u5B9E\u4F8B\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +cluster.instance.local.not.support.kill=Local \u6A21\u5F0F\u96C6\u7FA4\u5B9E\u4F8B\u6682\u672A\u5B9E\u73B0\u505C\u6B62\u529F\u80FD +cluster.instance.not.health=\u96C6\u7FA4\u5B9E\u4F8B\u72B6\u6001\u4E0D\u5065\u5EB7 +cluster.instance.health.not.delete=\u96C6\u7FA4\u5B9E\u4F8B\u4E3A\u53EF\u7528\u72B6\u6001,\u4E0D\u5141\u8BB8\u5220\u9664,\u8BF7\u5148\u505C\u6B62\u8BE5\u96C6\u7FA4\u5B9E\u4F8B +cluster.config.exist.relationship=\u96C6\u7FA4\u914D\u7F6E\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +udf.template.exist.relationship=UDF\u6A21\u677F\u5DF2\u5B58\u5728\u5173\u8054\u5173\u7CFB,\u4E0D\u5141\u8BB8\u5220\u9664 +operate.failed=\u64CD\u4F5C\u5931\u8D25 +test.connection.failed=\u6D4B\u8BD5\u8FDE\u63A5\u5931\u8D25 +switching.tenant.success=\u9009\u62E9\u79DF\u6237\u6210\u529F +tenant.name.not.exist=\u79DF\u6237\u4E0D\u5B58\u5728 +job.instance.not.exist=\u4F5C\u4E1A\u5B9E\u4F8B\u4E0D\u5B58\u5728 +modify.success=\u4FEE\u6539\u6210\u529F +user.old.password.incorrect=\u7528\u6237\u65E7\u5BC6\u7801\u4E0D\u6B63\u786E +ldap.user.incorrect=LDAP\u7528\u6237\u540D\uFF08DN\uFF09\u4E0D\u6B63\u786E +role.binding.row.permission=\u8BE5\u89D2\u8272\u5DF2\u7ED1\u5B9A\u884C\u6743\u9650\uFF0C\u65E0\u6CD5\u5220\u9664 # dinky-admin -unknown.i18n=未知 i18n 信息,请检查. . . +unknown.i18n=\u672A\u77E5 i18n \u4FE1\u606F,\u8BF7\u68C0\u67E5. . . -file.upload.failed=文件上传失败, 原因: {0} -file.rename.failed=文件重命名失败, 原因: {0} -file.delete.failed=文件删除失败, 原因: {0} -file.read.failed=文件读取失败, 原因: {0} +file.upload.failed=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25, \u539F\u56E0: {0} +file.rename.failed=\u6587\u4EF6\u91CD\u547D\u540D\u5931\u8D25, \u539F\u56E0: {0} +file.delete.failed=\u6587\u4EF6\u5220\u9664\u5931\u8D25, \u539F\u56E0: {0} +file.read.failed=\u6587\u4EF6\u8BFB\u53D6\u5931\u8D25, \u539F\u56E0: {0} -daemon.task.config.not.exist=线程任务配置不能为空 -daemon.task.not.support=不支持线程任务类型: +daemon.task.config.not.exist=\u7EBF\u7A0B\u4EFB\u52A1\u914D\u7F6E\u4E0D\u80FD\u4E3A\u7A7A +daemon.task.not.support=\u4E0D\u652F\u6301\u7EBF\u7A0B\u4EFB\u52A1\u7C7B\u578B\uFF1A # dinky-alert -alert.rule.jobFail=作业失败 -alert.rule.getJobInfoFail=获取作业信息失败 -alert.rule.jobRestart=作业重启 -alert.rule.checkpointFail=checkpoint失败 -alert.rule.jobRunException=作业运行异常 -alert.rule.checkpointTimeout=checkpoint超时 +alert.rule.jobFail=\u4F5C\u4E1A\u5931\u8D25 +alert.rule.getJobInfoFail=\u83B7\u53D6\u4F5C\u4E1A\u4FE1\u606F\u5931\u8D25 +alert.rule.jobRestart=\u4F5C\u4E1A\u91CD\u542F +alert.rule.checkpointFail=checkpoint\u5931\u8D25 +alert.rule.jobRunException=\u4F5C\u4E1A\u8FD0\u884C\u5F02\u5E38 +alert.rule.checkpointTimeout=checkpoint\u8D85\u65F6 # system config -sys.flink.settings.useRestAPI=使用 Rest API -sys.flink.settings.useRestAPI.note=在运维 Flink 任务时是否使用 RestAPI -sys.flink.settings.jobIdWait=Job 提交等待时间 -sys.flink.settings.jobIdWait.note=提交 Application 或 PerJob 任务时获取 Job ID 的最大等待时间(秒) -sys.maven.settings.settingsFilePath=Maven 配置文件路径 -sys.maven.settings.settingsFilePath.note=Maven 配置文件路径, eg: /opt/maven-3.9.2/conf/settings.xml ,请注意: 默认情况下会获取所在主机的 MAVEN_HOME 环境变量,则此处无需填写,如果没有配置请填写绝对路径 -sys.maven.settings.repository=Maven 仓库地址 -sys.maven.settings.repository.note=Maven 仓库地址 -sys.maven.settings.repositoryUser=Maven 仓库用户名 -sys.maven.settings.repositoryUser.note=Maven 私服认证用户名,如果需要配置 Maven 私服仓库认证信息,请填写此项 -sys.maven.settings.repositoryPassword=Maven 仓库密码 -sys.maven.settings.repositoryPassword.note=Maven 私服认证密码,如果需要配置 Maven 私服仓库认证信息,请填写此项 -sys.env.settings.pythonHome=Python 环境变量 -sys.env.settings.pythonHome.note=Python 环境变量,用于提交 Python 任务以及构建 Python Udf -sys.env.settings.dinkyAddr=Dinky 地址 -sys.env.settings.dinkyAddr.note=该地址必须与Dinky Application后台url中配置的地址相同 -sys.env.settings.jobResendDiffSecond=告警防重发间隔 -sys.env.settings.jobResendDiffSecond.note=在此间隔内,发送告警信息达到 [告警防重发最大条数] 配置的值时,达到阈值后,不再发送告警信息; 单位:秒 -sys.env.settings.diffMinuteMaxSendCount=告警防重发最大条数 -sys.env.settings.diffMinuteMaxSendCount.note=此配置用于在 [告警防重发间隔] 配置的指定间隔内,发送了 N 次告警信息,达到此配置设置的最大条数后,不再发送告警信息,注意: 此配置以[任务实例+告警策略]为维度,即: 每个[任务实例+告警策略]组合都会单独计算 -sys.env.settings.maxRetainDays=作业历史最大保留天数 -sys.env.settings.maxRetainDays.note=提交的作业历史与自动注册的集群记录最大保留天数,过期会被自动删除 -sys.env.settings.maxRetainCount=作业历史最大保留数量 -sys.env.settings.maxRetainCount.note=提交的作业历史与自动注册的集群记录最大保留数量,如果不足该数量,则不会被删除,即使已经过了最大保留天数 +sys.flink.settings.useRestAPI=\u4F7F\u7528 Rest API +sys.flink.settings.useRestAPI.note=\u5728\u8FD0\u7EF4 Flink \u4EFB\u52A1\u65F6\u662F\u5426\u4F7F\u7528 RestAPI +sys.flink.settings.jobIdWait=Job \u63D0\u4EA4\u7B49\u5F85\u65F6\u95F4 +sys.flink.settings.jobIdWait.note=\u63D0\u4EA4 Application \u6216 PerJob \u4EFB\u52A1\u65F6\u83B7\u53D6 Job ID \u7684\u6700\u5927\u7B49\u5F85\u65F6\u95F4\uFF08\u79D2\uFF09 +sys.maven.settings.settingsFilePath=Maven \u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84 +sys.maven.settings.settingsFilePath.note=Maven \u914D\u7F6E\u6587\u4EF6\u8DEF\u5F84, eg: /opt/maven-3.9.2/conf/settings.xml ,\u8BF7\u6CE8\u610F: \u9ED8\u8BA4\u60C5\u51B5\u4E0B\u4F1A\u83B7\u53D6\u6240\u5728\u4E3B\u673A\u7684 MAVEN_HOME \u73AF\u5883\u53D8\u91CF,\u5219\u6B64\u5904\u65E0\u9700\u586B\u5199,\u5982\u679C\u6CA1\u6709\u914D\u7F6E\u8BF7\u586B\u5199\u7EDD\u5BF9\u8DEF\u5F84 +sys.maven.settings.repository=Maven \u4ED3\u5E93\u5730\u5740 +sys.maven.settings.repository.note=Maven \u4ED3\u5E93\u5730\u5740 +sys.maven.settings.repositoryUser=Maven \u4ED3\u5E93\u7528\u6237\u540D +sys.maven.settings.repositoryUser.note=Maven \u79C1\u670D\u8BA4\u8BC1\u7528\u6237\u540D,\u5982\u679C\u9700\u8981\u914D\u7F6E Maven \u79C1\u670D\u4ED3\u5E93\u8BA4\u8BC1\u4FE1\u606F,\u8BF7\u586B\u5199\u6B64\u9879 +sys.maven.settings.repositoryPassword=Maven \u4ED3\u5E93\u5BC6\u7801 +sys.maven.settings.repositoryPassword.note=Maven \u79C1\u670D\u8BA4\u8BC1\u5BC6\u7801,\u5982\u679C\u9700\u8981\u914D\u7F6E Maven \u79C1\u670D\u4ED3\u5E93\u8BA4\u8BC1\u4FE1\u606F,\u8BF7\u586B\u5199\u6B64\u9879 +sys.env.settings.pythonHome=Python \u73AF\u5883\u53D8\u91CF +sys.env.settings.pythonHome.note=Python \u73AF\u5883\u53D8\u91CF,\u7528\u4E8E\u63D0\u4EA4 Python \u4EFB\u52A1\u4EE5\u53CA\u6784\u5EFA Python Udf +sys.env.settings.dinkyAddr=Dinky \u5730\u5740 +sys.env.settings.dinkyAddr.note=\u8BE5\u5730\u5740\u4E3A\u53EF\u8BBF\u95EE\u7684 Dinky \u5730\u5740\uFF0C\u5982 http://127.0.0.1:8888 +sys.env.settings.jobResendDiffSecond=\u544A\u8B66\u9632\u91CD\u53D1\u95F4\u9694 +sys.env.settings.jobResendDiffSecond.note=\u5728\u6B64\u95F4\u9694\u5185,\u53D1\u9001\u544A\u8B66\u4FE1\u606F\u8FBE\u5230 [\u544A\u8B66\u9632\u91CD\u53D1\u6700\u5927\u6761\u6570] \u914D\u7F6E\u7684\u503C\u65F6,\u8FBE\u5230\u9608\u503C\u540E,\u4E0D\u518D\u53D1\u9001\u544A\u8B66\u4FE1\u606F; \u5355\u4F4D\uFF1A\u79D2 +sys.env.settings.diffMinuteMaxSendCount=\u544A\u8B66\u9632\u91CD\u53D1\u6700\u5927\u6761\u6570 +sys.env.settings.diffMinuteMaxSendCount.note=\u6B64\u914D\u7F6E\u7528\u4E8E\u5728 [\u544A\u8B66\u9632\u91CD\u53D1\u95F4\u9694] \u914D\u7F6E\u7684\u6307\u5B9A\u95F4\u9694\u5185,\u53D1\u9001\u4E86 N \u6B21\u544A\u8B66\u4FE1\u606F,\u8FBE\u5230\u6B64\u914D\u7F6E\u8BBE\u7F6E\u7684\u6700\u5927\u6761\u6570\u540E,\u4E0D\u518D\u53D1\u9001\u544A\u8B66\u4FE1\u606F,\u6CE8\u610F: \u6B64\u914D\u7F6E\u4EE5[\u4EFB\u52A1\u5B9E\u4F8B+\u544A\u8B66\u7B56\u7565]\u4E3A\u7EF4\u5EA6,\u5373: \u6BCF\u4E2A[\u4EFB\u52A1\u5B9E\u4F8B+\u544A\u8B66\u7B56\u7565]\u7EC4\u5408\u90FD\u4F1A\u5355\u72EC\u8BA1\u7B97 +sys.env.settings.maxRetainDays=\u4F5C\u4E1A\u5386\u53F2\u6700\u5927\u4FDD\u7559\u5929\u6570 +sys.env.settings.maxRetainDays.note=\u63D0\u4EA4\u7684\u4F5C\u4E1A\u5386\u53F2\u4E0E\u81EA\u52A8\u6CE8\u518C\u7684\u96C6\u7FA4\u8BB0\u5F55\u6700\u5927\u4FDD\u7559\u5929\u6570\uFF0C\u8FC7\u671F\u4F1A\u88AB\u81EA\u52A8\u5220\u9664 +sys.env.settings.maxRetainCount=\u4F5C\u4E1A\u5386\u53F2\u6700\u5927\u4FDD\u7559\u6570\u91CF +sys.env.settings.maxRetainCount.note=\u63D0\u4EA4\u7684\u4F5C\u4E1A\u5386\u53F2\u4E0E\u81EA\u52A8\u6CE8\u518C\u7684\u96C6\u7FA4\u8BB0\u5F55\u6700\u5927\u4FDD\u7559\u6570\u91CF\uFF0C\u5982\u679C\u4E0D\u8DB3\u8BE5\u6570\u91CF\uFF0C\u5219\u4E0D\u4F1A\u88AB\u5220\u9664\uFF0C\u5373\u4F7F\u5DF2\u7ECF\u8FC7\u4E86\u6700\u5927\u4FDD\u7559\u5929\u6570 -sys.dolphinscheduler.settings.enable=是否启用 DolphinScheduler -sys.dolphinscheduler.settings.enable.note=是否启用 DolphinScheduler ,启用后才能使用 DolphinScheduler 的相关功能,请先填写下列配置项,完成后再开启此项配置, 另:请确保 DolphinScheduler 的相关配置正确 -sys.dolphinscheduler.settings.url=DolphinScheduler 地址 -sys.dolphinscheduler.settings.url.note=地址必须和DolphinScheduler后台配置的地址一致,eg: http://127.0.0.1:12345/dolphinscheduler +sys.dolphinscheduler.settings.enable=\u662F\u5426\u542F\u7528 DolphinScheduler +sys.dolphinscheduler.settings.enable.note=\u662F\u5426\u542F\u7528 DolphinScheduler ,\u542F\u7528\u540E\u624D\u80FD\u4F7F\u7528 DolphinScheduler \u7684\u76F8\u5173\u529F\u80FD,\u8BF7\u5148\u586B\u5199\u4E0B\u5217\u914D\u7F6E\u9879,\u5B8C\u6210\u540E\u518D\u5F00\u542F\u6B64\u9879\u914D\u7F6E, \u53E6:\u8BF7\u786E\u4FDD DolphinScheduler \u7684\u76F8\u5173\u914D\u7F6E\u6B63\u786E +sys.dolphinscheduler.settings.url=DolphinScheduler \u5730\u5740 +sys.dolphinscheduler.settings.url.note=\u5730\u5740\u5FC5\u987B\u548CDolphinScheduler\u540E\u53F0\u914D\u7F6E\u7684\u5730\u5740\u4E00\u81F4\uFF0Ceg: http://127.0.0.1:12345/dolphinscheduler sys.dolphinscheduler.settings.token=DolphinScheduler Token -sys.dolphinscheduler.settings.token.note=DolphinScheduler的Token,请在DolphinScheduler的安全中心->令牌管理中创建一个token,并填入该配置中 -sys.dolphinscheduler.settings.projectName=DolphinScheduler 项目名 -sys.dolphinscheduler.settings.projectName.note=DolphinScheduler 中指定的项目名称,不区分大小写 -sys.ldap.settings.url=Ldap 服务地址 -sys.ldap.settings.url.note=Ldap 认证服务地址,例如:ldap://192.168.111.1:389 -sys.ldap.settings.userDn=登录用户名(DN) -sys.ldap.settings.userDn.note=用于连接 Ldap 服务的用户名,或者管理员DN -sys.ldap.settings.userPassword=登录密码 -sys.ldap.settings.userPassword.note=用于连接ldap服务的密码 -sys.ldap.settings.timeLimit=连接超时 -sys.ldap.settings.timeLimit.note=连接 Ldap 服务的最大时间,超过则断开 -sys.ldap.settings.baseDn=用户基础 DN -sys.ldap.settings.baseDn.note=Dinky 会在此基础 DN 下进行用户搜索,例如:ou=users,dc=dinky,dc=com -sys.ldap.settings.filter=用户过滤规则 -sys.ldap.settings.filter.note=使用 Ldap 的 filter 语法进行用户过滤 -sys.ldap.settings.autoload=登录时自动映射用户 -sys.ldap.settings.autoload.note=开启后,当用户使用 LDAP 登录时,如果没有相应的 Dinky 用户映射,则会自动拉取 LDAP 信息创建一个 Dinky 用户与之映射,如果关闭此功能,对于未导入的 LDAP 用户将无法登录 -sys.ldap.settings.defaultTeant=LDAP 导入默认租户编码 -sys.ldap.settings.defaultTeant.note=开启自动导入用户后,新用户登录需要一个默认的租户编码,否则无法登录,例如: DefaultTenant -sys.ldap.settings.castUsername=LDAP 用户名字段 -sys.ldap.settings.castUsername.note=需要填写一个 LDAP 中用户的属性字段来与 Dinky 用户对应,必须填写,一般可选为 cn 或者 uid表示用户唯一标识 -sys.ldap.settings.castNickname=LDAP 昵称字段 -sys.ldap.settings.castNickname.note=需要填写一个 LDAP 中用户的属性字段来与 Dinky 昵称对应,必须填写,一般可选为 sn 或者其他标识,不要求唯一 -sys.ldap.settings.enable=是否启用 Ldap -sys.ldap.settings.enable.note=开启 LDAP 登录功能 -sys.metrics.settings.sys.enable=Dinky JVM Monitor 开关 -sys.metrics.settings.sys.enable.note=此开关会关系到Dinky JVM Monitor,决定监控页面中的Dinky Server显示,以及JVM Metrics采集 -sys.metrics.settings.sys.gatherTiming=Dinky JVM Metrics 采集时间粒度 -sys.metrics.settings.sys.gatherTiming.note=Dinky JVM Metrics 采集时间粒度,定时任务间隔触发 -sys.metrics.settings.flink.gatherTiming=Flink Metrics 采集时间粒度 -sys.metrics.settings.flink.gatherTiming.note=Flink Metrics 采集时间粒度,定时任务间隔触发 -sys.metrics.settings.flink.gatherTimeout=Flink Metrics 采集时间粒度,定时任务间隔触发 -sys.metrics.settings.flink.gatherTimeout.note=Flink Metrics 采集超时时长,定时任务间隔触发(此配置项应小于Flink Metrics 采集时间粒度) -sys.resource.settings.base.enable=是否启用Resource -sys.resource.settings.base.enable.note=启用资源管理功能,如果切换存储模式时,需关闭此开关,相关配置完成后,再开启 -sys.resource.settings.base.upload.base.path=上传目录的根路径 -sys.resource.settings.base.upload.base.path.note=资源存储在HDFS/OSS (S3)路径上,资源文件将存储到此基本路径,自行配置,请确保该目录存在于相关存储系统上并具有读写权限。 -sys.resource.settings.base.model=存储模式 -sys.resource.settings.base.model.note=支持HDFS、S3(Minio、阿里云OSS、腾讯云COS等..),切换选项后即可生效 +sys.dolphinscheduler.settings.token.note=DolphinScheduler\u7684Token\uFF0C\u8BF7\u5728DolphinScheduler\u7684\u5B89\u5168\u4E2D\u5FC3->\u4EE4\u724C\u7BA1\u7406\u4E2D\u521B\u5EFA\u4E00\u4E2Atoken\uFF0C\u5E76\u586B\u5165\u8BE5\u914D\u7F6E\u4E2D +sys.dolphinscheduler.settings.projectName=DolphinScheduler \u9879\u76EE\u540D +sys.dolphinscheduler.settings.projectName.note=DolphinScheduler \u4E2D\u6307\u5B9A\u7684\u9879\u76EE\u540D\u79F0\uFF0C\u4E0D\u533A\u5206\u5927\u5C0F\u5199 +sys.ldap.settings.url=Ldap \u670D\u52A1\u5730\u5740 +sys.ldap.settings.url.note=Ldap \u8BA4\u8BC1\u670D\u52A1\u5730\u5740\uFF0C\u4F8B\u5982\uFF1Aldap://192.168.111.1:389 +sys.ldap.settings.userDn=\u767B\u5F55\u7528\u6237\u540D\uFF08DN\uFF09 +sys.ldap.settings.userDn.note=\u7528\u4E8E\u8FDE\u63A5 Ldap \u670D\u52A1\u7684\u7528\u6237\u540D\uFF0C\u6216\u8005\u7BA1\u7406\u5458DN +sys.ldap.settings.userPassword=\u767B\u5F55\u5BC6\u7801 +sys.ldap.settings.userPassword.note=\u7528\u4E8E\u8FDE\u63A5ldap\u670D\u52A1\u7684\u5BC6\u7801 +sys.ldap.settings.timeLimit=\u8FDE\u63A5\u8D85\u65F6 +sys.ldap.settings.timeLimit.note=\u8FDE\u63A5 Ldap \u670D\u52A1\u7684\u6700\u5927\u65F6\u95F4\uFF0C\u8D85\u8FC7\u5219\u65AD\u5F00 +sys.ldap.settings.baseDn=\u7528\u6237\u57FA\u7840 DN +sys.ldap.settings.baseDn.note=Dinky \u4F1A\u5728\u6B64\u57FA\u7840 DN \u4E0B\u8FDB\u884C\u7528\u6237\u641C\u7D22,\u4F8B\u5982\uFF1Aou=users,dc=dinky,dc=com +sys.ldap.settings.filter=\u7528\u6237\u8FC7\u6EE4\u89C4\u5219 +sys.ldap.settings.filter.note=\u4F7F\u7528 Ldap \u7684 filter \u8BED\u6CD5\u8FDB\u884C\u7528\u6237\u8FC7\u6EE4 +sys.ldap.settings.autoload=\u767B\u5F55\u65F6\u81EA\u52A8\u6620\u5C04\u7528\u6237 +sys.ldap.settings.autoload.note=\u5F00\u542F\u540E\uFF0C\u5F53\u7528\u6237\u4F7F\u7528 LDAP \u767B\u5F55\u65F6\uFF0C\u5982\u679C\u6CA1\u6709\u76F8\u5E94\u7684 Dinky \u7528\u6237\u6620\u5C04\uFF0C\u5219\u4F1A\u81EA\u52A8\u62C9\u53D6 LDAP \u4FE1\u606F\u521B\u5EFA\u4E00\u4E2A Dinky \u7528\u6237\u4E0E\u4E4B\u6620\u5C04\uFF0C\u5982\u679C\u5173\u95ED\u6B64\u529F\u80FD\uFF0C\u5BF9\u4E8E\u672A\u5BFC\u5165\u7684 LDAP \u7528\u6237\u5C06\u65E0\u6CD5\u767B\u5F55 +sys.ldap.settings.defaultTeant=LDAP \u5BFC\u5165\u9ED8\u8BA4\u79DF\u6237\u7F16\u7801 +sys.ldap.settings.defaultTeant.note=\u5F00\u542F\u81EA\u52A8\u5BFC\u5165\u7528\u6237\u540E\uFF0C\u65B0\u7528\u6237\u767B\u5F55\u9700\u8981\u4E00\u4E2A\u9ED8\u8BA4\u7684\u79DF\u6237\u7F16\u7801\uFF0C\u5426\u5219\u65E0\u6CD5\u767B\u5F55,\u4F8B\u5982: DefaultTenant +sys.ldap.settings.castUsername=LDAP \u7528\u6237\u540D\u5B57\u6BB5 +sys.ldap.settings.castUsername.note=\u9700\u8981\u586B\u5199\u4E00\u4E2A LDAP \u4E2D\u7528\u6237\u7684\u5C5E\u6027\u5B57\u6BB5\u6765\u4E0E Dinky \u7528\u6237\u5BF9\u5E94\uFF0C\u5FC5\u987B\u586B\u5199\uFF0C\u4E00\u822C\u53EF\u9009\u4E3A cn \u6216\u8005 uid\u8868\u793A\u7528\u6237\u552F\u4E00\u6807\u8BC6 +sys.ldap.settings.castNickname=LDAP \u6635\u79F0\u5B57\u6BB5 +sys.ldap.settings.castNickname.note=\u9700\u8981\u586B\u5199\u4E00\u4E2A LDAP \u4E2D\u7528\u6237\u7684\u5C5E\u6027\u5B57\u6BB5\u6765\u4E0E Dinky \u6635\u79F0\u5BF9\u5E94\uFF0C\u5FC5\u987B\u586B\u5199\uFF0C\u4E00\u822C\u53EF\u9009\u4E3A sn \u6216\u8005\u5176\u4ED6\u6807\u8BC6\uFF0C\u4E0D\u8981\u6C42\u552F\u4E00 +sys.ldap.settings.enable=\u662F\u5426\u542F\u7528 Ldap +sys.ldap.settings.enable.note=\u5F00\u542F LDAP \u767B\u5F55\u529F\u80FD +sys.metrics.settings.sys.enable=Dinky JVM Monitor \u5F00\u5173 +sys.metrics.settings.sys.enable.note=\u6B64\u5F00\u5173\u4F1A\u5173\u7CFB\u5230Dinky JVM Monitor\uFF0C\u51B3\u5B9A\u76D1\u63A7\u9875\u9762\u4E2D\u7684Dinky Server\u663E\u793A\uFF0C\u4EE5\u53CAJVM Metrics\u91C7\u96C6 +sys.metrics.settings.sys.gatherTiming=Dinky JVM Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6 +sys.metrics.settings.sys.gatherTiming.note=Dinky JVM Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6\uFF0C\u5B9A\u65F6\u4EFB\u52A1\u95F4\u9694\u89E6\u53D1 +sys.metrics.settings.flink.gatherTiming=Flink Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6 +sys.metrics.settings.flink.gatherTiming.note=Flink Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6\uFF0C\u5B9A\u65F6\u4EFB\u52A1\u95F4\u9694\u89E6\u53D1 +sys.metrics.settings.flink.gatherTimeout=Flink Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6\uFF0C\u5B9A\u65F6\u4EFB\u52A1\u95F4\u9694\u89E6\u53D1 +sys.metrics.settings.flink.gatherTimeout.note=Flink Metrics \u91C7\u96C6\u8D85\u65F6\u65F6\u957F\uFF0C\u5B9A\u65F6\u4EFB\u52A1\u95F4\u9694\u89E6\u53D1\uFF08\u6B64\u914D\u7F6E\u9879\u5E94\u5C0F\u4E8EFlink Metrics \u91C7\u96C6\u65F6\u95F4\u7C92\u5EA6\uFF09 +sys.resource.settings.base.enable=\u662F\u5426\u542F\u7528Resource +sys.resource.settings.base.enable.note=\u542F\u7528\u8D44\u6E90\u7BA1\u7406\u529F\u80FD\uFF0C\u5982\u679C\u5207\u6362\u5B58\u50A8\u6A21\u5F0F\u65F6\uFF0C\u9700\u5173\u95ED\u6B64\u5F00\u5173\uFF0C\u76F8\u5173\u914D\u7F6E\u5B8C\u6210\u540E\uFF0C\u518D\u5F00\u542F +sys.resource.settings.base.upload.base.path=\u4E0A\u4F20\u76EE\u5F55\u7684\u6839\u8DEF\u5F84 +sys.resource.settings.base.upload.base.path.note=\u8D44\u6E90\u5B58\u50A8\u5728HDFS/OSS (S3)\u8DEF\u5F84\u4E0A\uFF0C\u8D44\u6E90\u6587\u4EF6\u5C06\u5B58\u50A8\u5230\u6B64\u57FA\u672C\u8DEF\u5F84\uFF0C\u81EA\u884C\u914D\u7F6E\uFF0C\u8BF7\u786E\u4FDD\u8BE5\u76EE\u5F55\u5B58\u5728\u4E8E\u76F8\u5173\u5B58\u50A8\u7CFB\u7EDF\u4E0A\u5E76\u5177\u6709\u8BFB\u5199\u6743\u9650\u3002 +sys.resource.settings.base.model=\u5B58\u50A8\u6A21\u5F0F +sys.resource.settings.base.model.note=\u652F\u6301HDFS\u3001S3(Minio\u3001\u963F\u91CC\u4E91OSS\u3001\u817E\u8BAF\u4E91COS\u7B49..)\uFF0C\u5207\u6362\u9009\u9879\u540E\u5373\u53EF\u751F\u6548 -sys.resource.settings.oss.endpoint=对象存储服务的 URL(Endpoint) -sys.resource.settings.oss.endpoint.note=例如:https://oss-cn-hangzhou.aliyuncs.com +sys.resource.settings.oss.endpoint=\u5BF9\u8C61\u5B58\u50A8\u670D\u52A1\u7684 URL\uFF08Endpoint\uFF09 +sys.resource.settings.oss.endpoint.note=\u4F8B\u5982\uFF1Ahttps://oss-cn-hangzhou.aliyuncs.com sys.resource.settings.oss.accessKey=Access key -sys.resource.settings.oss.accessKey.note=Access key就像用户ID,可以唯一标识你的账户 +sys.resource.settings.oss.accessKey.note=Access key\u5C31\u50CF\u7528\u6237ID\uFF0C\u53EF\u4EE5\u552F\u4E00\u6807\u8BC6\u4F60\u7684\u8D26\u6237 sys.resource.settings.oss.secretKey=Secret key -sys.resource.settings.oss.secretKey.note=Secret key是你账户的密码 -sys.resource.settings.oss.bucketName=存储桶名称 -sys.resource.settings.oss.bucketName.note=默认的存储桶名称 -sys.resource.settings.oss.region=区域 -sys.resource.settings.oss.region.note=区域,例如:oss-cn-hangzhou +sys.resource.settings.oss.secretKey.note=Secret key\u662F\u4F60\u8D26\u6237\u7684\u5BC6\u7801 +sys.resource.settings.oss.bucketName=\u5B58\u50A8\u6876\u540D\u79F0 +sys.resource.settings.oss.bucketName.note=\u9ED8\u8BA4\u7684\u5B58\u50A8\u6876\u540D\u79F0 +sys.resource.settings.oss.region=\u533A\u57DF +sys.resource.settings.oss.region.note=\u533A\u57DF,\u4F8B\u5982\uFF1Aoss-cn-hangzhou sys.resource.settings.oss.path.style.access=Path Style -sys.resource.settings.oss.path.style.access.note=是否开启 path style, 不同的提供方(如阿里云oss,腾讯云cos)支持情况不同,请阅读提供方文档说明进行填写 +sys.resource.settings.oss.path.style.access.note=\u662F\u5426\u5F00\u542F path style, \u4E0D\u540C\u7684\u63D0\u4F9B\u65B9\uFF08\u5982\u963F\u91CC\u4E91oss\uFF0C\u817E\u8BAF\u4E91cos\uFF09\u652F\u6301\u60C5\u51B5\u4E0D\u540C\uFF0C\u8BF7\u9605\u8BFB\u63D0\u4F9B\u65B9\u6587\u6863\u8BF4\u660E\u8FDB\u884C\u586B\u5199 -sys.resource.settings.hdfs.root.user=HDFS 操作用户名 -sys.resource.settings.hdfs.root.user.note=HDFS 操作用户名 +sys.resource.settings.hdfs.root.user=HDFS \u64CD\u4F5C\u7528\u6237\u540D +sys.resource.settings.hdfs.root.user.note=HDFS \u64CD\u4F5C\u7528\u6237\u540D sys.resource.settings.hdfs.fs.defaultFS=HDFS defaultFS -sys.resource.settings.hdfs.fs.defaultFS.note=fs.defaultFS 配置项,例如: 远程 HDFS:hdfs://localhost:9000,本地:file:/// +sys.resource.settings.hdfs.fs.defaultFS.note=fs.defaultFS \u914D\u7F6E\u9879\uFF0C\u4F8B\u5982: \u8FDC\u7A0B HDFS\uFF1Ahdfs://localhost:9000\uFF0C\u672C\u5730\uFF1Afile:/// sys.resource.settings.hdfs.core.site=core-site.xml -sys.resource.settings.hdfs.core.site.note=core-site.xml配置文件内容,高可用必填 +sys.resource.settings.hdfs.core.site.note=core-site.xml\u914D\u7F6E\u6587\u4EF6\u5185\u5BB9\uFF0C\u9AD8\u53EF\u7528\u5FC5\u586B sys.resource.settings.hdfs.hdfs.site=hdfs-site.xml -sys.resource.settings.hdfs.hdfs.site.note=hdfs-site.xml配置文件内容,高可用必填 +sys.resource.settings.hdfs.hdfs.site.note=hdfs-site.xml\u914D\u7F6E\u6587\u4EF6\u5185\u5BB9\uFF0C\u9AD8\u53EF\u7528\u5FC5\u586B #Dinky Gateway -gateway.kubernetes.test.failed=测试 Flink 配置失败: +gateway.kubernetes.test.failed=\u6D4B\u8BD5 Flink \u914D\u7F6E\u5931\u8D25\uFF1A # Task -task.status.is.not.done=当前作业状态未停止,请停止后操作 -task.sql.explain.failed=sql解析失败,请检查 -task.update.failed=Task更新失败 +task.status.is.not.done=\u5F53\u524D\u4F5C\u4E1A\u72B6\u6001\u672A\u505C\u6B62\uFF0C\u8BF7\u505C\u6B62\u540E\u64CD\u4F5C +task.sql.explain.failed=sql\u89E3\u6790\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 +task.update.failed=Task\u66F4\u65B0\u5931\u8D25 # process -process.submit.submitTask=提交作业 -process.submit.checkSql=检查作业 -process.submit.execute=执行作业 -process.submit.buildConfig=构建配置信息 -process.submit.execute.commSql=执行普通sql -process.submit.execute.flinkSql=执行flinkSql -process.register.exits=当前任务正在执行,请勿重复提交,如有问题请前往配置中心查看 +process.submit.submitTask=\u63D0\u4EA4\u4F5C\u4E1A +process.submit.checkSql=\u68C0\u67E5\u4F5C\u4E1A +process.submit.execute=\u6267\u884C\u4F5C\u4E1A +process.submit.buildConfig=\u6784\u5EFA\u914D\u7F6E\u4FE1\u606F +process.submit.execute.commSql=\u6267\u884C\u666E\u901Asql +process.submit.execute.flinkSql=\u6267\u884CflinkSql +process.register.exits=\u5F53\u524D\u4EFB\u52A1\u6B63\u5728\u6267\u884C\uFF0C\u8BF7\u52FF\u91CD\u590D\u63D0\u4EA4\uFF0C\u5982\u6709\u95EE\u9898\u8BF7\u524D\u5F80\u914D\u7F6E\u4E2D\u5FC3\u67E5\u770B # resource -resource.root.dir.not.allow.delete=根目录不允许删除 -resource.dir.or.file.not.exist=资源目录或文件不存在 -file.path.visit.failed=文件路径访问失败,请检查路径在对应存储系统上是否正确/是否存在 -resource.hdfs.configuration.error=资源配置错误,未启用HDFS -resource.oss.configuration.error=资源配置错误,未启用OSS -resource.root.dir.not.exist=根目录不存在,请检查数据库 -resource.folder.exists=文件夹已存在 \ No newline at end of file +resource.root.dir.not.allow.delete=\u6839\u76EE\u5F55\u4E0D\u5141\u8BB8\u5220\u9664 +resource.dir.or.file.not.exist=\u8D44\u6E90\u76EE\u5F55\u6216\u6587\u4EF6\u4E0D\u5B58\u5728 +file.path.visit.failed=\u6587\u4EF6\u8DEF\u5F84\u8BBF\u95EE\u5931\u8D25,\u8BF7\u68C0\u67E5\u8DEF\u5F84\u5728\u5BF9\u5E94\u5B58\u50A8\u7CFB\u7EDF\u4E0A\u662F\u5426\u6B63\u786E/\u662F\u5426\u5B58\u5728 +resource.hdfs.configuration.error=\u8D44\u6E90\u914D\u7F6E\u9519\u8BEF\uFF0C\u672A\u542F\u7528HDFS +resource.oss.configuration.error=\u8D44\u6E90\u914D\u7F6E\u9519\u8BEF\uFF0C\u672A\u542F\u7528OSS +resource.root.dir.not.exist=\u6839\u76EE\u5F55\u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5\u6570\u636E\u5E93 +resource.folder.exists=\u6587\u4EF6\u5939\u5DF2\u5B58\u5728 \ No newline at end of file diff --git a/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java b/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java index 14d4aaef97..7d2bfa6e26 100644 --- a/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java +++ b/dinky-core/src/main/java/org/dinky/api/FlinkAPI.java @@ -22,8 +22,8 @@ import org.dinky.assertion.Asserts; import org.dinky.data.constant.FlinkRestAPIConstant; import org.dinky.data.constant.NetConstant; +import org.dinky.data.enums.GatewayType; import org.dinky.data.exception.BusException; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.enums.SavePointType; import org.dinky.gateway.model.JobInfo; import org.dinky.gateway.result.SavePointResult; diff --git a/dinky-core/src/main/java/org/dinky/executor/ExecutorConfig.java b/dinky-core/src/main/java/org/dinky/executor/ExecutorConfig.java index d55a9ee37c..64471d44e8 100644 --- a/dinky-core/src/main/java/org/dinky/executor/ExecutorConfig.java +++ b/dinky-core/src/main/java/org/dinky/executor/ExecutorConfig.java @@ -20,7 +20,7 @@ package org.dinky.executor; import org.dinky.assertion.Asserts; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import java.util.ArrayList; import java.util.HashMap; diff --git a/dinky-core/src/main/java/org/dinky/explainer/Explainer.java b/dinky-core/src/main/java/org/dinky/explainer/Explainer.java index f151b84701..e0edce8091 100644 --- a/dinky-core/src/main/java/org/dinky/explainer/Explainer.java +++ b/dinky-core/src/main/java/org/dinky/explainer/Explainer.java @@ -20,6 +20,7 @@ package org.dinky.explainer; import org.dinky.assertion.Asserts; +import org.dinky.data.enums.GatewayType; import org.dinky.data.model.LineageRel; import org.dinky.data.result.ExplainResult; import org.dinky.data.result.SqlExplainResult; @@ -28,7 +29,6 @@ import org.dinky.explainer.print_table.PrintStatementExplainer; import org.dinky.function.data.model.UDF; import org.dinky.function.util.UDFUtil; -import org.dinky.gateway.enums.GatewayType; import org.dinky.interceptor.FlinkInterceptor; import org.dinky.job.JobConfig; import org.dinky.job.JobManager; diff --git a/dinky-core/src/main/java/org/dinky/job/Job.java b/dinky-core/src/main/java/org/dinky/job/Job.java index 7fd3c4db51..e352e6d8cc 100644 --- a/dinky-core/src/main/java/org/dinky/job/Job.java +++ b/dinky-core/src/main/java/org/dinky/job/Job.java @@ -19,10 +19,10 @@ package org.dinky.job; +import org.dinky.data.enums.GatewayType; import org.dinky.data.result.IResult; import org.dinky.executor.Executor; import org.dinky.executor.ExecutorConfig; -import org.dinky.gateway.enums.GatewayType; import java.time.LocalDateTime; import java.util.List; diff --git a/dinky-core/src/main/java/org/dinky/job/JobBuilder.java b/dinky-core/src/main/java/org/dinky/job/JobBuilder.java index ce529a2606..c31f33bd55 100644 --- a/dinky-core/src/main/java/org/dinky/job/JobBuilder.java +++ b/dinky-core/src/main/java/org/dinky/job/JobBuilder.java @@ -19,8 +19,8 @@ package org.dinky.job; +import org.dinky.data.enums.GatewayType; import org.dinky.executor.Executor; -import org.dinky.gateway.enums.GatewayType; public abstract class JobBuilder { diff --git a/dinky-core/src/main/java/org/dinky/job/JobConfig.java b/dinky-core/src/main/java/org/dinky/job/JobConfig.java index 96a8452c32..f5fd35a499 100644 --- a/dinky-core/src/main/java/org/dinky/job/JobConfig.java +++ b/dinky-core/src/main/java/org/dinky/job/JobConfig.java @@ -21,10 +21,10 @@ import org.dinky.assertion.Asserts; import org.dinky.data.constant.NetConstant; +import org.dinky.data.enums.GatewayType; import org.dinky.executor.ExecutorConfig; import org.dinky.gateway.config.FlinkConfig; import org.dinky.gateway.config.GatewayConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.enums.SavePointStrategy; import org.dinky.gateway.model.FlinkClusterConfig; diff --git a/dinky-core/src/main/java/org/dinky/job/JobManager.java b/dinky-core/src/main/java/org/dinky/job/JobManager.java index ec7d8a1421..83dba4a242 100644 --- a/dinky-core/src/main/java/org/dinky/job/JobManager.java +++ b/dinky-core/src/main/java/org/dinky/job/JobManager.java @@ -26,6 +26,7 @@ import org.dinky.context.FlinkUdfPathContextHolder; import org.dinky.context.RowLevelPermissionsContext; import org.dinky.data.annotations.ProcessStep; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.ProcessStepType; import org.dinky.data.exception.BusException; import org.dinky.data.model.SystemConfiguration; @@ -45,7 +46,6 @@ import org.dinky.gateway.config.FlinkConfig; import org.dinky.gateway.config.GatewayConfig; import org.dinky.gateway.enums.ActionType; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.enums.SavePointType; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.SavePointResult; diff --git a/dinky-core/src/main/java/org/dinky/job/builder/JobTransBuilder.java b/dinky-core/src/main/java/org/dinky/job/builder/JobTransBuilder.java index dc729735e6..e983e85719 100644 --- a/dinky-core/src/main/java/org/dinky/job/builder/JobTransBuilder.java +++ b/dinky-core/src/main/java/org/dinky/job/builder/JobTransBuilder.java @@ -21,12 +21,12 @@ import org.dinky.assertion.Asserts; import org.dinky.constant.FlinkSQLConstant; +import org.dinky.data.enums.GatewayType; import org.dinky.data.result.IResult; import org.dinky.data.result.InsertResult; import org.dinky.data.result.ResultBuilder; import org.dinky.executor.Executor; import org.dinky.gateway.Gateway; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.result.GatewayResult; import org.dinky.interceptor.FlinkInterceptor; import org.dinky.interceptor.FlinkInterceptorResult; diff --git a/dinky-core/src/test/java/org/dinky/core/JobManagerTest.java b/dinky-core/src/test/java/org/dinky/core/JobManagerTest.java index 484756b00a..978a92024b 100644 --- a/dinky-core/src/test/java/org/dinky/core/JobManagerTest.java +++ b/dinky-core/src/test/java/org/dinky/core/JobManagerTest.java @@ -19,9 +19,9 @@ package org.dinky.core; +import org.dinky.data.enums.GatewayType; import org.dinky.data.result.ResultPool; import org.dinky.data.result.SelectResult; -import org.dinky.gateway.enums.GatewayType; import org.dinky.job.JobConfig; import org.dinky.job.JobManager; import org.dinky.job.JobResult; diff --git a/dinky-core/src/test/java/org/dinky/job/JobConfigTest.java b/dinky-core/src/test/java/org/dinky/job/JobConfigTest.java index e84507fd1b..7db2ea3caf 100644 --- a/dinky-core/src/test/java/org/dinky/job/JobConfigTest.java +++ b/dinky-core/src/test/java/org/dinky/job/JobConfigTest.java @@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.*; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.apache.flink.configuration.RestOptions; diff --git a/dinky-function/src/main/java/org/dinky/function/util/UDFUtil.java b/dinky-function/src/main/java/org/dinky/function/util/UDFUtil.java index b4bc0c9712..3e54a9b75a 100644 --- a/dinky-function/src/main/java/org/dinky/function/util/UDFUtil.java +++ b/dinky-function/src/main/java/org/dinky/function/util/UDFUtil.java @@ -23,6 +23,7 @@ import org.dinky.classloader.DinkyClassLoader; import org.dinky.config.Dialect; import org.dinky.context.FlinkUdfPathContextHolder; +import org.dinky.data.enums.GatewayType; import org.dinky.data.exception.DinkyException; import org.dinky.data.model.FlinkUdfManifest; import org.dinky.data.model.SystemConfiguration; @@ -33,7 +34,6 @@ import org.dinky.function.constant.PathConstant; import org.dinky.function.data.model.UDF; import org.dinky.function.pool.UdfCodePool; -import org.dinky.gateway.enums.GatewayType; import org.dinky.pool.ClassEntity; import org.dinky.pool.ClassPool; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/AbstractGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/AbstractGateway.java index 33ca009512..9b74d7f257 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/AbstractGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/AbstractGateway.java @@ -21,10 +21,10 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobStatus; import org.dinky.gateway.config.GatewayConfig; import org.dinky.gateway.enums.ActionType; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.exception.GatewayException; import org.dinky.gateway.exception.NotSupportGetStatusException; import org.dinky.gateway.model.JobInfo; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/Gateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/Gateway.java index c99b99a361..3f7261f4d6 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/Gateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/Gateway.java @@ -21,9 +21,9 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; +import org.dinky.data.enums.GatewayType; import org.dinky.data.enums.JobStatus; import org.dinky.gateway.config.GatewayConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.exception.GatewayException; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.SavePointResult; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/config/GatewayConfig.java b/dinky-gateway/src/main/java/org/dinky/gateway/config/GatewayConfig.java index 0258871774..27e33bb9f1 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/config/GatewayConfig.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/config/GatewayConfig.java @@ -19,7 +19,7 @@ package org.dinky.gateway.config; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.model.CustomConfig; import org.dinky.gateway.model.FlinkClusterConfig; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java index 92d4a31b7d..0c7faaa8fc 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesApplicationGateway.java @@ -21,9 +21,9 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; +import org.dinky.data.enums.GatewayType; import org.dinky.data.model.SystemConfiguration; import org.dinky.gateway.config.AppConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.exception.GatewayException; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.KubernetesResult; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesSessionGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesSessionGateway.java index 1f4b4c96b6..8bbea1d8c2 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesSessionGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesSessionGateway.java @@ -21,7 +21,7 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.KubernetesResult; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/operator/KubetnetsApplicationOperatorGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/operator/KubetnetsApplicationOperatorGateway.java index c504bda204..e6137a643b 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/operator/KubetnetsApplicationOperatorGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/operator/KubetnetsApplicationOperatorGateway.java @@ -21,7 +21,7 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.kubernetes.operator.api.FlinkDeployment; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.KubernetesResult; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/model/FlinkClusterConfig.java b/dinky-gateway/src/main/java/org/dinky/gateway/model/FlinkClusterConfig.java index 8f5721250a..d7f55233a7 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/model/FlinkClusterConfig.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/model/FlinkClusterConfig.java @@ -19,11 +19,11 @@ package org.dinky.gateway.model; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.config.AppConfig; import org.dinky.gateway.config.ClusterConfig; import org.dinky.gateway.config.FlinkConfig; import org.dinky.gateway.config.K8sConfig; -import org.dinky.gateway.enums.GatewayType; import java.util.Optional; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/result/AbstractGatewayResult.java b/dinky-gateway/src/main/java/org/dinky/gateway/result/AbstractGatewayResult.java index 0c2151a1e1..be61ec2e5b 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/result/AbstractGatewayResult.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/result/AbstractGatewayResult.java @@ -19,7 +19,7 @@ package org.dinky.gateway.result; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import java.time.LocalDateTime; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/result/KubernetesResult.java b/dinky-gateway/src/main/java/org/dinky/gateway/result/KubernetesResult.java index 8a79bdc04a..502acddb4c 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/result/KubernetesResult.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/result/KubernetesResult.java @@ -19,7 +19,7 @@ package org.dinky.gateway.result; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import java.time.LocalDateTime; import java.util.List; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/result/SavePointResult.java b/dinky-gateway/src/main/java/org/dinky/gateway/result/SavePointResult.java index fb30e9aed6..7e30cc8e00 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/result/SavePointResult.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/result/SavePointResult.java @@ -19,7 +19,7 @@ package org.dinky.gateway.result; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.model.JobInfo; import java.time.LocalDateTime; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/result/YarnResult.java b/dinky-gateway/src/main/java/org/dinky/gateway/result/YarnResult.java index 0e89fa6df0..eebdbf9cd8 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/result/YarnResult.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/result/YarnResult.java @@ -19,7 +19,7 @@ package org.dinky.gateway.result; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import java.time.LocalDateTime; import java.util.List; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnApplicationGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnApplicationGateway.java index 5d7d12d72e..7c094a03d4 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnApplicationGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnApplicationGateway.java @@ -21,8 +21,8 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.config.AppConfig; -import org.dinky.gateway.enums.GatewayType; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.YarnResult; import org.dinky.utils.LogUtil; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnPerJobGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnPerJobGateway.java index 12840cdddc..aa25ff0af7 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnPerJobGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnPerJobGateway.java @@ -20,7 +20,7 @@ package org.dinky.gateway.yarn; import org.dinky.assertion.Asserts; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.YarnResult; diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnSessionGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnSessionGateway.java index 248749fd5f..0bea0652c2 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnSessionGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/yarn/YarnSessionGateway.java @@ -21,7 +21,7 @@ import org.dinky.assertion.Asserts; import org.dinky.context.FlinkUdfPathContextHolder; -import org.dinky.gateway.enums.GatewayType; +import org.dinky.data.enums.GatewayType; import org.dinky.gateway.result.GatewayResult; import org.dinky.gateway.result.YarnResult; diff --git a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx index 720d89e77c..a140a8bd25 100644 --- a/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx +++ b/dinky-web/src/pages/DataStudio/HeaderContainer/index.tsx @@ -46,7 +46,7 @@ import { TaskDataType, VIEW } from '@/pages/DataStudio/model'; -import { JOB_LIFE_CYCLE, JOB_STATUS } from '@/pages/DevOps/constants'; +import {JOB_LIFE_CYCLE, JOB_STATUS, JOB_SUBMIT_STATUS} from '@/pages/DevOps/constants'; import { isStatusDone } from '@/pages/DevOps/function'; import { SysConfigStateType } from '@/pages/SettingCenter/GlobalSetting/model'; import { SettingConfigKeyEnum } from '@/pages/SettingCenter/GlobalSetting/SettingOverView/constants'; @@ -231,13 +231,9 @@ const HeaderContainer = (props: connect) => { currentData.status = JOB_STATUS.FINISHED; if (currentTab) currentTab.console.results = res.data.results; } else { + currentData.status = res.data.status; if (currentTab) currentTab.console.result = res.data.result; } - // Common sql task is synchronized, so it needs to automatically update the status to finished. - if (isSql(currentData.dialect)) { - currentData.status = JOB_STATUS.FINISHED; - } - if (currentTab) currentTab.console.result = res.data.result; saveTabs({ ...props.tabs }); }; diff --git a/dinky-web/src/pages/DevOps/constants.tsx b/dinky-web/src/pages/DevOps/constants.tsx index 589c12c431..ac2352eb80 100644 --- a/dinky-web/src/pages/DevOps/constants.tsx +++ b/dinky-web/src/pages/DevOps/constants.tsx @@ -38,6 +38,14 @@ export enum JOB_STATUS { UNKNOWN = 'UNKNOWN' } +export enum JOB_SUBMIT_STATUS { + INITIALIZE = 'INITIALIZE', + RUNNING = 'RUNNING', + SUCCESS = 'SUCCESS', + FAILED = 'FAILED', + CANCEL = 'CANCEL' +} + export enum BackPressureStatus { OK = 'ok', HIGH = 'high' diff --git a/dinky-web/src/pages/DevOps/function.tsx b/dinky-web/src/pages/DevOps/function.tsx index 873a1207eb..a02d38902d 100644 --- a/dinky-web/src/pages/DevOps/function.tsx +++ b/dinky-web/src/pages/DevOps/function.tsx @@ -17,7 +17,7 @@ * */ -import { JOB_STATUS } from '@/pages/DevOps/constants'; +import {JOB_STATUS, JOB_SUBMIT_STATUS} from '@/pages/DevOps/constants'; import { Jobs } from '@/types/DevOps/data'; import { parseMilliSecondStr } from '@/utils/function'; @@ -36,11 +36,15 @@ export function isStatusDone(type: string) { case JOB_STATUS.CANCELED: case JOB_STATUS.FINISHED: case JOB_STATUS.UNKNOWN: + case JOB_SUBMIT_STATUS.SUCCESS: + case JOB_SUBMIT_STATUS.FAILED: + case JOB_SUBMIT_STATUS.CANCEL: return true; default: return false; } } + export function isNotFinallyStatus(type: string) { if (!type) { return false;