Commit 4ff1c877 by wilse

fix

parent 8b7eda01
...@@ -10,14 +10,11 @@ import lombok.SneakyThrows; ...@@ -10,14 +10,11 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.util.ResourceUtils; import org.springframework.util.ResourceUtils;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.validation.constraints.AssertTrue;
import java.io.File;
import java.util.*; import java.util.*;
/** /**
...@@ -55,7 +52,7 @@ public class WxPayConfig { ...@@ -55,7 +52,7 @@ public class WxPayConfig {
payConfig.setMchKey(StringUtils.trimToNull(config.getMchKey())); payConfig.setMchKey(StringUtils.trimToNull(config.getMchKey()));
//payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId())); //payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
//payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId())); //payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
payConfig.setKeyPath(StringUtils.join(ResourceUtils.CLASSPATH_URL_PREFIX,"cert/apiclient_cert.p12")); payConfig.setKeyPath(StringUtils.join(ResourceUtils.CLASSPATH_URL_PREFIX, "cert/", brandId, "/apiclient_cert.p12"));
// 可以指定是否使用沙箱环境 // 可以指定是否使用沙箱环境
payConfig.setUseSandboxEnv(false); payConfig.setUseSandboxEnv(false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment