Authored by mali

Merge branch 'test6.9.17' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.17

... ... @@ -18,10 +18,10 @@ public class WeixinPayConfig {
/**微信支付UFO商户号正式**/
public static final String APP_ID_UFO_REAL = "wx75b18b98bdd92bbc";
public static final String PARTNER_ID = "1516774631";
public static final String WECHAT_PAY_UFOREAL_APP_PARTNER_CERT = "/certs/wechatpay/apiclient_cert_ufo_real_app.p12";
public static final String WECHAT_PAY_UFOREAL_APP_PARTNER_CERT = "/.cert/wechatpay/apiclient_cert_ufo.p12";
public interface Miniapp{
String APP_PARTNER_CERT = "/certs/wechatpay/apiclient_cert_wx_miniapp.p12";
String APP_PARTNER_CERT = "/.cert/wechatpay/apiclient_cert_ufo.p12";
String APPID = "wxc677c88385762287";
String MALL_ID = PARTNER_ID;
}
... ...
... ... @@ -148,7 +148,7 @@
<dependency>
<groupId>com.yoho.core</groupId>
<artifactId>security</artifactId>
<version>1.6.5-SNAPSHOT</version>
<version>1.6.8-SNAPSHOT</version>
</dependency>
</dependencies>
... ...