From 94ec4a2196e3c77f2ec56fa9cc1da8ac35d4a305 Mon Sep 17 00:00:00 2001 From: jinyu Date: Tue, 8 Dec 2015 11:58:49 +0800 Subject: [PATCH] @since JDK 1.7 => @since JDK 1.6 --- CHANGE.md | 13 +++++++------ README.md | 6 +++--- .../java/com/foxinmy/weixin4j/api/BaseApi.java | 2 +- .../java/com/foxinmy/weixin4j/api/CashApi.java | 2 +- .../java/com/foxinmy/weixin4j/api/CouponApi.java | 2 +- .../java/com/foxinmy/weixin4j/api/Pay3Api.java | 4 ++-- .../weixin4j/exception/WeixinException.java | 2 +- .../weixin4j/exception/WeixinPayException.java | 2 +- .../weixin4j/http/AbstractHttpResponse.java | 2 +- .../com/foxinmy/weixin4j/http/ContentType.java | 2 +- .../com/foxinmy/weixin4j/http/HttpClient.java | 2 +- .../com/foxinmy/weixin4j/http/HttpMessage.java | 2 +- .../com/foxinmy/weixin4j/http/HttpMethod.java | 2 +- .../com/foxinmy/weixin4j/http/HttpParams.java | 2 +- .../com/foxinmy/weixin4j/http/HttpRequest.java | 2 +- .../com/foxinmy/weixin4j/http/HttpResponse.java | 2 +- .../com/foxinmy/weixin4j/http/HttpVersion.java | 2 +- .../foxinmy/weixin4j/http/SimpleHttpClient.java | 2 +- .../weixin4j/http/SimpleHttpResponse.java | 2 +- .../com/foxinmy/weixin4j/http/URLParameter.java | 2 +- .../weixin4j/http/factory/HttpClientFactory.java | 2 +- .../weixin4j/http/factory/HttpComponent3.java | 2 +- .../http/factory/HttpComponent3Factory.java | 4 ++-- .../http/factory/HttpComponent3Response.java | 2 +- .../weixin4j/http/factory/HttpComponent4.java | 2 +- .../http/factory/HttpComponent4Factory.java | 2 +- .../weixin4j/http/factory/HttpComponent4_1.java | 2 +- .../http/factory/HttpComponent4_1Response.java | 2 +- .../weixin4j/http/factory/HttpComponent4_2.java | 2 +- .../http/factory/HttpComponent4_2Response.java | 2 +- .../weixin4j/http/factory/Netty4HttpClient.java | 2 +- .../http/factory/Netty4HttpClientFactory.java | 2 +- .../http/factory/Netty4HttpResponse.java | 2 +- .../http/factory/SimpleHttpClientFactory.java | 2 +- .../foxinmy/weixin4j/http/weixin/JsonResult.java | 2 +- .../http/weixin/WeixinRequestExecutor.java | 2 +- .../http/weixin/WeixinSSLRequestExecutor.java | 2 +- .../foxinmy/weixin4j/http/weixin/XmlResult.java | 2 +- .../java/com/foxinmy/weixin4j/model/Button.java | 2 +- .../java/com/foxinmy/weixin4j/model/Consts.java | 2 +- .../java/com/foxinmy/weixin4j/model/Gender.java | 2 +- .../com/foxinmy/weixin4j/model/MediaCounter.java | 2 +- .../weixin4j/model/MediaDownloadResult.java | 2 +- .../com/foxinmy/weixin4j/model/MediaItem.java | 2 +- .../com/foxinmy/weixin4j/model/MediaRecord.java | 2 +- .../weixin4j/model/MediaUploadResult.java | 2 +- .../com/foxinmy/weixin4j/model/Pageable.java | 2 +- .../java/com/foxinmy/weixin4j/model/Token.java | 2 +- .../foxinmy/weixin4j/model/WeixinAccount.java | 2 +- .../foxinmy/weixin4j/model/WeixinPayAccount.java | 2 +- .../foxinmy/weixin4j/payment/JsPayNotify.java | 2 +- .../weixin4j/payment/MicroPayPackage.java | 2 +- .../foxinmy/weixin4j/payment/PayBaseInfo.java | 2 +- .../com/foxinmy/weixin4j/payment/PayPackage.java | 2 +- .../foxinmy/weixin4j/payment/PayURLConsts.java | 2 +- .../com/foxinmy/weixin4j/payment/PayUtil.java | 2 +- .../foxinmy/weixin4j/payment/WeixinPayProxy.java | 8 ++++---- .../weixin4j/payment/coupon/CouponDetail.java | 2 +- .../weixin4j/payment/coupon/CouponInfo.java | 2 +- .../weixin4j/payment/coupon/CouponResult.java | 2 +- .../weixin4j/payment/coupon/CouponStock.java | 2 +- .../foxinmy/weixin4j/payment/mch/ApiResult.java | 2 +- .../payment/mch/AuthCodeOpenIdResult.java | 2 +- .../foxinmy/weixin4j/payment/mch/MPPayment.java | 2 +- .../weixin4j/payment/mch/MPPaymentRecord.java | 2 +- .../weixin4j/payment/mch/MPPaymentResult.java | 2 +- .../weixin4j/payment/mch/MchPayPackage.java | 2 +- .../weixin4j/payment/mch/MchPayRequest.java | 16 +++++++--------- .../weixin4j/payment/mch/NativePayNotify.java | 2 +- .../weixin4j/payment/mch/NativePayResponse.java | 2 +- .../com/foxinmy/weixin4j/payment/mch/Order.java | 2 +- .../com/foxinmy/weixin4j/payment/mch/PrePay.java | 2 +- .../foxinmy/weixin4j/payment/mch/Redpacket.java | 2 +- .../weixin4j/payment/mch/RedpacketRecord.java | 2 +- .../payment/mch/RedpacketSendResult.java | 2 +- .../weixin4j/payment/mch/RefundDetail.java | 2 +- .../weixin4j/payment/mch/RefundRecord.java | 2 +- .../weixin4j/payment/mch/RefundResult.java | 2 +- .../foxinmy/weixin4j/token/CacheStorager.java | 2 +- .../weixin4j/token/FileTokenStorager.java | 2 +- .../com/foxinmy/weixin4j/token/TokenCreator.java | 2 +- .../com/foxinmy/weixin4j/token/TokenHolder.java | 2 +- .../foxinmy/weixin4j/token/TokenStorager.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Article.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Card.java | 2 +- .../com/foxinmy/weixin4j/tuple/ChatTuple.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/File.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Image.java | 2 +- .../com/foxinmy/weixin4j/tuple/MassTuple.java | 2 +- .../com/foxinmy/weixin4j/tuple/MpArticle.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/MpNews.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/MpVideo.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Music.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/News.java | 2 +- .../com/foxinmy/weixin4j/tuple/NotifyTuple.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Text.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Tuple.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Video.java | 2 +- .../java/com/foxinmy/weixin4j/tuple/Voice.java | 2 +- .../java/com/foxinmy/weixin4j/type/BankType.java | 2 +- .../java/com/foxinmy/weixin4j/type/BillType.java | 2 +- .../com/foxinmy/weixin4j/type/ButtonType.java | 2 +- .../com/foxinmy/weixin4j/type/CouponStatus.java | 2 +- .../foxinmy/weixin4j/type/CouponStockStatus.java | 2 +- .../foxinmy/weixin4j/type/CouponStockType.java | 2 +- .../com/foxinmy/weixin4j/type/CouponType.java | 2 +- .../com/foxinmy/weixin4j/type/CurrencyType.java | 2 +- .../java/com/foxinmy/weixin4j/type/IdQuery.java | 2 +- .../java/com/foxinmy/weixin4j/type/IdType.java | 2 +- .../weixin4j/type/MPPaymentCheckNameType.java | 2 +- .../com/foxinmy/weixin4j/type/MediaType.java | 2 +- .../java/com/foxinmy/weixin4j/type/QRType.java | 2 +- .../foxinmy/weixin4j/type/RedpacketSendType.java | 2 +- .../foxinmy/weixin4j/type/RedpacketStatus.java | 2 +- .../com/foxinmy/weixin4j/type/RedpacketType.java | 2 +- .../com/foxinmy/weixin4j/type/RefundChannel.java | 2 +- .../com/foxinmy/weixin4j/type/RefundStatus.java | 2 +- .../com/foxinmy/weixin4j/type/RefundType.java | 2 +- .../java/com/foxinmy/weixin4j/type/SignType.java | 2 +- .../com/foxinmy/weixin4j/type/TradeState.java | 2 +- .../com/foxinmy/weixin4j/type/TradeType.java | 2 +- .../java/com/foxinmy/weixin4j/util/DateUtil.java | 2 +- .../com/foxinmy/weixin4j/util/DigestUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/FileUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/IOUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/MapUtil.java | 2 +- .../com/foxinmy/weixin4j/util/NameValue.java | 6 +++++- .../com/foxinmy/weixin4j/util/RandomUtil.java | 2 +- .../foxinmy/weixin4j/util/URLEncodingUtil.java | 2 +- .../weixin4j/util/Weixin4jConfigUtil.java | 2 +- .../com/foxinmy/weixin4j/util/Weixin4jConst.java | 2 +- .../foxinmy/weixin4j/util/WeixinErrorUtil.java | 2 +- .../foxinmy/weixin4j/xml/ListsuffixResult.java | 2 +- .../xml/ListsuffixResultDeserializer.java | 2 +- .../weixin4j/xml/ListsuffixResultSerializer.java | 2 +- .../java/com/foxinmy/weixin4j/xml/XmlStream.java | 2 +- weixin4j-mp/CHANGE.md | 2 +- weixin4j-mp/README.md | 2 +- .../com/foxinmy/weixin4j/mp/WeixinProxy.java | 2 +- .../com/foxinmy/weixin4j/mp/api/CustomApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/DataApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/GroupApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/HelperApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/MassApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/MediaApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/MenuApi.java | 2 +- .../java/com/foxinmy/weixin4j/mp/api/MpApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/NotifyApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/OauthApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/Pay2Api.java | 2 +- .../java/com/foxinmy/weixin4j/mp/api/QrApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/TmplApi.java | 2 +- .../com/foxinmy/weixin4j/mp/api/UserApi.java | 2 +- .../weixin4j/mp/datacube/ArticleDatacube1.java | 2 +- .../weixin4j/mp/datacube/ArticleDatacube2.java | 2 +- .../mp/datacube/ArticleDatacubeShare.java | 2 +- .../weixin4j/mp/datacube/ArticleSummary.java | 2 +- .../weixin4j/mp/datacube/ArticleTotal.java | 2 +- .../weixin4j/mp/datacube/InterfaceSummary.java | 2 +- .../weixin4j/mp/datacube/UpstreamMsg.java | 2 +- .../weixin4j/mp/datacube/UpstreamMsgDist.java | 2 +- .../weixin4j/mp/datacube/UserSummary.java | 2 +- .../weixin4j/mp/message/NotifyMessage.java | 2 +- .../weixin4j/mp/message/TemplateMessage.java | 4 ++-- .../weixin4j/mp/model/AutoReplySetting.java | 6 +++--- .../foxinmy/weixin4j/mp/model/CustomRecord.java | 2 +- .../com/foxinmy/weixin4j/mp/model/Following.java | 2 +- .../com/foxinmy/weixin4j/mp/model/Group.java | 2 +- .../com/foxinmy/weixin4j/mp/model/KfAccount.java | 2 +- .../com/foxinmy/weixin4j/mp/model/KfSession.java | 2 +- .../foxinmy/weixin4j/mp/model/MenuSetting.java | 2 +- .../foxinmy/weixin4j/mp/model/OauthToken.java | 2 +- .../foxinmy/weixin4j/mp/model/QRParameter.java | 2 +- .../com/foxinmy/weixin4j/mp/model/QRResult.java | 2 +- .../com/foxinmy/weixin4j/mp/model/SemQuery.java | 2 +- .../com/foxinmy/weixin4j/mp/model/SemResult.java | 2 +- .../java/com/foxinmy/weixin4j/mp/model/User.java | 2 +- .../weixin4j/mp/payment/v2/ApiResultV2.java | 2 +- .../weixin4j/mp/payment/v2/JsPayRequestV2.java | 2 +- .../mp/payment/v2/NativePayNotifyV2.java | 2 +- .../mp/payment/v2/NativePayResponseV2.java | 2 +- .../foxinmy/weixin4j/mp/payment/v2/OrderV2.java | 2 +- .../weixin4j/mp/payment/v2/PayFeedback.java | 2 +- .../weixin4j/mp/payment/v2/PayPackageV2.java | 2 +- .../foxinmy/weixin4j/mp/payment/v2/PayUtil2.java | 2 +- .../foxinmy/weixin4j/mp/payment/v2/PayWarn.java | 2 +- .../weixin4j/mp/payment/v2/RefundDetailV2.java | 2 +- .../weixin4j/mp/payment/v2/RefundRecordV2.java | 2 +- .../weixin4j/mp/payment/v2/RefundResultV2.java | 2 +- .../weixin4j/mp/token/WeixinJSTicketCreator.java | 2 +- .../weixin4j/mp/token/WeixinTokenCreator.java | 2 +- .../foxinmy/weixin4j/mp/type/AutomatchMode.java | 2 +- .../foxinmy/weixin4j/mp/type/AutoreplyMode.java | 2 +- .../weixin4j/mp/type/CustomRecordOperCode.java | 2 +- .../foxinmy/weixin4j/mp/type/DatacubeType.java | 2 +- .../mp/type/DatacuteCountIntervalType.java | 2 +- .../com/foxinmy/weixin4j/mp/type/FaceSize.java | 2 +- .../foxinmy/weixin4j/mp/type/IndustryType.java | 2 +- .../foxinmy/weixin4j/mp/type/KfOnlineStatus.java | 2 +- .../java/com/foxinmy/weixin4j/mp/type/Lang.java | 2 +- .../foxinmy/weixin4j/mp/type/SemCategory.java | 2 +- .../weixin4j/mp/type/ShareSourceType.java | 2 +- .../com/foxinmy/weixin4j/mp/type/URLConsts.java | 2 +- .../foxinmy/weixin4j/mp/type/UserSourceType.java | 2 +- .../com/foxinmy/weixin4j/mp/test/CashTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/CouponTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/CustomTest.java | 2 +- .../foxinmy/weixin4j/mp/test/DataApiTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/GroupTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/MassTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/MediaTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/MenuTest.java | 10 +++++++--- .../com/foxinmy/weixin4j/mp/test/NotifyTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/QRTest.java | 4 ++-- .../com/foxinmy/weixin4j/mp/test/TokenTest.java | 2 +- .../com/foxinmy/weixin4j/mp/test/UserTest.java | 2 +- weixin4j-qy/CHANGE.md | 8 +++++--- weixin4j-qy/README.md | 2 +- .../com/foxinmy/weixin4j/qy/WeixinProxy.java | 2 +- .../foxinmy/weixin4j/qy/WeixinSuiteProxy.java | 2 +- .../com/foxinmy/weixin4j/qy/api/AgentApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/BatchApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/ChatApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/HelperApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/MediaApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/MenuApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/NotifyApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/OauthApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/PartyApi.java | 2 +- .../java/com/foxinmy/weixin4j/qy/api/QyApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/SuiteApi.java | 2 +- .../java/com/foxinmy/weixin4j/qy/api/TagApi.java | 2 +- .../com/foxinmy/weixin4j/qy/api/UserApi.java | 2 +- .../foxinmy/weixin4j/qy/message/ChatMessage.java | 2 +- .../weixin4j/qy/message/CustomeMessage.java | 6 +++--- .../weixin4j/qy/message/NotifyMessage.java | 2 +- .../com/foxinmy/weixin4j/qy/model/AgentInfo.java | 2 +- .../foxinmy/weixin4j/qy/model/AgentOverview.java | 2 +- .../foxinmy/weixin4j/qy/model/AgentSetter.java | 2 +- .../foxinmy/weixin4j/qy/model/BatchResult.java | 2 +- .../com/foxinmy/weixin4j/qy/model/Callback.java | 2 +- .../com/foxinmy/weixin4j/qy/model/ChatInfo.java | 2 +- .../com/foxinmy/weixin4j/qy/model/ChatMute.java | 2 +- .../com/foxinmy/weixin4j/qy/model/CorpInfo.java | 2 +- .../foxinmy/weixin4j/qy/model/IdParameter.java | 2 +- .../com/foxinmy/weixin4j/qy/model/OUserInfo.java | 8 ++++---- .../com/foxinmy/weixin4j/qy/model/Party.java | 2 +- .../java/com/foxinmy/weixin4j/qy/model/Tag.java | 2 +- .../java/com/foxinmy/weixin4j/qy/model/User.java | 4 ++-- .../weixin4j/qy/model/WeixinQyAccount.java | 2 +- .../weixin4j/qy/suite/SuitePerCodeHolder.java | 2 +- .../weixin4j/qy/suite/SuiteTicketHolder.java | 2 +- .../qy/suite/WeixinSuitePreCodeCreator.java | 2 +- .../qy/suite/WeixinSuiteTokenCreator.java | 2 +- .../qy/suite/WeixinTokenSuiteCreator.java | 2 +- .../weixin4j/qy/token/WeixinJSTicketCreator.java | 2 +- .../qy/token/WeixinProviderTokenCreator.java | 2 +- .../weixin4j/qy/token/WeixinTokenCreator.java | 2 +- .../foxinmy/weixin4j/qy/type/AgentAuthType.java | 2 +- .../foxinmy/weixin4j/qy/type/BatchStatus.java | 2 +- .../com/foxinmy/weixin4j/qy/type/BatchType.java | 2 +- .../com/foxinmy/weixin4j/qy/type/ChatType.java | 2 +- .../com/foxinmy/weixin4j/qy/type/CorpType.java | 2 +- .../com/foxinmy/weixin4j/qy/type/InviteType.java | 2 +- .../weixin4j/qy/type/ReportLocationType.java | 2 +- .../com/foxinmy/weixin4j/qy/type/URLConsts.java | 2 +- .../com/foxinmy/weixin4j/qy/type/UserStatus.java | 2 +- .../com/foxinmy/weixin4j/qy/test/AgentTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/BatchTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/HelperTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/MediaTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/MenuTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/NotifyTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/PartyTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/TagTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/TokenTest.java | 2 +- .../com/foxinmy/weixin4j/qy/test/UserTest.java | 2 +- weixin4j-server/CHANGE.md | 2 +- weixin4j-server/README.md | 4 ++-- .../foxinmy/weixin4j/dispatcher/BeanFactory.java | 2 +- .../dispatcher/DefaultMessageMatcher.java | 2 +- .../dispatcher/MessageHandlerExecutor.java | 2 +- .../dispatcher/WeixinMessageDispatcher.java | 2 +- .../weixin4j/dispatcher/WeixinMessageKey.java | 2 +- .../dispatcher/WeixinMessageMatcher.java | 2 +- .../weixin4j/exception/WeixinException.java | 2 +- .../weixin4j/handler/DebugMessageHandler.java | 2 +- .../weixin4j/handler/MessageHandlerAdapter.java | 2 +- .../weixin4j/handler/WeixinMessageHandler.java | 2 +- .../interceptor/MessageInterceptorAdapter.java | 2 +- .../interceptor/WeixinMessageInterceptor.java | 2 +- .../foxinmy/weixin4j/message/ImageMessage.java | 2 +- .../foxinmy/weixin4j/message/LinkMessage.java | 2 +- .../weixin4j/message/LocationMessage.java | 2 +- .../foxinmy/weixin4j/message/TextMessage.java | 2 +- .../foxinmy/weixin4j/message/VideoMessage.java | 2 +- .../foxinmy/weixin4j/message/VoiceMessage.java | 2 +- .../weixin4j/message/event/EventMessage.java | 2 +- .../message/event/LocationEventMessage.java | 2 +- .../weixin4j/message/event/MenuEventMessage.java | 2 +- .../message/event/MenuLocationEventMessage.java | 4 ++-- .../message/event/MenuPhotoEventMessage.java | 6 +++--- .../message/event/MenuScanEventMessage.java | 4 ++-- .../weixin4j/mp/event/KfCloseEventMessage.java | 2 +- .../weixin4j/mp/event/KfCreateEventMessage.java | 2 +- .../weixin4j/mp/event/KfSwitchEventMessage.java | 2 +- .../weixin4j/mp/event/MassEventMessage.java | 2 +- .../weixin4j/mp/event/ScanEventMessage.java | 2 +- .../weixin4j/mp/event/ScribeEventMessage.java | 2 +- .../mp/event/TemplatesendjobfinishMessage.java | 2 +- .../mp/event/VerifyExpireEventMessage.java | 2 +- .../mp/event/VerifyFailEventMessage.java | 2 +- .../foxinmy/weixin4j/qy/chat/ChatEventType.java | 2 +- .../com/foxinmy/weixin4j/qy/chat/ChatItem.java | 2 +- .../foxinmy/weixin4j/qy/chat/ChatReceiver.java | 2 +- .../com/foxinmy/weixin4j/qy/chat/ChatType.java | 2 +- .../weixin4j/qy/chat/WeixinChatMessage.java | 2 +- .../weixin4j/qy/event/BatchjobresultMessage.java | 4 ++-- .../qy/event/EnterAgentEventMessage.java | 2 +- .../weixin4j/qy/event/ScribeEventMessage.java | 2 +- .../weixin4j/qy/suite/SuiteEventType.java | 2 +- .../weixin4j/qy/suite/WeixinSuiteMessage.java | 2 +- .../foxinmy/weixin4j/request/WeixinMessage.java | 2 +- .../foxinmy/weixin4j/request/WeixinRequest.java | 2 +- .../foxinmy/weixin4j/response/BlankResponse.java | 2 +- .../foxinmy/weixin4j/response/ImageResponse.java | 2 +- .../foxinmy/weixin4j/response/MusicResponse.java | 2 +- .../foxinmy/weixin4j/response/NewsResponse.java | 4 ++-- .../weixin4j/response/SingleResponse.java | 2 +- .../foxinmy/weixin4j/response/TextResponse.java | 2 +- .../response/TransferCustomerResponse.java | 2 +- .../foxinmy/weixin4j/response/VideoResponse.java | 2 +- .../foxinmy/weixin4j/response/VoiceResponse.java | 2 +- .../weixin4j/response/WeixinResponse.java | 2 +- .../weixin4j/socket/SingleResponseEncoder.java | 2 +- .../weixin4j/socket/WeixinMessageDecoder.java | 2 +- .../weixin4j/socket/WeixinMessageTransfer.java | 2 +- .../weixin4j/socket/WeixinRequestHandler.java | 2 +- .../weixin4j/socket/WeixinResponseEncoder.java | 2 +- .../weixin4j/socket/WeixinServerInitializer.java | 2 +- .../weixin4j/startup/WeixinServerBootstrap.java | 2 +- .../com/foxinmy/weixin4j/type/AccountType.java | 2 +- .../com/foxinmy/weixin4j/type/AgentType.java | 2 +- .../com/foxinmy/weixin4j/type/EncryptType.java | 2 +- .../com/foxinmy/weixin4j/type/EventType.java | 2 +- .../java/com/foxinmy/weixin4j/util/AesToken.java | 2 +- .../java/com/foxinmy/weixin4j/util/Base64.java | 2 +- .../com/foxinmy/weixin4j/util/ClassUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/Consts.java | 2 +- .../com/foxinmy/weixin4j/util/DigestUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/HexUtil.java | 2 +- .../java/com/foxinmy/weixin4j/util/HttpUtil.java | 2 +- .../com/foxinmy/weixin4j/util/MessageUtil.java | 2 +- .../com/foxinmy/weixin4j/util/RandomUtil.java | 2 +- .../com/foxinmy/weixin4j/util/StringUtil.java | 2 +- .../weixin4j/xml/EncryptMessageHandler.java | 2 +- .../weixin4j/xml/MessageTransferHandler.java | 2 +- .../weixin4j/server/test/EncryptMessageTest.java | 2 +- .../server/test/EventMessageRequestTest.java | 2 +- .../weixin4j/server/test/MessagePush.java | 2 +- .../weixin4j/server/test/MessageRequestTest.java | 2 +- .../server/test/MessageServerStartup.java | 2 +- 362 files changed, 412 insertions(+), 403 deletions(-) diff --git a/CHANGE.md b/CHANGE.md index fc3cee9e..707aedd4 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -513,11 +513,6 @@ + weixin4j-base:调整PayUtil#createNativePayRequestURL参数位置：从主到次 -* 2015-12-01 - - + weixin4j-[mp|qy]:version upgrade to 1.6.4 - - + weixin4j-server:version upgrade to 1.1.4 * 2015-12-04 @@ -525,4 +520,10 @@ + weixin4j-base:【重要】添加MchPayRequest的构造函数，便于二次发起支付。 - + weixin4j-qy:【重要】第三方应用授权时获取永久授权码覆盖问题。 \ No newline at end of file + + weixin4j-qy:【重要】第三方应用授权时获取永久授权码覆盖问题。 + +* 2015-12-08 + + + weixin4j-[mp|qy]:version upgrade to 1.6.4 + + + weixin4j-server:version upgrade to 1.1.4 \ No newline at end of file diff --git a/README.md b/README.md index 1884b5fb..be2c54dd 100644 --- a/README.md +++ b/README.md @@ -26,21 +26,21 @@ weixin4j 如何获取 ---------- ###1.maven依赖 -微信公众平台API(1.6.4,2015-12-01 released) +微信公众平台API(1.6.4,2015-12-08 released) com.foxinmy weixin4j-mp 1.6.4 -微信企业号API(1.6.4,2015-12-01 released) +微信企业号API(1.6.4,2015-12-08 released) com.foxinmy weixin4j-qy 1.6.4 -微信回调消息服务器(1.1.4,2015-12-01 released) +微信回调消息服务器(1.1.4,2015-12-08 released) com.foxinmy diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/BaseApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/BaseApi.java index 11cb658b..90e2aa38 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/BaseApi.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/BaseApi.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.util.Weixin4jConst; * @className BaseApi * @author jy.hu * @date 2014年9月26日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 微信公众平台API文档 * @see 微信企业号API文档 */ diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java index 813518b8..f28e360c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/CashApi.java @@ -30,7 +30,7 @@ import com.foxinmy.weixin4j.xml.XmlStream; * @className CashApi * @author jy * @date 2015年3月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 现金红包 * @see 代金券文档 */ public class CouponApi { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java index ac650d41..1e0c25cd 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/api/Pay3Api.java @@ -48,7 +48,7 @@ import com.foxinmy.weixin4j.xml.XmlStream; * @className Pay3Api * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 商户平台API */ public class Pay3Api { @@ -304,7 +304,7 @@ public class Pay3Api { * href="http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_6">下载对账单API * @throws WeixinException */ - public File downloadbill(Date billDate, BillType billType) + public File downloadBill(Date billDate, BillType billType) throws WeixinException { if (billDate == null) { Calendar now = Calendar.getInstance(); diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinException.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinException.java index 084c6e34..5193b3ca 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinException.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinException.java @@ -8,7 +8,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className WeixinException * @author jy.hu * @date 2014年4月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class WeixinException extends Exception { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinPayException.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinPayException.java index 7bf5a039..07eaa923 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinPayException.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/exception/WeixinPayException.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.exception; * @className WeixinPayException * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class WeixinPayException extends WeixinException { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/AbstractHttpResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/AbstractHttpResponse.java index 5eecfc7e..0f9fd6d5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/AbstractHttpResponse.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/AbstractHttpResponse.java @@ -8,7 +8,7 @@ import java.io.InputStream; * @className AbstractHttpResponse * @author jy * @date 2015年9月7日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public abstract class AbstractHttpResponse implements HttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/ContentType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/ContentType.java index df3f2a65..b357507d 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/ContentType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/ContentType.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.model.Consts; * @className ContentType * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class ContentType implements Serializable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpClient.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpClient.java index 79c1900b..9417052a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpClient.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpClient.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.http.entity.HttpEntity; * @className HttpClient * @author jy * @date 2015年5月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface HttpClient { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMessage.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMessage.java index 5fccf31e..d0611711 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMessage.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMessage.java @@ -7,7 +7,7 @@ package com.foxinmy.weixin4j.http; * @className HttpMessage * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface HttpMessage { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMethod.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMethod.java index 7d38899c..ca541ba8 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMethod.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpMethod.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.http; * @className HttpMethod * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum HttpMethod { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpParams.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpParams.java index bf2241d6..3b530306 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpParams.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpParams.java @@ -11,7 +11,7 @@ import javax.net.ssl.SSLContext; * @className HttpParams * @author jy * @date 2015年8月13日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class HttpParams { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java index 8145e976..14c4351d 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.http.entity.HttpEntity; * @className HttpRequest * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpRequest implements HttpMessage { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpResponse.java index a5598b52..37ad732e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpResponse.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpResponse.java @@ -8,7 +8,7 @@ import java.io.InputStream; * @className HttpResponse * @author jy * @date 2015年5月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface HttpResponse extends HttpMessage { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpVersion.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpVersion.java index 0f45a610..13d79059 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpVersion.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpVersion.java @@ -9,7 +9,7 @@ import java.util.regex.Pattern; * @className HttpVersion * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpVersion implements Comparable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java index 8f580055..d1377296 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpClient.java @@ -27,7 +27,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className SimpleHttpClient * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class SimpleHttpClient extends AbstractHttpClient implements HttpClient { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpResponse.java index 193d881e..95ff1b18 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpResponse.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/SimpleHttpResponse.java @@ -13,7 +13,7 @@ import java.util.Map.Entry; * @className SimpleHttpResponse * @author jy * @date 2015年8月14日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class SimpleHttpResponse extends AbstractHttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/URLParameter.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/URLParameter.java index f9591bc3..83b15038 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/URLParameter.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/URLParameter.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.util.URLEncodingUtil; * @className UrlParameter * @author jy * @date 2015年5月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class URLParameter extends NameValue { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java index 47014143..c94776a1 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpClientFactory.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.http.HttpClientException; * @className HttpClientFactory * @author jy * @date 2015年8月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public abstract class HttpClientFactory { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java index f4e16acc..2566fb79 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3.java @@ -49,7 +49,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className HttpComponent3 * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent3 extends AbstractHttpClient { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Factory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Factory.java index 0776168b..3ed89b8c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Factory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Factory.java @@ -8,14 +8,14 @@ import org.apache.commons.httpclient.HttpClient; * @className HttpComponent3Factory * @author jy * @date 2015年8月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent3Factory extends HttpClientFactory { public HttpComponent3Factory() { // odd bug - Class _ = HttpClient.class; + Class _dead = HttpClient.class; } @Override diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Response.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Response.java index ece04ff6..6f04d40d 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Response.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent3Response.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.http.HttpVersion; * @className HttpComponent3Response * @author jy * @date 2015年8月17日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent3Response extends AbstractHttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4.java index 2d772853..6edcee8c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4.java @@ -41,7 +41,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className HttpComponent4 * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public abstract class HttpComponent4 extends AbstractHttpClient { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4Factory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4Factory.java index d484f4bf..e220e886 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4Factory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4Factory.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.http.HttpClient; * @className HttpComponent4Factory * @author jy * @date 2015年8月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent4Factory extends HttpClientFactory { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java index 8f72907b..399a1b48 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1.java @@ -26,7 +26,7 @@ import com.foxinmy.weixin4j.model.Consts; * @className HttpComponent4_1 * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent4_1 extends HttpComponent4 { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1Response.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1Response.java index f3879e1f..2d028cda 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1Response.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_1Response.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.http.HttpVersion; * @className HttpComponent4_1Response * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent4_1Response extends AbstractHttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java index 9a7b1977..77e4dc96 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2.java @@ -24,7 +24,7 @@ import com.foxinmy.weixin4j.http.HttpResponse; * @className HttpComponent4_2 * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent4_2 extends HttpComponent4 { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2Response.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2Response.java index ea2d0921..3683adc2 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2Response.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/HttpComponent4_2Response.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.http.HttpVersion; * @className HttpComponent4_2Response * @author jy * @date 2015年8月18日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HttpComponent4_2Response extends AbstractHttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClient.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClient.java index 0b7d7b6b..de5c4ebd 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClient.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClient.java @@ -45,7 +45,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className Netty4HttpClient * @author jy * @date 2015年8月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Netty4HttpClient extends AbstractHttpClient { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClientFactory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClientFactory.java index cb89eef8..6fe5c99a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClientFactory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpClientFactory.java @@ -22,7 +22,7 @@ import com.foxinmy.weixin4j.http.HttpClient; * @className Netty4HttpClientFactory * @author jy * @date 2015年8月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Netty4HttpClientFactory extends HttpClientFactory { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpResponse.java index 78092bfb..0bada376 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpResponse.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/Netty4HttpResponse.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.http.HttpVersion; * @className Netty4HttpResponse * @author jy * @date 2015年8月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Netty4HttpResponse extends AbstractHttpResponse { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/SimpleHttpClientFactory.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/SimpleHttpClientFactory.java index 806ee5a0..e55f7390 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/SimpleHttpClientFactory.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/factory/SimpleHttpClientFactory.java @@ -9,7 +9,7 @@ import com.foxinmy.weixin4j.http.SimpleHttpClient; * @className SimpleHttpClientFactory * @author jy * @date 2015年8月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.http.SimpleHttpClient */ public class SimpleHttpClientFactory extends HttpClientFactory { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/JsonResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/JsonResult.java index 039d84de..08b5d51e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/JsonResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/weixin/JsonResult.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className JsonResult * @author jy.hu * @date 2014年9月24日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 公众平台全局返回码说明 * @see 微信公众平台获取token * @see 商户平台支付API */ @@ -175,7 +175,7 @@ public class WeixinPayProxy { * @since V3 * @throws WeixinException */ - public RefundRecord refundQueryV3(IdQuery idQuery) throws WeixinException { + public RefundRecord refundQuery(IdQuery idQuery) throws WeixinException { return pay3Api.refundQuery(idQuery); } @@ -198,9 +198,9 @@ public class WeixinPayProxy { * href="http://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_6">下载对账单API * @throws WeixinException */ - public File downloadbill(Date billDate, BillType billType) + public File downloadBill(Date billDate, BillType billType) throws WeixinException { - return pay3Api.downloadbill(billDate, billType); + return pay3Api.downloadBill(billDate, billType); } /** diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java index 201f2b1d..b13b1459 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponDetail.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className CouponDetail * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponInfo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponInfo.java index 6b78dc1b..9155a4d5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponInfo.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponInfo.java @@ -15,7 +15,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className CouponInfo * @author jy * @date 2015年3月24日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java index 71a5724b..464b62b1 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponResult.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.payment.mch.ApiResult; * @className CouponResult * @author jy * @date 2015年3月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java index 919c5424..bd7a0a3e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/coupon/CouponStock.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className CouponStock * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/ApiResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/ApiResult.java index 7e992234..a1d4e364 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/ApiResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/ApiResult.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.http.weixin.XmlResult; * @className ApiResult * @author jy * @date 2014年10月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AuthCodeOpenIdResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AuthCodeOpenIdResult.java index 7372dcce..8904e3ac 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AuthCodeOpenIdResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/AuthCodeOpenIdResult.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className AuthCodeOpenIdResult * @author jy * @date 2015年7月23日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPayment.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPayment.java index 5ca4c0e9..e937345c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPayment.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPayment.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className MPPayment * @author jy * @date 2015年4月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java index 20f13eda..bab2cbb3 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentRecord.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className MPPaymentRecord * @author jy * @date 2015年6月23日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentResult.java index 9028cdbe..d5135833 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MPPaymentResult.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className MPPaymentResult * @author jy * @date 2015年4月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java index 60ac2491..96272cfe 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayPackage.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.util.RandomUtil; * @className MchPayPackage * @author jy * @date 2014年10月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java index 67be0c44..49106ca9 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/MchPayRequest.java @@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.payment.PayRequest; * @className MchPayRequest * @author jy * @date 2014年8月17日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.payment.mch.PrePay */ @XmlRootElement @@ -41,20 +41,19 @@ public class MchPayRequest extends PayRequest { } public MchPayRequest(PrePay prePay) { - this(prePay.getAppId(), prePay.getPrepayId()); + this.setAppId(prePay.getAppId()); + this.setPackageInfo("prepay_id=" + prePay.getPrepayId()); this.prePay = prePay; } public MchPayRequest(String appId, String prepayId) { this.setAppId(appId); - this.setPackageInfo("prepay_id=" + prePay.getPrepayId()); + this.setPackageInfo("prepay_id=" + prepayId); + this.prePay = new PrePay(); + this.prePay.setAppId(appId); + this.prePay.setPrepayId(prepayId); } - /** - * 注意：MchPayRequest(String appId, String prepayId) 构造时 为空 - * - * @return 预支付对象 - */ public PrePay getPrePay() { return prePay; } @@ -69,5 +68,4 @@ public class MchPayRequest extends PayRequest { public String toString() { return "MchPayRequest [" + super.toString() + "]"; } - } diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java index afc76cb3..c1bd4ac9 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayNotify.java @@ -11,7 +11,7 @@ import javax.xml.bind.annotation.XmlRootElement; * @className PayNativeNotify * @author jy * @date 2014年10月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java index 07057277..806b7925 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/NativePayResponse.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.util.RandomUtil; * @className NativePayResponseV3 * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java index e88ad51a..2442f4f4 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Order.java @@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult; * @className Order * @author jy * @date 2014年11月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java index f6fe462f..d58bc413 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/PrePay.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.type.TradeType; * @className PrePay * @author jy * @date 2014年10月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java index ef50e1b3..e5004d2d 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/Redpacket.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className Redpacket * @author jy * @date 2015年3月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 红包简介 */ diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java index e283f89a..54777ad3 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketRecord.java @@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className RedpacketRecord * @author jy * @date 2015年6月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java index 0060ecf1..bfbc07e5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RedpacketSendResult.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.http.weixin.XmlResult; * @className RedpacketSendResult * @author jy * @date 2015年4月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java index cf49d912..9e86217f 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundDetail.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult; * @className RefundDetail * @author jy * @date 2014年11月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java index 5103d6ea..106deef3 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundRecord.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult; * @className RefundRecord * @author jy * @date 2014年11月1日 - * @since JDK 1.7 + * @since JDK 1.6 */ @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java index 39e76696..fc33ad82 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/payment/mch/RefundResult.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className RefundResult * @author jy * @date 2014年11月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/CacheStorager.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/CacheStorager.java index 15920c92..0d19e5e5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/CacheStorager.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/CacheStorager.java @@ -8,7 +8,7 @@ import com.foxinmy.weixin4j.exception.WeixinException; * @className CacheStorager * @author jy * @date 2015年6月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface CacheStorager { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/FileTokenStorager.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/FileTokenStorager.java index d2aef8aa..ad897a4b 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/FileTokenStorager.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/FileTokenStorager.java @@ -15,7 +15,7 @@ import com.foxinmy.weixin4j.xml.XmlStream; * @className FileTokenStorager * @author jy * @date 2015年1月9日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class FileTokenStorager implements TokenStorager { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenCreator.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenCreator.java index 721c55b8..bfc18dab 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenCreator.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenCreator.java @@ -9,7 +9,7 @@ import com.foxinmy.weixin4j.model.Token; * @className TokenCreator * @author jy * @date 2015年1月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface TokenCreator { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenHolder.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenHolder.java index 496f89c2..67a8713a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenHolder.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenHolder.java @@ -9,7 +9,7 @@ import com.foxinmy.weixin4j.model.Token; * @className TokenHolder * @author jy * @date 2015年6月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see TokenCreator * @see TokenStorager */ diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenStorager.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenStorager.java index 9bc36913..5d98cf96 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenStorager.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/token/TokenStorager.java @@ -8,7 +8,7 @@ import com.foxinmy.weixin4j.model.Token; * @className TokenStorager * @author jy.hu * @date 2014年9月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.model.Token * @see com.foxinmy.weixin4j.token.FileTokenStorager * @see com.foxinmy.weixin4j.token.RedisTokenStorager diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Article.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Article.java index 7bb06b89..483465fc 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Article.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Article.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Article * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Article implements Serializable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Card.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Card.java index eafb2ab7..716bbd0b 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Card.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Card.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Card * @author jy * @date 2015年6月8日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Card implements MassTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/ChatTuple.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/ChatTuple.java index 39510000..ef154751 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/ChatTuple.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/ChatTuple.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.tuple; * @className ChatTuple * @author jy * @date 2015年8月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.tuple.Text * @see com.foxinmy.weixin4j.tuple.Image * @see com.foxinmy.weixin4j.tuple.File diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/File.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/File.java index 9a57272e..d5174913 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/File.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/File.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className File * @author jy * @date 2014年11月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class File implements NotifyTuple, ChatTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Image.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Image.java index be0e0dba..1b9f51f5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Image.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Image.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Image * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Image implements MassTuple, NotifyTuple, ChatTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MassTuple.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MassTuple.java index be0bce3e..1031f323 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MassTuple.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MassTuple.java @@ -7,7 +7,7 @@ package com.foxinmy.weixin4j.tuple; * @className MassTuple * @author jy * @date 2014年11月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.tuple.Text * @see com.foxinmy.weixin4j.tuple.Image * @see com.foxinmy.weixin4j.tuple.Voice diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java index 37a98a4d..7ac8e75a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpArticle.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField; * * @author jy.hu * @date 2014年4月26日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class MpArticle implements Serializable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpNews.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpNews.java index 626d66db..d9546a83 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpNews.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpNews.java @@ -18,7 +18,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className MpNews * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MpNews implements MassTuple, NotifyTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpVideo.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpVideo.java index f7faa8ed..994db686 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpVideo.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/MpVideo.java @@ -14,7 +14,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className MpVideo * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MpVideo implements MassTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Music.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Music.java index 5aaac9aa..0a0ee50e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Music.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Music.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Music * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Music implements NotifyTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/News.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/News.java index f7f5e034..8016c18c 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/News.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/News.java @@ -17,7 +17,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className News * @author jy * @date 2014年11月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class News implements NotifyTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/NotifyTuple.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/NotifyTuple.java index 2b05a08f..7fd2123a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/NotifyTuple.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/NotifyTuple.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.tuple; * @className NotifyTuple * @author jy * @date 2014年11月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.tuple.Text * @see com.foxinmy.weixin4j.tuple.Image * @see com.foxinmy.weixin4j.tuple.Voice diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Text.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Text.java index 3ea882c5..079baf48 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Text.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Text.java @@ -12,7 +12,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Text * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Text implements MassTuple, NotifyTuple, ChatTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Tuple.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Tuple.java index 21927892..71e54abc 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Tuple.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Tuple.java @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlTransient; * @className Tuple * @author jy * @date 2015年4月19日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public interface Tuple extends Serializable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Video.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Video.java index 0e12755b..3cbfcdb8 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Video.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Video.java @@ -15,7 +15,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Video * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Video implements NotifyTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Voice.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Voice.java index e2ee2492..49061622 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Voice.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/tuple/Voice.java @@ -12,7 +12,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className Voice * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Voice extends Image implements NotifyTuple { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java index 4ec5fc19..b98c17b7 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BankType.java @@ -7,7 +7,7 @@ package com.foxinmy.weixin4j.type; * @className BankType * @author jy * @date 2015年8月19日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum BankType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BillType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BillType.java index f0bde796..348157f4 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BillType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/BillType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className BillType * @author jy * @date 2014年10月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum BillType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java index 5d696260..66bca97f 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/ButtonType.java @@ -10,7 +10,7 @@ package com.foxinmy.weixin4j.type; * @className ButtonType * @author jy * @date 2014年9月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 按钮类型 */ diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStatus.java index 3a80c163..e15f0dae 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStatus.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStatus.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className CouponStatus * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CouponStatus { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockStatus.java index de3dedbb..4e8e46ef 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockStatus.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockStatus.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className CouponStockStatus * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CouponStockStatus { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockType.java index b618049d..30006144 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponStockType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className CouponStockType * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CouponStockType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponType.java index 14745ad9..684d51df 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CouponType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className CouponType * @author jy * @date 2015年3月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CouponType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java index 3390c883..94038ab5 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/CurrencyType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className CurrencyType * @author jy * @date 2014年11月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CurrencyType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java index ac2b5e08..efe6c14a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdQuery.java @@ -8,7 +8,7 @@ import java.io.Serializable; * @className IdQuery * @author jy * @date 2014年11月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class IdQuery implements Serializable { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java index 978eb3fd..8f57be20 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/IdType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className IdType * @author jy * @date 2014年11月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum IdType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MPPaymentCheckNameType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MPPaymentCheckNameType.java index 828cec39..a8ddd551 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MPPaymentCheckNameType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MPPaymentCheckNameType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className MPPaymentCheckType * @author jy * @date 2015年4月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum MPPaymentCheckNameType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MediaType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MediaType.java index 2716f45f..30cb297b 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MediaType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/MediaType.java @@ -21,7 +21,7 @@ import com.foxinmy.weixin4j.http.ContentType; * * @author jy.hu * @date 2014年4月2日 - * @since JDK 1.7 + * @since JDK 1.6 */ public enum MediaType { image(ContentType.IMAGE_JPG), voice(ContentType.AUDIO_MP3), video( diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/QRType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/QRType.java index d4a4a181..accd6bad 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/QRType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/QRType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className QRType * @author jy * @date 2014年11月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum QRType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketSendType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketSendType.java index defbce30..4693289f 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketSendType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketSendType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className RedpacketSendType * @author jy * @date 2015年6月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RedpacketSendType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketStatus.java index 3da3a739..c6d188db 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketStatus.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketStatus.java @@ -5,7 +5,7 @@ package com.foxinmy.weixin4j.type; * @className RedpacketStatus * @author jy * @date 2015年6月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RedpacketStatus { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketType.java index 9a7ca7e3..5ece1d35 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RedpacketType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className RedpacketType * @author jy * @date 2015年6月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RedpacketType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundChannel.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundChannel.java index 11c1a136..8d816bff 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundChannel.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundChannel.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className RefundChannel * @author jy * @date 2014年11月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RefundChannel { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundStatus.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundStatus.java index 3b2ec8e9..b36cb446 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundStatus.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundStatus.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className RefundStatus * @author jy * @date 2014年11月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RefundStatus { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundType.java index 78308095..ae98a085 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/RefundType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className RefundType * @author jy * @date 2014年12月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum RefundType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java index 49cb9ad3..15aabcd9 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/SignType.java @@ -5,7 +5,7 @@ package com.foxinmy.weixin4j.type; * @className SignType * @author jy * @date 2014年11月5日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum SignType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java index 655cbbab..87e5aa90 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeState.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className TradeState * @author jy * @date 2014年11月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum TradeState { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java index 5113354a..309285fb 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/type/TradeType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.type; * @className TradeType * @author jy * @date 2014年10月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum TradeType { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DateUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DateUtil.java index 0438628c..0e3c5a51 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DateUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DateUtil.java @@ -11,7 +11,7 @@ import java.util.Date; * @className DateUtil * @author jy * @date 2014年10月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class DateUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DigestUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DigestUtil.java index c7a7207b..e2bb5a34 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DigestUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/DigestUtil.java @@ -11,7 +11,7 @@ import com.foxinmy.weixin4j.model.Consts; * @className DigestUtil * @author jy * @date 2015年5月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class DigestUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/FileUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/FileUtil.java index 4ff2327c..cad09c1e 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/FileUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/FileUtil.java @@ -12,7 +12,7 @@ import java.util.Map; * @className FileUtil * @author jy * @date 2014年11月21日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class FileUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java index 314c41a2..9769cf6a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/IOUtil.java @@ -15,7 +15,7 @@ import java.nio.charset.Charset; * @className IOUtil * @author jy.hu * @date 2014年9月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see org.apache.commons.io.IOUtils */ public class IOUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/MapUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/MapUtil.java index f6ef2254..89ae5fe7 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/MapUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/MapUtil.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResultSerializer; * @className MapUtil * @author jy * @date 2014年10月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MapUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/NameValue.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/NameValue.java index 04b9a56c..8b707528 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/NameValue.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/NameValue.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className NameValue * @author jy * @date 2015年3月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class NameValue implements Serializable { @@ -20,6 +20,10 @@ public class NameValue implements Serializable { private String name; private String value; + public NameValue() { + + } + @JSONCreator public NameValue(@JSONField(name = "name") String name, @JSONField(name = "value") String value) { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/RandomUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/RandomUtil.java index fc344cd5..90e1d009 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/RandomUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/RandomUtil.java @@ -9,7 +9,7 @@ import java.util.UUID; * @className RandomUtil * @author jy * @date 2014年10月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class RandomUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/URLEncodingUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/URLEncodingUtil.java index e37510d2..dd15943a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/URLEncodingUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/URLEncodingUtil.java @@ -9,7 +9,7 @@ import java.util.BitSet; * @className URLEncodingUtil * @author jy * @date 2015年8月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class URLEncodingUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java index 680503cc..e5650061 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConfigUtil.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.model.WeixinAccount; * @className Weixin4jConfigUtil * @author jy * @date 2014年10月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Weixin4jConfigUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConst.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConst.java index 80cd58ab..8c28a5e1 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConst.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jConst.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.util; * @className Weixin4jConst * @author jy * @date 2015年7月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class Weixin4jConst { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/WeixinErrorUtil.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/WeixinErrorUtil.java index b59da8f3..fd6a2d7a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/WeixinErrorUtil.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/WeixinErrorUtil.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.http.weixin.WeixinResponse; * @className WeixinErrorUtil * @author jy * @date 2015年5月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class WeixinErrorUtil { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResult.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResult.java index 4a0d97b4..1fef6c40 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResult.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResult.java @@ -11,7 +11,7 @@ import java.lang.annotation.Target; * @className ListsuffixResult * @author jy * @date 2015年6月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @Target(ElementType.FIELD) diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultDeserializer.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultDeserializer.java index 93072124..54bc416a 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultDeserializer.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultDeserializer.java @@ -37,7 +37,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className ListsuffixResultDeserializer * @author jy * @date 2015年3月24日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ListsuffixResultDeserializer { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultSerializer.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultSerializer.java index 69e81069..d0006dcd 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultSerializer.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/ListsuffixResultSerializer.java @@ -25,7 +25,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className ListsuffixResultSerializer * @author jy * @date 2015年3月24日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ListsuffixResultSerializer { diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java index 1c07af6d..fbc7a52f 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/xml/XmlStream.java @@ -38,7 +38,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className XmlStream * @author jy * @date 2015年6月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class XmlStream { diff --git a/weixin4j-mp/CHANGE.md b/weixin4j-mp/CHANGE.md index 1c33bf91..b86c9176 100644 --- a/weixin4j-mp/CHANGE.md +++ b/weixin4j-mp/CHANGE.md @@ -170,6 +170,6 @@ + version upgrade to 1.6.3 -* 2015-12-01 +* 2015-12-08 + version upgrade to 1.6.4 diff --git a/weixin4j-mp/README.md b/weixin4j-mp/README.md index 4267fcef..fddc2460 100644 --- a/weixin4j-mp/README.md +++ b/weixin4j-mp/README.md @@ -43,7 +43,7 @@ weixin4j-mp 如何使用 -------- -0.maven依赖(1.6.4,2015-12-01 released) +0.maven依赖(1.6.4,2015-12-08 released) com.foxinmy diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java index 18f97c24..766741a5 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/WeixinProxy.java @@ -59,7 +59,7 @@ import com.foxinmy.weixin4j.type.MediaType; * @className WeixinProxy * @author jy.hu * @date 2014年3月23日 - * @since JDK 1.7 + * @since JDK 1.6 * @see api文档 */ public class WeixinProxy { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java index 1dd77fa1..b84cc4b4 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/CustomApi.java @@ -28,7 +28,7 @@ import com.foxinmy.weixin4j.util.IOUtil; * @className CustomApi * @author jy * @date 2014年11月16日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 多客服说明 * @see分组接口 * @see com.foxinmy.weixin4j.mp.model.Group diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java index 9390b687..d2d31fd6 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/HelperApi.java @@ -26,7 +26,7 @@ import com.foxinmy.weixin4j.tuple.MpArticle; * @className HelperApi * @author jy.hu * @date 2014年9月26日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class HelperApi extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java index 0ccf5814..ee6e3f9d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java @@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className MassApi * @author jy.hu * @date 2014年9月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 群发接口 */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java index 93e13a4b..775f57ec 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java @@ -56,7 +56,7 @@ import com.foxinmy.weixin4j.util.WeixinErrorUtil; * @className MediaApi * @author jy.hu * @date 2014年9月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.type.MediaType */ public class MediaApi extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java index 4ca0a9be..b956f89d 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MenuApi.java @@ -24,7 +24,7 @@ import com.foxinmy.weixin4j.type.ButtonType; * @className MenuApi * @author jy.hu * @date 2014年9月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.model.Button */ public class MenuApi extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MpApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MpApi.java index 7ea99c2a..25d4327f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MpApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MpApi.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.api.BaseApi; * @className MpApi * @author jy.hu * @date 2014年9月26日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.api.BaseApi * @see api文档 */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java index a1c31d86..0ff01f5e 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className NotifyApi * @author jy.hu * @date 2014年9月26日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 客服消息 * @see com.foxinmy.weixin4j.mp.message.NotifyMessage diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java index c20aa263..03f25bfe 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/OauthApi.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * @className OauthApi * @author jy * @date 2015年3月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 微信登陆 */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java index d47e1c39..2e670e3a 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/Pay2Api.java @@ -59,7 +59,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResultDeserializer; * @className Pay2Api * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class Pay2Api extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java index fc511269..29d40e51 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java @@ -22,7 +22,7 @@ import com.foxinmy.weixin4j.util.Weixin4jConst; * @className QrApi * @author jy.hu * @date 2014年9月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 二维码支持 */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java index e6bc5119..09918ea5 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/TmplApi.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.token.TokenHolder; * @className TemplApi * @author jy * @date 2014年9月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class TmplApi extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java index ed06c4ac..28153fb8 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java @@ -21,7 +21,7 @@ import com.foxinmy.weixin4j.token.TokenHolder; * @className UserApi * @author jy.hu * @date 2014年9月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.mp.model.User */ public class UserApi extends MpApi { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube1.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube1.java index 08ebc2a1..314c5b42 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube1.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube1.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className ArticleDatacube1 * @author jy * @date 2015年3月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ArticleDatacube1 implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube2.java index cfadfc0d..39817d2f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacube2.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className ArticleDatacube2 * @author jy * @date 2015年3月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ArticleDatacube2 extends ArticleDatacube1 { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacubeShare.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacubeShare.java index 3f109eb3..edb88141 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacubeShare.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleDatacubeShare.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.mp.type.ShareSourceType; * @className ArticleDatacubeShare * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ArticleDatacubeShare implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleSummary.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleSummary.java index 5ed12b80..888321e7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleSummary.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleSummary.java @@ -10,7 +10,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className ArticleSummary * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ArticleSummary extends ArticleDatacube1 { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleTotal.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleTotal.java index a50a461b..74949946 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleTotal.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/ArticleTotal.java @@ -12,7 +12,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className ArticleTotal * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class ArticleTotal implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/InterfaceSummary.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/InterfaceSummary.java index 4f013574..ab2e0cfb 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/InterfaceSummary.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/InterfaceSummary.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className InterfaceSummary * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class InterfaceSummary implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsg.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsg.java index 9f5cd742..ae4d23e7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsg.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsg.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className UpstreamMsg * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class UpstreamMsg implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsgDist.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsgDist.java index 3a2b4aee..56d432fc 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsgDist.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UpstreamMsgDist.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.mp.type.DatacuteCountIntervalType; * @className UpstreamMsgDist * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class UpstreamMsgDist implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UserSummary.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UserSummary.java index e74ba80a..749721ad 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UserSummary.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/datacube/UserSummary.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.mp.type.UserSourceType; * @className UserSummary * @author jy * @date 2015年1月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class UserSummary implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java index 1d6b59d6..0bbec34b 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/NotifyMessage.java @@ -9,7 +9,7 @@ import com.foxinmy.weixin4j.tuple.NotifyTuple; * * @author jy.hu * @date 2014年4月4日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.tuple.Text * @see com.foxinmy.weixin4j.tuple.Image * @see com.foxinmy.weixin4j.tuple.Voice diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java index 68cbc8a7..f5dbdad8 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className TemplateMessage * @author jy * @date 2014年9月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 模板消息 */ @@ -64,7 +64,7 @@ public class TemplateMessage implements Serializable { * @className Item * @author jy * @date 2015年3月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ private static class Item implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/AutoReplySetting.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/AutoReplySetting.java index fdc639fa..09b9f782 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/AutoReplySetting.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/AutoReplySetting.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.mp.type.AutoreplyMode; * @className AutoReplySetting * @author jy * @date 2015年4月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class AutoReplySetting implements Serializable { @@ -109,7 +109,7 @@ public class AutoReplySetting implements Serializable { * @className Rule * @author jy * @date 2015年4月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public static class Rule implements Serializable { @@ -202,7 +202,7 @@ public class AutoReplySetting implements Serializable { * @className Entry * @author jy * @date 2015年4月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public static class Entry implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/CustomRecord.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/CustomRecord.java index 9e706ab7..3da6c807 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/CustomRecord.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/CustomRecord.java @@ -12,7 +12,7 @@ import com.foxinmy.weixin4j.mp.type.CustomRecordOperCode; * @className CustomRecord * @author jy * @date 2014年6月28日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class CustomRecord implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Following.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Following.java index ef49fdf3..a23ace51 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Following.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Following.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * * @author jy.hu * @date 2014年4月4日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class Following implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java index f416cb11..da213b63 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/Group.java @@ -7,7 +7,7 @@ import java.io.Serializable; * * @author jy.hu * @date 2014年4月4日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class Group implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfAccount.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfAccount.java index e125078f..b5e47e8f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfAccount.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfAccount.java @@ -11,7 +11,7 @@ import com.foxinmy.weixin4j.mp.type.KfOnlineStatus; * @className KfAccount * @author jy * @date 2014年11月16日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 多客服账号信息 */ public class KfAccount implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java index a392042c..92e4d5a3 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/KfSession.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className KfSession * @author jy * @date 2015年3月22日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class KfSession implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuSetting.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuSetting.java index 029b9640..e23ec909 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuSetting.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/MenuSetting.java @@ -11,7 +11,7 @@ import com.foxinmy.weixin4j.model.Button; * @className MenuSetting * @author jy * @date 2015年4月14日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MenuSetting implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java index a850aff0..f47a8e80 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/OauthToken.java @@ -9,7 +9,7 @@ import com.foxinmy.weixin4j.model.Token; * @className OauthToken * @author jy.hu * @date 2014年4月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.mp.model.AuthResult * @see com.foxinmy.weixin4j.mp.model.AuthResult.AuthScope */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java index 1b1aa2de..693c68ce 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRParameter.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.type.QRType; * @className QRParameter * @author jy.hu * @date 2014年4月8日 - * @since JDK 1.7 + * @since JDK 1.6 * */ public class QRParameter implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRResult.java index c0d65d14..fa30a6c8 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/QRResult.java @@ -11,7 +11,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className QRResult * @author jy * @date 2015年7月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class QRResult implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemQuery.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemQuery.java index 23a069a1..adc4f33b 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemQuery.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemQuery.java @@ -11,7 +11,7 @@ import com.foxinmy.weixin4j.mp.type.SemCategory; * @className SemQuery * @author jy * @date 2014年11月7日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class SemQuery implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java index cd0c8013..3e8a3769 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/SemResult.java @@ -10,7 +10,7 @@ import com.foxinmy.weixin4j.http.weixin.JsonResult; * @className SemResult * @author jy * @date 2014年11月7日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 语义理解 */ diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java index c01a3eb0..c6e8f56c 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/model/User.java @@ -18,7 +18,7 @@ import com.foxinmy.weixin4j.util.StringUtil; * * @author jy.hu * @date 2014年4月8日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class User implements Serializable { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResultV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResultV2.java index 7b6adf12..a14821c7 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResultV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/ApiResultV2.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.type.SignType; * @className ApiResultV2 * @author jy * @date 2014年12月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java index d1c04d16..5217adda 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/JsPayRequestV2.java @@ -22,7 +22,7 @@ import com.foxinmy.weixin4j.util.MapUtil; * @className JsPayRequestV2 * @author jy * @date 2014年8月17日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java index 87bae8fd..2d942dfc 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayNotifyV2.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.payment.JsPayNotify; * @className PayNativeNotifyV2 * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java index 6d55432e..bdf8dda1 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/NativePayResponseV2.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.model.WeixinPayAccount; * @className NativePayResponseV2 * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/OrderV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/OrderV2.java index 79c2a183..c5390681 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/OrderV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/OrderV2.java @@ -13,7 +13,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className OrderV2 * @author jy * @date 2014年11月2日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class OrderV2 extends ApiResultV2 { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java index c6ad09a1..90e19da4 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayFeedback.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.payment.PayBaseInfo; * @className PayFeedback * @author jy * @date 2014年10月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java index 3ff07517..3d0a8537 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className PayPackageV2 * @author jy * @date 2014年8月17日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayUtil2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayUtil2.java index e946617b..2af6ee1f 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayUtil2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayUtil2.java @@ -21,7 +21,7 @@ import com.foxinmy.weixin4j.xml.XmlStream; * @className PayUtil2 * @author jy * @date 2014年10月28日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class PayUtil2 { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java index c23560d9..3d1c57dd 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayWarn.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.payment.PayBaseInfo; * @className PayWarn * @author jy * @date 2014年12月31日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetailV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetailV2.java index 1157db71..7fc0fa63 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetailV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundDetailV2.java @@ -15,7 +15,7 @@ import com.foxinmy.weixin4j.type.RefundStatus; * @className RefundDetailV2 * @author jy * @date 2014年11月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecordV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecordV2.java index 6bdda372..5f102719 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecordV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundRecordV2.java @@ -16,7 +16,7 @@ import com.foxinmy.weixin4j.xml.ListsuffixResult; * @className RefundRecordV2 * @author jy * @date 2014年11月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see com.foxinmy.weixin4j.mp.payment.v2.RefundDetailV2 */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResultV2.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResultV2.java index deb8647d..e4ba05ea 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResultV2.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/RefundResultV2.java @@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField; * @className RefundResultV2 * @author jy * @date 2014年11月6日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @XmlRootElement diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinJSTicketCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinJSTicketCreator.java index 84bd12b6..950eccdb 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinJSTicketCreator.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinJSTicketCreator.java @@ -15,7 +15,7 @@ import com.foxinmy.weixin4j.token.TokenHolder; * @className WeixinJSTicketCreator * @author jy * @date 2015年1月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see JS * TICKET diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java index 524db64c..3c336263 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/token/WeixinTokenCreator.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.token.TokenCreator; * @className WeixinTokenCreator * @author jy * @date 2015年1月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see 微信公众平台获取token说明 * @see com.foxinmy.weixin4j.model.Token diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutomatchMode.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutomatchMode.java index 2e511dab..88c124b9 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutomatchMode.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutomatchMode.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className AutomatchMode * @author jy * @date 2015年4月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum AutomatchMode { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutoreplyMode.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutoreplyMode.java index 8dc5b763..f52e2ee1 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutoreplyMode.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/AutoreplyMode.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className AutoreplyMode * @author jy * @date 2015年4月15日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum AutoreplyMode { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/CustomRecordOperCode.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/CustomRecordOperCode.java index 7fda7a1a..0e7b1b8a 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/CustomRecordOperCode.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/CustomRecordOperCode.java @@ -9,7 +9,7 @@ import java.util.Map; * @className CustomRecordOperCode * @author jy * @date 2014年11月16日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum CustomRecordOperCode { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacubeType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacubeType.java index e5be72a3..69440fc1 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacubeType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacubeType.java @@ -14,7 +14,7 @@ import com.foxinmy.weixin4j.mp.datacube.UserSummary; * @className DatacubeType * @author jy * @date 2015年1月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum DatacubeType { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacuteCountIntervalType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacuteCountIntervalType.java index 02079b88..5ec63836 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacuteCountIntervalType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/DatacuteCountIntervalType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className DatacuteCountIntervalType * @author jy * @date 2015年3月29日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum DatacuteCountIntervalType { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/FaceSize.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/FaceSize.java index 824fbfd8..328dbe4b 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/FaceSize.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/FaceSize.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className FaceSize * @author jy * @date 2014年11月5日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum FaceSize { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java index 24ebe31d..31cff0f1 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/IndustryType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className IndustryType * @author jy * @date 2014年12月12日 - * @since JDK 1.7 + * @since JDK 1.6 * @see所处行业 diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/KfOnlineStatus.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/KfOnlineStatus.java index a10475c7..ec85b36e 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/KfOnlineStatus.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/KfOnlineStatus.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className KfOnlineStatus * @author jy * @date 2014年11月16日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum KfOnlineStatus { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/Lang.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/Lang.java index 9d12f8bb..c8744b62 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/Lang.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/Lang.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className Lang * @author jy * @date 2014年11月5日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum Lang { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/SemCategory.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/SemCategory.java index f7c00ae8..4f1773ab 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/SemCategory.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/SemCategory.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className SemCategory * @author jy * @date 2014年11月7日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum SemCategory { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/ShareSourceType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/ShareSourceType.java index 146c5ad5..3c6f3f13 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/ShareSourceType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/ShareSourceType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className ShareSourceType * @author jy * @date 2015年1月30日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum ShareSourceType { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/URLConsts.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/URLConsts.java index a73e758d..483fb48b 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/URLConsts.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/URLConsts.java @@ -7,7 +7,7 @@ package com.foxinmy.weixin4j.mp.type; * @className URLConsts * @author jy * @date 2014年12月3日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public final class URLConsts { diff --git a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/UserSourceType.java b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/UserSourceType.java index e5c68232..a61ee4f4 100644 --- a/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/UserSourceType.java +++ b/weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/type/UserSourceType.java @@ -6,7 +6,7 @@ package com.foxinmy.weixin4j.mp.type; * @className UserSourceType * @author jy * @date 2015年1月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public enum UserSourceType { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java index a97effd5..ee05f8e1 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CashTest.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.type.MPPaymentCheckNameType; * @className CashTest * @author jy * @date 2015年4月1日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class CashTest extends PayTest { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CouponTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CouponTest.java index 67b228cf..5a17eb3d 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CouponTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CouponTest.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.util.DateUtil; * @className CouponTest * @author jy * @date 2015年3月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class CouponTest extends PayTest { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java index 1a7b57fa..fa221a94 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/CustomTest.java @@ -23,7 +23,7 @@ import com.foxinmy.weixin4j.mp.model.KfSession; * @className MessageNotifyTest * @author jy.hu * @date 2014年4月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class CustomTest extends TokenTest { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java index 7db1f8f8..9e5f00f5 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/DataApiTest.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.mp.type.DatacubeType; * @className DataApiTest * @author jy * @date 2015年1月25日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ @SuppressWarnings("unchecked") diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java index 678d5f74..85820901 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/GroupTest.java @@ -17,7 +17,7 @@ import com.foxinmy.weixin4j.mp.model.Group; * @className GroupTest * @author jy.hu * @date 2014年4月10日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class GroupTest extends TokenTest { private GroupApi groupApi; diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java index ceae5c64..c02b940f 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MassTest.java @@ -25,7 +25,7 @@ import com.foxinmy.weixin4j.tuple.Text; * @className MpNewsTest * @author jy * @date 2014年4月27日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MassTest extends TokenTest { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java index e9474769..be933967 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MediaTest.java @@ -30,7 +30,7 @@ import com.foxinmy.weixin4j.type.MediaType; * @className MediaTest * @author jy.hu * @date 2014年4月10日 - * @since JDK 1.7 + * @since JDK 1.6 * @see */ public class MediaTest extends TokenTest { diff --git a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java index 9ea35ba9..bdc06a18 100644 --- a/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java +++ b/weixin4j-mp/src/test/java/com/foxinmy/weixin4j/mp/test/MenuTest.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.type.ButtonType; * @className MenuTest * @author jy.hu * @date 2014年4月10日 - * @since JDK 1.7 + * @since JDK 1.6 */ public class MenuTest extends TokenTest { @@ -34,12 +34,16 @@ public class MenuTest extends TokenTest { @Test public void create() throws WeixinException { btnList = new ArrayList