diff --git a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java index 395b710..11d3014 100644 --- a/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java +++ b/src/main/java/cn/com/tenlion/systemcard/pojo/dtos/cardtemplateusearea/CardTemplateUseAreaDTO.java @@ -49,7 +49,7 @@ public class CardTemplateUseAreaDTO { @ApiModelProperty(name = "templateAreaFontCenter", value = "文字位置(快照)") private String templateAreaFontCenter; @ApiModelProperty(name = "templateAreaFontSize", value = "字体大小(快照)") - private String templateAreaFontSize; + private Integer templateAreaFontSize; @ApiModelProperty(name = "templateAreaFontBold", value = "文字加粗(快照)") private String templateAreaFontBold; @ApiModelProperty(name = "templateAreaFontFamily", value = "文字字体(快照)") @@ -215,11 +215,11 @@ public class CardTemplateUseAreaDTO { this.templateAreaFontCenter = templateAreaFontCenter; } - public String getTemplateAreaFontSize() { - return templateAreaFontSize == null ? "" : templateAreaFontSize.trim(); + public Integer getTemplateAreaFontSize() { + return templateAreaFontSize == null ? 0: templateAreaFontSize; } - public void setTemplateAreaFontSize(String templateAreaFontSize) { + public void setTemplateAreaFontSize(Integer templateAreaFontSize) { this.templateAreaFontSize = templateAreaFontSize; } diff --git a/src/main/java/cn/com/tenlion/systemcard/service/cardtemplateuse/impl/CardTemplateUseServiceImpl.java b/src/main/java/cn/com/tenlion/systemcard/service/cardtemplateuse/impl/CardTemplateUseServiceImpl.java index 27a79cf..231745f 100644 --- a/src/main/java/cn/com/tenlion/systemcard/service/cardtemplateuse/impl/CardTemplateUseServiceImpl.java +++ b/src/main/java/cn/com/tenlion/systemcard/service/cardtemplateuse/impl/CardTemplateUseServiceImpl.java @@ -95,7 +95,7 @@ public class CardTemplateUseServiceImpl extends DefaultBaseService implements IC static { try { - String viewButton = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAA4CAYAAAB6+vMDAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAAEnQAABJ0Ad5mH3gAAAKCSURBVHhe7dm9TvMwGIZhTorj4XSQ2FnZGZhYmZiQkJgZQGyVGKsyG+fHpW2cxq/j5EnLbeniQwolpb5jp/0u1uu1A1TqAC9ur4FZXd7fueevDwKEThUhAUKLACFFgJAiQEgRIKQIEFIECCkChBQBQooAIUWAkCJASBEgpAgQUgQIKQKE1EkE+PTuVs6517fIMZw2Aoy7+tz4M3ZH/nN4ca/+8avPx8ixcW6+/S/+eXdXkWON5tzu+yVyTGwJAfZNtnkMvcBvVcZpo2wobQD+Mnp4IsA9y14BH93DT/XibuoVcOX/Pf5Cj1DHufGBRI6NEuJLH9b4CXAKu9tu5/vcUOwxHA7bFtyeL+Wiaf/GnAuMAIuKTFrnHjCsjPbJiqknsPTqF4JKmfRwa5AZCAGWECbMf73pOdZZfbaPGRGPJZRE4Z42bKVN4PGtNRyzraz7wu/IGoUu4mz6AHdWvG1QueNIiIY3IIPjyKQ18XWfxzaSEHp4PgUCGF4BF2xRW3DfStfH+vMHmlgiK+5E9leqcls+AZYyY4A5H/2M2Sb/zlf4XtMjwFIyt2BzGNvtODGGrNDbN0oZw/YxTNk3ZLP7bytgvRJVk5VxTzh8nt3oqrit7z6bn88KMHFYP2Oc3H8KcG+rqgOccgWszBjg0Dnav4EAj2lfJOtICaNzn3Q2ASY+hgATWCc6Owxvki340AwBpl5IBLgwZ7ICJr8DJsCFOYcA21U86XkRYJ92kooMw4fKc27BxpEWiTFuAlyYE18Bzf+LQ4BABAFCigAhRYCQIkBIESCkCBBSBAgpAoQUAUKKACFFgJAiQEgRIKQIEFIECCkChMrl/R0BQqOK7/nrw/0CYJK8QSzpQMEAAAAASUVORK5CYII="; + String viewButton = "data:image/png;base64,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"; BASE64Decoder decoder = new sun.misc.BASE64Decoder(); byte[] bytes = decoder.decodeBuffer(viewButton.replaceAll("data:image/png;base64,", "")); ByteArrayInputStream bais = new ByteArrayInputStream(bytes);