[Waterstrong] update gitignore, add gradle, update utest, use singleton