Commit c03d16bd authored by wenmo's avatar wenmo

功能优化

parent 27fb0a75
...@@ -118,6 +118,7 @@ Dinky(原 Dlink): ...@@ -118,6 +118,7 @@ Dinky(原 Dlink):
| | | 新增 Doris 数据源注册及测试 | 0.6.0 | | | | 新增 Doris 数据源注册及测试 | 0.6.0 |
| | | 新增 Phoenix 数据源注册及测试 | 0.6.0 | | | | 新增 Phoenix 数据源注册及测试 | 0.6.0 |
| | | 新增 SqlServer 数据源注册及测试 | 0.6.0 | | | | 新增 SqlServer 数据源注册及测试 | 0.6.0 |
| | | 新增 Hive 数据源注册及测试 | 0.6.0 |
| | 报警实例管理 | 新增 钉钉报警 | 0.6.0 | | | 报警实例管理 | 新增 钉钉报警 | 0.6.0 |
| | | 新增 微信企业号报警 | 0.6.0 | | | | 新增 微信企业号报警 | 0.6.0 |
| | 报警组管理 | 新增 报警组管理 | 0.6.0 | | | 报警组管理 | 新增 报警组管理 | 0.6.0 |
......
...@@ -4,6 +4,7 @@ import com.dlink.assertion.Asserts; ...@@ -4,6 +4,7 @@ import com.dlink.assertion.Asserts;
import com.dlink.context.SpringContextUtils; import com.dlink.context.SpringContextUtils;
import com.dlink.daemon.task.DaemonFactory; import com.dlink.daemon.task.DaemonFactory;
import com.dlink.daemon.task.DaemonTaskConfig; import com.dlink.daemon.task.DaemonTaskConfig;
import com.dlink.gateway.GatewayType;
import com.dlink.model.*; import com.dlink.model.*;
import com.dlink.service.*; import com.dlink.service.*;
import com.dlink.utils.JSONUtil; import com.dlink.utils.JSONUtil;
...@@ -114,7 +115,7 @@ public class Job2MysqlHandler implements JobHandler { ...@@ -114,7 +115,7 @@ public class Job2MysqlHandler implements JobHandler {
if (Asserts.isNotNull(job.getJobConfig().getJarId())) { if (Asserts.isNotNull(job.getJobConfig().getJarId())) {
jar = jarService.getById(job.getJobConfig().getJarId()); jar = jarService.getById(job.getJobConfig().getJarId());
} }
if (Asserts.isNotNullCollection(job.getJids())) { if (Asserts.isNotNullCollection(job.getJids()) && !GatewayType.LOCAL.equalsValue(job.getJobConfig().getType())) {
for (String jid : job.getJids()) { for (String jid : job.getJids()) {
JobInstance jobInstance = history.buildJobInstance(); JobInstance jobInstance = history.buildJobInstance();
jobInstance.setHistoryId(job.getId()); jobInstance.setHistoryId(job.getId());
......
...@@ -158,6 +158,14 @@ ...@@ -158,6 +158,14 @@
<include>dlink-metadata-doris-${project.version}.jar</include> <include>dlink-metadata-doris-${project.version}.jar</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>${project.parent.basedir}/dlink-metadata/dlink-metadata-phoenix/target
</directory>
<outputDirectory>lib</outputDirectory>
<includes>
<include>dlink-metadata-phoenix-${project.version}.jar</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory>${project.parent.basedir}/dlink-alert/dlink-alert-dingtalk/target <directory>${project.parent.basedir}/dlink-alert/dlink-alert-dingtalk/target
</directory> </directory>
......
...@@ -127,9 +127,9 @@ public abstract class Executor { ...@@ -127,9 +127,9 @@ public abstract class Executor {
} }
public void initEnvironment() { public void initEnvironment() {
if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) { /*if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) {
environment.enableCheckpointing(executorSetting.getCheckpoint()); environment.enableCheckpointing(executorSetting.getCheckpoint());
} }*/
if (executorSetting.getParallelism() != null && executorSetting.getParallelism() > 0) { if (executorSetting.getParallelism() != null && executorSetting.getParallelism() > 0) {
environment.setParallelism(executorSetting.getParallelism()); environment.setParallelism(executorSetting.getParallelism());
} }
...@@ -140,9 +140,9 @@ public abstract class Executor { ...@@ -140,9 +140,9 @@ public abstract class Executor {
} }
public void updateEnvironment(ExecutorSetting executorSetting) { public void updateEnvironment(ExecutorSetting executorSetting) {
if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) { /*if (executorSetting.getCheckpoint() != null && executorSetting.getCheckpoint() > 0) {
environment.enableCheckpointing(executorSetting.getCheckpoint()); environment.enableCheckpointing(executorSetting.getCheckpoint());
} }*/
if (executorSetting.getParallelism() != null && executorSetting.getParallelism() > 0) { if (executorSetting.getParallelism() != null && executorSetting.getParallelism() > 0) {
environment.setParallelism(executorSetting.getParallelism()); environment.setParallelism(executorSetting.getParallelism());
} }
......
...@@ -770,6 +770,9 @@ export default (): React.ReactNode => { ...@@ -770,6 +770,9 @@ export default (): React.ReactNode => {
<li> <li>
<Link>优化 Studio血缘分析为字段级</Link> <Link>优化 Studio血缘分析为字段级</Link>
</li> </li>
<li>
<Link>新增 Hive 数据源注册、元数据、查询和执行</Link>
</li>
</ul> </ul>
</Paragraph> </Paragraph>
</Timeline.Item> </Timeline.Item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment