niko/weixin4j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version upgrade to 1.7.1

Browse Source
This commit is contained in:
jinyu 2016-08-09 15:58:44 +08:00
parent 46b496c84c
commit ee836c3193
14 changed files with 311 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGE.md
View File

@ -753,4 +753,6 @@
+ weixin4j-base:修复媒体消息转换错误bug
+ weixin4j-mp:新增创建卡券二维码接口
+ weixin4j-mp:新增创建卡券二维码接口
+ version upgrade to 1.7.1

520
pom.xml
View File

@ -1,261 +1,261 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId>
<version>1.7.0</version>
<packaging>pom</packaging>
<name>weixin4j</name>
<url>https://github.com/foxinmy/weixin4j</url>
<description>微信开发工具包</description>
<inceptionYear>2014</inceptionYear>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
<scm>
<url>https://github.com/foxinmy/weixin4j</url>
<connection>scm:git:git://github.com/foxinmy/weixin4j.git</connection>
<developerConnection>scm:git:git@github.com:foxinmy/weixin4j.git</developerConnection>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/foxinmy/weixin4j/issues</url>
</issueManagement>
<developers>
<developer>
<email>hujinyuhao@163.com</email>
<id>jinyu</id>
<name>jinyu</name>
<url>https://github.com/foxinmy</url>
<timezone>+8</timezone>
<roles>
<role>java developer</role>
</roles>
</developer>
</developers>
<modules>
<module>weixin4j-base</module>
<module>weixin4j-mp</module>
<module>weixin4j-qy</module>
<module>weixin4j-server</module>
<module>weixin4j-example</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<fastjson.version>1.2.3</fastjson.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<!-- 过滤证书文件 -->
<nonFilteredFileExtensions>
<nonFilteredFileExtension>pem</nonFilteredFileExtension>
<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
<nonFilteredFileExtension>p12</nonFilteredFileExtension>
<nonFilteredFileExtension>jks</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>target/classes</classesDirectory>
<excludes>
<exclude>*.properties</exclude>
<exclude>*.xml</exclude>
<exclude>*.txt</exclude>
<exclude>**/*.md</exclude>
</excludes>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
</archive>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>*.properties</exclude>
<exclude>*.xml</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>${project.build.sourceEncoding}</charset>
<encoding>${project.build.sourceEncoding}</encoding>
<docencoding>${project.build.sourceEncoding}</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<descriptors>
<descriptor>../assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.pem</include>
<include>**/*.p12</include>
<include>**/*.pfx</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
</build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
<snapshotRepository>
<id>oss-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>oss-release</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId>
<version>1.7.1</version>
<packaging>pom</packaging>
<name>weixin4j</name>
<url>https://github.com/foxinmy/weixin4j</url>
<description>微信开发工具包</description>
<inceptionYear>2014</inceptionYear>
<licenses>
<license>
<name>Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
<comments>A business-friendly OSS license</comments>
</license>
</licenses>
<scm>
<url>https://github.com/foxinmy/weixin4j</url>
<connection>scm:git:git://github.com/foxinmy/weixin4j.git</connection>
<developerConnection>scm:git:git@github.com:foxinmy/weixin4j.git</developerConnection>
<tag>HEAD</tag>
</scm>
<issueManagement>
<url>https://github.com/foxinmy/weixin4j/issues</url>
</issueManagement>
<developers>
<developer>
<email>hujinyuhao@163.com</email>
<id>jinyu</id>
<name>jinyu</name>
<url>https://github.com/foxinmy</url>
<timezone>+8</timezone>
<roles>
<role>java developer</role>
</roles>
</developer>
</developers>
<modules>
<module>weixin4j-base</module>
<module>weixin4j-mp</module>
<module>weixin4j-qy</module>
<module>weixin4j-server</module>
<module>weixin4j-example</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.6</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target>
<fastjson.version>1.2.3</fastjson.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
<!-- 过滤证书文件 -->
<nonFilteredFileExtensions>
<nonFilteredFileExtension>pem</nonFilteredFileExtension>
<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
<nonFilteredFileExtension>p12</nonFilteredFileExtension>
<nonFilteredFileExtension>jks</nonFilteredFileExtension>
</nonFilteredFileExtensions>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.5</version>
<executions>
<execution>
<id>default-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<classesDirectory>target/classes</classesDirectory>
<excludes>
<exclude>*.properties</exclude>
<exclude>*.xml</exclude>
<exclude>*.txt</exclude>
<exclude>**/*.md</exclude>
</excludes>
<archive>
<addMavenDescriptor>true</addMavenDescriptor>
</archive>
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
<configuration>
<excludes>
<exclude>*.properties</exclude>
<exclude>*.xml</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<show>public</show>
<charset>${project.build.sourceEncoding}</charset>
<encoding>${project.build.sourceEncoding}</encoding>
<docencoding>${project.build.sourceEncoding}</docencoding>
<links>
<link>http://docs.oracle.com/javase/7/docs/api</link>
</links>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.18</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<descriptors>
<descriptor>../assembly.xml</descriptor>
</descriptors>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<resources>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
<include>**/*.pem</include>
<include>**/*.p12</include>
<include>**/*.pfx</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
</build>
<profiles>
<profile>
<id>release</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
<snapshotRepository>
<id>oss-snapshot</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</snapshotRepository>
<repository>
<id>oss-release</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>

2
weixin4j-base/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>weixin4j-base</artifactId>
<name>weixin4j-base</name>

33
weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/qr/QRParameter.java
View File

@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.foxinmy.weixin4j.model.card.CardQR;
import com.foxinmy.weixin4j.type.QRType;
import com.foxinmy.weixin4j.util.Consts;
/**
* 二维码参数对象
@ -22,7 +23,7 @@ import com.foxinmy.weixin4j.type.QRType;
public class QRParameter implements Serializable {
private static final long serialVersionUID = 6611187606558274253L;
/**
* 二维码的类型
*
@ -35,6 +36,11 @@ public class QRParameter implements Serializable {
*/
@JSONField(name = "expire_seconds")
private Integer expireSeconds;
/**
* 二维码的场景值
*/
@JSONField(serialize = false)
private String sceneValue;
/**
* 二维码的内容
*/
@ -42,9 +48,10 @@ public class QRParameter implements Serializable {
private JSONObject sceneContent;
private QRParameter(QRType qrType, Integer expireSeconds,
JSONObject sceneContent) {
String sceneValue, JSONObject sceneContent) {
this.qrType = qrType;
this.expireSeconds = expireSeconds;
this.sceneValue = sceneValue;
this.sceneContent = sceneContent;
}
@ -56,6 +63,10 @@ public class QRParameter implements Serializable {
return qrType;
}
public String getSceneValue() {
return sceneValue;
}
public JSONObject getSceneContent() {
return sceneContent;
}
@ -75,7 +86,8 @@ public class QRParameter implements Serializable {
JSONObject scene = new JSONObject();
scene.put("scene_id", sceneValue);
sceneContent.put("scene", scene);
return new QRParameter(QRType.QR_SCENE, expireSeconds, sceneContent);
return new QRParameter(QRType.QR_SCENE, expireSeconds,
Long.toString(sceneValue), sceneContent);
}
/**
@ -89,7 +101,8 @@ public class QRParameter implements Serializable {
JSONObject scene = new JSONObject();
scene.put("scene_id", sceneValue);
sceneContent.put("scene", scene);
return new QRParameter(QRType.QR_LIMIT_SCENE, null, sceneContent);
return new QRParameter(QRType.QR_LIMIT_SCENE, null,
Integer.toString(sceneValue), sceneContent);
}
/**
@ -103,7 +116,8 @@ public class QRParameter implements Serializable {
JSONObject scene = new JSONObject();
scene.put("scene_str", sceneValue);
sceneContent.put("scene", scene);
return new QRParameter(QRType.QR_LIMIT_STR_SCENE, null, sceneContent);
return new QRParameter(QRType.QR_LIMIT_STR_SCENE, null, sceneValue,
sceneContent);
}
/**
@ -118,15 +132,22 @@ public class QRParameter implements Serializable {
CardQR... cardQRs) {
QRType qrType = QRType.QR_CARD;
JSONObject sceneContent = new JSONObject();
StringBuilder sceneValue = new StringBuilder();
sceneValue.append(cardQRs[0].getSceneValue());
if (cardQRs.length > 1) {
qrType = QRType.QR_MULTIPLE_CARD;
JSONObject multipleCard = new JSONObject();
multipleCard.put("card_list", cardQRs);
sceneContent.put("multiple_card", multipleCard);
for (int i = 1; i < cardQRs.length; i++) {
sceneValue.append(Consts.SEPARATOR).append(
cardQRs[i].getSceneValue());
}
} else {
sceneContent.put("card", cardQRs[0]);
}
return new QRParameter(qrType, expireSeconds, sceneContent);
return new QRParameter(qrType, expireSeconds, sceneValue.toString(),
sceneContent);
}
@Override

2
weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/WeixinPayProxy.java
View File

@ -951,5 +951,5 @@ public class WeixinPayProxy {
return customsApi.queryCustomsOrder(idQuery, customsCity);
}
public final static String VERSION = "1.7.0";
public final static String VERSION = "1.7.1";
}

1
weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Consts.java
View File

@ -28,4 +28,5 @@ public final class Consts {
public static final String SHA1 = "SHA-1";
public static final String PROTOCOL_FILE = "file";
public static final String PROTOCOL_JAR = "jar";
public static final String SEPARATOR = ",";
}

8
weixin4j-mp/CHANGE.md
View File

@ -242,4 +242,10 @@
* 2016-08-05
+ 新增CardApi:创建卡券接口
+ 新增CardApi:创建卡券接口
* 2016-08-09
+ 新增创建卡券二维码接口
+ version upgrade to 1.7.1

2
weixin4j-mp/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>weixin4j-mp</artifactId>
<name>weixin4j-mp</name>

2
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinComponentProxy.java
View File

@ -185,5 +185,5 @@ public class WeixinComponentProxy {
component(componentId).getTokenManager());
}
public final static String VERSION = "1.7.0";
public final static String VERSION = "1.7.1";
}

2
weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java
View File

@ -1926,5 +1926,5 @@ public class WeixinProxy {
return cardApi.createCardQR(expireSeconds, cardQRs);
}
public final static String VERSION = "1.7.0";
public final static String VERSION = "1.7.1";
}

6
weixin4j-qy/CHANGE.md
View File

@ -187,4 +187,8 @@
* 2016-06-20
+ version upgrade to 1.7.0
+ version upgrade to 1.7.0
* 2016-08-09
+ version upgrade to 1.7.1

2
weixin4j-qy/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.foxinmy</groupId>
<artifactId>weixin4j</artifactId>
<version>1.7.0</version>
<version>1.7.1</version>
</parent>
<artifactId>weixin4j-qy</artifactId>
<name>weixin4j-qy</name>

2
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinProxy.java
View File

@ -1353,5 +1353,5 @@ public class WeixinProxy {
return chatApi.sendChatMessage(message);
}
public final static String VERSION = "1.7.0";
public final static String VERSION = "1.7.1";
}

2
weixin4j-qy/src/main/java/com/foxinmy/weixin4j/qy/WeixinSuiteProxy.java
View File

@ -243,5 +243,5 @@ public class WeixinSuiteProxy {
return new WeixinProxy(suite(suiteId).getPerTicketManager(authCorpId), suite(suiteId).getTokenManager());
}
public final static String VERSION = "1.7.0";
public final static String VERSION = "1.7.1";
}