自动生成代码移到dao包

cms/cms-dao/src/main/java/com/zheng/cms/mapper/BookMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/BookMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.Book;
-import com.zheng.cms.model.BookExample;
+import com.zheng.cms.dao.model.Book;
+import com.zheng.cms.dao.model.BookExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/BookMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/BookMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.BookMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.Book" >
+<mapper namespace="com.zheng.cms.dao.mapper.BookMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.Book" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="userid" property="userid" jdbcType="INTEGER" />
     <result column="name" property="name" jdbcType="VARCHAR" />
@@ -67,7 +67,7 @@
   <sql id="Base_Column_List" >
     id, userid, name
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.BookExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.BookExample" >
     select
     <if test="distinct" >
       distinct
@@ -99,20 +99,20 @@
     delete from book
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.BookExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.BookExample" >
     delete from book
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.Book" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.Book" >
     <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into book (userid, name)
     values (#{userid,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.Book" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.Book" >
     <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -134,7 +134,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.BookExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.BookExample" resultType="java.lang.Integer" >
     select count(*) from book
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -166,7 +166,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.Book" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.Book" >
     update book
     <set >
       <if test="userid != null" >
@@ -178,7 +178,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.Book" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.Book" >
     update book
     set userid = #{userid,jdbcType=INTEGER},
       name = #{name,jdbcType=VARCHAR}

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleCategoryMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleCategoryMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsArticleCategory;
-import com.zheng.cms.model.CmsArticleCategoryExample;
+import com.zheng.cms.dao.model.CmsArticleCategory;
+import com.zheng.cms.dao.model.CmsArticleCategoryExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleCategoryMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleCategoryMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsArticleCategoryMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsArticleCategory" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsArticleCategoryMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsArticleCategory" >
     <id column="article_category_id" property="articleCategoryId" jdbcType="INTEGER" />
     <result column="article_id" property="articleId" jdbcType="INTEGER" />
     <result column="category_id" property="categoryId" jdbcType="INTEGER" />
@@ -67,7 +67,7 @@
   <sql id="Base_Column_List" >
     article_category_id, article_id, category_id
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsArticleCategoryExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsArticleCategoryExample" >
     select
     <if test="distinct" >
       distinct
@@ -99,19 +99,19 @@
     delete from cms_article_category
     where article_category_id = #{articleCategoryId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsArticleCategoryExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsArticleCategoryExample" >
     delete from cms_article_category
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsArticleCategory" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsArticleCategory" >
     insert into cms_article_category (article_category_id, article_id, category_id
       )
     values (#{articleCategoryId,jdbcType=INTEGER}, #{articleId,jdbcType=INTEGER}, #{categoryId,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsArticleCategory" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsArticleCategory" >
     insert into cms_article_category
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="articleCategoryId != null" >
@@ -136,7 +136,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsArticleCategoryExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsArticleCategoryExample" resultType="java.lang.Integer" >
     select count(*) from cms_article_category
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -168,7 +168,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsArticleCategory" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsArticleCategory" >
     update cms_article_category
     <set >
       <if test="articleId != null" >
@@ -180,7 +180,7 @@
     </set>
     where article_category_id = #{articleCategoryId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsArticleCategory" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsArticleCategory" >
     update cms_article_category
     set article_id = #{articleId,jdbcType=INTEGER},
       category_id = #{categoryId,jdbcType=INTEGER}

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsArticle;
-import com.zheng.cms.model.CmsArticleExample;
+import com.zheng.cms.dao.model.CmsArticle;
+import com.zheng.cms.dao.model.CmsArticleExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsArticleMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsArticle" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsArticleMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsArticle" >
     <id column="article_id" property="articleId" jdbcType="INTEGER" />
     <result column="title" property="title" jdbcType="VARCHAR" />
     <result column="author" property="author" jdbcType="VARCHAR" />
@@ -19,7 +19,7 @@
     <result column="ctime" property="ctime" jdbcType="BIGINT" />
     <result column="orders" property="orders" jdbcType="BIGINT" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.model.CmsArticle" extends="BaseResultMap" >
+  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.dao.model.CmsArticle" extends="BaseResultMap" >
     <result column="content" property="content" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -87,7 +87,7 @@
   <sql id="Blob_Column_List" >
     content
   </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.model.CmsArticleExample" >
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsArticleExample" >
     select
     <if test="distinct" >
       distinct
@@ -103,7 +103,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsArticleExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsArticleExample" >
     select
     <if test="distinct" >
       distinct
@@ -137,13 +137,13 @@
     delete from cms_article
     where article_id = #{articleId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsArticleExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsArticleExample" >
     delete from cms_article
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsArticle" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsArticle" >
     <selectKey resultType="java.lang.Integer" keyProperty="articleId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -160,7 +160,7 @@
       #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsArticle" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsArticle" >
     <selectKey resultType="java.lang.Integer" keyProperty="articleId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -266,7 +266,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsArticleExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsArticleExample" resultType="java.lang.Integer" >
     select count(*) from cms_article
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -376,7 +376,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsArticle" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsArticle" >
     update cms_article
     <set >
       <if test="title != null" >
@@ -430,7 +430,7 @@
     </set>
     where article_id = #{articleId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.model.CmsArticle" >
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsArticle" >
     update cms_article
     set title = #{title,jdbcType=VARCHAR},
       author = #{author,jdbcType=VARCHAR},
@@ -450,7 +450,7 @@
       content = #{content,jdbcType=LONGVARCHAR}
     where article_id = #{articleId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsArticle" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsArticle" >
     update cms_article
     set title = #{title,jdbcType=VARCHAR},
       author = #{author,jdbcType=VARCHAR},

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleTagMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleTagMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsArticleTag;
-import com.zheng.cms.model.CmsArticleTagExample;
+import com.zheng.cms.dao.model.CmsArticleTag;
+import com.zheng.cms.dao.model.CmsArticleTagExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsArticleTagMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsArticleTagMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsArticleTagMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsArticleTag" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsArticleTagMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsArticleTag" >
     <id column="article_tag_id" property="articleTagId" jdbcType="INTEGER" />
     <result column="article_id" property="articleId" jdbcType="INTEGER" />
     <result column="tag_id" property="tagId" jdbcType="INTEGER" />
@@ -67,7 +67,7 @@
   <sql id="Base_Column_List" >
     article_tag_id, article_id, tag_id
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsArticleTagExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsArticleTagExample" >
     select
     <if test="distinct" >
       distinct
@@ -99,19 +99,19 @@
     delete from cms_article_tag
     where article_tag_id = #{articleTagId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsArticleTagExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsArticleTagExample" >
     delete from cms_article_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsArticleTag" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsArticleTag" >
     insert into cms_article_tag (article_tag_id, article_id, tag_id
       )
     values (#{articleTagId,jdbcType=INTEGER}, #{articleId,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsArticleTag" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsArticleTag" >
     insert into cms_article_tag
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="articleTagId != null" >
@@ -136,7 +136,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsArticleTagExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsArticleTagExample" resultType="java.lang.Integer" >
     select count(*) from cms_article_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -168,7 +168,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsArticleTag" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsArticleTag" >
     update cms_article_tag
     <set >
       <if test="articleId != null" >
@@ -180,7 +180,7 @@
     </set>
     where article_tag_id = #{articleTagId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsArticleTag" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsArticleTag" >
     update cms_article_tag
     set article_id = #{articleId,jdbcType=INTEGER},
       tag_id = #{tagId,jdbcType=INTEGER}

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCategoryMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsCategory;
-import com.zheng.cms.model.CmsCategoryExample;
+import com.zheng.cms.dao.model.CmsCategory;
+import com.zheng.cms.dao.model.CmsCategoryExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCategoryMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsCategoryMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsCategory" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsCategoryMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsCategory" >
     <id column="category_id" property="categoryId" jdbcType="INTEGER" />
     <result column="pid" property="pid" jdbcType="INTEGER" />
     <result column="level" property="level" jdbcType="TINYINT" />
@@ -74,7 +74,7 @@
   <sql id="Base_Column_List" >
     category_id, pid, level, name, description, icon, type, alias, ctime, orders
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsCategoryExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsCategoryExample" >
     select
     <if test="distinct" >
       distinct
@@ -106,13 +106,13 @@
     delete from cms_category
     where category_id = #{categoryId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsCategoryExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsCategoryExample" >
     delete from cms_category
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsCategory" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsCategory" >
     <selectKey resultType="java.lang.Integer" keyProperty="categoryId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -123,7 +123,7 @@
       #{description,jdbcType=VARCHAR}, #{icon,jdbcType=VARCHAR}, #{type,jdbcType=TINYINT}, 
       #{alias,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT})
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsCategory" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsCategory" >
     <selectKey resultType="java.lang.Integer" keyProperty="categoryId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -187,7 +187,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsCategoryExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsCategoryExample" resultType="java.lang.Integer" >
     select count(*) from cms_category
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -247,7 +247,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsCategory" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsCategory" >
     update cms_category
     <set >
       <if test="pid != null" >
@@ -280,7 +280,7 @@
     </set>
     where category_id = #{categoryId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsCategory" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsCategory" >
     update cms_category
     set pid = #{pid,jdbcType=INTEGER},
       level = #{level,jdbcType=TINYINT},

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCategoryTagMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryTagMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsCategoryTag;
-import com.zheng.cms.model.CmsCategoryTagExample;
+import com.zheng.cms.dao.model.CmsCategoryTag;
+import com.zheng.cms.dao.model.CmsCategoryTagExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCategoryTagMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCategoryTagMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsCategoryTagMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsCategoryTag" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsCategoryTagMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsCategoryTag" >
     <id column="category_tag_id" property="categoryTagId" jdbcType="INTEGER" />
     <result column="category_id" property="categoryId" jdbcType="INTEGER" />
     <result column="tag_id" property="tagId" jdbcType="INTEGER" />
@@ -67,7 +67,7 @@
   <sql id="Base_Column_List" >
     category_tag_id, category_id, tag_id
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsCategoryTagExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsCategoryTagExample" >
     select
     <if test="distinct" >
       distinct
@@ -99,19 +99,19 @@
     delete from cms_category_tag
     where category_tag_id = #{categoryTagId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsCategoryTagExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsCategoryTagExample" >
     delete from cms_category_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsCategoryTag" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsCategoryTag" >
     insert into cms_category_tag (category_tag_id, category_id, tag_id
       )
     values (#{categoryTagId,jdbcType=INTEGER}, #{categoryId,jdbcType=INTEGER}, #{tagId,jdbcType=INTEGER}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsCategoryTag" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsCategoryTag" >
     insert into cms_category_tag
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="categoryTagId != null" >
@@ -136,7 +136,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsCategoryTagExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsCategoryTagExample" resultType="java.lang.Integer" >
     select count(*) from cms_category_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -168,7 +168,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsCategoryTag" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsCategoryTag" >
     update cms_category_tag
     <set >
       <if test="categoryId != null" >
@@ -180,7 +180,7 @@
     </set>
     where category_tag_id = #{categoryTagId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsCategoryTag" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsCategoryTag" >
     update cms_category_tag
     set category_id = #{categoryId,jdbcType=INTEGER},
       tag_id = #{tagId,jdbcType=INTEGER}

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCommentMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCommentMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsComment;
-import com.zheng.cms.model.CmsCommentExample;
+import com.zheng.cms.dao.model.CmsComment;
+import com.zheng.cms.dao.model.CmsCommentExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsCommentMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsCommentMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsCommentMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsComment" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsCommentMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsComment" >
     <id column="comment_id" property="commentId" jdbcType="INTEGER" />
     <result column="pid" property="pid" jdbcType="INTEGER" />
     <result column="article_id" property="articleId" jdbcType="INTEGER" />
@@ -11,7 +11,7 @@
     <result column="agent" property="agent" jdbcType="VARCHAR" />
     <result column="ctime" property="ctime" jdbcType="BIGINT" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.model.CmsComment" extends="BaseResultMap" >
+  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.dao.model.CmsComment" extends="BaseResultMap" >
     <result column="content" property="content" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -78,7 +78,7 @@
   <sql id="Blob_Column_List" >
     content
   </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.model.CmsCommentExample" >
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsCommentExample" >
     select
     <if test="distinct" >
       distinct
@@ -94,7 +94,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsCommentExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsCommentExample" >
     select
     <if test="distinct" >
       distinct
@@ -128,13 +128,13 @@
     delete from cms_comment
     where comment_id = #{commentId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsCommentExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsCommentExample" >
     delete from cms_comment
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsComment" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsComment" >
     insert into cms_comment (comment_id, pid, article_id, 
       user_id, status, ip, 
       agent, ctime, content
@@ -144,7 +144,7 @@
       #{agent,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsComment" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsComment" >
     insert into cms_comment
     <trim prefix="(" suffix=")" suffixOverrides="," >
       <if test="commentId != null" >
@@ -205,7 +205,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsCommentExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsCommentExample" resultType="java.lang.Integer" >
     select count(*) from cms_comment
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -275,7 +275,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsComment" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsComment" >
     update cms_comment
     <set >
       <if test="pid != null" >
@@ -305,7 +305,7 @@
     </set>
     where comment_id = #{commentId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.model.CmsComment" >
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.dao.model.CmsComment" >
     update cms_comment
     set pid = #{pid,jdbcType=INTEGER},
       article_id = #{articleId,jdbcType=INTEGER},
@@ -317,7 +317,7 @@
       content = #{content,jdbcType=LONGVARCHAR}
     where comment_id = #{commentId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsComment" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsComment" >
     update cms_comment
     set pid = #{pid,jdbcType=INTEGER},
       article_id = #{articleId,jdbcType=INTEGER},

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsTagMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.CmsTag;
-import com.zheng.cms.model.CmsTagExample;
+import com.zheng.cms.dao.model.CmsTag;
+import com.zheng.cms.dao.model.CmsTagExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/CmsTagMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/CmsTagMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.CmsTagMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.CmsTag" >
+<mapper namespace="com.zheng.cms.dao.mapper.CmsTagMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.CmsTag" >
     <id column="tag_id" property="tagId" jdbcType="INTEGER" />
     <result column="name" property="name" jdbcType="VARCHAR" />
     <result column="description" property="description" jdbcType="VARCHAR" />
@@ -72,7 +72,7 @@
   <sql id="Base_Column_List" >
     tag_id, name, description, icon, type, alias, ctime, orders
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.CmsTagExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.CmsTagExample" >
     select
     <if test="distinct" >
       distinct
@@ -104,13 +104,13 @@
     delete from cms_tag
     where tag_id = #{tagId,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.CmsTagExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.CmsTagExample" >
     delete from cms_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.CmsTag" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.CmsTag" >
     <selectKey resultType="java.lang.Integer" keyProperty="tagId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -121,7 +121,7 @@
       #{type,jdbcType=TINYINT}, #{alias,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
       #{orders,jdbcType=BIGINT})
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.CmsTag" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.CmsTag" >
     <selectKey resultType="java.lang.Integer" keyProperty="tagId" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -173,7 +173,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.CmsTagExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.CmsTagExample" resultType="java.lang.Integer" >
     select count(*) from cms_tag
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -225,7 +225,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.CmsTag" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.CmsTag" >
     update cms_tag
     <set >
       <if test="name != null" >
@@ -252,7 +252,7 @@
     </set>
     where tag_id = #{tagId,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.CmsTag" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.CmsTag" >
     update cms_tag
     set name = #{name,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},

cms/cms-dao/src/main/java/com/zheng/cms/mapper/UserMapper.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/UserMapper.java

@@ -1,7 +1,7 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import com.zheng.cms.model.User;
-import com.zheng.cms.model.UserExample;
+import com.zheng.cms.dao.model.User;
+import com.zheng.cms.dao.model.UserExample;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

cms/cms-dao/src/main/java/com/zheng/cms/mapper/UserMapper.xml → cms/cms-dao/src/main/java/com/zheng/cms/dao/mapper/UserMapper.xml

@@ -1,7 +1,7 @@
 <?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.mapper.UserMapper" >
-  <resultMap id="BaseResultMap" type="com.zheng.cms.model.User" >
+<mapper namespace="com.zheng.cms.dao.mapper.UserMapper" >
+  <resultMap id="BaseResultMap" type="com.zheng.cms.dao.model.User" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="username" property="username" jdbcType="VARCHAR" />
     <result column="password" property="password" jdbcType="VARCHAR" />
@@ -9,7 +9,7 @@
     <result column="sex" property="sex" jdbcType="INTEGER" />
     <result column="ctime" property="ctime" jdbcType="BIGINT" />
   </resultMap>
-  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.model.User" extends="BaseResultMap" >
+  <resultMap id="ResultMapWithBLOBs" type="com.zheng.cms.dao.model.User" extends="BaseResultMap" >
     <result column="content" property="content" jdbcType="LONGVARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -76,7 +76,7 @@
   <sql id="Blob_Column_List" >
     content
   </sql>
-  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.model.UserExample" >
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.zheng.cms.dao.model.UserExample" >
     select
     <if test="distinct" >
       distinct
@@ -92,7 +92,7 @@
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.model.UserExample" >
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.zheng.cms.dao.model.UserExample" >
     select
     <if test="distinct" >
       distinct
@@ -126,13 +126,13 @@
     delete from user
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.zheng.cms.model.UserExample" >
+  <delete id="deleteByExample" parameterType="com.zheng.cms.dao.model.UserExample" >
     delete from user
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.zheng.cms.model.User" >
+  <insert id="insert" parameterType="com.zheng.cms.dao.model.User" >
     <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -143,7 +143,7 @@
       #{sex,jdbcType=INTEGER}, #{ctime,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}
       )
   </insert>
-  <insert id="insertSelective" parameterType="com.zheng.cms.model.User" >
+  <insert id="insertSelective" parameterType="com.zheng.cms.dao.model.User" >
     <selectKey resultType="java.lang.Integer" keyProperty="id" order="AFTER" >
       SELECT LAST_INSERT_ID()
     </selectKey>
@@ -189,7 +189,7 @@
       </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.zheng.cms.model.UserExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.zheng.cms.dao.model.UserExample" resultType="java.lang.Integer" >
     select count(*) from user
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
@@ -249,7 +249,7 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.model.User" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.zheng.cms.dao.model.User" >
     update user
     <set >
       <if test="username != null" >
@@ -273,7 +273,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.model.User" >
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.zheng.cms.dao.model.User" >
     update user
     set username = #{username,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},
@@ -283,7 +283,7 @@
       content = #{content,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.model.User" >
+  <update id="updateByPrimaryKey" parameterType="com.zheng.cms.dao.model.User" >
     update user
     set username = #{username,jdbcType=VARCHAR},
       password = #{password,jdbcType=VARCHAR},

cms/cms-dao/src/main/java/com/zheng/cms/model/Book.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/Book.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/BookExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/BookExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticle.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticle.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticleCategory.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleCategory.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticleCategoryExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleCategoryExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticleExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticleTag.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleTag.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsArticleTagExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsArticleTagExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsCategory.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategory.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsCategoryExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsCategoryTag.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryTag.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsCategoryTagExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCategoryTagExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsComment.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsComment.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsCommentExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsCommentExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsTag.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTag.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/CmsTagExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/CmsTagExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/java/com/zheng/cms/model/User.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/User.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.io.Serializable;
 

cms/cms-dao/src/main/java/com/zheng/cms/model/UserExample.java → cms/cms-dao/src/main/java/com/zheng/cms/dao/model/UserExample.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.util.ArrayList;
 import java.util.List;

cms/cms-dao/src/main/resources/applicationContext-jdbc.xml

@@ -47,11 +47,11 @@
 	<bean id="sqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
 		<property name="configLocation" value="classpath:mybatis-config.xml" />
-		<property name="mapperLocations" value="classpath:com/zheng/cms/mapper/*Mapper.xml" />
+		<property name="mapperLocations" value="classpath:com/zheng/cms/dao/mapper/*Mapper.xml" />
 	</bean>
 	<!-- Mapper接口所在包名，Spring会自动查找其下的Mapper -->
 	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
-		<property name="basePackage" value="com.zheng.cms.mapper" />
+		<property name="basePackage" value="com.zheng.cms.dao.mapper" />
 		<property name="sqlSessionFactoryBeanName" value="sqlSessionFactory" />
 	</bean>
 

cms/cms-dao/src/main/resources/generatorConfig.xml

@@ -39,13 +39,13 @@
 			password="${jdbc.password}" />
 
 		<!-- model生成 -->
-		<javaModelGenerator targetPackage="com.zheng.cms.model" targetProject="src/main/java" />
+		<javaModelGenerator targetPackage="com.zheng.cms.dao.model" targetProject="src/main/java" />
 
 		<!-- MapperXML生成 -->
-		<sqlMapGenerator targetPackage="com.zheng.cms.mapper" targetProject="src/main/java" />
+		<sqlMapGenerator targetPackage="com.zheng.cms.dao.mapper" targetProject="src/main/java" />
 
 		<!-- Mapper接口生成 -->
-		<javaClientGenerator targetPackage="com.zheng.cms.mapper" targetProject="src/main/java" type="XMLMAPPER" />
+		<javaClientGenerator targetPackage="com.zheng.cms.dao.mapper" targetProject="src/main/java" type="XMLMAPPER" />
 
 		<!-- 需要映射的表 -->
 		<table tableName="user" domainObjectName="User">

cms/cms-dao/src/main/resources/mybatis-config.xml

@@ -6,7 +6,7 @@
 
 	<!-- 该包下的model不用写包名，会使用 model的首字母小写的非限定类名来作为它的别名，若有注解@Alias("xxx")，则别名为注解值 -->
 	<typeAliases>
-		<package name="com.zheng.cms.model" />
+		<package name="com.zheng.cms.dao.model" />
 	</typeAliases>
 
 </configuration>

cms/cms-service/src/main/java/com/zheng/cms/mapper/UserVOMapper.java → cms/cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.java

@@ -1,12 +1,8 @@
-package com.zheng.cms.mapper;
+package com.zheng.cms.dao.mapper;
 
-import java.util.List;
-import java.util.Map;
-
-import com.zheng.cms.model.User;
 import org.springframework.stereotype.Repository;
 
-import com.zheng.cms.model.UserVO;
+import com.zheng.cms.dao.model.UserVO;
 
 /**
  * 用户mapper

cms/cms-service/src/main/java/com/zheng/cms/mapper/UserVOMapper.xml → cms/cms-service/src/main/java/com/zheng/cms/dao/mapper/UserVOMapper.xml

@@ -1,6 +1,6 @@
 <?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.mapper.UserVOMapper">
+<mapper namespace="com.zheng.cms.dao.mapper.UserVOMapper">
 	
 	<!-- 缓存 -->
 	<!--<cache type="PERPETUAL" eviction="LRU" flushInterval="60000" size="1024" readOnly="true"/>-->

cms/cms-service/src/main/java/com/zheng/cms/model/UserVO.java → cms/cms-service/src/main/java/com/zheng/cms/dao/model/UserVO.java

@@ -1,4 +1,4 @@
-package com.zheng.cms.model;
+package com.zheng.cms.dao.model;
 
 import java.awt.print.Book;
 import java.util.List;

cms/cms-service/src/main/java/com/zheng/cms/service/UserService.java

@@ -1,7 +1,7 @@
 package com.zheng.cms.service;
 
-import com.zheng.cms.mapper.UserMapper;
-import com.zheng.cms.model.UserVO;
+import com.zheng.cms.dao.mapper.UserMapper;
+import com.zheng.cms.dao.model.UserVO;
 
 /**
  * 用户service接口

cms/cms-service/src/main/java/com/zheng/cms/service/impl/UserServiceImpl.java

@@ -1,8 +1,8 @@
 package com.zheng.cms.service.impl;
 
-import com.zheng.cms.mapper.UserMapper;
-import com.zheng.cms.mapper.UserVOMapper;
-import com.zheng.cms.model.UserVO;
+import com.zheng.cms.dao.mapper.UserMapper;
+import com.zheng.cms.dao.mapper.UserVOMapper;
+import com.zheng.cms.dao.model.UserVO;
 import com.zheng.cms.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

cms/cms-service/src/test/java/com/zheng/cms/service/UserServiceTest.java

@@ -1,7 +1,7 @@
 package com.zheng.cms.service;
 
-import com.zheng.cms.model.User;
-import com.zheng.cms.model.UserVO;
+import com.zheng.cms.dao.model.User;
+import com.zheng.cms.dao.model.UserVO;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;

cms/cms-web/src/main/java/com/zheng/cms/controller/HelloController.java

@@ -1,13 +1,7 @@
 package com.zheng.cms.controller;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.zheng.cms.model.User;
+import com.zheng.cms.dao.model.User;
+import com.zheng.cms.service.impl.UserServiceImpl;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.builder.ReflectionToStringBuilder;
 import org.slf4j.Logger;
@@ -16,16 +10,15 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
-import com.zheng.cms.service.impl.UserServiceImpl;
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Map;
 
 /**
  * 示例controller

cms/cms-web/src/main/java/com/zheng/cms/controller/UserController.java

@@ -1,7 +1,7 @@
 package com.zheng.cms.controller;
 
-import com.zheng.cms.model.User;
-import com.zheng.cms.model.UserExample;
+import com.zheng.cms.dao.model.User;
+import com.zheng.cms.dao.model.UserExample;
 import com.zheng.cms.service.UserService;
 import com.zheng.common.util.Paginator;
 import org.slf4j.Logger;

cms/cms-web/src/main/resources/log4j.properties

@@ -18,6 +18,6 @@ log4j.logger.druid.sql.Statement=warn,stdout
 log4j.logger.druid.sql.ResultSet=warn,stdout
 
 # MyBatis logging configuration
-log4j.logger.com.zheng.cms.mapper=debug
-#log4j.logger.com.zheng.cms.mapper.UserMapper=debug
-#log4j.logger.com.zheng.cms.mapper.UserMapper.selectUser=debug
+log4j.logger.com.zheng.cms.dao.mapper=debug
+#log4j.logger.com.zheng.cms.dao.mapper.UserMapper=debug
+#log4j.logger.com.zheng.cms.dao.mapper.UserMapper.selectUser=debug