diff --git a/README.md b/README.md
index 4248af0a..dd1a9680 100644
--- a/README.md
+++ b/README.md
@@ -24,14 +24,13 @@ weixin4j
-------
1.`weixin4j`包含「微信公众平台」和「微信企业号」的API封装以及一个半成品的netty服务实现.
-2.API的成功调用依赖于正确的appid等数据,其填写格式在每个项目下的README.md文件中都有说明.
+2.API的成功调用依赖于正确的appid等数据,填写格式说明见API工程下的README.md文件.
-3.在`weixin-4j`根目录执行`mvn package`命令得到jar包后,将`weixin4j-*-full`包或者`weixin4j-base`和`weixin4j-*-api`引入到自己的工程.
+3.如需使用netty服务,可以在相应的action中实现自己的具体业务,打包后放到`正确的目录`下解压`weixin-*-server-bin.zip`执行`sh startup.sh start`便可启动服务.
-4.如需使用netty服务,则可以在相应的action中实现自己的业务处理,打包后放到`正确的目录`下解压`weixin-*-server-bin.zip`执行`sh startup.sh start`便可启动服务.
-
-Maven
------
+如何获取
+-------
+###1.maven依赖
微信公众平台API
@@ -46,11 +45,21 @@ Maven
weixin4j-qy-api
1.0
+以上依赖如果出现Missing artifact错误 请尝试在eclipse里这么做
-直接下载jar包
+ + 进入 Window > Show View > Other > Maven Repositories 展开 Global Repositories 在group或者central上右键执行`update index` 操作
+
+ + 或者进入 Windows > Preferences > Maven 选中 `Download repository index updates on startup` 即可
+
+
+###2.直接下载jar包
https://github.com/foxinmy/weixin4j/releases
+###3.从源码打包
+
+`git clone`到本地在根目录下执行`mvn package`命令得到jar包,到target目录下将`weixin4j-*-full`包或者`weixin4j-base`和`weixin4j-*-api`引入到自己的工程.
+
更新LOG
-------
* 2014-10-27
@@ -150,7 +159,11 @@ https://github.com/foxinmy/weixin4j/releases
* 2014-11-27
+ **weixin-base**: 将BaseApi移入
+
+* 2014-11-29
+ + 重构了POM
+
接下来
------
* 微信小店
diff --git a/pom.xml b/pom.xml
index 732aedee..d93c0be0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
com.foxinmy
weixin4j
- 1.0
+ 1.0-SNAPSHOT
pom
weixin4j
https://github.com/foxinmy/weixin4j
@@ -39,9 +39,6 @@
weixin4j-qy
- 1.0
- 1.0
- 1.0
1.7
4.8.2
1.6.1
@@ -66,6 +63,7 @@
2.5
2.5.1
2.10.1
+ 2.8.2
1.5
@@ -104,6 +102,7 @@
*.properties
*.xml
*.txt
+ **/*.md
false
@@ -160,13 +159,30 @@
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven.deploy.plugin.version}
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ ${maven.gpg.plugin.version}
+
+
+ verify
+
+ sign
+
+
+
+
src/main/java
- **/*.md
**/*.xml
**/*.properties
**/*.pem
@@ -181,14 +197,16 @@
-
-
- junit
- junit
- ${junit.version}
- test
-
-
+
+
+
+ junit
+ junit
+ ${junit.version}
+ test
+
+
+
dev
@@ -214,15 +232,6 @@
org.apache.maven.plugins
maven-gpg-plugin
- ${maven.gpg.plugin.version}
-
-
- verify
-
- sign
-
-
-
diff --git a/weixin4j-base/pom.xml b/weixin4j-base/pom.xml
index 08e437af..32c7e594 100644
--- a/weixin4j-base/pom.xml
+++ b/weixin4j-base/pom.xml
@@ -6,10 +6,9 @@
com.foxinmy
weixin4j
- 1.0
+ 1.0-SNAPSHOT
weixin4j-base
- ${weixin4j.base.version}
weixin4j-base
https://github.com/foxinmy/weixin4j/tree/master/weixin4j-base
@@ -18,6 +17,11 @@
xstream
${xstream.version}
+
+ org.apache.httpcomponents
+ httpcore
+ ${httpclient.version}
+
org.apache.httpcomponents
httpclient
@@ -31,12 +35,22 @@
commons-codec
commons-codec
+
+ org.apache.httpcomponents
+ httpcore
+
org.apache.httpcomponents
httpmime
${httpclient.version}
+
+
+ org.apache.httpcomponents
+ httpcore
+
+
org.apache.commons
@@ -53,44 +67,6 @@
dom4j
${dom4j.version}
-
- ch.qos.logback
- logback-core
- ${logback.version}
-
-
- ch.qos.logback
- logback-classic
- ${logback.version}
-
-
- logback-core
- ch.qos.logback
-
-
-
-
- org.slf4j
- jcl-over-slf4j
- ${jcl.over.version}
-
-
- org.slf4j
- slf4j-api
-
-
-
-
- org.slf4j
- log4j-over-slf4j
- ${log4j.over.version}
-
-
- org.slf4j
- slf4j-api
-
-
-
redis.clients
jedis
@@ -101,10 +77,5 @@
commons-codec
${commons.codec.version}
-
- jaxen
- jaxen
- ${jaxen.version}
-
\ No newline at end of file
diff --git a/weixin4j-mp/pom.xml b/weixin4j-mp/pom.xml
index 17ab24e2..4c418d76 100644
--- a/weixin4j-mp/pom.xml
+++ b/weixin4j-mp/pom.xml
@@ -6,10 +6,9 @@
com.foxinmy
weixin4j
- 1.0
+ 1.0-SNAPSHOT
weixin4j-mp
- ${weixin4j.mp.version}
weixin4j-mp
pom
https://github.com/foxinmy/weixin4j/tree/master/weixin4j-mp
@@ -22,7 +21,7 @@
com.foxinmy
weixin4j-base
- ${weixin4j.base.version}
+ ${project.version}
\ No newline at end of file
diff --git a/weixin4j-mp/weixin4j-mp-api/pom.xml b/weixin4j-mp/weixin4j-mp-api/pom.xml
index 2a4bb435..af33abda 100644
--- a/weixin4j-mp/weixin4j-mp-api/pom.xml
+++ b/weixin4j-mp/weixin4j-mp-api/pom.xml
@@ -6,7 +6,7 @@
com.foxinmy
weixin4j-mp
- ${weixin4j.mp.version}
+ 1.0-SNAPSHOT
weixin4j-mp-api
weixin4j-mp-api
@@ -26,29 +26,37 @@
org.apache.poi
- poi
+ poi-ooxml
${poi.version}
commons-codec
commons-codec
+
+ dom4j
+ dom4j
+
-
- org.apache.poi
- poi-ooxml
- ${poi.version}
-
-
- org.apache.poi
- poi-ooxml-schemas
- ${poi.version}
-
org.jsoup
jsoup
${jsoup.version}
+
+ org.slf4j
+ slf4j-api
+ ${jcl.over.version}
+
+
+ jaxen
+ jaxen
+ ${jaxen.version}
+
+
+ junit
+ junit
+
\ No newline at end of file
diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/assembly.xml b/weixin4j-mp/weixin4j-mp-api/src/main/assembly.xml
index c471e5a4..fde1cf28 100644
--- a/weixin4j-mp/weixin4j-mp-api/src/main/assembly.xml
+++ b/weixin4j-mp/weixin4j-mp-api/src/main/assembly.xml
@@ -2,7 +2,7 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- full-${project.version}
+ full
jar
@@ -24,7 +24,7 @@
true
- com.foxinmy.weixin4j:weixin4j-base
+ com.foxinmy:weixin4j-base
diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/spider/WeixinExecutor.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/spider/WeixinExecutor.java
index d4fdd685..f6e95d9e 100644
--- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/spider/WeixinExecutor.java
+++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/spider/WeixinExecutor.java
@@ -53,10 +53,8 @@ import com.foxinmy.weixin4j.util.RandomUtil;
* @see
*/
public class WeixinExecutor implements Serializable {
-
- private static final long serialVersionUID = 4253859892138066462L;
-
private final Logger logger = LoggerFactory.getLogger(getClass());
+ private static final long serialVersionUID = 4253859892138066462L;
private final static Map accountMap = new HashMap() {
private static final long serialVersionUID = 1L;
diff --git a/weixin4j-mp/weixin4j-mp-server/pom.xml b/weixin4j-mp/weixin4j-mp-server/pom.xml
index ee607309..ba63e68c 100644
--- a/weixin4j-mp/weixin4j-mp-server/pom.xml
+++ b/weixin4j-mp/weixin4j-mp-server/pom.xml
@@ -6,7 +6,7 @@
com.foxinmy
weixin4j-mp
- ${weixin4j.mp.version}
+ 1.0-SNAPSHOT
weixin4j-mp-server
weixin4j-mp-server
@@ -39,7 +39,45 @@
com.foxinmy
weixin4j-mp-api
- ${weixin4j.mp.version}
+ ${project.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ logback-core
+ ch.qos.logback
+
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${jcl.over.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+ org.slf4j
+ log4j-over-slf4j
+ ${log4j.over.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
\ No newline at end of file
diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayAction.java b/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/PayAction.java
similarity index 98%
rename from weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayAction.java
rename to weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/PayAction.java
index 93d972c9..42769728 100644
--- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayAction.java
+++ b/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/PayAction.java
@@ -1,4 +1,4 @@
-package com.foxinmy.weixin4j.mp.payment;
+package com.foxinmy.weixin4j.mp.action;
import java.io.InputStream;
import java.util.HashMap;
@@ -13,6 +13,9 @@ import com.foxinmy.weixin4j.exception.PayException;
import com.foxinmy.weixin4j.http.XmlResult;
import com.foxinmy.weixin4j.model.Consts;
import com.foxinmy.weixin4j.model.WeixinMpAccount;
+import com.foxinmy.weixin4j.mp.payment.JsPayNotify;
+import com.foxinmy.weixin4j.mp.payment.PayPackage;
+import com.foxinmy.weixin4j.mp.payment.PayUtil;
import com.foxinmy.weixin4j.mp.payment.v2.NativePayNotifyV2;
import com.foxinmy.weixin4j.mp.payment.v2.NativePayResponseV2;
import com.foxinmy.weixin4j.mp.payment.v2.PayFeedback;
diff --git a/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/README.md b/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/README.md
index be36a4f2..9453c2ee 100644
--- a/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/README.md
+++ b/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/README.md
@@ -1 +1,3 @@
-普通消息对应的Action
\ No newline at end of file
+普通消息对应的Action
+
+其中「PayAction」为微信支付示例类
\ No newline at end of file
diff --git a/weixin4j-qy/pom.xml b/weixin4j-qy/pom.xml
index cb8811ab..db7b9615 100644
--- a/weixin4j-qy/pom.xml
+++ b/weixin4j-qy/pom.xml
@@ -6,10 +6,9 @@
com.foxinmy
weixin4j
- 1.0
+ 1.0-SNAPSHOT
weixin4j-qy
- ${weixin4j.qy.version}
weixin4j-qy
pom
https://github.com/foxinmy/weixin4j/tree/master/weixin4j-qy
@@ -22,7 +21,7 @@
com.foxinmy
weixin4j-base
- ${weixin4j.base.version}
+ ${project.version}
diff --git a/weixin4j-qy/weixin4j-qy-api/pom.xml b/weixin4j-qy/weixin4j-qy-api/pom.xml
index 48a1354b..80dba080 100644
--- a/weixin4j-qy/weixin4j-qy-api/pom.xml
+++ b/weixin4j-qy/weixin4j-qy-api/pom.xml
@@ -6,7 +6,7 @@
com.foxinmy
weixin4j-qy
- ${weixin4j.qy.version}
+ 1.0-SNAPSHOT
weixin4j-qy-api
weixin4j-qy-api
@@ -23,4 +23,15 @@
+
+
+ jaxen
+ jaxen
+ ${jaxen.version}
+
+
+ junit
+ junit
+
+
diff --git a/weixin4j-qy/weixin4j-qy-server/pom.xml b/weixin4j-qy/weixin4j-qy-server/pom.xml
index 91c6785e..821b0836 100644
--- a/weixin4j-qy/weixin4j-qy-server/pom.xml
+++ b/weixin4j-qy/weixin4j-qy-server/pom.xml
@@ -6,7 +6,7 @@
com.foxinmy
weixin4j-qy
- ${weixin4j.qy.version}
+ 1.0-SNAPSHOT
weixin4j-qy-server
weixin4j-qy-server
@@ -39,7 +39,45 @@
com.foxinmy
weixin4j-qy-api
- ${weixin4j.qy.version}
+ ${project.version}
+
+
+ ch.qos.logback
+ logback-core
+ ${logback.version}
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
+
+ logback-core
+ ch.qos.logback
+
+
+
+
+ org.slf4j
+ jcl-over-slf4j
+ ${jcl.over.version}
+
+
+ org.slf4j
+ slf4j-api
+
+
+
+
+ org.slf4j
+ log4j-over-slf4j
+ ${log4j.over.version}
+
+
+ org.slf4j
+ slf4j-api
+
+