#login:[zhang] optimize code