Dev 1.7.0 bug fix (#580)

* Resource reset code optimization * Resource reset code optimization * Resource johhistory code optimization * Resource johhistory code optimization * revent jobhistory: get data * update isreused * fix executionCode error * Code optimization * Code optimization * Code optimization * Code optimization * Code optimization * code review fix * code review fix * Fix Security Work Order: Upgrade Spring Version:5.3.27 -> 5.3.34 * Optimize script log address * SDK interface adds new parameters * Rollback modification to ensure normal cross cluster functionality * fix jobhistory query with code * fix jobhistory query with code * fix download slowly * fix download slowly * Optimize the execution code length * Optimize code * fix list error bug * fix list error bug --------- Co-authored-by: “v_kkhuang” <“[email protected]”>
WeDataSphere · Aug 21, 2024 · 6e53832 · 6e53832
1 parent a4ae669
commit 6e53832
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/...is-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java b/...is-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
@@ -591,10 +591,11 @@ private List<JobHistory> getJobhistoryList(
     } else if (!QueryUtils.checkNameValid(creator)) {
       throw new LinkisCommonErrorException(21304, "Invalid creator : " + creator);
     }
-    if (StringUtils.isNotBlank(executeApplicationName)
-        && !QueryUtils.checkNameValid(executeApplicationName)) {
-      throw new LinkisCommonErrorException(
-          21304, "Invalid applicationName : " + executeApplicationName);
+    if (StringUtils.isNotBlank(executeApplicationName)) {
+      if (!QueryUtils.checkNameValid(executeApplicationName)) {
+        throw new LinkisCommonErrorException(
+            21304, "Invalid applicationName : " + executeApplicationName);
+      }
     } else {
       executeApplicationName = null;
     }
@@ -634,6 +635,7 @@ private List<JobHistory> getJobhistoryList(
     } else if (!QueryUtils.checkInstanceNameValid(engineInstance)) {
       throw new LinkisCommonErrorException(21304, "Invalid instances : " + engineInstance);
     }
+
     List<JobHistory> queryTasks = new ArrayList<>();
     PageHelper.startPage(pageNow, pageSize);
     try {

diff --git a/...ts/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/JobhistoryUtils.java b/...ts/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/util/JobhistoryUtils.java
@@ -164,6 +164,6 @@ private static String formatDateTime(Date date) {
   // 格式化executeApplicationName的方法
   private static String formatExecuteApplicationName(
       String executeApplicationName, String requestApplicationName) {
-    return executeApplicationName + "/" + requestApplicationName;
+    return requestApplicationName + "/" + executeApplicationName ;
   }
 }