release(发布): release-2.0.2

jhinno-openapi-java-sdk/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jhinno-openapi-java-sdk</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
     <packaging>jar</packaging>
     <name>Jhinno OpenAPI SDK for Java</name>
     <description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.jhinno</groupId>
         <artifactId>jhinno-openapi-java-sdk-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
 
     <dependencies>

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/CommonConstant.java

@@ -57,6 +57,12 @@ public class CommonConstant {
      */
     public static final String CURRENT_TIME_MILLIS = "currentTimeMillis";
 
+
+    /**
+     * TOKEN
+     */
+    public static final String TOKEN = "token";
+
     /**
      * 签名加密格式
      * <ul>

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/JHApiExecution.java

@@ -43,10 +43,11 @@ import java.util.concurrent.ConcurrentHashMap;
 @NoArgsConstructor
 public class JHApiExecution {
 
+
     /**
      * JHApiClient实例
      */
-    public JHApiClient jhApiClient;
+    private JHApiClient jhApiClient;
 
     /**
      * token的超时时间
@@ -157,7 +158,7 @@ public class JHApiExecution {
     /**
      * @return
      */
-    private String getCurrentTimeMillis() {
+    public String getCurrentTimeMillis() {
         if (authType == AuthType.ACCESS_SECRET_MODE || !isUsedServerTime) {
             return String.valueOf(System.currentTimeMillis());
         }
@@ -196,7 +197,7 @@ public class JHApiExecution {
             headers.put(CommonConstant.CURRENT_TIME_MILLIS, currentTimeMillis);
             headers.put(CommonConstant.SIGNATURE, getsSignature(username, currentTimeMillis));
         } else if (authType == AuthType.TOKEN_MODE && StringUtils.isNotBlank(username)) {
-            headers.put("token", getToken(username));
+            headers.put(CommonConstant.TOKEN, getToken(username));
         }
         return headers;
     }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/AppPathConstant.java

@@ -91,4 +91,26 @@ public class AppPathConstant {
      * 获取应用链接URL
      */
     public static final String APPS_GET_URL_PATH = "/ws/api/apps/{appName}/url";
+
+
+    /**
+     * WEB启动会话URL
+     */
+    public static final String WEB_SESSION_URL_PATH = "/pageapi/apps/webclient/gui/{desktopId}";
+
+
+    /**
+     * 根据用途查询应用
+     * <p/>
+     * 该接口目前在Solutions下面维护，未经过产品的测试
+     */
+    public static final String APP_USE_LABEL_PATH = "/ws/api/app/use_label/apps";
+
+
+    /**
+     * 根据文件后缀查询应用
+     * <p/>
+     * 该接口目前在Solutions下面维护，未经过产品的测试
+     */
+    public static final String APPS_SUFFIXES_PATH = "/ws/api/apps/suffixes";
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/AppStartedInfo.java

@@ -34,4 +34,9 @@ public class AppStartedInfo {
      * 作业id（有可能出现，但不是太明白）
      */
     private String jobId;
+
+    /**
+     * WEB 启动会话URL
+     */
+    private String webSessionUrl;
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/AppstoreAppInfo.java

@@ -0,0 +1,121 @@
+package com.jhinno.sdk.openapi.api.app;
+
+import lombok.Data;
+
+/**
+ * 应用
+ */
+@Data
+public class AppstoreAppInfo {
+
+    /**
+     * 应ID
+     */
+    private String id;
+
+    /**
+     * 应用名称
+     */
+    private String name;
+
+    /**
+     * 应用图标
+     */
+    private String image;
+
+    /**
+     * 应用类型
+     */
+    private String type;
+
+    /**
+     * 应用版本
+     */
+    private String version;
+
+    /**
+     * 应用状态
+     */
+    private Boolean status;
+
+    /**
+     * 是否 使用
+     */
+    private Boolean isUsed;
+
+    /**
+     * CPU使用
+     */
+    private String cpuUsage;
+
+    /**
+     * 空闲内存
+     */
+    private String idleMem;
+
+    /**
+     *
+     */
+    private String idleTime;
+
+    /**
+     * 应用路径
+     */
+    private String appPath;
+
+    /**
+     * 工作路径
+     */
+    private String appCwd;
+
+    /**
+     * 发布时间
+     */
+    private String appReleaseTime;
+
+    /**
+     * 启动选项
+     */
+    private String appStartOpt;
+
+    /**
+     * 启动前缀
+     */
+    private String appStartPrefix;
+
+    /**
+     * 启动后缀
+     */
+    private String appStartSuffix;
+
+    /**
+     * 应用详情
+     */
+    private String appDetail;
+
+    /**
+     * 启动数量
+     */
+    private String startNum;
+
+    /**
+     * 用途英文名
+     */
+    private String useLabelEnStr;
+
+    /**
+     * 用途中文名
+     */
+    private String useLabelCnStr;
+
+    /**
+     * 应用系统
+     */
+    private String appOs;
+
+    /**
+     * 申请状态
+     */
+    private String applyStatus;
+
+}

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/JHAppApiExecution.java

@@ -2,6 +2,7 @@ package com.jhinno.sdk.openapi.api.app;
 
 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.ServiceException;
 import com.jhinno.sdk.openapi.api.JHApiExecution;
@@ -11,6 +12,7 @@ import com.jhinno.sdk.openapi.utils.CollectionUtil;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +37,10 @@ public class JHAppApiExecution extends JHApiExecution {
 
     /**
      * 启动一个会话
+     *
+     * <h4>一、通过JHClient启动</h4>
      * <p>
-     * 改方法返回一个重要的参数{@link AppStartedInfo#getJhappUrl()}（拉起景行客户端协议的URL）。
+     * 方法返回一个重要的参数{@link AppStartedInfo#getJhappUrl()}（拉起景行客户端协议的URL）。
      * <p>
      * 测试：将该URL复制粘贴到浏览器的地址栏进行访问即可启动会话。
      *
@@ -61,6 +65,16 @@ public class JHAppApiExecution extends JHApiExecution {
      *  iframe.src = "{@link AppStartedInfo#getJhappUrl()}";
      * </pre>
      *
+     * <p>
+     * 注意：如果使用JHAppClient启动应用的，并且没有做浏览器端和服务器没有做时间同步，
+     * 那么 {@link AppStartRequest#setCurrentTimestamp(String)} 参数必传，
+     * 并使用js生产的时间，具体的参数见 {@link AppStartRequest#setCurrentTimestamp(String)}
+     *
+     * <h4>通过浏览器启动</h4>
+     * <pre class="code">
+     *  window.open("{@link AppStartedInfo#getWebSessionUrl()}}")
+     * </pre>
+     *
      * @param username        用户名
      * @param appId           应用拆
      * @param appStartRequest 启动参数
@@ -73,7 +87,26 @@ public class JHAppApiExecution extends JHApiExecution {
         if (CollectionUtil.isEmpty(data)) {
             throw new ServiceException(path, 500, "获取到的会话信息为空");
         }
-        return data.get(0);
+        AppStartedInfo appStartedInfo = data.get(0);
+        appStartedInfo.setWebSessionUrl(getWebSessionUrl(username, appStartedInfo.getDesktopId()));
+        return appStartedInfo;
+    }
+
+    public String getWebSessionUrl(String username, String desktopId) {
+        String webSessionUrlPath = AppPathConstant.WEB_SESSION_URL_PATH.replace("{desktopId}", desktopId);
+        String url = getJhApiClient().getUrl(webSessionUrlPath);
+        Map<String, Object> params = new HashMap<>();
+        AuthType authType = getAuthType();
+        if (authType == AuthType.TOKEN_MODE) {
+            params.put(CommonConstant.TOKEN, 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.CURRENT_TIME_MILLIS, currentTimeMillis);
+            params.put(CommonConstant.SIGNATURE, getsSignature(username, currentTimeMillis));
+        }
+        return JHApiClient.getUrl(url, params);
     }
 
     /**
@@ -266,7 +299,10 @@ public class JHAppApiExecution extends JHApiExecution {
         if (CollectionUtil.isEmpty(list)) {
             throw new ServiceException(path, 500, "获取到的会话信息为空");
         }
-        return list.get(0);
+
+        AppStartedInfo appStartedInfo = list.get(0);
+        appStartedInfo.setWebSessionUrl(getWebSessionUrl(username, sessionId));
+        return appStartedInfo;
     }
 
 
@@ -358,7 +394,7 @@ public class JHAppApiExecution extends JHApiExecution {
     /**
      * 获取应用链接
      *
-     * @param username 应户名
+     * @param username 用户名
      * @param appName  应用名
      * @return 应用链接地址
      */
@@ -374,4 +410,61 @@ public class JHAppApiExecution extends JHApiExecution {
         }
         return apps.get(0).get("url");
     }
+
+    /**
+     * 根据文件后缀查询应用
+     *
+     * @param username 用户名
+     * @param suffixes 文件后缀列表
+     * @return 应用列表
+     */
+    public List<AppstoreAppInfo> getAppInfoSuffixList(String username, String... suffixes) {
+        return getAppInfoSuffixList(username, Arrays.asList(suffixes));
+    }
+
+    /**
+     * 根据文件后缀查询应用
+     *
+     * @param username 用户名
+     * @param suffixes 文件后缀列表
+     * @return 应用列表
+     */
+    public List<AppstoreAppInfo> getAppInfoSuffixList(String username, List<String> suffixes) {
+        Map<String, Object> params = new HashMap<>(1);
+        if (CollectionUtil.isNotEmpty(suffixes)) {
+            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<ResponseResult<List<AppstoreAppInfo>>>() {
+        });
+    }
+
+    /**
+     * 根据用途查询应用
+     *
+     * @param username 用户名
+     * @param labels   用途列表
+     * @return 应用列表
+     */
+    public List<UseLabelInfo> getUseLabelList(String username, String... labels) {
+        return getUseLabelList(username, Arrays.asList(labels));
+    }
+
+
+    /**
+     * 根据用途查询应用
+     *
+     * @param username 用户名
+     * @param labels   用途列表
+     * @return 应用列表
+     */
+    public List<UseLabelInfo> getUseLabelList(String username, List<String> labels) {
+        Map<String, Object> params = new HashMap<>(1);
+        if (CollectionUtil.isNotEmpty(labels)) {
+            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<ResponseResult<List<UseLabelInfo>>>() {
+        });
+    }
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/app/UseLabelInfo.java

@@ -0,0 +1,28 @@
+package com.jhinno.sdk.openapi.api.app;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UseLabelInfo {
+    /**
+     * 用途id
+     */
+    private String useLabelId;
+
+    /**
+     * 用途名称
+     */
+    private String useLabelName;
+
+    /**
+     * 用途图片
+     */
+    private String useLabelIcon;
+
+    /**
+     * 用途app列表
+     */
+    private List<AppstoreAppInfo> apps;
+}

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/file/JHFileApiExecution.java

@@ -196,8 +196,16 @@ public class JHFileApiExecution extends JHApiExecution {
         }
         body.put("uploadPath", uploadPath);
 
-        ResponseResult<Object> result = jhApiClient.upload(FilePathConstant.FILE_UPLOAD_PATH, "file", fileName, is, getHeaders(username, false), body, new TypeReference<ResponseResult<Object>>() {
-        });
+        ResponseResult<Object> result = getJhApiClient().upload(
+                FilePathConstant.FILE_UPLOAD_PATH,
+                "file",
+                fileName,
+                is,
+                getHeaders(username, false),
+                body,
+                new TypeReference<ResponseResult<Object>>() {
+                }
+        );
         if (StringUtils.equals(result.getResult(), CommonConstant.FAILED)) {
             throw new ServiceException(FilePathConstant.FILE_UPLOAD_PATH, result.getCode(), result.getMessage());
         }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JHJobApiExecution.java

@@ -12,6 +12,7 @@ import com.jhinno.sdk.openapi.utils.JsonUtil;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import com.jhinno.sdk.openapi.utils.CollectionUtil;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -355,7 +356,7 @@ public class JHJobApiExecution extends JHApiExecution {
             throw new ArgsException("jobId不能为空！");
         }
         String path = JobPathConstant.JOB_PEEK_PATH.replace("{jobId}", jobId);
-        ResponseResult<String> result = jhApiClient.get(path, getHeaders(username), new TypeReference<ResponseResult<String>>() {
+        ResponseResult<String> result = getJhApiClient().get(path, getHeaders(username), new TypeReference<ResponseResult<String>>() {
         });
         if (StringUtils.equals(result.getResult(), CommonConstant.FAILED)) {
             throw new ServiceException(path, result.getCode(), result.getMessage());

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/job/JobPathConstant.java

@@ -86,6 +86,8 @@ public class JobPathConstant {
 
     /**
      * 获取作业表单
+     * <p/>
+     * 该接口目前在Solutions下面维护，未经过产品的测试
      */
     public static final String JOB_GET_APP_FORM_PATH = "/ws/api/jobs/{appId}/form_params";
 }

jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java

@@ -24,13 +24,13 @@ public class JHClientConfig {
     /**
      * 初始化JHApi客户端
      */
-    public static final JHApiClient client = new JHApiClient("https://172.17.0.5/appform");
+    public static final JHApiClient client = new JHApiClient("https://192.168.38.160/appform");
 
     public static final Map<Class<? extends JHApiExecution>, JHApiExecution> jhApiClientMap = new HashMap<>();
 
-    public static final String ACCESS_KEY = "3f03747f147942bd8debd81b6c9c6a80";
+    public static final String ACCESS_KEY = "35154207caa94be582e75da31ec8e9f2";
 
-    public static final String ACCESS_KEY_SECRET = "e0681859b91c499eb1d2c8e09cea3242";
+    public static final String ACCESS_KEY_SECRET = "2cdb5ecbe51543ad9a08ad21c32e2dd9";
 
     static {
         client.initDefaultApiClient();

jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/app/AppApiTest.java

@@ -168,4 +168,21 @@ public class AppApiTest {
         System.out.println(jhAppApiExecution.getAppUrl("jhadmin", "myjobmana"));
     }
 
+
+    /**
+     * 测试根据文件后缀取应用列表
+     */
+    @Test
+    public void testGetAppInfoSuffixList() {
+        System.out.println(jhAppApiExecution.getAppInfoSuffixList("test", ".sh"));
+    }
+
+
+    /**
+     * 测试根据用途获取应用列表
+     */
+    @Test
+    public void testGetUseLabelList() {
+        System.out.println(jhAppApiExecution.getUseLabelList("jhadmin"));
+    }
 }

jhinno-openapi-sdk-spring-boot-starter/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jhinno-openapi-sdk-spring-boot-starter</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
     <packaging>jar</packaging>
     <name>Jhinno OpenAPI SDK for Java SpringBoot Starter</name>
     <description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>
@@ -14,7 +14,7 @@
     <parent>
         <groupId>com.jhinno</groupId>
         <artifactId>jhinno-openapi-java-sdk-parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.2</version>
     </parent>
 
 
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.jhinno</groupId>
             <artifactId>jhinno-openapi-java-sdk</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.2</version>
         </dependency>
 
         <dependency>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.jhinno</groupId>
     <artifactId>jhinno-openapi-java-sdk-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.2</version>
     <packaging>pom</packaging>
     <name>Jhinno OpenAPI SDK for Java parent</name>
     <description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>