Revert "规范并完善watchers（术士）"

This reverts commit 25ab9013f43e0a547f133fb429ff5cffc970304d.