Merge pull request #1101 from WeDataSphere/master

Fix some bugs.

.github/workflows/dlc.json

@@ -1,4 +1,15 @@
 {
+  "ignorePatterns": [
+    {
+      "pattern": "https://github.com/WeBankFinTech/DataSphereStudio-Doc"
+    },
+    {
+      "pattern": "http://localhost"
+    },
+    {
+      "pattern": "http://127.0.0.1"
+    }
+  ],
   "timeout": "10s",
   "retryOn429": true,
   "retryCount": 10,

assembly/bin/appconn-install.sh

@@ -26,7 +26,7 @@ function isSuccess(){
   fi
 }
 
-PROC_NAME=DSSProjectServerApplication
+PROC_NAME=DSSServerApplication
 ProcNumber=`ps -ef | grep -w $PROC_NAME | grep -v grep | wc -l`
 if [ $ProcNumber -le 0 ];then
    echo "${PROC_NAME} is not running, please ensure whether DSS is installed and started."

assembly/bin/appconn-refresh.sh

@@ -11,6 +11,17 @@ if [ -z $SOURCE_ROOT ]; then
   source ${SOURCE_ROOT}/conf/db.sh
 fi
 
+function refresh() {
+  while true; do
+    response=$(curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load)
+    if [[ $response == *"succeed"* ]]; then
+      break
+    else
+      sleep 5
+    fi
+  done
+}
+
 function isSuccess(){
   if [ $? -ne 0 ]; then
       echo "Failed to " + $1
@@ -39,18 +50,18 @@ if [ -z $1 ];then
     sh $SOURCE_ROOT/sbin/dss-start-all.sh
   else
     echo "You chose to wait for 5 minutes."
-    echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
-    curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load
-    isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
+    echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
+    refresh
+    isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
     echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
     echo ""
     exit 0
   fi
 else
   APPCONN_NAME=$1
-  echo "Now try to call dss-framework-project to reload the plugin of $APPCONN_NAME AppConn."
-  curl -H "Token-Code:BML-AUTH" -H "Token-User:hadoop" -X GET http://${GATEWAY_INSTALL_IP}:${GATEWAY_PORT}/api/rest_j/v1/dss/framework/project/appconn/${APPCONN_NAME}/load
-  isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-framework-project."
+  echo "Now try to call dss-server to reload the plugin of $APPCONN_NAME AppConn."
+  refresh
+  isSuccess "reload the plugin of $APPCONN_NAME AppConn in dss-server."
   echo "Now please wait for 5 minutes, then all of the DSS micro-services will refresh the ${APPCONN_NAME} AppConn plugin."
   echo ""
   exit 0

assembly/bin/dssinstall.sh

@@ -0,0 +1,215 @@
+#!/bin/sh
+#Actively load user env
+if [ -f "~/.bashrc" ];then
+  echo "Warning! user bashrc file does not exist."
+else
+  source ~/.bashrc
+fi
+
+shellDir=`dirname $0`
+workDir=`cd ${shellDir}/..;pwd`
+
+SERVER_IP=""
+SERVER_HOME=""
+
+local_host="`hostname --fqdn`"
+LOCAL_IP=$(hostname -I | sed 's/^\([0-9.]\+\) .*/\1/')
+
+#To be compatible with MacOS and Linux
+txt=""
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    txt="''"
+elif [[ "$OSTYPE" == "linux-gnu" ]]; then
+    txt=""
+elif [[ "$OSTYPE" == "cygwin" ]]; then
+    echo "dss not support Windows operating system"
+    exit 1
+elif [[ "$OSTYPE" == "msys" ]]; then
+    echo "dss not support Windows operating system"
+    exit 1
+elif [[ "$OSTYPE" == "win32" ]]; then
+    echo "dss not support Windows operating system"
+    exit 1
+elif [[ "$OSTYPE" == "freebsd"* ]]; then
+    txt=""
+else
+    echo "Operating system unknown, please tell us(submit issue) for better service"
+    exit 1
+fi
+
+function isSuccess(){
+  if [ $? -ne 0 ]; then
+      echo "Failed to " + $1
+      exit 1
+  else
+      echo "Succeed to " + $1
+  fi
+}
+
+function checkJava(){
+  java -version
+  isSuccess "execute java --version"
+}
+
+checkJava
+
+dos2unix -q ${workDir}/config/*
+isSuccess "execute dos2unix -q ${workDir}/config/*"
+dos2unix -q ${workDir}/bin/*
+
+echo "step1:load config"
+source ${workDir}/config/config.sh
+source ${workDir}/config/db.sh
+
+DSS_FILE_PATH="$workDir/$DSS_FILE_NAME"
+
+if [ -z $DSS_FILE_NAME ]; then
+  echo "DSS_FILE_NAME is null "
+  exit 1
+fi
+
+function replaceCommonIp() {
+  if [ -z "$DSS_SERVER_INSTALL_IP" ]; then
+    DSS_SERVER_INSTALL_IP=$LOCAL_IP
+  fi
+
+  if [ -z "$DSS_SERVER_PORT" ]; then
+    DSS_SERVER_PORT=9002
+  fi
+
+  if [ -z "$DSS_APPS_SERVER_INSTALL_IP" ]; then
+    DSS_APPS_SERVER_INSTALL_IP=$LOCAL_IP
+  fi
+  if [ -z "$DSS_APPS_SERVER_PORT" ]; then
+    DSS_APPS_SERVER_PORT=9003
+  fi
+
+  if [[ $GATEWAY_INSTALL_IP == "127.0.0.1" ]] || [ -z "$GATEWAY_INSTALL_IP" ]; then
+   GATEWAY_INSTALL_IP=$LOCAL_IP
+  fi
+
+  if [[ $EUREKA_INSTALL_IP == "127.0.0.1" ]] || [ -z "$EUREKA_INSTALL_IP" ]; then
+    EUREKA_INSTALL_IP=$LOCAL_IP
+  fi
+}
+##替换真实的IP
+replaceCommonIp
+
+EUREKA_URL=http://$EUREKA_INSTALL_IP:$EUREKA_PORT/eureka/
+
+## excecute sql
+source ${workDir}/bin/executeSQL.sh
+
+function changeCommonConf(){
+  sed -i "s#defaultZone:.*#defaultZone: $EUREKA_URL#g" $CONF_APPLICATION_YML
+  sed -i "s#hostname:.*#hostname: $SERVER_IP#g" $CONF_APPLICATION_YML
+  sed -i "s#wds.linkis.server.mybatis.datasource.url.*#wds.linkis.server.mybatis.datasource.url=jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DB}?characterEncoding=UTF-8#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.server.mybatis.datasource.username.*#wds.linkis.server.mybatis.datasource.username=$MYSQL_USER#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.server.mybatis.datasource.password.*#wds.linkis.server.mybatis.datasource.password=$MYSQL_PASSWORD#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.gateway.ip.*#wds.linkis.gateway.ip=$GATEWAY_INSTALL_IP#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.gateway.port.*#wds.linkis.gateway.port=$GATEWAY_PORT#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.gateway.url.*#wds.linkis.gateway.url=http://$GATEWAY_INSTALL_IP:$GATEWAY_PORT/#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.gateway.wtss.url.*#wds.linkis.gateway.wtss.url=http://$GATEWAY_INSTALL_IP:$GATEWAY_PORT/#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.bml.auth.token.value.*#wds.linkis.bml.auth.token.value=$BML_AUTH#g" $CONF_DSS_PROPERTIES
+  sed -i "s#linkis.configuration.linkisclient.auth.token.value.*#linkis.configuration.linkisclient.auth.token.value=$BML_AUTH#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.context.client.auth.value.*#wds.linkis.context.client.auth.value=$BML_AUTH#g" $CONF_DSS_PROPERTIES
+  sed -i "s#wds.linkis.errorcode.auth.token.*#wds.linkis.errorcode.auth.token=$BML_AUTH#g" $CONF_DSS_PROPERTIES
+}
+
+##function start
+function changeConf(){
+  sed -i "s#spring.server.port=.*#spring.server.port=$SERVER_PORT#g" $CONF_SERVER_PROPERTIES
+  if [[ $SERVER_NAME == "dss-framework-orchestrator-server" ]] || [[ $SERVER_NAME == "dss-workflow-server" ]]; then
+      SERVER_FULL_NAME=$SERVER_NAME
+      SERVER_FULL_NAME=$SERVER_NAME-$ENV_FLAG
+      sed -i "s#spring.spring.application.name=.*#spring.spring.application.name=$SERVER_FULL_NAME#g" $CONF_SERVER_PROPERTIES
+  fi
+  sed -i "s#wds.dss.appconn.scheduler.project.store.dir.*#wds.dss.appconn.scheduler.project.store.dir=$WDS_SCHEDULER_PATH#g" $CONF_SERVER_PROPERTIES
+  isSuccess "subsitution $CONF_SERVER_PROPERTIES"
+}
+##function end
+
+
+UPLOAD_PUBLIC_IPS=""
+##function start
+function uploadServiceFile(){
+  if [[ $SERVER_IP == "127.0.0.1" ]]; then
+    SERVER_IP=$local_host
+  fi
+  if [[ $UPLOAD_PUBLIC_IPS == *",${ENV_FLAG}-$SERVER_IP,"* ]]; then
+	  return 0
+  fi
+  echo "rfp:$SERVER_HOME"
+  cp -rfp ${DSS_FILE_PATH}/* $SERVER_HOME
+  cp -rfp ${workDir}/bin $SERVER_HOME
+  cp -rfp ${workDir}/config/* $SERVER_HOME/conf
+  sudo chown -R $deployUser:$deployUser $SERVER_HOME
+  UPLOAD_PUBLIC_IPS="$UPLOAD_PUBLIC_IPS,${ENV_FLAG}-$SERVER_IP,"
+  changeCommonConf
+}
+
+##function start
+function installPackage(){
+  if [[ $SERVER_IP == "127.0.0.1" ]]; then
+    SERVER_IP=$local_host
+  fi
+  if [ -z $SERVER_NAME ]; then
+    echo "ERROR:SERVER_NAME is null "
+    exit 1
+  fi
+  uploadServiceFile
+  # change configuration
+  changeConf
+}
+
+function dssWebInstall(){
+if ! test -e ${LINKIS_DSS_HOME}/wedatasphere-dss-web*.zip; then
+  echo "**********Error: please put wedatasphere-dss-web-xxx.zip in ${LINKIS_DSS_HOME}! "
+  exit 1
+else
+  echo "Start to unzip dss web package."
+  unzip  -d ${LINKIS_DSS_HOME}/web/ -o ${LINKIS_DSS_HOME}/wedatasphere-dss-web-*.zip > /dev/null 2>&1
+  sed -i "s#linkis_url.*#linkis_url=${LINKIS_GATEWAY_URL}#g" ${LINKIS_DSS_HOME}/web/config.sh
+  isSuccess "Unzip dss web package to ${LINKIS_DSS_HOME}/web"
+fi
+}
+
+##Install dss projects
+function installDssProject() {
+  echo "step2:update config"
+  SERVER_HOME=$DSS_INSTALL_HOME
+  echo "create dir SERVER_HOME: $SERVER_HOME"
+  sudo mkdir -p $SERVER_HOME
+  isSuccess "Create the dir of  $SERVER_HOME"
+  sudo chown -R $deployUser:$deployUser $SERVER_HOME
+  isSuccess "chown -R $deployUser:$deployUser $SERVER_HOME"
+
+  #echo ""
+  SERVER_NAME=dss-server
+  SERVER_IP=$DSS_SERVER_INSTALL_IP
+  SERVER_PORT=$DSS_SERVER_PORT
+  CONF_SERVER_PROPERTIES=$SERVER_HOME/conf/$SERVER_NAME.properties
+  CONF_DSS_PROPERTIES=$SERVER_HOME/conf/dss.properties
+  CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
+  ###install dss-server
+  installPackage
+  #echo ""
+
+  SERVER_NAME=dss-apps-server
+  SERVER_IP=$DSS_APPS_SERVER_INSTALL_IP
+  SERVER_PORT=$DSS_APPS_SERVER_PORT
+  CONF_SERVER_PROPERTIES=$SERVER_HOME/conf/$SERVER_NAME.properties
+  CONF_DSS_PROPERTIES=$SERVER_HOME/conf/dss.properties
+  CONF_APPLICATION_YML=$SERVER_HOME/conf/application-dss.yml
+  ###install dss-apps-server
+  installPackage
+  #echo ""
+
+  #echo "-----------------DSS install end--------------------"
+  #echo ""
+
+}
+ENV_FLAG="dev"
+installDssProject
+
+echo "Congratulations! You have installed DSS $DSS_VERSION successfully, please use sbin/dss-start-all.sh to start it!"