Merge pull request #4 from cnnic/master

update code
Merge pull request #5 from cnnic/master

update code
update function generateRandomChar

update function generateRandomChar
Merge https://github.com/dgq2010/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/unitTest/RuleFuncTest.class
	source/niot/src/cn/unitTest/RuleFuncTest.java
update code

update code
Merge pull request #8 from dgq2010/master

update function generateRandomChar