fix: download image url route

Author: xiaohuangdou666

security/src/main/java/datart/security/base/ResourceType.java

@@ -5,16 +5,28 @@ public enum ResourceType {
     SOURCE,
     VIEW,
 
-    DATACHART,
+    DATACHART("shareChart"),
     WIDGET,
-    DASHBOARD,
+    DASHBOARD("shareDashboard"),
     FOLDER,
-    STORYBOARD,
+    STORYBOARD("shareStoryPlayer"),
     VIZ,
 
     SCHEDULE,
 
     ROLE,
-    USER,
+    USER;
 
+    private String shareRoute;
+
+    ResourceType() {
+    }
+
+    ResourceType(String shareRoute) {
+        this.shareRoute = shareRoute;
+    }
+
+    public String getShareRoute() {
+        return shareRoute;
+    }
 }

server/src/main/java/datart/server/service/impl/AttachmentImageServiceImpl.java

@@ -11,6 +11,7 @@
 import datart.server.base.params.DownloadCreateParam;
 import datart.server.base.params.ShareCreateParam;
 import datart.server.base.params.ShareToken;
+import datart.server.base.params.ViewExecuteParam;
 import datart.server.service.AttachmentService;
 import datart.server.service.FolderService;
 import datart.server.service.ShareService;
@@ -41,7 +42,9 @@ public AttachmentImageServiceImpl(DatartSecurityManager datartSecurityManager, S
 
     @Override
     public File getFile(DownloadCreateParam downloadCreateParam, String path, String fileName) throws Exception {
-        String folderId = downloadCreateParam.getDownloadParams().size()>0 ? downloadCreateParam.getDownloadParams().get(0).getVizId() : "";
+        ViewExecuteParam viewExecuteParam = downloadCreateParam.getDownloadParams().size() > 0 ? downloadCreateParam.getDownloadParams().get(0) : new ViewExecuteParam();
+        String folderId = viewExecuteParam.getVizId();
+        ResourceType vizType = viewExecuteParam.getVizType();
         Folder folder = folderService.retrieve(folderId);
         ShareCreateParam shareCreateParam = new ShareCreateParam();
         shareCreateParam.setVizId(folder.getRelId());
@@ -51,7 +54,7 @@ public File getFile(DownloadCreateParam downloadCreateParam, String path, String
         shareCreateParam.setRowPermissionBy(ShareRowPermissionBy.CREATOR);
         ShareToken share = shareService.createShare(securityManager.getCurrentUser().getId(), shareCreateParam);
 
-        String url = Application.getWebRootURL() + "/share/"+share.getId()+"?type="+share.getAuthenticationMode();
+        String url = Application.getWebRootURL()+"/"+vizType.getShareRoute()+"/"+share.getId()+"?type="+share.getAuthenticationMode();
         log.info("created share url: {} ", url);
         int width = downloadCreateParam.getImageWidth()<=0 ? 1920 : downloadCreateParam.getImageWidth();
         File target = WebUtils.screenShot2File(url, path, width);

server/src/main/java/datart/server/service/impl/AttachmentPdfServiceImpl.java

@@ -1,6 +1,8 @@
 package datart.server.service.impl;
 
 import datart.core.base.consts.AttachmentType;
+import datart.core.base.consts.ShareAuthenticationMode;
+import datart.core.base.consts.ShareRowPermissionBy;
 import datart.core.common.Application;
 import datart.core.common.WebUtils;
 import datart.core.entity.Folder;
@@ -9,6 +11,7 @@
 import datart.server.base.params.DownloadCreateParam;
 import datart.server.base.params.ShareCreateParam;
 import datart.server.base.params.ShareToken;
+import datart.server.base.params.ViewExecuteParam;
 import datart.server.service.AttachmentService;
 import datart.server.service.FolderService;
 import datart.server.service.ShareService;
@@ -44,15 +47,19 @@ public AttachmentPdfServiceImpl(DatartSecurityManager securityManager, ShareServ
 
     @Override
     public File getFile(DownloadCreateParam downloadCreateParam, String path, String fileName) throws Exception {
-        String folderId = downloadCreateParam.getDownloadParams().size()>0 ? downloadCreateParam.getDownloadParams().get(0).getVizId() : "";
+        ViewExecuteParam viewExecuteParam = downloadCreateParam.getDownloadParams().size() > 0 ? downloadCreateParam.getDownloadParams().get(0) : new ViewExecuteParam();
+        String folderId = viewExecuteParam.getVizId();
+        ResourceType vizType = viewExecuteParam.getVizType();
         Folder folder = folderService.retrieve(folderId);
         ShareCreateParam shareCreateParam = new ShareCreateParam();
         shareCreateParam.setVizId(folder.getRelId());
         shareCreateParam.setVizType(ResourceType.valueOf(folder.getRelType()));
         shareCreateParam.setExpiryDate(DateUtils.addHours(new Date(), 1));
+        shareCreateParam.setAuthenticationMode(ShareAuthenticationMode.NONE);
+        shareCreateParam.setRowPermissionBy(ShareRowPermissionBy.CREATOR);
         ShareToken share = shareService.createShare(securityManager.getCurrentUser().getId(), shareCreateParam);
 
-        String url = Application.getWebRootURL() + "/share/"+share.getId()+"?type="+share.getAuthenticationMode();
+        String url = Application.getWebRootURL()+"/"+vizType.getShareRoute()+"/"+share.getId()+"?type="+share.getAuthenticationMode();
         log.info("share url {} ", url);
 
         downloadCreateParam.setImageWidth(600);