Merge branch 'develop-2.0.0' of https://github.com/FederatedAI/FATE-B…

…oard into develop-2.0.0
FederatedAI · Dec 20, 2023 · e3166b0 · e3166b0
2 parents bcfabed + 50809fb
commit e3166b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/bin/service.sh b/bin/service.sh
@@ -34,6 +34,7 @@ fatepath=$(
 
 main_class=org.fedai.fate.board.bootstrap.Bootstrap
 module=fateboard
+version=2.0.0
 
 
 if test -f "${fatepath}/fate/bin/init_env.sh";then
@@ -48,7 +49,7 @@ fi
 
 
 getpid() {
-  pid=$(ps -ef | grep java | grep ${basepath}/fateboard.jar | grep -v grep | awk '{print $2}')
+  pid=$(ps -ef | grep java | grep ${basepath}/fateboard-${version}.jar | grep -v grep | awk '{print $2}')
 
   if [[ -n ${pid} ]]; then
     return 1
@@ -80,9 +81,9 @@ start() {
   if [[ $? -eq 0 ]]; then
     mklogsdir
     if [[ $1 == "front" ]]; then
-      exec $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}.jar ${main_class} >/dev/null 2>&1
+      exec $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class} >/dev/null 2>&1
     else
-     nohup $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}.jar ${main_class} >/dev/null 2>&1 &
+     nohup $JAVA_HOME/bin/java -Dspring.config.location=$configpath/application.properties -Dssh_config_file=$basepath/ssh/ -Xmx2048m -Xms2048m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -XX:+HeapDumpOnOutOfMemoryError -cp $libpath/*:$basepath/${module}-${version}.jar ${main_class} >/dev/null 2>&1 &
 
     fi
 

diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.0.1-ANDROID</version>
+            <version>32.0.1-android</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/org/fedai/fate/board/controller/JobDetailController.java b/src/main/java/org/fedai/fate/board/controller/JobDetailController.java
@@ -422,6 +422,9 @@ public ResponseResult getData(@Valid @RequestBody ComponentQueryDTO componentQue
             return new ResponseResult<>(ErrorCode.FATEFLOW_ERROR_NULL_RESULT);
         }
         JSONObject object = JSON.parseObject(result);
+        if (object.isEmpty()) {
+            return new ResponseResult(ErrorCode.SUCCESS, object);
+        }
         Set<String> set = object.keySet();
         String[] keys = set.toArray(new String[0]);
         JSONArray outputDataArray = new JSONArray();