modify client
Merge branch 'cal' of 10.107.14.50:/root/VMThunder into cal
solve conflic
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge 10.107.14.50:/root/VMThunder
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
Merge branch 'lzy' into cal
clean code
Merge branch 'lzy' into cal
change return value
solve conflic
fix bugs