提交 21a23095 authored 作者: fit2cloud-chenyw's avatar fit2cloud-chenyw

fix: 截屏只有半屏

上级 0c748454
...@@ -21,6 +21,11 @@ ...@@ -21,6 +21,11 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>ru.yandex.qatools.ashot</groupId>
<artifactId>ashot</artifactId>
<version>1.5.4</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
...@@ -255,6 +260,7 @@ ...@@ -255,6 +260,7 @@
<groupId>org.seleniumhq.selenium</groupId> <groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId> <artifactId>selenium-java</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -408,14 +414,14 @@ ...@@ -408,14 +414,14 @@
</fileset> </fileset>
</move> </move>
<move todir="src/main/resources/static/de-app"> <copy todir="src/main/resources/static/de-app">
<fileset dir="../../dataease-app/dist/build/h5"> <fileset dir="../../dataease-app/dist/build/h5">
<exclude name="*.html"/> <exclude name="*.html"/>
</fileset> </fileset>
</move> </copy>
<move file="../../dataease-app/dist/build/h5/index.html" tofile="src/main/resources/templates/app.html" /> <copy file="../../dataease-app/dist/build/h5/index.html" tofile="src/main/resources/templates/app.html" />
</target> </target>
......
...@@ -153,7 +153,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { ...@@ -153,7 +153,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
private String panelUrl(String panelId) { private String panelUrl(String panelId) {
String domain = ServletUtils.domain(); String domain = ServletUtils.domain();
return domain + "/#/preview/" + panelId; return domain + "/#/previewScreenShot/" + panelId + "/true";
} }
} }
...@@ -80,7 +80,7 @@ public class XEmailTaskServer { ...@@ -80,7 +80,7 @@ public class XEmailTaskServer {
String panelId = request.getPanelId(); String panelId = request.getPanelId();
String content = request.getContent(); String content = request.getContent();
String url = ServletUtils.domain() + "/#/preview/" + panelId; String url = ServletUtils.domain() + "/#/previewScreenShot/" + panelId + "/true";
String token = ServletUtils.getToken(); String token = ServletUtils.getToken();
String fileId = null; String fileId = null;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论