Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: hide the share link created by schedule task #1715

Merged
merged 2 commits into from
Jul 22, 2022
Merged

fix: hide the share link created by schedule task #1715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeb37f0
fix: hide the share link created by schedule task
tianlu-root Jul 22, 2022
88174fd
feat: add database rollback script for beta.2 and beta.3
tianlu-root Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/datart/core/mappers/ext/ShareMapperExt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
public interface ShareMapperExt extends ShareMapper {

@Select({"<script>",
"SELECT * FROM `share` where viz_id = #{vizId} ORDER BY create_time",
"SELECT * FROM `share` where viz_id = #{vizId} AND create_by &lt;&gt; 'SCHEDULER' ORDER BY create_time",
"</script>"})
List<Share> selectByViz(String vizId);

Expand Down
4 changes: 3 additions & 1 deletion server/src/main/java/datart/server/service/AttachmentService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

public interface AttachmentService {

String SHARE_USER = "SCHEDULER";

File getFile(DownloadCreateParam downloadCreateParam, String path, String fileName) throws Exception;

default String generateFileName(String path, String fileName, AttachmentType attachmentType) {
Expand All @@ -36,7 +38,7 @@ static AttachmentService matchAttachmentService(AttachmentType type) {
case PDF:
return Application.getBean(AttachmentPdfServiceImpl.class);
default:
Exceptions.msg("unsupported download type."+type);
Exceptions.msg("unsupported download type." + type);
return null;
}
}
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/datart/server/service/impl/AttachmentImageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ public File getFile(DownloadCreateParam downloadCreateParam, String path, String
shareCreateParam.setExpiryDate(DateUtils.addHours(new Date(), 1));
shareCreateParam.setAuthenticationMode(ShareAuthenticationMode.NONE);
shareCreateParam.setRowPermissionBy(ShareRowPermissionBy.CREATOR);
ShareToken share = shareService.createShare(securityManager.getCurrentUser().getId(), shareCreateParam);
ShareToken share = shareService.createShare(SHARE_USER, shareCreateParam);

String url = Application.getWebRootURL()+"/"+shareCreateParam.getVizType().getShareRoute()+"/"+share.getId()+"?eager=true&type="+share.getAuthenticationMode();
String url = Application.getWebRootURL() + "/" + shareCreateParam.getVizType().getShareRoute() + "/" + share.getId() + "?eager=true&type=" + share.getAuthenticationMode();
log.info("created share url: {} ", url);
File target = WebUtils.screenShot2File(url, FileUtils.withBasePath(path), downloadCreateParam.getImageWidth());

path = generateFileName(path,fileName,attachmentType);
path = generateFileName(path, fileName, attachmentType);
File file = new File(path);
target.renameTo(file);
log.info("create image file complete.");
Expand Down
7 changes: 4 additions & 3 deletions server/src/main/java/datart/server/service/impl/AttachmentPdfServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ public File getFile(DownloadCreateParam downloadCreateParam, String path, String
shareCreateParam.setExpiryDate(DateUtils.addHours(new Date(), 1));
shareCreateParam.setAuthenticationMode(ShareAuthenticationMode.NONE);
shareCreateParam.setRowPermissionBy(ShareRowPermissionBy.CREATOR);
ShareToken share = shareService.createShare(securityManager.getCurrentUser().getId(), shareCreateParam);
ShareToken share = shareService.createShare(SHARE_USER, shareCreateParam);

String url = Application.getWebRootURL()+"/"+shareCreateParam.getVizType().getShareRoute()+"/"+share.getId()+"?eager=true&type="+share.getAuthenticationMode();
String url = Application.getWebRootURL() + "/" + shareCreateParam.getVizType().getShareRoute() + "/" + share.getId() + "?eager=true&type=" + share.getAuthenticationMode();
log.info("share url {} ", url);

File imageFile = WebUtils.screenShot2File(url, FileUtils.withBasePath(path), downloadCreateParam.getImageWidth());
File file = new File(generateFileName(path,fileName,attachmentType));
File file = new File(generateFileName(path, fileName, attachmentType));
createPDFFromImage(file.getPath(), imageFile.getPath());

log.info("create pdf file complete.");
Expand All @@ -74,6 +74,7 @@ public File getFile(DownloadCreateParam downloadCreateParam, String path, String

/**
* 使用Apache pdfbox将图片生成pdf
*
* @param pdfPath
* @param imagePath
* @throws Exception
Expand Down
13 changes: 13 additions & 0 deletions server/src/main/resources/db/migration/R2022.02.19__1.0.0.beta.2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
SET NAMES utf8;
SET FOREIGN_KEY_CHECKS = 0;

-- ----------------------------
-- Table structure for source_schemas
-- ----------------------------
DROP TABLE IF EXISTS `source_schemas`;

ALTER TABLE `folder`
DROP COLUMN `sub_type`,
DROP COLUMN `avatar`;

SET FOREIGN_KEY_CHECKS = 1;
22 changes: 22 additions & 0 deletions server/src/main/resources/db/migration/R2022.03.14__1.0.0.beta.3.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
SET FOREIGN_KEY_CHECKS = 0;

-- ----------------------------
-- Table structure for share
-- ----------------------------
DROP TABLE IF EXISTS `share`;

ALTER TABLE `source`
DROP COLUMN `parent_id` ,
DROP COLUMN `is_folder` ,
DROP COLUMN `index`;

DROP PROCEDURE IF EXISTS drop_source_prj_index;


ALTER TABLE `variable`
DROP COLUMN `source_id`,
DROP COLUMN `format`;
ALTER TABLE `variable`
DROP INDEX `source_id`;

SET FOREIGN_KEY_CHECKS = 1;