【BugFix】分享页面无法查看图片和视频

1. 需要调用getDocFileLinkForPreview 2. imgList页面未传入shareId 3. downloadImg接口需要支持非登录状态下调用(图片不能实时预览)
RainyGao-GitHub · Mar 18, 2024 · b73905b · b73905b
1 parent f7fd3e8
commit b73905b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 12 deletions.
diff --git a/WebRoot/web/imageViewer.html b/WebRoot/web/imageViewer.html
@@ -17,7 +17,7 @@
 	    if(!fileLink || fileLink != null)
 	    {
 		    var docInfo = getDocInfoFromRequestParamStr();	    
-	    	getDocFileLink(docInfo, showImage, showErrorMessage);    	
+		    getDocFileLinkForPreview(docInfo, showImage, showErrorMessage);    	
 	    }
 	    else
 	    {

diff --git a/WebRoot/web/imgListViewerForArt.html b/WebRoot/web/imgListViewerForArt.html
@@ -89,6 +89,7 @@
 			//console.log("getImgList doc:", doc);
 			if(isPictureFile(doc.name) == true)
 			{
+				doc.shareId = docInfo.shareId;
 				imgList.push(doc);
 				if(doc.docId == docInfo.docId)
 				{
@@ -99,15 +100,15 @@
     	console.log("getImgList imgList:", imgList);
     	console.log("getImgList index:", index);
 
-		getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+		getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
    	}
 
     function gotoPreviousDoc()
     {
     	if(index > 0)
     	{
     		index--;
-			getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+			getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
     	}
     }
 
@@ -116,7 +117,7 @@
     	if(index < imgList.length -1)
     	{
     		index++;
-			getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+			getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
     	}	    	
     }
 

diff --git a/WebRoot/web/imgListViewerForBootstrap.html b/WebRoot/web/imgListViewerForBootstrap.html
@@ -70,6 +70,7 @@
 			//console.log("getImgList doc:", doc);
 			if(isPictureFile(doc.name) == true)
 			{
+				doc.shareId = docInfo.shareId;
 				imgList.push(doc);
 				if(doc.docId == docInfo.docId)
 				{
@@ -80,15 +81,15 @@
     	console.log("getImgList imgList:", imgList);
     	console.log("getImgList index:", index);
 
-		getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+    	getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
    	}
 
     function gotoPreviousDoc()
     {
     	if(index > 0)
     	{
     		index--;
-			getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+    		getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
     	}
     }
 
@@ -97,7 +98,7 @@
     	if(index < imgList.length -1)
     	{
     		index++;
-			getDocFileLink(imgList[index], showImage, showErrorMessage);	    	
+    		getDocFileLinkForPreview(imgList[index], showImage, showErrorMessage);	    	
     	}	    	
     }
 

diff --git a/WebRoot/web/imgViewerForArt.html b/WebRoot/web/imgViewerForArt.html
@@ -32,7 +32,7 @@
     $("#img-div").css("margin-top","0");
 	console.log("imgViewerForArt.html => docInfo:",docInfo);
 
-	getDocFileLink(docInfo, showImage, showErrorMessage);    	
+	getDocFileLinkForPreview(docInfo, showImage, showErrorMessage);    	
 
     function showImage(fileLink)
     {

diff --git a/WebRoot/web/imgViewerForBootstrap.html b/WebRoot/web/imgViewerForBootstrap.html
@@ -20,7 +20,7 @@
 	    var fileLink = docInfo.fileLink;	    
 	    if(!fileLink || fileLink != null)
 	    {
-	    	getDocFileLink(docInfo, showImage, showErrorMessage);    	
+	    	getDocFileLinkForPreview(docInfo, showImage, showErrorMessage);    	
 	    }
 	    else
 	    {

diff --git a/WebRoot/web/videoViewer.html b/WebRoot/web/videoViewer.html
@@ -33,7 +33,7 @@
 		document.title = docInfo.name;
 
 		docInfo.fileSuffix = getFileSuffix(docInfo.name);
-	    getDocFileLink(docInfo, showVideo, showErrorMessage);    	
+	    getDocFileLinkForPreview(docInfo, showVideo, showErrorMessage);    	
 
 	    function showVideo(fileLink)
 	   	{

diff --git a/WebRoot/web/videoViewerForArt.html b/WebRoot/web/videoViewerForArt.html
@@ -49,7 +49,7 @@
 	console.log("videoViewerForArt.html => docInfo:",docInfo);
 
 	docInfo.fileSuffix = getFileSuffix(docInfo.name);
-    getDocFileLink(docInfo, showVideo, showErrorMessage);    	
+	getDocFileLinkForPreview(docInfo, showVideo, showErrorMessage);    	
 
     function showVideo(fileLink)
    	{

diff --git a/WebRoot/web/videoViewerForBootstrap.html b/WebRoot/web/videoViewerForBootstrap.html
@@ -29,7 +29,7 @@
 	    var fileLink = docInfo.fileLink;	    
 	    if(!fileLink || fileLink != null)
 	    {
-	    	getDocFileLink(docInfo, showVideo, showErrorMessage);    	
+	    	getDocFileLinkForPreview(docInfo, showVideo, showErrorMessage);    	
 	    }
 	    else
 	    {

diff --git a/src/com/DocSystem/controller/MyInterceptor.java b/src/com/DocSystem/controller/MyInterceptor.java
@@ -53,6 +53,7 @@ public class MyInterceptor extends HandlerInterceptorAdapter{
 		"Doc/downloadDocPrepare",
 		"Doc/downloadHistoryDocPrepare",
 		"Doc/downloadDoc",
+		"Doc/downloadImg",
 		"Doc/doGetTmpFile",
 		"Doc/DocToPDF",
 		"Doc/lockDoc",