修改配置

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

@@ -159,32 +159,31 @@ public class NameUtils {
      */
 
 	/** 公众号账户信息:水时代 */
-	public final static String pubNo = "gh_c73446c8ce91";// 微信号
+	/*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 partner = "1321590501";// 微信支付商户号*/
 
 	/** 水时代公众号商户信息 */
-	public final static String partnerkey = "cdb9075e7ecad945ba788bc5aedM212B";// 财付通初始密码
+	/*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 ipAddress = "120.25.79.106"; // ip地址*/
 
 	/** 公众号账户信息:爱贝源 */
-	/*public final static String pubNo = "gh_487d0dbf8e30";// 微信号
+	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 partner = "1340351501";// 微信支付商户号
 	/** 公众号商户信息 */
-	/*public final static String partnerkey = "8a90e3ab0e2db7772f5f64e7edwechat";// 财付通初始密码
+	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-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -30,7 +30,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("http://m.watero.cn");
 		origins.add("http://static.watero.cn");
 		origins.add("http://static.iamberry.com");
-		origins.add("http://test.iamberry.com:801");
+		origins.add("http://h5.iamberry.com:801");
 	}
 	
     public void init(FilterConfig filterConfig) throws ServletException {

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

@@ -14,7 +14,7 @@ PLACE_CODE_PREFIX=PREFIX
 # \u673A\u5668\u6FC0\u6D3B\u7801
 MACHINE_CODE=B
 # wechat auth back url
-WECHAT_BACK_URL=http://test.iamberry.com/iamberry/wechatBack
+WECHAT_BACK_URL=http://h5.iamberry.com/iamberry/wechatBack
 # order details url
 WECHAT_ORDER_BACK=http://test.iamberry.com/iamberry/callback/orderPayBack
 #rentOrder url
@@ -158,12 +158,12 @@ PICTRUE_FORMATE_JPG=jpg
 # signatureSimple
 signatureSimple=userAgent=%s&userIp=%s&token=%s&timestamp=%s&sessionId=%s
 
-## aiberle
-#pubNo=gh_487d0dbf8e30
-## appId
-#appId=wx09aa7519c4e5b360
-## appSecret
-#appSecret=c006d5a6af80b5291265a1364fd17edc
+# aiberle
+pubNo=gh_487d0dbf8e30
+# appId
+appId=wx09aa7519c4e5b360
+# appSecret
+appSecret=c006d5a6af80b5291265a1364fd17edc
 
 ### pubNo
 #pubNo=gh_c73446c8ce91
@@ -172,14 +172,6 @@ signatureSimple=userAgent=%s&userIp=%s&token=%s&timestamp=%s&sessionId=%s
 ## appSecret-test
 #appSecret=8a90e3ab0e2db7772f5f64e7ed2f4b98
 
-
-## pubNo
-pubNo=gh_cdd0a86d3b19
-# appId-test
-appId=wxdb090f0af89e0be3
-# appSecret-test
-appSecret=518114a120274f625530750c1803921b
-
 # appId-watero
 #appId=wx27c9f825761a861b
 # appSecret-watero