Merge pull request #4 from cnnic/master

update code
code compare init
Merge pull request #7 from xiaobaicoding/master

update UI for function 3
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
random untest
Merge branch 'master' into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
Merge branch 'master' of https://github.com/cnnic/niot

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/src/cn/niot/controller/RecoAction.java
random streetcode and EAN-13 update
Merge pull request #6 from cnnic/master

update code
update RuleFuncTest file

update RuleFuncTest file
update Back-end program

class file NewIDstdCollisionDetect, IDstrRecognition,
IoTNewRuleRecognitionAction and IoTIDRecognitionAction are updated!
Merge branch 'master' of https://github.com/dgq2010/niot into dgq2010-master

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/RecoAction.class
	source/niot/WebRoot/WEB-INF/classes/cn/niot/service/CompareCode13.class
	source/niot/src/cn/niot/controller/RecoAction.java
fix ean bug
Merge branch 'xiaobaicoding-master'

Conflicts:
	source/niot/WebRoot/WEB-INF/classes/cn/niot/controller/IoTNewRuleRecognitionAction.class
	source/niot/src/cn/niot/controller/IoTNewRuleRecognitionAction.java
Merge pull request #7 from cnnic/master

update code
update code

update code