Merge branch 'master' of http://git.oschina.net/thinkgem/jeesite

Conflicts:
	pom.xml

README.md

@@ -136,7 +136,8 @@ Hibernate性能上定不是问题。但对于大多数情况下，真正掌握Hi
 
 ## 如何交流、反馈、参与贡献？
 
-* QQ Group：127515876   209330483
+* QQ Group：127515876   209330483   223507718
+* E-mail：[email protected]
 * GitHub：<https://github.com/thinkgem/jeesite>
 * 开源中国：<http://git.oschina.net/thinkgem/jeesite>
 * 官方网址：<http://jeesite.com>  论坛：<http://bbs.jeesite.com>

src/main/resources/mappings/modules/gen/GenDataBaseDictDao.xml

@@ -14,6 +14,15 @@
 			</if>
 			ORDER BY t.TABLE_NAME
 		</if>
+		<if test="dbName == 'mysql'">			
+			SELECT t.table_name AS name,t.TABLE_COMMENT AS comments 
+			FROM information_schema.`TABLES` t 
+			WHERE t.TABLE_SCHEMA = (select database())
+			<if test="name != null and name != ''">
+				AND t.TABLE_NAME = upper(#{name})
+			</if>
+			ORDER BY t.TABLE_NAME
+		</if>
 	</select>
 
 	<select id="findTableColumnList" resultType="GenTableColumn">
@@ -43,6 +52,16 @@
 			</if>
 			ORDER BY t.COLUMN_ID
 		</if>
+		<if test="dbName == 'mysql'">	
+			SELECT t.COLUMN_NAME AS name, (CASE WHEN t.IS_NULLABLE = 'YES' THEN '1' ELSE '0' END) AS isNull,
+				(t.ORDINAL_POSITION * 10) AS sort,t.COLUMN_COMMENT AS comments,t.COLUMN_TYPE AS jdbcType 
+			FROM information_schema.`COLUMNS` t 
+			WHERE t.TABLE_SCHEMA = (select database())
+			<if test="name != null and name != ''">
+				AND t.TABLE_NAME = upper(#{name})
+			</if>
+			ORDER BY t.ORDINAL_POSITION
+		</if>
 	</select>
 
 	<select id="findTablePK" resultType="string">
@@ -53,6 +72,12 @@
 				AND au.constraint_type = 'P'
 				AND au.table_name = upper(#{name})
 		</if>
+		<if test="dbName == 'mysql'">
+			SELECT lower(au.COLUMN_NAME) AS columnName 
+			FROM information_schema.`COLUMNS` au
+			WHERE au.TABLE_SCHEMA = (select database()) 
+			AND au.COLUMN_KEY='PRI' AND au.TABLE_NAME = upper(#{name})
+		</if>
 	</select>
 
 </mapper>