ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit cbfea290de99c1ebc47c99eb358c82e04ce05d4b 1 parent bdb9f941

no message

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -26,8 +26,8 @@ import java.util.Map; @@ -26,8 +26,8 @@ import java.util.Map;
26 public abstract class AbstractWeixinPayService extends AbstractPayService { 26 public abstract class AbstractWeixinPayService extends AbstractPayService {
27 27
28 28
29 -// @Value("${wechat.notifyurl}")  
30 -// private String notifyURL; 29 + @Value("${wechat.notifyurl}")
  30 + private String notifyURL;
31 31
32 32
33 private final Logger logger = LoggerFactory.getLogger(getClass()); 33 private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -423,7 +423,7 @@ public abstract class AbstractWeixinPayService extends AbstractPayService { @@ -423,7 +423,7 @@ public abstract class AbstractWeixinPayService extends AbstractPayService {
423 //"X-Real-IP"可能出现"10.41.100.248, 120.197.194.125"这样的数据，微信支付会报错。需要截取一下 423 //"X-Real-IP"可能出现"10.41.100.248, 120.197.194.125"这样的数据，微信支付会报错。需要截取一下
424 //parameters.put(WeixinPayConfig.ApiConstants.SPBILL_CREATE_IP, WXUtils.getSingleIp(remoteIp)); 424 //parameters.put(WeixinPayConfig.ApiConstants.SPBILL_CREATE_IP, WXUtils.getSingleIp(remoteIp));
425 parameters.put(WeixinPayConfig.ApiConstants.SPBILL_CREATE_IP, ""); 425 parameters.put(WeixinPayConfig.ApiConstants.SPBILL_CREATE_IP, "");
426 -// parameters.put(WeixinPayConfig.ApiConstants.NOTIFY_URL, notifyURL); 426 + parameters.put(WeixinPayConfig.ApiConstants.NOTIFY_URL, notifyURL);
427 //parameters.put(WeixinPayConfig.ApiConstants.TRADE_TYPE, "APP"); 427 //parameters.put(WeixinPayConfig.ApiConstants.TRADE_TYPE, "APP");
428 parameters.put(WeixinPayConfig.ApiConstants.TRADE_TYPE, getTradeType()); 428 parameters.put(WeixinPayConfig.ApiConstants.TRADE_TYPE, getTradeType());
429 429
@@ -50,5 +50,5 @@ wechat.app.partnerid=1218934901 @@ -50,5 +50,5 @@ wechat.app.partnerid=1218934901
50 wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9 50 wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
51 wechat.app.appid=wx049fdaa3ba9cdd7a 51 wechat.app.appid=wx049fdaa3ba9cdd7a
52 52
53 -wechat.app.newnotifyurl=${wechat.app.newnotifyurl} 53 +wechat.notifyurl=${wechat.notifyurl}
54 alipay.notifyurl=${alipay.notifyurl} 54 alipay.notifyurl=${alipay.notifyurl}