issues45、issues42、issues40修复