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(); 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); } 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); } /*