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

修复Json Validator会失效的BUG #153

Merged
merged 3 commits into from
Jul 31, 2018

Conversation

limingxinleo
Copy link
Contributor

  • 增加接口调用的单测

@huangzhhui huangzhhui merged commit bca66d7 into swoft-cloud:master Jul 31, 2018
huangzhhui pushed a commit to swoft-cloud/swoft-db that referenced this pull request Jul 31, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-http-server that referenced this pull request Jul 31, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
@limingxinleo limingxinleo deleted the features/json-validator branch July 31, 2018 14:33
huangzhhui pushed a commit to swoft-cloud/swoft-rpc that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-auth that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-cache that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-framework that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-http-client that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-session that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-task that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-view that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-websocket-server that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-i18n that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-redis that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-rpc-client that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-rpc-server that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui pushed a commit to swoft-cloud/swoft-service-governance that referenced this pull request Aug 1, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
huangzhhui added a commit that referenced this pull request Aug 7, 2018
d0f9102 Upstream some components travis ci config (#161)
f8becac 修复Json Validator会失效的BUG (#153)
60749e6 fixed redis-compoent (#148)
4824233 修改Redis Hash相关方法使返回结果与\Redis一致 (#142)
5144352 修改Redis poolName为protected,方便自定义RedisClient (#144)
065827b Swoole Redis Client 增加expire方法的支持 (#141)

git-subtree-dir: src/redis
git-subtree-split: d0f9102f90f155d8cefbe78c0d6d35b67ea54855
huangzhhui added a commit that referenced this pull request Aug 7, 2018
ba1657b8 Upstream travis ci config (#160)
ffdb60e5 修复Json Validator会失效的BUG (#153)
4d788e9a 修复自定义注解无法使用Aop切面编程的BUG (#139)
405a83e3 Optimize  (#143)
b72e04ce 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
a30bf589 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (#137)
43088e60 Update PoolHelper.php (#131)
82aadc28 Scan bean according to Composer settings (#115)
5e55e722 Add psysh for debug (#109)
93c3ec76 Parse namespace to dir path according to composer settings (#103)

git-subtree-dir: src/framework
git-subtree-split: ba1657b85d5d5f1e846333e8f5ad03e499b76db8
huangzhhui added a commit that referenced this pull request Aug 8, 2018
e1aee2a1 Upstream some components travis ci config (#161)
605afbc8 修复Json Validator会失效的BUG (#153)
699c3a97 修改RPC客户端 packer获取有误 (#113 (review))
7a8eae12  add coWrite(); use swoft/swoole-ide-helper (#83)

git-subtree-dir: src/rpc-client
git-subtree-split: e1aee2a12854494be9fd95151c3cfb7a80d67d9b
huangzhhui added a commit that referenced this pull request Aug 8, 2018
4b3176b2 Upstream travis ci config (#160)
42be799f 修复Json Validator会失效的BUG (#153)
d1db1cf1 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
649e67a4 Validator增加Json格式支持 (#122)

git-subtree-dir: src/http-server
git-subtree-split: 4b3176b2d43dba4a3f7db5ad754c017ab1d8d294
huangzhhui added a commit that referenced this pull request Aug 30, 2018
c51130a3 Upstream travis ci config (#160)
166a16af 修复TravisCi Build失败的BUG (#154)
b3ec7609 增加DB验证器 (#146)
a10b8629 修复Json Validator会失效的BUG (#153)
d9218a31 Fix 查询值为null时,写入模型失败的BUG (#133)

git-subtree-dir: src/db
git-subtree-split: c51130a33ab42620d652a6ccb81cb3cd0999028e
huangzhhui added a commit that referenced this pull request Aug 30, 2018
6b5291db Upstream travis ci config (#160)
3bfc5036 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/http-client
git-subtree-split: 6b5291dbcd1402bd53ee53dbd76b5a3949650370
huangzhhui added a commit that referenced this pull request Aug 30, 2018
1e07a62d Upstream some components travis ci config (#161)
88f2523f 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/service-governance
git-subtree-split: 1e07a62df8b9b06a0a5b02d91fb8b24dc9186e35
huangzhhui pushed a commit to swoft-cloud/swoft-http-message that referenced this pull request Aug 30, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot added a commit that referenced this pull request Oct 15, 2018
be17b6c Upstream travis ci config (#160)
2ce1e06 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/session
git-subtree-split: be17b6c93b5194eefbc9615f636276fb45a93809
swoft-bot added a commit that referenced this pull request Oct 15, 2018
525b92e Upstream some components travis ci config (#161)
ddc5acb 修复Json Validator会失效的BUG (#153)
77f265c 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
37026e2 fix spelling (#120)
197a91e  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50 add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
swoft-bot added a commit that referenced this pull request Oct 15, 2018
e782bc1 Upstream travis ci config (#160)
a58ef2c Fix rpc unit test (#159)
a47e885 Fix ci (#158)
92c9b75 fix ci  (#157)
fd461c6 rpc component add travis ci config (#156)
8f02304 修复非server环境下使用rpc服务时抛出Call to a member function getTcpSetting() on null 的BUG (#155)
0eaec24 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/rpc
git-subtree-split: e782bc15cd72b710131bda795e4871b5606ea4a0
swoft-bot added a commit that referenced this pull request Oct 15, 2018
bf58b9d Upstream some components travis ci config (#161)
f0450aa 修复Json Validator会失效的BUG (#153)
303b1de optimization translate, do not throw exception (#138)
f4b7470  add coWrite(); use swoft/swoole-ide-helper (#83)

git-subtree-dir: src/i18n
git-subtree-split: bf58b9d520e5b0eddab11318d5b5c12f3070f208
swoft-bot added a commit that referenced this pull request Oct 15, 2018
218abf7 Update Request.php (#184)
b20adb8 修复Json Validator会失效的BUG (#153)
68b8332 fix stripos() expects parameter 1 to be string, array given (#140)
31e4eb9 fix: cannot correctly detect json request (#135)
6be72b3 Validator增加Json格式支持 (#122)
c9e871d  add coWrite(); use swoft/swoole-ide-helper (#83)
c989bfe add server params

git-subtree-dir: src/http-message
git-subtree-split: 218abf7ed6ecc16ae7ba3a3d61e1fc6d67caa1b9
swoft-bot added a commit that referenced this pull request Oct 15, 2018
d7153f5 使用StringHelper::ucfirst 代替 ucfirst,解决中文乱码的BUG (#194)
57158f7 修复Json Validator会失效的BUG (#153)
d906edb  add coWrite(); use swoft/swoole-ide-helper (#83)
ea46275 new: add timezone setting. fix some bug for Config

git-subtree-dir: src/console
git-subtree-split: d7153f56505a9be420ebae9eb29f7e45bfb2982e
swoft-bot added a commit that referenced this pull request Oct 15, 2018
2bb4b56 Upstream travis ci config (#160)
6f42ce4 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/cache
git-subtree-split: 2bb4b5604f5ee4a2fbfc6ac2d4d6c7e5e305e93b
swoft-bot added a commit that referenced this pull request Oct 15, 2018
c0f55c2 Fix auth travis ci (#205)
643afe8 Revert ./composer.json and remove useless comment and fix code style
7059e38 Merge branch 'master' of https://github.com/aprchen/swoft-component
c28008f remove test
0ee7caf Merge branch 'master' into master
6d1b532 cs-fix
89ea514 fix session get getExtendedData and add manager test,enable redis
8bced95 fix session get getExtendedData
4d3efab Fixed cache key repetition (#197)
3d9dad1 fix cache key repeat
5aba246 Upstream travis ci config (#160)
4809074 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/auth
git-subtree-split: c0f55c26faa9d048249f9d5cba69cd48d152ea4c
huangzhhui added a commit that referenced this pull request Nov 21, 2018
548e9972 Upstream travis ci config (#160)
32c35b45 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/task
git-subtree-split: 548e9972be65dfed59a03fdb4d440926d6428980
huangzhhui added a commit that referenced this pull request Nov 21, 2018
be17b6c9 Upstream travis ci config (#160)
2ce1e066 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/session
git-subtree-split: be17b6c93b5194eefbc9615f636276fb45a93809
huangzhhui added a commit that referenced this pull request Nov 21, 2018
525b92ec Upstream some components travis ci config (#161)
ddc5acb3 修复Json Validator会失效的BUG (#153)
77f265cc 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
37026e27 fix spelling (#120)
197a91e4  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50d add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad
huangzhhui added a commit that referenced this pull request Nov 21, 2018
5aba2468 Upstream travis ci config (#160)
48090748 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/auth
git-subtree-split: 5aba2468da04021789a2355a15d275926021a57b
swoft-bot pushed a commit to swoft-cloud/swoft-framework that referenced this pull request Nov 21, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot pushed a commit that referenced this pull request Dec 7, 2018
* Squashed 'src/task/' changes from e9d76eb8..548e9972

548e9972 Upstream travis ci config (#160)
32c35b45 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/task
git-subtree-split: 548e9972be65dfed59a03fdb4d440926d6428980

* Squashed 'src/session/' changes from e2bc8e6b..be17b6c9

be17b6c9 Upstream travis ci config (#160)
2ce1e066 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/session
git-subtree-split: be17b6c93b5194eefbc9615f636276fb45a93809

* Squashed 'src/rpc-server/' changes from 5622a9ca..525b92ec

525b92ec Upstream some components travis ci config (#161)
ddc5acb3 修复Json Validator会失效的BUG (#153)
77f265cc 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
37026e27 fix spelling (#120)
197a91e4  add coWrite(); use swoft/swoole-ide-helper (#83)
f231b50d add server type option on before server start.

git-subtree-dir: src/rpc-server
git-subtree-split: 525b92ec408af75dc98c1cbc8a35f01267dea1ad

* Squashed 'src/console/' changes from 1f3d3cc8..d906edb9

d906edb9  add coWrite(); use swoft/swoole-ide-helper (#83)
ea46275d new: add timezone setting. fix some bug for Config

git-subtree-dir: src/console
git-subtree-split: d906edb91f3d59a75498547def0300b7643f44fa

* Squashed 'src/auth/' changes from c9bc8780..5aba2468

5aba2468 Upstream travis ci config (#160)
48090748 修复Json Validator会失效的BUG (#153)

git-subtree-dir: src/auth
git-subtree-split: 5aba2468da04021789a2355a15d275926021a57b

* fix: Temporary fix the data confusion in SessionMiddleware (#229)

Fix bug about $sessionStore that has data confusion between same worker.

* fix: Fix Auth token cache time (#223)

* composer update

* fix #419 token cache time is incorrect.

* update composer

* feat: Added exclusive lock and shared lock (#225)

* feat: 为查询构造器添加排他锁和共享锁操作方法

* feat: 为活动记录AR添加排他锁和共享锁操作参数

* feat: 为查询构造器和活动记录AR中的加锁操作添加单元测试

* Optimized coding style and Fixed unit test.

* Optimized coding style and Fixed unit test

* 修复 zRem 前缀问题 (#232)

zRem 对应的 zDelete 无映射前缀方法

* fix: Fixed Session is accidentally replaced by the next request. (#234)

* Fix Session is accidentally replaced by the next request.

* Add Unit Test

* Update Unit Test

* Delete deprecated session

* Modify session context key

* fix scope usage error (#236)

* Fixed Session Unit (#235)

* FIxed BUG for incorrect result of Redis::HMget and Redis::HGetAll. (#239)

* fix: Fixed after the server is restarted, the client fails to receive the package. (#237)

* 增加服务重启后,RpcClient recv会失败的单测

* client->receive失败时,若错误码为5001,则重连并且重新发送

* 修改RPC收包失败,重试逻辑

* Update

* Update

* 增加日志

* Fix log

* 如果客户端正常返回数据,不需要关闭客户端

* 修改日志级别

* Fix 104 Connection reset by peer

* RPC 客户端意外关闭后,记录对应日志

* fix http-client Exception (#238)

* optimize: Optimize Server Request initialization. (#240)

* Optimize Server Request initialization.

* Update Request.php

* fix: Fixed rpc client log message for exception (#241)

* fix: Fixed rpc client exception

* Changed swoole version 4.0.2 -> 4.0.3

* fix: Fixed REDIS_DB is not effected when redis reconnected. (#242)

* Fixed REDIS_DB is not effected when redis reconnected.

* 修改切换DB操作统一在createConnection中进行

* 增加重连后,REDIS_DB会失效的BUG

* fix: Fixed unit test (#227)

* Fixed unit test

Since #209, the result that get via QueryBuilder will not format the data type anymore.

* Update BugTest.php

* feat: Added Redis HyperLogLog (#226)

* 增加pfAdd、pfCount、pfMerge方法单测

* Update pfadd pfcount pfmerge

* 完善 Redis HyperLogLog

* Add Redis::ZInter

* Swoole 4.2.6以后版本,协程Redis blpop timeout失效
swoft-bot pushed a commit to swoft-cloud/swoft-process that referenced this pull request Dec 21, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot pushed a commit to swoft-cloud/swoft-memory that referenced this pull request Dec 21, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot pushed a commit to swoft-cloud/swoft-trace that referenced this pull request Dec 21, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot pushed a commit to swoft-cloud/swoft-queue that referenced this pull request Dec 21, 2018
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot added a commit that referenced this pull request Jan 15, 2019
f9910dc Merge commit 'b4f8d0a17a1c9a99274d0e250f6179d14a8728a8'
036d98b Merge branch 'master' of github.com:swoft-cloud/swoft-component
0d9ccbe Update Aop.php (#222)
cacd775 修复Number验证器最大和最小的template没有生效的问题 (#218)
7ebaf5f 修复Number验证器最大和最小的template没有生效的问题 (#218)
ed18988 fix error on trigger event handler (#196)
bf188ad fix a bug when warnings appear in the high version of swoole (#195)
4ec3be6 自定义组件支持别名配置 (#181)
609dd83 修复restart不能正常使用的BUG (#180)
0bcd9bc 修改连接池配置的timeout字段为float (#177)
0044361 修改自定义组件只能扫描Aop、Command、Bootstrap三个文件的BUG (#169)
99916fc 兼容swoole 4.0.3版本 (#166)
a1d6ace 增加用户自定义组件配置 (#150)
d0f7f88 Upstream travis ci config (#160)
afb115f 修复Json Validator会失效的BUG (#153)
5fdf6c7 修复自定义注解无法使用Aop切面编程的BUG (#139)
3c147d1 Optimize  (#143)
c98825b 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
940f76f 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (#137)
427dcb6 Update PoolHelper.php (#131)
fc38546 Scan bean according to Composer settings (#115)
851f3f0 Add psysh for debug (#109)
e55fae5 Parse namespace to dir path according to composer settings (#103)
290a2f4 fix swoft-cloud/swoft#277 (#96)
0d2dade  fix logWriter (#95)
1f1af6c Uniform log path format (#94)
148daeb [fixed]eval error with void method (#92)
a22481a [fixed] logger->messages init error (#91)
69975cd  add coWrite(); use swoft/swoole-ide-helper (#83)
7f66cef change fix
410b028 fix index err

git-subtree-dir: src/framework
git-subtree-split: f9910dc9266e9f87c158d89286a2f07dc67f2a18
swoft-bot pushed a commit to swoft-cloud/swoft-view that referenced this pull request Jan 25, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
swoft-bot added a commit to swoft-cloud/swoft-view that referenced this pull request Jan 25, 2019
b3a45be fix error on trigger event handler (swoft-cloud/swoft-component#196)
b1a48cd fix a bug when warnings appear in the high version of swoole (swoft-cloud/swoft-component#195)
9c4da9f 自定义组件支持别名配置 (swoft-cloud/swoft-component#181)
bccf7a6 修复restart不能正常使用的BUG (swoft-cloud/swoft-component#180)
97bfe2e 修改连接池配置的timeout字段为float (swoft-cloud/swoft-component#177)
525097b 修改自定义组件只能扫描Aop、Command、Bootstrap三个文件的BUG (swoft-cloud/swoft-component#169)
0b5f320 兼容swoole 4.0.3版本 (swoft-cloud/swoft-component#166)
1d11b56 增加用户自定义组件配置 (swoft-cloud/swoft-component#150)
ba1657b Upstream travis ci config (swoft-cloud/swoft-component#160)
ffdb60e 修复Json Validator会失效的BUG (swoft-cloud/swoft-component#153)
4d788e9 修复自定义注解无法使用Aop切面编程的BUG (swoft-cloud/swoft-component#139)
405a83e Optimize  (swoft-cloud/swoft-component#143)
b72e04c 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
a30bf58 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (swoft-cloud/swoft-component#137)
43088e6 Update PoolHelper.php (swoft-cloud/swoft-component#131)
82aadc2 Scan bean according to Composer settings (#115)
5e55e72 Add psysh for debug (swoft-cloud/swoft-component#109)
93c3ec7 Parse namespace to dir path according to composer settings (swoft-cloud/swoft-component#103)
2da84a5 fix swoft-cloud/swoft#277 (#96)
fc8e1b3 Merge commit 'ab0f47838db6f3739146d53c3b48d3fb11c7675e'
33faf07  fix logWriter (#95)
f3075d8 Uniform log path format (swoft-cloud/swoft-component#94)
7003d92 Merge commit '30a1120da2a33a98360ee4da4e4586ad3412b5f2'
e8da860 [fixed]eval error with void method (#92)
5cf5896 [fixed] logger->messages init error (#91)
52bbec6 Merge pull request #114 from aprchen/patch-1
847f23b fix spanid
c559c93  add coWrite(); use swoft/swoole-ide-helper (#83)
21d268b change fix
e88a03f fix index err
620394d Merge commit '1643eb132396c22e6c9be8c90d123a31487455dd'
0d8bb66 add some cosnt, add global func config()
REVERT: 7ebaf5f 修复Number验证器最大和最小的template没有生效的问题 (#218)
REVERT: ed18988 fix error on trigger event handler (swoft-cloud/swoft-component#196)
REVERT: bf188ad fix a bug when warnings appear in the high version of swoole (swoft-cloud/swoft-component#195)
REVERT: 4ec3be6 自定义组件支持别名配置 (swoft-cloud/swoft-component#181)
REVERT: 609dd83 修复restart不能正常使用的BUG (swoft-cloud/swoft-component#180)
REVERT: 0bcd9bc 修改连接池配置的timeout字段为float (swoft-cloud/swoft-component#177)
REVERT: 0044361 修改自定义组件只能扫描Aop、Command、Bootstrap三个文件的BUG (swoft-cloud/swoft-component#169)
REVERT: 99916fc 兼容swoole 4.0.3版本 (swoft-cloud/swoft-component#166)
REVERT: a1d6ace 增加用户自定义组件配置 (swoft-cloud/swoft-component#150)
REVERT: d0f7f88 Upstream travis ci config (swoft-cloud/swoft-component#160)
REVERT: afb115f 修复Json Validator会失效的BUG (swoft-cloud/swoft-component#153)
REVERT: 5fdf6c7 修复自定义注解无法使用Aop切面编程的BUG (swoft-cloud/swoft-component#139)
REVERT: 3c147d1 Optimize  (swoft-cloud/swoft-component#143)
REVERT: c98825b 修复执行php bin/swoft stop命令时master进程异常未退出的问题,以及停止失败后,pid文件被删除的问题 (#134)
REVERT: 940f76f 修改`ComposerHelper::getDirByNamespace`匹配有误的BUG (swoft-cloud/swoft-component#137)
REVERT: 427dcb6 Update PoolHelper.php (swoft-cloud/swoft-component#131)
REVERT: fc38546 Scan bean according to Composer settings (#115)
REVERT: 851f3f0 Add psysh for debug (swoft-cloud/swoft-component#109)
REVERT: e55fae5 Parse namespace to dir path according to composer settings (swoft-cloud/swoft-component#103)
REVERT: 290a2f4 fix swoft-cloud/swoft#277 (#96)
REVERT: 0d2dade  fix logWriter (#95)
REVERT: 1f1af6c Uniform log path format (swoft-cloud/swoft-component#94)
REVERT: 148daeb [fixed]eval error with void method (#92)
REVERT: a22481a [fixed] logger->messages init error (#91)
REVERT: 69975cd  add coWrite(); use swoft/swoole-ide-helper (#83)
REVERT: 7f66cef change fix
REVERT: 410b028 fix index err

git-subtree-dir: src/framework
git-subtree-split: b3a45be705c9cb53cb357925e228e4f60e6d76d5
@liida
Copy link

liida commented Apr 9, 2019

各位大大,ProcessBuilder 这个类可否增加支持创建多个子进程
因为我看swoft框架里面是这样的
@Process(name="getGoodProcess", coroutine=false,num=10)
但是目前组件不支持
以下是我修改后的

if($num > 1){
                $childProcesses = [];
                $pid = $process->getProcess()->pid;
                while($num > 0){
                    $child = new SwooleProcess(function (SwooleProcess $child) use ($process,$pid,$processObject,$num,$name) {
                        $child = new Process($child);
                        $child->name($name." child process");
                        PhpHelper::call([$processObject, 'run'], [$child]);
                    });
                    $child->name($name." manager process");
                    $child->start();
                    App::trigger(ProcessEvent::BEFORE_PROCESS, null, $name.":child:".$child->pid);
                    $num --;
                    $childProcesses[$pid][$child->pid] = 1;
                }
                Process::signal(SIGCHLD, function($sig) use ($childProcesses,$pid,$process,$name) {
                    //必须为false,非阻塞模式
                    while(1){
                        $ret =  Process::wait(false);
                        if($ret){
                            App::trigger(ProcessEvent::AFTER_PROCESS, null, $name.":child:".$ret['pid']);
                            unset($childProcesses[$pid][$ret['pid']]);
                            if(!$childProcesses[$pid]){
                                break;
                            }
                        }
                    }
                    if($childProcesses[$pid]){
                        foreach ($childProcesses[$pid] as $cid=>$v){
                            App::trigger(ProcessEvent::AFTER_PROCESS, null, $name.":child:".$cid);
                        }
                        unset($childProcesses[$pid]);
                    }
                    $process->exit();
                });
            }else{
                PhpHelper::call([$processObject, 'run'], [$process]);
            }

stelin pushed a commit to swoft-cloud/swoft-db that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
stelin pushed a commit to swoft-cloud/swoft-framework that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
stelin pushed a commit to swoft-cloud/swoft-http-message that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
stelin pushed a commit to swoft-cloud/swoft-http-server that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
stelin pushed a commit to swoft-cloud/swoft-redis that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
stelin pushed a commit to swoft-cloud/swoft-rpc-client that referenced this pull request May 28, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
inhere pushed a commit to swoft-cloud/swoft-websocket-server that referenced this pull request Sep 21, 2019
* 修复Json Validator无法使用的BUG

* 完善单测

* 替换composer国内源为laravel-china
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.

3 participants