From 5c5b9c198eadd2d3debb4a72a5cee4faf25c70ec Mon Sep 17 00:00:00 2001 From: yanlongqi Date: Sat, 22 Nov 2025 18:00:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96JSON=E5=BA=8F?= =?UTF-8?q?=E5=88=97=E5=8C=96=E8=BE=93=E5=87=BA=E5=92=8C=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为JsonUtil添加格式化输出功能，启用INDENT_OUTPUT提高可读性 - 优化AppApiTest中的输出格式，使用JsonUtil格式化输出并改进显示格式 - 更新JobApiTest中的测试参数 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- .../jhinno/sdk/openapi/utils/JsonUtil.java | 2 + .../sdk/openapi/test/app/AppApiTest.java | 50 ++++++++++++------- .../sdk/openapi/test/job/JobApiTest.java | 2 +- 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/utils/JsonUtil.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/utils/JsonUtil.java index 7862368..8d7f37f 100644 --- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/utils/JsonUtil.java +++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/utils/JsonUtil.java @@ -3,6 +3,7 @@ package com.jhinno.sdk.openapi.utils; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.jhinno.sdk.openapi.CommonConstant; import lombok.SneakyThrows; import org.apache.commons.lang3.StringUtils; @@ -19,6 +20,7 @@ public class JsonUtil { OBJECT_MAPPER.setTimeZone(TimeZone.getTimeZone("GMT+8")); OBJECT_MAPPER.setDateFormat(new SimpleDateFormat(CommonConstant.NORM_DATETIME_PATTERN)); OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + OBJECT_MAPPER.enable(SerializationFeature.INDENT_OUTPUT); } @SneakyThrows diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/app/AppApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/app/AppApiTest.java index 1da8cc9..1bf7c1b 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/app/AppApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/app/AppApiTest.java @@ -42,7 +42,7 @@ public class AppApiTest { @Test public void testDefaultParamsStartApp() { AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("linux_desktop"); - System.out.println(appStartedInfo); + System.out.println(JsonUtil.objectToString(appStartedInfo)); } /** @@ -51,7 +51,7 @@ public class AppApiTest { @Test public void testGetSessionsList() { List desktopList = jhAppApiExecution.getDesktopList(); - System.out.println(desktopList); + System.out.println(JsonUtil.objectToString(desktopList)); } /** @@ -60,7 +60,7 @@ public class AppApiTest { @Test public void testGetDesktopsByParams() { List desktopList = jhAppApiExecution.getDesktopsByParams(null, "Windows桌面"); - System.out.println(desktopList); + System.out.println(JsonUtil.objectToString(desktopList)); } /** @@ -69,7 +69,7 @@ public class AppApiTest { @Test public void testGetDesktopsById() { List desktopList = jhAppApiExecution.getDesktopsById(Arrays.asList("151", "7637", "123")); - System.out.println(desktopList); + System.out.println(JsonUtil.objectToString(desktopList)); } /** @@ -78,7 +78,7 @@ public class AppApiTest { @Test public void testGetDesktopsByName() { List desktopList = jhAppApiExecution.getDesktopsByName("Linux桌面"); - System.out.println(desktopList); + System.out.println(JsonUtil.objectToString(desktopList)); } /** @@ -111,7 +111,7 @@ public class AppApiTest { @Test public void testConnectJhapp() { AppStartedInfo appStartedInfo = jhAppApiExecution.connectJhapp("151"); - System.out.println(appStartedInfo); + System.out.println(JsonUtil.objectToString(appStartedInfo)); } /** @@ -152,21 +152,35 @@ public class AppApiTest { @Test public void testGetAppList() { List appList = jhAppApiExecution.getAppList(); - System.out.println("全部列表" + JsonUtil.objectToString(appList)); + System.out.println("全部列表："); + System.out.println(JsonUtil.objectToString(appList)); // 类型获取 - System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppType.SYSTEM_APP.getAppList(appList))); - System.out.println("计算应用" + JsonUtil.objectToString(AppTypeConstant.AppType.BATCH_APP.getAppList(appList))); - System.out.println("图形应用" + JsonUtil.objectToString(AppTypeConstant.AppType.DESKTOP_APP.getAppList(appList))); + System.out.println("系统应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.SYSTEM_APP.getAppList(appList))); + + System.out.println("计算应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.BATCH_APP.getAppList(appList))); + + System.out.println("图形应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppType.DESKTOP_APP.getAppList(appList))); // 操作系统分类 - System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.SYSTEM.getAppList(appList))); - System.out.println("Linux应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.LINUX.getAppList(appList))); - System.out.println("Windows应用" + JsonUtil.objectToString(AppTypeConstant.AppOsType.WINDOWS.getAppList(appList))); + System.out.println("系统应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.SYSTEM.getAppList(appList))); + + System.out.println("Linux应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.LINUX.getAppList(appList))); + + System.out.println("Windows应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppOsType.WINDOWS.getAppList(appList))); // 应用分类 - System.out.println("系统应用" + JsonUtil.objectToString(AppTypeConstant.AppCategory.SYSTEM.getAppList(appList))); - System.out.println("景行发布应用" + JsonUtil.objectToString(AppTypeConstant.AppCategory.APP.getAppList(appList))); + System.out.println("系统应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppCategory.SYSTEM.getAppList(appList))); + + System.out.println("景行发布应用："); + System.out.println(JsonUtil.objectToString(AppTypeConstant.AppCategory.APP.getAppList(appList))); } /** @@ -174,7 +188,7 @@ public class AppApiTest { */ @Test public void testGetAppUrl() { - System.out.println(jhAppApiExecution.getAppUrl("jhadmin", "myjobmana")); + System.out.println(JsonUtil.objectToString(jhAppApiExecution.getAppUrl("jhadmin", "myjobmana"))); } /** @@ -182,7 +196,7 @@ public class AppApiTest { */ @Test public void testGetAppInfoSuffixList() { - System.out.println(jhAppApiExecution.getAppInfoSuffixList(Collections.singletonList(".cas"))); + System.out.println(JsonUtil.objectToString(jhAppApiExecution.getAppInfoSuffixList(Collections.singletonList(".cas")))); } /** @@ -190,6 +204,6 @@ public class AppApiTest { */ @Test public void testGetUseLabelList() { - System.out.println(jhAppApiExecution.getUseLabelList()); + System.out.println(JsonUtil.objectToString(jhAppApiExecution.getUseLabelList())); } } diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java index 5b6d998..646de80 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobApiTest.java @@ -26,7 +26,7 @@ public class JobApiTest { @Test public void testSubmitJob() { Map params = new HashMap<>(); - params.put("JH_CAS", "$HOME/test.sh"); + params.put("JH_CAS", "$HOME/test1.sh"); params.put("JH_NCPU", "1"); params.put("JH_JOB_CONF", "public"); System.out.println(execution.submit("yanlongqi", "common_sub", params));