Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

增加部分 摇一摇周边的相关接口 切换UINX换行符 #376

Merged
merged 13 commits into from Nov 14, 2017

Conversation

007gzs
Copy link
Member

@007gzs 007gzs commented Nov 14, 2017

No description provided.

…velop

Conflicts:
	pom.xml
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpShakeService.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpShakeServiceImpl.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpDeviceIdentifier.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpShakeAroundDeviceBindPageQuery.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpShakeAroundPageAddQuery.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpShakeAroundPageAddResult.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpShakeAroundRelationSearchQuery.java
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/shake/WxMpShakeAroundRelationSearchResult.java
	weixin-java-open/pom.xml
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenService.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInRedisConfigStorage.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMpServiceImpl.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceApacheHttpClientImpl.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenAuthorizerAccessToken.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/WxOpenComponentAccessToken.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/auth/WxOpenAuthorizationInfo.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/auth/WxOpenAuthorizerInfo.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerInfoResult.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerOptionResult.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenQueryAuthResult.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/util/WxOpenCryptUtil.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/util/json/WxOpenAuthorizationInfoGsonAdapter.java
	weixin-java-open/src/main/java/me/chanjar/weixin/open/util/json/WxOpenAuthorizerInfoGsonAdapter.java
@binarywang binarywang merged commit d32cf99 into Wechat-Group:develop Nov 14, 2017
comeonc added a commit to comeonc/weixin-java-tools that referenced this pull request Oct 9, 2018
…nto develop

* 'develop' of github.com:Wechat-Group/weixin-java-tools:
  Wechat-Group#376 增加摇一摇周边的部分相关接口
  发布临时测试版本2.8.8.BETA
  fix error code
  使用lombok的@DaTa注解简化cp模块的所有bean类
  格式化开放平台模块代码
  使用lombok的@DaTa注解简化common模块的所有bean类
  使用lombok的@DaTa注解简化miniapp模块的所有bean类
  发布临时测试版本2.8.7.BETA
  Wechat-Group#370 WxMpServiceOkHttpImpl改用httpProxy
  Wechat-Group#370 WxMpServiceOkHttpImpl改用httpProxy
  # 368 增加 微信第三方平台 模块
  统一使用WxErrorException
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants