完善一些架构修整中----------------------------------------------------------------------------------------------------------------