From 40278fffe784844d8ed8c8a8131296ff872b94e0 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 18 May 2020 08:05:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8D=A1=E5=AF=86=E5=BB=B6=E6=9C=9F][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/service/impl/WxCouponPasswordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 44aeebedb..51af6bb87 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -169,7 +169,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { @Override public void postpone(WxCouponPassword wxCouponPassword) { - + wxCouponPasswordMapper.updatePostpone(wxCouponPassword); } /* From 2da33c45cf436a2d5d5c7b4b40dd276b7d048cd9 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 18 May 2020 09:23:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=B8=9C=E8=BD=AF=E6=A3=80=E6=9F=A5][?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/impl/PosServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index 7c108e969..466433b6b 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -78,6 +78,9 @@ public class PosServiceImpl implements PosService { if (StringUtils.isBlank(phone)) { errParam(WxPayConstant.PHONE); } + if (!StringUtils.isNumeric(phone)) { + errParam(WxPayConstant.PHONE); + } if (StringUtils.isBlank(password)) { errParam(WxPayConstant.PASSWORD); } From 88de7a9a566f5fd8a1818320aa466dd08eb6a4c3 Mon Sep 17 00:00:00 2001 From: bruce Date: Mon, 18 May 2020 13:28:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=E7=BC=93=E5=AD=98key?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0token=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 4 ++-- .../src/main/java/com/iformall/aop/RedisCacheAspect.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index 463eb0a0a..97b844d1a 100644 --- a/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -95,9 +95,9 @@ public class RedisCacheAspect { // 接口路径 reqPath => /api/xxx String reqPath = requestUrl.substring(requestUrl.indexOf("/api/")); if (cache.md5()) { - redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, HashUtil.md5(StringUtils.join(args, DELIMITER_PARAMS))); + redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, HashUtil.md5(StringUtils.join(token,args, DELIMITER_PARAMS))); } else { - redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, StringUtils.join(args, DELIMITER_PARAMS)); + redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, StringUtils.join(token,args, DELIMITER_PARAMS)); } } else { redisKey = cache.key(); diff --git a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java index a451b2cac..366b521be 100644 --- a/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java +++ b/mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java @@ -92,9 +92,9 @@ public class RedisCacheAspect { // 接口路径 reqPath => /api/xxx String reqPath = requestUrl.substring(requestUrl.indexOf("/api/")); if (cache.md5()) { - redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, HashUtil.md5(StringUtils.join(args, DELIMITER_PARAMS))); + redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, HashUtil.md5(StringUtils.join(token,args, DELIMITER_PARAMS))); } else { - redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, StringUtils.join(args, DELIMITER_PARAMS)); + redisKey = StringUtils.join(reqPath, DELIMITER_KEY, tenantId, DELIMITER_KEY, StringUtils.join(token,args, DELIMITER_PARAMS)); } } else { redisKey = cache.key();