From a6bd2dcf0f6c8e77ea5704d269908ec7c9d3165d Mon Sep 17 00:00:00 2001 From: hewei Date: Thu, 20 Dec 2018 16:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=80=81=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/generator/plugins/LogicalDeletePlugin.java | 9 +++++++++ .../generator/plugins/tools/AbstractShellCallback.java | 8 ++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java b/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java index c39ba03..dfb7a3e 100644 --- a/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java +++ b/src/main/java/com/itfsw/mybatis/generator/plugins/LogicalDeletePlugin.java @@ -176,6 +176,15 @@ public class LogicalDeletePlugin extends BasePlugin { this.logicalDeleteColumn = null; warnings.add("itfsw(逻辑删除插件):" + introspectedTable.getFullyQualifiedTable() + "没有找到您配置的逻辑删除值，请全局或者局部配置logicalDeleteValue和logicalUnDeleteValue值！"); } else { + // 兼容处理以前一些老用户配置的Long 和 Float配置问题 + if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Long.class.getName())){ + this.logicalUnDeleteValue = this.logicalUnDeleteValue.replaceAll("L|l", ""); + this.logicalDeleteValue = this.logicalDeleteValue.replaceAll("L|l", ""); + } else if (this.logicalDeleteColumn.getFullyQualifiedJavaType().getFullyQualifiedName().equals(Float.class.getName())){ + this.logicalUnDeleteValue = this.logicalUnDeleteValue.replaceAll("F|f", ""); + this.logicalDeleteValue = this.logicalDeleteValue.replaceAll("F|f", ""); + } + enumInfo.addItem(this.logicalUnDeleteConstName, "未删除", this.logicalUnDeleteValue); enumInfo.addItem(this.logicalDeleteConstName, "已删除", this.logicalDeleteValue); this.logicalDeleteEnum = enumInfo.generateEnum(commentGenerator, introspectedTable); diff --git a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java index 1bbc703..ef334e2 100644 --- a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java +++ b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java @@ -52,16 +52,12 @@ public abstract class AbstractShellCallback implements ShellCallback { */ @Override public void refreshProject(String project) { - SqlSession sqlSession = null; - try { - // 编译项目 - sqlSession = tool.compile(); + // 编译项目 + try (SqlSession sqlSession = tool.compile()){ reloadProject(sqlSession, tool.getTargetClassLoader(), tool.getTargetPackage()); } catch (Exception e) { e.printStackTrace(); Assert.assertTrue(false); - } finally { - sqlSession.close(); } }