fix #71
fix #138
Merge branch 'master' of https://github.com/hoyoji/HoYoJiMoney.git