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 9171ec7..f7cb63c 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 @@ -445,4 +445,201 @@ public class JHAppApiExecution extends JHApiExecutionAbstract { return execution.get(path, username, new TypeReference>>() { }); } + + /** + * 启动一个会话 + * + * @param appId 应用ID + * @return JHClient协议链接 + */ + public AppStartedInfo desktopStart(String appId) { + return desktopStart(appId, new AppStartRequest()); + } + + /** + * 启动一个会话 + * + * @param appId 应用ID + * @param appStartRequest 启动参数 + * @return JHClient协议链接 + */ + public AppStartedInfo desktopStart(String appId, AppStartRequest appStartRequest) { + return desktopStart(null, appId, appStartRequest); + } + + /** + * 获取Web会话URL + * + * @param sessionId 会话ID + * @return Web会话URL + */ + public String getWebSessionUrl(String sessionId) { + return getWebSessionUrl(null, sessionId); + } + + /** + * 查询当前用户的会话列表 + * + * @return 会话列表 + */ + public List getDesktopList() { + return getDesktopList(null); + } + + /** + * 使用参数查询会话列表 + * + * @param sessionIds 会话ID列表（非必填） + * @param sessionName 会话名称（非必填） + * @return 会话列表 + */ + public List getDesktopsByParams(List sessionIds, String sessionName) { + return getDesktopsByParams(null, sessionIds, sessionName); + } + + /** + * 根据会话ID列表查询会话列表 + * + * @param ids 会话ID列表 + * @return 会话列表 + */ + public List getDesktopsById(List ids) { + return getDesktopsById(null, ids); + } + + /** + * 根据会话名称查询会话 + * + * @param sessionName 会话名称 + * @return 会话列表 + */ + public List getDesktopsByName(String sessionName) { + return getDesktopsByName(null, sessionName); + } + + /** + * 会话共享 + * + * @param sessionId 会话ID（必填） + * @param observers 观察者列表（非必填） + * @param interacts 协作者列表（非必填） + * @param isTransfer 是否传递操作权（非必填） + */ + public void shareDesktop(String sessionId, List observers, List interacts, String isTransfer) { + shareDesktop(null, sessionId, observers, interacts, isTransfer); + } + + /** + * 取消会话共享 + * + * @param sessionId 会话ID + */ + public void cancelShare(String sessionId) { + cancelShare(null, sessionId); + } + + /** + * 传递会话操作权 + * + * @param sessionId 会话ID（必填） + * @param interact 操作权（必填） + */ + public void transferOperatorRight(String sessionId, String interact) { + transferOperatorRight(null, sessionId, interact); + } + + /** + * 连接会话 + * + * @param sessionId 会话ID + * @return JHClient协议链接信息 + */ + public AppStartedInfo connectJhapp(String sessionId) { + return connectJhapp(null, sessionId); + } + + /** + * 断开会话连接 + * + * @param sessionId 会话ID + */ + public void disconnectSessionInfo(String sessionId) { + disconnectSessionInfo(null, sessionId); + } + + /** + * 通过应用ID批量断开会话 + * + * @param sessionIds 会话ID列表 + */ + public void disconnectSessionByIds(List sessionIds) { + disconnectSessionByIds(null, sessionIds); + } + + /** + * 注销会话 + * + * @param sessionId 会话ID + */ + public void destroySession(String sessionId) { + destroySession(null, sessionId); + } + + /** + * 批量注销会话 + * + * @param sessionIds 会话ID列表 + */ + public void destroySessionByIds(List sessionIds) { + destroySessionByIds(null, sessionIds); + } + + /** + * 获取当前用户的应用列表 + * + * @return 应用列表 + */ + public List getAppList() { + return getAppList(null); + } + + /** + * 根据文件后缀查询应用 + * + * @param suffixes 文件后缀列表 + * @return 应用列表 + */ + public List getAppInfoSuffixList(String... suffixes) { + return getAppInfoSuffixList(null, suffixes); + } + + /** + * 根据文件后缀查询应用 + * + * @param suffixes 文件后缀列表 + * @return 应用列表 + */ + public List getAppInfoSuffixList(List suffixes) { + return getAppInfoSuffixList(null, suffixes); + } + + /** + * 根据用途查询应用 + * + * @param labels 用途列表 + * @return 应用列表 + */ + public List getUseLabelList(String... labels) { + return getUseLabelList(null, labels); + } + + /** + * 根据用途查询应用 + * + * @param labels 用途列表 + * @return 应用列表 + */ + public List getUseLabelList(List labels) { + return getUseLabelList(null, labels); + } } 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 2457812..4975864 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 @@ -133,4 +133,63 @@ public class JHDataApiExecution extends JHApiExecutionAbstract { }); } + + /** + * 根据用户scope查询数据目录列表 + * + * @return 用户数据目录列表 + */ + public List getSpoolersData() { + return getSpoolersData(null); + } + + /** + * 根据作业id查作业数据目录信息 + * + * @param jobId 作业id + * @return 作业目录信息 + */ + public SpoolerDataInfo getSpoolersDataById(String jobId) { + return getSpoolersDataById(null, jobId); + } + + /** + * 根据作业id集合查询数据目录列表 + * + * @param jobIds 作业id列表 + * @return 用户数据目录列表 + */ + public List getSpoolersDataByIds(List jobIds) { + return getSpoolersDataByIds(null, jobIds); + } + + /** + * 根据数据目录名称查询数据目录列表 + * + * @param dataName 数据目录名称 + * @return 作业目录信息 + */ + public SpoolerDataInfo getSpoolersByName(String dataName) { + return getSpoolersByName(null, dataName); + } + + /** + * 立即删除作业数据目录 + * + * @param jobId 作业id + */ + public void deleteSpoolerData(String jobId) { + deleteSpoolerData(null, jobId); + } + + /** + * 设置用户数据目录的过期时间，也给以通过设置过期时间来删除用户数据区 + * + * @param jobId 作业id + * @param expirationTime 过期时间 + */ + public void purgeSpooler(String jobId, Date expirationTime) { + purgeSpooler(null, jobId, expirationTime); + } + } 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 3036b12..7b88a6e 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 @@ -46,6 +46,16 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { execution.put(FilePathConstant.FILE_RENAME_PATH, username, body); } + /** + * 重命名文件 + * + * @param sourceFileNamePath 源文件路径 + * @param targetFileName 目标文件路径 + */ + public void renameFile(String sourceFileNamePath, String targetFileName) { + renameFile(null, sourceFileNamePath, targetFileName); + } + /** * 删除文件 * @@ -62,6 +72,15 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { execution.delete(path, username); } + /** + * 删除文件 + * + * @param sourceFilePath 源文件路径 + */ + public void deleteFile(String sourceFilePath) { + deleteFile(null, sourceFilePath); + } + /** * 拷贝文件到目标文件夹 * @@ -82,6 +101,16 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { execution.put(FilePathConstant.FILE_COPY_PATH, username, body); } + /** + * 拷贝文件到目标文件夹 + * + * @param sourceFilePath 源文件路径 + * @param targetDirectoryPath 目标文件路径 + */ + public void copyFile(String sourceFilePath, String targetDirectoryPath) { + copyFile(null, sourceFilePath, targetDirectoryPath); + } + /** * 获取文件列表 * @@ -100,6 +129,16 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { }); } + /** + * 获取文件列表 + * + * @param dirPath 文件路径 + * @return 文件列表 + */ + public List getFileList(String dirPath) { + return getFileList(null, dirPath); + } + /** * 创建文件夹 * @@ -137,6 +176,27 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { return mkdir(username, dirPath, null); } + /** + * 创建文件夹 + * + * @param dirPath 文件夹路径 + * @param isForce 是否强制创建（非必传，默认：false） + * @return 新建后的文件路径 + */ + public String mkdir(String dirPath, Boolean isForce) { + return mkdir(null, dirPath, isForce); + } + + /** + * 新建文件夹，默认不强制新建 + * + * @param dirPath 文件路径 + * @return 新建后的文件路径 + */ + public String mkdir(String dirPath) { + return mkdir(dirPath, true); + } + /** * 创建文件 * @@ -159,6 +219,16 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { return result.get("dirPath"); } + /** + * 创建文件 + * + * @param filePath 文件路径 + * @return 新的文件路径 + */ + public String mkFile(String filePath) { + return mkFile(null, filePath); + } + /** * 上传文件 *

@@ -243,8 +313,7 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { * @param uploadPath 上传路径，服务器路径 * @param isCover 是否覆盖（非必填，默认：false） */ - public void uploadFile(String username, String path, String fileName, String uploadPath, Boolean isCover) - throws FileNotFoundException { + public void uploadFile(String username, String path, String fileName, String uploadPath, Boolean isCover) throws FileNotFoundException { if (StringUtils.isBlank(path)) { throw new ArgsException("path是必填参数"); } @@ -269,32 +338,6 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { uploadFile(username, path, fileName, uploadPath, null); } - /** - * 上传一个本地的路径 - * - * @param username 用户名 - * @param path 本地文件路径 - * @param uploadPath 上传路径，服务器路径 - * @param isCover 是否覆盖（非必填，默认：false） - */ - public void uploadFile(String username, String path, String uploadPath, Boolean isCover) - throws FileNotFoundException { - File file = new File(path); - uploadFile(username, path, file.getName(), uploadPath, isCover); - } - - /** - * 上传一个本地的路径（不覆盖源文件） - * - * @param username 用户名 - * @param path 本地文件路径 - * @param uploadPath 上传路径，服务器路径 - */ - public void uploadFile(String username, String path, String uploadPath) throws FileNotFoundException { - File file = new File(path); - uploadFile(username, path, file.getName(), uploadPath, null); - } - /** * 获取文件下载地址 * @@ -382,17 +425,6 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { execution.post(path, username); } - /** - * 文件压缩 - * - * @param username 用户名 - * @param sourceDirName 源文件目录(多个文件适用英文逗号隔开) - * @param targetFilePath 目标文件路径 - */ - public void compress(String username, String sourceDirName, String targetFilePath) { - compress(username, sourceDirName, targetFilePath, null); - } - /** * 解压文件 * @@ -491,4 +523,236 @@ public class JHFileApiExecution extends JHApiExecutionAbstract { body.put("path", path); execution.post(FilePathConstant.FILE_CONF_PATH, username, body); } + + + /** + * 上传文件 + *

+ * 如果isCover为空或者为false，源文件目录下存在相同文件则会报错 + *

+ * + * @param is 文件流 + * @param fileName 文件名称 + * @param uploadPath 上传路径 + * @param isCover 是否覆盖（非必填，默认：false） + * @param fileConf 密级（只有开启了密级才需要此参数，可以是密级的中文名，也可以是密级的中文名、英文名、或者密级的key） + */ + public void uploadFile(InputStream is, String fileName, String uploadPath, Boolean isCover, String fileConf) { + uploadFile(null, is, fileName, uploadPath, isCover, fileConf); + } + + /** + * 上传文件 + *

+ * 如果isCover为空或者为false，源文件目录下存在相同文件则会报错 + *

+ * + * @param is 文件流 + * @param fileName 文件名称 + * @param uploadPath 上传路径 + * @param isCover 是否覆盖（非必填，默认：false） + */ + public void uploadFile(InputStream is, String fileName, String uploadPath, Boolean isCover) { + uploadFile(is, fileName, uploadPath, isCover, null); + } + + /** + * 上传文件（不覆盖源文件） + *

+ * 源文件目录下存在相同文件则会报错 + *

+ * + * @param is 文件流 + * @param fileName 文件名 + * @param uploadPath 上传路径 + */ + public void uploadFile(InputStream is, String fileName, String uploadPath) { + uploadFile(is, fileName, uploadPath, false); + } + + /** + * 上传一个本地的路径 + * + * @param path 本地文件路径 + * @param fileName 文件名 + * @param uploadPath 上传路径，服务器路径 + * @param isCover 是否覆盖（非必填，默认：false） + */ + public void uploadFile(String path, String fileName, String uploadPath, Boolean isCover) throws FileNotFoundException { + if (StringUtils.isBlank(path)) { + throw new ArgsException("path是必填参数"); + } + File file = new File(path); + FileInputStream fileInputStream = new FileInputStream(file); + if (StringUtils.isBlank(fileName)) { + fileName = file.getName(); + } + uploadFile(fileInputStream, fileName, uploadPath, isCover); + } + + /** + * 上传一个本地的路径（不覆盖源文件） + *

+ * 源文件目录下存在相同文件则会报错 + *

+ * + * @param path 本地文件路径 + * @param fileName 文件名 + * @param uploadPath 上传路径，服务器路径 + */ + public void uploadFile(String path, String fileName, String uploadPath) throws FileNotFoundException { + uploadFile(path, fileName, uploadPath, false); + } + + /** + * 上传一个本地的路径 + * + * @param path 本地文件路径 + * @param uploadPath 上传路径，服务器路径 + * @param isCover 是否覆盖（非必填，默认：false） + */ + public void uploadFile(String path, String uploadPath, Boolean isCover) throws FileNotFoundException { + File file = new File(path); + uploadFile(null, path, file.getName(), uploadPath, isCover); + } + + /** + * 上传一个本地的路径（不覆盖源文件） + * + * @param path 本地文件路径 + * @param uploadPath 上传路径，服务器路径 + */ + public void uploadFile(String path, String uploadPath) throws FileNotFoundException { + uploadFile(path, null, uploadPath); + } + + /** + * 获取文件下载地址 + * + * @param filePath 文件路径 + * @return 文件地址信息 + */ + public String getFileDownloadUrl(String filePath) { + return getFileDownloadUrl(filePath, false); + } + + /** + * 获取文件下载地址 + * + * @param filePath 文件路径 + * @param forceDownload 是否强制下载，打开密级之后未标密的文件无法下载，可以通过设置当前参数为true来强制下载，默认：false + * @return 文件地址信息 + */ + public String getFileDownloadUrl(String filePath, Boolean forceDownload) { + return getFileDownloadUrl(null, filePath, forceDownload); + } + + /** + * 获取文件输入流 + * + * @param filePath 文件路径 + * @return 文件流 + * @throws IOException + */ + public InputStream getFileInputStream(String filePath) throws IOException { + return getFileInputStream(filePath, false); + } + + /** + * 获取文件输入流 + * + * @param filePath 文件路径 + * @param forceDownload 是否强制下载，打开密级之后未标密的文件无法下载，可以通过设置当前参数为true来强制下载，默认：false + * @return 文件流 + * @throws IOException + */ + public InputStream getFileInputStream(String filePath, Boolean forceDownload) throws IOException { + return getFileInputStream(null, filePath, forceDownload); + } + + /** + * 文件压缩 + * + * @param sourceDirName 源文件目录 + * @param targetFilePath 目标文件路径 + * @param compressType 压缩类型 （未使用以后扩展） + */ + public void compress(String sourceDirName, String targetFilePath, String compressType) { + compress(null, sourceDirName, targetFilePath, compressType); + } + + /** + * 文件压缩 + * + * @param sourceDirName 源文件目录(多个文件适用英文逗号隔开) + * @param targetFilePath 目标文件路径 + */ + public void compress(String sourceDirName, String targetFilePath) { + compress(sourceDirName, targetFilePath, null); + } + + /** + * 解压文件 + * + * @param sourceFilePath 源文件路径 + * @param targetDirPath 目标文件路径 + * @param isCover 是否覆盖 + * @param password 密码 + * @param compressType 压缩类型 （未使用以后扩展） + */ + public void uncompress(String sourceFilePath, String targetDirPath, Boolean isCover, String password, String compressType) { + uncompress(null, sourceFilePath, targetDirPath, isCover, password, compressType); + } + + /** + * 解压文件 + * + * @param sourceFilePath 源文件路径 + * @param targetDirPath 目标文件路径 + * @param isCover 是否覆盖 + * @param password 密码 + */ + public void uncompress(String sourceFilePath, String targetDirPath, Boolean isCover, String password) { + uncompress(sourceFilePath, targetDirPath, isCover, password, null); + } + + /** + * 解压文件 + * + * @param sourceFilePath 源文件路径 + * @param targetDirPath 目标文件路径 + * @param isCover 是否覆盖 + */ + public void uncompress(String sourceFilePath, String targetDirPath, Boolean isCover) { + uncompress(sourceFilePath, targetDirPath, isCover, null); + } + + /** + * 解压文件 + * + * @param sourceFilePath 源文件路径 + * @param targetDirPath 目标文件路径 + */ + public void uncompress(String sourceFilePath, String targetDirPath) { + uncompress(sourceFilePath, targetDirPath, false); + } + + /** + * 获取可用的文件密级列表 + * + * @return 密级列表 + */ + public List getConfList() { + return getConfList(null); + } + + /** + * 文件标密 + * + * @param conf 密级使用{@link JHFileApiExecution#getConfList(String)}返回的{@link Confidential#conf} + * @param path 文件路径 + */ + public void markConf(String conf, String path) { + markConf(null, conf, path); + } } diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHDepartmentApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHDepartmentApiExecution.java index 51eace6..3a4c24a 100644 --- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHDepartmentApiExecution.java +++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHDepartmentApiExecution.java @@ -33,6 +33,15 @@ public class JHDepartmentApiExecution extends JHApiExecutionAbstract { }); } + /** + * 查询用户列表 + * + * @return 用户列表 + */ + public List> getDepartmentList() { + return getDepartmentList(null); + } + /** * 添加部门 * @@ -43,6 +52,15 @@ public class JHDepartmentApiExecution extends JHApiExecutionAbstract { execution.post(DepartmentPathConstant.DEPARTMENT_PATH, username, departmentInfo); } + /** + * 添加部门 + * + * @param departmentInfo 部门信息 + */ + public void addDepartment(AddUpdateDepartment departmentInfo) { + addDepartment(null, departmentInfo); + } + /** * 修改部门信息 * @@ -57,6 +75,15 @@ public class JHDepartmentApiExecution extends JHApiExecutionAbstract { execution.put(path, username, departmentInfo); } + /** + * 修改部门信息 + * + * @param departmentInfo 部门信息 + */ + public void updateDepartment(AddUpdateDepartment departmentInfo) { + updateDepartment(null, departmentInfo); + } + /** * 删除部门信息 * @@ -70,4 +97,13 @@ public class JHDepartmentApiExecution extends JHApiExecutionAbstract { String path = DepartmentPathConstant.DEPARTMENT_NAME_PATH.replace("{depName}", departmentName); execution.delete(path, username); } + + /** + * 删除部门信息 + * + * @param departmentName 部门名称 + */ + public void deleteDepartment(String departmentName) { + deleteDepartment(null, departmentName); + } } diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHUserApiExecution.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHUserApiExecution.java index dc0dc6e..fe2a8fa 100644 --- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHUserApiExecution.java +++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHUserApiExecution.java @@ -48,6 +48,18 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { }); } + /** + * 分页查询用户列表 + * + * @param keyword 检索关键字 + * @param depName 部门名称 + * @param userConf 密级 + * @return 分页的用户列表 + */ + public PageResult getUserList(String keyword, String depName, String userConf) { + return getUserList(null, keyword, depName, userConf); + } + /** * 添加用户 * @@ -58,6 +70,15 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { execution.post(UserPathConstant.USERS_PATH, username, userInfo); } + /** + * 添加用户 + * + * @param userInfo 用户信息 + */ + public void addUser(AddUpdateUserInfo userInfo) { + addUser(null, userInfo); + } + /** * 修改用户信息 * @@ -72,6 +93,15 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { execution.put(path, username, userInfo); } + /** + * 修改用户信息 + * + * @param userInfo 用户信息 + */ + public void updateUser(AddUpdateUserInfo userInfo) { + updateUser(null, userInfo); + } + /** * 修改或重置用户密码 * @@ -88,8 +118,7 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { * @param password 新密码 * @param type 类型，（非必填，取值见{@link UpdateUserPasswordType}） */ - public void updateUserPassword(String username, String updatePasswordUsername, String oldPassword, String password, - String type) { + public void updateUserPassword(String username, String updatePasswordUsername, String oldPassword, String password, UpdateUserPasswordType type) { if (StringUtils.isBlank(updatePasswordUsername)) { throw new ArgsException("updatePasswordUsername不能为空"); } @@ -99,12 +128,30 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { params.put("oldPassword", oldPassword); } if (StringUtils.isNotBlank("type")) { - params.put("type", type); + params.put("type", type.getValue()); } params.put("password", password); execution.put(path, username, params); } + /** + * 修改或重置用户密码 + * + *
    + *
  • 当type值为{@link UpdateUserPasswordType#FORCE_UPDATE_PASSWORD_TYPE}重置密码后用户再次登录需要修改密码
    • + *
  • 当type值为{@link UpdateUserPasswordType#RESET_UPDATE_PASSWORD_TYPE}重置用户的密码
    • + *
  • 当type值为空时修改用户密码
    • + *
+ * + * @param updatePasswordUsername 被修改的用户名 + * @param oldPassword 旧密码 + * @param password 新密码 + * @param type 类型，（非必填，取值见{@link UpdateUserPasswordType}） + */ + public void updateUserPassword(String updatePasswordUsername, String oldPassword, String password, UpdateUserPasswordType type) { + updateUserPassword(null, updatePasswordUsername, oldPassword, password, type); + } + /** * 修改用户的密码 * @@ -113,33 +160,19 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { * @param oldPassword 旧密码 * @param password 新密码 */ - public void updateUserPassword(String username, String updatePasswordUsername, String oldPassword, - String password) { + public void updateUserPassword(String username, String updatePasswordUsername, String oldPassword, String password) { updateUserPassword(username, updatePasswordUsername, oldPassword, password, null); } /** - * 重置用户密码后强制用户修改密码 + * 修改用户的密码 * - * @param username 用户名 * @param updatePasswordUsername 被修改的用户名 - * @param password 新的用户密码 + * @param oldPassword 旧密码 + * @param password 新密码 */ - public void resetForceUpdatePassword(String username, String updatePasswordUsername, String password) { - updateUserPassword(username, updatePasswordUsername, null, password, - UpdateUserPasswordType.FORCE_UPDATE_PASSWORD_TYPE); - } - - /** - * 重置用户名 - * - * @param username 用户名 - * @param updatePasswordUsername 被修改的用户密码 - * @param password 新的用户密码 - */ - public void resetPassword(String username, String updatePasswordUsername, String password) { - updateUserPassword(username, updatePasswordUsername, null, password, - UpdateUserPasswordType.RESET_UPDATE_PASSWORD_TYPE); + public void updateUserPassword(String updatePasswordUsername, String oldPassword, String password) { + updateUserPassword(updatePasswordUsername, oldPassword, password, UpdateUserPasswordType.RESET_UPDATE_PASSWORD_TYPE); } /** @@ -155,4 +188,13 @@ public class JHUserApiExecution extends JHApiExecutionAbstract { execution.delete(UserPathConstant.USERS_USERNAME_PATH.replace("{username}", deleteUsername), username); } + /** + * 删除用户 + * + * @param deleteUsername 被删除的用户名 + */ + public void deleteUser(String deleteUsername) { + deleteUser(null, deleteUsername); + } + } diff --git a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/UpdateUserPasswordType.java b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/UpdateUserPasswordType.java index 4457cca..eb06eac 100644 --- a/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/UpdateUserPasswordType.java +++ b/jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/UpdateUserPasswordType.java @@ -1,20 +1,27 @@ package com.jhinno.sdk.openapi.api.organization; +import lombok.AllArgsConstructor; +import lombok.Getter; + /** * 密码操作的类型 * * @author yanlongqi * @date 2024/2/19 10:54 */ -public class UpdateUserPasswordType { - +@Getter +@AllArgsConstructor +public enum UpdateUserPasswordType { /** * 重置密码 */ - protected static final String RESET_UPDATE_PASSWORD_TYPE = "reset"; + RESET_UPDATE_PASSWORD_TYPE("reset"), + /** * 首次登录强制修改密码 */ - protected static final String FORCE_UPDATE_PASSWORD_TYPE = "force"; + FORCE_UPDATE_PASSWORD_TYPE("force"); + + private final String value; } 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 6c34896..1da8cc9 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 @@ -6,6 +6,7 @@ import com.jhinno.sdk.openapi.utils.JsonUtil; import org.junit.Test; import java.util.Arrays; +import java.util.Collections; import java.util.List; /** @@ -29,7 +30,7 @@ public class AppApiTest { public void testStartApp() { AppStartRequest appStartRequest = new AppStartRequest(); appStartRequest.setStartNew(true); - AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart(null, "linux_desktop", appStartRequest); + AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("linux_desktop", appStartRequest); System.out.println("会话ID：" + appStartedInfo.getDesktopId()); System.out.println("JhAppURL：" + appStartedInfo.getJhappUrl()); System.out.println("WebURL:" + appStartedInfo.getWebSessionUrl()); @@ -40,7 +41,7 @@ public class AppApiTest { */ @Test public void testDefaultParamsStartApp() { - AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("jhadmin", "linux_desktop"); + AppStartedInfo appStartedInfo = jhAppApiExecution.desktopStart("linux_desktop"); System.out.println(appStartedInfo); } @@ -49,7 +50,7 @@ public class AppApiTest { */ @Test public void testGetSessionsList() { - List desktopList = jhAppApiExecution.getDesktopList("jhadmin"); + List desktopList = jhAppApiExecution.getDesktopList(); System.out.println(desktopList); } @@ -58,7 +59,7 @@ public class AppApiTest { */ @Test public void testGetDesktopsByParams() { - List desktopList = jhAppApiExecution.getDesktopsByParams("jhadmin", null, "Windows桌面"); + List desktopList = jhAppApiExecution.getDesktopsByParams(null, "Windows桌面"); System.out.println(desktopList); } @@ -67,8 +68,7 @@ public class AppApiTest { */ @Test public void testGetDesktopsById() { - List desktopList = jhAppApiExecution.getDesktopsById("jhadmin", - Arrays.asList("7649", "7637", "123")); + List desktopList = jhAppApiExecution.getDesktopsById(Arrays.asList("151", "7637", "123")); System.out.println(desktopList); } @@ -77,7 +77,7 @@ public class AppApiTest { */ @Test public void testGetDesktopsByName() { - List desktopList = jhAppApiExecution.getDesktopsByName("jhadmin", "Windows桌面"); + List desktopList = jhAppApiExecution.getDesktopsByName("Linux桌面"); System.out.println(desktopList); } @@ -86,7 +86,7 @@ public class AppApiTest { */ @Test public void testShareDesktop() { - jhAppApiExecution.shareDesktop("jhadmin", "7649", null, null, null); + jhAppApiExecution.shareDesktop("7649", null, null, null); } /** @@ -94,7 +94,7 @@ public class AppApiTest { */ @Test public void testCancelShare() { - jhAppApiExecution.cancelShare("jhadmin", "7649"); + jhAppApiExecution.cancelShare("7649"); } /** @@ -102,7 +102,7 @@ public class AppApiTest { */ @Test public void testTransferOperatorRight() { - jhAppApiExecution.transferOperatorRight("jhadmin", "7649", "123"); + jhAppApiExecution.transferOperatorRight("7649", "123"); } /** @@ -110,7 +110,7 @@ public class AppApiTest { */ @Test public void testConnectJhapp() { - AppStartedInfo appStartedInfo = jhAppApiExecution.connectJhapp("lqyan", "7666"); + AppStartedInfo appStartedInfo = jhAppApiExecution.connectJhapp("151"); System.out.println(appStartedInfo); } @@ -119,7 +119,7 @@ public class AppApiTest { */ @Test public void testDisconnectSessionInfo() { - jhAppApiExecution.disconnectSessionInfo("jhadmin", "7666"); + jhAppApiExecution.disconnectSessionInfo("151"); } /** @@ -127,7 +127,7 @@ public class AppApiTest { */ @Test public void testDisconnectSessionByIds() { - jhAppApiExecution.disconnectSessionByIds("jhadmin", Arrays.asList("123", "456")); + jhAppApiExecution.disconnectSessionByIds(Arrays.asList("151", "456")); } /** @@ -135,7 +135,7 @@ public class AppApiTest { */ @Test public void testDestroySession() { - jhAppApiExecution.destroySession("jhadmin", "63"); + jhAppApiExecution.destroySession("156"); } /** @@ -143,7 +143,7 @@ public class AppApiTest { */ @Test public void testDestroySessionByIds() { - jhAppApiExecution.destroySessionByIds("jhadmin", Arrays.asList("123", "456")); + jhAppApiExecution.destroySessionByIds(Arrays.asList("123", "456")); } /** @@ -151,7 +151,7 @@ public class AppApiTest { */ @Test public void testGetAppList() { - List appList = jhAppApiExecution.getAppList("yanlongqi"); + List appList = jhAppApiExecution.getAppList(); System.out.println("全部列表" + JsonUtil.objectToString(appList)); // 类型获取 @@ -182,7 +182,7 @@ public class AppApiTest { */ @Test public void testGetAppInfoSuffixList() { - System.out.println(jhAppApiExecution.getAppInfoSuffixList("test", ".sh")); + System.out.println(jhAppApiExecution.getAppInfoSuffixList(Collections.singletonList(".cas"))); } /** @@ -190,6 +190,6 @@ public class AppApiTest { */ @Test public void testGetUseLabelList() { - System.out.println(jhAppApiExecution.getUseLabelList("jhadmin")); + System.out.println(jhAppApiExecution.getUseLabelList()); } } diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/data/DataApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/data/DataApiTest.java index aa34824..d71c10f 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/data/DataApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/data/DataApiTest.java @@ -14,15 +14,15 @@ import java.util.Arrays; */ public class DataApiTest { - public static final JHDataApiExecution execution =JHClientConfig.API_EXECUTION_MANAGE - .getApiExecution(JHDataApiExecution.class); + public static final JHDataApiExecution execution = JHClientConfig.API_EXECUTION_MANAGE + .getApiExecution(JHDataApiExecution.class); /** * 测试获取作业数据区目录列表 */ @Test public void testGetSpoolers() { - System.out.println(execution.getSpoolersData("jhadmin")); + System.out.println(execution.getSpoolersData()); } @@ -31,7 +31,7 @@ public class DataApiTest { */ @Test public void testGetSpoolersDataById() { - System.out.println(execution.getSpoolersDataById("jhadmin", "5909")); + System.out.println(execution.getSpoolersDataById("157")); } @@ -40,7 +40,7 @@ public class DataApiTest { */ @Test public void testGetSpoolersDataByIds() { - System.out.println(execution.getSpoolersDataByIds("jhadmin", Arrays.asList("6799", "6686"))); + System.out.println(execution.getSpoolersDataByIds(Arrays.asList("157", "6686"))); } /** @@ -48,7 +48,7 @@ public class DataApiTest { */ @Test public void testGetSpoolersDataByName() { - System.out.println(execution.getSpoolersByName("jhadmin", "common_sub__t1_aaa.sh_20240206103137")); + System.out.println(execution.getSpoolersByName("common_sub__t1_test.sh_2511221613073988875752")); } diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/file/FileApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/file/FileApiTest.java index 5f6ded8..81f4782 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/file/FileApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/file/FileApiTest.java @@ -28,7 +28,7 @@ public class FileApiTest { */ @Test public void testRenameFile() { - execution.renameFile("lqyan", "/apps/JHDP/lqyan/temp/PSUserService.class", "aaa.class"); + execution.renameFile("$HOME/test.sh", "test1.sh"); } /** @@ -36,7 +36,7 @@ public class FileApiTest { */ @Test public void testDeleteFile() { - execution.deleteFile("lqyan", "/apps/JHDP/lqyan/temp/aaa.class"); + execution.deleteFile("$HOME/test1/test.sh"); } /** @@ -44,7 +44,7 @@ public class FileApiTest { */ @Test public void testCopyFile() { - execution.copyFile("lqyan", "/apps/JHDP/lqyan/PSUserService.class", "/apps/JHDP/lqyan/temp"); + execution.copyFile("$HOME/test.sh", "$HOME/test1"); } /** @@ -52,7 +52,7 @@ public class FileApiTest { */ @Test public void testGetFileList() { - List fileList = execution.getFileList("jhadmin", "$HOME"); + List fileList = execution.getFileList("$HOME"); System.out.println(fileList); } @@ -61,7 +61,7 @@ public class FileApiTest { */ @Test public void testMkdir() { - System.out.println(execution.mkdir("jhadmin", "$HOMEtest1", true)); + System.out.println(execution.mkdir("$HOMEtest1", true)); } /** @@ -69,7 +69,7 @@ public class FileApiTest { */ @Test public void testMkdirNoForce() { - System.out.println(execution.mkdir("lqyan", "/apps/JHDP/lqyan/temp/bbb/ddd")); + System.out.println(execution.mkdir("$HOME/temp/bbb/ddd")); } /** @@ -77,7 +77,7 @@ public class FileApiTest { */ @Test public void testMkFile() { - System.out.println(execution.mkFile("lqyan", "/apps/JHDP/lqyan/temp/ddd.txt")); + System.out.println(execution.mkFile("$HOME/temp/ddd.txt")); } /** @@ -85,9 +85,9 @@ public class FileApiTest { */ @Test public void testUploadFile() throws IOException { - File file = new File("C:\\Users\\yanlongqi\\Desktop\\LdapAdminv1830.exe"); + File file = new File("D:\\Program Files\\Java\\apache-maven-3.9.11\\conf\\settings.xml"); FileInputStream fileInputStream = new FileInputStream(file); - execution.uploadFile("jhadmin", fileInputStream, file.getName(), "$HOME", true); + execution.uploadFile(fileInputStream, file.getName(), "$HOME", true); } /** @@ -95,9 +95,9 @@ public class FileApiTest { */ @Test public void testUploadFileNoCover() throws IOException { - File file = new File("C:\\Users\\yanlongqi\\Desktop\\Hash.exe"); + File file = new File("D:\\Program Files\\Java\\apache-maven-3.9.11\\conf\\settings.xml"); FileInputStream fileInputStream = new FileInputStream(file); - execution.uploadFile("lqyan", fileInputStream, file.getName(), "$HOME/temp"); + execution.uploadFile(fileInputStream, file.getName(), "$HOME/temp"); } @@ -106,9 +106,9 @@ public class FileApiTest { */ @Test public void testUploadFileConf() throws IOException { - File file = new File("C:\\Users\\yanlongqi\\Desktop\\Hash.exe"); + File file = new File("D:\\Program Files\\Java\\apache-maven-3.9.11\\conf\\settings.xml"); FileInputStream fileInputStream = new FileInputStream(file); - execution.uploadFile("lqyan", fileInputStream, file.getName(), "$HOME/temp111", false, "public"); + execution.uploadFile(fileInputStream, file.getName(), "$HOME/temp111", false, "public"); } /** @@ -116,12 +116,12 @@ public class FileApiTest { */ @Test public void testGetFileDownloadUrl() { - System.out.println(execution.getFileDownloadUrl("jhadmin", "$HOME/aa2a.sh")); + System.out.println(execution.getFileDownloadUrl("$HOME/test.sh")); } @Test public void testGetFileStream() throws IOException { - InputStream in = execution.getFileInputStream("jhadmin", "$HOME/aaa.sh"); + InputStream in = execution.getFileInputStream("$HOME/test.sh"); byte[] bytes = new byte[1024]; while (in.read(bytes) != -1) { System.out.println(new String(bytes)); @@ -130,12 +130,12 @@ public class FileApiTest { @Test public void testCompress() { - execution.compress("jhadmin", "$HOME/temp", "$HOME/temp.zip"); + execution.compress("$HOME/temp", "$HOME/temp.zip"); } @Test public void testUncompress() { - execution.uncompress("jhadmin", "$HOME/temp.zip", "$HOME/test"); + execution.uncompress("$HOME/temp.zip", "$HOME/test"); } @Test @@ -146,6 +146,6 @@ public class FileApiTest { @Test public void testMarkConf() { - execution.markConf("yanlongqi", "999999998", "/home/yanlongqi/test.sh"); + execution.markConf("999999998", "/home/yanlongqi/test.sh"); } } 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 9fb2d70..5b6d998 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,9 +26,10 @@ public class JobApiTest { @Test public void testSubmitJob() { Map params = new HashMap<>(); - params.put("JH_CAS", "$HOME/aaa.sh"); + params.put("JH_CAS", "$HOME/test.sh"); params.put("JH_NCPU", "1"); - System.out.println(execution.submit("jhadmin", "common_sub", params)); + params.put("JH_JOB_CONF", "public"); + System.out.println(execution.submit("yanlongqi", "common_sub", params)); } /** diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobTooltipDTO.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobTooltipDTO.java deleted file mode 100644 index 2af5132..0000000 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/job/JobTooltipDTO.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.jhinno.sdk.openapi.test.job; - -import lombok.Data; - -@Data -public class JobTooltipDTO { - - /** - * 可用cpu核数 - */ - private Integer slotsAvail; - - /** - * 等待作业数 - */ - private Integer totalPendJobs; - - /** - * 调试信息 - */ - private String debugMessage; -} diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/DepartmentApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/DepartmentApiTest.java index e6b60f8..2cecadf 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/DepartmentApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/DepartmentApiTest.java @@ -14,7 +14,7 @@ import org.junit.Test; public class DepartmentApiTest { private static final JHDepartmentApiExecution execution = JHClientConfig.API_EXECUTION_MANAGE - .getApiExecution(JHDepartmentApiExecution.class); + .getApiExecution(JHDepartmentApiExecution.class); /** @@ -22,7 +22,7 @@ public class DepartmentApiTest { */ @Test public void testGetDepartment() { - System.out.println(execution.getDepartmentList("jhadmin")); + System.out.println(execution.getDepartmentList()); } /** @@ -31,10 +31,10 @@ public class DepartmentApiTest { @Test public void testAddDepartment() { AddUpdateDepartment addUpdateDepartment = new AddUpdateDepartment(); - addUpdateDepartment.setDepName("test2"); - addUpdateDepartment.setDepNameCN("测试部门2"); + addUpdateDepartment.setDepName("test1"); + addUpdateDepartment.setDepNameCN("测试部门1"); addUpdateDepartment.setParentDepName("defaultDep"); - execution.addDepartment("jhadmin", addUpdateDepartment); + execution.addDepartment(addUpdateDepartment); } /** @@ -46,7 +46,7 @@ public class DepartmentApiTest { addUpdateDepartment.setDepName("test2"); addUpdateDepartment.setDepNameCN("测试部门2111"); addUpdateDepartment.setParentDepName("defaultDep"); - execution.updateDepartment("jhadmin", addUpdateDepartment); + execution.updateDepartment(addUpdateDepartment); } /** @@ -54,6 +54,6 @@ public class DepartmentApiTest { */ @Test public void testDeleteDepartment() { - execution.deleteDepartment("jhadmin", "test2"); + execution.deleteDepartment("test1"); } } diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/UserApiTest.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/UserApiTest.java index 808b33d..1525d5e 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/UserApiTest.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/organization/UserApiTest.java @@ -5,6 +5,7 @@ import com.jhinno.sdk.openapi.api.organization.AddUpdateUserInfo; import com.jhinno.sdk.openapi.api.organization.JHUserApiExecution; import com.jhinno.sdk.openapi.api.organization.UserInfo; import com.jhinno.sdk.openapi.test.JHClientConfig; +import com.jhinno.sdk.openapi.utils.JsonUtil; import org.junit.Test; /** @@ -15,8 +16,8 @@ import org.junit.Test; */ public class UserApiTest { - private static final JHUserApiExecution execution = JHClientConfig.API_EXECUTION_MANAGE - .getApiExecution(JHUserApiExecution.class); + private static final JHUserApiExecution execution = JHClientConfig.API_EXECUTION_MANAGE + .getApiExecution(JHUserApiExecution.class); /** @@ -24,8 +25,8 @@ public class UserApiTest { */ @Test public void testGetUserList() { - PageResult result = execution.getUserList("jhadmin", null, null, null); - System.out.println("result = " + result); + PageResult result = execution.getUserList(null, null, null); + System.out.println(JsonUtil.objectToString(result)); } /** @@ -38,7 +39,7 @@ public class UserApiTest { addUpdateUserInfo.setUserNameCn("张三3"); addUpdateUserInfo.setUserPassword("Jhadmin123"); addUpdateUserInfo.setDepName("defaultDep"); - execution.addUser("jhadmin", addUpdateUserInfo); + execution.addUser(addUpdateUserInfo); } @@ -48,11 +49,11 @@ public class UserApiTest { @Test public void updateUser() { AddUpdateUserInfo addUpdateUserInfo = new AddUpdateUserInfo(); - addUpdateUserInfo.setUserName("zhangsan"); + addUpdateUserInfo.setUserName("zhangsan3"); addUpdateUserInfo.setUserNameCn("张三1"); addUpdateUserInfo.setDepName("defaultDep"); addUpdateUserInfo.setUserPassword("Jhadmin123"); - execution.updateUser("jhadmin", addUpdateUserInfo); + execution.updateUser(addUpdateUserInfo); } @@ -61,7 +62,7 @@ public class UserApiTest { */ @Test public void testDeleteUser() { - execution.deleteUser("jhadmin", "zhangsan1"); + execution.deleteUser("zhangsan3"); } @@ -71,12 +72,7 @@ public class UserApiTest { @Test public void testUpdateUserPassword() { // 修改用户密码，应该是自己的密码需要自己的token修改 - execution.updateUserPassword("jhadmin", "zhangsan1", "Jhadmin123", "Jhadmin124"); + execution.updateUserPassword("zhangsan1", "Jhadmin124", "Jhadmin1241"); - // 管理员重置密码 - execution.resetPassword("jhadmin", "zhangsan2", "Jhadmin125"); - - // 管理员重置密码后，强制让用户修改密码（改接口调用报错，不应该传入旧密码） - execution.resetForceUpdatePassword("jhadmin", "zhangsan3", "Jhadmin127"); } }