优化了部分POM依赖

2014-11-29 15:57:46 +08:00 · 2014-11-29 15:57:46 +08:00 · 095ad993a3
commit 095ad993a3
parent 008c5ce4a8
13 changed files with 193 additions and 104 deletions
--- 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

 	<dependency>
@ -46,11 +45,21 @@ Maven
 	    <artifactId>weixin4j-qy-api</artifactId>
 	    <version>1.0</version>
 	</dependency>
+以上依赖如果出现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
+  
 接下来
 ------
 * 微信小店
--- a/pom.xml
+++ b/pom.xml
@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.foxinmy</groupId>
 	<artifactId>weixin4j</artifactId>
-	<version>1.0</version>
+	<version>1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>weixin4j</name>
 	<url>https://github.com/foxinmy/weixin4j</url>
@ -39,9 +39,6 @@
 		<module>weixin4j-qy</module>
 	</modules>
 	<properties>
-		<weixin4j.base.version>1.0</weixin4j.base.version>
-		<weixin4j.mp.version>1.0</weixin4j.mp.version>
-		<weixin4j.qy.version>1.0</weixin4j.qy.version>
 		<jdk.version>1.7</jdk.version>
 		<junit.version>4.8.2</junit.version>
 		<dom4j.version>1.6.1</dom4j.version>
@ -66,6 +63,7 @@
 		<maven.jar.plugin.version>2.5</maven.jar.plugin.version>
 		<maven.assembly.plugin.version>2.5.1</maven.assembly.plugin.version>
 		<maven.javadoc.plugin.version>2.10.1</maven.javadoc.plugin.version>
+		<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
 		<maven.gpg.plugin.version>1.5</maven.gpg.plugin.version>
 	</properties>
 	<build>
@ -104,6 +102,7 @@
 								<exclude>*.properties</exclude>
 								<exclude>*.xml</exclude>
 								<exclude>*.txt</exclude>
+								<exclude>**/*.md</exclude>
 							</excludes>
 							<archive>
 								<addMavenDescriptor>false</addMavenDescriptor>
@ -160,13 +159,30 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>${maven.deploy.plugin.version}</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-gpg-plugin</artifactId>
+					<version>${maven.gpg.plugin.version}</version>
+					<executions>
+						<execution>
+							<phase>verify</phase>
+							<goals>
+								<goal>sign</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<resources>
 			<resource>
 				<directory>src/main/java</directory>
 				<includes>
-					<include>**/*.md</include>
 					<include>**/*.xml</include>
 					<include>**/*.properties</include>
 					<include>**/*.pem</include>
@ -181,14 +197,16 @@
 			</resource>
 		</resources>
 	</build>
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit.version}</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+				<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<profiles>
 		<profile>
 			<id>dev</id>
@ -214,15 +232,6 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>${maven.gpg.plugin.version}</version>
-						<executions>
-							<execution>
-								<phase>verify</phase>
-								<goals>
-									<goal>sign</goal>
-								</goals>
-							</execution>
-						</executions>
 					</plugin>
 				</plugins>
 			</build>
--- a/weixin4j-base/pom.xml
+++ b/weixin4j-base/pom.xml
@ -6,10 +6,9 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.0</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-base</artifactId>
-	<version>${weixin4j.base.version}</version>
 	<name>weixin4j-base</name>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-base</url>
 	<dependencies>
@ -18,6 +17,11 @@
 			<artifactId>xstream</artifactId>
 			<version>${xstream.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>${httpclient.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@ -31,12 +35,22 @@
 					<groupId>commons-codec</groupId>
 					<artifactId>commons-codec</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpcore</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpmime</artifactId>
 			<version>${httpclient.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpcore</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@ -53,44 +67,6 @@
 			<artifactId>dom4j</artifactId>
 			<version>${dom4j.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-			<version>${logback.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>${logback.version}</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>logback-core</artifactId>
-					<groupId>ch.qos.logback</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<version>${jcl.over.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${log4j.over.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.slf4j</groupId>
-					<artifactId>slf4j-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<dependency>
 			<groupId>redis.clients</groupId>
 			<artifactId>jedis</artifactId>
@ -101,10 +77,5 @@
 			<artifactId>commons-codec</artifactId>
 			<version>${commons.codec.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>jaxen</groupId>
-			<artifactId>jaxen</artifactId>
-			<version>${jaxen.version}</version>
-		</dependency>
 	</dependencies>
 </project>
--- a/weixin4j-mp/pom.xml
+++ b/weixin4j-mp/pom.xml
@ -6,10 +6,9 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.0</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp</artifactId>
-	<version>${weixin4j.mp.version}</version>
 	<name>weixin4j-mp</name>
 	<packaging>pom</packaging>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-mp</url>
@ -22,7 +21,7 @@
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-base</artifactId>
-			<version>${weixin4j.base.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
--- a/weixin4j-mp/weixin4j-mp-api/pom.xml
+++ b/weixin4j-mp/weixin4j-mp-api/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-mp</artifactId>
-		<version>${weixin4j.mp.version}</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp-api</artifactId>
 	<name>weixin4j-mp-api</name>
@ -26,29 +26,37 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.poi</groupId>
-			<artifactId>poi</artifactId>
+			<artifactId>poi-ooxml</artifactId>
 			<version>${poi.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-codec</groupId>
 					<artifactId>commons-codec</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>dom4j</groupId>
+					<artifactId>dom4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml</artifactId>
-			<version>${poi.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.poi</groupId>
-			<artifactId>poi-ooxml-schemas</artifactId>
-			<version>${poi.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
 			<version>${jsoup.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${jcl.over.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>${jaxen.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
 	</dependencies>
 </project>
--- 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">
-	<id>full-${project.version}</id>
+	<id>full</id>
 	<formats>
 		<format>jar</format>
 	</formats>
@ -24,7 +24,7 @@
 		<dependencySet>
 			<unpack>true</unpack>
 			<includes>
-				<include>com.foxinmy.weixin4j:weixin4j-base</include>
+				<include>com.foxinmy:weixin4j-base</include>
 			</includes>
 		</dependencySet>
 	</dependencySets>
--- 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<String, String> accountMap = new HashMap<String, String>() {
 		private static final long serialVersionUID = 1L;
--- a/weixin4j-mp/weixin4j-mp-server/pom.xml
+++ b/weixin4j-mp/weixin4j-mp-server/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-mp</artifactId>
-		<version>${weixin4j.mp.version}</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-mp-server</artifactId>
 	<name>weixin4j-mp-server</name>
@ -39,7 +39,45 @@
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-mp-api</artifactId>
-			<version>${weixin4j.mp.version}</version>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>logback-core</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${jcl.over.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${log4j.over.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>
--- a/weixin4j-mp/weixin4j-mp-server/src/main/java/com/foxinmy/weixin4j/mp/action/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;
--- 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
+普通消息对应的Action
+
+其中「PayAction」为微信支付示例类
--- a/weixin4j-qy/pom.xml
+++ b/weixin4j-qy/pom.xml
@ -6,10 +6,9 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j</artifactId>
-		<version>1.0</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy</artifactId>
-	<version>${weixin4j.qy.version}</version>
 	<name>weixin4j-qy</name>
 	<packaging>pom</packaging>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-qy</url>
@ -22,7 +21,7 @@
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-base</artifactId>
-			<version>${weixin4j.base.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 </project>
--- a/weixin4j-qy/weixin4j-qy-api/pom.xml
+++ b/weixin4j-qy/weixin4j-qy-api/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-qy</artifactId>
-		<version>${weixin4j.qy.version}</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy-api</artifactId>
 	<name>weixin4j-qy-api</name>
@ -23,4 +23,15 @@
 			</plugin>
 		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>jaxen</groupId>
+			<artifactId>jaxen</artifactId>
+			<version>${jaxen.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+	</dependencies>
 </project>
--- a/weixin4j-qy/weixin4j-qy-server/pom.xml
+++ b/weixin4j-qy/weixin4j-qy-server/pom.xml
@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.foxinmy</groupId>
 		<artifactId>weixin4j-qy</artifactId>
-		<version>${weixin4j.qy.version}</version>
+		<version>1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>weixin4j-qy-server</artifactId>
 	<name>weixin4j-qy-server</name>
@ -39,7 +39,45 @@
 		<dependency>
 			<groupId>com.foxinmy</groupId>
 			<artifactId>weixin4j-qy-api</artifactId>
-			<version>${weixin4j.qy.version}</version>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-core</artifactId>
+			<version>${logback.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.logback</groupId>
+			<artifactId>logback-classic</artifactId>
+			<version>${logback.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>logback-core</artifactId>
+					<groupId>ch.qos.logback</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${jcl.over.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>${log4j.over.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 	</dependencies>
 </project>