>() {
+ });
if (StringUtils.equals(result.getResult(), CommonConstant.FAILED)) {
throw new ServiceException(path, result.getCode(), result.getMessage());
}
}
-
/**
* 退出用户的登录，释放许可，当用户退出登录后，建议清除用户的token信息
*
diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/JHAppApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/JHAppApiExecution.java
index f7f67e0..20e9b6a 100644
--- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/JHAppApiExecution.java
+++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/JHAppApiExecution.java
@@ -4,8 +4,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.jhinno.sdk.openapi.ArgsException;
import com.jhinno.sdk.openapi.AuthType;
import com.jhinno.sdk.openapi.CommonConstant;
+import com.jhinno.sdk.openapi.JHApiExecution;
import com.jhinno.sdk.openapi.ServiceException;
-import com.jhinno.sdk.openapi.api.JHApiExecution;
+import com.jhinno.sdk.openapi.api.JHRequestExecution;
import com.jhinno.sdk.openapi.api.ResponseResult;
import com.jhinno.sdk.openapi.client.JHApiClient;
import com.jhinno.sdk.openapi.utils.CollectionUtil;
@@ -23,16 +24,12 @@ import java.util.Map;
* @author yanlongqi
* @date 2024/2/1 16:26
*/
-@NoArgsConstructor
-public class JHAppApiExecution extends JHApiExecution {
+public class JHAppApiExecution implements JHApiExecution {
- /**
- * 获取一个执行器的实例
- *
- * @param jhApiClient 请求的客户端
- */
- public JHAppApiExecution(JHApiClient jhApiClient) {
- super(jhApiClient);
+ private JHRequestExecution execution;
+
+ public void init(JHRequestExecution execution) {
+ this.execution = execution;
}
/**
@@ -47,17 +44,19 @@ public class JHAppApiExecution extends JHApiExecution {
*
* 开发阶段，主要有一下几种方式：
*
- * - 使用js的 `window.open("{@link AppStartedInfo#getJhappUrl()}")`
- * - 使用HTML的a标签的href
- * - 使用HTML的iframe标签的src
+ * - 使用js的 `window.open("{@link AppStartedInfo#getJhappUrl()}")`
+ * - 使用HTML的a标签的href
+ * - 使用HTML的iframe标签的src
*
* 以下是使用的伪代码：
+ *
*
* // 使用a标签实例代码
* var a = document.createElement("a");
* a.href = "{@link AppStartedInfo#getJhappUrl()}";
* a.click();
*
+ *
*
* // 使用iframe标签实例代码
* var iframe = document.createElement("iframe");
@@ -71,6 +70,7 @@ public class JHAppApiExecution extends JHApiExecution {
* 并使用js生产的时间，具体的参数见 {@link AppStartRequest#setCurrentTimestamp(String)}
*
* 通过浏览器启动
+ *
*
* window.open("{@link AppStartedInfo#getWebSessionUrl()}}")
*
@@ -82,8 +82,9 @@ public class JHAppApiExecution extends JHApiExecution {
*/
public AppStartedInfo desktopStart(String username, String appId, AppStartRequest appStartRequest) {
String path = AppPathConstant.APPS_START_PATH.replace("{appId}", appId);
- List data = post(path, username, appStartRequest, new TypeReference>>() {
- });
+ List data = execution.post(path, username, appStartRequest,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(data)) {
throw new ServiceException(path, 500, "获取到的会话信息为空");
}
@@ -94,17 +95,17 @@ public class JHAppApiExecution extends JHApiExecution {
public String getWebSessionUrl(String username, String desktopId) {
String webSessionUrlPath = AppPathConstant.WEB_SESSION_URL_PATH.replace("{desktopId}", desktopId);
- String url = getJhApiClient().getUrl(webSessionUrlPath);
+ String url = execution.getJhApiClient().getUrl(webSessionUrlPath);
Map params = new HashMap<>();
- AuthType authType = getAuthType();
+ AuthType authType = execution.getAuthType();
if (authType == AuthType.TOKEN_MODE) {
- params.put(CommonConstant.TOKEN, getToken(username));
+ params.put(CommonConstant.TOKEN, execution.getToken(username));
} else if (authType == AuthType.ACCESS_SECRET_MODE) {
params.put(CommonConstant.USERNAME, username);
- params.put(CommonConstant.ACCESS_KEY, getAccessKey());
- String currentTimeMillis = getCurrentTimeMillis();
+ params.put(CommonConstant.ACCESS_KEY, execution.getAccessKey());
+ String currentTimeMillis = execution.getCurrentTimeMillis();
params.put(CommonConstant.CURRENT_TIME_MILLIS, currentTimeMillis);
- params.put(CommonConstant.SIGNATURE, getsSignature(username, currentTimeMillis));
+ params.put(CommonConstant.SIGNATURE, execution.getsSignature(username, currentTimeMillis));
}
return JHApiClient.getUrl(url, params);
}
@@ -131,16 +132,16 @@ public class JHAppApiExecution extends JHApiExecution {
* @return 会话列表
*/
public List getDesktopList(String username) {
- return get(AppPathConstant.APPS_SESSIONS_ALL_PATH, username, new TypeReference>>() {
- });
+ return execution.get(AppPathConstant.APPS_SESSIONS_ALL_PATH, username,
+ new TypeReference>>() {
+ });
}
-
/**
* 使用参数查询会话列表
*
- * - sessionIds 和 sessionName 不能同时为空
- * - 开启密级后，仅能查看比自己密级低以及和自己密级一致的会话
+ * - sessionIds 和 sessionName 不能同时为空
+ * - 开启密级后，仅能查看比自己密级低以及和自己密级一致的会话
*
*
* @param username 用户名
@@ -157,11 +158,10 @@ public class JHAppApiExecution extends JHApiExecution {
params.put("sessionName", sessionName);
}
String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
-
/**
* 根据会话列表查询会话列表
*
@@ -179,7 +179,7 @@ public class JHAppApiExecution extends JHApiExecution {
}
params.put("sessionIds", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, ids));
String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_IDS_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
@@ -201,16 +201,16 @@ public class JHAppApiExecution extends JHApiExecution {
}
params.put("sessionName", sessionName);
String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_NAME_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
/**
* 会话共享
*
- * - 调用该接口需要打开景行会话共享的功能
- * - observers 和 interacts 不能同时为空
- * - 会话共享有密级限制，仅能将会话共享给比会话密级高的用户
+ * - 调用该接口需要打开景行会话共享的功能
+ * - observers 和 interacts 不能同时为空
+ * - 会话共享有密级限制，仅能将会话共享给比会话密级高的用户
*
*
* @param username 用户名
@@ -219,7 +219,8 @@ public class JHAppApiExecution extends JHApiExecution {
* @param interacts 协作者列表 （非必填）
* @param isTransfer 是否传递操作权（不确定，需要咨询产品，非必填）
*/
- public void shareDesktop(String username, String sessionId, List observers, List interacts, String isTransfer) {
+ public void shareDesktop(String username, String sessionId, List observers, List interacts,
+ String isTransfer) {
if (StringUtils.isBlank(sessionId)) {
throw new ArgsException("sessionId为必填字段");
}
@@ -233,16 +234,16 @@ public class JHAppApiExecution extends JHApiExecution {
if (StringUtils.isBlank(isTransfer)) {
params.put("isTransfer", isTransfer);
}
- String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_SHARE_PATH.replace("{sessionId}", sessionId), params);
- post(path, username);
+ String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_SHARE_PATH.replace("{sessionId}", sessionId),
+ params);
+ execution.post(path, username);
}
-
/**
* 取消会话共享
*
- * - 调用该接口需要打开景行会话共享的功能
- * - 开启密级后，仅能操作比自己密级低或者和自己密级一致的会话
+ * - 调用该接口需要打开景行会话共享的功能
+ * - 开启密级后，仅能操作比自己密级低或者和自己密级一致的会话
*
*
* @param username 用户名
@@ -253,14 +254,14 @@ public class JHAppApiExecution extends JHApiExecution {
throw new ArgsException("sessionId为必填字段");
}
String path = AppPathConstant.APPS_SESSIONS_CANCEL_SHARE_PATH.replace("{sessionId}", sessionId);
- put(path, username);
+ execution.put(path, username);
}
/**
* 传递会话操作权
*
- * - 调用该接口需要打开景行会话共享的功能
- * - 开启密级后，仅能操作比自己密级低或者和自己密级一致的会话
+ * - 调用该接口需要打开景行会话共享的功能
+ * - 开启密级后，仅能操作比自己密级低或者和自己密级一致的会话
*
*
* @param username 用户名
@@ -278,10 +279,9 @@ public class JHAppApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("interact", interact);
path = JHApiClient.getUrl(path, params);
- put(path, username);
+ execution.put(path, username);
}
-
/**
* 连接会话
*
@@ -294,8 +294,9 @@ public class JHAppApiExecution extends JHApiExecution {
throw new ArgsException("sessionId为必填字段");
}
String path = AppPathConstant.APPS_SESSIONS_CONNECT_JHAPP_PATH.replace("{sessionId}", sessionId);
- List list = get(path, username, new TypeReference>>() {
- });
+ List list = execution.get(path, username,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(list)) {
throw new ServiceException(path, 500, "获取到的会话信息为空");
}
@@ -305,7 +306,6 @@ public class JHAppApiExecution extends JHApiExecution {
return appStartedInfo;
}
-
/**
* 断开会话连接（作业/应用）
*
@@ -320,10 +320,9 @@ public class JHAppApiExecution extends JHApiExecution {
throw new ArgsException("sessionId为必填字段");
}
String path = AppPathConstant.APPS_SESSIONS_DISCONNECT_PATH.replace("{sessionId}", sessionId);
- put(path, username);
+ execution.put(path, username);
}
-
/**
* 通过应用id批量断开会话（作业/应用）
*
@@ -340,10 +339,9 @@ public class JHAppApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("sessionIds", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, sessionIds));
String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_DISCONNECT_IDS_PATH, params);
- put(path, username);
+ execution.put(path, username);
}
-
/**
* 注销会话
*
@@ -358,10 +356,9 @@ public class JHAppApiExecution extends JHApiExecution {
throw new ArgsException("sessionId为必填字段");
}
String path = AppPathConstant.APPS_SESSIONS_DESTROY_PATH.replace("{sessionId}", sessionId);
- put(path, username);
+ execution.put(path, username);
}
-
/**
* 批量注销会话
*
@@ -375,10 +372,9 @@ public class JHAppApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("sessionIds", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, sessionIds));
String path = JHApiClient.getUrl(AppPathConstant.APPS_SESSIONS_DESTROY_IDS_PATH, params);
- put(path, username);
+ execution.put(path, username);
}
-
/**
* 获取当前用户的应用列表
*
@@ -386,11 +382,11 @@ public class JHAppApiExecution extends JHApiExecution {
* @return 应用列表
*/
public List getAppList(String username) {
- return get(AppPathConstant.APPS_LIST_PATH, username, new TypeReference>>() {
- });
+ return execution.get(AppPathConstant.APPS_LIST_PATH, username,
+ new TypeReference>>() {
+ });
}
-
/**
* 获取应用链接
*
@@ -403,8 +399,9 @@ public class JHAppApiExecution extends JHApiExecution {
throw new ArgsException("appName为必填字段");
}
String path = AppPathConstant.APPS_GET_URL_PATH.replace("{appName}", appName);
- List> apps = get(path, username, new TypeReference>>>() {
- });
+ List> apps = execution.get(path, username,
+ new TypeReference>>>() {
+ });
if (CollectionUtil.isEmpty(apps)) {
throw new ServiceException(path, 500, "应用信息为空！");
}
@@ -435,7 +432,7 @@ public class JHAppApiExecution extends JHApiExecution {
params.put("suffixes", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, suffixes));
}
String path = JHApiClient.getUrl(AppPathConstant.APPS_SUFFIXES_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
@@ -450,7 +447,6 @@ public class JHAppApiExecution extends JHApiExecution {
return getUseLabelList(username, Arrays.asList(labels));
}
-
/**
* 根据用途查询应用
*
@@ -464,7 +460,7 @@ public class JHAppApiExecution extends JHApiExecution {
params.put("use_labels", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, labels));
}
String path = JHApiClient.getUrl(AppPathConstant.APP_USE_LABEL_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
}
diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/data/JHDataApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/data/JHDataApiExecution.java
index 1cd5d3c..efc0ab0 100644
--- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/data/JHDataApiExecution.java
+++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/data/JHDataApiExecution.java
@@ -3,8 +3,9 @@ package com.jhinno.sdk.openapi.api.data;
import com.fasterxml.jackson.core.type.TypeReference;
import com.jhinno.sdk.openapi.ArgsException;
import com.jhinno.sdk.openapi.CommonConstant;
+import com.jhinno.sdk.openapi.JHApiExecution;
import com.jhinno.sdk.openapi.ServiceException;
-import com.jhinno.sdk.openapi.api.JHApiExecution;
+import com.jhinno.sdk.openapi.api.JHRequestExecution;
import com.jhinno.sdk.openapi.api.ResponseResult;
import com.jhinno.sdk.openapi.client.JHApiClient;
import com.jhinno.sdk.openapi.utils.CollectionUtil;
@@ -23,15 +24,12 @@ import java.util.Map;
* @date 2024/2/4 17:09
*/
@NoArgsConstructor
-public class JHDataApiExecution extends JHApiExecution {
+public class JHDataApiExecution implements JHApiExecution {
- /**
- * 获取一个执行器的实例
- *
- * @param jhApiClient 请求的客户端
- */
- public JHDataApiExecution(JHApiClient jhApiClient) {
- super(jhApiClient);
+ private JHRequestExecution execution;
+
+ public void init(JHRequestExecution execution) {
+ this.execution = execution;
}
/**
@@ -41,11 +39,11 @@ public class JHDataApiExecution extends JHApiExecution {
* @return 用户数据目录列表
*/
public List getSpoolersData(String username) {
- return get(DataPathConstant.DATA_SPOOLERS_PATH, username, new TypeReference>>() {
- });
+ return execution.get(DataPathConstant.DATA_SPOOLERS_PATH, username,
+ new TypeReference>>() {
+ });
}
-
/**
* 根据作业id查作业数据目录信息
*
@@ -58,8 +56,9 @@ public class JHDataApiExecution extends JHApiExecution {
throw new ArgsException("jobId不能为空！");
}
String path = DataPathConstant.DATA_SPOOLER_JOB_ID_PATH.replace("{jobId}", jobId);
- List list = get(path, username, new TypeReference>>() {
- });
+ List list = execution.get(path, username,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(list)) {
throw new ServiceException(path, 500, "作业数据目录信息为空！");
}
@@ -80,7 +79,7 @@ public class JHDataApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("jobIds", String.join(CommonConstant.NORMAL_CHARACTER_COMMA, jobIds));
String path = JHApiClient.getUrl(DataPathConstant.DATA_SPOOLERS_LIST_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
@@ -98,15 +97,15 @@ public class JHDataApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("name", dataName);
String path = JHApiClient.getUrl(DataPathConstant.DATA_SPOOLERS_NAME_PATH, params);
- List list = get(path, username, new TypeReference>>() {
- });
+ List list = execution.get(path, username,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(list)) {
throw new ServiceException(path, 500, "作业数据目录信息为空！");
}
return list.get(0);
}
-
/**
* 立即删除作业数据目录
*
@@ -118,11 +117,10 @@ public class JHDataApiExecution extends JHApiExecution {
throw new ArgsException("jobId不能为空！");
}
String path = DataPathConstant.DATA_SPOOLERS_DELETE_ID_PATH.replace("{id}", jobId);
- get(path, username, new TypeReference>() {
+ execution.get(path, username, new TypeReference>() {
});
}
-
/**
* 设置用户数据目录的过期时间，也给以通过设置过期时间来删除用户数据区
*
@@ -141,7 +139,7 @@ public class JHDataApiExecution extends JHApiExecution {
params.put("id", jobId);
params.put("expiration_time", expirationTime);
String path = JHApiClient.getUrl(DataPathConstant.DATA_SPOOLERS_PURGE_PATH, params);
- get(path, username, new TypeReference>() {
+ execution.get(path, username, new TypeReference>() {
});
}
diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/file/JHFileApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/file/JHFileApiExecution.java
index 8b4c206..4869304 100644
--- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/file/JHFileApiExecution.java
+++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/file/JHFileApiExecution.java
@@ -3,8 +3,9 @@ package com.jhinno.sdk.openapi.api.file;
import com.fasterxml.jackson.core.type.TypeReference;
import com.jhinno.sdk.openapi.ArgsException;
import com.jhinno.sdk.openapi.CommonConstant;
+import com.jhinno.sdk.openapi.JHApiExecution;
import com.jhinno.sdk.openapi.ServiceException;
-import com.jhinno.sdk.openapi.api.JHApiExecution;
+import com.jhinno.sdk.openapi.api.JHRequestExecution;
import com.jhinno.sdk.openapi.api.ResponseResult;
import com.jhinno.sdk.openapi.client.JHApiClient;
import com.jhinno.sdk.openapi.utils.CollectionUtil;
@@ -26,13 +27,14 @@ import java.util.Map;
* @date 2024/2/4 18:58
*/
@NoArgsConstructor
-public class JHFileApiExecution extends JHApiExecution {
+public class JHFileApiExecution implements JHApiExecution {
- public JHFileApiExecution(JHApiClient jhApiClient) {
- super(jhApiClient);
+ private JHRequestExecution execution;
+
+ public void init(JHRequestExecution execution) {
+ this.execution = execution;
}
-
/**
* 重命名文件
*
@@ -50,10 +52,9 @@ public class JHFileApiExecution extends JHApiExecution {
Map body = new HashMap<>(2);
body.put("oldFileName", sourceFileNamePath);
body.put("newFileName", targetFileName);
- put(FilePathConstant.FILE_RENAME_PATH, username, body);
+ execution.put(FilePathConstant.FILE_RENAME_PATH, username, body);
}
-
/**
* 删除文件
*
@@ -67,10 +68,9 @@ public class JHFileApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("fileName", sourceFilePath);
String path = JHApiClient.getUrl(FilePathConstant.FILE_DELETE_PATH, params);
- delete(path, username);
+ execution.delete(path, username);
}
-
/**
* 拷贝文件到目标文件夹
*
@@ -88,10 +88,9 @@ public class JHFileApiExecution extends JHApiExecution {
Map body = new HashMap<>(2);
body.put("sourceFileName", sourceFilePath);
body.put("targetDirectory", targetDirectoryPath);
- put(FilePathConstant.FILE_COPY_PATH, username, body);
+ execution.put(FilePathConstant.FILE_COPY_PATH, username, body);
}
-
/**
* 获取文件列表
*
@@ -106,11 +105,10 @@ public class JHFileApiExecution extends JHApiExecution {
Map params = new HashMap<>(1);
params.put("dir", dirPath);
String path = JHApiClient.getUrl(FilePathConstant.FILE_LIST_PATH, params);
- return get(path, username, new TypeReference>>() {
+ return execution.get(path, username, new TypeReference>>() {
});
}
-
/**
* 创建文件夹
*
@@ -128,15 +126,15 @@ public class JHFileApiExecution extends JHApiExecution {
if (isForce != null) {
body.put("isForce", isForce.toString());
}
- Map result = post(FilePathConstant.FILE_MKDIR_PATH, username, body, new TypeReference>>() {
- });
+ Map result = execution.post(FilePathConstant.FILE_MKDIR_PATH, username, body,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(result)) {
return null;
}
return result.get("dirPath");
}
-
/**
* 新建文件夹，默认不强制新建
*
@@ -148,7 +146,6 @@ public class JHFileApiExecution extends JHApiExecution {
return mkdir(username, dirPath, null);
}
-
/**
* 创建文件
*
@@ -162,8 +159,9 @@ public class JHFileApiExecution extends JHApiExecution {
}
Map body = new HashMap<>(1);
body.put("filePath", filePath);
- Map result = post(FilePathConstant.FILE_MKFILE_PATH, username, body, new TypeReference>>() {
- });
+ Map result = execution.post(FilePathConstant.FILE_MKFILE_PATH, username, body,
+ new TypeReference>>() {
+ });
if (CollectionUtil.isEmpty(result)) {
return null;
}
@@ -195,26 +193,25 @@ public class JHFileApiExecution extends JHApiExecution {
body.put("isCover", isCover);
}
body.put("uploadPath", uploadPath);
-
- ResponseResult