打包与扩展优化

hanwenbiao2 · Dec 2, 2021 · 8b7896f · 8b7896f
1 parent 476f31f
commit 8b7896f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ dlink-web/node_modules/*
 dlink-web/node/*
 dlink-web/dist/*
 dlink-admin/src/main/resources/static/*
+dependency-reduced-pom.xml
diff --git a/dlink-assembly/src/main/assembly/package.xml b/dlink-assembly/src/main/assembly/package.xml
@@ -134,17 +134,13 @@
         </fileSet>
 
         <!-- 将模块dlink-extends的常用jar文件放到打包目录/plugins下 -->
-        <fileSet>
+        <!--<fileSet>
             <directory>${project.parent.basedir}/dlink-extends/target
             </directory>
             <outputDirectory>plugins</outputDirectory>
             <includes>
-                <include>flink-csv-*.jar</include>
-                <include>flink-json-*.jar</include>
-                <include>flink-connector-jdbc_2.11-*.jar</include>
-                <include>mysql-connector-java-*.jar</include>
             </includes>
-        </fileSet>
+        </fileSet>-->
 
         <!-- 将模块dlink-extends的jar文件放到打包目录/extends下 -->
         <!--<fileSet>

diff --git a/dlink-client/dlink-client-1.11/pom.xml b/dlink-client/dlink-client-1.11/pom.xml
@@ -127,7 +127,10 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>reference.conf</resource>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>uber</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/dlink-client/dlink-client-1.12/pom.xml b/dlink-client/dlink-client-1.12/pom.xml
@@ -173,7 +173,10 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>reference.conf</resource>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>uber</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/dlink-client/dlink-client-1.13/pom.xml b/dlink-client/dlink-client-1.13/pom.xml
@@ -129,7 +129,10 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>reference.conf</resource>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>uber</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/dlink-client/dlink-client-1.14/pom.xml b/dlink-client/dlink-client-1.14/pom.xml
@@ -128,7 +128,10 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                     <resource>reference.conf</resource>
                                 </transformer>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                             </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>uber</shadedClassifierName>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/dlink-extends/pom.xml b/dlink-extends/pom.xml
@@ -70,6 +70,16 @@
             <groupId>ru.yandex.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
             <version>${clickhouse-jdbc.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-table</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-shaded-hadoop-3-uber</artifactId>
+            <version>3.1.1.7.2.1.0-327-9.0</version>
         </dependency>-->
     </dependencies>
 

diff --git a/dlink-web/src/pages/ClusterConfiguration/components/ClusterConfigurationForm.tsx b/dlink-web/src/pages/ClusterConfiguration/components/ClusterConfigurationForm.tsx
@@ -82,7 +82,8 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
         <Form.Item
           name="hadoopConfigPath"
           label="配置文件路径"
-          help="可指定配置文件路径（末尾无/），需要包含以下文件：core-site.xml,hdfs-site.xml,yarn-site.xml"
+          rules={[{required: true, message: '请输入 hadoop 配置文件路径！'}]}
+          help="指定配置文件路径（末尾无/），需要包含以下文件：core-site.xml,hdfs-site.xml,yarn-site.xml"
         >
           <Input placeholder="值如 /usr/local/dlink/conf"/>
         </Form.Item>
@@ -126,15 +127,16 @@ const ClusterConfigurationForm: React.FC<ClusterConfigurationFormProps> = (props
         <Form.Item
           name="flinkLibPath"
           label="lib 路径"
-          rules={[{required: true, message: '请输入 lib 路径！'}]}
-          help="必须指定 lib 的 hdfs 路径（末尾无/），需要包含 Flink 运行时的依赖"
+          rules={[{required: true, message: '请输入 lib 的 hdfs 路径！'}]}
+          help="指定 lib 的 hdfs 路径（末尾无/），需要包含 Flink 运行时的依赖"
         >
           <Input placeholder="值如 hdfs:///flink/lib"/>
         </Form.Item>
         <Form.Item
           name="flinkConfigPath"
           label="配置文件路径"
-          help="可指定配置文件 flink-conf.yaml 的具体路径"
+          rules={[{required: true, message: '请输入 flink-conf.yaml 路径！'}]}
+          help="指定 flink-conf.yaml 的具体路径"
         >
           <Input placeholder="值如 /usr/local/dlink/conf/flink-conf.yaml"/>
         </Form.Item>

diff --git a/dlink-web/src/pages/Welcome.tsx b/dlink-web/src/pages/Welcome.tsx
@@ -62,16 +62,22 @@ export default (): React.ReactNode => {
         </Typography.Text>
         </Paragraph>
         <p> </p>
-        <Timeline pending={<><Text code>0.4.0</Text>
+        <Timeline pending={<><Text code>0.5.0</Text>
           <Text type="secondary">敬请期待</Text>
           <p> </p>
           <Paragraph>
             <ul>
               <li>
-                <Link>FlinkSql Studio 时间调度</Link>
+                <Link>支持同时托管多版本的Flink实例</Link>
               </li>
               <li>
-                <Link>FlinkSql Studio 依赖调度</Link>
+                <Link>支持K8S多种运行模式</Link>
+              </li>
+              <li>
+                <Link>支持多种任务调度框架接口</Link>
+              </li>
+              <li>
+                <Link>支持UDF动态加载</Link>
               </li>
             </ul>
           </Paragraph></>} reverse={true}>
@@ -344,7 +350,7 @@ export default (): React.ReactNode => {
               </ul>
             </Paragraph>
           </Timeline.Item>
-          <Timeline.Item><Text code>0.4.0</Text> <Text type="secondary">2021-11-?</Text>
+          <Timeline.Item><Text code>0.4.0</Text> <Text type="secondary">2021-12-02</Text>
             <p> </p>
             <Paragraph>
               <ul>
@@ -432,6 +438,9 @@ export default (): React.ReactNode => {
                 <li>
                   <Link>新增一键回收过期集群</Link>
                 </li>
+                <li>
+                  <Link>优化打包及扩展方式</Link>
+                </li>
               </ul>
             </Paragraph>
           </Timeline.Item>