diff --git a/pom.xml b/pom.xml
index d8d6385..48fa0be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -375,7 +375,7 @@
     <dependency>
       <groupId>com.alibaba</groupId>
       <artifactId>druid</artifactId>
-      <version>1.1.9</version>
+      <version>1.1.21</version>
     </dependency>
     <!-- shiro spring 整合 ，作用：权限管理 -->
     <!-- shiro 核心架包 -->
diff --git a/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java b/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
index c7949fc..6176995 100755
--- a/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
+++ b/src/main/java/com/lq/cms/web/wechat/WechatRuleController.java
@@ -10,7 +10,6 @@ import com.lq.code.entity.AjaxResult;
 import com.lq.code.util.StringUtil;
 import com.lq.entity.WechatInfo;
 import com.lq.entity.WechatKeyword;
-import com.lq.entity.WechatMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -74,6 +73,29 @@ public class WechatRuleController {
         return ajaxResult;
     }
 
+    /**
+     * 更新回复规则
+     * @param vo
+     * @param keywordListStr
+     * @param messageListStr
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/update")
+    public AjaxResult update(WechatRuleVo vo,String keywordListStr,String messageListStr){
+        if (StringUtil.isNotNull(keywordListStr)) {
+            List<WechatKeyword> wechatKeywordList = JSON.parseArray(keywordListStr, WechatKeyword.class);
+            vo.setWechatKeywordList(wechatKeywordList);
+        }
+        if (StringUtil.isNotNull(messageListStr)){
+            List<Long> messageIds = JSON.parseArray(messageListStr, Long.class);
+            vo.setMessageIds(messageIds);
+        }
+        wechatRuleService.updateRule(vo);
+
+        return AjaxResult.getSuccessInstance();
+    }
+
     @ResponseBody
     @RequestMapping("/delete")
     public AjaxResult delete(Long id){
diff --git a/src/main/java/com/lq/dao/WechatKeywordDao.java b/src/main/java/com/lq/dao/WechatKeywordDao.java
index e2c6d60..b5f13b5 100644
--- a/src/main/java/com/lq/dao/WechatKeywordDao.java
+++ b/src/main/java/com/lq/dao/WechatKeywordDao.java
@@ -16,4 +16,9 @@ public interface WechatKeywordDao extends BaseDao<WechatKeyword>{
     List<WechatKeyword> findByWechatRuleIdAndStatus(@Param("wechatRuleId") Long wehcatRuleId,@Param("status") Integer status);
 
     List<WechatKeyword> findBykeywordAndWechatInfoId(@Param("keyword")String keyword,@Param("wechatInfoId")Long wechatInfoId);
+
+    WechatKeyword getByWechatRuleIdAndKeyWord(@Param("wechatRuleId")Long wechatRuleId,@Param("keyword")String keyword);
+
+    void deleteByWechatRuleId(@Param("wechatRuleId")Long wechatRuleId);
+
 }
diff --git a/src/main/java/com/lq/dao/WechatMessageDao.java b/src/main/java/com/lq/dao/WechatMessageDao.java
index df491b3..e911d67 100755
--- a/src/main/java/com/lq/dao/WechatMessageDao.java
+++ b/src/main/java/com/lq/dao/WechatMessageDao.java
@@ -3,10 +3,13 @@ package com.lq.dao;
 import com.lq.cms.dao.AdminBaseDao;
 import com.lq.cms.vo.WechatMessageVo;
 import com.lq.entity.WechatMessage;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface WechatMessageDao extends AdminBaseDao<WechatMessage,WechatMessageVo> {
 
     List<WechatMessage> findAllByWechatMessageVo(WechatMessageVo wechatMessageVo);
+
+    WechatMessage findByRuleId(@Param("ruleId")Long ruleId);
 }
diff --git a/src/main/java/com/lq/wechat/util/accessToken/AccessTokenAdapter.java b/src/main/java/com/lq/wechat/util/accessToken/AccessTokenAdapter.java
index 900fae5..eb13c08 100755
--- a/src/main/java/com/lq/wechat/util/accessToken/AccessTokenAdapter.java
+++ b/src/main/java/com/lq/wechat/util/accessToken/AccessTokenAdapter.java
@@ -10,5 +10,10 @@ import com.lq.wechat.mode.AccessToken;
  */
 public interface AccessTokenAdapter {
 
+    /**
+     * 获取wehcatToken
+     * @param accessToken
+     * @return
+     */
     WechatAccessToken adapter(AccessToken accessToken);
 }
diff --git a/src/main/resources/mybatis/mapping/WechatKeywordDao.xml b/src/main/resources/mybatis/mapping/WechatKeywordDao.xml
index 77929a7..9e053fa 100644
--- a/src/main/resources/mybatis/mapping/WechatKeywordDao.xml
+++ b/src/main/resources/mybatis/mapping/WechatKeywordDao.xml
@@ -76,5 +76,20 @@
         ORDER BY create_time DESC
     </select>
 
+    <select id="getByWechatRuleIdAndKeyWord" resultType="WechatKeyword">
+        SELECT <include refid="column_list"/>
+          FROM wechat_keyword
+        WHERE
+          wechat_rule_id = #{wechatRuleId}
+        AND
+          keyword=#{keyword}
+    </select>
+
+    <delete id="deleteByWechatRuleId">
+        update wechat_keyword
+        set status = 0
+        where wechat_rule_id = #{wechatRuleId}
+    </delete>
+
     
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/mapping/WechatMessageDao.xml b/src/main/resources/mybatis/mapping/WechatMessageDao.xml
index 93840da..e962a41 100644
--- a/src/main/resources/mybatis/mapping/WechatMessageDao.xml
+++ b/src/main/resources/mybatis/mapping/WechatMessageDao.xml
@@ -89,5 +89,12 @@
 
     </select>
 
+    <select id="findByRuleId" resultType="WechatMessage">
+      select wm.* from wechat_message wm
+      left join wechat_rule_message wrm ON wm.id = wrm.wechat_message_id
+      where wrm.wechat_rule_id = #{ruleId}
+      LIMIT 1
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
index 8125f85..9f8ca6d 100755
--- a/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
+++ b/src/main/webapp/WEB-INF/views/jsp/cms/wechat/rule/index.jsp
@@ -155,6 +155,7 @@
 <script type="text/javascript" src="${ctx}/resources/plugins/layer/layer.js"></script>
 <script type="text/javascript" href="${ctx}/resources/cms/wechat/wechat.js"></script>
 <script type="text/javascript">
+    var postUrl = '${ctx}/cms/wechat/rule/save';
     var isCheck = ${wechatInfo.openReply==1};
     var addkeywordRowHtml = $("#keyword").html();
     var wechatInfoId = '${wechatInfo.id}';
@@ -238,6 +239,7 @@
             }
         });
         $("#button4").click(function(){
+            postUrl = '${ctx}/cms/wechat/rule/save';
             if(isCheck){
                 showContent(4);
             }
@@ -287,7 +289,7 @@
             data.wechatInfoId = wechatInfoId;
             $.ajax({
                 type:"post",
-                url:"${ctx}/cms/wechat/rule/save",
+                url:postUrl,
                 traditional:true,
                 data:data,
                 dataType:"json",
@@ -523,6 +525,7 @@
 
     function showeditRule(wechatRuleId) {
         clearEdit();
+        postUrl = '${ctx}/cms/wechat/rule/update'
         var data = new Object();
         data.wechatRuleId = wechatRuleId;
         $.ajax({