Merge pull request #88 from WeDataSphere/1.0.0-rc1

1.0.0-rc1 release

Author: jinyangrao

README-CH.md

@@ -7,22 +7,22 @@
 
 ## 简介
 
-Visualis是一个基于宜信的开源项目[Davinci](https://github.com/edp963/davinci)开发的数据可视化BI工具。现已被集成到数据应用开发门户[DataSphere Studio](https://github.com/WeBankFinTech/DataSphereStudio)中。
+    Visualis是一个基于宜信的开源项目[Davinci](https://github.com/edp963/davinci)开发的数据可视化BI工具。现已被集成到数据应用开发门户[DataSphere Studio](https://github.com/WeBankFinTech/DataSphereStudio)中，此次发布的版本Visualis1.0.0-rc1版本支持Linkis1.1.1和DSS1.0.1版本。
 
-Visualis支持拖拽式报表定义、图表联动、钻取、全局筛选、多维分析、实时查询等数据开发探索的分析模式，并做了水印、数据质量校验等金融级增强。
+    Visualis支持拖拽式报表定义、图表联动、钻取、全局筛选、多维分析、实时查询等数据开发探索的分析模式，并做了水印、数据质量校验等金融级增强。
 
 ## 功能特性
 
-基于达芬奇项目, Visualis与DataSphere Studio结合，一同实现了以下特性：
+    基于达芬奇项目, Visualis与DataSphere Studio 1.0.1集成，实现了以下特性：
 * 图表水印
 * 数据质量校验
 * 图表展示优化
 * 对接Linkis计算中间件
 * Scriptis结果集一键可视化
 * 外部应用参数支持
-* Dashboard/Display集成为DataSphere Studio的工作流节点
+* Widget/Dashboard/Display集成为DataSphere Studio的工作流节点
 
-Visualis同时支持以下Davinci的原生功能：
+    Visualis同时支持以下Davinci v0.3版本的原生功能：
 * **数据源**
   * 支持JDBC数据源
   * 支持CSV文件上传
@@ -50,13 +50,13 @@ Visualis同时支持以下Davinci的原生功能：
   * 支持仪表板授权分享
 
 
-## 与DataSphere Studio继承
+## 与DataSphere Studio集成
 
-Visualis与DataSphere Studio的数据开发、工作流调度和数据质量校验等模块无缝衔接，实现数据应用开发全流程的连贯顺滑用户体验。
+    Visualis与DataSphere Studio的数据开发、工作流调度和数据质量校验等模块无缝衔接，实现数据应用开发全流程的连贯顺滑用户体验。
 
-更多信息请访问[DataSphere Studio documentations]().
+更多使用说明可参考: [Visualis User Manul Doc](./visualis_docs/zh_CN/Visualis_user_manul_cn.md)
 
-![Visualis](images/Visualis_AppJoint.gif)
+![Visualis](images/visualis_workflow.gif)
 
 
 
@@ -66,12 +66,31 @@ Visualis与DataSphere Studio的数据开发、工作流调度和数据质量校
 
 ## 文档
 
-[单独部署文档](visualis_docs/zh_CN/Visualis_deploy_doc_cn.md)
+## 安装部署文档
+[编译部署文档](visualis_docs/zh_CN/Visualis_deploy_doc_cn.md)
 
-[快速对接DSS和Linkis](visualis_docs/zh_CN/Visualis_deploy_doc_cn.md)
+[AppConn安装文档](visualis_docs/zh_CN/Visualis_appconn_install_cn.md)
+
+## 使用文档
+[用户使用文档](visualis_docs/zh_CN/Visualis_user_manul_cn.md)
 
 [Visualis与Davinci的区别](visualis_docs/zh_CN/Visualis_Davinci_difference_cn.md)
 
+## 设计文档
+[Visualis设计文档](visualis_docs/zh_CN/Visualis_design_cn.md)
+
+[Display和DashBoard预览原理](visualis_docs/zh_CN/Visualis_display_dashboard_privew_cn.md)
+
+[Visualis接入DSS/Linkis注意点](visualis_docs/zh_CN/Visualis_dss_integration_cn.md)
+
+[集成LinkisDatasource](visualis_docs/zh_CN/Visualis_linkisdatasource_cn.md)
+
+[发送邮件实现原理](visualis_docs/zh_CN/Visualis_sendemail_cn.md)
+
+[绑定sql节点原理](visualis_docs/zh_CN/Visualis_sql_databind_cn.md)
+
+[虚拟视图设计文档](visualis_docs/zh_CN/Visualis_visual_doc_cn.md)
+
 ## 交流贡献
 
 ![communication](images/communication.png)

README.md

@@ -24,7 +24,7 @@ Based on Davinci project, Visualis achieves below features with DataSphere Studi
 * External application parameters support.
 * Dashboard/Display as an appjoint of DataSphere Studio workflow
 
-Visualis also supports most of the original features of Davinci.
+Visualis also supports most of the original features of Davinci v0.3.
 * Data Source Support
   * Files in CSV format
   * JDBC data source
@@ -55,7 +55,7 @@ Visualis seamlessly integrates with the data develoment, workflow scheduling and
 
 For more detail, please visit [DataSphere Studio documentations]().
 
-![Visualis](images/Visualis_AppJoint.gif)
+![Visualis](images/visualis_workflow.gif)
 
 ## Quick start
 

assembly/pom.xml

@@ -3,18 +3,10 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <!--<parent>-->
-        <!--<artifactId>davinci-parent_3.01</artifactId>-->
-        <!--<groupId>edp.davinci</groupId>-->
-        <!--<version>0.3.1-SNAPSHOT</version>-->
-        <!--<relativePath>../pom.xml</relativePath>-->
-    <!--</parent>-->
-
     <parent>
         <artifactId>visualis</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.5.0</version>
+        <version>1.0.0-rc1</version>
     </parent>
 
     <artifactId>visualis-assembly</artifactId>

assembly/src/main/assembly/assembly.xml

@@ -30,7 +30,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.parent.basedir}</directory>
-            <outputDirectory>/</outputDirectory>
+            <outputDirectory>${file.separator}</outputDirectory>
             <includes>
                 <include>README*</include>
             </includes>
@@ -43,6 +43,7 @@
             <includes>
                 <include>*</include>
             </includes>
+            <lineEnding>unix</lineEnding>
         </fileSet>
         <fileSet>
             <directory>.</directory>
@@ -61,6 +62,7 @@
                 <exclude>upgrade.*</exclude>
                 <exclude>upgrade-*</exclude>
             </excludes>
+            <lineEnding>unix</lineEnding>
         </fileSet>
         <fileSet>
             <directory>
@@ -80,18 +82,12 @@
                 <include>text</include>
             </includes>
         </fileSet>
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--${project.parent.basedir}/davinci-ui-->
-            <!--</directory>-->
-            <!--<outputDirectory>davinci-ui</outputDirectory>-->
-        <!--</fileSet>-->
-        <!--<fileSet>-->
-            <!--<directory>-->
-                <!--${project.parent.basedir}/swagger-ui-->
-            <!--</directory>-->
-            <!--<outputDirectory>swagger-ui</outputDirectory>-->
-        <!--</fileSet>-->
+        <fileSet>
+            <directory>
+                ${project.parent.basedir}/davinci-ui
+            </directory>
+            <outputDirectory>davinci-ui</outputDirectory>
+        </fileSet>
 
     </fileSets>
 
@@ -104,11 +100,4 @@
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
     </dependencySets>
-
-    <!--<files>
-        <file>
-            <source>${project.parent.basedir}/server/target/davinci-server_2.11-${project.parent.version}-jar-with-dependencies.jar</source>
-            <outputDirectory>plugin</outputDirectory>
-        </file>
-    </files>-->
 </assembly>

assembly/src/main/assembly/distribution.xml

@@ -0,0 +1,61 @@
+<!--
+  ~ Copyright 2019 WeBank
+  ~ Licensed 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.
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+    <id>visualis-server</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>visualis-server</baseDirectory>
+
+    <dependencySets>
+        <dependencySet>
+            <!-- Enable access to all projects in the current multimodule build! <useAllReactorProjects>true</useAllReactorProjects> -->
+            <!-- Now, select which projects to include in this module-set. -->
+            <outputDirectory>lib</outputDirectory>
+            <useProjectArtifact>true</useProjectArtifact>
+            <useTransitiveDependencies>true</useTransitiveDependencies>
+            <unpack>false</unpack>
+            <useStrictFiltering>false</useStrictFiltering>
+            <useTransitiveFiltering>true</useTransitiveFiltering>
+            <excludes>
+                <exclude>com.amazonaws:aws-java-sdk-autoscaling:jar</exclude>
+                <exclude>com.amazonaws:aws-java-sdk-core:jar</exclude>
+                <exclude>com.amazonaws:aws-java-sdk-ec2:jar</exclude>
+                <exclude>com.amazonaws:aws-java-sdk-route53:jar</exclude>
+                <exclude>com.amazonaws:aws-java-sdk-sts:jar</exclude>
+                <exclude>com.amazonaws:jmespath-java:jar</exclude>
+                <exclude>javax.ws.rs:jsr311-api:jar</exclude>
+                <exclude>software.amazon.ion:ion-java:jar</exclude>
+            </excludes>
+        </dependencySet>
+    </dependencySets>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/src/main/resources</directory>
+            <includes>
+                <include>*</include>
+            </includes>
+            <fileMode>0777</fileMode>
+            <outputDirectory>conf</outputDirectory>
+            <lineEnding>unix</lineEnding>
+        </fileSet>
+    </fileSets>
+
+</assembly>
+

assembly/src/main/assembly/release.xml

@@ -17,12 +17,6 @@
   limitations under the License.
   >>
   -->
-
-
-
-
-
-
 <assembly>
     <id>release-beta.4</id>
     <formats>
@@ -91,11 +85,4 @@
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
     </dependencySets>
-
-    <!--<files>
-        <file>
-            <source>${project.parent.basedir}/server/target/davinci-server_2.11-${project.parent.version}-jar-with-dependencies.jar</source>
-            <outputDirectory>plugin</outputDirectory>
-        </file>
-    </files>-->
 </assembly>