Merge pull request #3 from WeBankFinTech/master

up to version
WeBankFinTech · Feb 10, 2020 · c532ece · c532ece
2 parents f19d68a + 859b0bd
commit c532ece
Show file tree

Hide file tree

Showing 75 changed files with 1,502 additions and 525 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -127,6 +127,17 @@ DSS主要特点：
 
  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;**根据需要，用户可以简单快速替换DSS已集成的各种功能组件，或新增功能组件。**
 
+## Demo试用环境
+
+&nbsp; &nbsp; &nbsp; &nbsp;由于DataSphereStudio支持执行脚本风险较高，WeDataSphere Demo环境的隔离没有做完，考虑到大家都在咨询Demo环境，决定向社区先定向发放邀请码，接受企业和组织的试用申请。
+
+&nbsp; &nbsp; &nbsp; &nbsp;如果您想试用Demo环境，请加入DataSphere Studio社区用户群（**加群方式请翻到本文档末尾处**），联系团队成员获取邀请码。
+
+&nbsp; &nbsp; &nbsp; &nbsp;WeDataSphere Demo环境用户注册页面：https://sandbox.webank.com/wds/dss/#/register
+
+&nbsp; &nbsp; &nbsp; &nbsp;WeDataSphere Demo环境登录页面：https://sandbox.webank.com/wds/dss/
+
+&nbsp; &nbsp; &nbsp; &nbsp;我们会尽快解决环境隔离问题，争取早日向社区完全开放WeDataSphere Demo环境。
 
 ## 与类似系统对比
 

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>dss</artifactId>
         <groupId>com.webank.wedatasphere.dss</groupId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -105,6 +105,51 @@
             <artifactId>jackson-core</artifactId>
             <version>2.9.6</version>
         </dependency>
+        <dependency>
+            <groupId>net.databinder.dispatch</groupId>
+            <artifactId>dispatch-core_2.11</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>net.databinder.dispatch</groupId>
+            <artifactId>dispatch-json4s-jackson_2.11</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.htrace</groupId>
+            <artifactId>htrace-core</artifactId>
+            <version>3.1.0-incubating</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-math3</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ning</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>1.8.10</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils-core</artifactId>
+            <version>1.8.0</version>
+        </dependency>
     </dependencies>
 
     <artifactId>dss-assembly</artifactId>

diff --git a/bin/checkEnv.sh b/bin/checkEnv.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Copyright 2019 WeBank
 #
@@ -13,7 +14,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-#!/bin/sh
 say() {
     printf 'check command fail \n %s\n' "$1"
 }
@@ -32,15 +32,14 @@ need_cmd() {
         err "need '$1' (your linux command not found)"
     fi
 }
-echo "<-----start to check linux cmd:yum java mysql unzip expect telnet sed tar---->"
+echo "<-----start to check used cmd---->"
 need_cmd yum
 need_cmd java
 need_cmd mysql
 need_cmd unzip
 need_cmd expect
 need_cmd telnet
-need_cmd sed
 need_cmd tar
-need_cmd source
-need_cmd hostname
-echo "<-----end to check linux cmd:yum java mysql unzip expect telnet sed tar------>"
+need_cmd sed
+need_cmd dos2unix
+echo "<-----end to check used cmd---->"
diff --git a/bin/checkServices.sh b/bin/checkServices.sh
@@ -0,0 +1,91 @@
+#
+# 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.
+#
+#!/bin/sh
+source ~/.bash_profile
+
+shellDir=`dirname $0`
+workDir=`cd ${shellDir}/..;pwd`
+
+##load config
+export LINKIS_DSS_CONF_FILE=${LINKIS_DSS_CONF_FILE:-"${workDir}/conf/config.sh"}
+export DISTRIBUTION=${DISTRIBUTION:-"${workDir}/conf/config.sh"}
+source ${LINKIS_DSS_CONF_FILE}
+source ${DISTRIBUTION}
+
+MICRO_SERVICE_NAME=$1
+MICRO_SERVICE_IP=$2
+MICRO_SERVICE_PORT=$3
+
+local_host="`hostname --fqdn`"
+
+ipaddr=$(ip addr | awk '/^[0-9]+: / {}; /inet.*global/ {print gensub(/(.*)\/(.*)/, "\\1", "g", $2)}')
+
+function isLocal(){
+    if [ "$1" == "127.0.0.1" ];then
+        return 0
+    elif [ $1 == "localhost" ]; then
+        return 0
+    elif [ $1 == $local_host ]; then
+        return 0
+    elif [ $1 == $ipaddr ]; then
+        return 0
+    fi
+        return 1
+}
+
+function executeCMD(){
+   isLocal $1
+   flag=$?
+   echo "Is local "$flag
+   if [ $flag == "0" ];then
+      eval $2
+   else
+      ssh -p $SSH_PORT $1 $2
+   fi
+
+}
+
+#echo "<--------------------------------------------------------------------------->"
+#echo "Start to Check if your microservice:$MICRO_SERVICE_NAME is normal via telnet"
+#echo ""
+#if ! executeCMD $SERVER_IP "test -e $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME"; then
+#  echo "$MICRO_SERVICE_NAME is not installed,the check steps will be skipped"
+#  exit 0
+#fi
+echo "==========================================================="
+echo $MICRO_SERVICE_NAME
+echo $MICRO_SERVICE_IP
+echo $MICRO_SERVICE_PORT
+echo "==========================================================="
+
+if [ $MICRO_SERVICE_NAME == "visualis-server" ] && [ $MICRO_SERVICE_IP == "127.0.0.1" ]; then
+    MICRO_SERVICE_IP=$ipaddr
+fi
+
+result=`echo -e "\n" | telnet $MICRO_SERVICE_IP $MICRO_SERVICE_PORT 2>/dev/null | grep Connected | wc -l`
+if [ $result -eq 1 ]; then
+      echo "$MICRO_SERVICE_NAME is ok."
+else
+      echo "<--------------------------------------------------------------------------->"
+      echo "ERROR your $MICRO_SERVICE_NAME microservice is not start successful !!! ERROR logs as follows :"
+      echo "PLEAESE CHECK  DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
+      echo '<------------------------------------------------------------->'
+      executeCMD $MICRO_SERVICE_IP "tail -n 50 $DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/*.out"
+      echo '<-------------------------------------------------------------->'
+      echo "PLEAESE CHECK DETAIL LOG,LOCATION:$DSS_INSTALL_HOME/$MICRO_SERVICE_NAME/logs/linkis.out"
+      exit 1
+fi
+