#2094 优化代码

Merged
lewis merged 2 commits from fix-ssh into V20220519 2 years ago