diff --git a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
index e0dff35..f3ccf34 100644
--- a/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
+++ b/src/main/java/com/sincere/wechatbusiness/controller/ChannelController.java
@@ -66,6 +66,22 @@ public class ChannelController {
         return result;
     }
 
+    @RequestMapping(value="GetAreaList",method = RequestMethod.POST)
+    @ApiOperation(value = "获取省市")
+    public BaseDto<List<Area>> GetAreaList(){
+        BaseDto<List<Area>> result=new BaseDto<>();
+        result.setData(channelService.getAreaList());
+        return result;
+    }
+
+    @RequestMapping(value = "GetTemplateList",method = RequestMethod.POST)
+    @ApiOperation(value = "获取模板库列表")
+    public BaseDto<List<Template>> GetTemplateList(){
+        BaseDto<List<Template>> result=new BaseDto<>();
+        result.setData(channelService.getTemplateList());
+        return result;
+    }
+
     @RequestMapping(value = "AddChannel",method = RequestMethod.POST)
     @ApiOperation(value = "新增渠道商")
     public BaseDto AddChannel(@RequestBody Channel channel){
@@ -79,6 +95,14 @@ public class ChannelController {
         return new BaseDto();
     }
 
+    @RequestMapping(value = "GetChannelProductList",method = RequestMethod.GET)
+    @ApiOperation(value = "获取渠道商代理商品列表")
+    public BaseDto<List<ChannelProduct>> GetChannelProductList(int id){
+        BaseDto<List<ChannelProduct>> result=new BaseDto<>();
+        result.setData(channelProductService.getList(id));
+        return result;
+    }
+
     @RequestMapping(value = "GetChannelDetail",method = RequestMethod.GET)
     @ApiOperation(value = "获取渠道商详情")
     public BaseDto<Channel> GetChannelDetail(int id){
@@ -240,7 +264,7 @@ public class ChannelController {
             }
             // 定义 BufferedReader输入流来读取URL的响应
             in = new BufferedReader(new InputStreamReader(
-                    connection.getInputStream()));
+                    connection.getInputStream(),"UTF-8"));
             String line;
             while ((line = in.readLine()) != null) {
                 result += line;
diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
index 3d4c54e..449379d 100644
--- a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
+++ b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java
@@ -1,6 +1,8 @@
 package com.sincere.wechatbusiness.mapper;
 
+import com.sincere.wechatbusiness.model.Area;
 import com.sincere.wechatbusiness.model.Channel;
+import com.sincere.wechatbusiness.model.Template;
 
 import java.util.List;
 
@@ -16,4 +18,12 @@ public interface ChannelMapper {
     int update(Channel channel);
 
     int deleteChannel(int id);
+
+    List<Area> getProvince();
+
+    List<Area> getCity(String areaCode);
+
+    List<Area> getArea(String areaCode);
+
+    List<Template> getTemplateList();
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/model/Area.java b/src/main/java/com/sincere/wechatbusiness/model/Area.java
new file mode 100644
index 0000000..e858ea2
--- /dev/null
+++ b/src/main/java/com/sincere/wechatbusiness/model/Area.java
@@ -0,0 +1,23 @@
+package com.sincere.wechatbusiness.model;
+
+import java.util.List;
+
+public class Area {
+    private String value;
+
+    private String label;
+
+    private List<Area> children;
+
+    public String getValue(){return value;}
+
+    public void setValue(String value){this.value=value;}
+
+    public String getLabel(){return label;}
+
+    public void setLabel(String label){this.label=label;}
+
+    public List<Area> getChildren(){return children;}
+
+    public void setChildren(List<Area> children){this.children=children;}
+}
diff --git a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
index 6dd7428..6345512 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/ChannelService.java
@@ -1,8 +1,12 @@
 package com.sincere.wechatbusiness.service;
 
+import com.sincere.wechatbusiness.model.Area;
 import com.sincere.wechatbusiness.model.Channel;
+import com.sincere.wechatbusiness.model.Template;
 import com.sincere.wechatbusiness.utils.Page;
 
+import java.util.List;
+
 public interface ChannelService {
     Page<Channel> getList(Channel channel, int page, int pageSize);
 
@@ -13,4 +17,8 @@ public interface ChannelService {
     int update(Channel channel);
 
     int deleteChannel(int id);
+
+    List<Area> getAreaList();
+
+    List<Template> getTemplateList();
 }
diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
index b807bf7..0f40f99 100644
--- a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
+++ b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java
@@ -2,7 +2,9 @@ package com.sincere.wechatbusiness.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.sincere.wechatbusiness.mapper.ChannelMapper;
+import com.sincere.wechatbusiness.model.Area;
 import com.sincere.wechatbusiness.model.Channel;
+import com.sincere.wechatbusiness.model.Template;
 import com.sincere.wechatbusiness.service.ChannelService;
 import com.sincere.wechatbusiness.utils.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,5 +42,23 @@ public class ChannelServiceImpl implements ChannelService {
 
     @Override
     public int deleteChannel(int id){return channelMapper.deleteChannel(id);}
+
+    @Override
+    public List<Area> getAreaList(){
+        List<Area> areaList=channelMapper.getProvince();
+        for (Area area:areaList)
+        {
+            List<Area> areaList1=channelMapper.getCity(area.getValue());
+            for(Area area1:areaList1)
+            {
+                area1.setChildren(channelMapper.getArea(area1.getValue()));
+            }
+            area.setChildren(areaList1);
+        }
+        return areaList;
+    }
+
+    @Override
+    public List<Template> getTemplateList(){return channelMapper.getTemplateList();}
 }
 
diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml
index b0aafa8..9742d90 100644
--- a/src/main/resources/mapper/ChannelMapper.xml
+++ b/src/main/resources/mapper/ChannelMapper.xml
@@ -16,6 +16,19 @@
         <result column="city_code" jdbcType="VARCHAR" property="cityCode" />
     </resultMap>
 
+    <resultMap id="AreaMap" type="com.sincere.wechatbusiness.model.Area">
+        <result column="value" jdbcType="VARCHAR" property="value" />
+        <result column="label" jdbcType="VARCHAR" property="label" />
+    </resultMap>
+
+    <resultMap id="TemplateMap" type="com.sincere.wechatbusiness.model.Template">
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="title" jdbcType="VARCHAR" property="title" />
+        <result column="img_url" jdbcType="VARCHAR" property="imgUrl" />
+        <result column="state" jdbcType="INTEGER" property="state"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    </resultMap>
+
     <select id="getList" parameterType="com.sincere.wechatbusiness.model.Channel" resultMap="ChannelMap">
         select *,(select count(0) from channel_product where channelId=c.id and state=1) as product_count,
          (select title from template where id=c.templateId) as template_name from channel c
@@ -79,4 +92,20 @@
         update channel set state=0 where id = #{id}
         update channel_product set state=0 where channelId = #{id}
     </update>
+
+    <select id="getProvince" resultMap="AreaMap">
+        select area_code as value,area_name as label from sys_area where area_code like '__'
+    </select>
+
+    <select id="getCity" parameterType="java.lang.String" resultMap="AreaMap">
+        select area_code as value,area_name as label from sys_area where area_code like '____' and area_code like #{areaCode}+'%'
+    </select>
+
+    <select id="getArea" parameterType="java.lang.String" resultMap="AreaMap">
+        select area_code as value,area_name as label from sys_area where area_code like '______' and area_code like #{areaCode}+'%'
+    </select>
+
+    <select id="getTemplateList" resultMap="TemplateMap">
+        select * from template where state=1 order by create_time
+    </select>
 </mapper>
\ No newline at end of file
--
libgit2 0.21.0