水印继续修改

pom.xml

@@ -9,7 +9,7 @@
 		<relativePath />
 	</parent>
 	<artifactId>platomix-gmetry-pdf</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 
 	<dependencies>
 		<dependency>

src/main/java/org/springblade/dto/ScreenShotParam.java

@@ -31,8 +31,8 @@ public class ScreenShotParam implements Serializable{
 	//水印说明
 	private String text;
 	
-	//水印参数
-	private Integer watermark = 1;
+	//水印参数[默认：无水印]
+	private Integer watermark = 0;
 	
 	private List<Site> site;
 	

src/main/java/org/springblade/handler/PlayWrightHandler.java

@@ -7,6 +7,7 @@ import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import cn.hutool.core.date.StopWatch;
@@ -59,8 +60,8 @@ public class PlayWrightHandler {
 			// 从池子中获取browserContext
 			browserContext = browserContextPool.borrowObject();
 			String id = site.getId();
-			log.info("[{}]开始请求,domain={},width={},height={},watermark={}", id, playwrightProperties.getWebsiteDomain(),
-					site.width(), site.height(), param.getText());
+			log.info("[{}]开始请求,domain={},width={},height={},watermarkStatus={},watermark={}", id, playwrightProperties.getWebsiteDomain(),
+					site.width(), site.height(), param.getWatermark(), param.getText());
 			Map<String, String> headers = new HashMap<>();
 			headers.put("Blade-Auth", param.getToken());
 			browserContext.setExtraHTTPHeaders(headers);
@@ -69,7 +70,7 @@ public class PlayWrightHandler {
 			Page page = browserContext.pages().get(0);
 			page.setViewportSize(site.width(), site.height());
 			String url = String.format("%s?watermark=%s&text=%s",
-					playwrightProperties.getWebsiteDomain() + site.getUrl(), param.getWatermark(), param.getText());
+					playwrightProperties.getWebsiteDomain() + site.getUrl(), param.getWatermark(), Optional.ofNullable(param.getText()).orElse(""));
 			page.onPageError(error -> log.info("[{}]页面出错了|{}", url, error));
 			page.onRequestFailed(request -> log.info("[{}]请求地址出错了|method={},error={}", request.url(), request.method(), request.failure()));
 			stopWatch.stop();