Authored by LUOXC

Merge branch 'gray' into test6.9.17

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