You've already forked FrameTour-BE
refactor(printer): 修改水印配置URL处理逻辑
- 将水印图片URL配置从列表类型改为字符串类型 - 使用Collections.singletonList包装单个URL为列表 - 简化了水印配置的构建过程 - 保持了原有的水印功能实现 - 优化了配置项的数据结构设计
This commit is contained in:
@@ -1084,8 +1084,8 @@ public class PrinterServiceImpl implements PrinterService {
|
|||||||
|
|
||||||
String scenicText = scenicConfig.getString("print_watermark_scenic_text", "");
|
String scenicText = scenicConfig.getString("print_watermark_scenic_text", "");
|
||||||
String dateFormat = scenicConfig.getString("print_watermark_dt_format", "yyyy.MM.dd");
|
String dateFormat = scenicConfig.getString("print_watermark_dt_format", "yyyy.MM.dd");
|
||||||
List<String> printWatermarkPUrlList = scenicConfig.getList("print_watermark_p_url", String.class);
|
String printWatermarkPUrl = scenicConfig.getString("print_watermark_p_url", null);
|
||||||
List<String> printWatermarkLUrlList = scenicConfig.getList("print_watermark_l_url", String.class);
|
String printWatermarkLUrl = scenicConfig.getString("print_watermark_l_url", null);
|
||||||
|
|
||||||
return WatermarkConfig.builder()
|
return WatermarkConfig.builder()
|
||||||
.watermarkType(watermarkType)
|
.watermarkType(watermarkType)
|
||||||
@@ -1096,8 +1096,8 @@ public class PrinterServiceImpl implements PrinterService {
|
|||||||
.edgeEnabled(true)
|
.edgeEnabled(true)
|
||||||
.qrcodeFile(qrCodeFile)
|
.qrcodeFile(qrCodeFile)
|
||||||
.scale(scale)
|
.scale(scale)
|
||||||
.printWatermarkPUrlList(printWatermarkPUrlList)
|
.printWatermarkPUrlList(Collections.singletonList(printWatermarkPUrl))
|
||||||
.printWatermarkLUrlList(printWatermarkLUrlList)
|
.printWatermarkLUrlList(Collections.singletonList(printWatermarkLUrl))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user