diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh index c0b5d716..d19ead1a 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh @@ -17,7 +17,7 @@ # usage="Usage: start.sh (start|stop|restart) " - +source /opt/datasophon/datasophon-worker/script/datasophon-env.sh # if no args specified, show usage if [ $# -le 1 ]; then echo $usage diff --git a/datasophon-ui/pom.xml b/datasophon-ui/pom.xml index bec13b8c..783bb85f 100644 --- a/datasophon-ui/pom.xml +++ b/datasophon-ui/pom.xml @@ -27,8 +27,10 @@ datasophon-ui - v12.16.3 - 6.14.4 + + v16.19.0 + + 9.8.1 .deployed dist node_modules @@ -68,7 +70,9 @@ ${build.npm.version} https://npm.taobao.org/mirrors/node/ + https://registry.npm.taobao.org/npm/-/ + @@ -85,7 +89,8 @@ generate-resources - install --registry=https://registry.npm.taobao.org --sass-binary-site=https://npm.taobao.org/mirrors/node-sass + install + diff --git a/datasophon-worker/src/main/resources/script/datasophon-env.sh b/datasophon-worker/src/main/resources/script/datasophon-env.sh index d05c3358..50aeb854 100644 --- a/datasophon-worker/src/main/resources/script/datasophon-env.sh +++ b/datasophon-worker/src/main/resources/script/datasophon-env.sh @@ -3,7 +3,8 @@ CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar export JAVA_HOME CLASSPATH export KYUUBI_HOME=/opt/datasophon/kyuubi-1.7.3 -export SPARK_HOME=/opt/datasophon/spark-3.1.3 +# export SPARK_HOME=/opt/datasophon/spark-3.1.3 +export SPARK_HOME=/opt/datasophon/spark2 export PYSPARK_ALLOW_INSECURE_GATEWAY=1 export HIVE_HOME=/opt/datasophon/hive-3.1.0