修改配置

iamberry-common-tool/src/main/java/com/iamberry/wechat/tools/NameUtils.java

@@ -159,34 +159,32 @@ public class NameUtils {
      */
 
 	/** 公众号账户信息:水时代 */
-//	public final static String pubNo = "gh_c73446c8ce91";// 微信号
-//	public final static String appId = "wxc71b789fad06a2d7";// 应用ID
-//	public final static String token = "weixin";// token
-//	public final static String appSecret = "8a90e3ab0e2db7772f5f64e7ed2f4b98";// 应用密钥
-//	public final static String partner = "1321590501";// 微信支付商户号
-    
+	/*public final static String pubNo = "gh_c73446c8ce91";// 微信号
+	public final static String appId = "wxc71b789fad06a2d7";// 应用ID
+	public final static String token = "weixin";// token
+	public final static String appSecret = "8a90e3ab0e2db7772f5f64e7ed2f4b98";// 应用密钥
+	public final static String partner = "1321590501";// 微信支付商户号*/
+
+	/** 水时代公众号商户信息 */
+	/*public final static String partnerkey = "cdb9075e7ecad945ba788bc5aedM212B";// 财付通初始密码
+	public final static String charset = "UTF-8"; // 支付编码
+	public final static String KEYSTORE_FILE = "E:/apiclient_cert.p12"; // 支付API安全文件FILE位置，但是现在保存到/resource/apiclient_cert.p12
+	public final static String KEYSTORE_PASSWORD = "124022090"; // 支付API安全文件密码
+	public final static String ipAddress = "120.25.79.106"; // ip地址*/
+
+
 	/** 公众号账户信息:爱贝源 */
 	public final static String pubNo = "gh_487d0dbf8e30";// 微信号
 	public final static String appId = "wx09aa7519c4e5b360";// 应用ID
 	public final static String token = "weixin";// token
 	public final static String appSecret = "c006d5a6af80b5291265a1364fd17edc";// 应用密钥
 	public final static String partner = "1340351501";// 微信支付商户号
-
 	/** 公众号商户信息 */
-	public final static String partnerkey = "cdb9075e7ecad945ba788bc5aedM212B";// 财付通初始密码
-	public final static String charset = "UTF-8"; // 支付编码
-	public final static String KEYSTORE_FILE = "E:/apiclient_cert.p12"; // 支付API安全文件FILE位置，但是现在保存到/resource/apiclient_cert.p12
-	public final static String KEYSTORE_PASSWORD = "124022090"; // 支付API安全文件密码
-	public final static String ipAddress = "120.25.79.106"; // ip地址
-
-//	
-//	/** 公众号商户信息 */
-	/*public final static String partner = "1340351501";// 微信支付商户号
 	public final static String partnerkey = "8a90e3ab0e2db7772f5f64e7edwechat";// 财付通初始密码
 	public final static String charset = "UTF-8"; // 支付编码
 	public final static String KEYSTORE_FILE = "E:/apiclient_cert.p12"; // 支付API安全文件FILE位置，但是现在保存到/resource/apiclient_cert.p12
 	public final static String KEYSTORE_PASSWORD = partner; // 支付API安全文件密码
-	public final static String ipAddress = "120.76.152.52"; // ip地址*/
+	public final static String ipAddress = "120.76.152.52"; // ip地址
 	
 	/** 微信支付回掉url接口 */
 	public final static String ORDER_PAY_BACK_URL = NameUtils.PATH_ROOT + "/iamberry/cart/payBack"; // 销售订单支付成功后回调地址

iamberry-wechat-web/src/main/resources/platform.properties

@@ -157,28 +157,38 @@ DATE_TIME_FORMAT2=yyyy\u5E74MM\u6708dd\u65E5 HH:mm
 PICTRUE_FORMATE_JPG=jpg
 # signatureSimple
 signatureSimple=userAgent=%s&userIp=%s&token=%s&timestamp=%s&sessionId=%s
-# pubNo
-pubNo=gh_c73446c8ce91
-# appId-test
-appId=wxc71b789fad06a2d7
+
+## aiberle
+pubNo=gh_487d0dbf8e30
+# appId
+appId=wx09aa7519c4e5b360
+# appSecret
+appSecret=c006d5a6af80b5291265a1364fd17edc
+
+## pubNo
+#pubNo=gh_c73446c8ce91
+## appId-test
+#appId=wxc71b789fad06a2d7
+## appSecret-test
+#appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
+# partnerkey
+#partnerkey=cdb9075e7ecad945ba788bc5aedM212B
+
 # appId-watero
 #appId=wx27c9f825761a861b
-# token
-token=weixin
-# appSecret-test
-appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
 # appSecret-watero
 #appSecret=97b2f2991e4ff0f2567fbc625f858377
-# partnerkey
-partnerkey=cdb9075e7ecad945ba788bc5aedM212B
+
+# token
+token=weixin
+# partner
+partner=1321590501
 # wechat-machine-id		test
 productId=29439
 # wechat-machine-id		watero
 #productId=30361
 # charset
 charset=UTF-8
-# partner
-partner=1321590501
 # keystore_password
 KEYSTORE_PASSWORD=124022090
 # keystore_file