添加密级字段

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: deploy
+
+on:
+  # 支持手动触发构建
+  workflow_dispatch:
+  release:
+    types: [released]
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 拉取源码
+        uses: actions/checkout@v2
+      - name: Set up Apache Maven Central
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8.0.302+8
+          distribution: 'temurin'
+          cache: maven
+          server-id: central
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_CENTRAL_TOKEN
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+          gpg-private-key: ${{ secrets.GPG_SECRET }}
+      - name: Publish to Apache Maven Central
+        run: mvn deploy 
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_CENTRAL_TOKEN: ${{ secrets.OSSRH_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}

README.md

@@ -17,6 +17,7 @@
 3. JH_Appform_6.1_Release
 4. JH_Appform_6.2_Release（使用: release-2.0.3）
 5. JH_Appform_6.3_Release（使用: release-2.0.4）
+5. JH_Appform_6.3_Release（使用: release-2.0.5）
 
 # 2. 快速开始
 
@@ -81,7 +82,7 @@ mvn clean install
 ```yaml
 jhinno:
   openapi:
-    server-url: https://172.17.0.5/appform
+    server-url: https://172.17.0.5
     access-key: xxxxx
     access-key-secret: xxxx
     auth-type: access_secret_mode
@@ -90,7 +91,7 @@ jhinno:
 #### 2.1.3.2 application.properties
 
 ```properties
-jhinno.openapi.server-url=https://{appform服务器的地址}/appform
+jhinno.openapi.server-url=https://{appform服务器的地址}
 jhinno.openapi.access-key=xxxxx
 jhinno.openapi.access-key-secret=xxxx
 jhinno.openapi.auth-type=access_secret_mode
@@ -180,7 +181,7 @@ spring.xml 添加以下内容
 <?xml version="1.0" encoding="utf-8"?>
 <beans>
     <bean id="apiClient" class="com.jhinno.sdk.openapi.client.JHApiClient" init-method="initDefaultApiClient">
-        <constructor-arg value="https://172.17.0.5/appform"/>
+        <constructor-arg value="https://172.17.0.5"/>
     </bean>
 
     <bean id="requestExecution" class="com.jhinno.sdk.openapi.api.JHRequestExecution">
@@ -256,7 +257,7 @@ public class JHApiUtile {
     /**
      * 创建一个API执行器管理器
      */
-    public static final JHApiExecutionManage API_EXECUTION_MANAGE = new JHApiExecutionManage("https://192.168.87.24/appform");
+    public static final JHApiExecutionManage API_EXECUTION_MANAGE = new JHApiExecutionManage("https://192.168.87.24");
 
     public static final String ACCESS_KEY = "3f03747f147942bd8debd81b6c9c6a80";
 
@@ -338,6 +339,7 @@ public class JHDemoApiExecution extends JHApiExecution {
 
     public XxxDTO getXXXX(String username, String demoParams) {
 
+        // ResponseResult<XxxDTO> 可以参照接口文档定义自己的数据传输对象
         return execution.get("/demo/path", username, new TypeReference<ResponseResult<XxxDTO>>() {
         });
     }
@@ -370,7 +372,7 @@ public class JHDemoApiExecution extends JHApiExecution {
 
 public class JHApiUtile {
 
-    public static final JHApiExecutionManage API_EXECUTION_MANAGE = new JHApiExecutionManage("https://192.168.87.24/appform");
+    public static final JHApiExecutionManage API_EXECUTION_MANAGE = new JHApiExecutionManage("https://192.168.87.24");
 
     public static final String ACCESS_KEY = "3f03747f147942bd8debd81b6c9c6a80";
 

jhinno-openapi-java-sdk/pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>jhinno-openapi-java-sdk</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</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.3</version>
+        <version>2.0.5</version>
     </parent>
 
     <dependencies>

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

@@ -11,86 +11,86 @@ public class AppPathConstant {
     /**
      * 申请会话
      */
-    public static final String APPS_START_PATH = "/ws/api/apps/{appId}/start";
+    public static final String APPS_START_PATH = "/appform/ws/api/apps/{appId}/start";
 
     /**
      * 查询会列表
      */
-    public static final String APPS_SESSIONS_ALL_PATH = "/ws/api/apps/sessions/all";
+    public static final String APPS_SESSIONS_ALL_PATH = "/appform/ws/api/apps/sessions/all";
 
     /**
      * 使用参数查询会话列表
      */
-    public static final String APPS_SESSIONS_PATH = "/ws/api/apps/sessions";
+    public static final String APPS_SESSIONS_PATH = "/appform/ws/api/apps/sessions";
 
 
     /**
      * 根据会话id列表查询会话列表
      */
-    public static final String APPS_SESSIONS_IDS_PATH = "/ws/api/apps/listBySessionIds";
+    public static final String APPS_SESSIONS_IDS_PATH = "/appform/ws/api/apps/listBySessionIds";
 
 
     /**
      * 根据会话名称查询会话列表
      */
-    public static final String APPS_SESSIONS_NAME_PATH = "/ws/api/apps/listBySessionName";
+    public static final String APPS_SESSIONS_NAME_PATH = "/appform/ws/api/apps/listBySessionName";
 
 
     /**
      * 会话共享
      */
-    public static final String APPS_SESSIONS_SHARE_PATH = "/ws/api/apps/sessions/{sessionId}/share";
+    public static final String APPS_SESSIONS_SHARE_PATH = "/appform/ws/api/apps/sessions/{sessionId}/share";
 
 
     /**
      * 取消会话共享
      */
-    public static final String APPS_SESSIONS_CANCEL_SHARE_PATH = "/ws/api/apps/sessions/{sessionId}/share_cancel";
+    public static final String APPS_SESSIONS_CANCEL_SHARE_PATH = "/appform/ws/api/apps/sessions/{sessionId}/share_cancel";
 
     /**
      * 传递会话的操作权
      */
-    public static final String APPS_SESSIONS_OPERATION_TRANSFER_PATH = "/ws/api/apps/sessions/{sessionId}/operation_transfer";
+    public static final String APPS_SESSIONS_OPERATION_TRANSFER_PATH = "/appform/ws/api/apps/sessions/{sessionId}/operation_transfer";
 
 
     /**
      * 连接会话
      */
-    public static final String APPS_SESSIONS_CONNECT_JHAPP_PATH = "/ws/api/apps/sessions/{sessionId}/connect";
+    public static final String APPS_SESSIONS_CONNECT_JHAPP_PATH = "/appform/ws/api/apps/sessions/{sessionId}/connect";
 
     /**
      * 断开会话连接（作业/应用）
      */
-    public static final String APPS_SESSIONS_DISCONNECT_PATH = "/ws/api/apps/sessions/{sessionId}/disconnect";
+    public static final String APPS_SESSIONS_DISCONNECT_PATH = "/appform/ws/api/apps/sessions/{sessionId}/disconnect";
 
 
     /**
      * 批量断开会话
      */
-    public static final String APPS_SESSIONS_DISCONNECT_IDS_PATH = "/ws/api/apps/sessions/disconnect";
+    public static final String APPS_SESSIONS_DISCONNECT_IDS_PATH = "/appform/ws/api/apps/sessions/disconnect";
 
 
     /**
      * 注销会话
      */
-    public static final String APPS_SESSIONS_DESTROY_PATH = "/ws/api/apps/sessions/{sessionId}/close";
+    public static final String APPS_SESSIONS_DESTROY_PATH = "/appform/ws/api/apps/sessions/{sessionId}/close";
 
     /**
      * 批量注销会话
      */
-    public static final String APPS_SESSIONS_DESTROY_IDS_PATH = "/ws/api/apps/sessions/close";
+    public static final String APPS_SESSIONS_DESTROY_IDS_PATH = "/appform/ws/api/apps/sessions/close";
 
 
     /**
      * 查询应用列表
      */
-    public static final String APPS_LIST_PATH = "/ws/api/apps";
+    public static final String APPS_LIST_PATH = "/appform/ws/api/apps";
 
 
     /**
      * 获取应用链接URL
      */
-    public static final String APPS_GET_URL_PATH = "/ws/api/apps/{appName}/url";
+    public static final String APPS_GET_URL_PATH = "/appform/ws/api/apps/{appName}/url";
 
 
     /**
@@ -104,7 +104,7 @@ public class AppPathConstant {
      * <p/>
      * 该接口目前在Solutions下面维护，未经过产品的测试
      */
-    public static final String APP_USE_LABEL_PATH = "/ws/api/app/use_label/apps";
+    public static final String APP_USE_LABEL_PATH = "/appform/ws/api/app/use_label/apps";
 
 
     /**
@@ -112,5 +112,5 @@ public class AppPathConstant {
      * <p/>
      * 该接口目前在Solutions下面维护，未经过产品的测试
      */
-    public static final String APPS_SUFFIXES_PATH = "/ws/api/apps/suffixes";
+    public static final String APPS_SUFFIXES_PATH = "/appform/ws/api/apps/suffixes";
 }

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

@@ -10,7 +10,6 @@ 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;
-import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/auth/AuthPathConstant.java

@@ -11,22 +11,22 @@ public class AuthPathConstant {
     /**
      * 获取用户token
      */
-    public static final String AUTH_TOKEN_PATH = "/ws/api/auth/token";
+    public static final String AUTH_TOKEN_PATH = "/appform/ws/api/auth/token";
 
     /**
      * 注销token
      */
-    public static final String AUTH_LOGOUT = "/ws/api/auth/logout";
+    public static final String AUTH_LOGOUT = "/appform/ws/api/auth/logout";
 
 
     /**
      * 用户注册
      */
-    public static final String AUTH_REGISTER = "/ws/api/auth/register";
+    public static final String AUTH_REGISTER = "/appform/ws/api/auth/register";
 
     /**
      * 测试服务器是否可用
      */
-    public static final String PING = "/ws/api/ping";
+    public static final String PING = "/appform/ws/api/ping";
 
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/data/DataPathConstant.java

@@ -11,32 +11,32 @@ public class DataPathConstant {
     /**
      * 根据用户scope查询数据目录列表
      */
-    public static final String DATA_SPOOLERS_PATH = "/ws/api/spoolers";
+    public static final String DATA_SPOOLERS_PATH = "/appform/ws/api/spoolers";
 
     /**
      * 根据作业id查数据目录信息
      */
-    public static final String DATA_SPOOLER_JOB_ID_PATH = "/ws/api/spooler/{jobId}";
+    public static final String DATA_SPOOLER_JOB_ID_PATH = "/appform/ws/api/spooler/{jobId}";
 
     /**
      * 根据作业id集合查询数据目录列表
      */
-    public static final String DATA_SPOOLERS_LIST_PATH = "/ws/api/spoolers/list";
+    public static final String DATA_SPOOLERS_LIST_PATH = "/appform/ws/api/spoolers/list";
 
     /**
      * 根据数据目录名称查询数据目录列表
      */
-    public static final String DATA_SPOOLERS_NAME_PATH = "/ws/api/spoolers/name";
+    public static final String DATA_SPOOLERS_NAME_PATH = "/appform/ws/api/spoolers/name";
 
 
     /**
      * 立即删除数据目录
      */
-    public static final String DATA_SPOOLERS_DELETE_ID_PATH = "/ws/api/spooler/del/{id}";
+    public static final String DATA_SPOOLERS_DELETE_ID_PATH = "/appform/ws/api/spooler/del/{id}";
 
 
     /**
      * 设置过期时间删除数据目录
      */
-    public static final String DATA_SPOOLERS_PURGE_PATH = "/ws/api/spooler/purge";
+    public static final String DATA_SPOOLERS_PURGE_PATH = "/appform/ws/api/spooler/purge";
 }

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

@@ -12,56 +12,56 @@ public class FilePathConstant {
     /**
      * 重命名文件
      */
-    public static final String FILE_RENAME_PATH = "/ws/api/files/rename";
+    public static final String FILE_RENAME_PATH = "/appform/ws/api/files/rename";
 
 
     /**
      * 删除文件
      */
-    public static final String FILE_DELETE_PATH = "/ws/api/files/delete";
+    public static final String FILE_DELETE_PATH = "/appform/ws/api/files/delete";
 
 
     /**
      * 拷贝文件
      */
-    public static final String FILE_COPY_PATH = "/ws/api/files/copy";
+    public static final String FILE_COPY_PATH = "/appform/ws/api/files/copy";
 
 
     /**
      * 获取文件列表
      */
-    public static final String FILE_LIST_PATH = "/ws/api/files";
+    public static final String FILE_LIST_PATH = "/appform/ws/api/files";
 
     /**
      * 创建文件夹
      */
-    public static final String FILE_MKDIR_PATH = "/ws/api/files/mkdir";
+    public static final String FILE_MKDIR_PATH = "/appform/ws/api/files/mkdir";
 
     /**
      * 创建文件
      */
-    public static final String FILE_MKFILE_PATH = "/ws/api/files/mkfile";
+    public static final String FILE_MKFILE_PATH = "/appform/ws/api/files/mkfile";
 
     /**
      * 文件上传
      */
-    public static final String FILE_UPLOAD_PATH = "/ws/api/files/upload";
+    public static final String FILE_UPLOAD_PATH = "/appform/ws/api/files/upload";
 
 
     /**
      * 文件下载
      */
-    public static final String FILE_DOWNLOAD_PATH = "/ws/api/files/download";
+    public static final String FILE_DOWNLOAD_PATH = "/appform/ws/api/files/download";
 
 
     /**
      * 压缩文件
      */
-    public static final String FILE_COMPRESS_PATH = "/ws/api/files/compress";
+    public static final String FILE_COMPRESS_PATH = "/appform/ws/api/files/compress";
 
     /**
      * 解压文件
      */
-    public static final String FILE_UNCOMPRESS_PATH = "/ws/api/files/uncompress";
+    public static final String FILE_UNCOMPRESS_PATH = "/appform/ws/api/files/uncompress";
 
 }

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

@@ -180,8 +180,9 @@ public class JHFileApiExecution implements JHApiExecution {
      * @param fileName   文件名称
      * @param uploadPath 上传路径
      * @param isCover    是否覆盖（非必填，默认：false）
+     * @param fileConf   密级（只有开启了密级才需要此参数，可以是密级的中文名，也可以是密级的中文名、英文名、或者密级的key）
      */
-    public void uploadFile(String username, InputStream is, String fileName, String uploadPath, Boolean isCover) {
+    public void uploadFile(String username, InputStream is, String fileName, String uploadPath, Boolean isCover, String fileConf) {
         if (is == null) {
             throw new ArgsException("is是必填参数");
         }
@@ -193,6 +194,9 @@ public class JHFileApiExecution implements JHApiExecution {
         if (isCover != null) {
             body.put("isCover", isCover);
         }
+        if (StringUtils.isNotBlank(fileConf)) {
+            body.put("fileConf", fileConf);
+        }
         body.put("uploadPath", uploadPath);
         ResponseResult<Object> result = execution.getJhApiClient().upload(
                 FilePathConstant.FILE_UPLOAD_PATH,
@@ -208,6 +212,23 @@ public class JHFileApiExecution implements JHApiExecution {
         }
     }
 
+    /**
+     * 上传文件
+     * <p>
+     * 如果isCover为空或者为false，源文件目录下存在相同文件则会报错
+     * </p>
+     *
+     * @param username   用户名
+     * @param is         文件流
+     * @param fileName   文件名称
+     * @param uploadPath 上传路径
+     * @param isCover    是否覆盖（非必填，默认：false）
+     */
+    public void uploadFile(String username, InputStream is, String fileName, String uploadPath, Boolean isCover) {
+        uploadFile(username, is, fileName, uploadPath, isCover, null);
+    }
+
+
     /**
      * 上传文件（不覆盖源文件）
      * <p>
@@ -224,6 +245,8 @@ public class JHFileApiExecution implements JHApiExecution {
     }
 
     /**
+     * 上传一个本地的路径
+     *
      * @param username   用户名
      * @param path       本地文件路径
      * @param fileName   文件名
@@ -241,6 +264,11 @@ public class JHFileApiExecution implements JHApiExecution {
     }
 
     /**
+     * 上传一个本地的路径（不覆盖源文件）
+     * <p>
+     * 源文件目录下存在相同文件则会报错
+     * </p>
+     *
      * @param username   用户名
      * @param path       本地文件路径
      * @param fileName   文件名
@@ -252,6 +280,8 @@ public class JHFileApiExecution implements JHApiExecution {
     }
 
     /**
+     * 上传一个本地的路径
+     *
      * @param username   用户名
      * @param path       本地文件路径
      * @param uploadPath 上传路径，服务器路径
@@ -264,6 +294,8 @@ public class JHFileApiExecution implements JHApiExecution {
     }
 
     /**
+     * 上传一个本地的路径（不覆盖源文件）
+     *
      * @param username   用户名
      * @param path       本地文件路径
      * @param uploadPath 上传路径，服务器路径
@@ -311,7 +343,7 @@ public class JHFileApiExecution implements JHApiExecution {
 
     /**
      * 获取文件输入流
-     * 
+     *
      * @param username 用户名
      * @param filePath 文件路径
      * @return 文件流
@@ -323,7 +355,7 @@ public class JHFileApiExecution implements JHApiExecution {
 
     /**
      * 获取文件输入流
-     * 
+     *
      * @param username      用户名
      * @param filePath      文件路径
      * @param forceDownload 是否强制下载，打开密级之后未标密的文件无法下载，可以通过设置当前参数为true来强制下载，默认：false
@@ -382,7 +414,7 @@ public class JHFileApiExecution implements JHApiExecution {
      * @param compressType   压缩类型 （未使用以后扩展）
      */
     public void uncompress(String username, String sourceFilePath, String targetDirPath, Boolean isCover,
-            String password, String compressType) {
+                           String password, String compressType) {
         if (StringUtils.isBlank(sourceFilePath)) {
             throw new ArgsException("sourceFilePath不能为空！");
         }
@@ -415,7 +447,7 @@ public class JHFileApiExecution implements JHApiExecution {
      * @param password       密码
      */
     public void uncompress(String username, String sourceFilePath, String targetDirPath, Boolean isCover,
-            String password) {
+                           String password) {
         uncompress(username, sourceFilePath, targetDirPath, isCover, password, null);
     }
 

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

@@ -11,77 +11,77 @@ public class JobPathConstant {
     /**
      * 提交作业
      */
-    public static final String JOB_SUBMIT_PATH = "/ws/api/jobs/jsub";
+    public static final String JOB_SUBMIT_PATH = "/appform/ws/api/jobs/jsub";
 
     /**
      * 使用作业id查询作业列表
      */
-    public static final String JOB_FIND_JOB_FILES_PATH = "/ws/api/jobs/{jobId}/files";
+    public static final String JOB_FIND_JOB_FILES_PATH = "/appform/ws/api/jobs/{jobId}/files";
 
     /**
      * 分页查询作业列表
      */
-    public static final String JOB_PAGE_PATH = "/ws/api/jobs/page";
+    public static final String JOB_PAGE_PATH = "/appform/ws/api/jobs/page";
 
     /**
      * 查询历史作业列表
      */
-    public static final String JOB_HISTORY_JOBS_PATH = "/ws/api/jobs/historyPage";
+    public static final String JOB_HISTORY_JOBS_PATH = "/appform/ws/api/jobs/historyPage";
 
     /**
      * 查询作业详情
      */
-    public static final String JOB_DETAIL_INFO_PATH = "/ws/api/jobs/{jobId}";
+    public static final String JOB_DETAIL_INFO_PATH = "/appform/ws/api/jobs/{jobId}";
 
     /**
      * 分页检索作业名
      */
-    public static final String JOB_LIST_BY_NAME_PATH = "/ws/api/jobs/byName";
+    public static final String JOB_LIST_BY_NAME_PATH = "/appform/ws/api/jobs/byName";
 
     /**
      * 作业号检索作业列表
      */
-    public static final String JOB_LIST_BY_STATUS_PATH = "/ws/api/jobs/byStatus/{status}";
+    public static final String JOB_LIST_BY_STATUS_PATH = "/appform/ws/api/jobs/byStatus/{status}";
 
     /**
      * 通过作业号查询作业列表
      */
-    public static final String JOB_LIST_BY_IDS_PATH = "/ws/api/jobs/list";
+    public static final String JOB_LIST_BY_IDS_PATH = "/appform/ws/api/jobs/list";
 
     /**
      * 作业操作
      */
-    public static final String JOB_ACTION_PATH = "/ws/api/jobs/{jobId}/{action}";
+    public static final String JOB_ACTION_PATH = "/appform/ws/api/jobs/{jobId}/{action}";
 
     /**
      * 批量操作作业
      */
-    public static final String JOB_ACTION_IDS_PATH = "/ws/api/jobs/{action}";
+    public static final String JOB_ACTION_IDS_PATH = "/appform/ws/api/jobs/{action}";
 
     /**
      * 获取作业历史
      */
-    public static final String JOB_HISTORY_PATH = "/ws/api/jobs/{jobId}/hist";
+    public static final String JOB_HISTORY_PATH = "/appform/ws/api/jobs/{jobId}/hist";
 
     /**
      * 通过多个作业号查询作业历史
      */
-    public static final String JOB_HISTORY_IDS_PATH = "/ws/api/jobs/hist";
+    public static final String JOB_HISTORY_IDS_PATH = "/appform/ws/api/jobs/hist";
 
     /**
      * 获取作业动态输出
      */
-    public static final String JOB_PEEK_PATH = "/ws/api/jobs/{jobId}/peek";
+    public static final String JOB_PEEK_PATH = "/appform/ws/api/jobs/{jobId}/peek";
 
     /**
      * 连接作业会话
      */
-    public static final String JOB_CONNECT_SESSION_PATH = "/ws/api/jobs/{jobId}/connect";
+    public static final String JOB_CONNECT_SESSION_PATH = "/appform/ws/api/jobs/{jobId}/connect";
 
     /**
      * 获取作业表单
      * <p/>
      * 该接口目前在Solutions下面维护，未经过产品的测试
      */
-    public static final String JOB_GET_APP_FORM_PATH = "/ws/api/jobs/{appId}/form_params";
+    public static final String JOB_GET_APP_FORM_PATH = "/appform/ws/api/jobs/{appId}/form_params";
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/DepartmentPathConstant.java

@@ -11,11 +11,11 @@ public class DepartmentPathConstant {
     /**
      * 组织
      */
-    public static final String DEPARTMENT_PATH = "/ws/api/deps";
+    public static final String DEPARTMENT_PATH = "/appform/ws/api/deps";
 
 
     /**
      * 组织名称操作组织
      */
-    public static final String DEPARTMENT_NAME_PATH = "/ws/api/deps/{depName}";
+    public static final String DEPARTMENT_NAME_PATH = "/appform/ws/api/deps/{depName}";
 }

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/JHDepartmentApiExecution.java

@@ -5,7 +5,6 @@ import com.jhinno.sdk.openapi.ArgsException;
 import com.jhinno.sdk.openapi.JHApiExecution;
 import com.jhinno.sdk.openapi.api.JHRequestExecution;
 import com.jhinno.sdk.openapi.api.ResponseResult;
-import com.jhinno.sdk.openapi.client.JHApiClient;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 

jhinno-openapi-java-sdk/src/main/java/com/jhinno/sdk/openapi/api/organization/UserPathConstant.java

@@ -11,18 +11,18 @@ public class UserPathConstant {
     /**
      * 查询用户和修改用户
      */
-    public static final String USERS_PATH = "/ws/api/users";
+    public static final String USERS_PATH = "/appform/ws/api/users";
 
 
     /**
      * 修改用户和删除用户
      */
-    public static final String USERS_USERNAME_PATH = "/ws/api/users/{username}";
+    public static final String USERS_USERNAME_PATH = "/appform/ws/api/users/{username}";
 
 
     /**
      * 用户密码操作
      */
-    public static final String USERS_RESET_PASSWORD_PATH = "/ws/api/users/{username}/password/password_reset";
+    public static final String USERS_RESET_PASSWORD_PATH = "/appform/ws/api/users/{username}/password/password_reset";
 
 }

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

@@ -25,16 +25,16 @@ public class JHClientConfig {
      * 创建一个API执行器管理器
      */
     public static final JHApiExecutionManage API_EXECUTRON_MANAGE = new JHApiExecutionManage(
-            "https://192.168.87.24/appform");
+            "https://192.168.87.24");
 
-    public static final String ACCESS_KEY = "3f03747f147942bd8debd81b6c9c6a80";
+    public static final String ACCESS_KEY = "e2544957e53b4377bb4f8203a094e50b";
 
-    public static final String ACCESS_KEY_SECRET = "e0681859b91c499eb1d2c8e09cea3242";
+    public static final String ACCESS_KEY_SECRET = "52d18cf7163047b78ea48756b8b40d28";
 
     static {
         API_EXECUTRON_MANAGE.configureApiExecution(t -> {
             // 默认为使用Token模式，如何使用的Token模式，则不需要配置ACCESS_KEY和ACCESS_KEY SECRET
-            // t.setAuthType(AuthType.ACCESS_KEY);
+             t.setAuthType(AuthType.ACCESS_SECRET_MODE);
             t.setAccessKey(ACCESS_KEY);
             t.setAccessKeySecret(ACCESS_KEY_SECRET);
         });

jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/file/FileApiTest.java

@@ -92,9 +92,20 @@ public class FileApiTest {
      */
     @Test
     public void testUploadFileNoCover() throws IOException {
-        File file = new File("C:\\Users\\yanlongqi\\Desktop\\双色球.xls");
+        File file = new File("C:\\Users\\yanlongqi\\Desktop\\Hash.exe");
         FileInputStream fileInputStream = new FileInputStream(file);
-        execution.uploadFile("jhadmin", fileInputStream, file.getName(), "$HOME/temp");
+        execution.uploadFile("lqyan", fileInputStream, file.getName(), "$HOME/temp");
+    }
+
+
+    /**
+     * 测试上传文件，开启密级的情况
+     */
+    @Test
+    public void testUploadFileConf() throws IOException {
+        File file = new File("C:\\Users\\yanlongqi\\Desktop\\Hash.exe");
+        FileInputStream fileInputStream = new FileInputStream(file);
+        execution.uploadFile("lqyan", fileInputStream, file.getName(), "$HOME/temp111", false,"public");
     }
 
     /**

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

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cim.jhinno</groupId>
     <artifactId>jhinno-openapi-sdk-spring-boot-example</artifactId>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <packaging>jar</packaging>
     <name>Jhinno OpenAPI SDK for Java SpringBoot Example</name>
     <description>The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service</description>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>com.jhinno</groupId>
             <artifactId>jhinno-openapi-sdk-spring-boot-starter</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>

jhinno-openapi-sdk-spring-boot-example/src/main/java/com/jhinno/sdk/openapi/example/api/extend/JHFileApiExtendExecution.java

@@ -21,7 +21,7 @@ public class JHFileApiExtendExecution implements JHApiExecution {
         this.execution = execution;
     }
 
-    public static String GET_FILE_ENV_PATH = "/ws/api/files/path/{env}";
+    public static String GET_FILE_ENV_PATH = "/appform/ws/api/files/path/{env}";
 
     public FilePath getFileEnvPath(String username, FileEnvType env, FileSystemType type) {
         Map<String, Object> params = new HashMap<>(1);

jhinno-openapi-sdk-spring-boot-example/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 jhinno:
   openapi:
-    server-url: https://192.168.87.24/appform
+    server-url: https://192.168.0.22
     auth-type: token_mode
     access-key: 3f03747f147942bd8debd81b6c9c6a80
     access-key-secret: e0681859b91c499eb1d2c8e09cea3242

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.4</version>
+    <version>2.0.5</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,14 +14,14 @@
     <parent>
         <groupId>com.jhinno</groupId>
         <artifactId>jhinno-openapi-java-sdk-parent</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.5</version>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>com.jhinno</groupId>
             <artifactId>jhinno-openapi-java-sdk</artifactId>
-            <version>2.0.4</version>
+            <version>2.0.5</version>
         </dependency>
 
         <dependency>

jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiExecutionAutoconfigure.java

@@ -8,7 +8,6 @@ import com.jhinno.sdk.openapi.api.file.JHFileApiExecution;
 import com.jhinno.sdk.openapi.api.job.JHJobApiExecution;
 import com.jhinno.sdk.openapi.api.organization.JHDepartmentApiExecution;
 import com.jhinno.sdk.openapi.api.organization.JHUserApiExecution;
-import com.jhinno.sdk.openapi.client.JHApiClient;
 import lombok.RequiredArgsConstructor;
 
 import org.springframework.beans.factory.config.BeanPostProcessor;

jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiProperties.java

@@ -15,7 +15,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 public class JHOpenapiProperties {
 
     /**
-     * 接口服务的BaseURL, 列如：https://192.168.87.20/appform
+     * 接口服务的BaseURL, 列如：https://192.168.87.20
      */
     private String serverUrl;
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.jhinno</groupId>
     <artifactId>jhinno-openapi-java-sdk-parent</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.5</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>
@@ -26,42 +26,47 @@
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.7.18</version>
     </parent>
-
+    
     <modules>
         <module>jhinno-openapi-java-sdk</module>
         <module>jhinno-openapi-sdk-spring-boot-starter</module>
     </modules>
 
     <build>
-
         <plugins>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
+                <artifactId>maven-source-plugin</artifactId>
-                <configuration>
+                <version>3.1.0</version>
-                    <source>${maven.compiler.source}</source>
+                <executions>
-                    <target>${maven.compiler.target}</target>
+                    <execution>
-                    <encoding>${project.build.sourceEncoding}</encoding>
+                        <phase>package</phase>
-                </configuration>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
+                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
+                <version>3.2.0</version>
-
-            <plugin>
-                <groupId>org.sonatype.central</groupId>
-                <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.7.0</version>
-                <extensions>true</extensions>
                 <configuration>
-                    <publishingServerId>central</publishingServerId>
+                    <show>private</show>
-                    <autoPublish>true</autoPublish>
+                    <nohelp>true</nohelp>
+                    <charset>UTF-8</charset>
+                    <encoding>UTF-8</encoding>
+                    <docencoding>UTF-8</docencoding>
                 </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -73,35 +78,25 @@
                         <goals>
                             <goal>sign</goal>
                         </goals>
+                        <configuration>
+                            <gpgArguments>
+                                <arg>--pinentry-mode</arg>
+                                <arg>loopback</arg>
+                            </gpgArguments>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.sonatype.central</groupId>
-                <artifactId>maven-source-plugin</artifactId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
-                <executions>
+                <version>0.7.0</version>
-                    <execution>
+                <extensions>true</extensions>
-                        <id>attach-sources</id>
+                <configuration>
-                        <goals>
+                    <publishingServerId>central</publishingServerId>
-                            <goal>jar-no-fork</goal>
+                    <autoPublish>true</autoPublish>
-                        </goals>
+                </configuration>
-                    </execution>
-                </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <inherited>true</inherited>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
         </plugins>
     </build>