Procházet zdrojové kódy

微信公众号-数据库字段修改

chao před 3 roky
rodič
revize
efac26f734

+ 50 - 50
db.sql

@@ -1,7 +1,7 @@
 -- ============================================== 系统表 start ===============================
--- 系统用户表
-DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user` (
+-- 系统用户表system_user
+DROP TABLE IF EXISTS `system_user`;
+CREATE TABLE `system_user` (
   `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '用户ID',
   `username` VARCHAR(255) UNIQUE NOT NULL COMMENT '用户名',
   `password` VARCHAR(255) NOT NULL COMMENT '密码',
@@ -15,8 +15,8 @@ CREATE TABLE `sys_user` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统用户表';
 -- 系统角色表
-DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role` (
+DROP TABLE IF EXISTS `system_role`;
+CREATE TABLE `system_role` (
   `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '角色ID',
   `role_name` VARCHAR(50) UNIQUE  NOT NULL COMMENT '角色名称',
   `role_desc` VARCHAR(255) DEFAULT NULL COMMENT '描述',
@@ -26,8 +26,8 @@ CREATE TABLE `sys_role` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统角色表';
 -- 系统菜单表
-DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE `sys_menu` (
+DROP TABLE IF EXISTS `system_menu`;
+CREATE TABLE `system_menu` (
   `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '菜单ID',
   `title` VARCHAR(100) NOT NULL COMMENT '菜单名称',
   `name` VARCHAR(100) UNIQUE NOT NULL COMMENT '路由名称(前端匹配路由用)',
@@ -42,24 +42,24 @@ CREATE TABLE `sys_menu` (
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统菜单表';
 -- 系统权限表
-/*DROP TABLE IF EXISTS `sys_permission`;
-CREATE TABLE `sys_permission` (
-  `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '权限ID',
-  `permission` VARCHAR(100) DEFAULT NULL COMMENT '权限标识',
-  PRIMARY KEY (`id`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统权限表';
-*/
+--DROP TABLE IF EXISTS `system_permission`;
+--CREATE TABLE `system_permission` (
+--  `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '权限ID',
+--  `permission` VARCHAR(100) DEFAULT NULL COMMENT '权限标识',
+--  PRIMARY KEY (`id`)
+--) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统权限表';
+--
 -- 用户&角色 关联表
-DROP TABLE IF EXISTS `sys_role_user`;
-CREATE TABLE `sys_role_user` (
+DROP TABLE IF EXISTS `system_role_user`;
+CREATE TABLE `system_role_user` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `role_id` VARCHAR(50) DEFAULT NULL COMMENT '角色ID',
   `user_id` VARCHAR(255) DEFAULT NULL COMMENT '用户ID',
   PRIMARY KEY (`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=utf8 COMMENT='系统用户角色关联表';
 -- 菜单&角色 关联表
-DROP TABLE IF EXISTS `sys_role_menu`;
-CREATE TABLE `sys_role_menu` (
+DROP TABLE IF EXISTS `system_role_menu`;
+CREATE TABLE `system_role_menu` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `role_id` VARCHAR(50) DEFAULT NULL COMMENT '角色ID',
   `menu_id` VARCHAR(255) DEFAULT NULL COMMENT '菜单ID',
@@ -83,7 +83,7 @@ CREATE TABLE `wechat_menu` (
   `url` text COMMENT '网页链接,用户点击菜单可打开链接(view类型必须)',
   `mediaId` varchar(64) DEFAULT '' COMMENT '调用新增永久素材接口返回的合法media_id(media_id类型和view_limited类型必须)',
   `appid` varchar(64) DEFAULT '' COMMENT '小程序appId,公众号跳转小程序时使用',
-  `pagepath` varchar(100) DEFAULT '' COMMENT '小程序页面路径,公众号跳转小程序时使用',
+  `pagePath` varchar(100) DEFAULT '' COMMENT '小程序页面路径,公众号跳转小程序时使用',
   `wxType` varchar(20) DEFAULT '' COMMENT '微信公众号类型',
   `createBy` bigint(11) DEFAULT NULL COMMENT '创建人',
   `createDate` datetime DEFAULT NULL COMMENT '创建时间',
@@ -95,33 +95,33 @@ CREATE TABLE `wechat_menu` (
 -- 微信公众号自动回复表(原表:caimei_weixin.cm_wxparam)
 DROP TABLE IF EXISTS `wechat_reply`;
 CREATE TABLE `wechat_reply` (
-  `cm_wxparamID` bigint(11) NOT NULL AUTO_INCREMENT,
+  `id` bigint(11) NOT NULL AUTO_INCREMENT,
   `keyword` varchar(128) DEFAULT NULL COMMENT '关键字',
   `responseType` varchar(16) DEFAULT NULL COMMENT '事件类型',
   `msgType` varchar(16) DEFAULT NULL COMMENT '回复类型',
-  `relateID` bigint(11) DEFAULT NULL COMMENT '素材id',
+  `relateId` bigint(11) DEFAULT NULL COMMENT '素材id',
   `title` varchar(128) DEFAULT NULL COMMENT '回复素材标题',
-  `wx_type` varchar(255) DEFAULT NULL COMMENT '公众号类型',
-  `create_by` bigint(11) DEFAULT NULL COMMENT '创建人',
-  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(11) DEFAULT NULL COMMENT '最后更新人',
-  `update_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-  PRIMARY KEY (`cm_wxparamID`)
+  `wxType` varchar(255) DEFAULT NULL COMMENT '公众号类型',
+  `createBy` bigint(11) DEFAULT NULL COMMENT '创建人',
+  `createDate` datetime DEFAULT NULL COMMENT '创建时间',
+  `updateBy` bigint(11) DEFAULT NULL COMMENT '最后更新人',
+  `updateDate` datetime DEFAULT NULL COMMENT '最后更新时间',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='回复配置表';
 
 -- 微信公众号-文本素材(原表:caimei_weixin.cm_wxtext)
 DROP TABLE IF EXISTS `wechat_text`;
 CREATE TABLE `wechat_text` (
-  `cm_wxtextID` int(11) NOT NULL AUTO_INCREMENT,
+  `id` int(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(128) DEFAULT NULL COMMENT '标题',
   `content` text COMMENT '内容',
   `addTime` varchar(19) DEFAULT NULL,
-  `wx_type` varchar(20) DEFAULT NULL COMMENT '微信公众号类型',
-  `create_by` bigint(11) DEFAULT NULL COMMENT '创建人',
-  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(11) DEFAULT NULL COMMENT '最后更新人',
-  `update_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-  PRIMARY KEY (`cm_wxtextID`)
+  `wxType` varchar(20) DEFAULT NULL COMMENT '微信公众号类型',
+  `createBy` bigint(11) DEFAULT NULL COMMENT '创建人',
+  `createDate` datetime DEFAULT NULL COMMENT '创建时间',
+  `updateBy` bigint(11) DEFAULT NULL COMMENT '最后更新人',
+  `updateDate` datetime DEFAULT NULL COMMENT '最后更新时间',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微信文本素材表';
 INSERT INTO security.wechat_text
 SELECT * FROM caimei_weixin.cm_wxtext;
@@ -129,33 +129,33 @@ SELECT * FROM caimei_weixin.cm_wxtext;
 -- 微信公众号-文本素材(原表:caimei_weixin.cm_wxarticle)
 DROP TABLE IF EXISTS `wechat_article`;
 CREATE TABLE `wechat_article` (
-  `cm_wxarticleID` bigint(11) NOT NULL AUTO_INCREMENT,
+  `articleId` bigint(11) NOT NULL AUTO_INCREMENT,
   `title` varchar(128) DEFAULT NULL COMMENT '标题',
   `addTime` varchar(19) DEFAULT NULL,
-  `wx_type` varchar(20) DEFAULT NULL COMMENT '微信公众号类型',
-  `create_by` bigint(11) DEFAULT NULL COMMENT '创建人',
-  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(11) DEFAULT NULL COMMENT '最后更新人',
-  `update_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-  PRIMARY KEY (`cm_wxarticleID`)
+  `wxType` varchar(20) DEFAULT NULL COMMENT '微信公众号类型',
+  `createBy` bigint(11) DEFAULT NULL COMMENT '创建人',
+  `createDate` datetime DEFAULT NULL COMMENT '创建时间',
+  `updateBy` bigint(11) DEFAULT NULL COMMENT '最后更新人',
+  `updateDate` datetime DEFAULT NULL COMMENT '最后更新时间',
+  PRIMARY KEY (`articleId`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微信图文素材表';
 
-INSERT INTO security.wechat_article (cm_wxarticleID,title,wx_type,create_by,create_date,update_by,update_date)
-SELECT cm_wxarticleID,title,wx_type,create_by,create_date,update_by,update_date FROM caimei_weixin.cm_wxarticle;
+INSERT INTO security.wechat_article (articleId,title,wxType,createBy,createDate,updateBy,updateDate)
+SELECT articleId,title,wxType,createBy,createDate,updateBy,updateDate FROM caimei_weixin.cm_wxarticle;
 
 -- 微信公众号-文本素材(原表:caimei_weixin.cm_wxarticledtl)
 DROP TABLE IF EXISTS `wechat_article_detail`;
 CREATE TABLE `wechat_article_detail` (
-  `cm_wxarticledtlID` int(11) NOT NULL AUTO_INCREMENT,
-  `cm_wxarticleID` int(11) DEFAULT NULL COMMENT '图文素材id',
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `articleId` int(11) DEFAULT NULL COMMENT '图文素材id',
   `title` varchar(128) DEFAULT NULL COMMENT '标题',
   `linkurl` varchar(255) DEFAULT NULL COMMENT '跳转链接',
   `picurl` varchar(255) DEFAULT NULL COMMENT '图片链接',
-  `create_by` bigint(11) DEFAULT NULL COMMENT '创建人',
-  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(11) DEFAULT NULL COMMENT '最后更新人',
-  `update_date` datetime DEFAULT NULL COMMENT '最后更新时间',
-  PRIMARY KEY (`cm_wxarticledtlID`)
+  `createBy` bigint(11) DEFAULT NULL COMMENT '创建人',
+  `createDate` datetime DEFAULT NULL COMMENT '创建时间',
+  `updateBy` bigint(11) DEFAULT NULL COMMENT '最后更新人',
+  `updateDate` datetime DEFAULT NULL COMMENT '最后更新时间',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微信图文素材详细表';
 INSERT INTO security.wechat_article_detail
 SELECT * FROM caimei_weixin.cm_wxarticledtl;

+ 1 - 1
pom.xml

@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.78</version>
+            <version>1.2.79</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

+ 66 - 0
src/main/java/com/caimei365/manager/controller/wechat/WechatDebugApi.java

@@ -0,0 +1,66 @@
+package com.caimei365.manager.controller.wechat;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.caimei365.manager.utils.HttpUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 微信接口调试API
+ *
+ * @author : Charles
+ * @date : 2022/1/12
+ */
+@RestController
+@RequestMapping("/wechat/debug")
+public class WechatDebugApi {
+
+    @Value("${wechat.apiUrl}")
+    private String wechatApiUrl;
+
+    /**
+     * 获取微信 access_token
+     */
+    @GetMapping("/access_token")
+    public String getAccessToken(String appid, String secret) {
+        String url = wechatApiUrl + "/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        return HttpUtil.httpRequest(url, "GET", null);
+    }
+
+    /**
+     * 获取微信用户列表
+     * @param openid 初始openid,不填默认从头开始拉取
+     */
+    @GetMapping("/user/list")
+    public String getUserList(String appid, String secret, String  openid) {
+        String tokenUrl = wechatApiUrl + "/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String jsonResult = HttpUtil.httpRequest(tokenUrl, "GET", null);
+        if(StringUtils.hasLength(jsonResult)){
+            JSONObject jsonObject = JSON.parseObject(jsonResult);
+            String accessToken = jsonObject.getString("access_token");
+            String userUrl = wechatApiUrl + "/cgi-bin/user/get?access_token="+ accessToken + "&next_openid="+ openid;
+            return HttpUtil.httpRequest(userUrl, "GET", null);
+        }
+        return "获取微信用户列表异常";
+    }
+
+    /**
+     * 公众号迁移后更新OpenId
+     */
+    @GetMapping("/change/openid")
+    public String changeOpenId(String appid, String secret, String json) {
+        String tokenUrl = wechatApiUrl + "/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String jsonResult = HttpUtil.httpRequest(tokenUrl, "GET", null);
+        if(StringUtils.hasLength(jsonResult)){
+            JSONObject jsonObject = JSON.parseObject(jsonResult);
+            String accessToken = jsonObject.getString("access_token");
+            String changeUrl = wechatApiUrl + "/cgi-bin/changeopenid?access_token=?access_token="+ accessToken;
+            return HttpUtil.httpRequest(changeUrl, "POST", json);
+        }
+        return "公众号迁移后更新OpenId异常";
+    }
+}

+ 1 - 1
src/main/java/com/caimei365/manager/entity/wechat/WechatArticle.java

@@ -49,7 +49,7 @@ public class WechatArticle {
      *            { "id":         "文章ID"
      *              "title":      "文章标题",
      *              "linkUrl":    "跳转链接",
-     *              "pictureUrl": "图片链接",
+     *              "picurl": "图片链接",
      *            },
      *            {多条数据结构同上}
      *         ]

+ 1 - 1
src/main/java/com/caimei365/manager/entity/wechat/WechatArticleDetail.java

@@ -30,7 +30,7 @@ public class WechatArticleDetail {
     /**
      * 图片链接
      */
-    private String pictureUrl;
+    private String picurl;
     /**
      * 操作人用户Id
      */

+ 1 - 1
src/main/java/com/caimei365/manager/entity/wechat/WechatReply.java

@@ -33,7 +33,7 @@ public class WechatReply {
     /**
      * 素材id
      */
-    private Long relateId;
+    private Integer relateId;
     /**
      * 回复素材标题
      */

+ 3 - 3
src/main/java/com/caimei365/manager/service/wechat/impl/WechatArticleServiceImpl.java

@@ -122,7 +122,7 @@ public class WechatArticleServiceImpl implements WechatArticleService {
                 Integer articleId = (Integer) detail.get("id");
                 String articleTitle = (String) detail.get("title");
                 String linkUrl = (String) detail.get("linkUrl");
-                String pictureUrl = (String) detail.get("pictureUrl");
+                String picurl = (String) detail.get("picurl");
                 WechatArticleDetail dbDetail = null;
                 if (null != articleId && articleId > 0) {
                     dbDetail = weChatDao.getWechatArticleDetail(articleId);
@@ -135,8 +135,8 @@ public class WechatArticleServiceImpl implements WechatArticleService {
                 if (StringUtils.hasLength(linkUrl)){
                     dbDetail.setLinkUrl(linkUrl);
                 }
-                if (StringUtils.hasLength(pictureUrl)){
-                    dbDetail.setPictureUrl(pictureUrl);
+                if (StringUtils.hasLength(picurl)){
+                    dbDetail.setPicurl(picurl);
                 }
                 dbDetail.setArticleId(article.getId());
                 dbDetail.setUserId(article.getUserId());

+ 4 - 6
src/main/java/com/caimei365/manager/service/wechat/impl/WechatMenuServiceImpl.java

@@ -29,12 +29,10 @@ import java.util.Map;
 @Service
 public class WechatMenuServiceImpl implements WechatMenuService {
 
+    @Value("${wechat.apiUrl}")
+    private String wechatApiUrl;
     @Value("${wechat.publicUrl}")
     private String publicUrl;
-    @Value("${wechat.getTokenUrl}")
-    private String getTokenUrl;
-    @Value("${wechat.createMenuUrl}")
-    private String createMenuUrl;
 
     @Value("${wechat.caimei.id}")
     private String caimeiId;
@@ -253,7 +251,7 @@ public class WechatMenuServiceImpl implements WechatMenuService {
         String jsonString = JSON.toJSONString(map);
         log.info("》》》微信公众号菜单发布,发布数据:" + jsonString);
         // 组装请求链接
-        String url = createMenuUrl + "?access_token=";
+        String url = wechatApiUrl + "/cgi-bin/menu/create?access_token=";
         if (1 == type) {
             // 采美微信公众号
             url += getAccessToken(caimeiAppid, caimeiSecret);
@@ -309,7 +307,7 @@ public class WechatMenuServiceImpl implements WechatMenuService {
      * 换取 access_token
      */
     public String getAccessToken(String appid, String secret){
-        String url = getTokenUrl + "?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String url = wechatApiUrl + "/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
         try {
             String jsonResult = HttpUtil.httpRequest(url, "GET", null);
             if(StringUtils.hasLength(jsonResult)){

+ 9 - 3
src/main/resources/application.yml

@@ -22,9 +22,8 @@ mybatis:
 
 # 微信公众号
 wechat:
+  apiUrl: https://api.weixin.qq.com
   publicUrl: http://mp.weixin.qq.com
-  getTokenUrl: https://api.weixin.qq.com/cgi-bin/token
-  createMenuUrl: https://api.weixin.qq.com/cgi-bin/menu/create
 #  caimei:
 #    id: gh_ef75b1b89b74
 #    appid: wx91c4152b60ca91a3
@@ -33,6 +32,10 @@ wechat:
 #    id: gh_eecada09617d
 #    appid: wxd81864ddacc0ed25
 #    secret: 7873323db2984c75556f8d04e76d1f02
+#  caimei-old:
+#    id: gh_7de98a37fb6a
+#    appid: wxea43a0f9ebce9e66
+#    secret: 1c3cd60908e72dd280840bee9e15f7f6
   caimei:
     id: gh_123456
     appid: wx123456
@@ -41,6 +44,9 @@ wechat:
     id: gh_7890123
     appid: wx7890123
     secret: abc7890123
-
+  caimei-old:
+    id: gh_123456
+    appid: wx123456
+    secret: abc123456
 
 

+ 45 - 45
src/main/resources/mapper/WeChatDao.xml

@@ -3,14 +3,14 @@
 <mapper namespace="com.caimei365.manager.dao.WeChatDao">
     <select id="getWechatMenuList" resultType="com.caimei365.manager.entity.wechat.WechatMenu">
         SELECT a.id, a.parentId, a.parentIds, a.`name`, a.sort, a.type, a.`key`,
-               a.url, a.mediaId, a.appid, a.pagepath AS pagePath, a.wxType
+               a.url, a.mediaId, a.appid, a.pagePath AS pagePath, a.wxType
         FROM wechat_menu a
         WHERE a.wxType = #{wxType} AND a.parentId = #{parentId}
         ORDER BY a.sort ASC
     </select>
     <select id="getWechatMenu" resultType="com.caimei365.manager.entity.wechat.WechatMenu">
         SELECT a.id, a.parentId, a.parentIds, a.`name`, a.sort, a.type, a.`key`,
-               a.url, a.mediaId, a.appid, a.pagepath AS pagePath, a.wxType
+               a.url, a.mediaId, a.appid, a.pagePath AS pagePath, a.wxType
         FROM wechat_menu a WHERE a.id = #{id}
     </select>
     <select id="countChildByParentId" resultType="java.lang.Integer">
@@ -19,23 +19,23 @@
     <update id="updateWechatMenu">
         UPDATE wechat_menu SET parentId = #{parentId}, parentIds = #{parentIds}, name = #{name}, sort = #{sort},
                                type = #{type}, `key` = #{key}, url = #{url}, mediaId = #{mediaId}, appid = #{appid},
-                               pagepath = #{pagePath}, updateBy = #{userId}, updateDate = NOW()
+                               pagePath = #{pagePath}, updateBy = #{userId}, updateDate = NOW()
         WHERE id = #{id}
     </update>
     <insert id="insertWechatMenu" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO wechat_menu(parentId, parentIds, `name`, sort, type, `key`, url, mediaId, appid, pagepath, wxType, createBy, createDate)
+        INSERT INTO wechat_menu(parentId, parentIds, `name`, sort, type, `key`, url, mediaId, appid, pagePath, wxType, createBy, createDate)
         VALUES (#{parentId}, #{parentIds}, #{name}, #{sort}, #{type}, #{key}, #{url}, #{mediaId}, #{appid}, #{pagePath}, #{wxType}, #{userId}, NOW())
     </insert>
     <delete id="deleteWechatMenu">
         DELETE FROM wechat_menu WHERE id = #{id}
     </delete>
     <select id="getReplyList" resultType="com.caimei365.manager.entity.wechat.WechatReply">
-        SELECT a.cm_wxparamID AS id, a.keyword, a.title, a.responsetype AS responseType,
-               a.msgtype AS msgType, a.relateID AS relateId, a.wx_type AS wxType, IFNULL(a.update_date,a.create_date) AS updateTime
+        SELECT a.id AS id, a.keyword, a.title, a.responsetype AS responseType,
+               a.msgtype AS msgType, a.relateId AS relateId, a.wxType AS wxType, IFNULL(a.updateDate,a.createDate) AS updateTime
         FROM wechat_reply a
         <where>
             <if test=" wxType != null and  wxType != ''">
-                AND a.wx_type =#{wxType}
+                AND a.wxType =#{wxType}
             </if>
             <if test="responseType != null and responseType != ''">
                 AND a.responsetype = #{responseType}
@@ -50,29 +50,29 @@
         ORDER BY updateTime DESC
     </select>
     <select id="getWechatReply" resultType="com.caimei365.manager.entity.wechat.WechatReply">
-        SELECT a.cm_wxparamID AS id, a.keyword, a.title, a.responsetype AS responseType,
-               a.msgtype AS msgType, a.relateID AS relateId, a.wx_type AS wxType, IFNULL(a.update_date,a.create_date) AS updateTime
-        FROM wechat_reply a WHERE a.cm_wxparamID = #{id}
+        SELECT a.id AS id, a.keyword, a.title, a.responsetype AS responseType,
+               a.msgtype AS msgType, a.relateId AS relateId, a.wxType AS wxType, IFNULL(a.updateDate,a.createDate) AS updateTime
+        FROM wechat_reply a WHERE a.id = #{id}
     </select>
     <update id="updateWechatReply">
         UPDATE wechat_reply SET keyword = #{keyword}, title = #{title}, responsetype = #{responseType},
-                                msgtype = #{msgType}, relateID = #{relateId}, update_by = #{userId}, update_date = NOW()
-        WHERE cm_wxparamID = #{id}
+                                msgtype = #{msgType}, relateId = #{relateId}, updateBy = #{userId}, updateDate = NOW()
+        WHERE id = #{id}
     </update>
     <insert id="insertWechatReply" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO wechat_reply(keyword, title, responsetype, msgtype, relateID, wx_type, create_by, create_date)
+        INSERT INTO wechat_reply(keyword, title, responsetype, msgtype, relateId, wxType, createBy, createDate)
         VALUES (#{keyword}, #{title}, #{responseType}, #{msgType}, #{relateId}, #{wxType}, #{userId}, NOW())
     </insert>
     <delete id="deleteWechatReply">
-        DELETE FROM wechat_reply WHERE cm_wxparamID = #{id}
+        DELETE FROM wechat_reply WHERE id = #{id}
     </delete>
     <select id="getTextList" resultType="com.caimei365.manager.entity.wechat.WechatText">
-        SELECT a.cm_wxtextID AS id, a.title, a.content, a.wx_type AS wxType,
-               IFNULL(a.update_date,a.create_date) AS updateTime
+        SELECT a.id AS id, a.title, a.content, a.wxType AS wxType,
+               IFNULL(a.updateDate,a.createDate) AS updateTime
         FROM wechat_text a
         <where>
             <if test=" wxType != null and  wxType != ''">
-                AND a.wx_type =#{wxType}
+                AND a.wxType =#{wxType}
             </if>
             <if test="title != null and title != ''">
                 AND a.title LIKE concat('%',#{title},'%')
@@ -81,28 +81,28 @@
         ORDER BY updateTime DESC
     </select>
     <select id="getWechatText" resultType="com.caimei365.manager.entity.wechat.WechatText">
-        SELECT a.cm_wxtextID AS id, a.title, a.content, a.wx_type AS wxType,
-               IFNULL(a.update_date,a.create_date) AS updateTime
-        FROM wechat_text a WHERE a.cm_wxtextID = #{id}
+        SELECT a.id AS id, a.title, a.content, a.wxType AS wxType,
+               IFNULL(a.updateDate,a.createDate) AS updateTime
+        FROM wechat_text a WHERE a.id = #{id}
     </select>
     <update id="updateWechatText">
-        UPDATE wechat_text SET title = #{title}, content = #{content}, wx_type = #{wxType}, update_by = #{userId}, update_date = NOW()
-        WHERE cm_wxtextID = #{id}
+        UPDATE wechat_text SET title = #{title}, content = #{content}, wxType = #{wxType}, updateBy = #{userId}, updateDate = NOW()
+        WHERE id = #{id}
     </update>
     <insert id="insertWechatText" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO wechat_text(title, content, wx_type, create_by, create_date)
+        INSERT INTO wechat_text(title, content, wxType, createBy, createDate)
         VALUES (#{title}, #{content}, #{wxType}, #{userId}, NOW())
     </insert>
     <delete id="deleteWechatText">
-        DELETE FROM wechat_text WHERE cm_wxtextID = #{id}
+        DELETE FROM wechat_text WHERE id = #{id}
     </delete>
     <select id="getArticleList" resultType="com.caimei365.manager.entity.wechat.WechatArticle">
-        SELECT a.cm_wxarticleID AS id, a.title, a.wx_type AS wxType,
-        IFNULL(a.update_date,a.create_date) AS updateTime
+        SELECT a.articleId AS id, a.title, a.wxType AS wxType,
+        IFNULL(a.updateDate,a.createDate) AS updateTime
         FROM wechat_article a
         <where>
             <if test=" wxType != null and  wxType != ''">
-                AND a.wx_type =#{wxType}
+                AND a.wxType =#{wxType}
             </if>
             <if test="title != null and title != ''">
                 AND a.title LIKE concat('%',#{title},'%')
@@ -111,44 +111,44 @@
         ORDER BY updateTime DESC
     </select>
     <select id="getWechatArticle" resultType="com.caimei365.manager.entity.wechat.WechatArticle">
-        SELECT a.cm_wxarticleID AS id, a.title, a.wx_type AS wxType,
-               IFNULL(a.update_date,a.create_date) AS updateTime
-        FROM wechat_article a WHERE a.cm_wxarticleID = #{id}
+        SELECT a.articleId AS id, a.title, a.wxType AS wxType,
+               IFNULL(a.updateDate,a.createDate) AS updateTime
+        FROM wechat_article a WHERE a.articleId = #{id}
     </select>
     <select id="getArticleDetailIds" resultType="java.lang.Integer">
-        SELECT cm_wxarticledtlID FROM wechat_article_detail  WHERE cm_wxarticleID = #{articleId}
+        SELECT id FROM wechat_article_detail  WHERE articleId = #{articleId}
     </select>
     <select id="getArticleDetailList" resultType="com.caimei365.manager.entity.wechat.WechatArticleDetail">
-        SELECT a.cm_wxarticledtlID AS id,a.cm_wxarticleID AS articleId, a.title, a.linkurl AS linkUrl, a.picurl AS pictureUrl
-        FROM wechat_article_detail a WHERE a.cm_wxarticleID = #{articleId}
+        SELECT a.id AS id,a.articleId AS articleId, a.title, a.linkurl AS linkUrl, a.picurl AS picurl
+        FROM wechat_article_detail a WHERE a.articleId = #{articleId}
     </select>
     <select id="getWechatArticleDetail" resultType="com.caimei365.manager.entity.wechat.WechatArticleDetail">
-        SELECT a.cm_wxarticledtlID AS id,a.cm_wxarticleID AS articleId, a.title, a.linkurl AS linkUrl, a.picurl AS pictureUrl
-        FROM wechat_article_detail a WHERE a.cm_wxarticledtlID = #{id}
+        SELECT a.id AS id,a.articleId AS articleId, a.title, a.linkurl AS linkUrl, a.picurl AS picurl
+        FROM wechat_article_detail a WHERE a.id = #{id}
     </select>
     <update id="updateWechatArticle">
-        UPDATE wechat_article SET title = #{title}, wx_type = #{wxType}, update_by = #{userId}, update_date = NOW()
-        WHERE cm_wxarticleID = #{id}
+        UPDATE wechat_article SET title = #{title}, wxType = #{wxType}, updateBy = #{userId}, updateDate = NOW()
+        WHERE articleId = #{id}
     </update>
     <update id="updateWechatArticleDetail">
-        UPDATE wechat_article_detail SET title = #{title}, linkurl = #{linkUrl}, picurl = #{pictureUrl}, update_by = #{userId}, update_date = NOW()
-        WHERE cm_wxarticledtlID = #{id}
+        UPDATE wechat_article_detail SET title = #{title}, linkurl = #{linkUrl}, picurl = #{picurl}, updateBy = #{userId}, updateDate = NOW()
+        WHERE id = #{id}
     </update>
     <insert id="insertWechatArticle" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO wechat_article(title, wx_type, create_by, create_date)
+        INSERT INTO wechat_article(title, wxType, createBy, createDate)
         VALUES (#{title}, #{wxType}, #{userId}, NOW())
     </insert>
     <insert id="insertWechatArticleDetail" keyProperty="id" useGeneratedKeys="true">
-        INSERT INTO wechat_article_detail(cm_wxarticleID, title, linkurl, picurl, create_by, create_date)
-        VALUES (#{articleId}, #{title}, #{linkUrl},#{pictureUrl}, #{userId}, NOW())
+        INSERT INTO wechat_article_detail(articleId, title, linkurl, picurl, createBy, createDate)
+        VALUES (#{articleId}, #{title}, #{linkUrl},#{picurl}, #{userId}, NOW())
     </insert>
     <delete id="deleteWechatArticle">
-        DELETE FROM wechat_article WHERE cm_wxarticleID = #{id}
+        DELETE FROM wechat_article WHERE articleId = #{id}
     </delete>
     <delete id="deleteDetailByArticleId">
-        DELETE FROM wechat_article_detail WHERE cm_wxarticleID = #{articleId}
+        DELETE FROM wechat_article_detail WHERE articleId = #{articleId}
     </delete>
     <delete id="deleteWechatArticleDetail">
-        DELETE FROM wechat_article_detail WHERE cm_wxarticledtlID = #{id}
+        DELETE FROM wechat_article_detail WHERE id = #{id}
     </delete>
 </mapper>