Просмотр исходного кода

重写CommentGenerator,自动生成的model类增加注释

shuzheng 9 лет назад
Родитель
Сommit
21056f11b8
22 измененных файлов с 298 добавлено и 1904 удалено
  1. 0 36
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsPageMapper.java
  2. 0 313
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsPageMapper.xml
  3. 0 30
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSettingMapper.java
  4. 0 190
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSettingMapper.xml
  5. 75 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java
  6. 15 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleCategory.java
  7. 15 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleTag.java
  8. 50 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java
  9. 15 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryTag.java
  10. 45 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java
  11. 0 142
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsPage.java
  12. 0 673
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsPageExample.java
  13. 0 77
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSetting.java
  14. 0 423
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSettingExample.java
  15. 40 0
      zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java
  16. 7 9
      zheng-cms/zheng-cms-dao/src/main/resources/generatorConfig.xml
  17. 25 0
      zheng-common/src/main/java/com/zheng/common/plugin/CommentGenerator.java
  18. 7 7
      zheng-common/src/main/resources/generatorConfig.vm
  19. 1 1
      zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/Generator.java
  20. 1 1
      zheng-ucenter/zheng-ucenter-dao/src/main/java/com/zheng/ucenter/dao/Generator.java
  21. 1 1
      zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/Generator.java
  22. 1 1
      zheng-wechat-mp/zheng-wechat-mp-dao/src/main/java/com/zheng/wechat/mp/dao/Generator.java

+ 0 - 36
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsPageMapper.java

@@ -1,36 +0,0 @@
-package com.zheng.cms.dao.mapper;
-
-import com.zheng.cms.dao.model.CmsPage;
-import com.zheng.cms.dao.model.CmsPageExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CmsPageMapper {
-    int countByExample(CmsPageExample example);
-
-    int deleteByExample(CmsPageExample example);
-
-    int deleteByPrimaryKey(Integer pageId);
-
-    int insert(CmsPage record);
-
-    int insertSelective(CmsPage record);
-
-    List<CmsPage> selectByExampleWithBLOBs(CmsPageExample example);
-
-    List<CmsPage> selectByExample(CmsPageExample example);
-
-    CmsPage selectByPrimaryKey(Integer pageId);
-
-    int updateByExampleSelective(@Param("record") CmsPage record, @Param("example") CmsPageExample example);
-
-    int updateByExampleWithBLOBs(@Param("record") CmsPage record, @Param("example") CmsPageExample example);
-
-    int updateByExample(@Param("record") CmsPage record, @Param("example") CmsPageExample example);
-
-    int updateByPrimaryKeySelective(CmsPage record);
-
-    int updateByPrimaryKeyWithBLOBs(CmsPage record);
-
-    int updateByPrimaryKey(CmsPage record);
-}

+ 0 - 313
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsPageMapper.xml

@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.zheng.cms.dao.mapper.CmsPageMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsPage" >
-    <id column="page_id" property="pageId" jdbcType="INTEGER" />
-    <result column="pid" property="pid" jdbcType="INTEGER" />
-    <result column="alias" property="alias" jdbcType="VARCHAR" />
-    <result column="keywords" property="keywords" jdbcType="VARCHAR" />
-    <result column="description" property="description" jdbcType="VARCHAR" />
-    <result column="ctime" property="ctime" jdbcType="BIGINT" />
-    <result column="orders" property="orders" jdbcType="BIGINT" />
-  </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.dao.model.CmsPage" extends="BaseResultMap" >
-    <result column="content" property="content" jdbcType="LONGVARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    page_id, pid, alias, keywords, description, ctime, orders
-  </sql>
-  <sql id="Blob_Column_List" >
-    content
-  </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsPageExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_page
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsPageExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_page
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null" >
-      <if test="offset != null" >
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null" >
-        limit ${limit}
-      </if>
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from cms_page
-    where page_id = #{pageId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from cms_page
-    where page_id = #{pageId,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsPageExample" >
-    delete from cms_page
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsPage" >
-    insert into cms_page (page_id, pid, alias, 
-      keywords, description, ctime, 
-      orders, content)
-    values (#{pageId,jdbcType=INTEGER}, #{pid,jdbcType=INTEGER}, #{alias,jdbcType=VARCHAR}, 
-      #{keywords,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
-      #{orders,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsPage" >
-    insert into cms_page
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="pageId != null" >
-        page_id,
-      </if>
-      <if test="pid != null" >
-        pid,
-      </if>
-      <if test="alias != null" >
-        alias,
-      </if>
-      <if test="keywords != null" >
-        keywords,
-      </if>
-      <if test="description != null" >
-        description,
-      </if>
-      <if test="ctime != null" >
-        ctime,
-      </if>
-      <if test="orders != null" >
-        orders,
-      </if>
-      <if test="content != null" >
-        content,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="pageId != null" >
-        #{pageId,jdbcType=INTEGER},
-      </if>
-      <if test="pid != null" >
-        #{pid,jdbcType=INTEGER},
-      </if>
-      <if test="alias != null" >
-        #{alias,jdbcType=VARCHAR},
-      </if>
-      <if test="keywords != null" >
-        #{keywords,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null" >
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="ctime != null" >
-        #{ctime,jdbcType=BIGINT},
-      </if>
-      <if test="orders != null" >
-        #{orders,jdbcType=BIGINT},
-      </if>
-      <if test="content != null" >
-        #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsPageExample" resultType="java.lang.Integer" >
-    select count(*) from cms_page
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update cms_page
-    <set >
-      <if test="record.pageId != null" >
-        page_id = #{record.pageId,jdbcType=INTEGER},
-      </if>
-      <if test="record.pid != null" >
-        pid = #{record.pid,jdbcType=INTEGER},
-      </if>
-      <if test="record.alias != null" >
-        alias = #{record.alias,jdbcType=VARCHAR},
-      </if>
-      <if test="record.keywords != null" >
-        keywords = #{record.keywords,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null" >
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.ctime != null" >
-        ctime = #{record.ctime,jdbcType=BIGINT},
-      </if>
-      <if test="record.orders != null" >
-        orders = #{record.orders,jdbcType=BIGINT},
-      </if>
-      <if test="record.content != null" >
-        content = #{record.content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map" >
-    update cms_page
-    set page_id = #{record.pageId,jdbcType=INTEGER},
-      pid = #{record.pid,jdbcType=INTEGER},
-      alias = #{record.alias,jdbcType=VARCHAR},
-      keywords = #{record.keywords,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      ctime = #{record.ctime,jdbcType=BIGINT},
-      orders = #{record.orders,jdbcType=BIGINT},
-      content = #{record.content,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update cms_page
-    set page_id = #{record.pageId,jdbcType=INTEGER},
-      pid = #{record.pid,jdbcType=INTEGER},
-      alias = #{record.alias,jdbcType=VARCHAR},
-      keywords = #{record.keywords,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR},
-      ctime = #{record.ctime,jdbcType=BIGINT},
-      orders = #{record.orders,jdbcType=BIGINT}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsPage" >
-    update cms_page
-    <set >
-      <if test="pid != null" >
-        pid = #{pid,jdbcType=INTEGER},
-      </if>
-      <if test="alias != null" >
-        alias = #{alias,jdbcType=VARCHAR},
-      </if>
-      <if test="keywords != null" >
-        keywords = #{keywords,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null" >
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="ctime != null" >
-        ctime = #{ctime,jdbcType=BIGINT},
-      </if>
-      <if test="orders != null" >
-        orders = #{orders,jdbcType=BIGINT},
-      </if>
-      <if test="content != null" >
-        content = #{content,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where page_id = #{pageId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsPage" >
-    update cms_page
-    set pid = #{pid,jdbcType=INTEGER},
-      alias = #{alias,jdbcType=VARCHAR},
-      keywords = #{keywords,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      ctime = #{ctime,jdbcType=BIGINT},
-      orders = #{orders,jdbcType=BIGINT},
-      content = #{content,jdbcType=LONGVARCHAR}
-    where page_id = #{pageId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsPage" >
-    update cms_page
-    set pid = #{pid,jdbcType=INTEGER},
-      alias = #{alias,jdbcType=VARCHAR},
-      keywords = #{keywords,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR},
-      ctime = #{ctime,jdbcType=BIGINT},
-      orders = #{orders,jdbcType=BIGINT}
-    where page_id = #{pageId,jdbcType=INTEGER}
-  </update>
-  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
-</mapper>

+ 0 - 30
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSettingMapper.java

@@ -1,30 +0,0 @@
-package com.zheng.cms.dao.mapper;
-
-import com.zheng.cms.dao.model.CmsSetting;
-import com.zheng.cms.dao.model.CmsSettingExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface CmsSettingMapper {
-    int countByExample(CmsSettingExample example);
-
-    int deleteByExample(CmsSettingExample example);
-
-    int deleteByPrimaryKey(Integer settingId);
-
-    int insert(CmsSetting record);
-
-    int insertSelective(CmsSetting record);
-
-    List<CmsSetting> selectByExample(CmsSettingExample example);
-
-    CmsSetting selectByPrimaryKey(Integer settingId);
-
-    int updateByExampleSelective(@Param("record") CmsSetting record, @Param("example") CmsSettingExample example);
-
-    int updateByExample(@Param("record") CmsSetting record, @Param("example") CmsSettingExample example);
-
-    int updateByPrimaryKeySelective(CmsSetting record);
-
-    int updateByPrimaryKey(CmsSetting record);
-}

+ 0 - 190
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsSettingMapper.xml

@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.zheng.cms.dao.mapper.CmsSettingMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsSetting" >
-    <id column="setting_id" property="settingId" jdbcType="INTEGER" />
-    <result column="setting_key" property="settingKey" jdbcType="VARCHAR" />
-    <result column="setting_value" property="settingValue" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    setting_id, setting_key, setting_value
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsSettingExample" >
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from cms_setting
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-    <if test="limit != null" >
-      <if test="offset != null" >
-        limit ${offset}, ${limit}
-      </if>
-      <if test="offset == null" >
-        limit ${limit}
-      </if>
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
-    select 
-    <include refid="Base_Column_List" />
-    from cms_setting
-    where setting_id = #{settingId,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
-    delete from cms_setting
-    where setting_id = #{settingId,jdbcType=INTEGER}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsSettingExample" >
-    delete from cms_setting
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsSetting" >
-    insert into cms_setting (setting_id, setting_key, setting_value
-      )
-    values (#{settingId,jdbcType=INTEGER}, #{settingKey,jdbcType=VARCHAR}, #{settingValue,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsSetting" >
-    insert into cms_setting
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      <if test="settingId != null" >
-        setting_id,
-      </if>
-      <if test="settingKey != null" >
-        setting_key,
-      </if>
-      <if test="settingValue != null" >
-        setting_value,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      <if test="settingId != null" >
-        #{settingId,jdbcType=INTEGER},
-      </if>
-      <if test="settingKey != null" >
-        #{settingKey,jdbcType=VARCHAR},
-      </if>
-      <if test="settingValue != null" >
-        #{settingValue,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsSettingExample" resultType="java.lang.Integer" >
-    select count(*) from cms_setting
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    update cms_setting
-    <set >
-      <if test="record.settingId != null" >
-        setting_id = #{record.settingId,jdbcType=INTEGER},
-      </if>
-      <if test="record.settingKey != null" >
-        setting_key = #{record.settingKey,jdbcType=VARCHAR},
-      </if>
-      <if test="record.settingValue != null" >
-        setting_value = #{record.settingValue,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    update cms_setting
-    set setting_id = #{record.settingId,jdbcType=INTEGER},
-      setting_key = #{record.settingKey,jdbcType=VARCHAR},
-      setting_value = #{record.settingValue,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsSetting" >
-    update cms_setting
-    <set >
-      <if test="settingKey != null" >
-        setting_key = #{settingKey,jdbcType=VARCHAR},
-      </if>
-      <if test="settingValue != null" >
-        setting_value = #{settingValue,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where setting_id = #{settingId,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsSetting" >
-    update cms_setting
-    set setting_key = #{settingKey,jdbcType=VARCHAR},
-      setting_value = #{settingValue,jdbcType=VARCHAR}
-    where setting_id = #{settingId,jdbcType=INTEGER}
-  </update>
-  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
-</mapper>

+ 75 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java

@@ -3,34 +3,109 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsArticle implements Serializable {
+    /**
+     * 文章编号
+     *
+     * @mbggenerated
+     */
     private Integer articleId;
 
+    /**
+     * 文章标题
+     *
+     * @mbggenerated
+     */
     private String title;
 
+    /**
+     * 文章原作者
+     *
+     * @mbggenerated
+     */
     private String author;
 
+    /**
+     * 转载来源网址
+     *
+     * @mbggenerated
+     */
     private String fromurl;
 
+    /**
+     * 封面图
+     *
+     * @mbggenerated
+     */
     private String image;
 
+    /**
+     * 关键字
+     *
+     * @mbggenerated
+     */
     private String keywords;
 
+    /**
+     * 简介
+     *
+     * @mbggenerated
+     */
     private String description;
 
+    /**
+     * 类型(1:普通,2:热门...)
+     *
+     * @mbggenerated
+     */
     private Byte type;
 
+    /**
+     * 是否允许评论(0:不允许,1:允许)
+     *
+     * @mbggenerated
+     */
     private Byte allowcomments;
 
+    /**
+     * 状态(-1:不通过,0未审核,1:通过)
+     *
+     * @mbggenerated
+     */
     private Byte status;
 
+    /**
+     * 发布人id
+     *
+     * @mbggenerated
+     */
     private Integer userId;
 
+    /**
+     * 阅读数量
+     *
+     * @mbggenerated
+     */
     private Integer readnumber;
 
+    /**
+     * 创建时间
+     *
+     * @mbggenerated
+     */
     private Long ctime;
 
+    /**
+     * 排序
+     *
+     * @mbggenerated
+     */
     private Long orders;
 
+    /**
+     * 内容
+     *
+     * @mbggenerated
+     */
     private String content;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleCategory.java

@@ -3,10 +3,25 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsArticleCategory implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
     private Integer articleCategoryId;
 
+    /**
+     * 文章编号
+     *
+     * @mbggenerated
+     */
     private Integer articleId;
 
+    /**
+     * 类目编号
+     *
+     * @mbggenerated
+     */
     private Integer categoryId;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleTag.java

@@ -3,10 +3,25 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsArticleTag implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
     private Integer articleTagId;
 
+    /**
+     * 文章编号
+     *
+     * @mbggenerated
+     */
     private Integer articleId;
 
+    /**
+     * 标签编号
+     *
+     * @mbggenerated
+     */
     private Integer tagId;
 
     private static final long serialVersionUID = 1L;

+ 50 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java

@@ -3,24 +3,74 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsCategory implements Serializable {
+    /**
+     * 类目编号
+     *
+     * @mbggenerated
+     */
     private Integer categoryId;
 
+    /**
+     * 上级编号
+     *
+     * @mbggenerated
+     */
     private Integer pid;
 
+    /**
+     * 层级
+     *
+     * @mbggenerated
+     */
     private Byte level;
 
+    /**
+     * 名称
+     *
+     * @mbggenerated
+     */
     private String name;
 
+    /**
+     * 描述
+     *
+     * @mbggenerated
+     */
     private String description;
 
+    /**
+     * 图标
+     *
+     * @mbggenerated
+     */
     private String icon;
 
+    /**
+     * 类型(1:普通,2:热门...)
+     *
+     * @mbggenerated
+     */
     private Byte type;
 
+    /**
+     * 别名
+     *
+     * @mbggenerated
+     */
     private String alias;
 
+    /**
+     * 创建时间
+     *
+     * @mbggenerated
+     */
     private Long ctime;
 
+    /**
+     * 排序
+     *
+     * @mbggenerated
+     */
     private Long orders;
 
     private static final long serialVersionUID = 1L;

+ 15 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryTag.java

@@ -3,10 +3,25 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsCategoryTag implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
     private Integer categoryTagId;
 
+    /**
+     * 类目编号
+     *
+     * @mbggenerated
+     */
     private Integer categoryId;
 
+    /**
+     * 标签编号
+     *
+     * @mbggenerated
+     */
     private Integer tagId;
 
     private static final long serialVersionUID = 1L;

+ 45 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java

@@ -3,22 +3,67 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsComment implements Serializable {
+    /**
+     * 编号
+     *
+     * @mbggenerated
+     */
     private Integer commentId;
 
+    /**
+     * 回复楼中楼编号回复楼中楼编号
+     *
+     * @mbggenerated
+     */
     private Integer pid;
 
+    /**
+     * 文章编号
+     *
+     * @mbggenerated
+     */
     private Integer articleId;
 
+    /**
+     * 用户编号
+     *
+     * @mbggenerated
+     */
     private Integer userId;
 
+    /**
+     * 状态(-1:不通过,0:未审核,1:通过)
+     *
+     * @mbggenerated
+     */
     private Byte status;
 
+    /**
+     * 评论人ip地址
+     *
+     * @mbggenerated
+     */
     private String ip;
 
+    /**
+     * 评论人终端信息
+     *
+     * @mbggenerated
+     */
     private String agent;
 
+    /**
+     * 创建时间
+     *
+     * @mbggenerated
+     */
     private Long ctime;
 
+    /**
+     * 评论内容
+     *
+     * @mbggenerated
+     */
     private String content;
 
     private static final long serialVersionUID = 1L;

+ 0 - 142
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsPage.java

@@ -1,142 +0,0 @@
-package com.zheng.cms.dao.model;
-
-import java.io.Serializable;
-
-public class CmsPage implements Serializable {
-    private Integer pageId;
-
-    private Integer pid;
-
-    private String alias;
-
-    private String keywords;
-
-    private String description;
-
-    private Long ctime;
-
-    private Long orders;
-
-    private String content;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getPageId() {
-        return pageId;
-    }
-
-    public void setPageId(Integer pageId) {
-        this.pageId = pageId;
-    }
-
-    public Integer getPid() {
-        return pid;
-    }
-
-    public void setPid(Integer pid) {
-        this.pid = pid;
-    }
-
-    public String getAlias() {
-        return alias;
-    }
-
-    public void setAlias(String alias) {
-        this.alias = alias;
-    }
-
-    public String getKeywords() {
-        return keywords;
-    }
-
-    public void setKeywords(String keywords) {
-        this.keywords = keywords;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Long getCtime() {
-        return ctime;
-    }
-
-    public void setCtime(Long ctime) {
-        this.ctime = ctime;
-    }
-
-    public Long getOrders() {
-        return orders;
-    }
-
-    public void setOrders(Long orders) {
-        this.orders = orders;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", pageId=").append(pageId);
-        sb.append(", pid=").append(pid);
-        sb.append(", alias=").append(alias);
-        sb.append(", keywords=").append(keywords);
-        sb.append(", description=").append(description);
-        sb.append(", ctime=").append(ctime);
-        sb.append(", orders=").append(orders);
-        sb.append(", content=").append(content);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        CmsPage other = (CmsPage) that;
-        return (this.getPageId() == null ? other.getPageId() == null : this.getPageId().equals(other.getPageId()))
-            && (this.getPid() == null ? other.getPid() == null : this.getPid().equals(other.getPid()))
-            && (this.getAlias() == null ? other.getAlias() == null : this.getAlias().equals(other.getAlias()))
-            && (this.getKeywords() == null ? other.getKeywords() == null : this.getKeywords().equals(other.getKeywords()))
-            && (this.getDescription() == null ? other.getDescription() == null : this.getDescription().equals(other.getDescription()))
-            && (this.getCtime() == null ? other.getCtime() == null : this.getCtime().equals(other.getCtime()))
-            && (this.getOrders() == null ? other.getOrders() == null : this.getOrders().equals(other.getOrders()))
-            && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getPageId() == null) ? 0 : getPageId().hashCode());
-        result = prime * result + ((getPid() == null) ? 0 : getPid().hashCode());
-        result = prime * result + ((getAlias() == null) ? 0 : getAlias().hashCode());
-        result = prime * result + ((getKeywords() == null) ? 0 : getKeywords().hashCode());
-        result = prime * result + ((getDescription() == null) ? 0 : getDescription().hashCode());
-        result = prime * result + ((getCtime() == null) ? 0 : getCtime().hashCode());
-        result = prime * result + ((getOrders() == null) ? 0 : getOrders().hashCode());
-        result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode());
-        return result;
-    }
-}

+ 0 - 673
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsPageExample.java

@@ -1,673 +0,0 @@
-package com.zheng.cms.dao.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CmsPageExample implements Serializable {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer limit;
-
-    private Integer offset;
-
-    public CmsPageExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
-    protected abstract static class GeneratedCriteria implements Serializable {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andPageIdIsNull() {
-            addCriterion("page_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdIsNotNull() {
-            addCriterion("page_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdEqualTo(Integer value) {
-            addCriterion("page_id =", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdNotEqualTo(Integer value) {
-            addCriterion("page_id <>", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdGreaterThan(Integer value) {
-            addCriterion("page_id >", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("page_id >=", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdLessThan(Integer value) {
-            addCriterion("page_id <", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdLessThanOrEqualTo(Integer value) {
-            addCriterion("page_id <=", value, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdIn(List<Integer> values) {
-            addCriterion("page_id in", values, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdNotIn(List<Integer> values) {
-            addCriterion("page_id not in", values, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdBetween(Integer value1, Integer value2) {
-            addCriterion("page_id between", value1, value2, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPageIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("page_id not between", value1, value2, "pageId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidIsNull() {
-            addCriterion("pid is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidIsNotNull() {
-            addCriterion("pid is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidEqualTo(Integer value) {
-            addCriterion("pid =", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidNotEqualTo(Integer value) {
-            addCriterion("pid <>", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidGreaterThan(Integer value) {
-            addCriterion("pid >", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidGreaterThanOrEqualTo(Integer value) {
-            addCriterion("pid >=", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidLessThan(Integer value) {
-            addCriterion("pid <", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidLessThanOrEqualTo(Integer value) {
-            addCriterion("pid <=", value, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidIn(List<Integer> values) {
-            addCriterion("pid in", values, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidNotIn(List<Integer> values) {
-            addCriterion("pid not in", values, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidBetween(Integer value1, Integer value2) {
-            addCriterion("pid between", value1, value2, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andPidNotBetween(Integer value1, Integer value2) {
-            addCriterion("pid not between", value1, value2, "pid");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasIsNull() {
-            addCriterion("alias is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasIsNotNull() {
-            addCriterion("alias is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasEqualTo(String value) {
-            addCriterion("alias =", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasNotEqualTo(String value) {
-            addCriterion("alias <>", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasGreaterThan(String value) {
-            addCriterion("alias >", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasGreaterThanOrEqualTo(String value) {
-            addCriterion("alias >=", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasLessThan(String value) {
-            addCriterion("alias <", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasLessThanOrEqualTo(String value) {
-            addCriterion("alias <=", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasLike(String value) {
-            addCriterion("alias like", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasNotLike(String value) {
-            addCriterion("alias not like", value, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasIn(List<String> values) {
-            addCriterion("alias in", values, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasNotIn(List<String> values) {
-            addCriterion("alias not in", values, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasBetween(String value1, String value2) {
-            addCriterion("alias between", value1, value2, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andAliasNotBetween(String value1, String value2) {
-            addCriterion("alias not between", value1, value2, "alias");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsIsNull() {
-            addCriterion("keywords is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsIsNotNull() {
-            addCriterion("keywords is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsEqualTo(String value) {
-            addCriterion("keywords =", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsNotEqualTo(String value) {
-            addCriterion("keywords <>", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsGreaterThan(String value) {
-            addCriterion("keywords >", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsGreaterThanOrEqualTo(String value) {
-            addCriterion("keywords >=", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsLessThan(String value) {
-            addCriterion("keywords <", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsLessThanOrEqualTo(String value) {
-            addCriterion("keywords <=", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsLike(String value) {
-            addCriterion("keywords like", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsNotLike(String value) {
-            addCriterion("keywords not like", value, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsIn(List<String> values) {
-            addCriterion("keywords in", values, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsNotIn(List<String> values) {
-            addCriterion("keywords not in", values, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsBetween(String value1, String value2) {
-            addCriterion("keywords between", value1, value2, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andKeywordsNotBetween(String value1, String value2) {
-            addCriterion("keywords not between", value1, value2, "keywords");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNull() {
-            addCriterion("description is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNotNull() {
-            addCriterion("description is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionEqualTo(String value) {
-            addCriterion("description =", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotEqualTo(String value) {
-            addCriterion("description <>", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThan(String value) {
-            addCriterion("description >", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
-            addCriterion("description >=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThan(String value) {
-            addCriterion("description <", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThanOrEqualTo(String value) {
-            addCriterion("description <=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLike(String value) {
-            addCriterion("description like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotLike(String value) {
-            addCriterion("description not like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIn(List<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> values) {
-            addCriterion("description not in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionBetween(String value1, String value2) {
-            addCriterion("description between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotBetween(String value1, String value2) {
-            addCriterion("description not between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeIsNull() {
-            addCriterion("ctime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeIsNotNull() {
-            addCriterion("ctime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeEqualTo(Long value) {
-            addCriterion("ctime =", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeNotEqualTo(Long value) {
-            addCriterion("ctime <>", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeGreaterThan(Long value) {
-            addCriterion("ctime >", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeGreaterThanOrEqualTo(Long value) {
-            addCriterion("ctime >=", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeLessThan(Long value) {
-            addCriterion("ctime <", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeLessThanOrEqualTo(Long value) {
-            addCriterion("ctime <=", value, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeIn(List<Long> values) {
-            addCriterion("ctime in", values, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeNotIn(List<Long> values) {
-            addCriterion("ctime not in", values, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeBetween(Long value1, Long value2) {
-            addCriterion("ctime between", value1, value2, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCtimeNotBetween(Long value1, Long value2) {
-            addCriterion("ctime not between", value1, value2, "ctime");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersIsNull() {
-            addCriterion("orders is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersIsNotNull() {
-            addCriterion("orders is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersEqualTo(Long value) {
-            addCriterion("orders =", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersNotEqualTo(Long value) {
-            addCriterion("orders <>", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersGreaterThan(Long value) {
-            addCriterion("orders >", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersGreaterThanOrEqualTo(Long value) {
-            addCriterion("orders >=", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersLessThan(Long value) {
-            addCriterion("orders <", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersLessThanOrEqualTo(Long value) {
-            addCriterion("orders <=", value, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersIn(List<Long> values) {
-            addCriterion("orders in", values, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersNotIn(List<Long> values) {
-            addCriterion("orders not in", values, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersBetween(Long value1, Long value2) {
-            addCriterion("orders between", value1, value2, "orders");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrdersNotBetween(Long value1, Long value2) {
-            addCriterion("orders not between", value1, value2, "orders");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria implements Serializable {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion implements Serializable {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

+ 0 - 77
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSetting.java

@@ -1,77 +0,0 @@
-package com.zheng.cms.dao.model;
-
-import java.io.Serializable;
-
-public class CmsSetting implements Serializable {
-    private Integer settingId;
-
-    private String settingKey;
-
-    private String settingValue;
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getSettingId() {
-        return settingId;
-    }
-
-    public void setSettingId(Integer settingId) {
-        this.settingId = settingId;
-    }
-
-    public String getSettingKey() {
-        return settingKey;
-    }
-
-    public void setSettingKey(String settingKey) {
-        this.settingKey = settingKey;
-    }
-
-    public String getSettingValue() {
-        return settingValue;
-    }
-
-    public void setSettingValue(String settingValue) {
-        this.settingValue = settingValue;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", settingId=").append(settingId);
-        sb.append(", settingKey=").append(settingKey);
-        sb.append(", settingValue=").append(settingValue);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        CmsSetting other = (CmsSetting) that;
-        return (this.getSettingId() == null ? other.getSettingId() == null : this.getSettingId().equals(other.getSettingId()))
-            && (this.getSettingKey() == null ? other.getSettingKey() == null : this.getSettingKey().equals(other.getSettingKey()))
-            && (this.getSettingValue() == null ? other.getSettingValue() == null : this.getSettingValue().equals(other.getSettingValue()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getSettingId() == null) ? 0 : getSettingId().hashCode());
-        result = prime * result + ((getSettingKey() == null) ? 0 : getSettingKey().hashCode());
-        result = prime * result + ((getSettingValue() == null) ? 0 : getSettingValue().hashCode());
-        return result;
-    }
-}

+ 0 - 423
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsSettingExample.java

@@ -1,423 +0,0 @@
-package com.zheng.cms.dao.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CmsSettingExample implements Serializable {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer limit;
-
-    private Integer offset;
-
-    public CmsSettingExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    public void setLimit(Integer limit) {
-        this.limit = limit;
-    }
-
-    public Integer getLimit() {
-        return limit;
-    }
-
-    public void setOffset(Integer offset) {
-        this.offset = offset;
-    }
-
-    public Integer getOffset() {
-        return offset;
-    }
-
-    protected abstract static class GeneratedCriteria implements Serializable {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andSettingIdIsNull() {
-            addCriterion("setting_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdIsNotNull() {
-            addCriterion("setting_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdEqualTo(Integer value) {
-            addCriterion("setting_id =", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdNotEqualTo(Integer value) {
-            addCriterion("setting_id <>", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdGreaterThan(Integer value) {
-            addCriterion("setting_id >", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("setting_id >=", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdLessThan(Integer value) {
-            addCriterion("setting_id <", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdLessThanOrEqualTo(Integer value) {
-            addCriterion("setting_id <=", value, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdIn(List<Integer> values) {
-            addCriterion("setting_id in", values, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdNotIn(List<Integer> values) {
-            addCriterion("setting_id not in", values, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdBetween(Integer value1, Integer value2) {
-            addCriterion("setting_id between", value1, value2, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("setting_id not between", value1, value2, "settingId");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyIsNull() {
-            addCriterion("setting_key is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyIsNotNull() {
-            addCriterion("setting_key is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyEqualTo(String value) {
-            addCriterion("setting_key =", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyNotEqualTo(String value) {
-            addCriterion("setting_key <>", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyGreaterThan(String value) {
-            addCriterion("setting_key >", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyGreaterThanOrEqualTo(String value) {
-            addCriterion("setting_key >=", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyLessThan(String value) {
-            addCriterion("setting_key <", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyLessThanOrEqualTo(String value) {
-            addCriterion("setting_key <=", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyLike(String value) {
-            addCriterion("setting_key like", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyNotLike(String value) {
-            addCriterion("setting_key not like", value, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyIn(List<String> values) {
-            addCriterion("setting_key in", values, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyNotIn(List<String> values) {
-            addCriterion("setting_key not in", values, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyBetween(String value1, String value2) {
-            addCriterion("setting_key between", value1, value2, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingKeyNotBetween(String value1, String value2) {
-            addCriterion("setting_key not between", value1, value2, "settingKey");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueIsNull() {
-            addCriterion("setting_value is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueIsNotNull() {
-            addCriterion("setting_value is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueEqualTo(String value) {
-            addCriterion("setting_value =", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueNotEqualTo(String value) {
-            addCriterion("setting_value <>", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueGreaterThan(String value) {
-            addCriterion("setting_value >", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueGreaterThanOrEqualTo(String value) {
-            addCriterion("setting_value >=", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueLessThan(String value) {
-            addCriterion("setting_value <", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueLessThanOrEqualTo(String value) {
-            addCriterion("setting_value <=", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueLike(String value) {
-            addCriterion("setting_value like", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueNotLike(String value) {
-            addCriterion("setting_value not like", value, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueIn(List<String> values) {
-            addCriterion("setting_value in", values, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueNotIn(List<String> values) {
-            addCriterion("setting_value not in", values, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueBetween(String value1, String value2) {
-            addCriterion("setting_value between", value1, value2, "settingValue");
-            return (Criteria) this;
-        }
-
-        public Criteria andSettingValueNotBetween(String value1, String value2) {
-            addCriterion("setting_value not between", value1, value2, "settingValue");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria implements Serializable {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion implements Serializable {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

+ 40 - 0
zheng-cms/zheng-cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java

@@ -3,20 +3,60 @@ package com.zheng.cms.dao.model;
 import java.io.Serializable;
 
 public class CmsTag implements Serializable {
+    /**
+     * 标签编号
+     *
+     * @mbggenerated
+     */
     private Integer tagId;
 
+    /**
+     * 名称
+     *
+     * @mbggenerated
+     */
     private String name;
 
+    /**
+     * 描述
+     *
+     * @mbggenerated
+     */
     private String description;
 
+    /**
+     * 图标
+     *
+     * @mbggenerated
+     */
     private String icon;
 
+    /**
+     * 类型(1:普通,2:热门...)
+     *
+     * @mbggenerated
+     */
     private Byte type;
 
+    /**
+     * 别名
+     *
+     * @mbggenerated
+     */
     private String alias;
 
+    /**
+     * 创建时间
+     *
+     * @mbggenerated
+     */
     private Long ctime;
 
+    /**
+     * 排序
+     *
+     * @mbggenerated
+     */
     private Long orders;
 
     private static final long serialVersionUID = 1L;

+ 7 - 9
zheng-cms/zheng-cms-dao/src/main/resources/generatorConfig.xml

@@ -8,13 +8,12 @@
     <!-- mysql驱动包 -->
     <classPathEntry location="${classPathEntry}" />
 
-    <context id="context" targetRuntime="MyBatis3">
+    <context id="MysqlContext" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>
-
-        <!-- 由于beginningDelimiter和endingDelimiter的默认值为双引号("),在Mysql中不能这么写,所以还要将这两个默认值改为**反单引号(`)**,配置如下:  -->
-        <property name="beginningDelimiter" value=""/>
-        <property name="endingDelimiter" value=""/>
+        <!-- 由于beginningDelimiter和endingDelimiter的默认值为双引号("),在Mysql中不能这么写,所以还要将这两个默认值改为`  -->
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
 
         <!-- 为生成的Java模型创建一个toString方法 -->
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"></plugin>
@@ -24,7 +23,7 @@
             <property name="suppressJavaInterface" value="false"/>
         </plugin>
 
-        <!-- 生成一个新的selectByExample方法,这个方法可以接受一个RowBounds参数,主要用来实现分页 -->
+        <!-- 生成一个新的selectByExample方法,这个方法可以接收offset和limit参数,主要用来实现分页 -->
         <plugin type="com.zheng.common.plugin.PaginationPlugin"></plugin>
 
         <!-- 生成在XML中的<cache>元素 -->
@@ -44,8 +43,9 @@
         <plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin"></plugin>
 
         <!-- 生成的代码去掉注释 -->
-        <commentGenerator>
+        <commentGenerator type="com.zheng.common.plugin.CommentGenerator">
             <property name="suppressAllComments" value="true" />
+            <property name="suppressDate" value="true"/>
         </commentGenerator>
 
         <!-- 数据库连接 -->
@@ -70,8 +70,6 @@
                 <table tableName="cms_category" domainObjectName="CmsCategory"></table>
                 <table tableName="cms_category_tag" domainObjectName="CmsCategoryTag"></table>
                 <table tableName="cms_comment" domainObjectName="CmsComment"></table>
-                <table tableName="cms_page" domainObjectName="CmsPage"></table>
-                <table tableName="cms_setting" domainObjectName="CmsSetting"></table>
                 <table tableName="cms_tag" domainObjectName="CmsTag"></table>
             </context>
 </generatorConfiguration>

+ 25 - 0
zheng-common/src/main/java/com/zheng/common/plugin/CommentGenerator.java

@@ -0,0 +1,25 @@
+package com.zheng.common.plugin;
+
+import org.mybatis.generator.api.IntrospectedColumn;
+import org.mybatis.generator.api.IntrospectedTable;
+import org.mybatis.generator.api.dom.java.Field;
+import org.mybatis.generator.internal.DefaultCommentGenerator;
+
+/**
+ * 生成model中,字段增加注释
+ * Created by ZhangShuzheng on 2017/1/11.
+ */
+public class CommentGenerator extends DefaultCommentGenerator {
+
+	@Override
+	public void addFieldComment(Field field, IntrospectedTable introspectedTable, IntrospectedColumn introspectedColumn) {
+		super.addFieldComment(field, introspectedTable, introspectedColumn);
+		if (introspectedColumn.getRemarks() != null && !introspectedColumn.getRemarks().equals("")) {
+			field.addJavaDocLine("/**");
+			field.addJavaDocLine(" * " + introspectedColumn.getRemarks());
+			addJavadocTag(field, false);
+			field.addJavaDocLine(" */");
+		}
+	}
+
+}

+ 7 - 7
zheng-common/src/main/resources/generatorConfig.vm

@@ -8,13 +8,12 @@
     <!-- mysql驱动包 -->
     <classPathEntry location="${classPathEntry}" />
 
-    <context id="context" targetRuntime="MyBatis3">
+    <context id="MysqlContext" defaultModelType="flat">
 
         <property name="javaFileEncoding" value="UTF-8"/>
-
-        <!-- 由于beginningDelimiter和endingDelimiter的默认值为双引号("),在Mysql中不能这么写,所以还要将这两个默认值改为**反单引号(`)**,配置如下:  -->
-        <property name="beginningDelimiter" value=""/>
-        <property name="endingDelimiter" value=""/>
+        <!-- 由于beginningDelimiter和endingDelimiter的默认值为双引号("),在Mysql中不能这么写,所以还要将这两个默认值改为`  -->
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
 
         <!-- 为生成的Java模型创建一个toString方法 -->
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"></plugin>
@@ -24,7 +23,7 @@
             <property name="suppressJavaInterface" value="false"/>
         </plugin>
 
-        <!-- 生成一个新的selectByExample方法,这个方法可以接受一个RowBounds参数,主要用来实现分页 -->
+        <!-- 生成一个新的selectByExample方法,这个方法可以接收offset和limit参数,主要用来实现分页 -->
         <plugin type="com.zheng.common.plugin.PaginationPlugin"></plugin>
 
         <!-- 生成在XML中的<cache>元素 -->
@@ -44,8 +43,9 @@
         <plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin"></plugin>
 
         <!-- 生成的代码去掉注释 -->
-        <commentGenerator>
+        <commentGenerator type="com.zheng.common.plugin.CommentGenerator">
             <property name="suppressAllComments" value="true" />
+            <property name="suppressDate" value="true"/>
         </commentGenerator>
 
         <!-- 数据库连接 -->

+ 1 - 1
zheng-pay/zheng-pay-dao/src/main/java/com/zheng/pay/dao/Generator.java

@@ -13,7 +13,7 @@ public class Generator {
 	private static String MODULE_PREFIX_NAME = "pay";
 	private static String JDBC_DRIVER = PropertiesFileUtil.getInstance("jdbc").get("jdbc.driver");
 	private static String JDBC_URL = PropertiesFileUtil.getInstance("jdbc").get("jdbc.url");
-	private static String JDBC_USERNAME= PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
+	private static String JDBC_USERNAME = PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
 	private static String JDBC_PASSWORD = PropertiesFileUtil.getInstance("jdbc").get("jdbc.password");
 
 	/**

+ 1 - 1
zheng-ucenter/zheng-ucenter-dao/src/main/java/com/zheng/ucenter/dao/Generator.java

@@ -13,7 +13,7 @@ public class Generator {
 	private static String MODULE_PREFIX_NAME = "ucenter";
 	private static String JDBC_DRIVER = PropertiesFileUtil.getInstance("jdbc").get("jdbc.driver");
 	private static String JDBC_URL = PropertiesFileUtil.getInstance("jdbc").get("jdbc.url");
-	private static String JDBC_USERNAME= PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
+	private static String JDBC_USERNAME = PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
 	private static String JDBC_PASSWORD = PropertiesFileUtil.getInstance("jdbc").get("jdbc.password");
 
 	/**

+ 1 - 1
zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/Generator.java

@@ -13,7 +13,7 @@ public class Generator {
 	private static String MODULE_PREFIX_NAME = "upms";
 	private static String JDBC_DRIVER = PropertiesFileUtil.getInstance("jdbc").get("jdbc.driver");
 	private static String JDBC_URL = PropertiesFileUtil.getInstance("jdbc").get("jdbc.url");
-	private static String JDBC_USERNAME= PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
+	private static String JDBC_USERNAME = PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
 	private static String JDBC_PASSWORD = PropertiesFileUtil.getInstance("jdbc").get("jdbc.password");
 
 	/**

+ 1 - 1
zheng-wechat-mp/zheng-wechat-mp-dao/src/main/java/com/zheng/wechat/mp/dao/Generator.java

@@ -13,7 +13,7 @@ public class Generator {
 	private static String MODULE_PREFIX_NAME = "wechat.mp";
 	private static String JDBC_DRIVER = PropertiesFileUtil.getInstance("jdbc").get("jdbc.driver");
 	private static String JDBC_URL = PropertiesFileUtil.getInstance("jdbc").get("jdbc.url");
-	private static String JDBC_USERNAME= PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
+	private static String JDBC_USERNAME = PropertiesFileUtil.getInstance("jdbc").get("jdbc.username");
 	private static String JDBC_PASSWORD = PropertiesFileUtil.getInstance("jdbc").get("jdbc.password");
 
 	/**