diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
index a64908a27ef6eb734a074e6e74596135c5592079..a7881640b30f3c06e71f1de765fe6e51ac647849 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatCollectionController.java
@@ -3,12 +3,16 @@ package com.linkwechat.web.controller.wecom;
 import com.linkwechat.common.annotation.Log;
 import com.linkwechat.common.core.controller.BaseController;
 import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.page.TableDataInfo;
 import com.linkwechat.common.enums.BusinessType;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import com.linkwechat.wecom.service.IWeChatCollectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 聊天工具 侧边栏栏 素材收藏
  *
@@ -28,8 +32,8 @@ public class WeChatCollectionController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('chat:collection:add')")
     @Log(title = "添加收藏", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult addCollection(@RequestParam(value = "materialId") Long materialId, @RequestParam(value = "userId") Long userId) {
+    @PutMapping("addCollection")
+    public AjaxResult addCollection(@RequestParam(value = "materialId") Long materialId,@RequestParam(value = "userId") Long userId) {
         return toAjax(weChatCollectionService.addCollection(materialId, userId));
     }
 
@@ -39,9 +43,20 @@ public class WeChatCollectionController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('chat:collection:delete')")
     @Log(title = "取消收藏", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult cancleCollection(@RequestParam(value = "materialId") Long materialId, @RequestParam(value = "userId") Long userId) {
+    @PostMapping(value = "cancleCollection")
+    public AjaxResult cancleCollection(@RequestParam(value = "materialId") Long materialId,@RequestParam(value = "userId") Long userId) {
         return toAjax(weChatCollectionService.cancleCollection(materialId, userId));
     }
 
+    /**
+     * 收藏列表
+     */
+    @PreAuthorize("@ss.hasPermi('chat:collection:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestParam(value = "userId") Long userId) {
+        startPage();
+        List<WeChatSideVo> collections = weChatCollectionService.collections(userId);
+        return getDataTable(collections);
+    }
+
 }
diff --git a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java
index 42e20cad0e1fbfe0b29bf4e5b56c43bbdbc14a6a..16054e37e3519d3a81dcf2986a583bd6883e6385 100644
--- a/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java
+++ b/linkwe-admin/src/main/java/com/linkwechat/web/controller/wecom/WeChatItemController.java
@@ -3,15 +3,16 @@ package com.linkwechat.web.controller.wecom;
 import com.linkwechat.common.annotation.Log;
 import com.linkwechat.common.core.controller.BaseController;
 import com.linkwechat.common.core.domain.AjaxResult;
+import com.linkwechat.common.core.page.TableDataInfo;
 import com.linkwechat.common.enums.BusinessType;
 import com.linkwechat.wecom.domain.dto.WeChatItemDto;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import com.linkwechat.wecom.service.IWeChatItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 聊天工具侧边栏
@@ -35,6 +36,15 @@ public class WeChatItemController extends BaseController {
         return toAjax(weChatItemService.checkItems(chatItemDto));
     }
 
-
+    /**
+     * h5素材列表
+     */
+    @PreAuthorize("@ss.hasPermi('chat:item:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(@RequestParam(value = "sideId") Long sideId) {
+        startPage();
+        List<WeChatSideVo> weChatSideVos = weChatItemService.chatItems(sideId);
+        return getDataTable(weChatSideVos);
+    }
 
 }
diff --git a/linkwe-admin/src/main/resources/application.yml b/linkwe-admin/src/main/resources/application.yml
index 9c842fdad58bfa7dd50912b4930573bd8d3803ff..0c39c8f24e6e753ec8fd290682b2a7cfe7aab266 100644
--- a/linkwe-admin/src/main/resources/application.yml
+++ b/linkwe-admin/src/main/resources/application.yml
@@ -178,6 +178,8 @@ wecome:
           - /externalcontact/get_unassigned_list
           - /externalcontact/send_welcome_msg
           - /externalcontact/unionid_to_external_userid
+          - /externalcontact/add_msg_template
+          - /externalcontact/get_group_msg_result
           - /get_jsapi_ticket
           - /ticket/get
   fileUplodUrl:  /media/upload,/media/uploadimg
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java
index 40d91172906e3325609cc48208260a84b4749449..650ffedbe0f4682d0bb2765d32f3c6e53645da98 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/WeChatSide.java
@@ -18,7 +18,7 @@ public class WeChatSide extends BaseEntity {
     /**
      *  0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本 5 海报
      */
-    private Long mediaType;
+    private String mediaType;
 
     /**
      * 聊天工具栏名称
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..db4891d521f6907782503c393b1258920a1735a2
--- /dev/null
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/domain/vo/WeChatSideVo.java
@@ -0,0 +1,37 @@
+package com.linkwechat.wecom.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 聊天侧边栏
+ * @author kewen
+ */
+@Data
+public class WeChatSideVo {
+
+    /**
+     *  0 图片（image）、1 语音（voice）、2 视频（video），3 普通文件(file) 4 文本 5 海报
+     */
+    private String mediaType;
+
+    /**
+     * 素材id
+     */
+    private Long materialId;
+
+    /**
+     * 本地资源文件地址
+     */
+    private String materialUrl;
+
+    /**
+     * 文本内容、图片文案
+     */
+    private String content;
+
+    /**
+     * 图片名称
+     */
+    private String materialName;
+
+}
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java
index 9f874c969bc923c81f06964d2ed3fc302e7308a0..fb4e913257c89995f4935ed36f5b695171cb6e48 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatCollectionMapper.java
@@ -2,8 +2,11 @@ package com.linkwechat.wecom.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.linkwechat.wecom.domain.WeChatCollection;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 聊天工具 侧边栏栏 素材收藏
  *
@@ -37,4 +40,12 @@ public interface WeChatCollectionMapper extends BaseMapper<WeChatCollection> {
      */
     public int countCollectionByMaterialIdAndUserId(@Param("materialId") Long materialId,@Param("userId") Long userId);
 
+    /**
+     * 收藏列表
+     *
+     * @param userId 用户id
+     * @return {@link WeChatSideVo}s
+     */
+    public List<WeChatSideVo> findCollections(Long userId);
+
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java
index d49f1dc34dd43d6d9a4da7fd74b25b462309c2e4..992b9a47258979a5cf9ea634cb841d247e5bb0e8 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatItemMapper.java
@@ -3,6 +3,7 @@ package com.linkwechat.wecom.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.linkwechat.wecom.domain.WeChatItem;
 import com.linkwechat.wecom.domain.dto.WeChatItemDto;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -27,4 +28,12 @@ public interface WeChatItemMapper extends BaseMapper<WeChatItem> {
      */
     public int dropItem(@Param("sideId") Long sideId);
 
+
+    /**
+     * h5素材列表
+     *
+     * @param sideId 侧边栏id
+     * @return
+     */
+    public List<WeChatSideVo> findChatItems(@Param("sideId") Long sideId);
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
index 73f895ee1c8c12c4cb8c7d7f061b86244eecda4c..3439594aa89a93dd6cc512e82fda66e9b1eb8c33 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/mapper/WeChatSideMapper.java
@@ -2,6 +2,8 @@ package com.linkwechat.wecom.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.linkwechat.wecom.domain.WeChatSide;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -27,4 +29,6 @@ public interface WeChatSideMapper extends BaseMapper<WeChatSide> {
      */
     public int updateWeChatSideById(WeChatSide weChatSide);
 
+
+
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
index c4add8356d94b86f5726778af5c4afcd45358727..2fa4c0bb6ffa5448d95ff9137ef53b7851b22dc3 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatCollectionService.java
@@ -2,6 +2,9 @@ package com.linkwechat.wecom.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.linkwechat.wecom.domain.WeChatCollection;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
+
+import java.util.List;
 
 /**
  * 聊天工具 侧边栏栏 素材收藏
@@ -28,4 +31,12 @@ public interface IWeChatCollectionService extends IService<WeChatCollection> {
      */
     public int cancleCollection( Long materialId, Long userId);
 
+    /**
+     * 收藏列表
+     *
+     * @param userId 用户id
+     * @return {@link WeChatSideVo}s
+     */
+    public List<WeChatSideVo> collections(Long userId);
+
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java
index a6e1521cc9fb2e4e4163a53a3466e3e264fea213..38f50de5dbba9e94d4a31abe642516fa10f9dbe4 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/IWeChatItemService.java
@@ -3,6 +3,9 @@ package com.linkwechat.wecom.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.linkwechat.wecom.domain.WeChatItem;
 import com.linkwechat.wecom.domain.dto.WeChatItemDto;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
+
+import java.util.List;
 
 /**
  * 聊天工具侧边栏
@@ -18,4 +21,12 @@ public interface IWeChatItemService extends IService<WeChatItem> {
      */
     public int checkItems(WeChatItemDto chatItemDto);
 
+    /**
+     * h5素材列表
+     *
+     * @param sideId 侧边栏id
+     * @return
+     */
+    public List<WeChatSideVo> chatItems(Long sideId);
+
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
index ea80055f0becf7ca9931eca45d993a680128b69b..c97d3c0a759e29c94a9664c8f7749e0880108d78 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatCollectionServiceImpl.java
@@ -3,11 +3,14 @@ package com.linkwechat.wecom.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.linkwechat.common.utils.SnowFlakeUtil;
 import com.linkwechat.wecom.domain.WeChatCollection;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import com.linkwechat.wecom.mapper.WeChatCollectionMapper;
 import com.linkwechat.wecom.service.IWeChatCollectionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 聊天工具 侧边栏栏 素材收藏
  *
@@ -34,4 +37,9 @@ public class WeChatCollectionServiceImpl extends ServiceImpl<WeChatCollectionMap
         return weChatCollectionMapper.dropCollection(materialId,userId);
     }
 
+    @Override
+    public List<WeChatSideVo> collections(Long userId) {
+        return weChatCollectionMapper.findCollections(userId);
+    }
+
 }
diff --git a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java
index 364277e3f868b7ef5d568db5cda7339fcb184388..3540a64a6e598c6585c2d9a5aed54f8aa4cf577f 100644
--- a/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java
+++ b/linkwe-wecom/src/main/java/com/linkwechat/wecom/service/impl/WeChatItemServiceImpl.java
@@ -6,6 +6,7 @@ import com.linkwechat.wecom.domain.WeChatItem;
 import com.linkwechat.wecom.domain.WeChatSide;
 import com.linkwechat.wecom.domain.WeMaterial;
 import com.linkwechat.wecom.domain.dto.WeChatItemDto;
+import com.linkwechat.wecom.domain.vo.WeChatSideVo;
 import com.linkwechat.wecom.mapper.WeChatItemMapper;
 import com.linkwechat.wecom.mapper.WeChatSideMapper;
 import com.linkwechat.wecom.service.IWeChatItemService;
@@ -94,6 +95,11 @@ public class WeChatItemServiceImpl extends ServiceImpl<WeChatItemMapper, WeChatI
         return 1;
     }
 
+    @Override
+    public List<WeChatSideVo> chatItems(Long sideId) {
+        return weChatItemMapper.findChatItems(sideId);
+    }
+
     /**
      * 更新该次选择的素材数
      *
diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml
index 229c29169e45f5c01e7e839673cfdfee739d60fd..4f2439ce56ddd003cc8f40ba9076b494d0f291a0 100644
--- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml
+++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatCollectionMapper.xml
@@ -23,5 +23,20 @@
             material_id=#{materialId} AND user_id=#{userId}
         </where>
     </select>
+    <select id="findCollections" resultType="com.linkwechat.wecom.domain.vo.WeChatSideVo">
+        SELECT
+            wcc.material_id,
+            wm.material_name,
+            wm.material_url,
+            wm.content,
+            wc.media_type
+        FROM
+            we_chat_collection wcc
+                LEFT JOIN we_material wm ON wcc.material_id = wm.id
+                LEFT JOIN we_category wc ON wm.category_id = wc.id
+       <where>
+           wcc.user_id=#{userId}
+       </where>
+    </select>
 
 </mapper>
\ No newline at end of file
diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml
index 2d87333813c7638124135cd545d45fd5b09796ec..d7376236abde847528695c102a9d080d19361122 100644
--- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml
+++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatItemMapper.xml
@@ -20,4 +20,20 @@
              side_id=#{sideId}
          </where>
     </delete>
+
+    <select id="findChatItems" resultType="com.linkwechat.wecom.domain.vo.WeChatSideVo">
+        SELECT
+        wci.material_id,
+        wm.material_name,
+        wm.material_url,
+        wm.content,
+        wc.media_type
+        FROM
+        we_chat_item wci
+        LEFT JOIN we_material wm ON wci.material_id = wm.id
+        LEFT JOIN we_category wc ON wm.category_id = wc.id
+        <where>
+            wci.side_id=#{sideId}
+        </where>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
index b2a1e0b0a5da712002e456a42cb9416da88678cf..ce8f9e164c8f08119daf452224a97111aeddc732 100644
--- a/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
+++ b/linkwe-wecom/src/main/resources/mapper/wecom/WeChatSideMapper.xml
@@ -34,4 +34,5 @@
             `using`=0
         </where>
     </select>
+
 </mapper>
\ No newline at end of file