Chsi http
Merge branch 'master' of https://github.com/wade0564/test.git

Conflicts:
	study_test/src/main/java/cn/edu/ustc/wade/db/JEtest.java