Compare commits
No commits in common. "ea288188e870b18f292fd7e45ea94c851c7de78a" and "d0af0912fb0103e1179ad89030488b16160396ef" have entirely different histories.
ea288188e8
...
d0af0912fb
|
@ -137,13 +137,6 @@ public class GlobalExceptionHandler {
|
||||||
assert fieldError != null; // 断言,避免告警
|
assert fieldError != null; // 断言,避免告警
|
||||||
return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage()));
|
return CommonResult.error(BAD_REQUEST.getCode(), String.format("请求参数不正确:%s", fieldError.getDefaultMessage()));
|
||||||
}
|
}
|
||||||
@ExceptionHandler(IllegalArgumentException.class)
|
|
||||||
public CommonResult<?> IllegalArgumentExceptionHandler(BindException ex) {
|
|
||||||
log.warn("[IllegalArgumentException]", ex);
|
|
||||||
FieldError fieldError = ex.getFieldError();
|
|
||||||
assert fieldError != null; // 断言,避免告警
|
|
||||||
return CommonResult.error(INTERNAL_SERVER_ERROR.getCode(), fieldError.getDefaultMessage());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 处理 Validator 校验不通过产生的异常
|
* 处理 Validator 校验不通过产生的异常
|
||||||
|
|
|
@ -112,11 +112,8 @@ public class MemberUserApiImpl implements MemberUserApi {
|
||||||
public PromoterDTO getPromoterDOByUserId(Long userId) {
|
public PromoterDTO getPromoterDOByUserId(Long userId) {
|
||||||
PromoterDTO promoterDTO = new PromoterDTO();
|
PromoterDTO promoterDTO = new PromoterDTO();
|
||||||
PromoterDO promoterDO = promoterService.getPromoterDOByUserId(userId);
|
PromoterDO promoterDO = promoterService.getPromoterDOByUserId(userId);
|
||||||
if(promoterDO != null){
|
promoterDTO.setDeptId(promoterDO.getDeptId());
|
||||||
promoterDTO.setDeptId(promoterDO.getDeptId());
|
promoterDO.setId(promoterDO.getId());
|
||||||
promoterDO.setId(promoterDO.getId());
|
|
||||||
return promoterDTO;
|
|
||||||
}
|
|
||||||
return promoterDTO;
|
return promoterDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -220,11 +220,11 @@ yudao:
|
||||||
- eb_express
|
- eb_express
|
||||||
- eb_store_order_status
|
- eb_store_order_status
|
||||||
sms-code: # 短信验证码相关的配置项
|
sms-code: # 短信验证码相关的配置项
|
||||||
expire-times: 5m
|
expire-times: 10m
|
||||||
send-frequency: 10m
|
send-frequency: 1m
|
||||||
send-maximum-quantity-per-day: 10
|
send-maximum-quantity-per-day: 10
|
||||||
begin-code: 100000 # 这里配置 9999 的原因是,测试方便。
|
begin-code: 9999 # 这里配置 9999 的原因是,测试方便。
|
||||||
end-code: 999999 # 这里配置 9999 的原因是,测试方便。
|
end-code: 9999 # 这里配置 9999 的原因是,测试方便。
|
||||||
trade:
|
trade:
|
||||||
order:
|
order:
|
||||||
app-id: 1 # 商户编号
|
app-id: 1 # 商户编号
|
||||||
|
|
Loading…
Reference in New Issue