From 6efe15788c0f227b704b3c3443916c8aae0d3986 Mon Sep 17 00:00:00 2001 From: shenghuadun Date: Thu, 21 Jul 2022 06:45:46 +0000 Subject: [PATCH] =?UTF-8?q?!43=20=E6=B0=B4=E5=8D=B0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=8D=E7=9F=A5=E9=81=93=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=E7=9A=84=E9=97=AE=E9=A2=98=20*=20=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E9=99=A4=E6=96=87=E6=9C=AC=E5=A4=96=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=AF=E9=80=9A=E8=BF=87url=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E4=BC=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../keking/web/filter/AttributeSetFilter.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java b/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java index 5c5667bd..5ce2926b 100644 --- a/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java +++ b/server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java @@ -48,15 +48,24 @@ public class AttributeSetFilter implements Filter { private void setWatermarkAttribute(ServletRequest request) { String watermarkTxt = request.getParameter("watermarkTxt"); request.setAttribute("watermarkTxt", watermarkTxt != null ? watermarkTxt : WatermarkConfigConstants.getWatermarkTxt()); - request.setAttribute("watermarkXSpace", WatermarkConfigConstants.getWatermarkXSpace()); - request.setAttribute("watermarkYSpace", WatermarkConfigConstants.getWatermarkYSpace()); - request.setAttribute("watermarkFont", WatermarkConfigConstants.getWatermarkFont()); - request.setAttribute("watermarkFontsize", WatermarkConfigConstants.getWatermarkFontsize()); - request.setAttribute("watermarkColor", WatermarkConfigConstants.getWatermarkColor()); - request.setAttribute("watermarkAlpha", WatermarkConfigConstants.getWatermarkAlpha()); - request.setAttribute("watermarkWidth", WatermarkConfigConstants.getWatermarkWidth()); - request.setAttribute("watermarkHeight", WatermarkConfigConstants.getWatermarkHeight()); - request.setAttribute("watermarkAngle", WatermarkConfigConstants.getWatermarkAngle()); + String watermarkXSpace = request.getParameter("watermarkXSpace"); + request.setAttribute("watermarkXSpace", watermarkXSpace != null ? watermarkXSpace : WatermarkConfigConstants.getWatermarkXSpace()); + String watermarkYSpace = request.getParameter("watermarkYSpace"); + request.setAttribute("watermarkYSpace", watermarkYSpace != null ? watermarkYSpace : WatermarkConfigConstants.getWatermarkYSpace()); + String watermarkFont = request.getParameter("watermarkFont"); + request.setAttribute("watermarkFont", watermarkFont != null ? watermarkFont : WatermarkConfigConstants.getWatermarkFont()); + String watermarkFontsize = request.getParameter("watermarkFontsize"); + request.setAttribute("watermarkFontsize", watermarkFontsize != null ? watermarkFontsize : WatermarkConfigConstants.getWatermarkFontsize()); + String watermarkColor = request.getParameter("watermarkColor"); + request.setAttribute("watermarkColor", watermarkColor != null ? watermarkColor : WatermarkConfigConstants.getWatermarkColor()); + String watermarkAlpha = request.getParameter("watermarkAlpha"); + request.setAttribute("watermarkAlpha", watermarkAlpha != null ? watermarkAlpha : WatermarkConfigConstants.getWatermarkAlpha()); + String watermarkWidth = request.getParameter("watermarkWidth"); + request.setAttribute("watermarkWidth", watermarkWidth != null ? watermarkWidth : WatermarkConfigConstants.getWatermarkWidth()); + String watermarkHeight = request.getParameter("watermarkHeight"); + request.setAttribute("watermarkHeight", watermarkHeight != null ? watermarkHeight : WatermarkConfigConstants.getWatermarkHeight()); + String watermarkAngle = request.getParameter("watermarkAngle"); + request.setAttribute("watermarkAngle", watermarkAngle != null ? watermarkAngle : WatermarkConfigConstants.getWatermarkAngle()); } @Override