diff --git a/pom.xml b/pom.xml
index b917f3b..9adee3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
 			 <scope>test</scope>
 		 </dependency>
 
-
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
 			<artifactId>activemq-all</artifactId>
@@ -125,9 +124,15 @@
 	    </dependency>
 
 		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-			<version>1.2.56</version>
+		<groupId>com.alibaba</groupId>
+		<artifactId>fastjson</artifactId>
+		<version>1.2.56</version>
+	</dependency>
+
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-pool2</artifactId>
+			<version>2.6.2</version>
 		</dependency>
 
 	    <dependency>
diff --git a/src/main/java/com/ifish/socketNew/SomeServer.java b/src/main/java/com/ifish/socketNew/SomeServer.java
index a17e104..77aae23 100644
--- a/src/main/java/com/ifish/socketNew/SomeServer.java
+++ b/src/main/java/com/ifish/socketNew/SomeServer.java
@@ -1,44 +1,43 @@
 package com.ifish.socketNew;
 
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.ifish.entity.*;
+import com.ifish.entity.Device;
+import com.ifish.entity.DeviceUser;
+import com.ifish.entity.PushList;
+import com.ifish.entity.User;
 import com.ifish.entity.event.QueueEventBody;
 import com.ifish.entity.event.QueueEventEntity;
-import com.ifish.socketNew.model.receive.*;
-import org.apache.mina.core.buffer.IoBuffer;
-import org.apache.mina.core.session.IoSession;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
 import com.ifish.enums.BooleanEnum;
-import com.ifish.enums.NeteaseEnum;
 import com.ifish.enums.PushTypeEnum;
 import com.ifish.netease.NeteaseIM;
 import com.ifish.quartz.JobGroup;
 import com.ifish.quartz.ScheduleJob;
 import com.ifish.service.DeviceService;
 import com.ifish.service.UserService;
-import com.ifish.socketNew.model.send.OrderFunctionCode0;
-import com.ifish.socketNew.model.send.OrderFunctionCode1;
-import com.ifish.socketNew.model.send.OrderFunctionCode15;
-import com.ifish.socketNew.model.send.OrderFunctionCode16;
-import com.ifish.socketNew.model.send.OrderFunctionCode17;
-import com.ifish.socketNew.model.send.OrderFunctionCode5;
-import com.ifish.socketNew.model.send.OrderFunctionCode9;
+import com.ifish.socketNew.model.receive.BackFunctionCode0;
+import com.ifish.socketNew.model.receive.BackFunctionCode1;
+import com.ifish.socketNew.model.receive.BackFunctionCode8;
+import com.ifish.socketNew.model.receive.BackFunctionCodeHeater;
+import com.ifish.socketNew.model.send.*;
 import com.ifish.socketNew.util.OrderModel;
 import com.ifish.util.ByteUtil;
 import com.ifish.util.IfishUtil;
+import org.apache.mina.core.buffer.IoBuffer;
+import org.apache.mina.core.session.IoSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jms.core.JmsTemplate;
 
 import javax.jms.Destination;
 import javax.jms.Session;
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 
 /**
diff --git a/src/main/resources/application-context.xml b/src/main/resources/application-context.xml
index f4d8376..40b9d1a 100644
--- a/src/main/resources/application-context.xml
+++ b/src/main/resources/application-context.xml
@@ -79,20 +79,28 @@
 		</constructor-arg>
 	</bean>
 
-	<amq:connectionFactory id="amqConnectionFactory"
-						   brokerURL="${broker_url}"
-						   userName="${username}"
-						   password="${password}" />
-	<!-- 配置JMS连接工长 -->
-	<bean id="connectionFactory"
-		  class="org.springframework.jms.connection.CachingConnectionFactory">
-		<constructor-arg ref="amqConnectionFactory" />
-		<property name="sessionCacheSize" value="100" />
+	<bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory" >
+		<property name="brokerURL" value="${broker_url}" />
+		<property name="userName" value="${username}" />
+		<property name="password" value="${password}" />
 	</bean>
 
-    <bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
-        <property name="connectionFactory" ref="connectionFactory"/>
-    </bean>
+	<bean id="jmsFactory" class="org.apache.activemq.pool.PooledConnectionFactory"
+		  destroy-method="stop">
+		<property name="connectionFactory" ref="connectionFactory"/>
+		<property name="maxConnections" value="100"></property>
+	</bean>
+	<!--使用缓存可以提升效率-->
+	<bean id="cachingConnectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
+		<property name="targetConnectionFactory" ref="jmsFactory"/>
+		<property name="sessionCacheSize" value="1"/>
+	</bean>
+	<bean id="jmsTemplate" class="org.springframework.jms.core.JmsTemplate">
+		<property name="connectionFactory" ref="cachingConnectionFactory"/>
+		<property name="messageConverter">
+			<bean class="org.springframework.jms.support.converter.SimpleMessageConverter"/>
+		</property>
+	</bean>
 
 	<!-- 定义数据存储消息队列（Queue） -->
 	<bean id="ifish7DataQueueDestination" class="org.apache.activemq.command.ActiveMQQueue">
diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index 730b740..57b078a 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -1,10 +1,10 @@
 c3p0.driverClassName=com.mysql.jdbc.Driver
-c3p0.url=jdbc\:mysql\://localhost\:3306/myfishdb?characterEncoding\=UTF-8
-#c3p0.url=jdbc\:mysql\://139.196.24.156\:3306/myfishdb?characterEncoding\=UTF-8
-c3p0.username=ifish
-c3p0.password=ifish7pwd
-#c3p0.username=root
-#c3p0.password=ifish7mysql
+#c3p0.url=jdbc\:mysql\://localhost\:3306/myfishdb?characterEncoding\=UTF-8
+c3p0.url=jdbc\:mysql\://139.196.24.156\:3306/myfishdb?characterEncoding\=UTF-8
+#c3p0.username=ifish
+#c3p0.password=ifish7pwd
+c3p0.username=root
+c3p0.password=ifish7mysql
 #c3p0.username=root
 #c3p0.password=123456
 
diff --git a/src/main/resources/mq.properties b/src/main/resources/mq.properties
index 2409198..60d854c 100644
--- a/src/main/resources/mq.properties
+++ b/src/main/resources/mq.properties
@@ -1,5 +1,6 @@
-broker_url=tcp://localhost:61616
+broker_url=tcp://test.ifish7.com:61616
 username=admin
-password=admin
+#password=admin
+password=adminifish7
 queue_data_name=ifishDataMq
 queue_push_name=ifishPushMq
\ No newline at end of file
diff --git a/src/main/resources/property.properties b/src/main/resources/property.properties
index 117e57f..71f4f4d 100644
--- a/src/main/resources/property.properties
+++ b/src/main/resources/property.properties
@@ -1,8 +1,8 @@
 #\u672c\u5730
-#ifish.ip=192.168.31.83
+#ifish.ip=192.168.1.7
 #\u6d4b\u8bd5\u4e91
-#ifish.ip=139.196.24.156
+ifish.ip=139.196.24.156
 #\u6b63\u5f0f\u4e91
-ifish.ip=120.55.190.56
+#ifish.ip=120.55.190.56
 #\u670d\u52a1\u5668\u7aef\u53e3
 ifish.port=9955
\ No newline at end of file