From b08e48e7a90636ebace5aa59202ce6407a9429c8 Mon Sep 17 00:00:00 2001
From: xyLiang <lxy_my126@126.com>
Date: Mon, 29 Apr 2024 10:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20hive=E9=9B=86=E6=88=90spar?=
 =?UTF-8?q?k2.3.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/meta/DDP-1.2.1/HIVE/control_hive.sh     |  2 +-
 datasophon-ui/pom.xml                                 | 11 ++++++++---
 .../src/main/resources/script/datasophon-env.sh       |  3 ++-
 3 files changed, 11 insertions(+), 5 deletions(-)

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) <command> "
-
+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 @@
     <artifactId>datasophon-ui</artifactId>
 
     <properties>
-        <build.node.version>v12.16.3</build.node.version>
-        <build.npm.version>6.14.4</build.npm.version>
+<!--        <build.node.version>v12.16.3</build.node.version>-->
+        <build.node.version>v16.19.0</build.node.version>
+<!--        <build.npm.version>6.14.4</build.npm.version>-->
+        <build.npm.version>9.8.1</build.npm.version>
         <deployed.dir>.deployed</deployed.dir>
         <dist.dir>dist</dist.dir>
         <nodemodules.dir>node_modules</nodemodules.dir>
@@ -68,7 +70,9 @@
                     <npmVersion>${build.npm.version}</npmVersion>
 
                     <nodeDownloadRoot>https://npm.taobao.org/mirrors/node/</nodeDownloadRoot>
+<!--                    <nodeDownloadRoot>https://mirrors.huaweicloud.com/repository/node/</nodeDownloadRoot>-->
                     <npmDownloadRoot>https://registry.npm.taobao.org/npm/-/</npmDownloadRoot>
+<!--                    <npmDownloadRoot>https://mirrors.huaweicloud.com/repository/npm/</npmDownloadRoot>-->
                 </configuration>
                 <executions>
                     <execution>
@@ -85,7 +89,8 @@
                         </goals>
                         <phase>generate-resources</phase>
                         <configuration>
-                            <arguments>install --registry=https://registry.npm.taobao.org --sass-binary-site=https://npm.taobao.org/mirrors/node-sass</arguments>
+                            <arguments>install</arguments>
+<!--                            <arguments>install &#45;&#45;registry=https://registry.npm.taobao.org &#45;&#45;sass-binary-site=https://npm.taobao.org/mirrors/node-sass</arguments>-->
                         </configuration>
                     </execution>
                     <execution>
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