fix up the issue when a description call "key fk_xxx(xx)" will generate to a column named "key"

This commit is contained in:
moshowgame@126.com 2018-11-08 11:05:54 +08:00
parent 506621cdfc
commit 506c770a5d
3 changed files with 8 additions and 6 deletions

View File

@ -6,9 +6,9 @@
SpringBootCodeGenerator
----
基于SpringBoot2+Freemarker的代码生成器用DDL SQL语句生成JPA/JdbcTemplate/Mybatis/BeetlSQL相关代码支持mysql/oracle/pgsql三大数据库。以释放双手为目的各大模板也在陆续补充和优化。欢迎大家提交模板和交流想法
基于SpringBoot2+Freemarker的代码生成器用DDL SQL语句生成JPA/JdbcTemplate/Mybatis/BeetlSQL相关代码支持mysql/oracle/pgsql三大数据库。以释放双手为目的,各大模板也在陆续补充和优化。欢迎大家提交模板和交流想法!
<br><br>
另外感谢bejson三叔将他部署在http://java.bejson.com/generator上成为besjon专供工具。
另外感谢bejson三叔将他部署在 http://java.bejson.com/generator 上,目前是besjon专供工具。
<br><br>
<table><tbody>
<tr><td>访问路径</td> <td>http://127.0.0.1:1234/generator</td></tr>
@ -16,7 +16,8 @@ SpringBootCodeGenerator
<tr><td>CSDN博客</td> <td>http://blog.csdn.net/moshowgame</td></tr>
<tr><td></td> <td></td></tr>
<tr><td>更新日期</td> <td>更新内容</td></tr>
<tr><td>20181018<td>支持doublt(x,x)的类型以及comment里面包含一些特殊字符的处理感谢@tanwubo的反馈)。</td></tr>
<tr><td>20181108<td>修复非字段描述"KEY FK_xxxx (xxxx)"导致生成KEY字段情况感谢@tornadoorz反馈)。</td></tr>
<tr><td>20181018<td>支持double(x,x)的类型以及comment里面包含一些特殊字符的处理感谢@tanwubo的反馈)。</td></tr>
<tr><td>20181010<td>CDN变更修复CDN不稳定导致网页js报错问题。</td></tr>
<tr><td>20181003<td>新增element-ui/bootstrap生成。</td></tr>
<tr><td>20181002<td>修复公共CDN之Layer.js404问题导致项目无法生成。</td></tr>

View File

@ -25,11 +25,11 @@
<!-- https://mvnrepository.com/artifact/com.sun.mail/javax.mail -->
<dependency>
<!--<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.6.1</version>
</dependency>
</dependency>-->
<!-- spring-data-jpa -->

View File

@ -140,7 +140,8 @@ public class TableParseUtil {
columnLine = columnLine.replaceAll("\n","").replaceAll("\t","").trim();
// `userid` int(11) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
// 2018-9-18 zhengk 修改为contains提升匹配率和匹配不按照规矩出牌的语句
if (!columnLine.contains("constraint")&&!columnLine.contains("using")&&!columnLine.contains("unique")
// 2018-11-8 zhengkai 修复tornadoorz反馈的KEY FK_permission_id (permission_id),KEY FK_role_id (role_id)情况
if (!columnLine.contains("key ")&&!columnLine.contains("constraint")&&!columnLine.contains("using")&&!columnLine.contains("unique")
&&!columnLine.contains("storage")&&!columnLine.contains("pctincrease")
&&!columnLine.contains("buffer_pool")&&!columnLine.contains("tablespace")
&&!(columnLine.contains("primary")&&i>3)){