Merge branch 'testSecure'
Fix API
clean payment acception logic
fix some bug
fix