remove Zepplin module #395

datavane · Nov 26, 2024 · ec4b8c5 · ec4b8c5
1 parent cbe474c
commit ec4b8c5
Show file tree

Hide file tree

Showing 38 changed files with 806 additions and 317 deletions.
diff --git a/README.md b/README.md
@@ -111,7 +111,7 @@ TIS基于数据库元数据信息自动生成Flink-SQL脚本,您没看错全部
 - WEB UI [https://github.com/qlangtech/ng-tis](https://github.com/qlangtech/ng-tis)
 - 发版信息生成器[https://github.com/qlangtech/tis-git-manager](https://github.com/qlangtech/tis-git-manager)
 - 基于Ansible的打包工具 [https://github.com/qlangtech/tis-ansible](https://github.com/qlangtech/tis-ansible)
-- TIS 插件 [https://github.com/qlangtech/plugins](https://github.com/qlangtech/plugins)
+- TIS 插件 [1.plugins](https://github.com/qlangtech/plugins) [2.tis-plugins-commercial](https://github.com/qlangtech/tis-plugins-commercial)
 - TIS 插件元数据生成工具 [https://github.com/qlangtech/update-center2](https://github.com/qlangtech/update-center2)
 - DataX [https://github.com/qlangtech/DataX](https://github.com/qlangtech/DataX)
 - Flink Extend [https://github.com/qlangtech/flink](https://github.com/qlangtech/flink)

diff --git a/datax-config/src/main/java/com/qlangtech/tis/datax/ITimeFormat.java b/datax-config/src/main/java/com/qlangtech/tis/datax/ITimeFormat.java
@@ -0,0 +1,27 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.qlangtech.tis.datax;
+
+/**
+ * @author: 百岁（baisui@qlangtech.com）
+ * @create: 2024-11-15 12:21
+ **/
+public interface ITimeFormat {
+    public static final String DATA_FORMAT = "yyyy-MM-dd";
+}
diff --git a/datax-config/src/main/java/com/qlangtech/tis/datax/TimeFormat.java b/datax-config/src/main/java/com/qlangtech/tis/datax/TimeFormat.java
@@ -32,9 +32,12 @@
  * @author: 百岁（baisui@qlangtech.com）
  * @create: 2023-02-23 13:31
  **/
-public enum TimeFormat {
-    yyyyMMddHHmmss(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")), yyyyMMdd(DateTimeFormatter.ofPattern("yyyyMMdd"));
-    public static final String DATA_FORMAT = "yyyy-MM-dd";
+public enum TimeFormat implements ITimeFormat {
+
+    yyyyMMddHHmmss(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) //
+    , yyyyMMdd(DateTimeFormatter.ofPattern("yyyyMMdd")) //
+    , yyyy_MM_dd(DateTimeFormatter.ofPattern(DATA_FORMAT));
+   // public static final String DATA_FORMAT = yyyy_MM_dd.timeFormatter.p;
     public static final ZoneId sysZoneId = ZoneOffset.systemDefault();
     public final DateTimeFormatter timeFormatter;
     public static Long timestampForTest;
@@ -53,8 +56,11 @@ public static long getCurrentTimeStamp() {
     }
 
     public String format(long epochMilli) {
-        return LocalDateTime.ofInstant(
-                Instant.ofEpochMilli(epochMilli), sysZoneId).format(this.timeFormatter);
+        return this.ofInstant(epochMilli).format(this.timeFormatter);
+    }
+
+    public LocalDateTime ofInstant(long epochMilli) {
+        return LocalDateTime.ofInstant(Instant.ofEpochMilli(epochMilli), sysZoneId);
     }
 
     public static TimeFormat parse(String token) {
@@ -68,6 +74,6 @@ public static TimeFormat parse(String token) {
     }
 
     public static void main(String[] args) {
-        System.out.println( TimeFormat.yyyyMMddHHmmss.format(1709001500699l));
+        System.out.println(TimeFormat.yyyyMMddHHmmss.format(1709001500699l));
     }
 }
diff --git a/datax-config/src/test/java/com/qlangtech/tis/datax/TestTimeFormat.java b/datax-config/src/test/java/com/qlangtech/tis/datax/TestTimeFormat.java
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.qlangtech.tis.datax;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author: 百岁（baisui@qlangtech.com）
+ * @create: 2024-11-15 12:18
+ **/
+public class TestTimeFormat {
+
+    @Test
+    public void testDATA_FORMAT() {
+        Assert.assertEquals("yyyy-MM-dd", TimeFormat.DATA_FORMAT);
+    }
+}
diff --git a/maven-tpi-plugin/src/main/java/com/qlangtech/tis/maven/plugins/tpi/AbstractHpiMojo.java b/maven-tpi-plugin/src/main/java/com/qlangtech/tis/maven/plugins/tpi/AbstractHpiMojo.java
@@ -250,6 +250,12 @@ public abstract class AbstractHpiMojo extends AbstractJenkinsMojo {
     @Parameter
     protected boolean pluginFirstClassLoader = false;
 
+    /**
+     * 社区协力版本，需要证书验证
+     */
+    @Parameter
+    protected boolean communityVIP = false;
+
     /**
      * If true, test scope dependencies count as if they are normal dependencies.
      * This is only useful during hpi:run, so not exposing it as a configurable parameter.

diff --git a/...tpi-plugin/src/main/java/com/qlangtech/tis/maven/plugins/tpi/AbstractTISManifestMojo.java b/...tpi-plugin/src/main/java/com/qlangtech/tis/maven/plugins/tpi/AbstractTISManifestMojo.java
@@ -1,19 +1,19 @@
 /**
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.qlangtech.tis.maven.plugins.tpi;
 
@@ -176,6 +176,11 @@ protected void setAttributes(Manifest.ExistingSection mainSection) throws MojoEx
             // The "Implementation-Version" baked by Maven should serve the same purpose if someone needs to know the version.
             mainSection.addAttributeAndCheck(new Manifest.Attribute("Plugin-Version", v));
         }
+
+        if (communityVIP) {
+            mainSection.addAttributeAndCheck(new Manifest.Attribute(ICoord.KEY_PLUGIN_VIP, String.valueOf(true)));
+        }
+
         String jv = findTISVersion();
         mainSection.addAttributeAndCheck(new Manifest.Attribute("tis-Version", jv));
         if (maskClasses != null)

diff --git a/pom.xml b/pom.xml
@@ -78,33 +78,20 @@
         <module>tis-manage-pojo</module>
         <module>tis-hadoop-rpc</module>
         <module>tis-solrconfig-parser</module>
-
         <module>tis-common</module>
         <module>tis-base-test</module>
         <module>tis-web-start-api</module>
         <module>tis-web-start</module>
         <module>tis-assemble</module>
-        <!--        <module>tis-ds-dump</module>-->
         <module>tis-plugin-sezpoz</module>
         <module>tis-plugin</module>
-        <!--        <module>tis-solrcore-extend</module>-->
-        <!--        <module>tis-index-builder</module>-->
         <module>tis-dag</module>
-        <!--        <module>tis-realtime-base</module>-->
         <module>tis-sql-parser</module>
         <module>tis-common-dao</module>
-        <!--        <module>tis-collection-info-collect</module>-->
         <module>tis-console</module>
-        <!--        <module>solr-webapp</module>-->
         <module>tis-scala-compiler</module>
-        <!-- <module>tis-scala-compiler-dependencies</module>-->
-
         <module>maven-tpi-plugin</module>
         <module>tis-k8s</module>
-        <!--        <module>tis-datax-executor</module>-->
-        <!--        <module>tis-zeppelin</module>-->
-
-
     </modules>
 
     <dependencies>
@@ -122,12 +109,6 @@
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
         </dependency>
-
-        <!--        <dependency>-->
-        <!--            <groupId>com.qlangtech.tis</groupId>-->
-        <!--            <artifactId>tis-web-start-api</artifactId>-->
-        <!--            <scope>test</scope>-->
-        <!--        </dependency>-->
     </dependencies>
 
     <dependencyManagement>

diff --git a/tis-builder-api/src/main/java/com/qlangtech/tis/maven/plugins/tpi/ICoord.java b/tis-builder-api/src/main/java/com/qlangtech/tis/maven/plugins/tpi/ICoord.java
@@ -1,19 +1,19 @@
 /**
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.qlangtech.tis.maven.plugins.tpi;
@@ -27,6 +27,10 @@
  * @create: 2022-06-27 11:57
  **/
 public interface ICoord {
+    /**
+     * 是否是VIP插件
+     */
+    String KEY_PLUGIN_VIP = "communityVIP";
 
     public URL getDownloadUrl() throws MalformedURLException;
 

diff --git a/tis-builder-api/src/main/java/com/qlangtech/tis/maven/plugins/tpi/PluginClassifier.java b/tis-builder-api/src/main/java/com/qlangtech/tis/maven/plugins/tpi/PluginClassifier.java
@@ -1,19 +1,19 @@
 /**
- *   Licensed to the Apache Software Foundation (ASF) under one
- *   or more contributor license agreements.  See the NOTICE file
- *   distributed with this work for additional information
- *   regarding copyright ownership.  The ASF licenses this file
- *   to you under the Apache License, Version 2.0 (the
- *   "License"); you may not use this file except in compliance
- *   with the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 package com.qlangtech.tis.maven.plugins.tpi;
@@ -28,6 +28,9 @@
  * @create: 2022-06-20 17:16
  **/
 public class PluginClassifier {
+
+
+
     public static final String PACAKGE_TPI_EXTENSION_NAME = "tpi";
     private static final String DIMENSION_SPLIT = ";";
     private static final String TUPLE_SPLIT = "_";

diff --git a/tis-builder-api/src/main/java/com/qlangtech/tis/plugin/IdentityDesc.java b/tis-builder-api/src/main/java/com/qlangtech/tis/plugin/IdentityDesc.java
@@ -0,0 +1,30 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.qlangtech.tis.plugin;
+
+/**
+ * 在pluginAction中保存plguin内容之后，默认向页面返回identity值，在某些场景下需要向页面中返回特定的Bean内容信息，例如TISLicense 保存后需要向页面返回validate结果：HasExpire
+ *
+ * @author: 百岁（baisui@qlangtech.com）
+ * @create: 2024-11-18 18:17
+ * //@see TISLicense
+ **/
+public interface IdentityDesc<T> {
+    public T describePlugin();
+}
diff --git a/tis-common/src/main/java/com/qlangtech/tis/pubhook/common/ConfigConstant.java b/tis-common/src/main/java/com/qlangtech/tis/pubhook/common/ConfigConstant.java
@@ -32,17 +32,4 @@ public class ConfigConstant {
     public static final String FILE_SOLR = "solrconfig.xml";
 
     // public static final String FILE_JAR = "dump.jar";
-
-    // public static final String FILE_CORE_PROPERTIES = "core.properties";
-    // public static String getRunEnvir(int runEnvironment) {
-    // switch (runEnvironment) {
-    // case 0:
-    // return "日常环境";
-    // case 1:
-    // return "DAILY";
-    // default:
-    // throw new IllegalStateException("runEnvironment:" + runEnvironment
-    // + "  is not valid");
-    // }
-    // }
 }