Merge branch master into branch develop. #663
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…handling Missing message handling
* 🐛Fix mini-program decryptor * fix styles
使用第三方平台授权来生成JS-SDK签名时，返回的 appid 是第三方平台的，应该改为授权方的 appid 才对。
Update OpenPlatform AppId
点击查看[微信创建卡券文档](https://mp.weixin.qq.com/wiki?action=doc&id=mp1451025056&t=0. 3971944842969317#2.6)
创建门店时,必须填入微信支持格式的门店类目, 所以需要先获得支持的门店类目 点击查看[微信创建门店文档](https://mp.weixin.qq.com/wiki?action=doc&id=mp1444378120&t=0.3682459036774999#mdlmb)
修复一个创建卡券时的 bug, 添加获取微信门店类目表的api
* Refactoring for mini-program. * Fix styles. * Fix styles again 💣 * Modify name. * naming. * PrefixedContainer Trait.
* tweak code. * Fix styles. * Remove unused method.
* ♻️ All tests have been namespaced. * ordered_use * Fix styles.
* support cash coupon * fixed styleci
* Rename. * Open-platform api tests. * Sensitive config items. * Socialite minimum version. * Log Configuration. * Add header. * Remove include. * Log configuration. * Header copyright. * Remove open-platform option. * array type. * Use short array syntax. * remove files. * Update open-platform service provider. * Remove verify-ticket trait. * Remove trait. * do nothing for the time being. * Update doc. * use `basename` function * Cache. * refactoring * `Daemon` => `Authorization` * Styles.
* Wrong role * full name * Add PrefixedContainer testcase. * Add fetch method. * Fix. * announced api * Remove test * extract method. * Update test. * fix bug * remove method. * get api. * Styles * new line
* Remove stale code. * Full namespace. * protected vars. * Cleanup * Do nothing on the auth events. * tweak. * Remove @method announce * rename. * Unused code
* variable name shortening. * Add callable. * class name * 🐛 开放平台 ServerGuard 覆盖基类 ServerGuard * extensible
* mini-program datacube. * stats testcase. * service provider.
* Support Payment Sandbox. Fixing styleci complains. More fixing on styles. Use a wrapper for sandbox API instead. More style fixing. Still need one more line for styling. Change the wrapApi to public. * Different approach; allow mocking protected methods.
* Fix. * Fix.
|
其实前两天我还在纠结到底怎么合。。。 |
|
然后呢。。 |
|
@mingyoung 然后没敢动 |
|
@overtrue 就 open-platform 比较多冲突😆 |
|
对啊，所以没敢动 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.