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

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

Merged
merged 11 commits into from
Nov 15, 2018

Conversation

limingxinleo
Copy link
Contributor

No description provided.

} catch (\Throwable $throwable) {
if (isset($client) && $client instanceof AbstractServiceConnection) {
// If the client is normal, no need to close it.
if ($closeStatus && isset($client) && $client instanceof AbstractServiceConnection) {
$client->close();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

close(true) 会更好一点

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的,我处理一下

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

我查了一下协程Client,close没有参数啊

@huangzhhui huangzhhui changed the title Fixed after the server is restarted, the client fails to receive the package. fix: Fixed after the server is restarted, the client fails to receive the package. Nov 9, 2018
@limingxinleo
Copy link
Contributor Author

@huangzhhui 新版的RPC里,要不要实现一个重试机制,可以让用户自定义需要捕获失败的tcp错误码和重试次数

@huangzhhui
Copy link
Contributor

@limingxinleo 可以啊,放个配置出来就好

@limingxinleo
Copy link
Contributor Author

这部分代码我已经放到线上了,我先试试效果
@huangzhhui

@limingxinleo
Copy link
Contributor Author

昨天一天稳定运行,没有再出现这个问题🤔

@limingxinleo
Copy link
Contributor Author

image
应该问题不大

@huangzhhui
Copy link
Contributor

/merge
/distribute

@swoft-bot swoft-bot merged commit 5148097 into swoft-cloud:master Nov 15, 2018
swoft-bot pushed a commit to swoft-cloud/swoft-rpc-client that referenced this pull request Nov 15, 2018
… the package. (swoft-cloud/swoft-component#237)

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

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

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

* Update

* Update

* 增加日志

* Fix log

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

* 修改日志级别

* Fix 104 Connection reset by peer

* RPC 客户端意外关闭后,记录对应日志
@limingxinleo limingxinleo deleted the bugs/rpc-client-recv-fail branch November 15, 2018 05:42
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失效
inhere added a commit that referenced this pull request Jul 19, 2019
f4e83ff4 Merge commit 'd6f70b2bf2c668ce9df7bf2f51f9264518641baa'
d6f70b2b Squashed 'src/annotation/' changes from 6c4f9a44..0db8ff4b
4a79db2a gen new version for all component
ef3e194b gen readme for process
d115a0ca Merge remote-tracking branch 'upstream/master'
c4ed3d41 Modify process pool array
b87ef2bf Add getHeaderLines
4f702314 Add process
00462850 Added process command
c96a8710 Add process pool
3f0d6108 Add user process
766bb3a0 Add process util
09510042 Merge pull request #472 from sakuraovq/master
de23b860 add entity unit
caadf0e9 fix time
1b8c7b90 Add process json
ffd5bf42 Merge commit '6dd143299e2b9d8e5dda6f548253ab7c8648c7a5' as 'src/process'
7d7b974d Dev: 2.0.4 (#469)
c88e72ef Merge branch 'master' of github.com:swoft-cloud/swoft-component
524d6dad save updating
a9616f8a replece Event::wait to Swoft\Co::rawRun
def07e20 fix console component unit tests error
2eb28249 complete batch release tag command
16c0b548 add some script for dev
d2ff17f2 fix statment
6979bdfa Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
1ab1d27b fix: swoft-cloud/swoft#781 cannot restart server on docker env
1e5727e0 Merge pull request #470 from banyancheung/issue/fix-server-restart-problem
2be450bf remove Pidfile method default return value should be true
6531e958 fix model attr sync bug
8578485d update: dev tool commands
ae0cb3f5 update: control enable coroutine move to SwoftApplication
94e95cbe fix code format add @Different、@GreaterThan、@LessThan Rules add Unit
f04ff279 add new readme for tcp server
2e95c4b5 add new tool script for gen version
5b7e63de add unit test for http uri
7eb2d74d fix: connot clone swoole http request and response object on 4.4
fad69c85 update: compatible with swoole 4.4
3114390e fix: always return true on stop server
2f9d7e34 fix: tcp-server deps error (#468)
36c12c94 fix: tcp-server deps error
bbe5dd7e Dev2 (#467)
7b76ad0e add delete remote tag script
b8427c6e add help message
3bfc7413 Dev2 (#466)
951ca4ff fix error
eb25ec06 update release script
053401f5 update push and makefile script (#465)
76a88ae8 update push and makefile script
01d7c26d fix package name (#464)
63159a41 fix package name
a4d3b91e Merge pull request #463 from sakuraovq/master
acdf410b add zadd
06b23253 fix code format Perfect date validator
a97cc13f Dev2 (#462)
d142fdbf update composer json config
0a7f968c Merge commit '0f4903034a3f77f03aa352c5dee45f7f8bee2cd1' as 'src/tcp'
0f490303 Squashed 'src/tcp/' content from commit 7d4fa7ad
13674794 remove tcp protocol component
96deaa54 Merge pull request #461 from ulue/dev2
7d76d64f Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
13144228 update some info
90d24b95 Merge pull request #457 from sakuraovq/master
3a6f87d8 fixbug
cdda2186 Merge branch 'master' of github.com:swoft-cloud/swoft-component
df8759a2 Dev: 2.0 (#460)
027d57cf update some logic for tcp server
03ac4f6b add some comments for framework
169af96b add model auto wirte timestamp test
46592728 Merge branch 'master' of github.com:swoft-cloud/swoft-component
e2982560 Merge pull request #459 from swoftcloud/master
ea452728 update all component description in composer
a50b07a5 Modiy version
8eb8aba2 Fixed logger levels bug
b1bf44f6 Add unfields for validate
669826b4 add new Validator Rule add new Validator Rule Unit
d914d513 update command description
a58a0557 update: optimize server restart command
a33a009a Merge pull request #455 from swoftcloud/master
5ec9b535 update: modify tcp route logic, simple route command
b59f5c7e Merge commit 'a7e35412eaa6f78ee1396bcf30e84bcee6965bd3' as 'src/tcp-protocol'
a7e35412 Squashed 'src/tcp-protocol/' content from commit d599478f
dc58011c add event and auto wirte timestamp
b1cec041 Add middle check by class annotation
eaa62f87 Dev: 2.0 (#456)
8cea3eac fix namespace error. add componser config for tcp-protocol
bc5e4795 Add aop ns reg
4d091bef Fixed rpc return null bug
a6da3cb5 Add return null
01034cbe Fixed bug
204bc7f4 Fixed rpc server class not middeware bug
c9e8f048 Rm json method
3db02a4a update some logic for ws message parser
4e44ee9b update: add some new class for tcp server
773d3b91 fix websocket server unit tests auoload config
a69347c8 Fix task null bug
f5c1b278 Add provider client
2dcb99e4 update: shielding hazard method on stdlib
d1f66498 update: add some mock class for ws server
83a81170 update some logic for ws server
cf4e2c7f add an makefile for quick run scripts
10554206 complate release script logic
d34a9d31 complete new release scripts
cfc4f9c4 update scripts
30d73c3b Add swoft rpc v1
2e7fe0b7 Merge pull request #454 from ulue/dev2
d6fc6c14 format imports
27590b2d update readme
df93cc95 update: format and unify the README file
7f988d83 Merge pull request #452 from sakuraovq/master
cfaf82dc update: optimize console component imports
3d1d0d84 update add an common method for server commands
9d01c137 change default
4563c617 add model method
a5096fa3 change schema builder name
c5a0269f update: allow disable command group in console component
4fdc01fd update: fix some start error for tcp server
6a82c87f update: update some logic and add beans for tcp server
90dc64d1 update some logic for ws server
5a1d78b3 update some code format
063d9dcb Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
6106454b Merge pull request #453 from swoftcloud/master
7a956df4 Merge
c284b5ca Merge
ef3f72b4 add
2ffec375 Add restart method
77c154cd update: add error handlers for tcp server
472b49a5 add check database exists method
50fd05d3 Dev: 2.0.3 (#447)
1296d1d6 fix schema builder
da2cbb5f Merge pull request #450 from sakuraovq/master
82f1f8cf Modify comment
07baa964 fix expression bug
e61f704d support entity auto convert json to array and add batchUpdateByIds method
228c0cee Merge branch 'master' of github.com:swoft-cloud/swoft-component
5b985653 Test unit of phphelper and xmlhelper added . (#449)
1f411819 fix i18n test error
daca256b rename folder zh-cn to zh-CN
7f387e1e update some for i18n
061040db update symfony/yaml to 4.3
7f27f1c8 update: upgrade phpdotenv 2.5 to version 3.4
a8260124 Test unit of phphelper and xmlhelper added.
6f23e481 fix collection unique and remove migrate
360ee010 新增XmlHelperTest, PhpHelperTest
178d4ef6 update: add mini swoole version check
49ea7f36 Merge pull request #446 from carpcai/master
04074f14 fix: error words
39d1be15 update code format
ff79e0a4 fix: swoft-cloud/swoft#744 use Coroutine::create instead of go() create new coroutine
17fe539f Test unit of Json helper added.
51361cde Merge pull request #445 from shulinqian/master
d6e9ab88 test for stdlib ArrayHelper
b76f124b add new method getParams for Uri
32cc2305 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
6b2e1484 update: add sent mark on http response, for deny repeat send response
7cfc000b Dev: 2.0 (#443)
8123a859 Merge pull request #442 from swoftcloud/master
2b1ac186 Update composer.json
c9ca10d5 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
8a9555a9 update: add an dev command for gen readme file
fe7e3a69 Merge pull request #444 from sunnyos/master
b1bf9ae2 fix: the swoft documents url is error
00dfb071 fix: unit tests error on http server
2e00b4b1 remove composer repositories for laravel-china
feb9a675 add uploadfile getFile method
fad307a4 Merge pull request #1 from swoft-cloud/master
62a67e96 update: remove the laravel-china source
c4bfb69c fix: swoft-cloud/swoft/issues/708 Call undefined method
4f472045 update: console use system error handle component
8a5418bf update: throw exception on co exec error
d959a4f5 Update validator
c53bf15e add new console input method
a4cb3e03 add an http query build helper method
86035ddd Fixed unit
07780ff4 rm packget url
c7165286 rm dump
6169f84f Add interface inject
f3a8f04b update: rename ErrorHandlers to ErrorManager, update some class imports
b05afbb0 update: modify some cookie logic, add withXX methods for cookies
afff9029 update some info
f82169ef Add inject interface
db2d9355 fix: should stop ws server if server has been started on use ws:restart
d6b532c8 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
aaf3df3c update some for release script
2be5eb5c update some
fe272498 Merge pull request #441 from ulue/dev2
f8ef5a9a fix: swoft-cloud/swoft#723 swoft-cloud/swoft#719 some bean always repeat create and init
a75914b4 Merge pull request #440 from swoftcloud/master
baa482fd Add exception
ae933afd Add rpc code
9d84e7f3 fix: clog call position print is error
29f2e2e4 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
4e9a83ab update some
67d1d247 Merge pull request #439 from swoftcloud/master
2d64dafa Merge code
cc35560a Add validator not annotation
977c6cbb update release script file
48410ce0 update notice message
e440e469 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
0f52eb61 update release script
46d99d37 Dev: 2.0 (#438)
89847438 fix: http server unit tests error
9bd93b9b Rename validtor method
edd24a2d Merge pull request #437 from sakuraovq/master
d29d45c3 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
89d9f3a3 update: add some scripts for subtree push and release
c3675e61 fix redis config bug
8aaa38c4 add more server events and modify some logic
4e2ca761 update some logic for tcp server
395ebffe add db schema table comment
8e058366 Fix parserQuery bug
0e73a8cc Update validator
74fd5e90 change redis zAdd
92b2a5fa Fixed autoloader instance
efccc23d Merge branch 'master' of github.com:swoft-cloud/swoft-component
4ca35627 Merge pull request #436 from sakuraovq/master
582c806c up: dont call validate if no Validate tag
873a97be up: buffer full and empty event has been deprecated
afec0e3f fix: swoft-cloud/swoft#718 add pipeMessage and packet event support
ba19af36 fix: modify component loader check logic
d5798a95 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
e8427f11 update comments
e0757a00 Merge branch 'master' of github.com:swoftcloud/swoft-component
fe9b92ba Fixed config bug
1a3275b3 change redis unit
9215ef1f fix unit
c9660847 optimization db redis
eb251954 Merge pull request #435 from swoftcloud/master
e4b1ac6d Add trait and base unit
a1e56ebb Add rpc error message
d8fb588d Update route match
460bbd49 Added unit
10092bcb Merge branch 'master' of github.com:swoft-cloud/swoft-component
3f80474c Fix pool bug
560bc14b Merge pull request #434 from sakuraovq/master
d1f86a61 fix __call
ffd4281a Merge pull request #433 from ulue/dev2
f7ca1472 fix: command option or argument default value is bool type, will auto convert value
6ce5ce4f Merge pull request #431 from sakuraovq/master
6d488067 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
feac3700 fix redis by inject release bug
0d89c26a add getter method for get accept language
d85414c1 Dev: 2.0 (#432)
67401f60 add more input getter methods
5394f1cf schema compatible dbSelector
cab1b7ae add some unit test for consoel
304d22af resloved
c9b5e17a fix aggregate doc
2647b9f4 update some console logic, add required option check
fbec8916 update some for console
6a96b2cf update: will delete pid file on stop server
ec30dd47 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
7fa7188f fix: add env check on start swoft application
bda3b1bf fix var is not define
da6b328b Merge pull request #429 from swoftcloud/master
33181850 Add unit
b36ca034 Add selector
bc8ecf1c fix error notice
f3b12c94 Add db select
c5d796fb Merge branch 'master' of github.com:swoft-cloud/swoft-component
9c0f9505 Merge pull request #430 from sakuraovq/master
a91c0249 fix table prefix bug
cff4e2c1 add table column schema
32abf60d Fix not parsed body
d0ff0f78 Fixed multi error bug
16579797 Fixed contenttype and add unit
74bb2f8d Merge pull request #428 from akaQin/master
09a35b97 add model safe insert
3d0f0df3 optimization model insert methods and add Schema proxyClass
8aba9122 Merge pull request #427 from sakuraovq/master
df6f0bf3 Merge pull request #426 from ulue/dev2
7b28798e Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
f5e46bf9 Update Request.php
8ce1303d add unit tests for reponse html content
3da893ae update: matched route data save to request context
e5513df4 fix: maybe error on response html data
4ac510de fix: use not exist function
7b723213 buf fixed: Content-Type在包含charset时无法正确解析
51dacc04 add unit test for ws server message middleware
9044d2e4 fix code
82fa23ab add more unit test for cookit and cn route
69c06a00 add schema
b76ce300 Merge branch 'master' of github.com:swoft-cloud/swoft-component into schema
10f55d0a Merge pull request #425 from swoftcloud/master
e7041164 Fixed error handler contentType
33433249 Merge pull request #424 from swoftcloud/master
e443cebd Added bean unit
fdaa9b70 Add unit
3964e976 Merge branch 'master' of github.com:swoft-cloud/swoft-component
52fac7d9 Merge pull request #423 from sakuraovq/master
54e00aca Fix aop repeat execute
1a9d25b0 fix sysmtem attributes name
3e9b431f fix: type check error on enable SSL
807a51d9 Merge branch 'master' of github.com:swoft-cloud/swoft-component
e3d40856 Property to transfer for bean
1a024bf5 update: add cookies support for response
5193846a Merge pull request #422 from sakuraovq/master
4d277189 fix some bug for display cli table
37ed2d9c add two helper func for print data
f247ec23 update some for sys helper
4d3392e6 up: fix param route match on ws server
d4580d6d fix: error component unit test
446a3a24 fix entity join raw select
ab450891 Add parsedQuery and Fix body
ee366cb9 Merge pull request #421 from sakuraovq/master
749a2270 convert redis getDatabase
c6c595a7 merge master
308d3300 fix model doc and fix paginate add select problem
978ab744 Added travis
2403d99e Added travis
5d3d115b Modify version
021839cd Merge pull request #420 from swoftcloud/master
33430efc Modify error
bef25b3c 修改状态
533b5923 Modify type
ed883394 Aop filter
1653b247 Add rpc error handler
d360acd9 Dev2 (#417)
42ecd7a9 Merge pull request #412 from sunnyos/master
ef5df483 Fix ContetTypeTest
5c53deac Fix ContetTypeTest
95c9a7f0 fix Request test
755c8cfe fix Request test
2ffe3bcd Merge pull request #419 from sakuraovq/master
1d97cf17 Merge branch 'master' of github.com:swoft-cloud/swoft-component
ab9c7900 add scherma grammar
dfd43e35 Merge pull request #418 from swoftcloud/master
46976c58 Add
0e055913 Fixed pool maxIdelTime bug
3a335359 Merge pull request #416 from swoftcloud/master
bac5b4dd Fix bug
eeab4404 Added getter
48ac41d4 Fixed unit
dc37c923 Added bean name of comma
e0d14934 Fixed session and request destory bug
6452a375 Added query validator
ebd8bf2b fix path error on built phar package
bb6f39ea add an tests for stdlib
fc0a88eb support inject redis pool option
8fcf35c5 up
665a23b8 Merge pull request #415 from swoftcloud/master
1f9923e5 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
9d55195e Merge branch 'dev2' of https://github.com/ulue/swoft-component into dev2
46cc5cd4 Merge branch 'master' of github.com:swoft-cloud/swoft-component
22cf706c Fixed content-type bug
e45ed0aa Merge pull request #414 from swoftcloud/master
7c2318dc Modify host
f700e22f Modify host
504869ec Add unit
6d947666 Modify event name add
27931a70 fix $this->getKey() return array (#413)
5b1baa5b Fix worker stop and error close connection bug
642d791e fix $this->getKey() return array
999c10f2 Add get beans by classname
10bc7fa7 fix upload file bug
66528515 fix upload file bug
f8c38951 Merge pull request #411 from swoftcloud/master
7778bd27 fix upload file moveTo bug
74d76a92 modify default output charset to utf-8
ab3cfea5 Fix logger trace bug
509f63d5 Merge pull request #410 from swoftcloud/master
b063dd15 Fix repeat loaded bug
d95577ab Merge pull request #409 from swoftcloud/master
5ba8682d Add vistor name
459a1055 update helper method
0fd5fab9 Merge branch 'master' of github.com:swoftcloud/swoft-component
868102ff Fix multi and clog trace bug
33b09dbb add
b1777e49 remove min
c0316477 Modify version
7bcec62f Merge pull request #408 from swoftcloud/master
1cf9ee22 Modify version
8b4b2ac2 Merge pull request #407 from sakuraovq/master
eaa697cd fix db unit
7f03ff5c Merge branch 'master' of https://github.com/swoft-cloud/swoft-component
0d830478 fix updateOrInsert
52282545 Merge pull request #406 from swoftcloud/master
857783b3 Merge branch 'master' of github.com:swoftcloud/swoft-component
6bb3bc9d Modify method
3918dc48 Merge pull request #405 from swoftcloud/master
3021b71f add
f8941795 add
441aab33 add
ec801679 Merge branch 'master' of github.com:swoft-cloud/swoft-component
8cbf430f Fix task tarvis
398418a9 Fix task tarvis
31e07193 Fix rpc server travis
f4f98ad1 Fix rpc server travis
bea8cdd4 Fix http server travis
3066da5d Fix http server travis
7b113ada Fix rpc travis
bde6ef18 Merge pull request #403 from ulue/dev2
09707e89 Fix rpc travis
c358d5fa Merge pull request #404 from swoftcloud/master
01c61f3a Fix rpc travis
d4370c33 Fix rpc travis
131221e9 Fix rpc travis
3be36d2c Fix validator travis
36bedaa4 Fix validator travis
aff46110 Fix validator travis
e311df17 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
11d20bdf Fix validator travis
b15b7c6d Fix validator travis
6ecae0b8 Fix redis travis
63c3f61d Fix redis travis
5fa55024 Fix redis travis
3259a661 add
d70c924e Fix db travis
667106b5 Fix db travis
fc5eb3bc Fix db travis
7bf626f0 fix error component test
d92af14d Fix i18n travis
548ea04d Fix i18n travis
0bf30009 Fix i18n travis
0030db51 Fix i18n travis
96dc11db Fix framework travis
225f7c18 Fix framework travis
50f546e1 Fix framework travis
d9e7754d Fix server travis
701391fa Merge pull request #402 from swoftcloud/master
9b1532e4 Fix server travis
52eeeb8f Fix travis
6f6a9fb5 Modfiy composser
06d3be6a Modfiy composser
d86d4787 Modfiy composser
72109f67 Modfiy composser
0a392334 Modfiy composser
0b44d78b Modfiy composser
12ffd25f Modfiy composser
ff9e4a29 Modfiy composser
edf780c6 Fix framework travis
00b76a79 Modfiy composser
ba2e960d Fix framework travis
61af4ddd Fix framework travis
5b5ea2e2 Fix log traviss
7f7a0059 console
3883b2df i18n travis
b574325d Fix http messsage
4dd2547a Fix error travis
fb78effc Fix cp travis
5a3eb8a3 Fix cp travis
defb6a96 Fix config travis
32833183 Fix config travis
fd98c58a Fix config travis
caa78b6b Fix bean travis
996c8665 Fix event travis
75e7e73c Fix event travis
36f165f3 Fix event travis
96d130c6 Fix aop travis
86eab9ee Fix aop travis
38c5ffc0 Fix bean travis
c8526de4 Fix bean travis
b7fd7458 Fix aop travis
7f98a6b0 Fix proxy travis
3ae53f35 Fix proxy travis
d993515b Fix proxy travis
58e1fdf5 Fix bean travis
a3c345ff Fix aop travis
6bd3a6ff Fix
141b0f2f Fix
19d1a09d Fix
33163fe6 Merge pull request #401 from sakuraovq/master
6535004c Fix
b68fbfc8 fix perPage params
85e53f79 Dev 2.0 (#400)
54f18b67 db unit paginate
d45f2b45 Fix stdlib travis
b233e46e Fixed readme
34ad2a53 Fixed readme
e4f29301 Fix travis
0b8048d2 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
8eb25c79 up format
9ed3f8e9 format websocket-server codes
a021345d Merge pull request #399 from swoftcloud/master
e134261f Modify method name
ef51bc8d Merge branch 'master' of github.com:swoftcloud/swoft-component
0ad57c57 Added parsedBody method
0ae93821 Merge pull request #398 from sakuraovq/master
f1f9d471 sync value type
ef9b60f7 fix fill bug
994105bd fix model fill bug
3a381eb2 fix unit config
e973f8ee add paginate fix db exp
ea4c0e1a fix by phpstan (#388)
cf089d70 format error codes
9929662e format event codes
383a49e5 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
38cda899 Merge pull request #397 from swoftcloud/master
bf06165f Fix formate
c2bbbd1c Fix formate
f2074de5 update
039ab03e Merge branch 'master' of https://github.com/swoft-cloud/swoft-component
3ad2a02e fix require for swoft component
80467078 add console required argument check
1d120d8a Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
9d1a9349 update some
130c35ea Merge pull request #396 from swoftcloud/master
514d9347 Merge pull request #395 from sakuraovq/master
5e4d681c add
69d4efb8 recover db pool unit password
5fe2468b Merge pull request #394 from sakuraovq/master
e3674e5b recover config and formate db unit
06e6f091 fix redis serializer and fix some collection
aea78ce1 Merge pull request #393 from swoftcloud/master
bdc33c6a Formate
50191522 Refactor db
3686aa25 Modify push
a69a0928 add inPhar for annotation load
5a0b916e Merge pull request #392 from swoftcloud/master
0669a6ed split
ced2bbf8 Merge branch 'master' of github.com:swoft-cloud/swoft-component
723b5900 test aop
5de369fb test addd
bee0c691 test
5b80a650 Split 'src/annotation/' into commit '6c4f9a444db53365c85dcc0a3b1cb066c0ec48ef'
e00abc3f Merge pull request #391 from swoftcloud/master
fd4de694 Fix travis
c38068b3 Fix travis
002d2311 Fix travis
6ba4bad9 Fix travis
71522472 Fix travis
157d309e Fix travis
510f0451 Fix travis
4aa46fd1 Fix travis
36d63182 Fix travis
213fe608 Fix travis
1effbb67 Fix travis
2e35a9c8 Fix travis
d408b9a9 Fix travis
01c7efca Fix travis
7e5fc639 Fix travis
30f04bbe Fix travis
6c4f9a44 Fix travis
b0ee0a63 Fix travis
54eead23 add
8ed5d1d0 Merge pull request #390 from swoftcloud/master
0a7f29e0 add
9b9a0e75 Merge pull request #389 from swoftcloud/master
a7930cbb add
b7551b6e fix by phpstan
566ddd7c Dev: 2.0 (#387)
b8f87657 up composer.json move phpunit to require-dev
e589aa20 Merge pull request #386 from swoftcloud/master
885eda2f Fix log
4df0764a add some unit tests for file helper
cbf0770b Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
fea8fc99 Merge branch 'master' of github.com:swoftcloud/swoft-component
910b23db Fix event bug
fd8e5dbe Merge pull request #384 from swoftcloud/master
747d8fbf Update run.php
40ad1311 Merge branch 'master' of github.com:swoftcloud/swoft-component
05036c22 Fix rpc reconnect
9ffa9e97 Fix redis
556d41c4 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component
ce1381ca fix unit
16dda7df Merge pull request #382 from sakuraovq/master
08dad928 Merge pull request #383 from swoftcloud/master
09d23dd5 Fix content bug
74cc5c5b add tips
3a227bb4 recover test db pwd
cd994874 补全collection
8edd1b30 add
46d54a9f Fix bug
99350f1f Merge branch 'master' of github.com:swoft-cloud/swoft-component
6591b314 Refactor config
4e7a129c Refactor config
37ae6662 Merge pull request #381 from swoftcloud/master
e7e5ff56 Fix validator bug
f2c3b7d9 Merge pull request #380 from swoftcloud/master
f6ae8d1d add http server validator
0a1c99e7 update
93074eb7 Merge pull request #379 from swoftcloud/master
0e8251b7 add
46a1c362 add
39215a8e add
633aa033 add
9aee31b4 add
6eab226b add
81f0e47e add
273ada7d add
f14d5969 Update .travis.yml
39782543 Merge pull request #378 from swoftcloud/master
259aecb4 add
944374ec add
5447e6ef add
7d67bca8 Merge pull request #377 from swoftcloud/master
7034fbcc add
9323cf15 Merge pull request #376 from swoftcloud/master
edcd1d2b add .travis.yml
43d3ef03 Merge branch 'master' of github.com:swoft-cloud/swoft-component
824e8c70 Merge branch 'master' of github.com:swoft-cloud/swoft-component
b2c2943d Fix bug
6950a86e add component
5f5f9d04 Add unit
00794147 Dev 2.0: inspect and format console codes (#375)
bb7193ea inspect and format console codes
e3e2f33e fix console component tests
311db446 add unit
2f905873 Dev 2.0 (#374)
4ac96519 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
10dde505 re format error, event codes
5b3c8771 Dev 2.0 (#373)
7aad622e re-format websocket server codes
515fba43 update some
4771f1f3 test db and redis
ac368587 rename
640a64c1 rename annotation
94efd963 update some
e71c14e6 add unit and fix bug
e3054729 add type unit
f15d2dfa add type unit
5200d422 fix redis clusters config bug
ee69a32c add help methods for response
14d94a3b Merge branch 'master' of github.com:swoft-cloud/swoft-component
ef477b62 add validator item
8467192c 取消where 类型限制
3e827b40 add validator
2d4951ac fix dobule
387ca0ac add type
b2418b32 add unit
57c5debb Merge branch 'master' of https://github.com/swoft-cloud/swoft-component
a7250e0a Fix aop bug
12c78ad7 fix transaction savepoint
587945d0 Dev 2.0 (#371)
fb6ea097 Merge branch 'dev2' of https://github.com/ulue/swoft-component into dev2
575aa8ee update: fix some logic for pack phar
73895a47 update: fix some logic for pack phar
d921df00 add some tests for stdlib
bba28189 update test helper class
cc98c81b Dev 2.0 (#370)
b8d4bb55 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
414beda3 update some logic for ws server. add some tests for ws server
b7f3212c merge
fc10b40c add Validator
f47378cd add Validator
74740a00 Merge pull request #369 from daydaygo/master
88b56c82 Merge pull request #368 from sakuraovq/master
f5fe6711 update composer.json
2f4ccc14 change var name
ad53715f fix aggregate
e0a96cbd test pool
4e2bfcc7 Signed-off-by: zhenghongyang <[email protected]>
4fb78e04 update some test config and classes
4ad49848 update script file
3111884f add some setter methods for base server
e4964175 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into dev2
293ec1d8 update some base logic
e5c6b564 update: update ws server message dispatch logic
26d8a2a7 Add i18n
eadbe8b4 Add i18n unit
0c2e042c Add validator and i18n
ea4ffcd7 Merge commit 'a574a2abe523d23b31c723fb3be68405a0388db4' as 'src/i18n'
a574a2ab Squashed 'src/i18n/' content from commit bf58b9d5
ab70508e Merge commit 'fdd42bf46d8375f4846b29fbe0a40f21f2085328' as 'src/validator'
fdd42bf4 Squashed 'src/validator/' content from commit 5bc885ca
76e38792 Merge pull request #367 from swoftcloud/master
7328e79f Fix unit bugg
882e4cfa Merge branch 'master' of github.com:swoft-cloud/swoft-component
6b02281c Fix push log bug
2761c4c0 Merge branch 'master' of github.com:swoft-cloud/swoft-component
95fdd7d9 2.0 update (#366)
00895241 update some
57e35902 update some
9406e371 update some info for annotation load
c1f64e1e update some info for annotation load
f823bcd3 Compatibility as defined field
0de4b1a1 2.0 (#365)
8b4c2c3d Merge pull request #364 from swoftcloud/master
4e67cc93 Fix html bug
65764eb1 add multi co
838c233f Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
34212a9f update some logic for parse bean. add new class for ws server
e0c71572 Merge pull request #362 from sakuraovq/master
c73e6891 Merge pull request #363 from swoftcloud/master
0e95d30c Fix big string
b347a7d0 fix unit
9c07ca89 fix type jud
719f11b8 fix model hidden bug
f90503e1 Recover withData
49fcdbdb add unit
3e41118f Add use md unit
a5e08a1e Add rpc md unit
ab3a5db2 Add rpc server middleware
3381536a  error handler
c46aaf5e Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
a41e49cd updaet some logic for ws sever
b3deb325 Merge pull request #361 from swoftcloud/master
3af89249 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
d4ef5ad6 Fixed unit bug
b753ea3d Add task unit
ec7a1c76 Fix task bug
88a7479e Add rpc context
e330b1fc Merge pull request #360 from swoftcloud/master
0f68b333 Fixed accept emtpy bug
4ff8c8c4 Add html
21cf13cf Add rpc command
485f6215 Added unit rpc server
1865ce00 Add mock server and unit
35731e12 Added rpc client and rpc server unit
acc484aa Add config unit
b3fd193c Merge pull request #359 from swoftcloud/master
26b4b0bd Merge branch 'master' of github.com:swoft-cloud/swoft-component
3a98320c Merge pull request #358 from sakuraovq/master
d62cdca1 Add aop test
290c69a6 remove no use namespace
40ed16b0 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
3d493f30 update some info
bf3638a2 add db test
e7c4c16d Add component unit
afde52a5 Merge pull request #357 from swoftcloud/master
ce79067d Add unit demo
cd3c06ae Fename corebean to beans
9df30048 Add task finish contenxt and unit
131aa0f2 Add task unit
2d266801 Add task unit demo
e4c25946 Add task unit demo
c38e4606 Merge pull request #356 from swoftcloud/master
d2e14712 Add unit and fix db bug
e8d3b84a Refactor stdlib
7f7cee93 Merge pull request #355 from sakuraovq/master
1b8b2d1f restore test db bean config
91f19e58 fix db unit
833a403c fix model increment bug
b4d429ed Merge pull request #354 from swoftcloud/master
67f27b06 merge
631f0b36 Add middlewars and unit
9b3f5e50 Add request unit and fix bug
522a28c5 Fixed unit
ad332d60 Merge pull request #353 from ulue/2.0
fd7b3861 update server log check. format websocket codes
785b838c Add rest unit and fix parser bug
1da7dda8 update: strict check registered event listener class
95d796aa Merge pull request #352 from ulue/2.0
fab03d36 update: rewite phpunit.sh file. update some component test dir and config
12e3aa90 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
f3cb590d update some info
89f4ac75 Added http unit and fix bug
1464e563 Add httpserver mock
9ea60ad4 Merge branch 'master' of github.com:swoft-cloud/swoft-component
3a8c3a9d Add http server unit
4ac27aeb Merge pull request #351 from sakuraovq/master
50863b17 fix gitignore
07312edb reset code
81a7026f db testing
77eb26bc Merge branch 'master' of github.com:swoft-cloud/swoft-component
b9589f35 add unit
37be8841 Merge pull request #350 from ulue/2.0
324cb29c Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
e8fa6729 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
b8256a3d Merge branch 'master' of github.com:swoft-cloud/swoft-component
0d879a08 add aliases getter
e4c94c5b Merge pull request #349 from swoftcloud/master
3ae8c1e3 Refactor config and connection pool
140e5813 Refactor bean
cec66d03 Refactor aop
6260a945 Fixed annotation excpetion
89a400e3 Fixed annotation excpetion
24c72755 Refactor annotation interface
7bce7478 Refactor annotation interface
8f6c59d1 update composer json autoload config
f40652aa update composer json autoload config
3218dc28 Added yaml unit
47982438 Added config php
88e60acc Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
18deb063 update some console logic, some bug fixed
897e9be1 Merge branch 'master' of github.com:swoft-cloud/swoft-component
4c0532c7 Merge pull request #347 from swoftcloud/master
2ebb6289 1111 (#346)
1eef2a7e Merge branch 'master' of github.com:swoft-cloud/swoft-component
70bae28d Fix tosql bug (#345)
a84b5e7d Fix to sql bug
a59e99a7 Merge branch 'master' of github.com:swoft-cloud/swoft-component
51932eb1 Merge branch 'master' of github.com:swoft-cloud/swoft-component
15b7053d Added config unit
cd014a18 add db test (#343)
bba3432d fix code style
d0c4baa6 update code style
7c4f43c7 add db test
3cbc20cb Add bean unit
7dad3f7a Merge branch 'master' of github.com:swoft-cloud/swoft-component
ae5dee75 Fix add (#342)
ff2d30a6 Fix add (#342)
ee9fd81e Merge
786f400a Added unit and Fixed bug
ca6df064 Add unit aop
0cb31f26 Fix unit (#341)
fcc4d06e Fix unit (#341)
2218661f Merge branch 'master' of github.com:swoft-cloud/swoft-component
46c7426a Fixed redis unit
e8e26ff2 Fixed db unit
a72d89d6 Fixed unit
b55ebb1d Formated
3c1e5fd0 Add annotation unit
c371f8dd add
3d4f5972 Fixed unit
112f783b Merge pull request #340 from ulue/2.0
483ed19b update some logic for console. add class annotation tag check on init bean
7e2a5e08 add some helper methods. console support id alias
eed530b6 Merge branch 'master' of github.com:swoft-cloud/swoft-component
5fb935fd Fixed unit (#339)
314ef0bd Merge branch 'master' of github.com:swoft-cloud/swoft-component
b17284de Fixed unit
8841c383 Refactor db (#338)
f6fba551 Refactor db
e37f5353 fix: error handler dont catch php internal error
e37248d0 Merge pull request #337 from ulue/2.0
4831cbaa Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
1dfd7747 fix error handler logic
735ed209 fix some class namespace is error
abff3545 fix some class namespace is error
09aac48b Merge pull request #336 from ulue/2.0
fab81cdf fix error on console run by corotine
629d67f1 Fixed waitgroup bug
bf6bc474 formated
df5674cb Merge branch 'master' of github.com:swoft-cloud/swoft-component
9299fae8 Added transtion and pipleline
f610230b update some info for ws, update error handle for http server
71b0a6b4 Merge pull request #335 from ulue/2.0
43c8ba82 Merge branch 'master' of https://github.com/swoft-cloud/swoft-component into 2.0
975ed261 update some logic, fix some bugs for ws server
f746358b update some config for error package
005bcb49 update some code
1ceb6799 update some handshake logic. rename handShake to handshake
d81a753c Added redis unit
47decbf7 Fixed reconnect bug
5bef5004 Added redis connect
89b81c77 Added redis con manager
ae293f67 Fixed logger
5a3b788e Merge commit '21fdf6df08655dc750a9e57ef50d67a90cf7e14c' as 'src/db'
21fdf6df Squashed 'src/db/' content from commit fac80439
ffae7b25 rm
48d45ba3 Merge commit '9978c1f786e9e63b091b45a8d9b9023c646a93a6' as 'src/db'
9978c1f7 Squashed 'src/db/' content from commit c4c20242
59d281ba Rm
dc3babfe Split 'src/db/' into commit '5582ab255b367a727091085400881c9f1b035f70'
ffed2130 Split 'src/db/' into commit '5582ab255b367a727091085400881c9f1b035f70'
548e5be2 Modify readme
5582ab25 Merge branch '2.0' into 2.0-merged
c8ed5bdd Merge branch '2.0' into 2.0-merged
7dae41b3 Clear
42c8b75f update ws server error handle logic
d423dc0d Fixed unit
36fa9658 Fix redis pool and connection
8883edac Fixed unit
8682af58 Fixed unit
061f0e73 modify some logic for error handle
fdaa03d8 update some logic for error handler
d48ab4bd Added redis
7e98b0b5 Added redis
0c41c7f0 Remove handler
0d86093b Added redis
50b839db Merge commit 'f19b06f385bffd82b95dfd919e79f0a1f8a38960' as 'src/redis'
f19b06f3 Squashed 'src/redis/' content from commit d9bf515
66dec3d7 Fixed tasks bug
105ddf14 Fix conflict
857eaa3f add task co
4e11cf11 Added task
c8c32211 Merge pull request #329 from ulue/2.0
ae083d0d add console context
9b1dd08f update some logic for console dispatch
a9a18dc8 update some logic for console dispatch
e6f9aa36 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
dae4d407 add task
0e8f1410 add context method
86cc14fd add rpc
37ebdfa7 Merge pull request #258 from swoft-cloud/inhere-patch-1
faf0375d Merge pull request #327 from swoft-cloud/inhere-patch-3
3f8787a5 up
fd7b5a65 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
ff20eced add version
ec9904a7 Merge pull request #328 from ulue/2.0
fd43635d Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
155cb29a Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
8d5f0c54 update some error handle logic
373ec9d4 update some logic for error handle
321e3393 add rpc
0028f183 modify log
fb2c9c5a modify log
b2b419b2 modify log
f48b8a9b Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
f53819e9 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
99eb12a8 fix rpc bug
1ae28e2c add error handler package
31c1fb4c Merge commit '6dfbd7d41f25794b89d1f8d1328c04dfdc64ee0f' as 'src/error-handler'
6dfbd7d4 Squashed 'src/error-handler/' content from commit eb4606a
0684d02f add new file for add repo
5a798f6d Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
57fb0d9f update some logic for listener, context, session
39a7bc3a update some logic for listener, context, session
14ed6205 fix setParameters error
a3d5ffc0 Merge pull request #326 from ulue/2.0
8fd5fb3b Merge branch '2.0' into 2.0
6f4a9807 Merge branch '2.0' into 2.0
ff613df1 update some info on swoft start
d9631f53 update some info on swoft start
11e7571a update changelog
d436f58b update some basic logic
9aebfa38 update some websocket logic, optimize error handle
048d469b add rpc
e8af002d add rpc
b361195d add rpc
e6ef4f55 Merge pull request #323 from nihaibao/master
eca6a361 Merge pull request #324 from ulue/2.0
f61b5505 update: complete ws server message dispatch logic
9c3d7157 add rpc
3cb5b39e Update Logger.php
50b9ff7d Merge pull request #322 from nihaibao/master
d9a6169e 修改获取请求时间类型错误
a014acc2 Merge pull request #321 from limingxinleo/2.0-limx-patch-1
6ec5eac1 Removed the right `/` of the route.
b8338f4d fix typo
0f4fd5ca merge
678268e1 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
db521361 rpc proxy
1a69f3d9 rpc proxy
28c8fa52 format codes
16d5d811 Merge pull request #320 from ulue/2.0
1fca3ac8 Merge branch '2.0' into 2.0
4116f733 update changelog
fd43e57c complete websocket server handle flow
a68ab2d2 fix class bug
3e50ba22 fix class bug
955df1b1 add proxy
3d168e9b add proxy
85dd5bc0 add proxy
b228497c Merge commit '228e6a9f85c31353816486336ba413107a8a69b8' as 'src/proxy'
228e6a9f Squashed 'src/proxy/' content from commit 0ad5763
6e3c9a72 add rpc
4e73da99 Update composer.json
773fd0b4 modify composer
9529ae0f delete tasak
c2f67ca7 Merge commit '8df510faec2ed35a51fa914dd88e57e0edd55ca5' as 'src/task'
8df510fa Squashed 'src/task/' content from commit e38a9e9
2abe44db Merge commit '0795fbc75e05c81fd2d302fdc1db8b4715bef28c' as 'src/rpc-task'
0795fbc7 Squashed 'src/rpc-task/' content from commit e38a9e9
3ba837b0 Merge commit '7bbb756a0abd776dd145e74155ecb77ef950d08e' as 'src/rpc-server'
7bbb756a Squashed 'src/rpc-server/' content from commit 234dde1
8ad098fb Merge commit '6edbcfd7e8614ee9b094b06913dc700545670b1d' as 'src/rpc-client'
6edbcfd7 Squashed 'src/rpc-client/' content from commit 6d1337b
e170ea1d Merge commit 'f4455e22da1dac38fde8a5fadafcc9303edd358a' as 'src/rpc'
f4455e22 Squashed 'src/rpc/' content from commit 3a0a074
48e47b5f add unit
5b7c825e add unit
8da56ffd enhance db
69260814 enhance db
0a3fd23c fix transaction
38854e2c fix transaction
bc85417f release all
84c90a26 release all
fa125de1 add relese cm
f6e768d6 add relese cm
a0719920 auto release ord connection
73730d9a auto release ord connection
ad5c7eb8 add cm
b1903a54 add cm
eade748c add waitgroup
42833c85 add waitgroup
0f3380f7 add waitgroup
35f2314a update some logic for ws server
6b9267a1 update some logic for ws server
84266dcd Merge pull request #313 from swoft-cloud/optimization-logic
850fcff0 Update Container.php (#318)
05223508 add reconnect
5e4a8668 add reconnect
55c79037 Mod: 纠正了部分拼写错误 (#317)
5f757cdd Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
d87e4a37 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
7c949668 fix pool
7cd30f10 fix pool
47378e8c update some logic for http handle
a669819e Merge pull request #316 from hliang0813/master
99bb7cb9 Update LoadEnv.php
036da7bc update: formate websocket server codes
a4bed05c update some info for http server
e69fd722 improve db pool
61e6a9c6 improve db pool
34e5f4ee 打包之后的phar包,加载同级目录的.env配置文件,覆盖phar包中config目录下的配置。
335fa97e Merge pull request #315 from ulue/2.0
d12a0d07 Merge pull request #315 from ulue/2.0
a0aa1954 fix some error
25b4e499 fix bug
2f55a20e update some basic logic
7d0fbfab update some basic logic
e20ecca6 update some basic logic
94cfee58 update some for http server
3894c60b Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
bf902e88 add strict declare define. add new helper class for cache reflect info
a3c18ce0 Merge pull request #314 from ulue/2.0
73468fbf update: optimize http dispatch logic
3c1d40b9 update: add some new methods for quick get bean
e5b6894b update: No longer proxying classes without AOP cuts in
8e258b88 Merge pull request #312 from hliang0813/master
9487d6f5 修改了打包phar之后无法识别router,报错“Router not found”的问题。
f12eaa6a Merge pull request #275 from tanpeng/tp-branch
1cc6d72d Merge pull request #311 from swoft-cloud/inhere-patch-2
f342741f fix swoft-cloud/swoft/issues/555
9e4d35e4 modify db
4b543de1 modify db
9d7c06c3 Merge pull request #310 from ulue/2.0
85a370d9 update some logic for console component
e9007752 remove repear methods
e9ba9ce3 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
2dd26c6b update some info for http-server
bb7452ca update some info
c1ebd556 update some init bean logic
952ced6c update some bean init logic in container
b0443f98 Merge pull request #309 from ulue/2.0
96af91ab update some logic for console application
d80608d5 console: update some logic for help render
7df0c7be update: console some udpate
4e9a7628 Merge pull request #308 from ulue/2.0
2a5ede5a replace alias name use full class
8e61edab Merge pull request #307 from ulue/2.0
51d05e8a Merge pull request #307 from ulue/2.0
8dc633c5 replace some class alias name
bc52c1b1 run inspect check for aop/ component
feb20022 run inspect check for aop/ component
a24e4f77 format some codes
4e210456 format some codes
d253be46 Merge pull request #306 from ulue/2.0
df449201 Merge pull request #306 from ulue/2.0
e05b3986 up
a597afca up
accc8969 add annotation
80044b3e add annotation
a77485c7 Merge pull request #305 from ulue/2.0
b995d8ce Merge pull request #305 from ulue/2.0
09149915 Optimize some codes for framework
092a077f Optimize some codes for framework
3269f462 Optimize code for 'server' component
23575511 Optimize code for log component
54dc5410 add unit
dc802dd9 add unit
c3a98f68 add model save
d8c417cf add model save
d47ecb7f add model save
d4e4295b fix request and session bean
2abed965 fix request and session bean
c194bc2b Merge pull request #304 from ulue/2.0
1f70b56d update: Optimize AOP performance
c7e3402f merge
51632382 merge
6f10a399 Merge pull request #303 from ulue/2.0
32bbbc79 update
803eab8d Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
4b619b24 optimize event calls
510e21f0 add request and session bean
6c2d0a6a Merge pull request #302 from ulue/2.0
9d03d4e1 fix event test errot
0bc9972e update event handle logic
5c260187 impove
04d38042 proxy remove eval express
3c222571 add controller
b5d2bc1f add
b3512941 update some info for websocket server
4c01b1b9 Merge pull request #301 from ulue/2.0
64dc61a8 revert comment option 'coroutine'
d9233cfc revert comment option 'coroutine'
fb20a259 update some for console help render
59206891 add log
8bd4a27d add log
73fe6597 fix master pid bug
fcb24a6f Merge pull request #300 from ulue/2.0
ff0fcff9 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
7ed4ec45 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
584600da fix: some error for console running
485ebbb6 fix: some error for console running
28cf1a30 add log
02038255 add log
ff67adfe add console logger
a22469c2 add console logger
8885568e update some info for console. remove corotine setting for command
16ec9843 Merge pull request #299 from ulue/2.0
e9ce2edb update some info. add some bootstrap file for tests
a128bdd7 update some render methods
5b14cb73 modify composer
6ed4e0f1 modify composer
a21dc1c4 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
fa541a0f modify composer
b069189b modify composer
4d3de005 modify composer
b8c1414e modify composer
5ac05973 modify composer.json
72801cca modify composer.json
0b84b446 add composer
5d27e334 add logger
3aef918a Update composer.json
05668d44 add monlog
d03342ee fix start bug
604d9f20 add --expand option for application help
2fe9239b update some info
d2e6db75 update some basic logic
f7de0aeb update some basic logic
77e9f592 pre-define some event data object
0863bf5c update change log
cb368ce3 update some info
42a1df75 fix aop bug
486dc5f2 Merge pull request #298 from ulue/2.0
af12c6e9 complate console logic ...
51e99f1b add db unit
645b17f7 add db unit
60a08245 complete group help info render
1cc706a2 add console command class for manage http server
54167d0e Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
cc5f722d Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
ac23685a add gramar
b06cc84c add gramar
9297398e Merge pull request #297 from ulue/2.0
802f88ea update some logic for render console help
6ca2a286 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
1582d1e3 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
7077b8ca update some info for console
cbbc0791 update some info for console
50256844 add
b828f84f add
9c660170 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
1c2bc28a Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
c75c2156 update some base logic
c2550cb2 update some base logic
53d740f3 update console command dispatch logic
7cb66a5b modify prototype
2c666308 modify prototype
115a8fe2 modify composer
e92fce0f add
8b9d39c6 add
314f7c23 add load
faaf1d78 add load
923ba968 modify composer
eb052119 add
ada5208c add
9ed0534b add
d152afdb Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
ba1cc003 add
2bca8f87 add
1269e07c Merge pull request #296 from ulue/2.0
0dcb2084 update all component unit test config
49587778 update all component unit test config
2c97438f console: move some dirs, update namespace
9f2ddda7 add some new helper classes and methods
fd4a404b add user interact methods from inhere/console
34e92862 add test component
c3b59f18 Merge commit '6560e814d669d1448285245442beeed1f948b1fc' as 'src/test'
6560e814 Squashed 'src/test/' content from commit 133a144
59ed7d20 Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
aed0d74a Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
9790afbc add
e19d1114 add
b5a8ce3e Merge pull request #295 from ulue/2.0
bb2960c4 update some info, fix error for console flow
58b8289b update some logic for server start
24e64222 update some logic for server start
f8459fa9 Merge pull request #294 from ulue/2.0
f29dd3ac update some
843d9cb0 complete console router logic and info collect
e1f9ba6c update some base info
28669d72 update some base info
a55894a6 update some logic for console
230b1ec0 inspect check for stdlib package
51a046d5 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
451d3ce4 Merge commit '9650fca96e8f1860ac730e2a1256b4f543443110' as 'src/console'
9650fca9 Squashed 'src/console/' content from commit 11982cf
23c2281c update some info
72f11e19 update some info
b7ef133b Merge pull request #293 from ulue/2.0
c0511e62 Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
2a6d5787 add
fdf5d8bf add
3a7dda34 modify model
e29a4632 modify model
a13947d2 update some composer json config
d5f6d4ba Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
5a0ded9b update: add some helper methods
4d954f3c fix ws-server namespace is error
b9322f6d fix ws-server namespace is error
d9b75471 Merge pull request #292 from ulue/2.0
19381cd1 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
97eb4b3c update some info
edc2fa70 fix some http message error, update some.
24ad5f48 add log
15617b50 modify model
b81f956a modify model
f60607c3 add prototype new
c23057d3 add prototype new
2d03a571 modify builder type
43051a48 modify builder type
f63a2141 add connection
9e2bd145 add connection
4be56cf8 add ext-pdo
1adab358 add ext-pdo
e0dfa621 add ext-pdo
44b46e83 Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
ea8ddbb5 add
6a7d97ad add
84512576 rename framework/Connection to framework/Session. update some logic
2712bbbf update some exception class
f44b63ba Merge pull request #291 from ulue/2.0
f3b63004 Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
739fae2b run code inspect check for http message
15fd9102 move http-server/Response to http-message/Response
dee5882e move http-server/Request to http-message/ServerRequest
866d252c move http-server/Request to http-message/ServerRequest
4b705662 add strict_types declare
a4b9661d Merge pull request #290 from ulue/2.0
f107a163 update: change log
839478ce phpstorm.meta use new format
eed6d7d4 add a .phpstorm.meta.php file provide IDE code hints
d7427409 update: add some swoole event bind trigger, and some server event bind
f53eeb18 add change log file
47081ab3 Merge pull request #289 from swoft-cloud/inhere-patch-2
faf12737 fix: db condition() comments is error
81ad748a add some helper methods for server
d74c2c38 Merge pull request #288 from ulue/2.0
12982fb9 remove load Functions.php file from composer.json
6e676dc6 remove load Functions.php file from composer.json
1cf17ab0 update some string helper methods
c5056c81 update some logic for ws methods
40a0166e add query and builder
bebbf5a0 add query and builder
c94237eb update some logic for ws server
c61d0ecc add pool and connection
b805360a add pool and connection
fdbbe208 update some logic for ws server
d98b8962 add some new annotation class, update some logic
56068cdd Merge pull request #287 from ulue/2.0
a0edc4e5 modify some logic for ws server and framework package
c0ca4dff update some logic for ws connection and context manage
b4fcea66 update: modify ws server logic
9df8b0e3 Merge pull request #286 from ulue/2.0
fa7a6d8c update
624a3c63 update: udpate some logic for ws server
ce21dd96 add pool
f2a2a359 init db
a760467d init db
7ff6a268 update some logc for ws server
d09109c6 update some info
82f4af99 add some websocket server class
642b87ba Merge branch '2.0' of https://github.com/swoft-cloud/swoft-component into 2.0
08d16254 update som
07741120 fix formatter bug
47dde7f7 fix trait use bug by self
5486ca8e add db and pool
c60046d0 Merge commit 'e61bb616914874896aebb86b845a9de1ef5e09c5' as 'src/db'
9aab694b Merge commit 'e61bb616914874896aebb86b845a9de1ef5e09c5' as 'src/db'
e61bb616 Squashed 'src/db/' content from commit 9183da7
05f8dcca Merge commit 'ac23f951c2590d71ce0e1b299022b72e242dd855' as 'src/connection-pool'
ac23f951 Squashed 'src/connection-pool/' content from commit b961f8d
9183da75 init
9a3c5376 init
c3aa9068 Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
bebdc639 modify formatter
5eb873a7 Merge pull request #285 from ulue/2.0
8a17087d update some logic for component define
e6833d5a Merge pull request #284 from ulue/2.0
897ce4d2 update some info, clear some data
7dfb2b14 update some info
316cf482 update some info
5f921ad5 update some logic. add new event, trigger event on app init after
87bed57b update: complete event collect and register
600329f6 add: http router register logic
ac369cca update: update some logic. add some interface
5e234038 update: update some logic. add some interface
7ad65805 Merge pull request #283 from ulue/2.0
05d53ca8 update var name
ce1ab3c6 update some
640e9930 add: add http router with unit tests
837c4da1 Merge pull request #282 from ulue/2.0
28bd9aac update: add more unit tests for event manager
5421d6eb update: add more unit tests for event manager
a61d1854 Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
c64fc592 2.0 (#281)
aba0ce0a 2.0 (#281)
4d713e8c update some method comments
ba13eefc Merge branch '2.0' of github.com:swoft-cloud/swoft-component into 2.0
853aae2f add: add some annotation classes for event component
402d54e5 fix: 添加定时器缺失参数 (#280)
d12c53eb add parser
808b7f24 update: add phpunit config. some update for event lib (#279)
c2f236f4 update composer json
c6a36920 update class comments
cbcefbde change some info
d2e76443 update: add phpunit config. some update for event lib
437d9a47 add accept
c469e811 add middleware
97878221 add middleware
eed42279 fix: 定时任务内存溢出 (#276)
43e5bb52 add http server
17b2f4cf add http server
8b6c29ce add http message
d0098a65 add context
75d75eb7 refactor aspect
953d7a5d modify aop
c5da41ad format
20f572fe format
af17fc42 add aop
c0daf1d0 fix: 修正replace语句执行时使用fetch的bug (https://github.com/swoft-cloud/swoft-component/pull/278)
c5801a19 add bean handler
e8871e43 add original class name
e8f81c4f add class proxy
b76772b4 add class proxy
36be0d85 add composer require
e5720cf3 add
d6335a6a modify composer
0a5005d7 Update composer.json
289b416c modify composer.json
3b43a76f add
7031f620 add
f23e1b95 add
a5a34f7b add
50a4ecb2 modify composer.json
3095130d rename dir
33b8d19d rename dir
925b6030 modify composer.json
e024ec5f modify composer.json
9c2a9645 modify composer.json
9de52438 add
76441354 ini
0b5f540d Merge commit '2af22df3f662ae83da8178d9145ce3ac9b37a07e' as 'src/websocket-server'
2af22df3 Squashed 'src/websocket-server/' content from commit 981be27
7fad8f18 Merge commit '5322db46a1f3de349e74dd13f7f3685e637990d1' as 'src/tcp-server'
5322db46 Squashed 'src/tcp-server/' content from commit 9f3d468
fa6b3d5c Merge commit '7623eca1a7829e3e679693d6548d522410990a01' as 'src/stdlib'
7623eca1 Squashed 'src/stdlib/' content from commit 7193950
98f1f4ea Merge commit '4dba5b3223242d70e6b1d32ede72efa4aad5bb10' as 'src/server'
4dba5b32 Squashed 'src/server/' content from commit 7faf071
71e8b64c Merge commit 'cba061f6a2d4bcf6a793ce40af0e398081eccfe6' as 'src/log'
cba061f6 Squashed 'src/log/' content from commit 56a7504
7f3540b3 Merge commit 'ba1d02f489b1ecb7e920b38c97cc8d42fbdc3b97' as 'src/http-server'
ba1d02f4 Squashed 'src/http-server/' content from commit e85cc46
f0419f86 Merge commit '5421c8f1898bb48ebc46088c0865df5fa546e1c3' as 'src/http-mesage'
5421c8f1 Squashed 'src/http-mesage/' content from commit a27591a
57282fab Merge commit '12b70993d51c8c145d16e31921b1f9459e422b64' as 'src/framework'
12b70993 Squashed 'src/framework/' content from commit 5300224
13fb564b Merge commit 'a707d12bb4ccffda4b4600cb9369137efb52aa91' as 'src/event'
a707d12b Squashed 'src/event/' content from commit 8dc166b
aca2a5b9 Merge commit 'dffdcb88152ab11054189642ffb0258a6bc0d959' as 'src/config'
dffdcb88 Squashed 'src/config/' content from commit 21efb5c
1b2878aa Merge commit '5cdb5448c65c92f990f98d5de3e8a38eecfeaf7c' as 'src/bean'
5cdb5448 Squashed 'src/bean/' content from commit 67be2c5
b3143ec9 Merge commit '23575b0c15649b93f57c8a84f3d89713d920f134' as 'src/aop'
23575b0c Squashed 'src/aop/' content from commit fd2ac16
6a248b70 Merge commit '33d183abc04d5f47ad6da5be63d2c54236439086' as 'src/annottion'
33d183ab Squashed 'src/annottion/' content from commit fe4aeda
47741a2c remove 1.x files
312ceeb4 init
8ab5b00a feat: Disregister the service with consul when server stop (#162)
bcd3f5a1 Merge commit '9b5c5f9873539a9803a16c27ee281d230ff0ba53'
9b5c5f98 Squashed 'src/framework/' changes from b3a45be..f9910dc
301d6588 修复连接池的连接归还问题,完善连接归还检查避免重复回池
57379ca2 修复连接池连接释放,对应空闲时间使用错误问题 (https://github.com/swoft-cloud/swoft-component/pull/274)
32ec137b 完善ws onClose数据清理 (#273)
fa75eaac Update package.json (#272)
1591e93a optimize(websocket-server): Fixed "undefined index: websocket status" when sending broadcasts (#269)
8cb3be8b 修复错别字 (#268)
aaec01b0 fix: Clear RequestContext (#267)
d43e161c 事务异常场景下无法在commit/rollback事务前将查询模式设为非defer (#266)
ffb68822 some update (#265)
b0e62516 使用swoole_process::kill 代替posix_kill (#264)
1718aeab Update RequestMapping.php
9519bfaa feat: Added Redis HyperLogLog (https://github.com/swoft-cloud/swoft-component/pull/226)
96ba4621 fix: Fixed unit test (https://github.com/swoft-cloud/swoft-component/pull/227)
60f77585 Merge branch 'master' of github.com:swoft-cloud/swoft-component
3d07ee96 fix: Fixed REDIS_DB is not effected when redis reconnected. (#242)
3578f4a0 fix: Fixed rpc client log message for exception (#241)
94121526 optimize: Optimize Server Request initialization. (https://github.com/swoft-cloud/swoft-component/pull/240)
41553ce5 fix http-client Exception (#238)
51480977 fix: Fixed after the server is restarted, the client fails to receive the package. (https://github.com/swoft-cloud/swoft-component/pull/237)
24acf224 FIxed BUG for incorrect result of Redis::HMget and Redis::HGetAll. (#239)
31482f06 Fixed Session Unit (#235)
99e285ba fix scope usage error (#236)
d3171225 fix: Fixed Session is accidentally replaced by the next request. (#234)
57c88478 修复 zRem 前缀问题 (https://github.com/swoft-cloud/swoft-component/pull/232)
0ff126ce feat: Added exclusive lock and shared lock (https://github.com/swoft-cloud/swoft-component/pull/225)
090a151b fix: Fix Auth token cache time (https://github.com/swoft-cloud/swoft-component/pull/223)
834b93df fix: Temporary fix the data confusion in SessionMiddleware (https://github.com/swoft-cloud/swoft-component/pull/229)
94d01ddd Update Aop.php (#222)
32a7d906 Merge branch 'master' of github.com:swoft-cloud/swoft-component
763e398d Merge branch 'master' of github.com:swoft-cloud/swoft-component
9ea42ab0 修复Number验证器最大和最小的template没有生效的问题 (#218)
fc376266 Merge branch 'master' of github.com:swoft-cloud/swoft-component
d448412e fix: db entity to array lost null value column (#217)
f25129f8 fix: pexpire words is error
a56eebae Merge branch 'master' of github.com:swoft-cloud/swoft-component
55feb0e1 fix: Patch for #207, fixed error syntax that due to conflicts merged (https://github.com/swoft-cloud/swoft-component/pull/216)
f7054b70 Merge branch 'master' of github.com:swoft-cloud/swoft-component
ff21ce81 [fixed]can't use function in DB (https://github.com/swoft-cloud/swoft-component/pull/207)
90a60fe5 Merge branch 'master' of github.com:swoft-cloud/swoft-component
974c7e1c add: Added support of QueryBuilder column alias (https://github.com/swoft-cloud/swoft-component/pull/209)
4f0e4d9c Merge branch 'master' of github.com:swoft-cloud/swoft-component
70bc5794 fix: Fixed environment check failed in Swoole 4 (https://github.com/swoft-cloud/swoft-component/pull/215)
94133d7c Fix typos. (#214)
0131dfe1 Merge branch 'master' of github.com:swoft-cloud/swoft-component
07cfc508 feat: Added strict mode and fetch mode for Mysql client (https://github.com/swoft-cloud/swoft-component/pull/208)
f398e066 Squashed 'src/framework/' changes from ba1657b..b3a45be
9ee4ea92 Merge commit 'f398e066ffb5ce8840492c04277d3eb54f8364cd'
4add043b Merge commit '41c921e5a291d5c2566add3d34bca088aef3bf98'
41c921e5 Squashed 'src/auth/' changes from c9bc878..c0f55c2
2b4d1cf5 Merge commit '6e39bf8ee68afc076ef14ee31173190b24e51b98'
6e39bf8e Squashed 'src/queue/' changes from a6dc836..92a47f4
5722bcb3 Merge commit 'bb2127d6efbbe1f7c1d856d4dd64b983651df67e'
bb2127d6 Squashed 'src/trace/' changes from 88604f6..373301c
8cb9bc07 Merge commit '9f1dee575dfd820ccc097d323cf86f226feeb668'
9f1dee57 Squashed 'src/cache/' changes from a982405..2bb4b56
3294309f Merge commit '3726fe409a8460da92a00acf46a0d628244f541f'
3726fe40 Squashed 'src/console/' changes from 1f3d3cc..d7153f5
bf7da0aa Merge commit 'b506b712c28d690a524022239109640553e736c3'
b506b712 Squashed 'src/db/' changes from c51130a..a61928c
433b5b4a Merge commit '8585c0070cfb3dc7de74655a978dd843b4f449f3'
8585c007 Squashed 'src/devtool/' changes from f6983dc..54b7afe
dfd478ef Merge commit '3957effdda95a3f21c6e39ff2dbf2a6a5878a7a2'
3957effd Squashed 'src/http-message/' changes from 71f8a40..218abf7
7698db0f Merge commit '7de8f7c238b48a343f8952de8c02cbad0ace41fd'
7de8f7c2 Squashed 'src/http-client/' changes from 0746832..afe514c
de90efc9 Merge commit '0c8e5f0adbaac934f32727d234cf6ee75356b1ff'
0c8e5f0a Squashed 'src/i18n/' changes from 3081cf1..bf58b9d
5c58c74e Merge commit 'e9a229b130f449a4994a58048eb2be3772df8317'
e9a229b1 Squashed 'src/memory/' changes from e0cc9d3..3bca6f7
2ce634eb Merge commit '0521932aab225d5f61c1cc5a9eefde3ec0f3316e'
0521932a Squashed 'src/redis/' changes from d0f9102..61469f2
11dbad7d Merge commit 'e1852b7015b9c4c499322081ba7e244374965ef4'
e1852b70 Squashed 'src/rpc/' changes from c017bf5..e782bc1
b4ac1200 Merge commit 'e040deb39327b7738530aac7f9cb304bbf157cb0'
e040deb3 Squashed 'src/rpc-client/' changes from e1aee2a..0db27e7
78b246ad Merge commit 'f3c57fb4099279b17cc9552a1470ae316b249a2b'
f3c57fb4 Squashed 'src/rpc-server/' changes from 5622a9c..525b92e
7fd90aa6 Merge commit '498b2c8afc98e24cab8cec53503450e481ea5e90'
498b2c8a Squashed 'src/service-governance/' changes from 1e07a62..cd995fb
81882800 Merge commit '0b26c2d6c5c774ce30c33ed9ed1723105981df1a'
0b26c2d6 Squashed 'src/session/' changes from e2bc8e6..be17b6c
000a6c0e Merge commit 'bf0a7438d3544ea9f93be06f668c95d83c1a4837'
bf0a7438 Squashed 'src/task/' changes from e9d76eb..0062cd5
df5315ea Merge commit '27d4bbd30d4ec97cf911567a838a5ae2bdd031c5'
27d4bbd3 Squashed 'src/websocket-server/' changes from d614189..a463143
183773ba Squashed 'src/http-client/' changes from 6b5291d..0746832
fcda0739 Merge commit '183773ba628fc6e199bf7a91376d8915a2f5bcc9'
107a03cb docs: Fix typo (https://github.com/swoft-cloud/swoft-component/pull/213)
4f711a68 docs: Update README.md (https://github.com/swoft-cloud/swoft-component/pull/212)
22e25245 fix https://github.com/swoft-cloud/swoft-component/pull/82 (#206)
be39ddc5 把首部的 case 全部移至 default 上面并使用同一部分代码
22eb58a4 Merge branch 'master' of github.com:swoft-cloud/swoft-component
d7a44f3d Fix auth travis ci (https://github.com/swoft-cloud/swoft-component/pull/205)
68b55987 Merge branch 'master' of github.com:swoft-cloud/swoft-component
aa8f9601 修改更新和新增时,表名是Mysql关键字会报错的BUG (https://github.com/swoft-cloud/swoft-component/pull/204)
a79ee5d7 Fix 找不到$client的BUG (https://github.com/swoft-cloud/swoft-component/pull/199)
b7e22554 t push origin masterMerge branch 'aprchen-master'
c5fbd67c Revert ./composer.json and remove useless comment and fix code style
65c282b6 Merge branch 'master' of https://github.com/aprchen/swoft-component into aprchen-master
bbdc7577 查询条件修改QueryBuilder的andCondition方法,新增switch的default方法,支持更多的查询条件
945486b4 Merge branch 'master' of github.com:swoft-cloud/swoft-component
46bf2f3f Fix Travis Ci (https://github.com/swoft-cloud/swoft-component/pull/201)
1aea6253 Merge branch 'master' of github.com:swoft-cloud/swoft-component
3c1de37f Fixed https://github.com/swoft-cloud/swoft/issues/293 and clean codes, also remove `App\Task\Task::run2()` method. (https://github.com/swoft-cloud/swoft-component/pull/192)
26be82aa 表模型中存在下划线的字段名时,使用 Swoft\Helper\StringHelper::camel() 转换 (https://github.com/swoft-cloud/swoft-component/pull/191)
a03aab89 Merge branch 'master' of github.com:swoft-cloud/swoft-component
cfa08edd Features/db bug (https://github.com/swoft-cloud/swoft-component/pull/200)
d24424ce Merge branch 'master' of https://github.com/aprchen/swoft-component
993d5c79 remove test
3bc11026 Merge branch 'master' into master
8676b8d1 Merge branch 'master' of https://github.com/aprchen/swoft-component
e9a4f09a cs-fix
1e6fb27e Update composer.json
40ef80d7 fix session get getExtendedData and add manager test,enable redis
fdaaeadb fix session get getExtendedData
9a215bc9 Merge commit '840c80eec88d5fcd9680593cfaf27b60c369b415'
840c80ee Squashed 'src/auth/' changes from c9bc8780..5aba2468
168b76c0 Merge branch 'master' of github.com:swoft-cloud/swoft-component
453ba307 Fixed cache key repetition (https://github.com/swoft-cloud/swoft-component/pull/197)
45c2a73b fix cache key repeat
20a9b6cd Merge commit '813e62c19cf4f3e7f93424072caee3e69ed33336'
813e62c1 Squashed 'src/console/' changes from 1f3d3cc8..d906edb9
218fee77 Merge branch 'master' of github.com:swoft-cloud/swoft-component
898a6be3 fix error on trigger event handler (https://github.com/swoft-cloud/swoft-component/pull/196)
2402c4fe fix a bug when warnings appear in the high version of swoole (https://github.com/swoft-cloud/swoft-component/pull/195)
92d2bea0 使用StringHelper::ucfirst 代替 ucfirst,解决中文乱码的BUG (https://github.com/swoft-cloud/swoft-component/pull/194)
87cfcfc8 Merge commit '4e0001669fd6921a9eae6d0aa63edeea01b39851'
4e000166 Squashed 'src/rpc-server/' changes from 5622a9ca..525b92ec
cb027972 Merge commit '88481c8f50cccc6de6b8309d0daa4498c1240947'
88481c8f Squashed 'src/session/' changes from e2bc8e6b..be17b6c9
6d678314 Merge commit '2f06f8fb669be083625740f19715650c3467da4f'
2f06f8fb Squashed 'src/task/' changes from e9d76eb8..548e9972
ac78133e Merge commit '45b368890cefb1bb08c98c26d0153b88c630a896'
45b36889 Squashed 'src/view/' changes from e28044b4..befcc931
2bbc954e fix: ws server push method param is error (https://github.com/swoft-cloud/swoft-component/pull/186)
341fc595 Fix Travis Ci (https://github.com/swoft-cloud/swoft-component/pull/190)
e060bcd1 Soloved Conflict
29ae5703 Squashed 'src/service-governance/' changes from 9608c9bc..1e07a62d
31416e16 Merge branch 'master' of github.com:swoft-cloud/swoft-component
827131fe DbConnection::check时,验证闲置时间是否超过最大值 (https://github.com/swoft-cloud/swoft-component/pull/189)
9c65c85f 修改timeout为float,增加协程Redis timeout配置 (https://github.com/swoft-cloud/swoft-component/pull/188)
5db82673 修改consul注入失败,也会显示成功的BUG (https://github.com/swoft-cloud/swoft-component/pull/187)
a19538c8 Update Request.php (https://github.com/swoft-cloud/swoft-component/pull/184)
b9f533f4 QueryBuilder根据Entity注解参数主动切换数据库 (https://github.com/swoft-cloud/swoft-component/pull/164)
a3941ad1 Merge branch 'master' of github.com:swoft-cloud/swoft-component
b3f43f82 Fix Http Client Travis Failed (https://github.com/swoft-cloud/swoft-component/pull/183)
69d1a819 Merge branch 'master' of github.com:swoft-cloud/swoft-component
0568d8cb Fix https://github.com/swoft-cloud/swoft/issues/301 (https://github.com/swoft-cloud/swoft-component/pull/182)
8c3c2d6f Merge branch 'master' of github.com:swoft-cloud/swoft-component
9178de1c 自定义组件支持别名配置 (https://github.com/swoft-cloud/swoft-component/pull/181)
b3f49f56 Squashed 'src/http-client/' changes from aec7d3b5..6b5291db
45d15c84 Merge commit 'b3f49f56b3f1ac8502657125de12bd210275bdab'
fc58cc76 Merge branch 'master' of github.com:swoft-cloud/swoft-component
…
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