Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| beba6e494d |
16
.idea/checkstyle-idea.xml
generated
16
.idea/checkstyle-idea.xml
generated
@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CheckStyle-IDEA" serialisationVersion="2">
|
||||
<checkstyleVersion>10.22.0</checkstyleVersion>
|
||||
<scanScope>JavaOnly</scanScope>
|
||||
<copyLibs>true</copyLibs>
|
||||
<option name="thirdPartyClasspath" />
|
||||
<option name="activeLocationIds" />
|
||||
<option name="locations">
|
||||
<list>
|
||||
<ConfigurationLocation id="bundled-sun-checks" type="BUNDLED" scope="All" description="Sun Checks">(bundled)</ConfigurationLocation>
|
||||
<ConfigurationLocation id="bundled-google-checks" type="BUNDLED" scope="All" description="Google Checks">(bundled)</ConfigurationLocation>
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
21
.idea/compiler.xml
generated
21
.idea/compiler.xml
generated
@ -2,6 +2,7 @@
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<annotationProcessing>
|
||||
<profile default="true" name="Default" enabled="true" />
|
||||
<profile name="Maven default annotation processors profile" enabled="true">
|
||||
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||
@ -14,5 +15,25 @@
|
||||
<module name="wechat-j-oa" />
|
||||
</profile>
|
||||
</annotationProcessing>
|
||||
<bytecodeTargetLevel>
|
||||
<module name="wechat-j-oa (1)" target="11" />
|
||||
<module name="wechat-j-oa (2)" target="1.8" />
|
||||
<module name="weixin-graal" target="1.8" />
|
||||
<module name="weixin-java-common" target="1.8" />
|
||||
<module name="weixin-java-cp" target="1.8" />
|
||||
<module name="weixin-java-miniapp" target="1.8" />
|
||||
<module name="weixin-java-mp" target="1.8" />
|
||||
<module name="weixin-java-open" target="1.8" />
|
||||
<module name="weixin-java-pay" target="1.8" />
|
||||
<module name="weixin-java-qidian" target="1.8" />
|
||||
<module name="wx-java" target="1.8" />
|
||||
<module name="wx-java-cp-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-miniapp-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-mp-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-open-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-pay-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-qidian-spring-boot-starter" target="1.8" />
|
||||
<module name="wx-java-spring-boot-starters" target="1.8" />
|
||||
</bytecodeTargetLevel>
|
||||
</component>
|
||||
</project>
|
||||
22
.idea/encodings.xml
generated
22
.idea/encodings.xml
generated
@ -11,8 +11,30 @@
|
||||
<file url="file://$PROJECT_DIR$/open/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/pay/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/pay/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-cp-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-miniapp-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-mp-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-open-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-pay-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-graal/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-graal/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-miniapp/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-miniapp/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-mp/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-mp/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-qidian/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/weixin-java-qidian/src/main/resources" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/work/src/main/java" charset="UTF-8" />
|
||||
<file url="file://$PROJECT_DIR$/work/src/main/resources" charset="UTF-8" />
|
||||
</component>
|
||||
|
||||
1831
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
1831
.idea/inspectionProfiles/Project_Default.xml
generated
Normal file
File diff suppressed because it is too large
Load Diff
20
.idea/jarRepositories.xml
generated
20
.idea/jarRepositories.xml
generated
@ -1,20 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RemoteRepositoriesConfiguration">
|
||||
<remote-repository>
|
||||
<option name="id" value="ossez-repo-snapshots" />
|
||||
<option name="name" value="OSSEZ Private Snapshots" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-snapshots/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossez-repo-releases" />
|
||||
<option name="name" value="iSharkFly Private Releases" />
|
||||
<option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-releases/" />
|
||||
<option name="name" value="OSSEZ Private Releases" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-releases/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
<option name="name" value="Central Repository" />
|
||||
<option name="url" value="https://repo.isharkfly.com/repository/maven/" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossez-repo-snapshots" />
|
||||
<option name="name" value="iSharkFly Private Snapshots" />
|
||||
<option name="url" value="https://repo.isharkfly.com/repository/isharkfly-maven-snapshots/" />
|
||||
<option name="name" value="OSSEZ Private Snapshots" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="central" />
|
||||
@ -26,5 +31,10 @@
|
||||
<option name="name" value="JBoss Community repository" />
|
||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||
</remote-repository>
|
||||
<remote-repository>
|
||||
<option name="id" value="ossez-repo-releases" />
|
||||
<option name="name" value="OSSEZ Private Releases" />
|
||||
<option name="url" value="https://repo.ossez.com/repository/maven-public/" />
|
||||
</remote-repository>
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/jpa-buddy.xml
generated
Normal file
6
.idea/jpa-buddy.xml
generated
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JpaBuddyIdeaProjectConfig">
|
||||
<option name="renamerInitialized" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
12
.idea/php.xml
generated
Normal file
12
.idea/php.xml
generated
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="MessDetectorOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PHPCSFixerOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PHPCodeSnifferOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
</project>
|
||||
1
.idea/vcs.xml
generated
1
.idea/vcs.xml
generated
@ -2,5 +2,6 @@
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@ -82,6 +82,16 @@
|
||||
<artifactId>logback-classic</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ossez.wechat.common.model.entity.menu;
|
||||
package com.ossez.wechat.common.bean.menu;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
@ -19,7 +19,7 @@ import lombok.Data;
|
||||
public class WxMenu implements Serializable {
|
||||
private static final long serialVersionUID = -7083914585539687746L;
|
||||
|
||||
private List<MenuButton> buttons = new ArrayList<>();
|
||||
private List<WxMenuButton> buttons = new ArrayList<>();
|
||||
|
||||
private WxMenuRule matchRule;
|
||||
|
||||
@ -0,0 +1,96 @@
|
||||
package com.ossez.wechat.common.bean.menu;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.ossez.wechat.common.util.json.WxGsonBuilder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* menu button.
|
||||
*
|
||||
* @author Daniel Qian
|
||||
*/
|
||||
@Data
|
||||
public class WxMenuButton implements Serializable {
|
||||
private static final long serialVersionUID = -1070939403109776555L;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 菜单的响应动作类型.
|
||||
* view表示网页类型，
|
||||
* click表示点击类型，
|
||||
* miniprogram表示小程序类型
|
||||
* </pre>
|
||||
*/
|
||||
private String type;
|
||||
|
||||
/**
|
||||
* 菜单标题，不超过16个字节，子菜单不超过60个字节.
|
||||
*/
|
||||
private String name;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 菜单KEY值，用于消息接口推送，不超过128字节.
|
||||
* click等点击类型必须
|
||||
* </pre>
|
||||
*/
|
||||
private String key;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 网页链接.
|
||||
* 用户点击菜单可打开链接，不超过1024字节。type为miniprogram时，不支持小程序的老版本客户端将打开本url。
|
||||
* view、miniprogram类型必须
|
||||
* </pre>
|
||||
*/
|
||||
private String url;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 调用新增永久素材接口返回的合法media_id.
|
||||
* media_id类型和view_limited类型必须
|
||||
* </pre>
|
||||
*/
|
||||
@SerializedName("media_id")
|
||||
private String mediaId;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 调用发布图文接口获得的article_id.
|
||||
* article_id类型和article_view_limited类型必须
|
||||
* </pre>
|
||||
*/
|
||||
@SerializedName("article_id")
|
||||
private String articleId;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 小程序的appid.
|
||||
* miniprogram类型必须
|
||||
* </pre>
|
||||
*/
|
||||
@SerializedName("appid")
|
||||
private String appId;
|
||||
|
||||
/**
|
||||
* <pre>
|
||||
* 小程序的页面路径.
|
||||
* miniprogram类型必须
|
||||
* </pre>
|
||||
*/
|
||||
@SerializedName("pagepath")
|
||||
private String pagePath;
|
||||
|
||||
@SerializedName("sub_button")
|
||||
private List<WxMenuButton> subButtons = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return WxGsonBuilder.create().toJson(this);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package com.ossez.wechat.common.model.entity.menu;
|
||||
package com.ossez.wechat.common.bean.menu;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@ -58,33 +58,51 @@ public class WeChatConstant {
|
||||
/**
|
||||
* 主动发送消息(即客服消息)的消息类型.
|
||||
*/
|
||||
public static class MsgType {
|
||||
public static class KefuMsgType {
|
||||
/**
|
||||
* 消息类型:
|
||||
* text(文本)
|
||||
* image(图片)
|
||||
* voice(语音)
|
||||
* video(视频)
|
||||
* music(音乐)
|
||||
* news(图文消息 - 点击跳转到外链)
|
||||
* mpnews(图文消息 - 点击跳转到图文消息页面)
|
||||
* wxcard(卡券)
|
||||
* miniprogrampage(小程序)
|
||||
* markdown(目前仅支持markdown语法的子集，微工作台（原企业号）不支持展示markdown消息)
|
||||
* file(发送文件 - CP专用)
|
||||
* textcard(文本卡片消息 - CP专用)
|
||||
* wxcard(卡券消息)
|
||||
* 文本消息.
|
||||
*/
|
||||
public static final String TEXT = "text";
|
||||
/**
|
||||
* 图片消息.
|
||||
*/
|
||||
public static final String IMAGE = "image";
|
||||
/**
|
||||
* 语音消息.
|
||||
*/
|
||||
public static final String VOICE = "voice";
|
||||
/**
|
||||
* 视频消息.
|
||||
*/
|
||||
public static final String VIDEO = "video";
|
||||
/**
|
||||
* 音乐消息.
|
||||
*/
|
||||
public static final String MUSIC = "music";
|
||||
/**
|
||||
* 图文消息（点击跳转到外链）.
|
||||
*/
|
||||
public static final String NEWS = "news";
|
||||
/**
|
||||
* 图文消息（点击跳转到图文消息页面）.
|
||||
*/
|
||||
public static final String MPNEWS = "mpnews";
|
||||
/**
|
||||
* markdown消息.
|
||||
* （目前仅支持markdown语法的子集，微工作台（原企业号）不支持展示markdown消息）
|
||||
*/
|
||||
public static final String MARKDOWN = "markdown";
|
||||
/**
|
||||
* 发送文件（CP专用）.
|
||||
*/
|
||||
public static final String FILE = "file";
|
||||
/**
|
||||
* 文本卡片消息（CP专用）.
|
||||
*/
|
||||
public static final String TEXTCARD = "textcard";
|
||||
/**
|
||||
* 卡券消息.
|
||||
*/
|
||||
public static final String WXCARD = "wxcard";
|
||||
/**
|
||||
* 转发到客服的消息.
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
package com.ossez.wechat.common.exception;
|
||||
|
||||
/**
|
||||
* @author Daniel Qian
|
||||
*/
|
||||
public class DataStructureException extends WxErrorException {
|
||||
private static final long serialVersionUID = -6357149550353160810L;
|
||||
|
||||
private final WxError error;
|
||||
|
||||
private static final int DEFAULT_ERROR_CODE = -99;
|
||||
|
||||
public DataStructureException(String message) {
|
||||
this(WxError.builder().errorCode(DEFAULT_ERROR_CODE).errorMsg(message).build());
|
||||
}
|
||||
|
||||
public DataStructureException(WxError error) {
|
||||
super(error.toString());
|
||||
this.error = error;
|
||||
}
|
||||
|
||||
|
||||
public WxError getError() {
|
||||
return this.error;
|
||||
}
|
||||
}
|
||||
@ -1,34 +0,0 @@
|
||||
package com.ossez.wechat.common.model;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
/**
|
||||
* WeChatStatus Response Object
|
||||
*
|
||||
* @author YuCheng Hu
|
||||
*/
|
||||
|
||||
public class WeChatStatus {
|
||||
|
||||
@JsonProperty("errcode")
|
||||
private int errCode = 0;
|
||||
|
||||
@JsonProperty("errmsg")
|
||||
private String errMsg;
|
||||
|
||||
public int getErrCode() {
|
||||
return errCode;
|
||||
}
|
||||
|
||||
public void setErrCode(int errCode) {
|
||||
this.errCode = errCode;
|
||||
}
|
||||
|
||||
public String getErrMsg() {
|
||||
return errMsg;
|
||||
}
|
||||
|
||||
public void setErrMsg(String errMsg) {
|
||||
this.errMsg = errMsg;
|
||||
}
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package com.ossez.wechat.common.model.entity.builder;
|
||||
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.req.MenuRequest;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class MenuButtonBuilder {
|
||||
private List<MenuButton> subButtonList;
|
||||
private String type;
|
||||
private String name;
|
||||
private String key;
|
||||
private String url;
|
||||
|
||||
public MenuButtonBuilder setSubButtonList(List<MenuButton> subButtonList) {
|
||||
this.subButtonList = subButtonList;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MenuButtonBuilder setType(String type) {
|
||||
this.type = type;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MenuButtonBuilder setName(String name) {
|
||||
this.name = name;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MenuButtonBuilder setKey(String key) {
|
||||
this.key = key;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MenuButtonBuilder setUrl(String url) {
|
||||
this.url = url;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MenuButton createMenuButton() {
|
||||
return new MenuButton(subButtonList, type, name, key, url);
|
||||
}
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
package com.ossez.wechat.common.model.entity.menu;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import com.ossez.wechat.common.model.req.MenuRequest;
|
||||
import com.ossez.wechat.common.util.json.WxGsonBuilder;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* menu button.
|
||||
*
|
||||
* @author Daniel Qian
|
||||
*/
|
||||
@Data
|
||||
public class MenuButton implements Serializable {
|
||||
private static final long serialVersionUID = -1070939403109776555L;
|
||||
|
||||
public MenuButton(List<MenuButton> subButtonList, String type, String name, String key, String url) {
|
||||
this.subButtonList = subButtonList;
|
||||
this.type = type;
|
||||
this.name = name;
|
||||
this.key = key;
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
@JsonProperty(value = "sub_button")
|
||||
private List<MenuButton> subButtonList;
|
||||
@JsonProperty("type")
|
||||
private String type;
|
||||
@JsonProperty("name")
|
||||
private String name;
|
||||
@JsonProperty("key")
|
||||
private String key;
|
||||
@JsonProperty("url")
|
||||
private String url;
|
||||
}
|
||||
@ -1,40 +0,0 @@
|
||||
package com.ossez.wechat.common.model.req;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* CustomMessage
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
public class DataCubeRequest implements Serializable {
|
||||
private static final long serialVersionUID = -9196732086954365246L;
|
||||
|
||||
@JsonProperty(value = "begin_date", required = true)
|
||||
private String beginDate;
|
||||
|
||||
@JsonProperty(value = "end_date", required = true)
|
||||
private String endDate;
|
||||
|
||||
public String getBeginDate() {
|
||||
return beginDate;
|
||||
}
|
||||
|
||||
public void setBeginDate(String beginDate) {
|
||||
this.beginDate = beginDate;
|
||||
}
|
||||
|
||||
public String getEndDate() {
|
||||
return endDate;
|
||||
}
|
||||
|
||||
public void setEndDate(String endDate) {
|
||||
this.endDate = endDate;
|
||||
}
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
package com.ossez.wechat.common.model.req;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.res.DataCubeArticle;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* CustomMessage
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
public class MenuRequest implements Serializable {
|
||||
private static final long serialVersionUID = -9196732086954365246L;
|
||||
@JsonProperty(value = "button", required = true)
|
||||
private List<MenuButton> buttonList;
|
||||
|
||||
|
||||
public List<MenuButton> getButtonList() {
|
||||
return buttonList;
|
||||
}
|
||||
|
||||
public void setButtonList(List<MenuButton> buttonList) {
|
||||
this.buttonList = buttonList;
|
||||
}
|
||||
}
|
||||
@ -1,130 +0,0 @@
|
||||
package com.ossez.wechat.common.model.res;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* UserSummaryResponse Object
|
||||
*
|
||||
* @author YuCheng Hu
|
||||
*/
|
||||
public class DataCubeArticle {
|
||||
@JsonProperty("list")
|
||||
private List<ArticleData> articleDataList;
|
||||
|
||||
public static class ArticleData {
|
||||
@JsonProperty("ref_date")
|
||||
private String refDate;
|
||||
|
||||
@JsonProperty("msgid")
|
||||
private String msgId;
|
||||
@JsonProperty("title")
|
||||
private String title;
|
||||
@JsonProperty("int_page_read_user")
|
||||
private Long intPageReadUser;
|
||||
@JsonProperty("ori_page_read_user")
|
||||
private Long oriPageReadUser;
|
||||
@JsonProperty("ori_page_read_count")
|
||||
private Long oriPageReadCount;
|
||||
@JsonProperty("share_user")
|
||||
private Long shareUser;
|
||||
|
||||
@JsonProperty("shareCount")
|
||||
private Long shareCount;
|
||||
|
||||
@JsonProperty("add_to_fav_user")
|
||||
private Long addToFavUser;
|
||||
|
||||
@JsonProperty("add_to_fav_count")
|
||||
private Long addToFavCount;
|
||||
|
||||
public String getRefDate() {
|
||||
return refDate;
|
||||
}
|
||||
|
||||
public void setRefDate(String refDate) {
|
||||
this.refDate = refDate;
|
||||
}
|
||||
|
||||
public String getMsgId() {
|
||||
return msgId;
|
||||
}
|
||||
|
||||
public void setMsgId(String msgId) {
|
||||
this.msgId = msgId;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public Long getIntPageReadUser() {
|
||||
return intPageReadUser;
|
||||
}
|
||||
|
||||
public void setIntPageReadUser(Long intPageReadUser) {
|
||||
this.intPageReadUser = intPageReadUser;
|
||||
}
|
||||
|
||||
public Long getOriPageReadUser() {
|
||||
return oriPageReadUser;
|
||||
}
|
||||
|
||||
public void setOriPageReadUser(Long oriPageReadUser) {
|
||||
this.oriPageReadUser = oriPageReadUser;
|
||||
}
|
||||
|
||||
public Long getOriPageReadCount() {
|
||||
return oriPageReadCount;
|
||||
}
|
||||
|
||||
public void setOriPageReadCount(Long oriPageReadCount) {
|
||||
this.oriPageReadCount = oriPageReadCount;
|
||||
}
|
||||
|
||||
public Long getShareUser() {
|
||||
return shareUser;
|
||||
}
|
||||
|
||||
public void setShareUser(Long shareUser) {
|
||||
this.shareUser = shareUser;
|
||||
}
|
||||
|
||||
public Long getShareCount() {
|
||||
return shareCount;
|
||||
}
|
||||
|
||||
public void setShareCount(Long shareCount) {
|
||||
this.shareCount = shareCount;
|
||||
}
|
||||
|
||||
public Long getAddToFavUser() {
|
||||
return addToFavUser;
|
||||
}
|
||||
|
||||
public void setAddToFavUser(Long addToFavUser) {
|
||||
this.addToFavUser = addToFavUser;
|
||||
}
|
||||
|
||||
public Long getAddToFavCount() {
|
||||
return addToFavCount;
|
||||
}
|
||||
|
||||
public void setAddToFavCount(Long addToFavCount) {
|
||||
this.addToFavCount = addToFavCount;
|
||||
}
|
||||
}
|
||||
|
||||
public List<ArticleData> getArticleDataList() {
|
||||
return articleDataList;
|
||||
}
|
||||
|
||||
public void setArticleDataList(List<ArticleData> articleDataList) {
|
||||
this.articleDataList = articleDataList;
|
||||
}
|
||||
}
|
||||
@ -1,78 +0,0 @@
|
||||
package com.ossez.wechat.common.model.res;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* UserSummaryResponse Object
|
||||
*
|
||||
* @author YuCheng Hu
|
||||
*/
|
||||
public class DataCubeUser {
|
||||
@JsonProperty("list")
|
||||
private List<UserData> userDataList;
|
||||
|
||||
public static class UserData {
|
||||
@JsonProperty("ref_date")
|
||||
private String refDate;
|
||||
@JsonProperty("user_source")
|
||||
private Long userSource;
|
||||
|
||||
@JsonProperty("new_user")
|
||||
private Long newUser;
|
||||
@JsonProperty("cancel_user")
|
||||
private Long cancelUser;
|
||||
|
||||
@JsonProperty("cumulate_user")
|
||||
private Long cumulateUser;
|
||||
|
||||
public String getRefDate() {
|
||||
return refDate;
|
||||
}
|
||||
|
||||
public void setRefDate(String refDate) {
|
||||
this.refDate = refDate;
|
||||
}
|
||||
|
||||
public Long getUserSource() {
|
||||
return userSource;
|
||||
}
|
||||
|
||||
public void setUserSource(Long userSource) {
|
||||
this.userSource = userSource;
|
||||
}
|
||||
|
||||
public Long getNewUser() {
|
||||
return newUser;
|
||||
}
|
||||
|
||||
public void setNewUser(Long newUser) {
|
||||
this.newUser = newUser;
|
||||
}
|
||||
|
||||
public Long getCancelUser() {
|
||||
return cancelUser;
|
||||
}
|
||||
|
||||
public void setCancelUser(Long cancelUser) {
|
||||
this.cancelUser = cancelUser;
|
||||
}
|
||||
|
||||
public Long getCumulateUser() {
|
||||
return cumulateUser;
|
||||
}
|
||||
|
||||
public void setCumulateUser(Long cumulateUser) {
|
||||
this.cumulateUser = cumulateUser;
|
||||
}
|
||||
}
|
||||
|
||||
public List<UserData> getUserDataList() {
|
||||
return userDataList;
|
||||
}
|
||||
|
||||
public void setUserDataList(List<UserData> userDataList) {
|
||||
this.userDataList = userDataList;
|
||||
}
|
||||
}
|
||||
@ -5,7 +5,7 @@ import com.google.gson.GsonBuilder;
|
||||
import com.ossez.wechat.common.exception.WxError;
|
||||
import com.ossez.wechat.common.model.WeChatAccessToken;
|
||||
import com.ossez.wechat.common.bean.WxNetCheckResult;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.result.WxMediaUploadResult;
|
||||
import java.util.Objects;
|
||||
|
||||
|
||||
@ -9,10 +9,9 @@
|
||||
package com.ossez.wechat.common.util.json;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.ossez.wechat.common.model.entity.builder.MenuButtonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenuRule;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuButton;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuRule;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
|
||||
@ -20,16 +19,16 @@ import java.lang.reflect.Type;
|
||||
/**
|
||||
* @author Daniel Qian
|
||||
*/
|
||||
public class WxMenuGsonAdapter {
|
||||
public class WxMenuGsonAdapter implements JsonSerializer<WxMenu>, JsonDeserializer<WxMenu> {
|
||||
|
||||
// @Override
|
||||
@Override
|
||||
public JsonElement serialize(WxMenu menu, Type typeOfSrc, JsonSerializationContext context) {
|
||||
JsonObject json = new JsonObject();
|
||||
|
||||
JsonArray buttonArray = new JsonArray();
|
||||
for (MenuButton button : menu.getButtons()) {
|
||||
// JsonObject buttonJson = convertToJson(button);
|
||||
// buttonArray.add(buttonJson);
|
||||
for (WxMenuButton button : menu.getButtons()) {
|
||||
JsonObject buttonJson = convertToJson(button);
|
||||
buttonArray.add(buttonJson);
|
||||
}
|
||||
json.add("button", buttonArray);
|
||||
|
||||
@ -40,25 +39,25 @@ public class WxMenuGsonAdapter {
|
||||
return json;
|
||||
}
|
||||
|
||||
// protected JsonObject convertToJson(MenuButton button) {
|
||||
// JsonObject buttonJson = new JsonObject();
|
||||
// buttonJson.addProperty("type", button.getType());
|
||||
// buttonJson.addProperty("name", button.getName());
|
||||
// buttonJson.addProperty("key", button.getKey());
|
||||
// buttonJson.addProperty("url", button.getUrl());
|
||||
// buttonJson.addProperty("media_id", button.getMediaId());
|
||||
// buttonJson.addProperty("article_id", button.getArticleId());
|
||||
// buttonJson.addProperty("appid", button.getAppId());
|
||||
// buttonJson.addProperty("pagepath", button.getPagePath());
|
||||
// if (button.getSubButtons() != null && button.getSubButtons().size() > 0) {
|
||||
// JsonArray buttonArray = new JsonArray();
|
||||
// for (MenuButton sub_button : button.getSubButtons()) {
|
||||
// buttonArray.add(convertToJson(sub_button));
|
||||
// }
|
||||
// buttonJson.add("sub_button", buttonArray);
|
||||
// }
|
||||
// return buttonJson;
|
||||
// }
|
||||
protected JsonObject convertToJson(WxMenuButton button) {
|
||||
JsonObject buttonJson = new JsonObject();
|
||||
buttonJson.addProperty("type", button.getType());
|
||||
buttonJson.addProperty("name", button.getName());
|
||||
buttonJson.addProperty("key", button.getKey());
|
||||
buttonJson.addProperty("url", button.getUrl());
|
||||
buttonJson.addProperty("media_id", button.getMediaId());
|
||||
buttonJson.addProperty("article_id", button.getArticleId());
|
||||
buttonJson.addProperty("appid", button.getAppId());
|
||||
buttonJson.addProperty("pagepath", button.getPagePath());
|
||||
if (button.getSubButtons() != null && button.getSubButtons().size() > 0) {
|
||||
JsonArray buttonArray = new JsonArray();
|
||||
for (WxMenuButton sub_button : button.getSubButtons()) {
|
||||
buttonArray.add(convertToJson(sub_button));
|
||||
}
|
||||
buttonJson.add("sub_button", buttonArray);
|
||||
}
|
||||
return buttonJson;
|
||||
}
|
||||
|
||||
protected JsonObject convertToJson(WxMenuRule menuRule) {
|
||||
JsonObject matchRule = new JsonObject();
|
||||
@ -87,47 +86,47 @@ public class WxMenuGsonAdapter {
|
||||
return menuRule;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
// /*
|
||||
// * 操蛋的微信
|
||||
// * 创建菜单时是 { button : ... }
|
||||
// * 查询菜单时是 { menu : { button : ... } }
|
||||
// * 现在企业号升级为企业微信后，没有此问题，因此需要单独处理
|
||||
// */
|
||||
// JsonArray buttonsJson = json.getAsJsonObject().get("menu").getAsJsonObject().get("button").getAsJsonArray();
|
||||
// return this.buildMenuFromJson(buttonsJson);
|
||||
// }
|
||||
@Override
|
||||
public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
/*
|
||||
* 操蛋的微信
|
||||
* 创建菜单时是 { button : ... }
|
||||
* 查询菜单时是 { menu : { button : ... } }
|
||||
* 现在企业号升级为企业微信后，没有此问题，因此需要单独处理
|
||||
*/
|
||||
JsonArray buttonsJson = json.getAsJsonObject().get("menu").getAsJsonObject().get("button").getAsJsonArray();
|
||||
return this.buildMenuFromJson(buttonsJson);
|
||||
}
|
||||
|
||||
// protected WxMenu buildMenuFromJson(JsonArray buttonsJson) {
|
||||
// WxMenu menu = new WxMenu();
|
||||
// for (int i = 0; i < buttonsJson.size(); i++) {
|
||||
// JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject();
|
||||
// MenuButton button = convertFromJson(buttonJson);
|
||||
// menu.getButtons().add(button);
|
||||
// if (buttonJson.get("sub_button") == null || buttonJson.get("sub_button").isJsonNull()) {
|
||||
// continue;
|
||||
// }
|
||||
// JsonArray sub_buttonsJson = buttonJson.get("sub_button").getAsJsonArray();
|
||||
// for (int j = 0; j < sub_buttonsJson.size(); j++) {
|
||||
// JsonObject sub_buttonJson = sub_buttonsJson.get(j).getAsJsonObject();
|
||||
// button.getSubButtons().add(convertFromJson(sub_buttonJson));
|
||||
// }
|
||||
// }
|
||||
// return menu;
|
||||
// }
|
||||
protected WxMenu buildMenuFromJson(JsonArray buttonsJson) {
|
||||
WxMenu menu = new WxMenu();
|
||||
for (int i = 0; i < buttonsJson.size(); i++) {
|
||||
JsonObject buttonJson = buttonsJson.get(i).getAsJsonObject();
|
||||
WxMenuButton button = convertFromJson(buttonJson);
|
||||
menu.getButtons().add(button);
|
||||
if (buttonJson.get("sub_button") == null || buttonJson.get("sub_button").isJsonNull()) {
|
||||
continue;
|
||||
}
|
||||
JsonArray sub_buttonsJson = buttonJson.get("sub_button").getAsJsonArray();
|
||||
for (int j = 0; j < sub_buttonsJson.size(); j++) {
|
||||
JsonObject sub_buttonJson = sub_buttonsJson.get(j).getAsJsonObject();
|
||||
button.getSubButtons().add(convertFromJson(sub_buttonJson));
|
||||
}
|
||||
}
|
||||
return menu;
|
||||
}
|
||||
|
||||
// protected MenuButton convertFromJson(JsonObject json) {
|
||||
// MenuButton button = new MenuButtonBuilder().createMenuButton();
|
||||
// button.setName(GsonHelper.getString(json, "name"));
|
||||
// button.setKey(GsonHelper.getString(json, "key"));
|
||||
// button.setUrl(GsonHelper.getString(json, "url"));
|
||||
// button.setType(GsonHelper.getString(json, "type"));
|
||||
// button.setMediaId(GsonHelper.getString(json, "media_id"));
|
||||
// button.setArticleId(GsonHelper.getString(json, "article_id"));
|
||||
// button.setAppId(GsonHelper.getString(json, "appid"));
|
||||
// button.setPagePath(GsonHelper.getString(json, "pagepath"));
|
||||
// return button;
|
||||
// }
|
||||
protected WxMenuButton convertFromJson(JsonObject json) {
|
||||
WxMenuButton button = new WxMenuButton();
|
||||
button.setName(GsonHelper.getString(json, "name"));
|
||||
button.setKey(GsonHelper.getString(json, "key"));
|
||||
button.setUrl(GsonHelper.getString(json, "url"));
|
||||
button.setType(GsonHelper.getString(json, "type"));
|
||||
button.setMediaId(GsonHelper.getString(json, "media_id"));
|
||||
button.setArticleId(GsonHelper.getString(json, "article_id"));
|
||||
button.setAppId(GsonHelper.getString(json, "appid"));
|
||||
button.setPagePath(GsonHelper.getString(json, "pagepath"));
|
||||
return button;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,14 +1,11 @@
|
||||
package com.ossez.wechat.common.api;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
|
||||
import static org.testng.Assert.assertFalse;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
|
||||
/**
|
||||
* @author jiangby
|
||||
@ -16,8 +13,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
* @description: 作用
|
||||
* created on 2022/5/26 1:46
|
||||
*/
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
@Test
|
||||
public class WxMessageInMemoryDuplicateCheckerSingletonTest {
|
||||
|
||||
private static WxMessageInMemoryDuplicateCheckerSingleton checkerSingleton = WxMessageInMemoryDuplicateCheckerSingleton.getInstance();
|
||||
@ -28,14 +24,14 @@ public class WxMessageInMemoryDuplicateCheckerSingletonTest {
|
||||
// 第一次检查
|
||||
for (Long msgId : msgIds) {
|
||||
boolean result = checkerSingleton.isDuplicate(String.valueOf(msgId));
|
||||
assertThat(result).isFalse();
|
||||
assertFalse(result);
|
||||
}
|
||||
|
||||
// 初始化后1S进行检查 每五秒检查一次，过期时间为15秒，过15秒再检查
|
||||
TimeUnit.SECONDS.sleep(15);
|
||||
for (Long msgId : msgIds) {
|
||||
boolean result = checkerSingleton.isDuplicate(String.valueOf(msgId));
|
||||
assertThat(result).isTrue();
|
||||
assertTrue(result);
|
||||
}
|
||||
|
||||
// 过6秒再检查
|
||||
|
||||
@ -1,41 +1,39 @@
|
||||
package com.ossez.wechat.common.api;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.junit.jupiter.api.TestInstance.Lifecycle;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.testng.Assert.assertFalse;
|
||||
import static org.testng.Assert.assertTrue;
|
||||
|
||||
@TestInstance(Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
@Test
|
||||
public class WxMessageInMemoryDuplicateCheckerTest {
|
||||
private WxMessageInMemoryDuplicateChecker checker = new WxMessageInMemoryDuplicateChecker(2000L, 1000L);
|
||||
|
||||
@Test
|
||||
public void test() throws InterruptedException {
|
||||
Long[] msgIds = new Long[]{1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L};
|
||||
|
||||
// 第一次检查
|
||||
for (Long msgId : msgIds) {
|
||||
boolean result = checker.isDuplicate(String.valueOf(msgId));
|
||||
assertThat(result).isFalse();
|
||||
assertFalse(result);
|
||||
}
|
||||
|
||||
// 过1秒再检查
|
||||
TimeUnit.SECONDS.sleep(1);
|
||||
for (Long msgId : msgIds) {
|
||||
boolean result = checker.isDuplicate(String.valueOf(msgId));
|
||||
assertThat(result).isTrue();
|
||||
assertTrue(result);
|
||||
}
|
||||
|
||||
// 过1.5秒再检查
|
||||
TimeUnit.MILLISECONDS.sleep(1500L);
|
||||
for (Long msgId : msgIds) {
|
||||
boolean result = checker.isDuplicate(String.valueOf(msgId));
|
||||
assertThat(result).isFalse();
|
||||
assertFalse(result);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,40 +1,35 @@
|
||||
package com.ossez.wechat.common.exception;
|
||||
|
||||
import com.ossez.wechat.common.enums.WxType;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNull;
|
||||
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
@Test
|
||||
public class WxErrorTest {
|
||||
@Test
|
||||
public void testFromJson() {
|
||||
String json = "{ \"errcode\": 40003, \"errmsg\": \"invalid openid\" }";
|
||||
WxError wxError = WxError.fromJson(json, WxType.MP);
|
||||
assertThat(40003).isEqualTo(wxError.getErrorCode());
|
||||
// assertEquals(wxError.getErrorMsgEn(), "invalid openid");
|
||||
assertEquals(40003, wxError.getErrorCode());
|
||||
assertEquals(wxError.getErrorMsgEn(), "invalid openid");
|
||||
|
||||
}
|
||||
|
||||
// @Test
|
||||
// public void testFromBadJson1() {
|
||||
// String json = "{ \"errcode\": 40003, \"errmsg\": \"invalid openid\", \"media_id\": \"12323423dsfafsf232f\" }";
|
||||
// WxError wxError = WxError.fromJson(json, WxType.MP);
|
||||
// assertEquals(40003, wxError.getErrorCode());
|
||||
// assertEquals(wxError.getErrorMsgEn(), "invalid openid");
|
||||
//
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void testFromBadJson2() {
|
||||
// String json = "{\"access_token\":\"ACCESS_TOKEN\",\"expires_in\":7200}";
|
||||
// WxError wxError = WxError.fromJson(json, WxType.MP);
|
||||
// assertEquals(0, wxError.getErrorCode());
|
||||
// assertNull(wxError.getErrorMsg());
|
||||
//
|
||||
// }
|
||||
public void testFromBadJson1() {
|
||||
String json = "{ \"errcode\": 40003, \"errmsg\": \"invalid openid\", \"media_id\": \"12323423dsfafsf232f\" }";
|
||||
WxError wxError = WxError.fromJson(json, WxType.MP);
|
||||
assertEquals(40003, wxError.getErrorCode());
|
||||
assertEquals(wxError.getErrorMsgEn(), "invalid openid");
|
||||
|
||||
}
|
||||
|
||||
public void testFromBadJson2() {
|
||||
String json = "{\"access_token\":\"ACCESS_TOKEN\",\"expires_in\":7200}";
|
||||
WxError wxError = WxError.fromJson(json, WxType.MP);
|
||||
assertEquals(0, wxError.getErrorCode());
|
||||
assertNull(wxError.getErrorMsg());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
package com.ossez.wechat.common.model;
|
||||
|
||||
import com.ossez.wechat.common.model.entity.builder.MenuButtonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenuRule;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuButton;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuRule;
|
||||
import org.testng.*;
|
||||
import org.testng.annotations.*;
|
||||
|
||||
@ -19,41 +18,41 @@ public class WxMenuTest {
|
||||
@Test(dataProvider = "wxPushMenu")
|
||||
public void testToJson(String json) {
|
||||
WxMenu menu = new WxMenu();
|
||||
MenuButton button1 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button1 = new WxMenuButton();
|
||||
button1.setType("click");
|
||||
button1.setName("今日歌曲");
|
||||
button1.setKey("V1001_TODAY_MUSIC");
|
||||
|
||||
MenuButton button2 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button2 = new WxMenuButton();
|
||||
button2.setType("click");
|
||||
button2.setName("歌手简介");
|
||||
button2.setKey("V1001_TODAY_SINGER");
|
||||
|
||||
MenuButton button3 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button3 = new WxMenuButton();
|
||||
button3.setName("菜单");
|
||||
|
||||
menu.getButtons().add(button1);
|
||||
menu.getButtons().add(button2);
|
||||
menu.getButtons().add(button3);
|
||||
|
||||
MenuButton button31 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button31 = new WxMenuButton();
|
||||
button31.setType("view");
|
||||
button31.setName("搜索");
|
||||
button31.setUrl("http://www.soso.com/");
|
||||
|
||||
MenuButton button32 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button32 = new WxMenuButton();
|
||||
button32.setType("view");
|
||||
button32.setName("视频");
|
||||
button32.setUrl("http://v.qq.com/");
|
||||
|
||||
MenuButton button33 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button33 = new WxMenuButton();
|
||||
button33.setType("click");
|
||||
button33.setName("赞一下我们");
|
||||
button33.setKey("V1001_GOOD");
|
||||
|
||||
// button3.getSubButtons().add(button31);
|
||||
// button3.getSubButtons().add(button32);
|
||||
// button3.getSubButtons().add(button33);
|
||||
button3.getSubButtons().add(button31);
|
||||
button3.getSubButtons().add(button32);
|
||||
button3.getSubButtons().add(button33);
|
||||
|
||||
Assert.assertEquals(menu.toJson(), json);
|
||||
}
|
||||
@ -61,7 +60,7 @@ public class WxMenuTest {
|
||||
@Test(dataProvider = "wxAddConditionalMenu")
|
||||
public void testAddConditionalToJson(String json) {
|
||||
WxMenu menu = new WxMenu();
|
||||
MenuButton button1 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button1 = new WxMenuButton();
|
||||
button1.setType("click");
|
||||
button1.setName("今日歌曲");
|
||||
button1.setKey("V1001_TODAY_MUSIC");
|
||||
|
||||
10
mp/pom.xml
10
mp/pom.xml
@ -32,6 +32,16 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
|
||||
15
oa/pom.xml
15
oa/pom.xml
@ -31,6 +31,21 @@
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.ossez.wechat.oa.api;
|
||||
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.bean.menu.WxMpGetSelfMenuInfoResult;
|
||||
import com.ossez.wechat.oa.bean.menu.WxMpMenu;
|
||||
|
||||
@ -5,7 +5,7 @@ import com.ossez.wechat.oa.bean.menu.WxMpGetSelfMenuInfoResult;
|
||||
import com.ossez.wechat.oa.bean.menu.WxMpMenu;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.util.json.GsonParser;
|
||||
import com.ossez.wechat.oa.api.WxMpMenuService;
|
||||
|
||||
@ -1,149 +0,0 @@
|
||||
package com.ossez.wechat.oa.api.impl.okhttp;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant;
|
||||
import com.ossez.wechat.common.exception.DataStructureException;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.model.req.DataCubeRequest;
|
||||
import com.ossez.wechat.common.model.res.DataCubeArticle;
|
||||
import com.ossez.wechat.common.model.res.DataCubeUser;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.interceptor.AuthenticationInterceptor;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.interceptor.WeChatErrorInterceptor;
|
||||
import okhttp3.ConnectionPool;
|
||||
import okhttp3.OkHttpClient;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import retrofit2.HttpException;
|
||||
import retrofit2.Retrofit;
|
||||
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
|
||||
import retrofit2.converter.jackson.JacksonConverterFactory;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* WeChat Official Account Platform DataCube
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
public class WeChatDataCubeService {
|
||||
private final Logger log = LoggerFactory.getLogger(WeChatDataCubeService.class);
|
||||
|
||||
private WeChatOfficialAccountApi weChatOfficialAccountApi;
|
||||
|
||||
public WeChatDataCubeService(WeChatOfficialAccountService weChatOfficialAccountService) {
|
||||
String accessToken = null;
|
||||
try {
|
||||
accessToken = weChatOfficialAccountService.getAccessToken();
|
||||
} catch (WxErrorException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||
mapper.setSerializationInclusion(Include.NON_NULL);
|
||||
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
|
||||
|
||||
OkHttpClient client = new OkHttpClient.Builder().addInterceptor(new AuthenticationInterceptor(accessToken)).addInterceptor(new WeChatErrorInterceptor()).connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS)).readTimeout(1000, TimeUnit.SECONDS).build();
|
||||
|
||||
Retrofit retrofit = new Retrofit.Builder().baseUrl(WeChatConstant.ENDPOINT_WECHAT).client(client).addConverterFactory(JacksonConverterFactory.create(mapper)).addCallAdapterFactory(RxJava2CallAdapterFactory.create()).build();
|
||||
|
||||
this.weChatOfficialAccountApi = retrofit.create(WeChatOfficialAccountApi.class);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Get user summary
|
||||
*
|
||||
* @param beginDate
|
||||
* @param endDate
|
||||
* @return
|
||||
* @throws WxErrorException
|
||||
*/
|
||||
public DataCubeUser getUserSummary(LocalDateTime beginDate, LocalDateTime endDate) throws WxErrorException {
|
||||
if (!(ObjectUtils.isNotEmpty(beginDate) && ObjectUtils.isNotEmpty(endDate) && endDate.isAfter(beginDate))) {
|
||||
log.warn("The begin date [{}] Or end date [{}] was null or ender date greater than begin date.", beginDate, endDate);
|
||||
throw new DataStructureException("Query data range error ");
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
DataCubeRequest dataCubeRequest = new DataCubeRequest();
|
||||
dataCubeRequest.setBeginDate(beginDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
dataCubeRequest.setEndDate(endDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
|
||||
return weChatOfficialAccountApi.getUserSummary(dataCubeRequest).blockingGet();
|
||||
} catch (HttpException ex) {
|
||||
log.warn("Call WeChat API with error: " + ex);
|
||||
if (ex.code() == 400) {
|
||||
throw new WxErrorException(ex);
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public DataCubeUser getUserCumulate(LocalDateTime beginDate, LocalDateTime endDate) throws WxErrorException {
|
||||
if (!(ObjectUtils.isNotEmpty(beginDate) && ObjectUtils.isNotEmpty(endDate) && endDate.isAfter(beginDate))) {
|
||||
log.warn("The begin date [{}] Or end date [{}] was null or ender date greater than begin date.", beginDate, endDate);
|
||||
throw new DataStructureException("Query data range error ");
|
||||
}
|
||||
|
||||
try {
|
||||
DataCubeRequest dataCubeRequest = new DataCubeRequest();
|
||||
dataCubeRequest.setBeginDate(beginDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
dataCubeRequest.setEndDate(endDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
|
||||
return weChatOfficialAccountApi.getUserCumulate(dataCubeRequest).blockingGet();
|
||||
} catch (HttpException ex) {
|
||||
log.warn("Call WeChat API with error: " + ex);
|
||||
if (ex.code() == 400) {
|
||||
throw new WxErrorException(ex);
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param beginDate
|
||||
* @param endDate
|
||||
* @return
|
||||
* @throws WxErrorException
|
||||
*/
|
||||
public DataCubeArticle getArticleSummary(LocalDateTime beginDate, LocalDateTime endDate) throws WxErrorException {
|
||||
try {
|
||||
return weChatOfficialAccountApi.getarticlesummary(getDataCubeRequest(beginDate, endDate)).blockingGet();
|
||||
} catch (HttpException ex) {
|
||||
log.warn("Call WeChat API with error: " + ex);
|
||||
if (ex.code() == 400) {
|
||||
throw new WxErrorException(ex);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private DataCubeRequest getDataCubeRequest(LocalDateTime beginDate, LocalDateTime endDate) throws DataStructureException {
|
||||
if (!(ObjectUtils.isNotEmpty(beginDate) && ObjectUtils.isNotEmpty(endDate) && endDate.isAfter(beginDate))) {
|
||||
log.warn("The begin date [{}] Or end date [{}] was null or ender date greater than begin date.", beginDate, endDate);
|
||||
throw new DataStructureException("Query data range error ");
|
||||
}
|
||||
|
||||
DataCubeRequest dataCubeRequest = new DataCubeRequest();
|
||||
dataCubeRequest.setBeginDate(beginDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
dataCubeRequest.setEndDate(endDate.format(DateTimeFormatter.ISO_LOCAL_DATE));
|
||||
|
||||
return dataCubeRequest;
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,90 +0,0 @@
|
||||
package com.ossez.wechat.oa.api.impl.okhttp;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant;
|
||||
import com.ossez.wechat.common.exception.DataStructureException;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.model.WeChatStatus;
|
||||
import com.ossez.wechat.common.model.req.DataCubeRequest;
|
||||
import com.ossez.wechat.common.model.req.MenuRequest;
|
||||
import com.ossez.wechat.common.model.res.DataCubeArticle;
|
||||
import com.ossez.wechat.common.model.res.DataCubeUser;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.interceptor.AuthenticationInterceptor;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.interceptor.WeChatErrorInterceptor;
|
||||
import okhttp3.ConnectionPool;
|
||||
import okhttp3.OkHttpClient;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import retrofit2.HttpException;
|
||||
import retrofit2.Retrofit;
|
||||
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
|
||||
import retrofit2.converter.jackson.JacksonConverterFactory;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/**
|
||||
* WeChat Official Account Platform DataCube
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
public class WeChatMenuService {
|
||||
private final Logger log = LoggerFactory.getLogger(WeChatMenuService.class);
|
||||
|
||||
private WeChatOfficialAccountApi weChatOfficialAccountApi;
|
||||
|
||||
public WeChatMenuService(WeChatOfficialAccountService weChatOfficialAccountService) {
|
||||
String accessToken = null;
|
||||
try {
|
||||
accessToken = weChatOfficialAccountService.getAccessToken();
|
||||
} catch (WxErrorException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||
mapper.setSerializationInclusion(Include.NON_NULL);
|
||||
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
|
||||
|
||||
OkHttpClient client = new OkHttpClient.Builder()
|
||||
.addInterceptor(new AuthenticationInterceptor(accessToken))
|
||||
.addInterceptor(new WeChatErrorInterceptor())
|
||||
.connectionPool(new ConnectionPool(5, 1, TimeUnit.SECONDS)).readTimeout(1000, TimeUnit.SECONDS)
|
||||
.build();
|
||||
|
||||
Retrofit retrofit = new Retrofit.Builder().baseUrl(WeChatConstant.ENDPOINT_WECHAT).client(client)
|
||||
.addConverterFactory(JacksonConverterFactory.create(mapper))
|
||||
.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
|
||||
.build();
|
||||
|
||||
this.weChatOfficialAccountApi = retrofit.create(WeChatOfficialAccountApi.class);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @param menuRequest
|
||||
* @return
|
||||
* @throws WxErrorException
|
||||
*/
|
||||
public WeChatStatus create(MenuRequest menuRequest) throws WxErrorException {
|
||||
try {
|
||||
|
||||
return weChatOfficialAccountApi.createMenu(menuRequest).blockingGet();
|
||||
} catch (HttpException ex) {
|
||||
log.warn("Call WeChat API with error: " + ex);
|
||||
if (ex.code() == 400) {
|
||||
throw new WxErrorException(ex);
|
||||
}
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,7 +1,6 @@
|
||||
package com.ossez.wechat.oa.api.impl.okhttp;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude.Include;
|
||||
import com.fasterxml.jackson.databind.DeserializationFeature;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
||||
@ -30,7 +29,7 @@ import java.util.concurrent.TimeUnit;
|
||||
public class WeChatMsgService {
|
||||
private final Logger log = LoggerFactory.getLogger(WeChatMsgService.class);
|
||||
|
||||
private WeChatOfficialAccountApi weChatOfficialAccountApi;
|
||||
WeChatOfficialAccountApi weChatOfficialAccountApi;
|
||||
|
||||
public WeChatMsgService(WeChatOfficialAccountService weChatOfficialAccountService) {
|
||||
String accessToken = null;
|
||||
@ -42,7 +41,7 @@ public class WeChatMsgService {
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
|
||||
mapper.setSerializationInclusion(Include.NON_NULL);
|
||||
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
|
||||
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
|
||||
|
||||
OkHttpClient client = new OkHttpClient.Builder()
|
||||
@ -56,8 +55,10 @@ public class WeChatMsgService {
|
||||
.build();
|
||||
|
||||
this.weChatOfficialAccountApi = retrofit.create(WeChatOfficialAccountApi.class);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public String sendMessage(CustomMessage customMessage) throws WxErrorException {
|
||||
|
||||
try {
|
||||
|
||||
@ -2,12 +2,11 @@ package com.ossez.wechat.oa.api.impl.okhttp;
|
||||
|
||||
import com.ossez.wechat.common.model.WeChatAccessToken;
|
||||
import com.ossez.wechat.common.model.WeChatApiDomainIp;
|
||||
import com.ossez.wechat.common.model.WeChatStatus;
|
||||
import com.ossez.wechat.common.model.req.*;
|
||||
import com.ossez.wechat.common.model.res.DataCubeArticle;
|
||||
import com.ossez.wechat.common.model.req.CustomMessage;
|
||||
import com.ossez.wechat.common.model.req.NetworkCheck;
|
||||
import com.ossez.wechat.common.model.req.QueryQuota;
|
||||
import com.ossez.wechat.common.model.res.NetworkCheckResponse;
|
||||
import com.ossez.wechat.common.model.res.QueryQuotaResponse;
|
||||
import com.ossez.wechat.common.model.res.DataCubeUser;
|
||||
import io.reactivex.Single;
|
||||
import retrofit2.http.Body;
|
||||
import retrofit2.http.GET;
|
||||
@ -32,37 +31,5 @@ public interface WeChatOfficialAccountApi {
|
||||
Single<QueryQuotaResponse> queryQuota(@Body QueryQuota request);
|
||||
|
||||
@POST("/cgi-bin/message/custom/send")
|
||||
Single<WeChatStatus> sendMessage(@Body CustomMessage customMessage);
|
||||
|
||||
// MENU
|
||||
@POST("/cgi-bin/menu/create")
|
||||
Single<WeChatStatus> createMenu(@Body MenuRequest menuRequest);
|
||||
|
||||
@GET("/cgi-bin/get_current_selfmenu_info")
|
||||
Single<WeChatStatus> getMenu();
|
||||
|
||||
// DATA ANALYST
|
||||
@POST("/datacube/getusersummary")
|
||||
Single<DataCubeUser> getUserSummary(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getusercumulate")
|
||||
Single<DataCubeUser> getUserCumulate(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getarticlesummary")
|
||||
Single<DataCubeArticle> getarticlesummary(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getarticletotal")
|
||||
Single<DataCubeUser> getarticletotal(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getuserread")
|
||||
Single<DataCubeUser> getuserread(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getuserreadhour")
|
||||
Single<DataCubeUser> getuserreadhour(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getusershare")
|
||||
Single<DataCubeUser> getusershare(@Body DataCubeRequest dataCubeRequest);
|
||||
|
||||
@POST("/datacube/getusersharehour")
|
||||
Single<DataCubeUser> getusersharehour(@Body DataCubeRequest dataCubeRequest);
|
||||
Single<WeChatAccessToken> sendMessage(@Body CustomMessage customMessage);
|
||||
}
|
||||
@ -11,11 +11,10 @@ import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* kefu message Object
|
||||
* 客服消息.
|
||||
*
|
||||
* @author YuCheng
|
||||
* @author chanjarster
|
||||
*/
|
||||
@Data
|
||||
public class WxMpKefuMessage implements Serializable {
|
||||
@ -125,18 +124,18 @@ public class WxMpKefuMessage implements Serializable {
|
||||
/**
|
||||
* <pre>
|
||||
* 请使用
|
||||
* {@link WeChatConstant.MsgType#TEXT}
|
||||
* {@link WeChatConstant.MsgType#IMAGE}
|
||||
* {@link WeChatConstant.MsgType#VOICE}
|
||||
* {@link WeChatConstant.MsgType#MUSIC}
|
||||
* {@link WeChatConstant.MsgType#VIDEO}
|
||||
* {@link WeChatConstant.MsgType#NEWS}
|
||||
* {@link WeChatConstant.MsgType#MPNEWS}
|
||||
* {@link WeChatConstant.MsgType#WXCARD}
|
||||
* {@link WeChatConstant.MsgType#MINIPROGRAMPAGE}
|
||||
* {@link WeChatConstant.MsgType#TASKCARD}
|
||||
* {@link WeChatConstant.MsgType#MSGMENU}
|
||||
* {@link WeChatConstant.MsgType#MP_NEWS_ARTICLE}
|
||||
* {@link WeChatConstant.KefuMsgType#TEXT}
|
||||
* {@link WeChatConstant.KefuMsgType#IMAGE}
|
||||
* {@link WeChatConstant.KefuMsgType#VOICE}
|
||||
* {@link WeChatConstant.KefuMsgType#MUSIC}
|
||||
* {@link WeChatConstant.KefuMsgType#VIDEO}
|
||||
* {@link WeChatConstant.KefuMsgType#NEWS}
|
||||
* {@link WeChatConstant.KefuMsgType#MPNEWS}
|
||||
* {@link WeChatConstant.KefuMsgType#WXCARD}
|
||||
* {@link WeChatConstant.KefuMsgType#MINIPROGRAMPAGE}
|
||||
* {@link WeChatConstant.KefuMsgType#TASKCARD}
|
||||
* {@link WeChatConstant.KefuMsgType#MSGMENU}
|
||||
* {@link WeChatConstant.KefuMsgType#MP_NEWS_ARTICLE}
|
||||
* </pre>
|
||||
*/
|
||||
public void setMsgType(String msgType) {
|
||||
|
||||
@ -8,8 +8,9 @@ import lombok.Data;
|
||||
import com.ossez.wechat.oa.util.json.WxMpGsonBuilder;
|
||||
|
||||
/**
|
||||
* @author YuCheng
|
||||
* @author Binary Wang
|
||||
*/
|
||||
@Data
|
||||
public class WxMpKfOnlineList implements Serializable {
|
||||
private static final long serialVersionUID = -6154705288500854617L;
|
||||
|
||||
@ -25,11 +26,4 @@ public class WxMpKfOnlineList implements Serializable {
|
||||
return WxMpGsonBuilder.create().toJson(this);
|
||||
}
|
||||
|
||||
public List<WxMpKfInfo> getKfOnlineList() {
|
||||
return kfOnlineList;
|
||||
}
|
||||
|
||||
public void setKfOnlineList(List<WxMpKfInfo> kfOnlineList) {
|
||||
this.kfOnlineList = kfOnlineList;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@ import java.util.List;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
import lombok.Data;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenuRule;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuButton;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuRule;
|
||||
import com.ossez.wechat.common.util.json.WxGsonBuilder;
|
||||
import com.ossez.wechat.oa.util.json.WxMpGsonBuilder;
|
||||
|
||||
@ -46,7 +46,7 @@ public class WxMpMenu implements Serializable {
|
||||
private static final long serialVersionUID = -2279946921755382289L;
|
||||
|
||||
@SerializedName("button")
|
||||
private List<MenuButton> buttons;
|
||||
private List<WxMenuButton> buttons;
|
||||
@SerializedName("matchrule")
|
||||
private WxMenuRule rule;
|
||||
@SerializedName("menuid")
|
||||
|
||||
@ -24,7 +24,7 @@ public class WxMpXmlOutTransferKefuMessage extends WxMpXmlOutMessage {
|
||||
protected TransInfo transInfo;
|
||||
|
||||
public WxMpXmlOutTransferKefuMessage() {
|
||||
this.msgType = WeChatConstant.MsgType.TRANSFER_CUSTOMER_SERVICE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TRANSFER_CUSTOMER_SERVICE;
|
||||
}
|
||||
|
||||
@Data
|
||||
|
||||
@ -15,7 +15,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
|
||||
private String mediaId;
|
||||
|
||||
public ImageBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.IMAGE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.IMAGE;
|
||||
}
|
||||
|
||||
public ImageBuilder mediaId(String media_id) {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.ossez.wechat.oa.builder.kefu;
|
||||
|
||||
import com.ossez.wechat.common.constant.WeChatConstant.MsgType;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant.KefuMsgType;
|
||||
import com.ossez.wechat.oa.bean.kefu.WxMpKefuMessage;
|
||||
|
||||
/**
|
||||
@ -20,7 +20,7 @@ public final class MiniProgramPageBuilder extends BaseBuilder<MiniProgramPageBui
|
||||
private String thumbMediaId;
|
||||
|
||||
public MiniProgramPageBuilder() {
|
||||
this.msgType = MsgType.MINIPROGRAMPAGE;
|
||||
this.msgType = KefuMsgType.MINIPROGRAMPAGE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ public final class MpNewsArticleBuilder extends BaseBuilder<MpNewsArticleBuilder
|
||||
private String articleId;
|
||||
|
||||
public MpNewsArticleBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MP_NEWS_ARTICLE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MP_NEWS_ARTICLE;
|
||||
}
|
||||
|
||||
public MpNewsArticleBuilder articleId(String articleId) {
|
||||
|
||||
@ -16,7 +16,7 @@ public final class MpNewsBuilder extends BaseBuilder<MpNewsBuilder> {
|
||||
private String mediaId;
|
||||
|
||||
public MpNewsBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MPNEWS;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MPNEWS;
|
||||
}
|
||||
|
||||
public MpNewsBuilder mediaId(String mediaId) {
|
||||
|
||||
@ -24,7 +24,7 @@ public final class MusicBuilder extends BaseBuilder<MusicBuilder> {
|
||||
private String hqMusicUrl;
|
||||
|
||||
public MusicBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MUSIC;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MUSIC;
|
||||
}
|
||||
|
||||
public MusicBuilder musicUrl(String musicurl) {
|
||||
|
||||
@ -20,7 +20,7 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
|
||||
private List<WxMpKefuMessage.WxArticle> articles = new ArrayList<>();
|
||||
|
||||
public NewsBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.NEWS;
|
||||
this.msgType = WeChatConstant.KefuMsgType.NEWS;
|
||||
}
|
||||
|
||||
public NewsBuilder addArticle(WxMpKefuMessage.WxArticle... articles) {
|
||||
|
||||
@ -15,7 +15,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
|
||||
private String content;
|
||||
|
||||
public TextBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.TEXT;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TEXT;
|
||||
}
|
||||
|
||||
public TextBuilder content(String content) {
|
||||
|
||||
@ -24,7 +24,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
|
||||
private String thumbMediaId;
|
||||
|
||||
public VideoBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.VIDEO;
|
||||
this.msgType = WeChatConstant.KefuMsgType.VIDEO;
|
||||
}
|
||||
|
||||
public VideoBuilder mediaId(String mediaId) {
|
||||
|
||||
@ -15,7 +15,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
|
||||
private String mediaId;
|
||||
|
||||
public VoiceBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.VOICE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.VOICE;
|
||||
}
|
||||
|
||||
public VoiceBuilder mediaId(String media_id) {
|
||||
|
||||
@ -15,7 +15,7 @@ public final class WxCardBuilder extends BaseBuilder<WxCardBuilder> {
|
||||
private String cardId;
|
||||
|
||||
public WxCardBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.WXCARD;
|
||||
this.msgType = WeChatConstant.KefuMsgType.WXCARD;
|
||||
}
|
||||
|
||||
public WxCardBuilder cardId(String cardId) {
|
||||
|
||||
@ -23,7 +23,7 @@ public final class WxMsgMenuBuilder extends BaseBuilder<WxMsgMenuBuilder> {
|
||||
|
||||
|
||||
public WxMsgMenuBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MSGMENU;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MSGMENU;
|
||||
}
|
||||
|
||||
public WxMsgMenuBuilder addMenus(WxMpKefuMessage.MsgMenu... msgMenus) {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.ossez.wechat.oa.util.json;
|
||||
|
||||
import com.google.gson.*;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant.MsgType;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant.KefuMsgType;
|
||||
import com.ossez.wechat.common.exception.WxRuntimeException;
|
||||
import com.ossez.wechat.oa.bean.kefu.WxMpKefuMessage;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@ -17,22 +17,22 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
messageJson.addProperty("msgtype", message.getMsgType());
|
||||
|
||||
switch (message.getMsgType()) {
|
||||
case MsgType.TEXT:
|
||||
case KefuMsgType.TEXT:
|
||||
JsonObject text = new JsonObject();
|
||||
text.addProperty("content", message.getContent());
|
||||
messageJson.add("text", text);
|
||||
break;
|
||||
case MsgType.IMAGE:
|
||||
case KefuMsgType.IMAGE:
|
||||
JsonObject image = new JsonObject();
|
||||
image.addProperty("media_id", message.getMediaId());
|
||||
messageJson.add("image", image);
|
||||
break;
|
||||
case MsgType.VOICE:
|
||||
case KefuMsgType.VOICE:
|
||||
JsonObject voice = new JsonObject();
|
||||
voice.addProperty("media_id", message.getMediaId());
|
||||
messageJson.add("voice", voice);
|
||||
break;
|
||||
case MsgType.VIDEO:
|
||||
case KefuMsgType.VIDEO:
|
||||
JsonObject video = new JsonObject();
|
||||
video.addProperty("media_id", message.getMediaId());
|
||||
video.addProperty("thumb_media_id", message.getThumbMediaId());
|
||||
@ -40,7 +40,7 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
video.addProperty("description", message.getDescription());
|
||||
messageJson.add("video", video);
|
||||
break;
|
||||
case MsgType.MUSIC:
|
||||
case KefuMsgType.MUSIC:
|
||||
JsonObject music = new JsonObject();
|
||||
music.addProperty("title", message.getTitle());
|
||||
music.addProperty("description", message.getDescription());
|
||||
@ -49,7 +49,7 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
music.addProperty("hqmusicurl", message.getHqMusicUrl());
|
||||
messageJson.add("music", music);
|
||||
break;
|
||||
case MsgType.NEWS:
|
||||
case KefuMsgType.NEWS:
|
||||
JsonObject newsJsonObject = new JsonObject();
|
||||
JsonArray articleJsonArray = new JsonArray();
|
||||
for (WxMpKefuMessage.WxArticle article : message.getArticles()) {
|
||||
@ -63,17 +63,17 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
newsJsonObject.add("articles", articleJsonArray);
|
||||
messageJson.add("news", newsJsonObject);
|
||||
break;
|
||||
case MsgType.MPNEWS:
|
||||
case KefuMsgType.MPNEWS:
|
||||
JsonObject json = new JsonObject();
|
||||
json.addProperty("media_id", message.getMpNewsMediaId());
|
||||
messageJson.add("mpnews", json);
|
||||
break;
|
||||
case MsgType.WXCARD:
|
||||
case KefuMsgType.WXCARD:
|
||||
JsonObject wxcard = new JsonObject();
|
||||
wxcard.addProperty("card_id", message.getCardId());
|
||||
messageJson.add("wxcard", wxcard);
|
||||
break;
|
||||
case MsgType.MINIPROGRAMPAGE:
|
||||
case KefuMsgType.MINIPROGRAMPAGE:
|
||||
JsonObject miniProgramPage = new JsonObject();
|
||||
miniProgramPage.addProperty("title", message.getTitle());
|
||||
miniProgramPage.addProperty("appid", message.getMiniProgramAppId());
|
||||
@ -81,7 +81,7 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
miniProgramPage.addProperty("thumb_media_id", message.getThumbMediaId());
|
||||
messageJson.add("miniprogrampage", miniProgramPage);
|
||||
break;
|
||||
case MsgType.MSGMENU: {
|
||||
case KefuMsgType.MSGMENU: {
|
||||
JsonObject msgmenuJsonObject = new JsonObject();
|
||||
JsonArray listJsonArray = new JsonArray();
|
||||
for (WxMpKefuMessage.MsgMenu list : message.getMsgMenus()) {
|
||||
@ -96,7 +96,7 @@ public class WxMpKefuMessageGsonAdapter implements JsonSerializer<WxMpKefuMessag
|
||||
messageJson.add("msgmenu", msgmenuJsonObject);
|
||||
break;
|
||||
}
|
||||
case MsgType.MP_NEWS_ARTICLE:
|
||||
case KefuMsgType.MP_NEWS_ARTICLE:
|
||||
JsonObject mpNewsArticleJson = new JsonObject();
|
||||
mpNewsArticleJson.addProperty("article_id", message.getMpNewsArticleId());
|
||||
messageJson.add("mpnewsarticle", mpNewsArticleJson);
|
||||
|
||||
@ -1,196 +0,0 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.DataStructureException;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.model.res.DataCubeArticle;
|
||||
import com.ossez.wechat.common.model.res.DataCubeUser;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatDataCubeService;
|
||||
import com.ossez.wechat.oa.api.test.TestBase;
|
||||
import com.ossez.wechat.oa.api.test.TestConfigStorage;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Test for datacube API
|
||||
* @author YuCheng
|
||||
*/
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
public class DataCubeServiceTest extends TestBase {
|
||||
private static final Logger log = LoggerFactory.getLogger(TestBase.class);
|
||||
|
||||
@Inject
|
||||
protected TestConfigStorage testConfigStorage;
|
||||
|
||||
@Inject
|
||||
protected WeChatDataCubeService weChatDataCubeService;
|
||||
|
||||
@Test
|
||||
public void testGetUserSummarye() throws WxErrorException, DataStructureException {
|
||||
DataCubeUser dataCubeUser = weChatDataCubeService.getUserSummary(LocalDateTime.now().minusDays(4), LocalDateTime.now().minusDays(1));
|
||||
|
||||
assertThat(dataCubeUser).isNotNull();
|
||||
assertThat(dataCubeUser.getUserDataList().size()).isEqualTo(4);
|
||||
assertThat(dataCubeUser.getUserDataList().get(0).getCancelUser()).isGreaterThanOrEqualTo(0);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetUserCumulate() throws WxErrorException {
|
||||
DataCubeUser dataCubeUser = weChatDataCubeService.getUserCumulate(LocalDateTime.now().minusDays(4), LocalDateTime.now().minusDays(1));
|
||||
|
||||
assertThat(dataCubeUser).isNotNull();
|
||||
assertThat(dataCubeUser.getUserDataList().size()).isEqualTo(4);
|
||||
assertThat(dataCubeUser.getUserDataList().get(0).getCumulateUser()).isGreaterThanOrEqualTo(0);
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetarticlesummary() throws WxErrorException {
|
||||
DataCubeArticle dataCubeArticle = weChatDataCubeService.getArticleSummary(LocalDateTime.now().minusDays(12), LocalDateTime.now().minusDays(12));
|
||||
|
||||
assertThat(dataCubeArticle).isNotNull();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
//
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetArticleSummary(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
// .getArticleSummary(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
// */
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetArticleTotal(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeArticleTotal> results = this.wxService.getDataCubeService()
|
||||
// .getArticleTotal(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "threeDays")
|
||||
// public void testGetUserRead(Date beginDate, Date endDate)
|
||||
// throws WxErrorException {
|
||||
// List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
// .getUserRead(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetUserReadHour(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
// .getUserReadHour(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "sevenDays")
|
||||
// public void testGetUserShare(Date beginDate, Date endDate)
|
||||
// throws WxErrorException {
|
||||
// List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
// .getUserShare(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetUserShareHour(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
// .getUserShareHour(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "sevenDays")
|
||||
// public void testGetUpstreamMsg(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsg(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetUpstreamMsgHour(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgHour(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "thirtyDays")
|
||||
// public void testGetUpstreamMsgWeek(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgWeek(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
// */
|
||||
// @Test(dataProvider = "thirtyDays")
|
||||
// public void testGetUpstreamMsgMonth(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgMonth(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "fifteenDays")
|
||||
// public void testGetUpstreamMsgDist(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgDist(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "thirtyDays")
|
||||
// public void testGetUpstreamMsgDistWeek(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgDistWeek(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// /**
|
||||
// * TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
// */
|
||||
// @Test(dataProvider = "thirtyDays")
|
||||
// public void testGetUpstreamMsgDistMonth(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
// .getUpstreamMsgDistMonth(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "thirtyDays")
|
||||
// public void testGetInterfaceSummary(Date beginDate, Date endDate) throws WxErrorException {
|
||||
// List<WxDataCubeInterfaceResult> results = this.wxService.getDataCubeService()
|
||||
// .getInterfaceSummary(beginDate, endDate);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "oneDay")
|
||||
// public void testGetInterfaceSummaryHour(Date date) throws WxErrorException {
|
||||
// List<WxDataCubeInterfaceResult> results = this.wxService.getDataCubeService()
|
||||
// .getInterfaceSummaryHour(date, date);
|
||||
// Assert.assertNotNull(results);
|
||||
// System.out.println(results);
|
||||
// }
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.model.WeChatStatus;
|
||||
import com.ossez.wechat.common.model.entity.builder.MenuButtonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.model.req.MenuRequest;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatMenuService;
|
||||
import com.ossez.wechat.oa.api.test.TestBase;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.junit.jupiter.api.TestInstance.Lifecycle;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* Test for datacube API
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
@TestInstance(Lifecycle.PER_CLASS)
|
||||
public class MenuServiceTest extends TestBase {
|
||||
private static final Logger log = LoggerFactory.getLogger(TestBase.class);
|
||||
@Inject
|
||||
protected WeChatMenuService weChatMenuService;
|
||||
|
||||
/**
|
||||
* Test Create Menu
|
||||
*
|
||||
* @throws WxErrorException
|
||||
*/
|
||||
@Test
|
||||
public void testCreate() throws WxErrorException {
|
||||
log.debug("Create WeChat Offical Account Menun Test");
|
||||
MenuRequest menuRequest = new MenuRequest();
|
||||
|
||||
List<MenuButton> buttonList = new ArrayList<>();
|
||||
|
||||
List<MenuButton> menuLinkButtonList = new ArrayList<>();
|
||||
menuLinkButtonList.add(new MenuButtonBuilder()
|
||||
.setType("view")
|
||||
.setName("地产经纪")
|
||||
.setUrl("https://www.verani.com/").createMenuButton());
|
||||
|
||||
|
||||
menuLinkButtonList.add(new MenuButtonBuilder()
|
||||
.setType("view")
|
||||
.setName("置业科普")
|
||||
.setUrl("https://www.isharkfly.com/c/realestate/8").createMenuButton());
|
||||
|
||||
menuLinkButtonList.add(new MenuButtonBuilder()
|
||||
.setType("view")
|
||||
.setName("USVisaTrack")
|
||||
.setUrl("https://www.usvisatrack.com/").createMenuButton());
|
||||
|
||||
MenuButton buttonTop = new MenuButtonBuilder().createMenuButton();
|
||||
buttonTop.setName("Shark 服务");
|
||||
buttonTop.setSubButtonList(menuLinkButtonList);
|
||||
buttonList.add(buttonTop);
|
||||
|
||||
menuRequest.setButtonList(buttonList);
|
||||
|
||||
WeChatStatus weChatStatus = weChatMenuService.create(menuRequest);
|
||||
|
||||
assertThat(weChatStatus).isNotNull();
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -2,21 +2,25 @@ package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.WxMpCommentService;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.bean.comment.WxMpCommentListVo;
|
||||
import org.mockito.ArgumentMatchers;
|
||||
import org.mockito.Matchers;
|
||||
import org.mockito.Mockito;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
/**
|
||||
* Test Classes move to use Junit 5
|
||||
* 测试类.
|
||||
*
|
||||
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
||||
* created on 2019-06-16
|
||||
*/
|
||||
|
||||
@Test
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpCommentServiceImplTest {
|
||||
@ -58,7 +62,7 @@ public class WxMpCommentServiceImplTest {
|
||||
|
||||
wxService = Mockito.spy(wxService);
|
||||
WxMpCommentService commentService = new WxMpCommentServiceImpl(wxService);
|
||||
Mockito.doReturn(expectedResponse).when(wxService).post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString());
|
||||
Mockito.doReturn(expectedResponse).when(wxService).post(Matchers.anyString(), Matchers.anyString());
|
||||
|
||||
final WxMpCommentListVo commentListVo = commentService.list("1", 1, 1, 1, 1);
|
||||
assertThat(commentListVo).isNotNull();
|
||||
|
||||
@ -0,0 +1,208 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.bean.datacube.*;
|
||||
import org.apache.commons.lang3.time.FastDateFormat;
|
||||
import org.testng.Assert;
|
||||
import org.testng.annotations.DataProvider;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 测试统计分析相关的接口
|
||||
* Created by Binary Wang on 2016/8/23.
|
||||
*
|
||||
* @author binarywang (https://github.com/binarywang)
|
||||
*/
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpDataCubeServiceImplTest {
|
||||
@Inject
|
||||
protected WeChatOfficialAccountService wxService;
|
||||
private FastDateFormat simpleDateFormat = FastDateFormat
|
||||
.getInstance("yyyy-MM-dd");
|
||||
|
||||
@DataProvider
|
||||
public Object[][] oneDay() throws ParseException {
|
||||
return new Object[][]{{this.simpleDateFormat.parse("2016-08-22")}};
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] threeDays() throws ParseException {
|
||||
return new Object[][]{{this.simpleDateFormat.parse("2016-08-20"),
|
||||
this.simpleDateFormat.parse("2016-08-22")}};
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] sevenDays() throws ParseException {
|
||||
return new Object[][]{{this.simpleDateFormat.parse("2016-08-16"),
|
||||
this.simpleDateFormat.parse("2016-08-22")}};
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] fifteenDays() throws ParseException {
|
||||
return new Object[][]{{this.simpleDateFormat.parse("2016-08-14"),
|
||||
this.simpleDateFormat.parse("2016-08-27")}};
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] thirtyDays() throws ParseException {
|
||||
return new Object[][]{{this.simpleDateFormat.parse("2016-07-30"),
|
||||
this.simpleDateFormat.parse("2016-08-27")}};
|
||||
}
|
||||
|
||||
@Test(dataProvider = "sevenDays")
|
||||
public void testGetUserSummary(Date beginDate, Date endDate)
|
||||
throws WxErrorException {
|
||||
List<WxDataCubeUserSummary> summaries = this.wxService.getDataCubeService()
|
||||
.getUserSummary(beginDate, endDate);
|
||||
Assert.assertNotNull(summaries);
|
||||
System.out.println(summaries);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "sevenDays")
|
||||
public void testGetUserCumulate(Date beginDate, Date endDate)
|
||||
throws WxErrorException {
|
||||
List<WxDataCubeUserCumulate> result = this.wxService.getDataCubeService()
|
||||
.getUserCumulate(beginDate, endDate);
|
||||
Assert.assertNotNull(result);
|
||||
System.out.println(result);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetArticleSummary(Date date) throws WxErrorException {
|
||||
List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
.getArticleSummary(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
*/
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetArticleTotal(Date date) throws WxErrorException {
|
||||
List<WxDataCubeArticleTotal> results = this.wxService.getDataCubeService()
|
||||
.getArticleTotal(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "threeDays")
|
||||
public void testGetUserRead(Date beginDate, Date endDate)
|
||||
throws WxErrorException {
|
||||
List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
.getUserRead(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetUserReadHour(Date date) throws WxErrorException {
|
||||
List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
.getUserReadHour(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "sevenDays")
|
||||
public void testGetUserShare(Date beginDate, Date endDate)
|
||||
throws WxErrorException {
|
||||
List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
.getUserShare(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetUserShareHour(Date date) throws WxErrorException {
|
||||
List<WxDataCubeArticleResult> results = this.wxService.getDataCubeService()
|
||||
.getUserShareHour(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "sevenDays")
|
||||
public void testGetUpstreamMsg(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsg(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetUpstreamMsgHour(Date date) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgHour(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "thirtyDays")
|
||||
public void testGetUpstreamMsgWeek(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgWeek(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
*/
|
||||
@Test(dataProvider = "thirtyDays")
|
||||
public void testGetUpstreamMsgMonth(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgMonth(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "fifteenDays")
|
||||
public void testGetUpstreamMsgDist(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgDist(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "thirtyDays")
|
||||
public void testGetUpstreamMsgDistWeek(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgDistWeek(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
/**
|
||||
* TODO 该接口，暂时没找到有数据的日期，无法测试验证
|
||||
*/
|
||||
@Test(dataProvider = "thirtyDays")
|
||||
public void testGetUpstreamMsgDistMonth(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeMsgResult> results = this.wxService.getDataCubeService()
|
||||
.getUpstreamMsgDistMonth(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "thirtyDays")
|
||||
public void testGetInterfaceSummary(Date beginDate, Date endDate) throws WxErrorException {
|
||||
List<WxDataCubeInterfaceResult> results = this.wxService.getDataCubeService()
|
||||
.getInterfaceSummary(beginDate, endDate);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "oneDay")
|
||||
public void testGetInterfaceSummaryHour(Date date) throws WxErrorException {
|
||||
List<WxDataCubeInterfaceResult> results = this.wxService.getDataCubeService()
|
||||
.getInterfaceSummaryHour(date, date);
|
||||
Assert.assertNotNull(results);
|
||||
System.out.println(results);
|
||||
}
|
||||
}
|
||||
@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* created on 2021/5/13/013
|
||||
*/
|
||||
|
||||
//@Guice(modules = ApiTestModule.class)
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpGuideBuyerServiceImplTest {
|
||||
@Inject
|
||||
protected WeChatOfficialAccountService wxService;
|
||||
|
||||
@ -18,9 +18,9 @@ import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @author <a href="https://www.sacoc.cn">广州跨界-宋心成</a>
|
||||
* created on 2021/5/13/013
|
||||
*/
|
||||
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
|
||||
@ -3,11 +3,11 @@ package com.ossez.wechat.oa.api.impl;
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.bean.guide.*;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
||||
* created on 2020-10-06
|
||||
*/
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpGuideServiceImplTest {
|
||||
@Inject
|
||||
protected WeChatOfficialAccountService wxService;
|
||||
|
||||
@ -3,25 +3,25 @@ package com.ossez.wechat.oa.api.impl;
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.bean.guide.WxMpGuideBuyerResp;
|
||||
import com.ossez.wechat.oa.bean.guide.WxMpGuideTagInfo;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* @author <a href="https://www.sacoc.cn">广州跨界-宋心成</a>
|
||||
* created on 2021/5/13/013
|
||||
*/
|
||||
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpGuideTagServiceImplTest {
|
||||
|
||||
@Inject
|
||||
protected WeChatOfficialAccountService wxService;
|
||||
|
||||
|
||||
@ -1,26 +1,30 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.util.fs.FileUtils;
|
||||
import com.ossez.wechat.common.service.WxImgProcService;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.api.test.TestConstants;
|
||||
import com.ossez.wechat.common.bean.imgproc.WxImgProcAiCropResult;
|
||||
import com.ossez.wechat.common.bean.imgproc.WxImgProcQrCodeResult;
|
||||
import com.ossez.wechat.common.bean.imgproc.WxImgProcSuperResolutionResult;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.service.WxImgProcService;
|
||||
import com.ossez.wechat.common.util.fs.FileUtils;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.TestConstants;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.mockito.Matchers;
|
||||
import org.mockito.Mockito;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.util.UUID;
|
||||
|
||||
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
@Test
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpImgProcServiceImplTest {
|
||||
@Inject
|
||||
private WeChatOfficialAccountService mpService;
|
||||
@ -92,120 +96,120 @@ public class WxMpImgProcServiceImplTest {
|
||||
public static class mockTest {
|
||||
private WeChatOfficialAccountService wxService = Mockito.mock(WeChatOfficialAccountService.class);
|
||||
|
||||
// @Test
|
||||
// public void testQrCode() throws Exception {
|
||||
// String returnJson = "{\n" +
|
||||
// " \"errcode\": 0, \n" +
|
||||
// " \"errmsg\": \"ok\", \n" +
|
||||
// " \"code_results\": [\n" +
|
||||
// " {\n" +
|
||||
// " \"type_name\": \"QR_CODE\", \n" +
|
||||
// " \"data\": \"https://www.qq.com\", \n" +
|
||||
// " \"pos\": {\n" +
|
||||
// " \"left_top\": {\n" +
|
||||
// " \"x\": 585, \n" +
|
||||
// " \"y\": 378\n" +
|
||||
// " }, \n" +
|
||||
// " \"right_top\": {\n" +
|
||||
// " \"x\": 828, \n" +
|
||||
// " \"y\": 378\n" +
|
||||
// " }, \n" +
|
||||
// " \"right_bottom\": {\n" +
|
||||
// " \"x\": 828, \n" +
|
||||
// " \"y\": 618\n" +
|
||||
// " }, \n" +
|
||||
// " \"left_bottom\": {\n" +
|
||||
// " \"x\": 585, \n" +
|
||||
// " \"y\": 618\n" +
|
||||
// " }\n" +
|
||||
// " }\n" +
|
||||
// " }, \n" +
|
||||
// " {\n" +
|
||||
// " \"type_name\": \"QR_CODE\", \n" +
|
||||
// " \"data\": \"https://mp.weixin.qq.com\", \n" +
|
||||
// " \"pos\": {\n" +
|
||||
// " \"left_top\": {\n" +
|
||||
// " \"x\": 185, \n" +
|
||||
// " \"y\": 142\n" +
|
||||
// " }, \n" +
|
||||
// " \"right_top\": {\n" +
|
||||
// " \"x\": 396, \n" +
|
||||
// " \"y\": 142\n" +
|
||||
// " }, \n" +
|
||||
// " \"right_bottom\": {\n" +
|
||||
// " \"x\": 396, \n" +
|
||||
// " \"y\": 353\n" +
|
||||
// " }, \n" +
|
||||
// " \"left_bottom\": {\n" +
|
||||
// " \"x\": 185, \n" +
|
||||
// " \"y\": 353\n" +
|
||||
// " }\n" +
|
||||
// " }\n" +
|
||||
// " }, \n" +
|
||||
// " {\n" +
|
||||
// " \"type_name\": \"EAN_13\", \n" +
|
||||
// " \"data\": \"5906789678957\"\n" +
|
||||
// " }, \n" +
|
||||
// " {\n" +
|
||||
// " \"type_name\": \"CODE_128\", \n" +
|
||||
// " \"data\": \"50090500019191\"\n" +
|
||||
// " }\n" +
|
||||
// " ], \n" +
|
||||
// " \"img_size\": {\n" +
|
||||
// " \"w\": 1000, \n" +
|
||||
// " \"h\": 900\n" +
|
||||
// " }\n" +
|
||||
// "}";
|
||||
// Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
// final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
// final WxImgProcQrCodeResult result = wxMpImgProcService.qrCode("abc");
|
||||
// Assertions.assertThat(result).isNotNull();
|
||||
// System.out.println(result);
|
||||
// }
|
||||
@Test
|
||||
public void testQrCode() throws Exception {
|
||||
String returnJson = "{\n" +
|
||||
" \"errcode\": 0, \n" +
|
||||
" \"errmsg\": \"ok\", \n" +
|
||||
" \"code_results\": [\n" +
|
||||
" {\n" +
|
||||
" \"type_name\": \"QR_CODE\", \n" +
|
||||
" \"data\": \"https://www.qq.com\", \n" +
|
||||
" \"pos\": {\n" +
|
||||
" \"left_top\": {\n" +
|
||||
" \"x\": 585, \n" +
|
||||
" \"y\": 378\n" +
|
||||
" }, \n" +
|
||||
" \"right_top\": {\n" +
|
||||
" \"x\": 828, \n" +
|
||||
" \"y\": 378\n" +
|
||||
" }, \n" +
|
||||
" \"right_bottom\": {\n" +
|
||||
" \"x\": 828, \n" +
|
||||
" \"y\": 618\n" +
|
||||
" }, \n" +
|
||||
" \"left_bottom\": {\n" +
|
||||
" \"x\": 585, \n" +
|
||||
" \"y\": 618\n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
" }, \n" +
|
||||
" {\n" +
|
||||
" \"type_name\": \"QR_CODE\", \n" +
|
||||
" \"data\": \"https://mp.weixin.qq.com\", \n" +
|
||||
" \"pos\": {\n" +
|
||||
" \"left_top\": {\n" +
|
||||
" \"x\": 185, \n" +
|
||||
" \"y\": 142\n" +
|
||||
" }, \n" +
|
||||
" \"right_top\": {\n" +
|
||||
" \"x\": 396, \n" +
|
||||
" \"y\": 142\n" +
|
||||
" }, \n" +
|
||||
" \"right_bottom\": {\n" +
|
||||
" \"x\": 396, \n" +
|
||||
" \"y\": 353\n" +
|
||||
" }, \n" +
|
||||
" \"left_bottom\": {\n" +
|
||||
" \"x\": 185, \n" +
|
||||
" \"y\": 353\n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
" }, \n" +
|
||||
" {\n" +
|
||||
" \"type_name\": \"EAN_13\", \n" +
|
||||
" \"data\": \"5906789678957\"\n" +
|
||||
" }, \n" +
|
||||
" {\n" +
|
||||
" \"type_name\": \"CODE_128\", \n" +
|
||||
" \"data\": \"50090500019191\"\n" +
|
||||
" }\n" +
|
||||
" ], \n" +
|
||||
" \"img_size\": {\n" +
|
||||
" \"w\": 1000, \n" +
|
||||
" \"h\": 900\n" +
|
||||
" }\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
final WxImgProcQrCodeResult result = wxMpImgProcService.qrCode("abc");
|
||||
Assertions.assertThat(result).isNotNull();
|
||||
System.out.println(result);
|
||||
}
|
||||
|
||||
// @Test
|
||||
// public void testSuperResolution() throws Exception {
|
||||
// String returnJson = "{\n" +
|
||||
// " \"errcode\": 0, \n" +
|
||||
// " \"errmsg\": \"ok\", \n" +
|
||||
// " \"media_id\": \"6WXsIXkG7lXuDLspD9xfm5dsvHzb0EFl0li6ySxi92ap8Vl3zZoD9DpOyNudeJGB\"\n" +
|
||||
// "}";
|
||||
// Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
// final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
// final WxImgProcSuperResolutionResult result = wxMpImgProcService.superResolution("abc");
|
||||
// Assertions.assertThat(result).isNotNull();
|
||||
// System.out.println(result);
|
||||
// }
|
||||
@Test
|
||||
public void testSuperResolution() throws Exception {
|
||||
String returnJson = "{\n" +
|
||||
" \"errcode\": 0, \n" +
|
||||
" \"errmsg\": \"ok\", \n" +
|
||||
" \"media_id\": \"6WXsIXkG7lXuDLspD9xfm5dsvHzb0EFl0li6ySxi92ap8Vl3zZoD9DpOyNudeJGB\"\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
final WxImgProcSuperResolutionResult result = wxMpImgProcService.superResolution("abc");
|
||||
Assertions.assertThat(result).isNotNull();
|
||||
System.out.println(result);
|
||||
}
|
||||
|
||||
// @Test
|
||||
// public void testAiCrop() throws Exception {
|
||||
// String returnJson = "{\n" +
|
||||
// " \"errcode\": 0, \n" +
|
||||
// " \"errmsg\": \"ok\", \n" +
|
||||
// " \"results\": [ //智能裁剪结果\n" +
|
||||
// " {\n" +
|
||||
// " \"crop_left\": 112, \n" +
|
||||
// " \"crop_top\": 0, \n" +
|
||||
// " \"crop_right\": 839, \n" +
|
||||
// " \"crop_bottom\": 727\n" +
|
||||
// " }, \n" +
|
||||
// " {\n" +
|
||||
// " \"crop_left\": 0, \n" +
|
||||
// " \"crop_top\": 205, \n" +
|
||||
// " \"crop_right\": 965, \n" +
|
||||
// " \"crop_bottom\": 615\n" +
|
||||
// " }\n" +
|
||||
// " ], \n" +
|
||||
// " \"img_size\": { //图片大小\n" +
|
||||
// " \"w\": 966, \n" +
|
||||
// " \"h\": 728\n" +
|
||||
// " }\n" +
|
||||
// "}";
|
||||
// Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
// final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
// final WxImgProcAiCropResult result = wxMpImgProcService.aiCrop("abc");
|
||||
// Assertions.assertThat(result).isNotNull();
|
||||
// System.out.println(result);
|
||||
// }
|
||||
@Test
|
||||
public void testAiCrop() throws Exception {
|
||||
String returnJson = "{\n" +
|
||||
" \"errcode\": 0, \n" +
|
||||
" \"errmsg\": \"ok\", \n" +
|
||||
" \"results\": [ //智能裁剪结果\n" +
|
||||
" {\n" +
|
||||
" \"crop_left\": 112, \n" +
|
||||
" \"crop_top\": 0, \n" +
|
||||
" \"crop_right\": 839, \n" +
|
||||
" \"crop_bottom\": 727\n" +
|
||||
" }, \n" +
|
||||
" {\n" +
|
||||
" \"crop_left\": 0, \n" +
|
||||
" \"crop_top\": 205, \n" +
|
||||
" \"crop_right\": 965, \n" +
|
||||
" \"crop_bottom\": 615\n" +
|
||||
" }\n" +
|
||||
" ], \n" +
|
||||
" \"img_size\": { //图片大小\n" +
|
||||
" \"w\": 966, \n" +
|
||||
" \"h\": 728\n" +
|
||||
" }\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.get(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxImgProcService wxMpImgProcService = new WxMpImgProcServiceImpl(wxService);
|
||||
final WxImgProcAiCropResult result = wxMpImgProcService.aiCrop("abc");
|
||||
Assertions.assertThat(result).isNotNull();
|
||||
System.out.println(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,203 +1,202 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant.MsgType;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.model.req.CustomMessage;
|
||||
import com.ossez.wechat.common.model.req.CustomMessage.KfText;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatMsgService;
|
||||
import com.ossez.wechat.oa.api.test.TestBase;
|
||||
import java.io.File;
|
||||
import java.time.Instant;
|
||||
import java.time.temporal.ChronoUnit;
|
||||
import java.util.Date;
|
||||
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.api.test.TestConfigStorage;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.TestInstance;
|
||||
import org.junit.jupiter.api.TestInstance.Lifecycle;
|
||||
import com.ossez.wechat.oa.bean.kefu.WxMpKefuMessage;
|
||||
import com.ossez.wechat.oa.bean.kefu.request.WxMpKfAccountRequest;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.testng.annotations.*;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfInfo;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfList;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfMsgList;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfOnlineList;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfSessionGetResult;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfSessionList;
|
||||
import com.ossez.wechat.oa.bean.kefu.result.WxMpKfSessionWaitCaseList;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 测试客服相关接口
|
||||
*
|
||||
* @author Binary Wang
|
||||
*/
|
||||
@TestInstance(Lifecycle.PER_CLASS)
|
||||
@Slf4j
|
||||
public class WxMpKefuServiceImplTest extends TestBase {
|
||||
@Inject
|
||||
protected TestConfigStorage testConfigStorage;
|
||||
@Test
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpKefuServiceImplTest {
|
||||
|
||||
@Inject
|
||||
protected WeChatMsgService weChatMsgService;
|
||||
protected WeChatOfficialAccountService wxService;
|
||||
|
||||
public void testSendKefuMpNewsMessage() throws WxErrorException {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
WxMpKefuMessage message = new WxMpKefuMessage();
|
||||
message.setMsgType(WeChatConstant.KefuMsgType.MPNEWS);
|
||||
message.setToUser(configStorage.getOpenid());
|
||||
message.setMpNewsMediaId("52R6dL2FxDpM9N1rCY3sYBqHwq-L7K_lz1sPI71idMg");
|
||||
|
||||
// public void testSendKefuMpNewsMessage() throws WxErrorException {
|
||||
// TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
// WxMpKefuMessage message = new WxMpKefuMessage();
|
||||
// message.setMsgType(WeChatConstant.MsgType.MPNEWS);
|
||||
// message.setToUser(configStorage.getOpenid());
|
||||
// message.setMpNewsMediaId("52R6dL2FxDpM9N1rCY3sYBqHwq-L7K_lz1sPI71idMg");
|
||||
//
|
||||
// boolean result = this.wxService.getKefuService().sendKefuMessage(message);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
|
||||
|
||||
@Test
|
||||
void testSendKefuMessage() throws WxErrorException {
|
||||
|
||||
|
||||
StringBuilder stringBuilder = new StringBuilder();
|
||||
stringBuilder.append("欢迎使用 WeChat-J API " + System.lineSeparator());
|
||||
stringBuilder.append("回车换行测试 " + System.lineSeparator());
|
||||
stringBuilder.append("超链接:<a href=\"https://www.ossez.com/\">OSSEZ.COM</a>");
|
||||
|
||||
CustomMessage.KfText kfText = new CustomMessage.KfText("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"https://www.ossez.com/\">OSSEZ.COM</a>");
|
||||
CustomMessage customMessage = new CustomMessage();
|
||||
customMessage.setToUser(testConfigStorage.getOpenid());
|
||||
customMessage.setMsgType(MsgType.TEXT);
|
||||
customMessage.setText(new KfText(stringBuilder.toString()));
|
||||
|
||||
|
||||
String result = weChatMsgService.sendMessage(customMessage);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
boolean result = this.wxService.getKefuService().sendKefuMessage(message);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
// public void testSendKefuMessageWithKfAccount() throws WxErrorException {
|
||||
// TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
// WxMpKefuMessage message = new WxMpKefuMessage();
|
||||
// message.setMsgType(WeChatConstant.MsgType.TEXT);
|
||||
// message.setToUser(configStorage.getOpenid());
|
||||
// message.setKfAccount(configStorage.getKfAccount());
|
||||
// message.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
|
||||
//
|
||||
// boolean result = this.wxService.getKefuService().sendKefuMessage(message);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
//
|
||||
// public void testKfList() throws WxErrorException {
|
||||
// WxMpKfList kfList = this.wxService.getKefuService().kfList();
|
||||
// assertThat(kfList).isNotNull();
|
||||
// for (WxMpKfInfo k : kfList.getKfList()) {
|
||||
// System.err.println(k);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public void testKfOnlineList() throws WxErrorException {
|
||||
// WxMpKfOnlineList kfOnlineList = this.wxService.getKefuService().kfOnlineList();
|
||||
// assertThat(kfOnlineList).isNotNull();
|
||||
// for (WxMpKfInfo k : kfOnlineList.getKfOnlineList()) {
|
||||
// System.err.println(k);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @DataProvider
|
||||
// public Object[][] getKfAccount() {
|
||||
// TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
// return new Object[][]{{configStorage.getKfAccount()}};
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccount")
|
||||
// public void testKfAccountAdd(String kfAccount) throws WxErrorException {
|
||||
// WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
// .kfAccount(kfAccount).nickName("我晕").build();
|
||||
// assertThat(this.wxService.getKefuService().kfAccountAdd(request)).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dependsOnMethods = {
|
||||
// "testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
// public void testKfAccountUpdate(String kfAccount) throws WxErrorException {
|
||||
// WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
// .kfAccount(kfAccount).nickName("我晕").build();
|
||||
// assertThat(this.wxService.getKefuService().kfAccountUpdate(request)).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dependsOnMethods = {
|
||||
// "testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
// public void testKfAccountInviteWorker(String kfAccount) throws WxErrorException {
|
||||
// WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
// .kfAccount(kfAccount).inviteWx(" ").build();
|
||||
// assertThat(this.wxService.getKefuService().kfAccountInviteWorker(request)).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dependsOnMethods = {"testKfAccountUpdate", "testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
// public void testKfAccountUploadHeadImg(String kfAccount) throws WxErrorException {
|
||||
// File imgFile = new File("src\\test\\resources\\mm.jpeg");
|
||||
// boolean result = this.wxService.getKefuService().kfAccountUploadHeadImg(kfAccount, imgFile);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccount")
|
||||
// public void testKfAccountDel(String kfAccount) throws WxErrorException {
|
||||
// boolean result = this.wxService.getKefuService().kfAccountDel(kfAccount);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
//
|
||||
// @DataProvider
|
||||
// public Object[][] getKfAccountAndOpenid() {
|
||||
// TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
// return new Object[][]{{configStorage.getKfAccount(), configStorage.getOpenid()}};
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccountAndOpenid")
|
||||
// public void testKfSessionCreate(String kfAccount, String openid) throws WxErrorException {
|
||||
// boolean result = this.wxService.getKefuService().kfSessionCreate(openid, kfAccount);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccountAndOpenid")
|
||||
// public void testKfSessionClose(String kfAccount, String openid) throws WxErrorException {
|
||||
// boolean result = this.wxService.getKefuService().kfSessionClose(openid, kfAccount);
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccountAndOpenid")
|
||||
// public void testKfSessionGet(@SuppressWarnings("unused") String kfAccount, String openid) throws WxErrorException {
|
||||
// WxMpKfSessionGetResult result = this.wxService.getKefuService().kfSessionGet(openid);
|
||||
// assertThat(result).isNotNull();
|
||||
// System.err.println(result);
|
||||
// }
|
||||
//
|
||||
// @Test(dataProvider = "getKfAccount")
|
||||
// public void testKfSessionList(String kfAccount) throws WxErrorException {
|
||||
// WxMpKfSessionList result = this.wxService.getKefuService().kfSessionList(kfAccount);
|
||||
// assertThat(result).isNotNull();
|
||||
// System.err.println(result);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void testKfSessionGetWaitCase() throws WxErrorException {
|
||||
// WxMpKfSessionWaitCaseList result = this.wxService.getKefuService().kfSessionGetWaitCase();
|
||||
// assertThat(result).isNotNull();
|
||||
// System.err.println(result);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void testKfMsgList() throws WxErrorException {
|
||||
// // Date startTime = DateTime.now().minusDays(1).toDate();
|
||||
// // Date endTime = DateTime.now().minusDays(0).toDate();
|
||||
// Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
|
||||
// Date endTime = Date.from(Instant.now());
|
||||
//
|
||||
// WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime, 1L, 50);
|
||||
// assertThat(result).isNotNull();
|
||||
// System.err.println(result);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void testKfMsgListAll() throws WxErrorException {
|
||||
// // Date startTime = DateTime.now().minusDays(1).toDate();
|
||||
// // Date endTime = DateTime.now().minusDays(0).toDate();
|
||||
// Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
|
||||
// Date endTime = Date.from(Instant.now());
|
||||
//
|
||||
// WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime);
|
||||
// assertThat(result).isNotNull();
|
||||
// System.err.println(result);
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// public void testSendKfTypingState() throws WxErrorException {
|
||||
// TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
// boolean result = this.wxService.getKefuService().sendKfTypingState(configStorage.getOpenid(), "Typing");
|
||||
// Assertions.assertThat(result).isTrue();
|
||||
// }
|
||||
}
|
||||
public void testSendKefuMessage() throws WxErrorException {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
WxMpKefuMessage message = new WxMpKefuMessage();
|
||||
message.setMsgType(WeChatConstant.KefuMsgType.TEXT);
|
||||
message.setToUser(configStorage.getOpenid());
|
||||
message.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
|
||||
|
||||
boolean result = this.wxService.getKefuService().sendKefuMessage(message);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
public void testSendKefuMessageWithKfAccount() throws WxErrorException {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
WxMpKefuMessage message = new WxMpKefuMessage();
|
||||
message.setMsgType(WeChatConstant.KefuMsgType.TEXT);
|
||||
message.setToUser(configStorage.getOpenid());
|
||||
message.setKfAccount(configStorage.getKfAccount());
|
||||
message.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
|
||||
|
||||
boolean result = this.wxService.getKefuService().sendKefuMessage(message);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
public void testKfList() throws WxErrorException {
|
||||
WxMpKfList kfList = this.wxService.getKefuService().kfList();
|
||||
assertThat(kfList).isNotNull();
|
||||
for (WxMpKfInfo k : kfList.getKfList()) {
|
||||
System.err.println(k);
|
||||
}
|
||||
}
|
||||
|
||||
public void testKfOnlineList() throws WxErrorException {
|
||||
WxMpKfOnlineList kfOnlineList = this.wxService.getKefuService().kfOnlineList();
|
||||
assertThat(kfOnlineList).isNotNull();
|
||||
for (WxMpKfInfo k : kfOnlineList.getKfOnlineList()) {
|
||||
System.err.println(k);
|
||||
}
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] getKfAccount() {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
return new Object[][]{{configStorage.getKfAccount()}};
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccount")
|
||||
public void testKfAccountAdd(String kfAccount) throws WxErrorException {
|
||||
WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
.kfAccount(kfAccount).nickName("我晕").build();
|
||||
assertThat(this.wxService.getKefuService().kfAccountAdd(request)).isTrue();
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = {
|
||||
"testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
public void testKfAccountUpdate(String kfAccount) throws WxErrorException {
|
||||
WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
.kfAccount(kfAccount).nickName("我晕").build();
|
||||
assertThat(this.wxService.getKefuService().kfAccountUpdate(request)).isTrue();
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = {
|
||||
"testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
public void testKfAccountInviteWorker(String kfAccount) throws WxErrorException {
|
||||
WxMpKfAccountRequest request = WxMpKfAccountRequest.builder()
|
||||
.kfAccount(kfAccount).inviteWx(" ").build();
|
||||
assertThat(this.wxService.getKefuService().kfAccountInviteWorker(request)).isTrue();
|
||||
}
|
||||
|
||||
@Test(dependsOnMethods = {"testKfAccountUpdate", "testKfAccountAdd"}, dataProvider = "getKfAccount")
|
||||
public void testKfAccountUploadHeadImg(String kfAccount) throws WxErrorException {
|
||||
File imgFile = new File("src\\test\\resources\\mm.jpeg");
|
||||
boolean result = this.wxService.getKefuService().kfAccountUploadHeadImg(kfAccount, imgFile);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccount")
|
||||
public void testKfAccountDel(String kfAccount) throws WxErrorException {
|
||||
boolean result = this.wxService.getKefuService().kfAccountDel(kfAccount);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
@DataProvider
|
||||
public Object[][] getKfAccountAndOpenid() {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
return new Object[][]{{configStorage.getKfAccount(), configStorage.getOpenid()}};
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccountAndOpenid")
|
||||
public void testKfSessionCreate(String kfAccount, String openid) throws WxErrorException {
|
||||
boolean result = this.wxService.getKefuService().kfSessionCreate(openid, kfAccount);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccountAndOpenid")
|
||||
public void testKfSessionClose(String kfAccount, String openid) throws WxErrorException {
|
||||
boolean result = this.wxService.getKefuService().kfSessionClose(openid, kfAccount);
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccountAndOpenid")
|
||||
public void testKfSessionGet(@SuppressWarnings("unused") String kfAccount, String openid) throws WxErrorException {
|
||||
WxMpKfSessionGetResult result = this.wxService.getKefuService().kfSessionGet(openid);
|
||||
assertThat(result).isNotNull();
|
||||
System.err.println(result);
|
||||
}
|
||||
|
||||
@Test(dataProvider = "getKfAccount")
|
||||
public void testKfSessionList(String kfAccount) throws WxErrorException {
|
||||
WxMpKfSessionList result = this.wxService.getKefuService().kfSessionList(kfAccount);
|
||||
assertThat(result).isNotNull();
|
||||
System.err.println(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKfSessionGetWaitCase() throws WxErrorException {
|
||||
WxMpKfSessionWaitCaseList result = this.wxService.getKefuService().kfSessionGetWaitCase();
|
||||
assertThat(result).isNotNull();
|
||||
System.err.println(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKfMsgList() throws WxErrorException {
|
||||
// Date startTime = DateTime.now().minusDays(1).toDate();
|
||||
// Date endTime = DateTime.now().minusDays(0).toDate();
|
||||
Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
|
||||
Date endTime = Date.from(Instant.now());
|
||||
|
||||
WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime, 1L, 50);
|
||||
assertThat(result).isNotNull();
|
||||
System.err.println(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testKfMsgListAll() throws WxErrorException {
|
||||
// Date startTime = DateTime.now().minusDays(1).toDate();
|
||||
// Date endTime = DateTime.now().minusDays(0).toDate();
|
||||
Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
|
||||
Date endTime = Date.from(Instant.now());
|
||||
|
||||
WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime);
|
||||
assertThat(result).isNotNull();
|
||||
System.err.println(result);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSendKfTypingState() throws WxErrorException {
|
||||
TestConfigStorage configStorage = (TestConfigStorage) this.wxService.getWxMpConfigStorage();
|
||||
boolean result = this.wxService.getKefuService().sendKfTypingState(configStorage.getOpenid(), "Typing");
|
||||
Assertions.assertThat(result).isTrue();
|
||||
}
|
||||
}
|
||||
|
||||
@ -2,9 +2,8 @@ package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant;
|
||||
import com.ossez.wechat.common.model.entity.builder.MenuButtonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuButton;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
@ -201,7 +200,7 @@ public class WxMpMenuServiceImplTest {
|
||||
@DataProvider(name = "menu")
|
||||
public Object[][] getMenu() {
|
||||
WxMenu menu = new WxMenu();
|
||||
MenuButton button1 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button1 = new WxMenuButton();
|
||||
button1.setType(WeChatConstant.MenuButtonType.CLICK);
|
||||
button1.setName("今日歌曲");
|
||||
button1.setKey("V1001_TODAY_MUSIC");
|
||||
@ -213,31 +212,31 @@ public class WxMpMenuServiceImplTest {
|
||||
// button2.setPagePath("pages/lunar/index.html");
|
||||
// button2.setUrl("http://mp.weixin.qq.com");
|
||||
|
||||
MenuButton button3 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button3 = new WxMenuButton();
|
||||
button3.setName("菜单");
|
||||
|
||||
menu.getButtons().add(button1);
|
||||
// menu.getButtons().add(button2);
|
||||
menu.getButtons().add(button3);
|
||||
|
||||
MenuButton button31 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button31 = new WxMenuButton();
|
||||
button31.setType(WeChatConstant.MenuButtonType.VIEW);
|
||||
button31.setName("搜索");
|
||||
button31.setUrl("http://www.soso.com/");
|
||||
|
||||
MenuButton button32 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button32 = new WxMenuButton();
|
||||
button32.setType(WeChatConstant.MenuButtonType.VIEW);
|
||||
button32.setName("视频");
|
||||
button32.setUrl("http://v.qq.com/");
|
||||
|
||||
MenuButton button33 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button33 = new WxMenuButton();
|
||||
button33.setType(WeChatConstant.MenuButtonType.CLICK);
|
||||
button33.setName("赞一下我们");
|
||||
button33.setKey("V1001_GOOD");
|
||||
|
||||
// button3.getSubButtons().add(button31);
|
||||
// button3.getSubButtons().add(button32);
|
||||
// button3.getSubButtons().add(button33);
|
||||
button3.getSubButtons().add(button31);
|
||||
button3.getSubButtons().add(button32);
|
||||
button3.getSubButtons().add(button33);
|
||||
|
||||
return new Object[][]{
|
||||
new Object[]{
|
||||
|
||||
@ -1,18 +1,24 @@
|
||||
package com.ossez.wechat.oa.api.impl;
|
||||
|
||||
import com.ossez.wechat.common.bean.ocr.*;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.common.util.fs.FileUtils;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.api.test.TestConstants;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrBankCardResult;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrBizLicenseResult;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrCommResult;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrDrivingLicenseResult;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrDrivingResult;
|
||||
import com.ossez.wechat.common.bean.ocr.WxOcrIdCardResult;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.mockito.ArgumentMatchers;
|
||||
import org.mockito.Matchers;
|
||||
import org.mockito.Mockito;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@ -20,8 +26,14 @@ import java.net.HttpURLConnection;
|
||||
import java.net.URL;
|
||||
import java.util.UUID;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
/**
|
||||
* @author YuCheng
|
||||
* 测试类.
|
||||
*
|
||||
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
||||
* created on 2019-06-22
|
||||
*/
|
||||
@Test
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
@ -148,7 +160,7 @@ public class WxMpOcrServiceImplTest {
|
||||
public void testIdCard() throws Exception {
|
||||
String returnJson = "{\"type\":\"Back\",\"name\":\"张三\",\"id\":\"110101199909090099\",\"valid_date\":\"20110101-20210201\"}";
|
||||
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrIdCardResult result = wxMpOcrService.idCard("abc");
|
||||
@ -160,7 +172,7 @@ public class WxMpOcrServiceImplTest {
|
||||
public void testBankCard() throws Exception {
|
||||
String returnJson = "{\"number\":\"24234234345234\"}";
|
||||
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrBankCardResult result = wxMpOcrService.bankCard("abc");
|
||||
@ -235,7 +247,7 @@ public class WxMpOcrServiceImplTest {
|
||||
" }\n" +
|
||||
"}";
|
||||
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrDrivingResult result = wxMpOcrService.driving("abc");
|
||||
@ -260,7 +272,7 @@ public class WxMpOcrServiceImplTest {
|
||||
" \"valid_to\": \"2020-07-01\", //有效期限终止日\n" +
|
||||
" \"official_seal\": \"xx市公安局公安交通管理局\" //印章文字\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrDrivingLicenseResult result = wxMpOcrService.drivingLicense("abc");
|
||||
@ -310,7 +322,7 @@ public class WxMpOcrServiceImplTest {
|
||||
" \"h\": 728\n" +
|
||||
" }\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrBizLicenseResult result = wxMpOcrService.bizLicense("abc");
|
||||
@ -372,7 +384,7 @@ public class WxMpOcrServiceImplTest {
|
||||
" \"h\": 720\n" +
|
||||
" }\n" +
|
||||
"}";
|
||||
Mockito.when(wxService.post(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.anyString(), Matchers.anyString())).thenReturn(returnJson);
|
||||
final WxMpOcrServiceImpl wxMpOcrService = new WxMpOcrServiceImpl(wxService);
|
||||
|
||||
final WxOcrCommResult result = wxMpOcrService.comm("abc");
|
||||
|
||||
@ -14,7 +14,7 @@ import org.testng.annotations.Test;
|
||||
* @author rememberber
|
||||
*/
|
||||
@Test(groups = "userAPI")
|
||||
//@Guice(modules = ApiTestModule.class)
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
public class WxMpShakeServiceImplTest {
|
||||
@Inject
|
||||
private WeChatOfficialAccountService wxService;
|
||||
|
||||
@ -7,19 +7,22 @@ import com.ossez.wechat.oa.api.test.ApiTestModule;
|
||||
import com.ossez.wechat.oa.bean.wifi.WxMpWifiShopDataResult;
|
||||
import com.ossez.wechat.oa.bean.wifi.WxMpWifiShopListResult;
|
||||
import org.assertj.core.api.Assertions;
|
||||
import org.mockito.ArgumentMatchers;
|
||||
import org.mockito.Matchers;
|
||||
import org.mockito.Mockito;
|
||||
import org.testng.annotations.Guice;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import static com.ossez.wechat.common.enums.WxMpApiUrl.Wifi.BIZWIFI_SHOP_GET;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
/**
|
||||
* Change to use JUnit 5
|
||||
* <pre>
|
||||
* Created by BinaryWang on 2018/6/10.
|
||||
* </pre>
|
||||
*
|
||||
* @author YuCheng
|
||||
* @author <a href="https://github.com/binarywang">Binary Wang</a>
|
||||
*/
|
||||
@Test
|
||||
@Guice(modules = ApiTestModule.class)
|
||||
@ -83,7 +86,7 @@ public class WxMpWifiServiceImplTest {
|
||||
" }\n" +
|
||||
"}";
|
||||
|
||||
Mockito.when(wxService.post(ArgumentMatchers.eq(BIZWIFI_SHOP_GET), ArgumentMatchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.post(Matchers.eq(BIZWIFI_SHOP_GET), Matchers.anyString())).thenReturn(returnJson);
|
||||
Mockito.when(wxService.getWifiService()).thenReturn(new WxMpWifiServiceImpl(wxService));
|
||||
|
||||
final WxMpWifiShopDataResult wifiInfo = this.wxService.getWifiService().getShopWifiInfo(123);
|
||||
|
||||
@ -1,22 +1,21 @@
|
||||
package com.ossez.wechat.oa.api.test;
|
||||
|
||||
import com.google.inject.Binder;
|
||||
import com.google.inject.Module;
|
||||
import com.ossez.wechat.common.exception.WxRuntimeException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatMsgService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatOfficialAccountServiceOkHttp;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.dom4j.Document;
|
||||
import org.dom4j.DocumentException;
|
||||
import org.dom4j.io.SAXReader;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
import com.ossez.wechat.common.exception.WxRuntimeException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatOfficialAccountServiceOkHttp;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import com.google.inject.Binder;
|
||||
import com.google.inject.Module;
|
||||
import com.thoughtworks.xstream.XStream;
|
||||
import com.ossez.wechat.common.util.xml.XStreamInitializer;
|
||||
import com.ossez.wechat.common.config.ConfigStorage;
|
||||
|
||||
public class ApiTestModule implements Module {
|
||||
private final Logger log = LoggerFactory.getLogger(this.getClass());
|
||||
private static final String TEST_CONFIG_XML = "test-config.xml";
|
||||
@ -24,36 +23,30 @@ public class ApiTestModule implements Module {
|
||||
@Override
|
||||
public void configure(Binder binder) {
|
||||
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
|
||||
|
||||
if (ObjectUtils.isEmpty(inputStream)) {
|
||||
if (inputStream == null) {
|
||||
throw new WxRuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
|
||||
}
|
||||
|
||||
|
||||
// Init WeChat config for testing
|
||||
Document document = new SAXReader().read(inputStream);
|
||||
TestConfigStorage config = new TestConfigStorage();
|
||||
config.setAppId(document.getRootElement().element("appId").getText());
|
||||
config.setSecret(document.getRootElement().element("secret").getText());
|
||||
config.setToken(document.getRootElement().element("token").getText());
|
||||
config.setOpenid(document.getRootElement().element("openid").getText());
|
||||
TestConfigStorage config = this.fromXml(TestConfigStorage.class, inputStream);
|
||||
config.setAccessTokenLock(new ReentrantLock());
|
||||
WeChatOfficialAccountService mpService = new WeChatOfficialAccountServiceOkHttp();
|
||||
|
||||
// Init WeChat Service
|
||||
WeChatOfficialAccountService weChatOfficialAccountService = new WeChatOfficialAccountServiceOkHttp();
|
||||
weChatOfficialAccountService.setWxMpConfigStorage(config);
|
||||
weChatOfficialAccountService.addConfigStorage("another", config);
|
||||
mpService.setWxMpConfigStorage(config);
|
||||
mpService.addConfigStorage("another", config);
|
||||
|
||||
// Init WeChatMsgService
|
||||
WeChatMsgService weChatMsgService = new WeChatMsgService(weChatOfficialAccountService);
|
||||
|
||||
binder.bind(TestConfigStorage.class).toInstance(config);
|
||||
binder.bind(WeChatOfficialAccountService.class).toInstance(weChatOfficialAccountService);
|
||||
binder.bind(WeChatMsgService.class).toInstance(weChatMsgService);
|
||||
binder.bind(ConfigStorage.class).toInstance(config);
|
||||
binder.bind(WeChatOfficialAccountService.class).toInstance(mpService);
|
||||
} catch (IOException e) {
|
||||
this.log.error(e.getMessage(), e);
|
||||
} catch (DocumentException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private <T> T fromXml(Class<T> clazz, InputStream is) {
|
||||
XStream xstream = XStreamInitializer.getInstance();
|
||||
xstream.alias("xml", clazz);
|
||||
xstream.processAnnotations(clazz);
|
||||
return (T) xstream.fromXML(is);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
package com.ossez.wechat.oa.api.test;
|
||||
|
||||
import com.google.inject.AbstractModule;
|
||||
import com.google.inject.Guice;
|
||||
import com.google.inject.Injector;
|
||||
import com.ossez.wechat.common.exception.WxRuntimeException;
|
||||
import com.ossez.wechat.oa.api.WeChatOfficialAccountService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatDataCubeService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatMenuService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatMsgService;
|
||||
import com.ossez.wechat.oa.api.impl.okhttp.WeChatOfficialAccountServiceOkHttp;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.dom4j.Document;
|
||||
import org.dom4j.DocumentException;
|
||||
import org.dom4j.io.SAXReader;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
/**
|
||||
* Init Guice DI
|
||||
*
|
||||
* @author YuCheng
|
||||
*/
|
||||
public class TestBase {
|
||||
private static final Logger log = LoggerFactory.getLogger(TestBase.class);
|
||||
private static final String TEST_CONFIG_XML = "test-config.xml";
|
||||
|
||||
@BeforeAll
|
||||
public void setup() {
|
||||
injector.injectMembers(this);
|
||||
}
|
||||
|
||||
private static final Injector injector = Guice.createInjector(new AbstractModule() {
|
||||
@Override
|
||||
public void configure() {
|
||||
try (InputStream inputStream = ClassLoader.getSystemResourceAsStream(TEST_CONFIG_XML)) {
|
||||
|
||||
if (ObjectUtils.isEmpty(inputStream)) {
|
||||
throw new WxRuntimeException("测试配置文件【" + TEST_CONFIG_XML + "】未找到，请参照test-config-sample.xml文件生成");
|
||||
}
|
||||
|
||||
|
||||
// Init WeChat config for testing
|
||||
Document document = new SAXReader().read(inputStream);
|
||||
TestConfigStorage config = new TestConfigStorage();
|
||||
config.setAppId(document.getRootElement().element("appId").getText());
|
||||
config.setSecret(document.getRootElement().element("secret").getText());
|
||||
config.setToken(document.getRootElement().element("token").getText());
|
||||
config.setOpenid(document.getRootElement().element("openid").getText());
|
||||
config.setAccessTokenLock(new ReentrantLock());
|
||||
|
||||
// Init WeChat Service
|
||||
WeChatOfficialAccountService weChatOfficialAccountService = new WeChatOfficialAccountServiceOkHttp();
|
||||
weChatOfficialAccountService.setWxMpConfigStorage(config);
|
||||
weChatOfficialAccountService.addConfigStorage("another", config);
|
||||
|
||||
// Init WeChatMsgService
|
||||
WeChatMsgService weChatMsgService = new WeChatMsgService(weChatOfficialAccountService);
|
||||
WeChatDataCubeService weChatDataCubeService = new WeChatDataCubeService(weChatOfficialAccountService);
|
||||
WeChatMenuService weChatMenuService = new WeChatMenuService(weChatOfficialAccountService);
|
||||
|
||||
bind(TestConfigStorage.class).toInstance(config);
|
||||
bind(WeChatOfficialAccountService.class).toInstance(weChatOfficialAccountService);
|
||||
bind(WeChatMsgService.class).toInstance(weChatMsgService);
|
||||
bind(WeChatDataCubeService.class).toInstance(weChatDataCubeService);
|
||||
bind(WeChatMenuService.class).toInstance(weChatMenuService);
|
||||
} catch (IOException e) {
|
||||
log.error(e.getMessage(), e);
|
||||
} catch (DocumentException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
|
||||
import java.util.concurrent.locks.Lock;
|
||||
|
||||
@XStreamAlias("xml")
|
||||
public class TestConfigStorage extends DefaultConfigStorage {
|
||||
|
||||
private String openid;
|
||||
|
||||
@ -10,7 +10,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testTextReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.TEXT);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.TEXT);
|
||||
reply.setContent("sfsfdsdf");
|
||||
Assert
|
||||
.assertEquals(reply.toJson(), "{\"touser\":\"OPENID\",\"msgtype\":\"text\",\"text\":{\"content\":\"sfsfdsdf\"}}");
|
||||
@ -25,7 +25,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testImageReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.IMAGE);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.IMAGE);
|
||||
reply.setMediaId("MEDIA_ID");
|
||||
Assert.assertEquals(reply.toJson(),
|
||||
"{\"touser\":\"OPENID\",\"msgtype\":\"image\",\"image\":{\"media_id\":\"MEDIA_ID\"}}");
|
||||
@ -40,7 +40,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testVoiceReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.VOICE);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.VOICE);
|
||||
reply.setMediaId("MEDIA_ID");
|
||||
Assert.assertEquals(reply.toJson(),
|
||||
"{\"touser\":\"OPENID\",\"msgtype\":\"voice\",\"voice\":{\"media_id\":\"MEDIA_ID\"}}");
|
||||
@ -55,7 +55,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testVideoReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.VIDEO);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.VIDEO);
|
||||
reply.setMediaId("MEDIA_ID");
|
||||
reply.setThumbMediaId("MEDIA_ID");
|
||||
reply.setTitle("TITLE");
|
||||
@ -74,7 +74,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testMusicReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.MUSIC);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.MUSIC);
|
||||
reply.setThumbMediaId("MEDIA_ID");
|
||||
reply.setDescription("DESCRIPTION");
|
||||
reply.setTitle("TITLE");
|
||||
@ -100,7 +100,7 @@ public class WxMpKefuMessageTest {
|
||||
public void testNewsReply() {
|
||||
WxMpKefuMessage reply = new WxMpKefuMessage();
|
||||
reply.setToUser("OPENID");
|
||||
reply.setMsgType(WeChatConstant.MsgType.NEWS);
|
||||
reply.setMsgType(WeChatConstant.KefuMsgType.NEWS);
|
||||
|
||||
WxMpKefuMessage.WxArticle article1 = new WxMpKefuMessage.WxArticle();
|
||||
article1.setUrl("URL");
|
||||
|
||||
@ -1,32 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<configuration debug="true">
|
||||
<timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
|
||||
<configuration>
|
||||
|
||||
<appender name="STDOUT"
|
||||
class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- encoders are assigned by default the type
|
||||
ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %replace(%caller{1}){'Caller', ''} - %msg%n</pattern>
|
||||
</encoder>
|
||||
<layout class="ch.qos.logback.classic.PatternLayout">
|
||||
<Pattern>
|
||||
%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
|
||||
</Pattern>
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
<!-- LOGGER -->
|
||||
<logger name="com.ossez" level="DEBUG"/>
|
||||
<logger name="org.apache" level="INFO"/>
|
||||
<logger name="org.hibernate" level="INFO"/>
|
||||
<logger name="org.springframework" level="INFO"/>
|
||||
|
||||
<!-- ROOT AND APPENDER -->
|
||||
<root level="debug">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</root>
|
||||
|
||||
|
||||
</configuration>
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
<xml>
|
||||
<appId>***</appId>
|
||||
<secret>***</secret>
|
||||
<token>***</token>
|
||||
<aesKey>公众号EncodingAESKey</aesKey>
|
||||
<accessToken>可以不填写</accessToken>
|
||||
<expiresTime>可以不填写</expiresTime>
|
||||
<openid>o9phd5jz_We8mPs1ovmyjud97Ock</openid>
|
||||
<partnerId>微信商户平台ID</partnerId>
|
||||
<partnerKey>商户平台设置的API密钥</partnerKey>
|
||||
<keyPath>商户平台的证书文件地址</keyPath>
|
||||
<templateId>模版消息的模版ID</templateId>
|
||||
<oauth2redirectUri>网页授权获取用户信息回调地址</oauth2redirectUri>
|
||||
<qrconnectRedirectUrl>网页应用授权登陆回调地址</qrconnectRedirectUrl>
|
||||
<kfAccount>完整客服账号，格式为：账号前缀@公众号微信号</kfAccount>
|
||||
</xml>
|
||||
10
open/pom.xml
10
open/pom.xml
@ -38,11 +38,11 @@
|
||||
<artifactId>wechat-j-mp</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.github.binarywang</groupId>-->
|
||||
<!-- <artifactId>weixin-java-miniapp</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.github.binarywang</groupId>-->
|
||||
<!-- <artifactId>weixin-java-miniapp</artifactId>-->
|
||||
<!-- <version>${project.version}</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
<dependency>
|
||||
<groupId>org.jodd</groupId>
|
||||
|
||||
54
pom.xml
54
pom.xml
@ -158,7 +158,7 @@
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<version>5.1.0</version>
|
||||
<version>4.2.3</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -263,6 +263,7 @@
|
||||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- LOGGING WITH SELF4J AND LOG4J2 -->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
@ -300,11 +301,6 @@
|
||||
<groupId>com.squareup.retrofit2</groupId>
|
||||
<artifactId>converter-gson</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
<version>5.1.0</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JSON -->
|
||||
<dependency>
|
||||
@ -325,24 +321,12 @@
|
||||
<version>5.9.2</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<version>7.7.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.assertj</groupId>
|
||||
<artifactId>assertj-core</artifactId>
|
||||
<version>3.24.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-junit-jupiter</artifactId>
|
||||
<version>5.3.1</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!--/ TEST -->
|
||||
|
||||
</dependencies>
|
||||
@ -479,23 +463,23 @@
|
||||
<release>11</release>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
|
||||
<!-- <version>3.0.1</version>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>sign-artifacts</id>-->
|
||||
<!-- <phase>verify</phase>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>sign</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <passphraseServerId>ossez</passphraseServerId>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- </plugin>-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-gpg-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sign-artifacts</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>sign</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<passphraseServerId>ossez</passphraseServerId>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
|
||||
11
work/pom.xml
11
work/pom.xml
@ -43,7 +43,16 @@
|
||||
<groupId>org.redisson</groupId>
|
||||
<artifactId>redisson</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.testng</groupId>
|
||||
<artifactId>testng</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-all</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.inject</groupId>
|
||||
<artifactId>guice</artifactId>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.ossez.wechat.wecom.api;
|
||||
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
|
||||
/**
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
package com.ossez.wechat.wecom.api.impl;
|
||||
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.exception.WxErrorException;
|
||||
import com.ossez.wechat.wecom.api.WxCpMenuService;
|
||||
import com.ossez.wechat.wecom.api.WxCpService;
|
||||
|
||||
@ -16,8 +16,8 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.ossez.wechat.common.constant.WeChatConstant.MsgType.TASKCARD;
|
||||
import static com.ossez.wechat.common.constant.WeChatConstant.MsgType.TEMPLATE_CARD;
|
||||
import static com.ossez.wechat.common.constant.WeChatConstant.KefuMsgType.TASKCARD;
|
||||
import static com.ossez.wechat.common.constant.WeChatConstant.KefuMsgType.TEMPLATE_CARD;
|
||||
|
||||
/**
|
||||
* 消息.
|
||||
|
||||
@ -18,7 +18,7 @@ public final class FileBuilder extends BaseBuilder<FileBuilder> {
|
||||
* Instantiates a new File builder.
|
||||
*/
|
||||
public FileBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.FILE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.FILE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -18,7 +18,7 @@ public final class ImageBuilder extends BaseBuilder<ImageBuilder> {
|
||||
* Instantiates a new Image builder.
|
||||
*/
|
||||
public ImageBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.IMAGE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.IMAGE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -18,7 +18,7 @@ public class MarkdownMsgBuilder extends BaseBuilder<MarkdownMsgBuilder> {
|
||||
* Instantiates a new Markdown msg builder.
|
||||
*/
|
||||
public MarkdownMsgBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MARKDOWN;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MARKDOWN;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -25,7 +25,7 @@ public class MiniProgramNoticeMsgBuilder extends BaseBuilder<MiniProgramNoticeMs
|
||||
* Instantiates a new Mini program notice msg builder.
|
||||
*/
|
||||
public MiniProgramNoticeMsgBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MINIPROGRAM_NOTICE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MINIPROGRAM_NOTICE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -26,7 +26,7 @@ public final class MpnewsBuilder extends BaseBuilder<MpnewsBuilder> {
|
||||
* Instantiates a new Mpnews builder.
|
||||
*/
|
||||
public MpnewsBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.MPNEWS;
|
||||
this.msgType = WeChatConstant.KefuMsgType.MPNEWS;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -25,7 +25,7 @@ public final class NewsBuilder extends BaseBuilder<NewsBuilder> {
|
||||
* Instantiates a new News builder.
|
||||
*/
|
||||
public NewsBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.NEWS;
|
||||
this.msgType = WeChatConstant.KefuMsgType.NEWS;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -28,7 +28,7 @@ public class TaskCardBuilder extends BaseBuilder<TaskCardBuilder> {
|
||||
* Instantiates a new Task card builder.
|
||||
*/
|
||||
public TaskCardBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.TASKCARD;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TASKCARD;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -182,7 +182,7 @@ public class TemplateCardBuilder extends BaseBuilder<TemplateCardBuilder> {
|
||||
* Instantiates a new Template card builder.
|
||||
*/
|
||||
public TemplateCardBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.TEMPLATE_CARD;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TEMPLATE_CARD;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -18,7 +18,7 @@ public final class TextBuilder extends BaseBuilder<TextBuilder> {
|
||||
* Instantiates a new Text builder.
|
||||
*/
|
||||
public TextBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.TEXT;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TEXT;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -22,7 +22,7 @@ public class TextCardBuilder extends BaseBuilder<TextCardBuilder> {
|
||||
* Instantiates a new Text card builder.
|
||||
*/
|
||||
public TextCardBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.TEXTCARD;
|
||||
this.msgType = WeChatConstant.KefuMsgType.TEXTCARD;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -27,7 +27,7 @@ public final class VideoBuilder extends BaseBuilder<VideoBuilder> {
|
||||
* Instantiates a new Video builder.
|
||||
*/
|
||||
public VideoBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.VIDEO;
|
||||
this.msgType = WeChatConstant.KefuMsgType.VIDEO;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -18,7 +18,7 @@ public final class VoiceBuilder extends BaseBuilder<VoiceBuilder> {
|
||||
* Instantiates a new Voice builder.
|
||||
*/
|
||||
public VoiceBuilder() {
|
||||
this.msgType = WeChatConstant.MsgType.VOICE;
|
||||
this.msgType = WeChatConstant.KefuMsgType.VOICE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -2,7 +2,7 @@ package com.ossez.wechat.wecom.util.json;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.exception.WxError;
|
||||
import com.ossez.wechat.common.util.json.WxErrorAdapter;
|
||||
import com.ossez.wechat.wecom.bean.WxCpChat;
|
||||
|
||||
@ -3,7 +3,7 @@ package com.ossez.wechat.wecom.util.json;
|
||||
import com.google.gson.JsonDeserializationContext;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParseException;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.util.json.WxMenuGsonAdapter;
|
||||
|
||||
import java.lang.reflect.Type;
|
||||
@ -16,8 +16,8 @@ import java.lang.reflect.Type;
|
||||
*/
|
||||
public class WxCpMenuGsonAdapter extends WxMenuGsonAdapter {
|
||||
|
||||
// @Override
|
||||
// public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
// return this.buildMenuFromJson(json.getAsJsonObject().get("button").getAsJsonArray());
|
||||
// }
|
||||
@Override
|
||||
public WxMenu deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
|
||||
return this.buildMenuFromJson(json.getAsJsonObject().get("button").getAsJsonArray());
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,8 @@
|
||||
package com.ossez.wechat.wecom.api.impl;
|
||||
|
||||
import com.google.inject.Inject;
|
||||
import com.ossez.wechat.common.model.entity.builder.MenuButtonBuilder;
|
||||
import com.ossez.wechat.common.model.entity.menu.WxMenu;
|
||||
import com.ossez.wechat.common.model.entity.menu.MenuButton;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenu;
|
||||
import com.ossez.wechat.common.bean.menu.WxMenuButton;
|
||||
import com.ossez.wechat.common.constant.WeChatConstant;
|
||||
import com.ossez.wechat.wecom.api.ApiTestModule;
|
||||
import com.ossez.wechat.wecom.api.WxCpService;
|
||||
@ -35,42 +34,42 @@ public class WxCpMenuServiceImplTest {
|
||||
@DataProvider
|
||||
public Object[][] menuData() {
|
||||
WxMenu menu = new WxMenu();
|
||||
MenuButton button1 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button1 = new WxMenuButton();
|
||||
Object WxConsts;
|
||||
button1.setType(WeChatConstant.MenuButtonType.CLICK);
|
||||
button1.setName("今日歌曲");
|
||||
button1.setKey("V1001_TODAY_MUSIC");
|
||||
|
||||
MenuButton button2 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button2 = new WxMenuButton();
|
||||
button2.setType(WeChatConstant.MenuButtonType.CLICK);
|
||||
button2.setName("歌手简介");
|
||||
button2.setKey("V1001_TODAY_SINGER");
|
||||
|
||||
MenuButton button3 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button3 = new WxMenuButton();
|
||||
button3.setName("菜单");
|
||||
|
||||
menu.getButtons().add(button1);
|
||||
menu.getButtons().add(button2);
|
||||
menu.getButtons().add(button3);
|
||||
|
||||
MenuButton button31 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button31 = new WxMenuButton();
|
||||
button31.setType(WeChatConstant.MenuButtonType.VIEW);
|
||||
button31.setName("搜索");
|
||||
button31.setUrl("http://www.soso.com/");
|
||||
|
||||
MenuButton button32 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button32 = new WxMenuButton();
|
||||
button32.setType(WeChatConstant.MenuButtonType.VIEW);
|
||||
button32.setName("视频");
|
||||
button32.setUrl("http://v.qq.com/");
|
||||
|
||||
MenuButton button33 = new MenuButtonBuilder().createMenuButton();
|
||||
WxMenuButton button33 = new WxMenuButton();
|
||||
button33.setType(WeChatConstant.MenuButtonType.CLICK);
|
||||
button33.setName("赞一下我们");
|
||||
button33.setKey("V1001_GOOD");
|
||||
|
||||
// button3.getSubButtons().add(button31);
|
||||
// button3.getSubButtons().add(button32);
|
||||
// button3.getSubButtons().add(button33);
|
||||
button3.getSubButtons().add(button31);
|
||||
button3.getSubButtons().add(button32);
|
||||
button3.getSubButtons().add(button33);
|
||||
|
||||
return new Object[][]{
|
||||
new Object[]{
|
||||
|
||||
@ -71,7 +71,7 @@ public class WxCpMessageServiceImplTest {
|
||||
public void testSendMessage() throws WxErrorException {
|
||||
WxCpMessage message = new WxCpMessage();
|
||||
// message.setAgentId(configStorage.getAgentId());
|
||||
message.setMsgType(WeChatConstant.MsgType.TEXT);
|
||||
message.setMsgType(WeChatConstant.KefuMsgType.TEXT);
|
||||
message.setToUser(configStorage.getUserId());
|
||||
message.setContent("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>");
|
||||
|
||||
@ -200,7 +200,7 @@ public class WxCpMessageServiceImplTest {
|
||||
@Test
|
||||
public void testSendLinkedCorpMessage() throws WxErrorException {
|
||||
this.wxService.getMessageService().sendLinkedCorpMessage(WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.TEXT)
|
||||
.msgType(WeChatConstant.KefuMsgType.TEXT)
|
||||
.toUsers(new String[]{configStorage.getUserId()})
|
||||
.content("欢迎欢迎，热烈欢迎\n换行测试\n超链接:<a href=\"http://www.baidu.com\">Hello World</a>")
|
||||
.build());
|
||||
|
||||
@ -23,7 +23,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_text() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.TEXT)
|
||||
.msgType(WeChatConstant.KefuMsgType.TEXT)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -57,7 +57,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_image() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.IMAGE)
|
||||
.msgType(WeChatConstant.KefuMsgType.IMAGE)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -90,7 +90,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_video() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.VIDEO)
|
||||
.msgType(WeChatConstant.KefuMsgType.VIDEO)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -127,7 +127,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_file() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.FILE)
|
||||
.msgType(WeChatConstant.KefuMsgType.FILE)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -160,7 +160,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_textCard() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.TEXTCARD)
|
||||
.msgType(WeChatConstant.KefuMsgType.TEXTCARD)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -199,7 +199,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_news() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.NEWS)
|
||||
.msgType(WeChatConstant.KefuMsgType.NEWS)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -246,7 +246,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_mpnews() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.MPNEWS)
|
||||
.msgType(WeChatConstant.KefuMsgType.MPNEWS)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -295,7 +295,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_markdown() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.MARKDOWN)
|
||||
.msgType(WeChatConstant.KefuMsgType.MARKDOWN)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
@ -350,7 +350,7 @@ public class WxCpLinkedCorpMessageTest {
|
||||
@Test
|
||||
public void testToJson_miniProgramNotice() {
|
||||
WxCpLinkedCorpMessage message = WxCpLinkedCorpMessage.builder()
|
||||
.msgType(WeChatConstant.MsgType.MINIPROGRAM_NOTICE)
|
||||
.msgType(WeChatConstant.KefuMsgType.MINIPROGRAM_NOTICE)
|
||||
.toUsers(new String[]{"userid1", "userid2", "CorpId1/userid1", "CorpId2/userid2"})
|
||||
.toParties(new String[]{"partyid1", "partyid2", "LinkedId1/partyid1", "LinkedId2/partyid2"})
|
||||
.toTags(new String[]{"tagid1", "tagid2"})
|
||||
|
||||
@ -11,8 +11,8 @@ import org.mockito.MockitoAnnotations;
|
||||
import org.testng.annotations.BeforeClass;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
@ -17,8 +17,8 @@ import org.testng.annotations.Test;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.assertEquals;
|
||||
import static org.testng.Assert.assertNotNull;
|
||||
|
||||
@ -17,8 +17,8 @@ import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.*;
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ import org.testng.collections.CollectionUtils;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.*;
|
||||
import static org.mockito.Matchers.*;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.testng.Assert.*;
|
||||
|
||||
|
||||
@ -1,32 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<configuration debug="true">
|
||||
<timestamp key="bySecond" datePattern="yyyyMMdd'T'HHmmss"/>
|
||||
<configuration>
|
||||
|
||||
<appender name="STDOUT"
|
||||
class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- encoders are assigned by default the type
|
||||
ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
|
||||
|
||||
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %replace(%caller{1}){'Caller', ''} - %msg%n</pattern>
|
||||
</encoder>
|
||||
<layout class="ch.qos.logback.classic.PatternLayout">
|
||||
<Pattern>
|
||||
%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
|
||||
</Pattern>
|
||||
</layout>
|
||||
</appender>
|
||||
|
||||
<!-- LOGGER -->
|
||||
<logger name="com.ossez" level="DEBUG"/>
|
||||
<logger name="org.apache" level="INFO"/>
|
||||
<logger name="org.hibernate" level="INFO"/>
|
||||
<logger name="org.springframework" level="INFO"/>
|
||||
|
||||
<!-- ROOT AND APPENDER -->
|
||||
<root level="debug">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
</root>
|
||||
|
||||
|
||||
</configuration>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user