[shardingsphere-elasticjob-ui] branch master updated: Add ext-lib to distribution and update documents

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git


The following commit(s) were added to refs/heads/master by this push:
     new 31d8238  Add ext-lib to distribution and update documents
     new d5a66a6  Merge pull request #52 from TeslaCN/fixes-46
31d8238 is described below

commit 31d8238611f30ffad1d089c01f2ece2e0e3001c1
Author: 吴伟杰 <ro...@me.com>
AuthorDate: Fri Sep 25 20:02:30 2020 +0800

    Add ext-lib to distribution and update documents
---
 README.md                                                | 16 ++++++++++++++++
 README_ZH.md                                             | 16 ++++++++++++++++
 ...hardingsphere-elasticjob-lite-ui-bin-distribution.xml |  7 +++++++
 3 files changed, 39 insertions(+)

diff --git a/README.md b/README.md
index bf1fb28..4407ff1 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
+[中文文档](https://github.com/apache/shardingsphere-elasticjob-ui/blob/master/README_ZH.md)
+
 ## Overview
 
 ElasticJob UI is an administrator console of [ElasticJob](http://shardingsphere.apache.org/elasticjob/).
@@ -28,3 +30,17 @@ mvn clean package -Prelease
 
 - Get the lite tar in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz`
 - Get the cloud tar in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz`
+
+## How to Connect Event Trace DataSource
+
+Restricted by the agreement, some databases' JDBC driver cannot be added to project directly, and users need to add it by themselves. There are two ways:
+
+### Add JDBC Driver Dependency to pom.xml and Build
+
+Add JDBC driver dependency to [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml](https://github.com/apache/shardingsphere-elasticjob-ui/blob/master/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml) and build.
+
+### Add JDBC Driver JAR to ext-lib in Binary Distribution Package
+
+1. Get `apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz` and extract.
+2. Add JDBC Driver (Such as `mysql-connector-java-8.0.13.jar`) to directory `ext-lib`.
+3. Run application with `bin/start.sh`
diff --git a/README_ZH.md b/README_ZH.md
index fc6c07d..4762f04 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -2,6 +2,8 @@
 
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
+[English document](https://github.com/apache/shardingsphere-elasticjob-ui/blob/master/README.md)
+
 ## 概述
 
 ElasticJob-UI 是 [ElasticJob](http://shardingsphere.apache.org/elasticjob/) 的管理控制台，包含了动态配置、作业管控等功能。
@@ -29,3 +31,17 @@ mvn clean package -Prelease
 
 - 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz` 中获取 lite 软件包。
 - 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz` 中获取 cloud 软件包。
+
+## 如何连接事件追踪数据源
+
+受协议限制，本项目无法直接添加部分数据库的 JDBC 驱动，需要用户自行添加，有两种方式：
+
+### 在 pom.xml 添加 JDBC 依赖项并构建项目
+
+通过源码构建本项目，可以直接在 [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml](https://github.com/apache/shardingsphere-elasticjob-ui/blob/master/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml) 中直接添加所需的 JDBC 驱动依赖。
+
+### 在分发包的 ext-lib 目录中添加 JDBC 驱动 JAR
+
+1. 获取并解压 `apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz`；
+2. 添加 JDBC 驱动 (例如 `mysql-connector-java-8.0.13.jar`) 到文件夹 `ext-lib`；
+3. 使用脚本 `bin/start.sh` 运行管理控制台。
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-lite-ui-bin-distribution.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-lite-ui-bin-distribution.xml
index d16998b..3db6160 100644
--- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-lite-ui-bin-distribution.xml
+++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/src/main/assembly/shardingsphere-elasticjob-lite-ui-bin-distribution.xml
@@ -52,6 +52,13 @@
             </includes>
             <outputDirectory>/</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>.</directory>
+            <outputDirectory>ext-lib</outputDirectory>
+            <excludes>
+                <exclude>*/**</exclude>
+            </excludes>
+        </fileSet>
     </fileSets>
     
     <dependencySets>