fix: NPE without notifyUrl

Closes  #59
This commit is contained in:
felord
2022-01-13 14:38:11 +08:00
parent 3dd7c67f9a
commit 564bc4c445

View File

@@ -29,6 +29,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import org.springframework.http.RequestEntity; import org.springframework.http.RequestEntity;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder;
import java.net.URI; import java.net.URI;
@@ -281,7 +282,10 @@ public class WechatDirectPayApi extends AbstractApi {
.build() .build()
.toUri(); .toUri();
WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3(); WechatPayProperties.V3 v3 = this.wechatMetaBean().getV3();
params.setNotifyUrl(v3.getDomain().concat(params.getNotifyUrl())); String notifyUrl = params.getNotifyUrl();
if (StringUtils.hasText(notifyUrl)) {
params.setNotifyUrl(v3.getDomain().concat(notifyUrl));
}
return Post(uri, params); return Post(uri, params);
})) }))
.consumer(wechatResponseEntity::convert) .consumer(wechatResponseEntity::convert)