Merge branch 'v2' # Conflicts: # README.md # doc.go # go.mod # go.sum # mch/core/client.go # mch/core/server.go # mch/core/time.go # mch/mmpaymkttransfers/gethbinfo.go # mch/mmpaymkttransfers/gettransferinfo.go # mch/mmpaymkttransfers/promotion/transfers.go # mch/mmpaymkttransfers/query_coupon_stock.go # mch/mmpaymkttransfers/send_coupon.go # mch/mmpaymkttransfers/sendgroupredpack.go # mch/mmpaymkttransfers/sendredpack.go # mch/pay/closeorder.go # mch/pay/downloadbill.go # mch/pay/micropay.go # mch/pay/orderquery.go # mch/pay/refund.go # mch/pay/refundquery.go # mch/pay/reverse.go # mch/pay/unifiedorder.go # mch/payutil/report.go # mch/promotion/query_coupon.go # mch/tools/authcodetoopenid.go # mch/tools/shorturl.go # mp/README.md # mp/account/event.go # mp/base/getcallbackip.go # mp/base/shorturl.go # mp/base/uploadimg.go # mp/bizwifi/device/add.go # mp/bizwifi/device/delete.go # mp/bizwifi/device/list.go # mp/bizwifi/event.go # mp/bizwifi/homepage/get.go # mp/bizwifi/homepage/set.go # mp/bizwifi/qrcode/get.go # mp/bizwifi/shop/list.go # mp/bizwifi/statistics/list.go # mp/card/boardingpass/checkin.go # mp/card/card.go # mp/card/code/consume.go # mp/card/code/decrypt.go # mp/card/code/get.go # mp/card/code/unavailable.go # mp/card/code/update.go # mp/card/color.go # mp/card/datacube/doc.go # mp/card/event.go # mp/card/meetingticket/updateuser.go # mp/card/membercard/activate.go # mp/card/membercard/updateuser.go # mp/card/membercard/userinfo/get.go # mp/card/movieticket/updateuser.go # mp/card/mpnews/gethtml.go # mp/card/qrcode/create.go # mp/card/testwhitelist/set.go # mp/card/user/getcardlist.go # mp/core/access_token_server.go # mp/core/client.go # mp/core/client_upload.go # mp/core/context.go # mp/core/example_test.go # mp/core/handler.go # mp/core/server.go # mp/datacube/article.go # mp/datacube/card/getcardbizuininfo.go # mp/datacube/card/getcardcardinfo.go # mp/datacube/card/getcardmembercardinfo.go # mp/datacube/interface.go # mp/datacube/upstream_msg.go # mp/datacube/user.go # mp/dkf/account/account.go # mp/dkf/account/head_img.go # mp/dkf/kf_list.go # mp/dkf/record/iter.go # mp/dkf/record/record.go # mp/dkf/resp.go # mp/dkf/session/event.go # mp/dkf/session/sesson.go # mp/jssdk/card_ticket_server.go # mp/jssdk/ticket_server.go # mp/material/download.go # mp/material/material.go # mp/material/news.go # mp/material/upload.go # mp/material/video.go # mp/media/download.go # mp/media/mpvideo.go # mp/media/news.go # mp/media/upload.go # mp/menu/api.go # mp/menu/api_conditional.go # mp/menu/event.go # mp/menu/menu_info.go # mp/message/callback/request/event.go # mp/message/callback/request/event_test.go # mp/message/callback/request/msg.go # mp/message/callback/request/msg_test.go # mp/message/callback/response/msg.go # mp/message/custom/custom.go # mp/message/custom/msg.go # mp/message/mass/event.go # mp/message/mass/mass.go # mp/message/mass/mass2all/mass2all.go # mp/message/mass/mass2all/msg.go # mp/message/mass/mass2group/mass2group.go # mp/message/mass/mass2group/msg.go # mp/message/mass/mass2users/mass2users.go # mp/message/mass/mass2users/msg.go # mp/message/mass/preview/msg.go # mp/message/mass/preview/preview.go # mp/message/template/event.go # mp/message/template/send.go # mp/message/template/template.go # mp/oauth2/README.md # mp/oauth2/component/endpoint.go # mp/oauth2/endpoint.go # mp/oauth2/oauth2.go # mp/oauth2/session.go # mp/oauth2/userinfo.go # mp/poi/add.go # mp/poi/category.go # mp/poi/del.go # mp/poi/event.go # mp/poi/get.go # mp/poi/list.go # mp/poi/update.go # mp/qrcode/create.go # mp/qrcode/download.go # mp/qrcode/shorturl.go # mp/shakearound/account/account.go # mp/shakearound/device/applyid.go # mp/shakearound/device/applystatus.go # mp/shakearound/device/bindlocation.go # mp/shakearound/device/bindpage.go # mp/shakearound/device/search.go # mp/shakearound/device/update.go # mp/shakearound/event.go # mp/shakearound/material/add.go # mp/shakearound/page/add.go # mp/shakearound/page/delete.go # mp/shakearound/page/search.go # mp/shakearound/page/update.go # mp/shakearound/relation/search.go # mp/shakearound/statistics/device.go # mp/shakearound/statistics/devicelist.go # mp/shakearound/statistics/page.go # mp/shakearound/statistics/pagelist.go # mp/shakearound/statistics/statistics.go # mp/shakearound/user/getshakeinfo.go # mp/user/group.go # mp/user/group/group.go # mp/user/list.go # mp/user/tag/tag.go # mp/user/user.go # oauth2/api.go # oauth2/client.go # open/oauth2/endpoint.go # open/oauth2/oauth2.go # open/oauth2/userinfo.go