事件订阅框架完善...
Merge remote-tracking branch 'origin/master'