broker service refactor
merge
Merge pull request #594 from jialinsun/master

broker-service refactor
review the code
merge