From ab435709b002733bd38d35c0b7b3e7c949eb1b20 Mon Sep 17 00:00:00 2001 From: wmqwxb <13628607970@163.com> Date: Wed, 20 Dec 2023 15:42:55 +0800 Subject: [PATCH 1/3] update version info Signed-off-by: wmqwxb <13628607970@163.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4492b36b..04d91f95 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ com.google.guava guava - 32.0.1-ANDROID + 32.0.1-android From ddbdbaeeb9352c2e29e1b4b16ec13e8559476681 Mon Sep 17 00:00:00 2001 From: wmqwxb <13628607970@163.com> Date: Wed, 20 Dec 2023 16:45:14 +0800 Subject: [PATCH 2/3] fix debug Signed-off-by: wmqwxb <13628607970@163.com> --- .../org/fedai/fate/board/controller/JobDetailController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/fedai/fate/board/controller/JobDetailController.java b/src/main/java/org/fedai/fate/board/controller/JobDetailController.java index 78e4217d..c48f626b 100644 --- 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 set = object.keySet(); String[] keys = set.toArray(new String[0]); JSONArray outputDataArray = new JSONArray(); From 50809fb6ac22db8189431fea14a8c4350edb87a9 Mon Sep 17 00:00:00 2001 From: wmqwxb <13628607970@163.com> Date: Wed, 20 Dec 2023 18:15:42 +0800 Subject: [PATCH 3/3] update start shell Signed-off-by: wmqwxb <13628607970@163.com> --- bin/service.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/service.sh b/bin/service.sh index 8c1de5fb..4b96aa97 100644 --- 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