# Conflicts:
#	pom.xml
#	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
#	src/main/java/com/cx/cn/cxquartz/job/WebSocket.java
#	src/main/resources/file.properties