Merge branch 'branch_other'

# Conflicts:
#	pom.xml
#	src/main/java/cn/com/qmth/examcloud/ws/api/provider/WsCloudServiceProvider.java
#	src/main/java/cn/com/qmth/examcloud/ws/handler/TestHandler2.java
#	src/main/java/cn/com/qmth/examcloud/ws/handler/TestHandler3.java
#	src/main/java/cn/com/qmth/examcloud/ws/handler/bean/TestBean.java
#	src/main/resources/application.properties
#	src/main/resources/log4j2.xml