Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/DataLinkDC/dinky into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user
actions-user committed Nov 29, 2024
2 parents 99ad951 + 0ee8278 commit 8ce9ede
Show file tree
Hide file tree
Showing 26 changed files with 641 additions and 174 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ dinky.db
hs_err_pid*
.idea/*
!.idea/icon.svg
!.idea/vcs.xml
build
target/*
*.iml
Expand Down Expand Up @@ -63,4 +62,6 @@ tmp/*
extends/*
/.run/

.idea
.idea
.idea/vcs.xml
dinky-web/package-lock.json
15 changes: 2 additions & 13 deletions dinky-admin/src/main/java/org/dinky/init/FlinkHistoryServer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

package org.dinky.init;

import org.dinky.data.model.ResourcesModelEnum;
import org.dinky.data.model.S3Configuration;
import org.dinky.data.model.SystemConfiguration;
import org.dinky.data.properties.OssProperties;
import org.dinky.resource.BaseResourceManager;
import org.dinky.service.JobInstanceService;
import org.dinky.service.SysConfigService;

Expand Down Expand Up @@ -63,16 +61,7 @@ public FlinkHistoryServer(JobInstanceService jobInstanceService, SysConfigServic
this.historyRunnable = () -> {
Map<String, String> flinkHistoryServerConfiguration =
SystemConfiguration.getInstances().getFlinkHistoryServerConfiguration();
if (systemConfiguration.getResourcesEnable().getValue()) {
if (systemConfiguration.getResourcesModel().getValue().equals(ResourcesModelEnum.OSS)) {
OssProperties ossProperties = systemConfiguration.getOssProperties();
flinkHistoryServerConfiguration.put(S3Configuration.ENDPOINT, ossProperties.getEndpoint());
flinkHistoryServerConfiguration.put(S3Configuration.ACCESS_KEY, ossProperties.getAccessKey());
flinkHistoryServerConfiguration.put(S3Configuration.SECRET_KEY, ossProperties.getSecretKey());
flinkHistoryServerConfiguration.put(
S3Configuration.PATH_STYLE_ACCESS, String.valueOf(ossProperties.getPathStyleAccess()));
}
}
flinkHistoryServerConfiguration.putAll(BaseResourceManager.convertFlinkResourceConfig());

HistoryServerUtil.run(
(jobId) -> {
Expand Down
2 changes: 1 addition & 1 deletion dinky-admin/src/main/java/org/dinky/service/impl/SuggestionServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private static void buildGlobalVariableSuggestions(
.key(fragmentVariable.getId() + "_fragmentVariable")
.label(suggestionLabelVO)
.kind(4)
.insertText(fragmentVariable.getFragmentValue())
.insertText(fragmentVariable.getName())
.detail(fragmentVariable.getNote())
.build();
})
Expand Down
52 changes: 39 additions & 13 deletions dinky-app/dinky-app-1.15/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,51 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<!-- 可以设置jar包的入口类(可选) -->
<mainClass>org.dinky.app.MainApp</mainClass>
</manifest>
</archive>
<finalName>${project.build.finalName}-jar-with-dependencies</finalName>
<outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>org.dinky:*</artifact>
<includes>
<include>org/dinky/**</include>
<include>META-INF/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>tpch/**</exclude>
<exclude>tpcds/**</exclude>
<exclude>support/**</exclude>
<exclude>springfox/**</exclude>
<exclude>org/slf4j/**</exclude>
<exclude>org/springframework/**</exclude>
<exclude>javax/**</exclude>
<exclude>javassist/**</exclude>
<exclude>Class50/**</exclude>
<exclude>lombok/**</exclude>
<exclude>freemarker/**</exclude>
<exclude>com.sun/**</exclude>
<exclude>META-INF/resources/**</exclude>
</excludes>
</filter>
</filters>

<transformers>
<!--设置主函数-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.dinky.app.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
Expand Down
52 changes: 39 additions & 13 deletions dinky-app/dinky-app-1.16/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,51 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<!-- 可以设置jar包的入口类(可选) -->
<mainClass>org.dinky.app.MainApp</mainClass>
</manifest>
</archive>
<finalName>${project.build.finalName}-jar-with-dependencies</finalName>
<outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>org.dinky:*</artifact>
<includes>
<include>org/dinky/**</include>
<include>META-INF/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>tpch/**</exclude>
<exclude>tpcds/**</exclude>
<exclude>support/**</exclude>
<exclude>springfox/**</exclude>
<exclude>org/slf4j/**</exclude>
<exclude>org/springframework/**</exclude>
<exclude>javax/**</exclude>
<exclude>javassist/**</exclude>
<exclude>Class50/**</exclude>
<exclude>lombok/**</exclude>
<exclude>freemarker/**</exclude>
<exclude>com.sun/**</exclude>
<exclude>META-INF/resources/**</exclude>
</excludes>
</filter>
</filters>

<transformers>
<!--设置主函数-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.dinky.app.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
Expand Down
52 changes: 39 additions & 13 deletions dinky-app/dinky-app-1.17/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,51 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<!-- 可以设置jar包的入口类(可选) -->
<mainClass>org.dinky.app.MainApp</mainClass>
</manifest>
</archive>
<finalName>${project.build.finalName}-jar-with-dependencies</finalName>
<outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>org.dinky:*</artifact>
<includes>
<include>org/dinky/**</include>
<include>META-INF/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>tpch/**</exclude>
<exclude>tpcds/**</exclude>
<exclude>support/**</exclude>
<exclude>springfox/**</exclude>
<exclude>org/slf4j/**</exclude>
<exclude>org/springframework/**</exclude>
<exclude>javax/**</exclude>
<exclude>javassist/**</exclude>
<exclude>Class50/**</exclude>
<exclude>lombok/**</exclude>
<exclude>freemarker/**</exclude>
<exclude>com.sun/**</exclude>
<exclude>META-INF/resources/**</exclude>
</excludes>
</filter>
</filters>

<transformers>
<!--设置主函数-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.dinky.app.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
Expand Down
52 changes: 39 additions & 13 deletions dinky-app/dinky-app-1.18/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,51 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<!-- 可以设置jar包的入口类(可选) -->
<mainClass>org.dinky.app.MainApp</mainClass>
</manifest>
</archive>
<finalName>${project.build.finalName}-jar-with-dependencies</finalName>
<outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>org.dinky:*</artifact>
<includes>
<include>org/dinky/**</include>
<include>META-INF/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>tpch/**</exclude>
<exclude>tpcds/**</exclude>
<exclude>support/**</exclude>
<exclude>springfox/**</exclude>
<exclude>org/slf4j/**</exclude>
<exclude>org/springframework/**</exclude>
<exclude>javax/**</exclude>
<exclude>javassist/**</exclude>
<exclude>Class50/**</exclude>
<exclude>lombok/**</exclude>
<exclude>freemarker/**</exclude>
<exclude>com.sun/**</exclude>
<exclude>META-INF/resources/**</exclude>
</excludes>
</filter>
</filters>

<transformers>
<!--设置主函数-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.dinky.app.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
Expand Down
52 changes: 39 additions & 13 deletions dinky-app/dinky-app-1.19/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,51 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven-assembly-plugin.version}</version>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<!-- 可以设置jar包的入口类(可选) -->
<mainClass>org.dinky.app.MainApp</mainClass>
</manifest>
</archive>
<finalName>${project.build.finalName}-jar-with-dependencies</finalName>
<outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory>
<minimizeJar>true</minimizeJar>
<createDependencyReducedPom>false</createDependencyReducedPom>
<filters>
<filter>
<artifact>org.dinky:*</artifact>
<includes>
<include>org/dinky/**</include>
<include>META-INF/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>tpch/**</exclude>
<exclude>tpcds/**</exclude>
<exclude>support/**</exclude>
<exclude>springfox/**</exclude>
<exclude>org/slf4j/**</exclude>
<exclude>org/springframework/**</exclude>
<exclude>javax/**</exclude>
<exclude>javassist/**</exclude>
<exclude>Class50/**</exclude>
<exclude>lombok/**</exclude>
<exclude>freemarker/**</exclude>
<exclude>com.sun/**</exclude>
<exclude>META-INF/resources/**</exclude>
</excludes>
</filter>
</filters>

<transformers>
<!--设置主函数-->
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.dinky.app.MainApp</mainClass>
</transformer>
</transformers>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<goals>
<goal>single</goal>
<goal>shade</goal>
</goals>
<phase>package</phase>
</execution>
Expand Down
Loading

0 comments on commit 8ce9ede

Please sign in to comment.