Skip to content

Commit 5eeb4a0

Browse files
C-WangPengHuiC-WangPengHui
committed
update Version1.3.2
1 parent ae1b5d7 commit 5eeb4a0

File tree

2 files changed

+107
-16
lines changed

2 files changed

+107
-16
lines changed

‎src/main/java/com/compdfkit/client/CPDFClient.java‎

Lines changed: 84 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,18 @@ public List<CPDFTool> getTools() {
9696
* @return CPDFFileInfo
9797
*/
9898
public CPDFFileInfo getFileInfo(String fileKey) {
99-
return httpClient.getFileInfo(fileKey);
99+
return httpClient.getFileInfo(fileKey, null);
100+
}
101+
102+
/**
103+
* get file info
104+
*
105+
* @param fileKey fileKey
106+
* @param language 1:English, 2:Chinese
107+
* @return CPDFFileInfo
108+
*/
109+
public CPDFFileInfo getFileInfo(String fileKey, Integer language) {
110+
return httpClient.getFileInfo(fileKey, language);
100111
}
101112

102113
/**
@@ -127,7 +138,18 @@ public CPDFTaskRecordsResult getTaskList(String page, String size) {
127138
* @return CPDFCreateTaskResult
128139
*/
129140
public CPDFCreateTaskResult createTask(String executeTypeUrl) {
130-
return httpClient.createTask(executeTypeUrl);
141+
return httpClient.createTask(executeTypeUrl, null);
142+
}
143+
144+
/**
145+
* createTask
146+
*
147+
* @param executeTypeUrl task execution type
148+
* @param language 1:English, 2:Chinese
149+
* @return CPDFCreateTaskResult
150+
*/
151+
public CPDFCreateTaskResult createTask(String executeTypeUrl, Integer language) {
152+
return httpClient.createTask(executeTypeUrl, language);
131153
}
132154

133155
/**
@@ -140,6 +162,17 @@ public CPDFCreateTaskResult createTask(CPDFConversionEnum conversionEnum) {
140162
return this.createTask(conversionEnum.getValue());
141163
}
142164

165+
/**
166+
* createTask
167+
*
168+
* @param conversionEnum task execution type
169+
* @param language 1:English, 2:Chinese
170+
* @return CPDFCreateTaskResult
171+
*/
172+
public CPDFCreateTaskResult createTask(CPDFConversionEnum conversionEnum, Integer language) {
173+
return this.createTask(conversionEnum.getValue(), language);
174+
}
175+
143176
/**
144177
* createTask
145178
*
@@ -150,6 +183,17 @@ public CPDFCreateTaskResult createTask(CPDFDocumentEditorEnum documentEditorEnum
150183
return this.createTask(documentEditorEnum.getValue());
151184
}
152185

186+
/**
187+
* createTask
188+
*
189+
* @param documentEditorEnum task execution type
190+
* @param language 1:English, 2:Chinese
191+
* @return CPDFCreateTaskResult
192+
*/
193+
public CPDFCreateTaskResult createTask(CPDFDocumentEditorEnum documentEditorEnum, Integer language) {
194+
return this.createTask(documentEditorEnum.getValue(), language);
195+
}
196+
153197
/**
154198
* createTask
155199
*
@@ -160,6 +204,17 @@ public CPDFCreateTaskResult createTask(CPDFDocumentAIEnum documentAIEnum) {
160204
return this.createTask(documentAIEnum.getValue());
161205
}
162206

207+
/**
208+
* createTask
209+
*
210+
* @param documentAIEnum task execution type
211+
* @param language 1:English, 2:Chinese
212+
* @return CPDFCreateTaskResult
213+
*/
214+
public CPDFCreateTaskResult createTask(CPDFDocumentAIEnum documentAIEnum, Integer language) {
215+
return this.createTask(documentAIEnum.getValue(), language);
216+
}
217+
163218
/**
164219
* uploadFile
165220
*
@@ -172,6 +227,19 @@ public CPDFUploadFileResult uploadFile(File file, String taskId, String password
172227
return getUploadFileResult(file, taskId, password, null);
173228
}
174229

230+
/**
231+
* uploadFile
232+
*
233+
* @param file file
234+
* @param taskId taskId
235+
* @param password password
236+
* @param language 1:English, 2:Chinese
237+
* @return CPDFUploadFileResult
238+
*/
239+
public CPDFUploadFileResult uploadFile(File file, String taskId, String password, Integer language) {
240+
return getUploadFileResult(file, taskId, password, null, language);
241+
}
242+
175243
/**
176244
* uploadFile
177245
*
@@ -185,6 +253,20 @@ public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String p
185253
return getUploadFileResult(file, taskId, password, null, fileName);
186254
}
187255

256+
/**
257+
* uploadFile
258+
*
259+
* @param file file
260+
* @param taskId taskId
261+
* @param password password
262+
* @param fileName fileName
263+
* @param language 1:English, 2:Chinese
264+
* @return CPDFUploadFileResult
265+
*/
266+
public CPDFUploadFileResult uploadFile(InputStream file, String taskId, String password, String fileName, Integer language) {
267+
return getUploadFileResult(file, taskId, password, null, fileName, language);
268+
}
269+
188270
/**
189271
* uploadFile
190272
*

‎src/main/java/com/compdfkit/client/CPDFHttpClient.java‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,12 @@ List<CPDFTool> getTools() {
164164
/**
165165
* getFileInfo
166166
*
167-
* @param fileKey fileKey
167+
* @param fileKey fileKey
168+
* @param language 1:English, 2:Chinese
168169
* @return CFileInfo
169170
*/
170-
CPDFFileInfo getFileInfo(String fileKey) {
171-
String url = address.concat(CPDFConstant.API_V1_FILE_INFO).concat("?fileKey=").concat(fileKey);
171+
CPDFFileInfo getFileInfo(String fileKey, Integer language) {
172+
String url = address.concat(CPDFConstant.API_V1_FILE_INFO).concat("?fileKey=").concat(fileKey).concat("&language=").concat(String.valueOf(language));
172173
ResponseEntity<CPDFResult<CPDFFileInfo>> response;
173174
ParameterizedTypeReference<CPDFResult<CPDFFileInfo>> typeRef = new ParameterizedTypeReference<CPDFResult<CPDFFileInfo>>() {
174175
};
@@ -255,10 +256,12 @@ CPDFTaskRecordsResult getTaskList(String page, String size) {
255256
* createTask
256257
*
257258
* @param executeTypeUrl executeTypeUrl
259+
* @param language 1:English, 2:Chinese
258260
* @return CCreateTaskResult
259261
*/
260-
CPDFCreateTaskResult createTask(String executeTypeUrl) {
261-
String url = address.concat(CPDFConstant.API_V1_CREATE_TASK).replace("{executeTypeUrl}", executeTypeUrl);
262+
CPDFCreateTaskResult createTask(String executeTypeUrl, Integer language) {
263+
String url = address.concat(CPDFConstant.API_V1_CREATE_TASK).replace("{executeTypeUrl}", executeTypeUrl)
264+
.concat("?language=").concat(String.valueOf(language));
262265
ResponseEntity<CPDFResult<CPDFCreateTaskResult>> response;
263266
ParameterizedTypeReference<CPDFResult<CPDFCreateTaskResult>> typeRef = new ParameterizedTypeReference<CPDFResult<CPDFCreateTaskResult>>() {
264267
};
@@ -286,11 +289,12 @@ CPDFCreateTaskResult createTask(String executeTypeUrl) {
286289
* @param taskId taskId
287290
* @param password password
288291
* @param fileParameter fileParameter
292+
* @param language 1:English, 2:Chinese
289293
* @return CUploadFileResult
290294
*/
291-
CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter) {
295+
CPDFUploadFileResult getUploadFileResult(File file, String taskId, String password, CPDFFileParameter fileParameter, Integer language) {
292296
try {
293-
return this.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(),null,null);
297+
return this.getUploadFileResult(new FileInputStream(file), taskId, password, fileParameter, file.getName(), null, null, language);
294298
} catch (FileNotFoundException e) {
295299
throw new CPDFException(e.getMessage(), e);
296300
}
@@ -306,9 +310,10 @@ CPDFUploadFileResult getUploadFileResult(File file, String taskId, String passwo
306310
* @param fileName fileName
307311
* @param imageInputStream imageFile
308312
* @param imageFileName imageFileName
313+
* @param language 1:English, 2:Chinese
309314
* @return return CUploadFileResult
310315
*/
311-
CPDFUploadFileResult getUploadFileResult(InputStream fileInputStream, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName) {
316+
CPDFUploadFileResult getUploadFileResult(InputStream fileInputStream, String taskId, String password, CPDFFileParameter fileParameter, String fileName, InputStream imageInputStream, String imageFileName, Integer language) {
312317
log.info("Start uploading files, task Id: {}, password: {}", taskId, password);
313318
String url = address.concat(CPDFConstant.API_V1_UPLOAD_FILE);
314319
MultiValueMap<String, Object> param = new LinkedMultiValueMap<>();
@@ -325,6 +330,7 @@ public String getFilename() {
325330
};
326331
param.add("file", inputStreamResource);
327332
param.add("taskId", taskId);
333+
param.add("language", language);
328334
if (!StringUtils.isEmpty(password)) {
329335
param.add("password", password);
330336
}
@@ -337,6 +343,7 @@ public String getFilename() {
337343
public long contentLength() throws IOException {
338344
return imageInputStream.available();
339345
}
346+
340347
@Override
341348
public String getFilename() {
342349
return imageFileName;
@@ -375,12 +382,13 @@ public String getFilename() {
375382
/**
376383
* executeTask
377384
*
378-
* @param taskId taskId
385+
* @param taskId taskId
386+
* @param language 1:English, 2:Chinese
379387
* @return CCreateTaskResult
380388
*/
381-
CPDFCreateTaskResult executeTask(String taskId) {
389+
CPDFCreateTaskResult executeTask(String taskId, Integer language) {
382390
log.info("Start executing task transfer, taskId: {}", taskId);
383-
String url = address.concat(CPDFConstant.API_V1_EXECUTE_TASK).concat("?taskId=").concat(taskId);
391+
String url = address.concat(CPDFConstant.API_V1_EXECUTE_TASK).concat("?taskId=").concat(taskId).concat("&language=").concat(String.valueOf(language));
384392
ResponseEntity<CPDFResult<CPDFCreateTaskResult>> response;
385393
ParameterizedTypeReference<CPDFResult<CPDFCreateTaskResult>> result = new ParameterizedTypeReference<CPDFResult<CPDFCreateTaskResult>>() {
386394
};
@@ -404,12 +412,13 @@ CPDFCreateTaskResult executeTask(String taskId) {
404412
/**
405413
* getTaskInfo
406414
*
407-
* @param taskId taskId
415+
* @param taskId taskId
416+
* @param language 1:English, 2:Chinese
408417
* @return CTaskInfoResult
409418
*/
410-
CPDFTaskInfoResult getTaskInfo(String taskId) {
419+
CPDFTaskInfoResult getTaskInfo(String taskId, Integer language) {
411420
log.info("Start to query the transfer status, taskId: {}", taskId);
412-
String url = address.concat(CPDFConstant.API_V1_TASK_INFO).concat("?taskId=").concat(taskId);
421+
String url = address.concat(CPDFConstant.API_V1_TASK_INFO).concat("?taskId=").concat(taskId).concat("&language=").concat(String.valueOf(language));
413422
ResponseEntity<CPDFResult<CPDFTaskInfoResult>> response;
414423
ParameterizedTypeReference<CPDFResult<CPDFTaskInfoResult>> result = new ParameterizedTypeReference<CPDFResult<CPDFTaskInfoResult>>() {
415424
};

0 commit comments

Comments
 (0)