兼容老版本配置

This commit is contained in:
hewei
2018-12-20 16:42:47 +08:00
parent 1de9e889c1
commit a6bd2dcf0f
2 changed files with 11 additions and 6 deletions
@@ -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);
@@ -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();
}
}