From c5163e7eacb6d308066d4634939167e021982ff3 Mon Sep 17 00:00:00 2001 From: jinyu Date: Wed, 10 Jun 2015 12:35:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E6=84=8F=EF=BC=9Aweixin.properties?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BAweixin4j.properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGE.md | 4 ++++ .../java/com/foxinmy/weixin4j/util/ConfigUtil.java | 2 +- weixin4j-mp/README.md | 14 +++++++------- .../{weixin.properties => weixin4j.properties} | 10 +++++----- .../com/foxinmy/weixin4j/mp/test/MediaTest.java | 6 +++--- weixin4j-qy/README.md | 8 ++++---- .../{weixin.properties => weixin4j.properties} | 4 ++-- 7 files changed, 26 insertions(+), 22 deletions(-) rename weixin4j-mp/src/main/resources/{weixin.properties => weixin4j.properties} (87%) rename weixin4j-qy/src/main/resources/{weixin.properties => weixin4j.properties} (86%) diff --git a/CHANGE.md b/CHANGE.md index b9f274a0..8660297d 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -322,3 +322,7 @@ * 2015-06-10 + **weixin4j-server**: released 1.0.2 + +* 2015-06-11 + + + weixin.properties重命名为weixin4j.properties \ No newline at end of file diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ConfigUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ConfigUtil.java index d57139f3..4574d619 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ConfigUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/ConfigUtil.java @@ -21,7 +21,7 @@ public class ConfigUtil { private final static String CLASSPATH_VALUE; private final static ResourceBundle weixinBundle; static { - weixinBundle = ResourceBundle.getBundle("weixin"); + weixinBundle = ResourceBundle.getBundle("weixin4j"); Set keySet = weixinBundle.keySet(); File file = null; CLASSPATH_VALUE = Thread.currentThread().getContextClassLoader() diff --git a/weixin4j-mp/README.md b/weixin4j-mp/README.md index 09c5383e..6850ab36 100644 --- a/weixin4j-mp/README.md +++ b/weixin4j-mp/README.md @@ -48,9 +48,9 @@ weixin4j-mp weixin4j-mp 1.4 -1.需新增或拷贝`weixin.properties`文件到项目的`classpath`中 +1.需新增或拷贝`weixin4j.properties`文件到项目的`classpath`中 -weixin.properties说明 +weixin4j.properties说明 | 属性名 | 说明 | | :---------- | :-------------- | @@ -73,12 +73,12 @@ weixin.properties说明 "version":"针对微信支付的版本号(2,3),如果不填则按照mchId非空与否来判断",\ "paySignKey":"微信支付中调用API的密钥"} - token_path=/tmp/weixin/token - qr_path=/tmp/weixin/qr - media_path=/tmp/weixin/media - bill_path=/tmp/weixin/bill + token_path=/tmp/weixin4j/token + qr_path=/tmp/weixin4j/qr + media_path=/tmp/weixin4j/media + bill_path=/tmp/weixin4j/bill # ca证书存放的完整路径 (V2版本后缀为*.pfx,V3版本后缀为*.p12) - ca_file=/tmp/weixin/xxxxx.p12 + ca_file=/tmp/weixin4j/xxxxx.p12 #classpath路径下:ca_file=classpath:xxxxx.p12 #微信登陆授权的重定向路径(使用OauthApi时需要填写) diff --git a/weixin4j-mp/src/main/resources/weixin.properties b/weixin4j-mp/src/main/resources/weixin4j.properties similarity index 87% rename from weixin4j-mp/src/main/resources/weixin.properties rename to weixin4j-mp/src/main/resources/weixin4j.properties index 9d63fc11..d92440e3 100644 --- a/weixin4j-mp/src/main/resources/weixin.properties +++ b/weixin4j-mp/src/main/resources/weixin4j.properties @@ -10,14 +10,14 @@ account={"id":"wx4ab8f8de58159a57","secret":"1d4eb0f4bf556aaed539f30ed05ca795",\ "paySignKey":"\u5fae\u4fe1\u652f\u4ed8\u4e2d\u8c03\u7528API\u7684\u5bc6\u94a5 \u670d\u52a1\u53f7\u652f\u4ed8\u65f6\u9700\u8981\u586b\u5165"} # \u4f7f\u7528FileTokenHolder\u65f6token\u7684\u5b58\u653e\u8def\u5f84 -token_path=/tmp/weixin/token +token_path=/tmp/weixin4j/token # \u4e8c\u7ef4\u7801\u4fdd\u5b58\u8def\u5f84 -qr_path=/tmp/weixin/qr +qr_path=/tmp/weixin4j/qrcode # \u5a92\u4f53\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84 -media_path=/tmp/weixin/media +media_path=/tmp/weixin4j/media # \u5bf9\u8d26\u5355\u4fdd\u5b58\u8def\u5f84 -bill_path=/tmp/weixin/bill +bill_path=/tmp/weixin4j/bill # ca\u8bc1\u4e66\u5b58\u653e\u7684\u5b8c\u6574\u8def\u5f84 (V2\u7248\u672c\u540e\u7f00\u4e3a*.pfx,V3\u7248\u672c\u540e\u7f00\u4e3a*.p12) -ca_file=/tmp/weixin/xxxxx.p12 +ca_file=/tmp/weixin4j/xxxxx.p12 # classpath\u8def\u5f84\u4e0b\u53ef\u4ee5\u8fd9\u4e48\u5199 # ca_file=classpath:xxxxx.pfx \ No newline at end of file diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java index 3f2fa532..c6cfef76 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java @@ -38,9 +38,9 @@ public class MediaTest extends TokenTest { @Test public void upload1() throws IOException, WeixinException { - File file = new File("/Users/jy/Downloads/test.jpg"); + File file = new File("/Users/jy/Downloads/weixin4j.png"); String mediaId = mediaApi.uploadMedia(file, MediaType.image, false); - // Sy1KOLsi4ri3kB3TYUuculVelcW2I7W6BrfGwkGvSW8beTCAarxuGQLjuNJChJr8 + // 1Vgd1R5DdznSc3rPxd-sNZ3pLt54cejhJ5ItuNcCgrqoQArNANWy5oxso_r9KNlE Assert.assertNotNull(mediaId); System.err.println(mediaId); } @@ -49,7 +49,7 @@ public class MediaTest extends TokenTest { public void download1() throws WeixinException, IOException { File file = mediaApi .downloadMedia( - "Sy1KOLsi4ri3kB3TYUuculVelcW2I7W6BrfGwkGvSW8beTCAarxuGQLjuNJChJr8", + "1Vgd1R5DdznSc3rPxd-sNZ3pLt54cejhJ5ItuNcCgrqoQArNANWy5oxso_r9KNlE", MediaType.image, false); Assert.assertTrue(file.exists()); } diff --git a/weixin4j-qy/README.md b/weixin4j-qy/README.md index 6370713e..25a67aaa 100644 --- a/weixin4j-qy/README.md +++ b/weixin4j-qy/README.md @@ -32,9 +32,9 @@ weixin4j-qy weixin4j-qy 1.4 -1.需新增或拷贝`weixin.properties`文件到项目的`classpath`中 +1.需新增或拷贝`weixin4j.properties`文件到项目的`classpath`中 -weixin.properties说明 +weixin4j.properties说明 | 属性名 | 说明 | | :---------- | :-------------- | @@ -48,8 +48,8 @@ weixin.properties说明 "token":"企业号中应用在回调模式下的token",\ "encodingAesKey":"企业号中应用在回调模式下AES加密密钥"} - token_path=/tmp/weixin/token - media_path=/tmp/weixin/media + token_path=/tmp/weixin4j/token + media_path=/tmp/weixin4j/media 2.实例化一个`WeixinProxy`对象,调用API diff --git a/weixin4j-qy/src/main/resources/weixin.properties b/weixin4j-qy/src/main/resources/weixin4j.properties similarity index 86% rename from weixin4j-qy/src/main/resources/weixin.properties rename to weixin4j-qy/src/main/resources/weixin4j.properties index c42bd003..94a1c56f 100644 --- a/weixin4j-qy/src/main/resources/weixin.properties +++ b/weixin4j-qy/src/main/resources/weixin4j.properties @@ -5,6 +5,6 @@ account={"id":"wxf10bce209c91d0e2","secret":"cW0OtP7-7YJ7jHKFZaJW2skJHE9bLHadxOs "encodingAesKey":"BRYfV4zPFUJb3v3MySNBg1ERKE3vyyMRoScu76vFySv"} # \u4f7f\u7528FileTokenHolder\u65f6token\u7684\u5b58\u653e\u8def\u5f84 -token_path=/tmp/weixin/token +token_path=/tmp/weixin4j/token # \u5a92\u4f53\u6587\u4ef6\u4fdd\u5b58\u8def\u5f84 -media_path=/tmp/weixin/media \ No newline at end of file +media_path=/tmp/weixin4j/media \ No newline at end of file