Merge master to feature #247
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
548e9972 Upstream travis ci config (swoft-cloud#160) 32c35b45 修复Json Validator会失效的BUG (swoft-cloud#153) git-subtree-dir: src/task git-subtree-split: 548e9972be65dfed59a03fdb4d440926d6428980
be17b6c9 Upstream travis ci config (swoft-cloud#160) 2ce1e066 修复Json Validator会失效的BUG (swoft-cloud#153) git-subtree-dir: src/session git-subtree-split: be17b6c93b5194eefbc9615f636276fb45a93809
525b92ec Upstream some components travis ci config (swoft-cloud#161) ddc5acb3 修复Json Validator会失效的BUG (swoft-cloud#153) 77f265cc 修复执行php bin/swoft stop命令时master进程异常未退出的问题，以及停止失败后，pid文件被删除的问题 (swoft-cloud#134) 37026e27 fix spelling (swoft-cloud#120) 197a91e4 add coWrite(); use swoft/swoole-ide-helper (swoft-cloud#83) f231b50d add server type option on before server start. git-subtree-dir: src/rpc-server git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
d906edb9 add coWrite(); use swoft/swoole-ide-helper (swoft-cloud#83) ea46275d new: add timezone setting. fix some bug for Config git-subtree-dir: src/console git-subtree-split: d906edb91f3d59a75498547def0300b7643f44fa
5aba2468 Upstream travis ci config (swoft-cloud#160) 48090748 修复Json Validator会失效的BUG (swoft-cloud#153) git-subtree-dir: src/auth git-subtree-split: 5aba2468da04021789a2355a15d275926021a57b
…ud#229) Fix bug about $sessionStore that has data confusion between same worker.
* composer update * fix swoft-cloud#419 token cache time is incorrect. * update composer
* feat: 为查询构造器添加排他锁和共享锁操作方法 * feat: 为活动记录AR添加排他锁和共享锁操作参数 * feat: 为查询构造器和活动记录AR中的加锁操作添加单元测试 * Optimized coding style and Fixed unit test. * Optimized coding style and Fixed unit test
zRem 对应的 zDelete 无映射前缀方法
…ft-cloud#234) * Fix Session is accidentally replaced by the next request. * Add Unit Test * Update Unit Test * Delete deprecated session * Modify session context key
… the package. (swoft-cloud#237) * 增加服务重启后，RpcClient recv会失败的单测 * client->receive失败时，若错误码为5001，则重连并且重新发送 * 修改RPC收包失败，重试逻辑 * Update * Update * 增加日志 * Fix log * 如果客户端正常返回数据，不需要关闭客户端 * 修改日志级别 * Fix 104 Connection reset by peer * RPC 客户端意外关闭后，记录对应日志
* Optimize Server Request initialization. * Update Request.php
* fix: Fixed rpc client exception * Changed swoole version 4.0.2 -> 4.0.3
…oud#242) * Fixed REDIS_DB is not effected when redis reconnected. * 修改切换DB操作统一在createConnection中进行 * 增加重连后，REDIS_DB会失效的BUG
* Fixed unit test Since swoft-cloud#209, the result that get via QueryBuilder will not format the data type anymore. * Update BugTest.php
* 增加pfAdd、pfCount、pfMerge方法单测 * Update pfadd pfcount pfmerge * 完善 Redis HyperLogLog * Add Redis::ZInter * Swoole 4.2.6以后版本，协程Redis blpop timeout失效
# Conflicts: # src/rpc-client/src/Service.php # src/rpc-client/test/config/beans/log.php # src/session/src/SessionManager.php
|
/merge |
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.