update war and sql
Merge pull request #322 from forumbyr/master

update war and sql
Merge pull request #323 from cnnic/dev

Dev