Ver código fonte

Merge tag 'refs/tags/jenkins-back-end-3316' into SiChuan

release
release_toaliyun_real
Stormeye Wu 6 anos atrás
pai
commit
1c49ce9e36
4 arquivos alterados com 8 adições e 5 exclusões
  1. +2
    -2
      mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
  2. +2
    -2
      mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java
  3. +3
    -0
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 2
- 2
mallinkBApi/src/main/java/com/iformall/aop/RedisCacheAspect.java Ver arquivo

@@ -95,9 +95,9 @@ public class RedisCacheAspect {
// 接口路径 reqPath => /api/xxx // 接口路径 reqPath => /api/xxx
String reqPath = requestUrl.substring(requestUrl.indexOf("/api/")); String reqPath = requestUrl.substring(requestUrl.indexOf("/api/"));
if (cache.md5()) { 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 { } 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 { } else {
redisKey = cache.key(); redisKey = cache.key();


+ 2
- 2
mallinkCApi/src/main/java/com/iformall/aop/RedisCacheAspect.java Ver arquivo

@@ -92,9 +92,9 @@ public class RedisCacheAspect {
// 接口路径 reqPath => /api/xxx // 接口路径 reqPath => /api/xxx
String reqPath = requestUrl.substring(requestUrl.indexOf("/api/")); String reqPath = requestUrl.substring(requestUrl.indexOf("/api/"));
if (cache.md5()) { 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 { } 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 { } else {
redisKey = cache.key(); redisKey = cache.key();


+ 3
- 0
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Ver arquivo

@@ -78,6 +78,9 @@ public class PosServiceImpl implements PosService {
if (StringUtils.isBlank(phone)) { if (StringUtils.isBlank(phone)) {
errParam(WxPayConstant.PHONE); errParam(WxPayConstant.PHONE);
} }
if (!StringUtils.isNumeric(phone)) {
errParam(WxPayConstant.PHONE);
}
if (StringUtils.isBlank(password)) { if (StringUtils.isBlank(password)) {
errParam(WxPayConstant.PASSWORD); errParam(WxPayConstant.PASSWORD);
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Ver arquivo

@@ -169,7 +169,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {


@Override @Override
public void postpone(WxCouponPassword wxCouponPassword) { public void postpone(WxCouponPassword wxCouponPassword) {
wxCouponPasswordMapper.updatePostpone(wxCouponPassword);
} }


/* /*


Carregando…
Cancelar
Salvar