diff --git a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java index f32d8805..e8cd912c 100644 --- a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java +++ b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/aslp/WPSOnlineReadOnlyASLP.java @@ -35,7 +35,7 @@ public class WPSOnlineReadOnlyASLP implements ASLP { WPS4Util.initAppInfo(YiliWpsConst.AK, YiliWpsConst.SK); String url = String.format("/api/preview/v1/files/%s/link?type=%s&preview_mode=%s&_w_third_sid=%s&_w_third_palId=%s&_w_third_queryFileId=%s&_w_third_fname=%s&_w_third_appId=%s&_w_third_repositoryName=%s&_w_third_groupValue=%s&_w_third_fileValue=%s&_w_third_filePreview=%s" - ,sourceDc.getFileValue(),fileType,"ordinary",sid,sourceDc.getGroupValue(),sourceDc.getFileValue(), URLEncoder.encode(sourceDc.getFileName()),sourceDc.getAppId(),sourceDc.getRepositoryName(),sourceDc.getGroupValue(),sourceDc.getFileValue(),"filePreview"); + ,sourceDc.getGroupValue(),fileType,"ordinary",sid,sourceDc.getGroupValue(),sourceDc.getFileValue(), URLEncoder.encode(sourceDc.getFileName()),sourceDc.getAppId(),sourceDc.getRepositoryName(),sourceDc.getGroupValue(),sourceDc.getFileValue(),"filePreview"); System.out.println(">>>>>>>>预览的url = " + url); Map headers = null; try { diff --git a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java index 0500d2af..b2e4178a 100644 --- a/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java +++ b/com.awspaas.user.apps.yiliwps/src/com/awspaas/user/apps/yiliwps/web/WpsWeb.java @@ -91,18 +91,21 @@ public class WpsWeb extends ActionWeb { e.printStackTrace(); } DCContext sourceDc; - if(UtilString.isEmpty(filePreview)){ - sourceDc = getFileDCContext(fileId); - }else{ - sourceDc = getFileDCContext(palId,appId,repositoryName,groupValue,fileValue,sourceFileName); - } JSONObject jsonObject = new JSONObject(); JSONObject file = new JSONObject(); JSONObject user = new JSONObject(); JSONObject user_acl = new JSONObject(); JSONObject watermark = new JSONObject(); - try { + if(UtilString.isEmpty(filePreview)){ + sourceDc = getFileDCContext(fileId); file.put("id", fileId.equals("")?"1":fileId); + }else{ + sourceDc = getFileDCContext(palId,appId,repositoryName,groupValue,fileValue,sourceFileName); + file.put("id", palId); + } + + try { + file.put("name", sourceFileName); file.put("version", Integer.parseInt(SDK.getRuleAPI().executeAtScript("@sequence("+palId+")"))); long fileSize = 0;