diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/Generator.java b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/Generator.java
new file mode 100644
index 0000000000000000000000000000000000000000..63881629f1a47cd0aab15a3efa1eaeb024beb109
--- /dev/null
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/Generator.java
@@ -0,0 +1,27 @@
+package com.zheng.upms.dao;
+
+import com.zheng.common.util.MybatisGeneratorConfigUtil;
+import com.zheng.common.util.PropertiesFileUtil;
+
+/**
+ * 代码生成类
+ * Created by ZhangShuzheng on 2017/1/10.
+ */
+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_PASSWORD = PropertiesFileUtil.getInstance("jdbc").get("jdbc.password");
+
+	/**
+	 * 根据模板生成generatorConfig.xml文件
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		MybatisGeneratorConfigUtil.generator(JDBC_DRIVER, JDBC_URL, JDBC_USERNAME, JDBC_PASSWORD, MODULE_PREFIX_NAME);
+	}
+
+}
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml
index 0db2ca5f77e5ba8daddf79f85863d6f7ac50393b..f4fc154b04cbe1a348fe604d28a8190f2ef05c8a 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsOrganizationMapper.xml
@@ -107,20 +107,17 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsOrganization" >
-    <selectKey resultType="java.lang.Integer" keyProperty="organizationId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into upms_organization (system_id, name, description
-      )
-    values (#{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}
-      )
+    insert into upms_organization (organization_id, system_id, name, 
+      description)
+    values (#{organizationId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsOrganization" >
-    <selectKey resultType="java.lang.Integer" keyProperty="organizationId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into upms_organization
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="organizationId != null" >
+        organization_id,
+      </if>
       <if test="systemId != null" >
         system_id,
       </if>
@@ -132,6 +129,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="organizationId != null" >
+        #{organizationId,jdbcType=INTEGER},
+      </if>
       <if test="systemId != null" >
         #{systemId,jdbcType=INTEGER},
       </if>
@@ -201,5 +201,5 @@
       description = #{description,jdbcType=VARCHAR}
     where organization_id = #{organizationId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml
index 923c9e8b708a46073850163cf0594c71bbe03b76..6449750cbb847f2bbaae7ae7cd1a644583661e24 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsPermissionMapper.xml
@@ -105,23 +105,23 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsPermission" >
-    <selectKey resultType="java.lang.Integer" keyProperty="permissionId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into upms_permission (system_id)
-    values (#{systemId,jdbcType=INTEGER})
+    insert into upms_permission (permission_id, system_id)
+    values (#{permissionId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsPermission" >
-    <selectKey resultType="java.lang.Integer" keyProperty="permissionId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into upms_permission
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="permissionId != null" >
+        permission_id,
+      </if>
       <if test="systemId != null" >
         system_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="permissionId != null" >
+        #{permissionId,jdbcType=INTEGER},
+      </if>
       <if test="systemId != null" >
         #{systemId,jdbcType=INTEGER},
       </if>
@@ -169,5 +169,5 @@
     set system_id = #{systemId,jdbcType=INTEGER}
     where permission_id = #{permissionId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml
index d98c722d3716a5b1050fe17cb0f8f9ef69af49a0..abf18b7b88815ae4a31e81325886fffa7fc0b1c6 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRoleMapper.xml
@@ -110,22 +110,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsRole" >
-    <selectKey resultType="java.lang.Integer" keyProperty="roleId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into upms_role (system_id, name, description, 
-      status, ctime, orders
-      )
-    values (#{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT}
-      )
+    insert into upms_role (role_id, system_id, name, 
+      description, status, ctime, 
+      orders)
+    values (#{roleId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, 
+      #{description,jdbcType=VARCHAR}, #{status,jdbcType=TINYINT}, #{ctime,jdbcType=BIGINT}, 
+      #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsRole" >
-    <selectKey resultType="java.lang.Integer" keyProperty="roleId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into upms_role
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
+        role_id,
+      </if>
       <if test="systemId != null" >
         system_id,
       </if>
@@ -146,6 +143,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="roleId != null" >
+        #{roleId,jdbcType=INTEGER},
+      </if>
       <if test="systemId != null" >
         #{systemId,jdbcType=INTEGER},
       </if>
@@ -248,5 +248,5 @@
       orders = #{orders,jdbcType=BIGINT}
     where role_id = #{roleId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml
index f1e40fba9d786e829916911945fe15f1a759316a..5104e7f8bf310e047d153d69c7d05dbfa5cc4fd5 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsRolePermissionMapper.xml
@@ -186,5 +186,5 @@
       permission_id = #{permissionId,jdbcType=INTEGER}
     where role_permission_id = #{rolePermissionId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml
index 71db87b8783423ed7fe98e491af3a75ea32930e9..ac0ad6759f8e8adc70625fd015c507bf79814578 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsSystemMapper.xml
@@ -110,20 +110,19 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsSystem" >
-    <selectKey resultType="java.lang.Integer" keyProperty="systemId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into upms_system (icon, basepath, status, 
-      name, ctime, orders)
-    values (#{icon,jdbcType=VARCHAR}, #{basepath,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, 
-      #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, #{orders,jdbcType=BIGINT})
+    insert into upms_system (system_id, icon, basepath, 
+      status, name, ctime, 
+      orders)
+    values (#{systemId,jdbcType=INTEGER}, #{icon,jdbcType=VARCHAR}, #{basepath,jdbcType=VARCHAR}, 
+      #{status,jdbcType=SMALLINT}, #{name,jdbcType=VARCHAR}, #{ctime,jdbcType=BIGINT}, 
+      #{orders,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsSystem" >
-    <selectKey resultType="java.lang.Integer" keyProperty="systemId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into upms_system
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="systemId != null" >
+        system_id,
+      </if>
       <if test="icon != null" >
         icon,
       </if>
@@ -144,6 +143,9 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="systemId != null" >
+        #{systemId,jdbcType=INTEGER},
+      </if>
       <if test="icon != null" >
         #{icon,jdbcType=VARCHAR},
       </if>
@@ -246,5 +248,5 @@
       orders = #{orders,jdbcType=BIGINT}
     where system_id = #{systemId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml
index 12431985c559022133352cd85748f435a4d05432..aea5d2d1a20a1b7baedd09ec243d2dddadb3ad57 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserMapper.xml
@@ -105,23 +105,23 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.zheng.upms.dao.model.UpmsUser" >
-    <selectKey resultType="java.lang.Integer" keyProperty="userId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into upms_user (system_id)
-    values (#{systemId,jdbcType=INTEGER})
+    insert into upms_user (user_id, system_id)
+    values (#{userId,jdbcType=INTEGER}, #{systemId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.zheng.upms.dao.model.UpmsUser" >
-    <selectKey resultType="java.lang.Integer" keyProperty="userId" order="AFTER" >
-      SELECT LAST_INSERT_ID()
-    </selectKey>
     insert into upms_user
     <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        user_id,
+      </if>
       <if test="systemId != null" >
         system_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="userId != null" >
+        #{userId,jdbcType=INTEGER},
+      </if>
       <if test="systemId != null" >
         #{systemId,jdbcType=INTEGER},
       </if>
@@ -169,5 +169,5 @@
     set system_id = #{systemId,jdbcType=INTEGER}
     where user_id = #{userId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml
index 0b779aaede4a6da1354c18c5d61c043551309104..40bb57bf76a517a4235c03d0312fb5d9c2e05404 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserOrganizationMapper.xml
@@ -186,5 +186,5 @@
       organization_id = #{organizationId,jdbcType=INTEGER}
     where user_organization_id = #{userOrganizationId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml
index e4be4ff085361694889788e432d8de92e5b7b3d2..7f9625b15a1ec3a82a8e15901484d0424eed14cc 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserPermissionMapper.xml
@@ -186,5 +186,5 @@
       permission_id = #{permissionId,jdbcType=INTEGER}
     where user_permission_id = #{userPermissionId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml
index cdc8a685aa04af66ad48abf655b11c14121e8014..43f8f8bb0c8c22ad1e8301095dc24cab614ebe44 100644
--- a/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/java/com/zheng/upms/dao/mapper/UpmsUserRoleMapper.xml
@@ -201,5 +201,5 @@
       role = #{role,jdbcType=INTEGER}
     where user_role_id = #{userRoleId,jdbcType=INTEGER}
   </update>
-  <cache />
+  <cache type="org.mybatis.caches.ehcache.LoggingEhcache" />
 </mapper>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml b/zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml
index 28208de84824a498a077a52f761155cc164f8c6f..341b2dd75da2bc870aaebe0717617ec5980e5c51 100644
--- a/zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml
+++ b/zheng-upms/zheng-upms-dao/src/main/resources/generatorConfig.xml
@@ -2,76 +2,76 @@
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
 <generatorConfiguration>
 
-	<!-- 配置文件 -->
-	<properties resource="jdbc.properties"></properties>
+    <!-- 配置文件 -->
+    <properties resource="jdbc.properties"></properties>
 
-	<!-- mysql驱动包 -->
-	<classPathEntry location="${classPathEntry}" />
+    <!-- mysql驱动包 -->
+    <classPathEntry location="${classPathEntry}" />
 
-	<context id="context" targetRuntime="MyBatis3">
+    <context id="context" targetRuntime="MyBatis3">
 
-		<property name="javaFileEncoding" value="UTF-8"/>
+        <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方法 -->
+        <!-- 为生成的Java模型创建一个toString方法 -->
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"></plugin>
 
-		<!-- 为生成的Java模型类添加序列化接口，并生成serialVersionUID字段 -->
-		<plugin type="com.zheng.common.plugin.SerializablePlugin">
-			<property name="suppressJavaInterface" value="false"/>
-		</plugin>
+        <!-- 为生成的Java模型类添加序列化接口，并生成serialVersionUID字段 -->
+        <plugin type="com.zheng.common.plugin.SerializablePlugin">
+            <property name="suppressJavaInterface" value="false"/>
+        </plugin>
 
-		<!-- 生成一个新的selectByExample方法，这个方法可以接受一个RowBounds参数，主要用来实现分页 -->
+        <!-- 生成一个新的selectByExample方法，这个方法可以接受一个RowBounds参数，主要用来实现分页 -->
         <plugin type="com.zheng.common.plugin.PaginationPlugin"></plugin>
 
-		<!-- 生成在XML中的<cache>元素 -->
-		<plugin type="org.mybatis.generator.plugins.CachePlugin"></plugin>
-
-		<!-- Java模型生成equals和hashcode方法 -->
-		<plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin"></plugin>
-
-		<!-- 生成的代码去掉注释 -->
-		<commentGenerator>
-			<property name="suppressAllComments" value="true" />
-		</commentGenerator>
-
-		<!-- 数据库连接 -->
-		<jdbcConnection driverClass="${jdbc.driver}"
-			connectionURL="${jdbc.url}"
-			userId="${jdbc.username}"
-			password="${jdbc.password}" />
-
-		<!-- model生成 -->
-		<javaModelGenerator targetPackage="${generator.javaModelGenerator.targetPackage}" targetProject="src/main/java" />
-
-		<!-- MapperXML生成 -->
-		<sqlMapGenerator targetPackage="${generator.sqlMapGenerator.targetPackage}" targetProject="src/main/java" />
-
-		<!-- Mapper接口生成 -->
-		<javaClientGenerator targetPackage="${generator.javaClientGenerator.targetPackage}" targetProject="src/main/java" type="XMLMAPPER" />
-
-		<!-- 需要映射的表 -->
-		<table tableName="upms_system" domainObjectName="UpmsSystem">
-			<generatedKey column="system_id" sqlStatement="MySql" identity="true" />
-		</table>
-		<table tableName="upms_organization" domainObjectName="UpmsOrganization">
-			<generatedKey column="organization_id" sqlStatement="MySql" identity="true" />
-		</table>
-		<table tableName="upms_role" domainObjectName="UpmsRole">
-			<generatedKey column="role_id" sqlStatement="MySql" identity="true" />
-		</table>
-		<table tableName="upms_user" domainObjectName="UpmsUser">
-			<generatedKey column="user_id" sqlStatement="MySql" identity="true" />
-		</table>
-		<table tableName="upms_permission" domainObjectName="UpmsPermission">
-			<generatedKey column="permission_id" sqlStatement="MySql" identity="true" />
-		</table>
-		<table tableName="upms_user_organization" domainObjectName="UpmsUserOrganization"></table>
-		<table tableName="upms_user_role" domainObjectName="UpmsUserRole"></table>
-		<table tableName="upms_user_permission" domainObjectName="UpmsUserPermission"></table>
-		<table tableName="upms_role_permission" domainObjectName="UpmsRolePermission"></table>
-	</context>
+        <!-- 生成在XML中的<cache>元素 -->
+        <plugin type="org.mybatis.generator.plugins.CachePlugin">
+            <!-- 使用ehcache -->
+            <property name="cache_type" value="org.mybatis.caches.ehcache.LoggingEhcache" />
+            <!-- 内置cache配置 -->
+            <!--
+            <property name="cache_eviction" value="LRU" />
+            <property name="cache_flushInterval" value="60000" />
+            <property name="cache_readOnly" value="true" />
+            <property name="cache_size" value="1024" />
+            -->
+        </plugin>
+
+        <!-- Java模型生成equals和hashcode方法 -->
+        <plugin type="org.mybatis.generator.plugins.EqualsHashCodePlugin"></plugin>
+
+        <!-- 生成的代码去掉注释 -->
+        <commentGenerator>
+            <property name="suppressAllComments" value="true" />
+        </commentGenerator>
+
+        <!-- 数据库连接 -->
+        <jdbcConnection driverClass="${jdbc.driver}"
+                        connectionURL="${jdbc.url}"
+                        userId="${jdbc.username}"
+                        password="${jdbc.password}" />
+
+        <!-- model生成 -->
+        <javaModelGenerator targetPackage="com.zheng.upms.dao.model" targetProject="src/main/java" />
+
+        <!-- MapperXML生成 -->
+        <sqlMapGenerator targetPackage="com.zheng.upms.dao.mapper" targetProject="src/main/java" />
+
+        <!-- Mapper接口生成 -->
+        <javaClientGenerator targetPackage="com.zheng.upms.dao.mapper" targetProject="src/main/java" type="XMLMAPPER" />
+
+        <!-- 需要映射的表 -->
+                <table tableName="upms_organization" domainObjectName="UpmsOrganization"></table>
+                <table tableName="upms_permission" domainObjectName="UpmsPermission"></table>
+                <table tableName="upms_role" domainObjectName="UpmsRole"></table>
+                <table tableName="upms_role_permission" domainObjectName="UpmsRolePermission"></table>
+                <table tableName="upms_system" domainObjectName="UpmsSystem"></table>
+                <table tableName="upms_user" domainObjectName="UpmsUser"></table>
+                <table tableName="upms_user_organization" domainObjectName="UpmsUserOrganization"></table>
+                <table tableName="upms_user_permission" domainObjectName="UpmsUserPermission"></table>
+                <table tableName="upms_user_role" domainObjectName="UpmsUserRole"></table>
+            </context>
 </generatorConfiguration>
\ No newline at end of file
diff --git a/zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties b/zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties
index 77a983a02a24a9b97b7e2274797b44a352e83d68..cea49fe56e903850b9a6212c17ecd485ffcd210b 100644
--- a/zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties
+++ b/zheng-upms/zheng-upms-dao/src/main/resources/jdbc.properties
@@ -3,7 +3,4 @@ jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding
 jdbc.username=root
 jdbc.password=123456
 
-classPathEntry=D:/mysql-connector-java-5.1.34.jar
-generator.javaModelGenerator.targetPackage=com.zheng.upms.dao.model
-generator.sqlMapGenerator.targetPackage=com.zheng.upms.dao.mapper
-generator.javaClientGenerator.targetPackage=com.zheng.upms.dao.mapper
\ No newline at end of file
+classPathEntry=D:/mysql-connector-java-5.1.34.jar
\ No newline at end of file