diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxAccessToken.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java similarity index 93% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxAccessToken.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java index e92023bb9..deacb432e 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxAccessToken.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/bean/WxAccessToken.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.enterprise.bean; +package me.chanjar.weixin.common.bean; import me.chanjar.weixin.enterprise.util.json.WxCpGsonBuilder; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/AdapterCDATA.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/AdapterCDATA.java similarity index 92% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/AdapterCDATA.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/AdapterCDATA.java index 37629022d..30a8a927c 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/AdapterCDATA.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/AdapterCDATA.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.common; +package me.chanjar.weixin.common.util; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/FileUtils.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/FileUtils.java similarity index 96% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/FileUtils.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/FileUtils.java index 2c96793d3..b4eb72381 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/FileUtils.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/FileUtils.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.common; +package me.chanjar.weixin.common.util; import java.io.File; import java.io.FileOutputStream; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/GsonHelper.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/GsonHelper.java similarity index 98% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/GsonHelper.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/GsonHelper.java index b84932d0f..ffc810226 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/GsonHelper.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/GsonHelper.java @@ -6,7 +6,7 @@ * arose from modification of the original source, or other redistribution of this source * is not permitted without written permission of the KINGSTAR MEDIA SOLUTIONS LTD. */ -package me.chanjar.weixin.common; +package me.chanjar.weixin.common.util; import com.google.gson.JsonElement; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/MediaIdMarshaller.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/MediaIdMarshaller.java similarity index 91% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/MediaIdMarshaller.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/MediaIdMarshaller.java index ca5000059..cfe3de1a3 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/MediaIdMarshaller.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/MediaIdMarshaller.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.common; +package me.chanjar.weixin.common.util; import javax.xml.bind.annotation.adapters.XmlAdapter; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/XmlTransformer.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/XmlTransformer.java similarity index 98% rename from weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/XmlTransformer.java rename to weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/XmlTransformer.java index 604bf0e15..3652506b7 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/XmlTransformer.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/common/util/XmlTransformer.java @@ -1,4 +1,4 @@ -package me.chanjar.weixin.common; +package me.chanjar.weixin.common.util; import java.io.IOException; import java.io.InputStream; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConfigStorage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConfigStorage.java index cefac4a45..3e63d463b 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConfigStorage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpConfigStorage.java @@ -1,6 +1,6 @@ package me.chanjar.weixin.enterprise.api; -import me.chanjar.weixin.enterprise.bean.WxAccessToken; +import me.chanjar.weixin.common.bean.WxAccessToken; /** * 微信客户端配置存储 diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java index 949fda64f..fec2715ac 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxCpServiceImpl.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; +import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.enterprise.bean.*; import me.chanjar.weixin.enterprise.util.http.SimpleGetRequestExecutor; import me.chanjar.weixin.enterprise.util.crypto.SHA1; @@ -25,7 +26,7 @@ import me.chanjar.weixin.enterprise.bean.result.WxError; import me.chanjar.weixin.enterprise.bean.result.WxMediaUploadResult; import me.chanjar.weixin.enterprise.bean.result.WxUser; import me.chanjar.weixin.enterprise.exception.WxErrorException; -import me.chanjar.weixin.common.FileUtils; +import me.chanjar.weixin.common.util.FileUtils; import me.chanjar.weixin.enterprise.util.http.MediaDownloadRequestExecutor; import me.chanjar.weixin.enterprise.util.http.MediaUploadRequestExecutor; import me.chanjar.weixin.enterprise.util.http.RequestExecutor; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxInMemoryCpConfigStorage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxInMemoryCpConfigStorage.java index cff868a03..376ed7923 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxInMemoryCpConfigStorage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/api/WxInMemoryCpConfigStorage.java @@ -1,6 +1,6 @@ package me.chanjar.weixin.enterprise.api; -import me.chanjar.weixin.enterprise.bean.WxAccessToken; +import me.chanjar.weixin.common.bean.WxAccessToken; /** * 基于内存的微信配置provider，在实际生产环境中应该将这些配置持久化 diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java index 3330c344b..2b540c97e 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlMessage.java @@ -1,8 +1,8 @@ package me.chanjar.weixin.enterprise.bean; import me.chanjar.weixin.enterprise.api.WxCpConfigStorage; -import me.chanjar.weixin.common.AdapterCDATA; -import me.chanjar.weixin.common.XmlTransformer; +import me.chanjar.weixin.common.util.AdapterCDATA; +import me.chanjar.weixin.common.util.XmlTransformer; import me.chanjar.weixin.enterprise.util.crypto.WxCryptUtil; import org.apache.commons.io.IOUtils; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java index d7626fa04..ff1508269 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutImageMessage.java @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import me.chanjar.weixin.enterprise.api.WxCpConsts; -import me.chanjar.weixin.common.MediaIdMarshaller; +import me.chanjar.weixin.common.util.MediaIdMarshaller; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java index 0ad9814e0..8df5b4347 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMessage.java @@ -14,8 +14,8 @@ import me.chanjar.weixin.enterprise.bean.outxmlbuilder.TextBuilder; import me.chanjar.weixin.enterprise.bean.outxmlbuilder.VideoBuilder; import me.chanjar.weixin.enterprise.bean.outxmlbuilder.VoiceBuilder; import me.chanjar.weixin.enterprise.util.crypto.WxCryptUtil; -import me.chanjar.weixin.common.AdapterCDATA; -import me.chanjar.weixin.common.XmlTransformer; +import me.chanjar.weixin.common.util.AdapterCDATA; +import me.chanjar.weixin.common.util.XmlTransformer; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java index f7040b952..4cc673636 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutMewsMessage.java @@ -11,7 +11,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import me.chanjar.weixin.enterprise.api.WxCpConsts; -import me.chanjar.weixin.common.AdapterCDATA; +import me.chanjar.weixin.common.util.AdapterCDATA; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java index d603881cf..d048933b0 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutTextMessage.java @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import me.chanjar.weixin.enterprise.api.WxCpConsts; -import me.chanjar.weixin.common.AdapterCDATA; +import me.chanjar.weixin.common.util.AdapterCDATA; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVideoMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVideoMessage.java index ded10f3d5..447298a3a 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVideoMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVideoMessage.java @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import me.chanjar.weixin.enterprise.api.WxCpConsts; -import me.chanjar.weixin.common.AdapterCDATA; +import me.chanjar.weixin.common.util.AdapterCDATA; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVoiceMessage.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVoiceMessage.java index 9bcd124dc..541b276b6 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVoiceMessage.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/bean/WxCpXmlOutVoiceMessage.java @@ -7,7 +7,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import me.chanjar.weixin.enterprise.api.WxCpConsts; -import me.chanjar.weixin.common.MediaIdMarshaller; +import me.chanjar.weixin.common.util.MediaIdMarshaller; @XmlRootElement(name = "xml") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/http/MediaDownloadRequestExecutor.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/http/MediaDownloadRequestExecutor.java index 9fce84b0b..bbe58847a 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/http/MediaDownloadRequestExecutor.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/http/MediaDownloadRequestExecutor.java @@ -15,7 +15,7 @@ import org.apache.http.entity.ContentType; import me.chanjar.weixin.enterprise.bean.result.WxError; import me.chanjar.weixin.enterprise.exception.WxErrorException; -import me.chanjar.weixin.common.FileUtils; +import me.chanjar.weixin.common.util.FileUtils; /** * 下载媒体文件请求执行器，请求的参数是String, 返回的结果是File diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpAccessTokenAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpAccessTokenAdapter.java index 1892a2ad5..0de5428d4 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpAccessTokenAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpAccessTokenAdapter.java @@ -9,8 +9,8 @@ package me.chanjar.weixin.enterprise.util.json; import com.google.gson.*; -import me.chanjar.weixin.common.GsonHelper; -import me.chanjar.weixin.enterprise.bean.WxAccessToken; +import me.chanjar.weixin.common.util.GsonHelper; +import me.chanjar.weixin.common.bean.WxAccessToken; import java.lang.reflect.Type; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpDepartGsonAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpDepartGsonAdapter.java index 9c40d6bf4..d2cff9452 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpDepartGsonAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpDepartGsonAdapter.java @@ -10,7 +10,7 @@ package me.chanjar.weixin.enterprise.util.json; import java.lang.reflect.Type; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.WxCpDepart; import com.google.gson.JsonDeserializationContext; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpGsonBuilder.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpGsonBuilder.java index ab8729213..a339ead41 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpGsonBuilder.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpGsonBuilder.java @@ -3,6 +3,7 @@ package me.chanjar.weixin.enterprise.util.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import me.chanjar.weixin.common.bean.WxAccessToken; import me.chanjar.weixin.enterprise.bean.*; import me.chanjar.weixin.enterprise.bean.result.*; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMediaUploadResultAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMediaUploadResultAdapter.java index 2ba524575..028e6c3f6 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMediaUploadResultAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMediaUploadResultAdapter.java @@ -9,7 +9,7 @@ package me.chanjar.weixin.enterprise.util.json; import com.google.gson.*; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.result.WxMediaUploadResult; import java.lang.reflect.Type; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java index 31db9dfc6..e2a62f786 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpMenuGsonAdapter.java @@ -10,7 +10,7 @@ package me.chanjar.weixin.enterprise.util.json; import java.lang.reflect.Type; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.WxCpMenu; import com.google.gson.JsonArray; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserGsonAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserGsonAdapter.java index 904afa883..5da2e6ab9 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserGsonAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserGsonAdapter.java @@ -10,7 +10,7 @@ package me.chanjar.weixin.enterprise.util.json; import java.lang.reflect.Type; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.result.WxUser; import com.google.gson.JsonDeserializationContext; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserListGsonAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserListGsonAdapter.java index 9231e2e5b..adcb150fd 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserListGsonAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxCpUserListGsonAdapter.java @@ -10,7 +10,7 @@ package me.chanjar.weixin.enterprise.util.json; import java.lang.reflect.Type; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.result.WxUserList; import com.google.gson.JsonArray; diff --git a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxErrorAdapter.java b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxErrorAdapter.java index 12359e0b3..2a3536117 100644 --- a/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxErrorAdapter.java +++ b/weixin-java-enterprise/src/main/java/me/chanjar/weixin/enterprise/util/json/WxErrorAdapter.java @@ -9,7 +9,7 @@ package me.chanjar.weixin.enterprise.util.json; import com.google.gson.*; -import me.chanjar.weixin.common.GsonHelper; +import me.chanjar.weixin.common.util.GsonHelper; import me.chanjar.weixin.enterprise.bean.result.WxError; import java.lang.reflect.Type; diff --git a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/bean/WxAccessTokenTest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/common/bean/WxAccessTokenTest.java similarity index 80% rename from weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/bean/WxAccessTokenTest.java rename to weixin-java-enterprise/src/test/java/me/chanjar/weixin/common/bean/WxAccessTokenTest.java index e0c4c59da..c3b891f71 100644 --- a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/bean/WxAccessTokenTest.java +++ b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/common/bean/WxAccessTokenTest.java @@ -1,6 +1,6 @@ -package me.chanjar.weixin.enterprise.bean; +package me.chanjar.weixin.common.bean; -import me.chanjar.weixin.enterprise.bean.WxAccessToken; +import me.chanjar.weixin.common.bean.WxAccessToken; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxBaseAPITest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpBaseAPITest.java similarity index 96% rename from weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxBaseAPITest.java rename to weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpBaseAPITest.java index 453ea36a0..637d93ba3 100644 --- a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxBaseAPITest.java +++ b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpBaseAPITest.java @@ -16,7 +16,7 @@ import com.google.inject.Inject; */ @Test(groups = "baseAPI") @Guice(modules = ApiTestModule.class) -public class WxBaseAPITest { +public class WxCpBaseAPITest { @Inject protected WxCpServiceImpl wxService; diff --git a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java index b22cba7ab..cf1b70bef 100644 --- a/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java +++ b/weixin-java-enterprise/src/test/java/me/chanjar/weixin/enterprise/api/WxCpMenuAPITest.java @@ -18,8 +18,7 @@ import me.chanjar.weixin.enterprise.exception.WxErrorException; * @author Daniel Qian * */ -//@Test(groups="menuAPI", dependsOnGroups="baseAPI") -@Test +@Test(groups="menuAPI", dependsOnGroups="baseAPI") @Guice(modules = ApiTestModule.class) public class WxCpMenuAPITest { diff --git a/weixin-java-enterprise/src/test/resources/testng.xml b/weixin-java-enterprise/src/test/resources/testng.xml index af00d0f8f..cae049fea 100644 --- a/weixin-java-enterprise/src/test/resources/testng.xml +++ b/weixin-java-enterprise/src/test/resources/testng.xml @@ -3,33 +3,28 @@ - - - - - - - - - - + + + + + + - - - - - - - - - - - - + + + + + + + + + + +