finish user controller and unit test
Merge branch '1119-1'