add baseAction
fix dev branch
finish fix and merge dev
update index page first.
Merge branch 'dev' of github.com:hellojian123/MavenTest into lfj