diff --git a/.gitignore b/.gitignore
index c8ea253d..d3448df7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 .gradle/
 *.iml
 
+gradle.properties
+
 ##忽略输出文件夹
 out/
 build/
diff --git a/build.gradle b/build.gradle
index e5425e82..084ef4b4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 }
 }
 dependencies {
- classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.5.0-SNAPSHOT"
+ classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.5.0"
 }
 }
 
@@ -25,7 +25,7 @@ apply plugin: 'java'
 apply plugin: 'org.jetbrains.intellij'
 
 group 'com.sjhy'
-version '1.2.3-RELEASE'
+version '1.2.4-RC2'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -55,7 +55,7 @@ intellij {
 // 各种版本去这里找
 // https://www.jetbrains.com/intellij-repository/releases
 // 依赖的插件
- plugins = ['DatabaseTools', 'Velocity']
+ plugins = ['java', 'DatabaseTools', 'Velocity']
 //Disables updating since-build attribute in plugin.xml
 updateSinceUntilBuild false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3928e236..8a2ecb54 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+
diff --git a/src/main/java/com/sjhy/plugin/actions/MainAction.java b/src/main/java/com/sjhy/plugin/actions/MainAction.java
index e1976b5e..a32d3be5 100644
--- a/src/main/java/com/sjhy/plugin/actions/MainAction.java
+++ b/src/main/java/com/sjhy/plugin/actions/MainAction.java
@@ -6,6 +6,7 @@
 import com.sjhy.plugin.service.TableInfoService;
 import com.sjhy.plugin.tool.CacheDataUtils;
 import com.sjhy.plugin.ui.SelectSavePath;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -31,7 +32,7 @@ public class MainAction extends AnAction {
 * @param event 事件对象
 */
 @Override
- public void actionPerformed(AnActionEvent event) {
+ public void actionPerformed(@NotNull AnActionEvent event) {
 Project project = event.getProject();
 if (project == null) {
 return;
diff --git a/src/main/java/com/sjhy/plugin/config/Settings.java b/src/main/java/com/sjhy/plugin/config/Settings.java
index 6f052891..84c466fa 100644
--- a/src/main/java/com/sjhy/plugin/config/Settings.java
+++ b/src/main/java/com/sjhy/plugin/config/Settings.java
@@ -68,10 +68,6 @@ public class Settings implements PersistentStateComponent<settings> {
 * 全局配置组
 */
 private Map<string, GlobalConfigGroup> globalConfigGroupMap;
- /**
- * 默认编码
- */
- private String encode;
 /**
 * 作者
 */
@@ -99,9 +95,7 @@ public Settings() {
 */
 public void initDefault() {
 // 版本号
- this.version = "1.2.0";
- // 默认编码
- this.encode = "UTF-8";
+ this.version = "1.2.4";
 // 作者名称
 this.author = "makejava";
 // 当前各项分组名称
diff --git a/src/main/java/com/sjhy/plugin/entity/Callback.java b/src/main/java/com/sjhy/plugin/entity/Callback.java
index 230df454..a57b33b9 100644
--- a/src/main/java/com/sjhy/plugin/entity/Callback.java
+++ b/src/main/java/com/sjhy/plugin/entity/Callback.java
@@ -11,6 +11,16 @@
 */
 @Data
 public class Callback {
+ /**
+ * 文件名
+ */
 private String fileName;
+ /**
+ * 保存路径
+ */
 private String savePath;
+ /**
+ * 是否重新格式化代码
+ */
+ private boolean reformat = true;
 }
diff --git a/src/main/java/com/sjhy/plugin/entity/SaveFile.java b/src/main/java/com/sjhy/plugin/entity/SaveFile.java
new file mode 100644
index 00000000..1b4ab965
--- /dev/null
+++ b/src/main/java/com/sjhy/plugin/entity/SaveFile.java
@@ -0,0 +1,288 @@
+package com.sjhy.plugin.entity;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.fileTypes.FileType;
+import com.intellij.openapi.fileTypes.FileTypeManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.MessageDialogBuilder;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.testFramework.LightVirtualFile;
+import com.sjhy.plugin.constants.MsgValue;
+import com.sjhy.plugin.tool.CompareFileUtils;
+import com.sjhy.plugin.tool.FileUtils;
+import com.sjhy.plugin.tool.ProjectUtils;
+import lombok.Data;
+import lombok.NonNull;
+
+import java.io.File;
+
+/**
+ * 需要保存的文件
+ * <p>
+ * 如果文件保存在项目路径下,则使用idea提供的psi对象操作。如果文件保存在非项目路径下,则使用java原始IO流操作。
+ *
+ * @author makejava
+ * @version 1.0.0
+ * @since 2020年04月20日 22:54
+ */
+@Data
+public class SaveFile {
+ private static final Logger LOG = Logger.getInstance(SaveFile.class);
+ /**
+ * 所属项目
+ */
+ private Project project;
+ /**
+ * 文件保存目录
+ */
+ private String path;
+ /**
+ * 文件名
+ */
+ private String fileName;
+ /**
+ * 文件内容
+ */
+ private String content;
+ /**
+ * 是否需要重新格式化代码
+ */
+ private boolean reformat;
+ /**
+ * 是否显示操作提示
+ */
+ private boolean operateTitle;
+ /**
+ * 文件工具类
+ */
+ private FileUtils fileUtils = FileUtils.getInstance();
+
+ /**
+ * 构建对象
+ *
+ * @param project 项目对象
+ * @param path 绝对路径
+ * @param fileName 文件名
+ * @param content 文件内容
+ * @param reformat 是否重新格式化代码
+ * @param operateTitle 操作提示
+ */
+ public SaveFile(@NonNull Project project, @NonNull String path, @NonNull String fileName, String content, boolean reformat, boolean operateTitle) {
+ this.path = path;
+ this.project = project;
+ this.fileName = fileName;
+ LOG.assertTrue(content != null);
+ this.content = content.replace("\r", "");
+ this.reformat = reformat;
+ this.operateTitle = operateTitle;
+ }
+
+ /**
+ * 文件是否为项目文件
+ *
+ * @return 是否为项目文件
+ */
+ private boolean isProjectFile() {
+ VirtualFile baseDir = ProjectUtils.getBaseDir(project);
+ // 无法获取到项目基本目录,可能是Default项目,直接返回非项目文件
+ if (baseDir == null) {
+ return false;
+ }
+ // 路径对比,判断项目路径是否为文件保存路径的子路径
+ String projectPath = handlerPath(baseDir.getPath());
+ String tmpFilePath = handlerPath(this.path);
+ if (tmpFilePath.length()> projectPath.length()) {
+ if (!"/".equals(tmpFilePath.substring(projectPath.length(), projectPath.length() + 1))) {
+ return false;
+ }
+ }
+ return tmpFilePath.indexOf(projectPath) == 0;
+ }
+
+ /**
+ * 处理路径,统一分割符并转小写
+ *
+ * @param path 路径
+ * @return 处理后的路径
+ */
+ private String handlerPath(String path) {
+ return handlerPath(path, true);
+ }
+
+ /**
+ * 处理路径,统一分割符并转小写
+ *
+ * @param path 路径
+ * @param lowerCase 是否转小写
+ * @return 处理后的路径
+ */
+ private String handlerPath(String path, boolean lowerCase) {
+ // 统一分割符
+ path = path.replace("\\", "/");
+ // 避免重复分割符
+ path = path.replace("//", "/");
+ // 统一小写
+ return lowerCase ? path.toLowerCase() : path;
+ }
+
+ /**
+ * 通过IDEA自带的Psi文件方式写入
+ */
+ public void write() {
+ // 判断目录是否存在
+ VirtualFile baseDir = ProjectUtils.getBaseDir(project);
+ if (baseDir == null) {
+ throw new IllegalStateException("项目基本路径不存在");
+ }
+ // 处理保存路径
+ String savePath = handlerPath(this.path, false);
+ if (isProjectFile()) {
+ // 删除保存路径的前面部分
+ savePath = savePath.substring(handlerPath(baseDir.getPath()).length());
+ } else {
+ baseDir = null;
+ }
+ // 删除开头与结尾的/符号
+ while (savePath.startsWith("/")) {
+ savePath = savePath.substring(1);
+ }
+ while (savePath.endsWith("/")) {
+ savePath = savePath.substring(0, savePath.length() - 1);
+ }
+ // 查找保存目录是否存在
+ VirtualFile saveDir;
+ if (baseDir == null) {
+ saveDir = VfsUtil.findFileByIoFile(new File(savePath), false);
+ } else {
+ saveDir = VfsUtil.findRelativeFile(baseDir, savePath.split("/"));
+ }
+ // 提示创建目录
+ VirtualFile directory = titleCreateDir(saveDir, baseDir, savePath);
+ if (directory == null) {
+ return;
+ }
+ VirtualFile psiFile = directory.findChild(this.fileName);
+ // 保存或覆盖
+ saveOrReplaceFile(psiFile, directory);
+ }
+
+ /**
+ * 提示创建目录
+ *
+ * @param saveDir 保存路径
+ * @return 是否放弃执行
+ */
+ private VirtualFile titleCreateDir(VirtualFile saveDir, VirtualFile baseDir, String savePath) {
+ if (saveDir != null) {
+ return saveDir;
+ }
+ // 尝试创建目录
+ String msg = String.format("Directory %s Not Found, Confirm Create?", this.path);
+ if (this.operateTitle && !MessageDialogBuilder.yesNo(MsgValue.TITLE_INFO, msg).isYes()) {
+ return null;
+ }
+ saveDir = fileUtils.createChildDirectory(project, baseDir, savePath);
+ return saveDir;
+ }
+
+ /**
+ * 保存或替换文件
+ *
+ * @param file 文件
+ * @param directory 目录
+ */
+ private void saveOrReplaceFile(VirtualFile file, VirtualFile directory) {
+ PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
+ Document document;
+ // 文件不存在直接创建
+ if (file == null) {
+ file = fileUtils.createChildFile(project, directory, this.fileName);
+ if (file == null) {
+ return;
+ }
+ document = coverFile(file);
+ } else {
+ // 提示覆盖文件
+ if (operateTitle) {
+ String msg = String.format("File %s Exists, Select Operate Mode?", file.getPath());
+ MessageDialogBuilder.YesNoCancel yesNoCancel = MessageDialogBuilder.yesNoCancel(MsgValue.TITLE_INFO, msg);
+ yesNoCancel.yesText("Cover");
+ yesNoCancel.noText("Compare");
+ yesNoCancel.cancelText("Cancel");
+ int result = yesNoCancel.show();
+ switch (result) {
+ case Messages.YES:
+ // 覆盖文件
+ document = coverFile(file);
+ break;
+ case Messages.NO:
+ // 对比代码时也格式化代码
+ String newText = content;
+ if (reformat) {
+ // 保留旧文件内容,用新文件覆盖旧文件执行格式化,然后再还原旧文件内容
+ String oldText = getFileText(file);
+ Document tmpDoc = coverFile(file);
+ // 格式化代码
+ FileUtils.getInstance().reformatFile(project, file);
+ // 提交文档改动,并非VCS中的提交文件
+ psiDocumentManager.commitDocument(tmpDoc);
+ // 获取新的文件内容
+ newText = getFileText(file);
+ // 还原旧文件
+ coverFile(file, oldText);
+ }
+ FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(fileName);
+ CompareFileUtils.showCompareWindow(project, file, new LightVirtualFile(fileName, fileType, newText));
+ return;
+ case Messages.CANCEL:
+ default:
+ return;
+ }
+ } else {
+ // 没有操作提示的情况下直接覆盖
+ document = coverFile(file);
+ }
+ }
+ // 执行代码格式化操作
+ if (reformat) {
+ FileUtils.getInstance().reformatFile(project, file);
+ }
+ // 提交文档改动,并非VCS中的提交文件
+ psiDocumentManager.commitDocument(document);
+ }
+
+ private String getFileText(VirtualFile file) {
+ FileDocumentManager fileDocumentManager = FileDocumentManager.getInstance();
+ Document document = fileDocumentManager.getDocument(file);
+ if (document == null) {
+ throw new IllegalStateException("virtual file to document failure");
+ }
+ return document.getText();
+ }
+
+ /**
+ * 覆盖文件
+ *
+ * @param file 文件
+ * @return 覆盖后的文档对象
+ */
+ private Document coverFile(VirtualFile file) {
+ return coverFile(file, content);
+ }
+
+ /**
+ * 覆盖文件
+ *
+ * @param file 文件
+ * @param text 文件内容
+ * @return 覆盖后的文档对象
+ */
+ private Document coverFile(VirtualFile file, String text) {
+ return FileUtils.getInstance().writeFileContent(project, file, fileName, text);
+ }
+}
diff --git a/src/main/java/com/sjhy/plugin/entity/TableInfo.java b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
index d4de05db..b98c19fd 100644
--- a/src/main/java/com/sjhy/plugin/entity/TableInfo.java
+++ b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
@@ -24,10 +24,18 @@ public class TableInfo {
 * 表名(首字母大写)
 */
 private String name;
+ /**
+ * 表名前缀
+ */
+ private String preName;
 /**
 * 注释
 */
 private String comment;
+ /**
+ * 模板组名称
+ */
+ private String templateGroupName;
 /**
 * 所有列
 */
diff --git a/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java b/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
index d22f1cf7..67555d31 100644
--- a/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
+++ b/src/main/java/com/sjhy/plugin/provider/EasyCodeGlobalVariableProvider.java
@@ -39,6 +39,8 @@ public Collection<vtlvariable> getGlobalVariables(@NotNull VtlFile file) {
 result.add(new VtlLightVariable("tableInfo", file, "com.sjhy.plugin.entity.TableInfo"));
 result.add(new VtlLightVariable("tableInfoList", file, "java.util.List<com.sjhy.plugin.entity.tableinfo>"));
 result.add(new VtlLightVariable("generateService", file, "com.sjhy.plugin.tool.ExtraCodeGenerateUtils"));
+ result.add(new VtlLightVariable("dbUtil", file, "com.intellij.database.util.DbUtil"));
+ result.add(new VtlLightVariable("dasUtil", file, "com.intellij.database.util.DasUtil"));
 return result;
 }
 
diff --git a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
index ed4cee0c..4448b1c7 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
@@ -1,23 +1,23 @@
 package com.sjhy.plugin.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.intellij.database.util.DasUtil;
+import com.intellij.database.util.DbUtil;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.ui.MessageDialogBuilder;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.util.ReflectionUtil;
 import com.sjhy.plugin.config.Settings;
 import com.sjhy.plugin.constants.MsgValue;
 import com.sjhy.plugin.entity.Callback;
+import com.sjhy.plugin.entity.SaveFile;
 import com.sjhy.plugin.entity.TableInfo;
 import com.sjhy.plugin.entity.Template;
 import com.sjhy.plugin.service.CodeGenerateService;
 import com.sjhy.plugin.service.TableInfoService;
 import com.sjhy.plugin.tool.*;
 
-import java.io.File;
 import java.util.*;
 
 /**
@@ -34,10 +34,6 @@ public class CodeGenerateServiceImpl implements CodeGenerateService {
 * 模型管理
 */
 private ModuleManager moduleManager;
- /**
- * 文件工具
- */
- private FileUtils fileUtils;
 /**
 * 表信息服务
 */
@@ -54,7 +50,6 @@ public class CodeGenerateServiceImpl implements CodeGenerateService {
 public CodeGenerateServiceImpl(Project project) {
 this.project = project;
 this.moduleManager = ModuleManager.getInstance(project);
- this.fileUtils = FileUtils.getInstance();
 this.tableInfoService = TableInfoService.getInstance(project);
 this.cacheDataUtils = CacheDataUtils.getInstance();
 }
@@ -72,6 +67,11 @@ public void generateByUnifiedConfig(Collection<template> templates, boolean unif
 TableInfo selectedTableInfo = tableInfoService.getTableInfoAndConfig(cacheDataUtils.getSelectDbTable());
 // 获取所有选中的表信息
 List<table class="undef"> tableInfoList = tableInfoService.getTableInfoAndConfig(cacheDataUtils.getDbTableList());
+ // 校验选中表的保存路径是否正确
+ if (StringUtils.isEmpty(selectedTableInfo.getSavePath())) {
+ Messages.showInfoMessage(selectedTableInfo.getObj().getName() + "表配置信息不正确,请尝试重新配置", MsgValue.TITLE_INFO);
+ return;
+ }
 // 将未配置的表进行配置覆盖
 tableInfoList.forEach(tableInfo -> {
 if (StringUtils.isEmpty(tableInfo.getSavePath())) {
@@ -123,6 +123,11 @@ public void generate(Collection<template> templates, Collection<table class="undef"> table
 TemplateUtils.addGlobalConfig(templates);
 // 生成代码
 for (TableInfo tableInfo : tableInfoList) {
+ // 表名去除前缀
+ if (!StringUtils.isEmpty(tableInfo.getPreName()) && tableInfo.getObj().getName().startsWith(tableInfo.getPreName())) {
+ String newName = tableInfo.getObj().getName().substring(tableInfo.getPreName().length());
+ tableInfo.setName(NameUtils.getInstance().getClassName(newName));
+ }
 // 构建参数
 Map<string, Object> param = getDefaultParam();
 // 其他参数
@@ -137,14 +142,13 @@ public void generate(Collection<template> templates, Collection<table class="undef"> table
 setModulePathAndImportList(param, tableInfo);
 // 设置额外代码生成服务
 param.put("generateService", new ExtraCodeGenerateUtils(this, tableInfo, title));
-
 for (Template template : templates) {
 Callback callback = new Callback();
 // 设置回调对象
 param.put("callback", callback);
 // 开始生成
 String code = VelocityUtils.generate(template.getCode(), param);
- // 消除两端空格
+ // 清除前面空格
 code = code.trim();
 // 设置一个默认保存路径与默认文件名
 if (StringUtils.isEmpty(callback.getFileName())) {
@@ -159,31 +163,9 @@ public void generate(Collection<template> templates, Collection<table class="undef"> table
 if (path.startsWith(".")) {
 path = project.getBasePath() + path.substring(1);
 }
- // 创建目录
- File dir = new File(path);
- if (!dir.exists()) {
- // 提示创建目录
- if (title && !MessageDialogBuilder.yesNo(MsgValue.TITLE_INFO, "Directory " + dir.getAbsolutePath() + " Not Found, Confirm Create?").isYes()) {
- continue;
- }
- if (!dir.mkdirs()) {
- Messages.showWarningDialog("Directory Create Failure!", MsgValue.TITLE_INFO);
- continue;
- }
- }
- File file = new File(dir, callback.getFileName());
- // 提示是否覆盖文件
- if (title && file.exists()) {
- if (!MessageDialogBuilder.yesNo(MsgValue.TITLE_INFO, "File " + file.getName() + " Exists, Confirm Continue?").isYes()) {
- continue;
- }
- }
- // 保存文件
- fileUtils.write(file, code);
+ new SaveFile(project, path, callback.getFileName(), code, callback.isReformat(), title).write();
 }
 }
- //刷新整个项目
- VirtualFileManager.getInstance().syncRefresh();
 }
 
 /**
@@ -219,7 +201,7 @@ private void setModulePathAndImportList(Map<string, Object> param, TableInfo tab
 }
 if (module != null) {
 // 设置modulePath
- param.put("modulePath", ModuleUtil.getModuleDirPath(module));
+ param.put("modulePath", ModuleUtils.getModuleDir(module).getPath());
 }
 // 设置要导入的包
 param.put("importList", getImportList(tableInfo));
@@ -234,8 +216,6 @@ private Map<string, Object> getDefaultParam() {
 // 系统设置
 Settings settings = Settings.getInstance();
 Map<string, Object> param = new HashMap<strong>(20);
- // 编码
- param.put("encode", settings.getEncode());
 // 作者
 param.put("author", settings.getAuthor());
 //工具类
@@ -243,6 +223,9 @@ private Map<string, Object> getDefaultParam() {
 param.put("time", TimeUtils.getInstance());
 // 项目路径
 param.put("projectPath", project.getBasePath());
+ // Database数据库工具
+ param.put("dbUtil", ReflectionUtil.newInstance(DbUtil.class));
+ param.put("dasUtil", ReflectionUtil.newInstance(DasUtil.class));
 return param;
 }
 
diff --git a/src/main/java/com/sjhy/plugin/service/impl/TableInfoServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/TableInfoServiceImpl.java
index 37bb9af4..fbb037ea 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/TableInfoServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/TableInfoServiceImpl.java
@@ -5,24 +5,27 @@
 import com.intellij.database.model.DasColumn;
 import com.intellij.database.psi.DbTable;
 import com.intellij.database.util.DasUtil;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.options.ShowSettingsUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageDialogBuilder;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.vfs.VirtualFileManager;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ExceptionUtil;
 import com.intellij.util.containers.JBIterable;
 import com.sjhy.plugin.constants.MsgValue;
 import com.sjhy.plugin.entity.ColumnInfo;
+import com.sjhy.plugin.entity.SaveFile;
 import com.sjhy.plugin.entity.TableInfo;
 import com.sjhy.plugin.entity.TypeMapper;
 import com.sjhy.plugin.service.TableInfoService;
 import com.sjhy.plugin.tool.*;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 /**
 * @author makejava
@@ -48,11 +51,6 @@ public class TableInfoServiceImpl implements TableInfoService {
 */
 private FileUtils fileUtils;
 
- /**
- * 保存的相对路径
- */
- private static final String SAVE_PATH = "/.idea/EasyCodeConfig";
-
 public TableInfoServiceImpl(Project project) {
 this.project = project;
 this.nameUtils = NameUtils.getInstance();
@@ -148,6 +146,10 @@ private void loadConfig(TableInfo tableInfo) {
 tableInfo.setSavePackageName(tableInfoConfig.getSavePackageName());
 // 选择的保存路径
 tableInfo.setSavePath(tableInfoConfig.getSavePath());
+ // 选择的表名前缀
+ tableInfo.setPreName(tableInfoConfig.getPreName());
+ // 选择的模板组
+ tableInfo.setTemplateGroupName(tableInfoConfig.getTemplateGroupName());
 
 // 没有列时不处理
 if (CollectionUtil.isEmpty(tableInfoConfig.getFullColumn())) {
@@ -241,13 +243,23 @@ public boolean typeValidator(DbTable dbTable) {
 JBIterable<? extends DasColumn> columns = DasUtil.getColumns(dbTable);
 List<typemapper> typeMapperList = CurrGroupUtils.getCurrTypeMapperGroup().getElementList();
 
+ // 简单的记录报错弹窗次数,避免重复报错
+ Set<string> errorCount = new HashSet<strong>();
+
 FLAG:
 for (DasColumn column : columns) {
 String typeName = column.getDataType().getSpecification();
 for (TypeMapper typeMapper : typeMapperList) {
- // 不区分大小写查找类型
- if (Pattern.compile(typeMapper.getColumnType(), Pattern.CASE_INSENSITIVE).matcher(typeName).matches()) {
- continue FLAG;
+ try {
+ // 不区分大小写查找类型
+ if (Pattern.compile(typeMapper.getColumnType(), Pattern.CASE_INSENSITIVE).matcher(typeName).matches()) {
+ continue FLAG;
+ }
+ } catch (PatternSyntaxException e) {
+ if (!errorCount.contains(typeMapper.getColumnType())) {
+ Messages.showWarningDialog("类型映射《" + typeMapper.getColumnType() + "》存在语法错误,请及时修正。报错信息:" + e.getMessage(), MsgValue.TITLE_INFO);
+ errorCount.add(typeMapper.getColumnType());
+ }
 }
 }
 // 没找到类型,引导用户去添加类型
@@ -324,20 +336,12 @@ public void save(TableInfo tableInfo) {
 return;
 }
 // 获取或创建保存目录
- String path = project.getBasePath() + SAVE_PATH;
- File dir = new File(path);
- if (!dir.exists()) {
- if (!dir.mkdirs()) {
- Messages.showWarningDialog("保存失败,无法创建目录。", MsgValue.TITLE_INFO);
- return;
- }
+ VirtualFile dir = getEasyCodeConfigDirectory(project);
+ if (dir == null) {
+ return;
 }
 // 获取保存文件
- File file = new File(dir, getConfigFileName(oldTableInfo.getObj()));
- //写入配置文件
- fileUtils.write(file, content);
- // 同步刷新
- VirtualFileManager.getInstance().syncRefresh();
+ new SaveFile(project, dir.getPath(), getConfigFileName(oldTableInfo.getObj()), content, true, false).write();
 }
 
 /**
@@ -348,16 +352,56 @@ public void save(TableInfo tableInfo) {
 */
 private TableInfo read(TableInfo tableInfo) {
 // 获取保存的目录
- String path = project.getBasePath() + SAVE_PATH;
- File dir = new File(path);
- // 获取保存的文件
- File file = new File(dir, getConfigFileName(tableInfo.getObj()));
- // 文件不存在时直接保存一份
- if (!file.exists()) {
+ VirtualFile easyCodeConfigDir = getEasyCodeConfigDirectory(project);
+ if (easyCodeConfigDir == null) {
+ return null;
+ }
+ // 获取配置文件
+ String fileName = getConfigFileName(tableInfo.getObj());
+ VirtualFile configJsonFile = easyCodeConfigDir.findChild(getConfigFileName(tableInfo.getObj()));
+ if (configJsonFile == null) {
+ return null;
+ }
+ Document document = FileDocumentManager.getInstance().getDocument(configJsonFile);
+ if (document == null) {
+ Messages.showInfoMessage(fileName + "转文档对象失败", MsgValue.TITLE_INFO);
 return null;
 }
 // 读取并解析文件
- return parser(fileUtils.read(file));
+ String json = document.getText();
+ if (StringUtils.isEmpty(json)) {
+ Messages.showInfoMessage(fileName + "配置文件文件为空,请尝试手动删除" + configJsonFile.getPath() + "文件!", MsgValue.TITLE_INFO);
+ return null;
+ }
+ return parser(json, configJsonFile);
+ }
+
+ /**
+ * 获取EasyCodeConfig目录
+ *
+ * @param project 项目
+ * @return EasyCodeConfig目录
+ */
+ private VirtualFile getEasyCodeConfigDirectory(Project project) {
+ VirtualFile baseDir = ProjectUtils.getBaseDir(project);
+ if (baseDir == null) {
+ Messages.showInfoMessage("无法获取项目路径", MsgValue.TITLE_INFO);
+ return null;
+ }
+ // 获取.idea路径
+ VirtualFile ideaDir = baseDir.findChild(".idea");
+ if (ideaDir == null) {
+ Messages.showInfoMessage(".idea路径获取失败", MsgValue.TITLE_INFO);
+ String errorMsg = String.format("baseDir:%s, not found .idea child directory", baseDir.getPath());
+ ExceptionUtil.rethrow(new IllegalStateException(errorMsg));
+ return null;
+ }
+ // 查找或创建EasyCodeConfig路径
+ VirtualFile easyCodeDir = ideaDir.findChild("EasyCodeConfig");
+ if (easyCodeDir == null) {
+ easyCodeDir = fileUtils.createChildDirectory(project, ideaDir, "EasyCodeConfig");
+ }
+ return easyCodeDir;
 }
 
 /**
@@ -377,11 +421,11 @@ private String getConfigFileName(DbTable dbTable) {
 * @param str 原始JSON字符串
 * @return 解析结果
 */
- private TableInfo parser(String str) {
+ private TableInfo parser(String str, VirtualFile originalFile) {
 try {
 return objectMapper.readValue(str, TableInfo.class);
 } catch (IOException e) {
- Messages.showWarningDialog("读取配置失败,JSON反序列化异常。", MsgValue.TITLE_INFO);
+ Messages.showWarningDialog("读取配置失败,JSON反序列化异常。请尝试手动删除" + originalFile.getPath() + "文件!", MsgValue.TITLE_INFO);
 ExceptionUtil.rethrow(e);
 }
 return null;
diff --git a/src/main/java/com/sjhy/plugin/tool/CompareFileUtils.java b/src/main/java/com/sjhy/plugin/tool/CompareFileUtils.java
new file mode 100644
index 00000000..fa480b09
--- /dev/null
+++ b/src/main/java/com/sjhy/plugin/tool/CompareFileUtils.java
@@ -0,0 +1,61 @@
+package com.sjhy.plugin.tool;
+
+import com.intellij.diff.DiffContentFactory;
+import com.intellij.diff.DiffDialogHints;
+import com.intellij.diff.DiffManager;
+import com.intellij.diff.DiffRequestFactory;
+//import com.intellij.diff.actions.impl.MutableDiffRequestChain;
+import com.intellij.diff.chains.DiffRequestChain;
+import com.intellij.diff.contents.DiffContent;
+import com.intellij.diff.requests.DiffRequest;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.ExceptionUtil;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * @author makejava
+ * @version 1.0.0
+ * @since 2020年06月11日 15:47
+ */
+public class CompareFileUtils {
+
+ /**
+ * 显示文件对比框
+ *
+ * @param project 项目
+ * @param leftFile 左边的文件
+ * @param rightFile 右边的文件
+ */
+ public static void showCompareWindow(Project project, VirtualFile leftFile, VirtualFile rightFile) {
+
+ try {
+ Class<?> cls = Class.forName("com.intellij.diff.actions.impl.MutableDiffRequestChain");
+ // 新版支持
+ DiffContentFactory contentFactory = DiffContentFactory.getInstance();
+ DiffRequestFactory requestFactory = DiffRequestFactory.getInstance();
+
+ DiffContent leftContent = contentFactory.create(project, leftFile);
+ DiffContent rightContent = contentFactory.create(project, rightFile);
+
+ DiffRequestChain chain = (DiffRequestChain) cls.getConstructor(DiffContent.class, DiffContent.class).newInstance(leftContent, rightContent);
+// MutableDiffRequestChain chain = new MutableDiffRequestChain(leftContent, rightContent);
+
+ cls.getMethod("setWindowTitle", String.class).invoke(chain, requestFactory.getTitle(leftFile, rightFile));
+ cls.getMethod("setTitle1", String.class).invoke(chain, requestFactory.getContentTitle(leftFile));
+ cls.getMethod("setTitle2", String.class).invoke(chain, requestFactory.getContentTitle(rightFile));
+// chain.setWindowTitle(requestFactory.getTitle(leftFile, rightFile));
+// chain.setTitle1(requestFactory.getContentTitle(leftFile));
+// chain.setTitle2(requestFactory.getContentTitle(rightFile));
+ DiffManager.getInstance().showDiff(project, chain, DiffDialogHints.MODAL);
+ } catch (ClassNotFoundException e) {
+ // 旧版兼容
+ DiffRequest diffRequest = DiffRequestFactory.getInstance().createFromFiles(project, leftFile, rightFile);
+ DiffManager.getInstance().showDiff(project, diffRequest, DiffDialogHints.MODAL);
+ } catch (IllegalAccessException &#124; InstantiationException &#124; NoSuchMethodException &#124; InvocationTargetException e) {
+ ExceptionUtil.rethrow(e);
+ }
+ }
+
+}
diff --git a/src/main/java/com/sjhy/plugin/tool/FileUtils.java b/src/main/java/com/sjhy/plugin/tool/FileUtils.java
index a8470eb8..c29e1313 100644
--- a/src/main/java/com/sjhy/plugin/tool/FileUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/FileUtils.java
@@ -1,12 +1,29 @@
 package com.sjhy.plugin.tool;
 
-import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.codeInsight.actions.AbstractLayoutCodeProcessor;
+import com.intellij.codeInsight.actions.OptimizeImportsProcessor;
+import com.intellij.codeInsight.actions.ReformatCodeProcessor;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import com.intellij.util.ExceptionUtil;
-import com.sjhy.plugin.config.Settings;
+import com.sjhy.plugin.constants.MsgValue;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.List;
 
 /**
 * 文件工具类
@@ -16,6 +33,7 @@
 * @since 2018年07月17日 13:10
 */
 public class FileUtils {
+ private static final Logger LOG = Logger.getInstance(FileUtils.class);
 private static volatile FileUtils fileUtils;
 
 /**
@@ -36,41 +54,114 @@ private FileUtils() {
 }
 
 /**
- * 读取文件内容(文本文件)
- * @param file 文件对象
- * @return 文件内容
+ * 创建子目录
+ *
+ * @param project 文件对象
+ * @param parent 父级目录
+ * @param dirName 子目录
+ * @return 目录对象
 */
- public String read(File file) {
- StringBuilder builder = new StringBuilder();
- try {
- builder.append(FileUtil.loadFileText(file, StandardCharsets.UTF_8));
- } catch (IOException e) {
- ExceptionUtil.rethrow(e);
+ public VirtualFile createChildDirectory(Project project, VirtualFile parent, String dirName) {
+ return WriteCommandAction.runWriteCommandAction(project, (Computable<virtualfile>) () -> {
+ try {
+ return VfsUtil.createDirectoryIfMissing(parent, dirName);
+ } catch (IOException e) {
+ Messages.showWarningDialog("目录创建失败:" + dirName, MsgValue.TITLE_INFO);
+ return null;
+ }
+ });
+ }
+
+ /**
+ * 创建子文件
+ *
+ * @param project 项目对象
+ * @param parent 父级目录
+ * @param fileName 子文件名
+ * @return 文件对象
+ */
+ public VirtualFile createChildFile(Project project, VirtualFile parent, String fileName) {
+ return WriteCommandAction.runWriteCommandAction(project, (Computable<virtualfile>) () -> {
+ PsiManager psiManager = PsiManager.getInstance(project);
+ try {
+ PsiDirectory directory = psiManager.findDirectory(parent);
+ if (directory != null) {
+ PsiFile psiFile = directory.createFile(fileName);
+ return psiFile.getVirtualFile();
+ }
+ return parent.createChildData(new Object(), fileName);
+ } catch (IOException e) {
+ Messages.showWarningDialog("文件创建失败:" + fileName, MsgValue.TITLE_INFO);
+ return null;
+ }
+ });
+ }
+
+ /**
+ * 设置文件内容
+ *
+ * @param project 项目对象
+ * @param file 文件
+ * @param text 文件内容
+ * @return 覆盖后的文档对象
+ */
+ public Document writeFileContent(Project project, VirtualFile file, String fileName, String text) {
+ FileDocumentManager fileDocumentManager = FileDocumentManager.getInstance();
+ Document document = fileDocumentManager.getDocument(file);
+ if (document == null) {
+ throw new IllegalStateException("获取文档对象失败,fileName:" + fileName);
 }
- return builder.toString();
+ WriteCommandAction.runWriteCommandAction(project, () -> document.setText(text));
+ PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
+ // 提交改动,并非VCS中的提交文件
+ psiDocumentManager.commitDocument(document);
+ return document;
 }
 
 /**
- * 写入文件内容
- * @param file 文件
- * @param content 内容
+ * 格式化虚拟文件
+ *
+ * @param project 项目对象
+ * @param virtualFile 虚拟文件
 */
- public void write(File file, String content) {
- write(file, content, false);
+ public void reformatFile(Project project, VirtualFile virtualFile) {
+ PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile);
+ if (psiFile == null) {
+ return;
+ }
+ reformatFile(project, Collections.singletonList(psiFile));
 }
 
 /**
- * 写入文件内容
- * @param file 文件
- * @param content 文件内容
- * @param append 是否为追加模式
+ * 执行格式化
+ *
+ * @param project 项目对象
+ * @param psiFileList 文件列表
 */
- private void write(File file, String content, boolean append) {
- Settings settings = Settings.getInstance();
+ @SuppressWarnings("unchecked")
+ public void reformatFile(Project project, List<psifile> psiFileList) {
+ if (CollectionUtil.isEmpty(psiFileList)) {
+ return;
+ }
+ // 尝试对文件进行格式化处理
+ AbstractLayoutCodeProcessor processor = new ReformatCodeProcessor(project, psiFileList.toArray(new PsiFile[0]), null, false);
+ // 优化导入
+ processor = new OptimizeImportsProcessor(processor);
+ // 重新编排代码(会将代码中的属性与方法的顺序进行重新调整)
+// processor = new RearrangeCodeProcessor(processor);
+
+ // 清理代码,进行旧版本兼容,旧版本的IDEA尚未提供该处理器
 try {
- FileUtil.writeToFile(file, content.getBytes(settings.getEncode()), append);
- } catch (IOException e) {
+ Class<abstractlayoutcodeprocessor> codeCleanupCodeProcessorCls = (Class<abstractlayoutcodeprocessor>) Class.forName("com.intellij.codeInsight.actions.CodeCleanupCodeProcessor");
+ Constructor<abstractlayoutcodeprocessor> constructor = codeCleanupCodeProcessorCls.getConstructor(AbstractLayoutCodeProcessor.class);
+ processor = constructor.newInstance(processor);
+ } catch (ClassNotFoundException ignored) {
+ // 类不存在直接忽略
+ } catch (NoSuchMethodException &#124; IllegalAccessException &#124; InstantiationException &#124; InvocationTargetException e) {
+ // 抛出未知异常
 ExceptionUtil.rethrow(e);
 }
+ // 执行处理
+ processor.run();
 }
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/GlobalTool.java b/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
index fdd9320e..bb287d63 100644
--- a/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
+++ b/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
@@ -3,6 +3,8 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.intellij.database.psi.DbColumn;
+import com.intellij.database.util.DasUtil;
 import com.intellij.util.ExceptionUtil;
 import com.intellij.util.ReflectionUtil;
 import com.sjhy.plugin.entity.DebugField;
@@ -367,4 +369,21 @@ public Object service(String name, Object... param) {
 return null;
 }
 }
+
+ /**
+ * 字段是否为索引字段
+ * @param column
+ * @return
+ */
+ public boolean isIndexColumn(DbColumn column) {
+ return DasUtil.isIndexColumn(column);
+ }
+
+ /**
+ * 生成UUID
+ * @return
+ */
+ public String uuid() {
+ return UUID.randomUUID().toString();
+ }
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/HttpUtils.java b/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
index 1145ae03..5e0f3c14 100644
--- a/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
@@ -42,7 +42,7 @@ public final class HttpUtils {
 /**
 * 服务器地址
 */
- private static final String HOST_URL = "http://www.shujuhaiyang.com/easyCode";
+ public static String HOST_URL = "http://www.shujuhaiyang.com/easyCode";
 /**
 * http客户端
 */
diff --git a/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java b/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
index c9c1947d..77f654bb 100644
--- a/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
@@ -3,6 +3,7 @@
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import org.jetbrains.annotations.NotNull;
@@ -25,6 +26,26 @@ private ModuleUtils() {
 throw new UnsupportedOperationException();
 }
 
+ /**
+ * 获取module路径
+ *
+ * @param module 模块
+ * @return 路径
+ */
+ public static VirtualFile getModuleDir(@NotNull Module module) {
+ String modulePath = ModuleUtil.getModuleDirPath(module);
+ // 统一路径分割符号
+ modulePath = modulePath.replace("\\", "/");
+ // 尝试消除不正确的路径
+ if (modulePath.contains(".idea/modules/")) {
+ modulePath = modulePath.replace(".idea/modules/","");
+ }
+ if (modulePath.contains("/.idea")) {
+ modulePath = modulePath.replace("/.idea","");
+ }
+ return VirtualFileManager.getInstance().findFileByUrl(String.format("file://%s", modulePath));
+ }
+
 /**
 * 获取模块的源代码文件夹,不存在
 *
@@ -34,7 +55,13 @@ private ModuleUtils() {
 public static VirtualFile getSourcePath(@NotNull Module module) {
 List<virtualfile> virtualFileList = ModuleRootManager.getInstance(module).getSourceRoots(JavaSourceRootType.SOURCE);
 if (CollectionUtil.isEmpty(virtualFileList)) {
- return VirtualFileManager.getInstance().findFileByUrl(String.format("file://%s", ModuleUtil.getModuleDirPath(module)));
+ VirtualFile modulePath = getModuleDir(module);
+ // 尝试智能识别原代码路径(通过上面的方式,IDEA不能百分百拿到原代码路径)
+ VirtualFile srcDir = VfsUtil.findRelativeFile(modulePath, "src", "main", "java");
+ if (srcDir != null && srcDir.isDirectory()) {
+ return srcDir;
+ }
+ return modulePath;
 }
 return virtualFileList.get(0);
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/NameUtils.java b/src/main/java/com/sjhy/plugin/tool/NameUtils.java
index abc8080c..64efb898 100644
--- a/src/main/java/com/sjhy/plugin/tool/NameUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/NameUtils.java
@@ -1,5 +1,6 @@
 package com.sjhy.plugin.tool;
 
+import com.google.common.base.CaseFormat;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.util.regex.Matcher;
@@ -61,6 +62,15 @@ public String firstLowerCase(String name) {
 return StringUtils.uncapitalize(name);
 }
 
+ /**
+ * 下划线转中划线
+ * @param name
+ * @return
+ */
+ public String underScoreToHyphen(String name) {
+ return CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_HYPHEN, name.toLowerCase());
+ }
+
 /**
 * 驼峰转下划线,全小写
 *
@@ -91,7 +101,7 @@ public String hump2Underline(String str) {
 * @return 类名
 */
 public String getClsNameByFullName(String fullName) {
- return fullName.substring(fullName.lastIndexOf('.') + 1, fullName.length());
+ return fullName.substring(fullName.lastIndexOf('.') + 1);
 }
 
 /**
@@ -133,7 +143,7 @@ public String getClassName(String name) {
 */
 public String append(Object... objects) {
 
- if (ArrayUtils.isEmpty(objects)) {
+ if (objects == null &#124;&#124; objects.length == 0) {
 return null;
 }
 StringBuilder builder = new StringBuilder();
diff --git a/src/main/java/com/sjhy/plugin/tool/ProjectUtils.java b/src/main/java/com/sjhy/plugin/tool/ProjectUtils.java
index 484b0366..731c2004 100644
--- a/src/main/java/com/sjhy/plugin/tool/ProjectUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/ProjectUtils.java
@@ -1,7 +1,12 @@
 package com.sjhy.plugin.tool;
 
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.vfs.LocalFileSystem;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.WindowManager;
 
 import java.awt.*;
@@ -46,4 +51,41 @@ public static Project getCurrProject() {
 //否则使用默认项目
 return projectManager.getDefaultProject();
 }
+
+ /**
+ * 进行旧版本兼容,该方法已经存在 @see {@link com.intellij.openapi.project.ProjectUtil#guessProjectDir(Project)}
+ *
+ * @param project 项目对象
+ * @return 基本目录
+ */
+ public static VirtualFile getBaseDir(Project project) {
+ if (project.isDefault()) {
+ return null;
+ }
+ Module[] modules = ModuleManager.getInstance(project).getModules();
+ Module module = null;
+ if (modules.length == 1) {
+ module = modules[0];
+ } else {
+ for (Module item : modules) {
+ if (item.getName().equals(project.getName())) {
+ module = item;
+ break;
+ }
+ }
+ }
+ if (module != null) {
+ ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
+ for (VirtualFile contentRoot : moduleRootManager.getContentRoots()) {
+ if (contentRoot.isDirectory() && contentRoot.getName().equals(module.getName())) {
+ return contentRoot;
+ }
+ }
+ }
+ String basePath = project.getBasePath();
+ if (basePath == null) {
+ throw new NullPointerException();
+ }
+ return LocalFileSystem.getInstance().findFileByPath(basePath);
+ }
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/VelocityUtils.java b/src/main/java/com/sjhy/plugin/tool/VelocityUtils.java
index fb7e78d9..f11155ce 100644
--- a/src/main/java/com/sjhy/plugin/tool/VelocityUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/VelocityUtils.java
@@ -1,6 +1,5 @@
 package com.sjhy.plugin.tool;
 
-import com.sjhy.plugin.config.Settings;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.runtime.RuntimeConstants;
@@ -50,14 +49,10 @@ public static String generate(String template, Map<string, Object> map) {
 VelocityEngine velocityEngine = new VelocityEngine(INIT_PROP);
 // 创建上下文对象
 VelocityContext velocityContext = new VelocityContext();
- Settings settings = Settings.getInstance();
 if (map != null) {
 map.forEach(velocityContext::put);
 }
 StringWriter stringWriter = new StringWriter();
- // 设置编码
- velocityEngine.setProperty(VelocityEngine.INPUT_ENCODING, settings.getEncode());
- velocityEngine.setProperty(VelocityEngine.OUTPUT_ENCODING, settings.getEncode());
 try {
 // 生成代码
 velocityEngine.evaluate(velocityContext, stringWriter, "Velocity Code Generate", template);
diff --git a/src/main/java/com/sjhy/plugin/ui/GlobalConfigSettingPanel.java b/src/main/java/com/sjhy/plugin/ui/GlobalConfigSettingPanel.java
index 184f53a1..bb83d1e6 100644
--- a/src/main/java/com/sjhy/plugin/ui/GlobalConfigSettingPanel.java
+++ b/src/main/java/com/sjhy/plugin/ui/GlobalConfigSettingPanel.java
@@ -109,6 +109,17 @@ public String getDisplayName() {
 return "Global Config";
 }
 
+ /**
+ * Returns the topic in the help file which is shown when help for the configurable is requested.
+ *
+ * @return the help topic, or {@code null} if no help is available
+ */
+ @Nullable
+ @Override
+ public String getHelpTopic() {
+ return null;
+ }
+
 /**
 * 获取主面板对象
 *
diff --git a/src/main/java/com/sjhy/plugin/ui/MainSetting.form b/src/main/java/com/sjhy/plugin/ui/MainSetting.form
index b37c5cf5..5fbd62e8 100644
--- a/src/main/java/com/sjhy/plugin/ui/MainSetting.form
+++ b/src/main/java/com/sjhy/plugin/ui/MainSetting.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to->
- <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+ <grid id="27dc6" binding="mainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
 <margin top="0" left="0" bottom="0" right="0"/>
 <constraints>
 <xy x="0" y="1" height="499"/>
@@ -8,43 +8,18 @@
 <properties/>
 <border type="none"/>
 <children>
- <component id="c1393">
- <constraints>
- <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
- </constraints>
- <properties>
- <labelfor value="3e397"/>
- <text resource-bundle="string" key="label.default.encode"/>
- </properties>
- </component>
 <component id="9b299">
 <constraints>
- <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <labelfor value="94649"/>
 <text resource-bundle="string" key="label.author.name"/>
 </properties>
 </component>
- <component id="3e397" binding="encodeComboBox">
- <constraints>
- <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
- </constraints>
- <properties>
- <model>
- <item value="UTF-8"/>
- <item value="GBK"/>
- <item value="GB2312"/>
- <item value="UNICODE"/>
- <item value="ANSI"/>
- <item value="ASCII"/>
- <item value="ISO-8859-1"/>
- </model>
- </properties>
- </component>
 <component id="94649" binding="authorTextField">
 <constraints>
- <grid row="2" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="0" indent="0" use-parent-layout="false">
+ <grid row="2" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
 <preferred-size height="-1"/>
 </grid>
 </constraints>
@@ -52,23 +27,10 @@
 <text value=""/>
 </properties>
 </component>
- <component id="49eb5" binding="resetBtn">
- <constraints>
- <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
- </constraints>
- <properties>
- <text resource-bundle="string" key="button.reset"/>
- </properties>
- </component>
- <hspacer id="fefd">
- <constraints>
- <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
- </constraints>
- </hspacer>
 <grid id="45da" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
 <margin top="0" left="0" bottom="0" right="0"/>
 <constraints>
- <grid row="3" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+ <grid row="4" column="1" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties/>
 <border type="none"/>
@@ -117,6 +79,30 @@
 <text value=""/>
 </properties>
 </component>
+ <component id="49eb5" binding="resetBtn">
+ <constraints>
+ <grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle="string" key="button.reset"/>
+ </properties>
+ </component>
+ <component id="da0a8">
+ <constraints>
+ <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <text resource-bundle="string" key="label.configServer"/>
+ </properties>
+ </component>
+ <component id="1240c" binding="configServerTextField">
+ <constraints>
+ <grid row="3" column="1" row-span="1" col-span="3" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <preferred-size height="-1"/>
+ </grid>
+ </constraints>
+ <properties/>
+ </component>
 </children>
 </grid>
 </form>
diff --git a/src/main/java/com/sjhy/plugin/ui/MainSetting.java b/src/main/java/com/sjhy/plugin/ui/MainSetting.java
index e399ba73..fe143bc6 100644
--- a/src/main/java/com/sjhy/plugin/ui/MainSetting.java
+++ b/src/main/java/com/sjhy/plugin/ui/MainSetting.java
@@ -29,6 +29,8 @@
 import java.io.IOException;
 import java.util.*;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
 * 主设置面板
@@ -42,10 +44,6 @@ public class MainSetting implements Configurable, Configurable.Composite {
 * 主面板
 */
 private JPanel mainPanel;
- /**
- * 编码选择下拉框
- */
- private JComboBox encodeComboBox;
 /**
 * 作者编辑框
 */
@@ -66,6 +64,10 @@ public class MainSetting implements Configurable, Configurable.Composite {
 * 当前版本号
 */
 private JLabel versionLabel;
+ /**
+ * 配置服务器
+ */
+ private JTextField configServerTextField;
 
 /**
 * 重置列表
@@ -87,6 +89,8 @@ public class MainSetting implements Configurable, Configurable.Composite {
 */
 private Settings settings = Settings.getInstance();
 
+ private Pattern tokenPattern = Pattern.compile("(?<token>\\w{32})");
+
 /**
 * 默认构造方法
 */
@@ -235,8 +239,12 @@ public void actionPerformed(ActionEvent e) {
 // 提取token
 String token = "error";
 if (result.contains("token")) {
- int startLocation = result.indexOf("token") + 6;
- token = result.substring(startLocation, result.indexOf(",", startLocation));
+// int startLocation = result.indexOf("token") + 6;
+// token = result.substring(startLocation, result.indexOf(",", startLocation));
+ Matcher m = tokenPattern.matcher(result);
+ if (m.find()) {
+ token = m.group("token");
+ }
 }
 // 显示token
 Messages.showInputDialog(project, result, MsgValue.TITLE_INFO, AllIcons.General.InformationDialog, token, new NonEmptyInputValidator());
@@ -306,7 +314,7 @@ private void init() {
 //初始化数据
 versionLabel.setText(settings.getVersion());
 authorTextField.setText(settings.getAuthor());
- encodeComboBox.setSelectedItem(settings.getEncode());
+ configServerTextField.setText(HttpUtils.HOST_URL);
 }
 
 /**
@@ -320,6 +328,17 @@ public String getDisplayName() {
 return "Easy Code";
 }
 
+ /**
+ * Returns the topic in the help file which is shown when help for the configurable is requested.
+ *
+ * @return the help topic, or {@code null} if no help is available
+ */
+ @Nullable
+ @Override
+ public String getHelpTopic() {
+ return getDisplayName();
+ }
+
 /**
 * 更多配置
 *
@@ -369,7 +388,8 @@ public JComponent createComponent() {
 */
 @Override
 public boolean isModified() {
- return !settings.getEncode().equals(encodeComboBox.getSelectedItem()) &#124;&#124; !settings.getAuthor().equals(authorTextField.getText());
+ return !settings.getAuthor().equals(authorTextField.getText())
+ &#124;&#124; !HttpUtils.HOST_URL.equals(configServerTextField.getText());
 }
 
 /**
@@ -379,7 +399,7 @@ public boolean isModified() {
 public void apply() {
 //保存数据
 settings.setAuthor(authorTextField.getText());
- settings.setEncode((String) encodeComboBox.getSelectedItem());
+ HttpUtils.HOST_URL = configServerTextField.getText();
 }
 
 /**
@@ -389,4 +409,8 @@ public void apply() {
 public void reset() {
 init();
 }
+
+ private void createUIComponents() {
+ // TODO: place custom component creation code here
+ }
 }
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
index 56a96a4e..9fc5665d 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
@@ -3,7 +3,7 @@
 <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
 <margin top="10" left="10" bottom="10" right="10"/>
 <constraints>
- <xy x="48" y="54" height="297"/>
+ <xy x="48" y="54" height="336"/>
 </constraints>
 <properties/>
 <border type="none"/>
@@ -49,7 +49,7 @@
 </grid>
 </children>
 </grid>
- <grid id="e3588" layout-manager="GridLayoutManager" row-count="7" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+ <grid id="e3588" layout-manager="GridLayoutManager" row-count="9" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
 <margin top="0" left="0" bottom="0" right="0"/>
 <constraints>
 <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -57,24 +57,15 @@
 <properties/>
 <border type="none"/>
 <children>
- <component id="f79bc">
- <constraints>
- <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
- </constraints>
- <properties>
- <labelfor value="76436"/>
- <text resource-bundle="string" key="label.module"/>
- </properties>
- </component>
 <component id="76436" binding="moduleComboBox">
 <constraints>
- <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+ <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties/>
 </component>
 <component id="2dff5">
 <constraints>
- <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <labelfor value="158fc"/>
@@ -83,7 +74,7 @@
 </component>
 <component id="158fc" binding="packageField">
 <constraints>
- <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
 <preferred-size height="-1"/>
 </grid>
 </constraints>
@@ -91,7 +82,7 @@
 </component>
 <component id="d7b53">
 <constraints>
- <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <labelfor value="ab063"/>
@@ -100,7 +91,7 @@
 </component>
 <component id="ab063" binding="pathField">
 <constraints>
- <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
 <preferred-size height="-1"/>
 </grid>
 </constraints>
@@ -108,7 +99,7 @@
 </component>
 <component id="7467f" binding="packageChooseButton">
 <constraints>
- <grid row="1" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+ <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text resource-bundle="string" key="label.choose"/>
@@ -116,7 +107,7 @@
 </component>
 <component id="fba1b" binding="pathChooseButton">
 <constraints>
- <grid row="2" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+ <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text resource-bundle="string" key="label.choose"/>
@@ -125,7 +116,7 @@
 <grid id="7831c" binding="templatePanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
 <margin top="0" left="0" bottom="0" right="0"/>
 <constraints>
- <grid row="3" column="1" row-span="4" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+ <grid row="5" column="1" row-span="4" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties/>
 <border type="none"/>
@@ -133,7 +124,7 @@
 </grid>
 <component id="91ae2">
 <constraints>
- <grid row="3" column="0" row-span="4" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="5" column="0" row-span="4" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text resource-bundle="string" key="label.template"/>
@@ -141,7 +132,7 @@
 </component>
 <component id="9a8d1" binding="allCheckBox" default-binding="true">
 <constraints>
- <grid row="3" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text resource-bundle="string" key="label.all"/>
@@ -149,12 +140,12 @@
 </component>
 <vspacer id="98aa7">
 <constraints>
- <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+ <grid row="8" column="2" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
 </constraints>
 </vspacer>
 <component id="5e5a1" binding="unifiedConfig">
 <constraints>
- <grid row="4" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="6" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text resource-bundle="string" key="label.unified.config"/>
@@ -162,12 +153,53 @@
 </component>
 <component id="af94e" binding="titleConfig">
 <constraints>
- <grid row="5" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ <grid row="7" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
 <text value="禁止提示"/>
 </properties>
 </component>
+ <component id="caddc">
+ <constraints>
+ <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <labelfor value="81a34"/>
+ <text resource-bundle="string" key="label.removePre"/>
+ </properties>
+ </component>
+ <component id="81a34" binding="preField">
+ <constraints>
+ <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+ <preferred-size height="-1"/>
+ </grid>
+ </constraints>
+ <properties/>
+ </component>
+ <component id="f79bc">
+ <constraints>
+ <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <labelfor value="76436"/>
+ <text resource-bundle="string" key="label.group"/>
+ </properties>
+ </component>
+ <component id="a9ca">
+ <constraints>
+ <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties>
+ <labelfor value="76436"/>
+ <text resource-bundle="string" key="label.module"/>
+ </properties>
+ </component>
+ <component id="2c7fc" binding="groupComboBox">
+ <constraints>
+ <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+ </constraints>
+ <properties/>
+ </component>
 </children>
 </grid>
 </children>
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
index 61179490..c1bf0c81 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
@@ -1,6 +1,6 @@
 package com.sjhy.plugin.ui;
 
-//import com.intellij.ide.util.PackageChooserDialog;
+import com.intellij.ide.util.PackageChooserDialog;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.module.Module;
@@ -8,8 +8,9 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.vfs.VirtualFile;
-//import com.intellij.psi.PsiPackage;
 import com.intellij.util.ExceptionUtil;
+import com.intellij.psi.PsiPackage;
+import com.sjhy.plugin.config.Settings;
 import com.sjhy.plugin.constants.MsgValue;
 import com.sjhy.plugin.constants.StrState;
 import com.sjhy.plugin.entity.TableInfo;
@@ -17,17 +18,11 @@
 import com.sjhy.plugin.entity.TemplateGroup;
 import com.sjhy.plugin.service.CodeGenerateService;
 import com.sjhy.plugin.service.TableInfoService;
-import com.sjhy.plugin.tool.CacheDataUtils;
-import com.sjhy.plugin.tool.CurrGroupUtils;
-import com.sjhy.plugin.tool.ModuleUtils;
-import com.sjhy.plugin.tool.StringUtils;
+import com.sjhy.plugin.tool.*;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -64,6 +59,10 @@ public class SelectSavePath extends JDialog {
 * 路径字段
 */
 private JTextField pathField;
+ /**
+ * 前缀字段
+ */
+ private JTextField preField;
 /**
 * 包选择按钮
 */
@@ -88,6 +87,10 @@ public class SelectSavePath extends JDialog {
 * 禁止提示复选框
 */
 private JCheckBox titleConfig;
+ /**
+ * 分组选择框
+ */
+ private JComboBox<string> groupComboBox;
 /**
 * 所有模板复选框
 */
@@ -204,13 +207,20 @@ private void onOK() {
 // 保存路径使用相对路径
 String basePath = project.getBasePath();
 if (!StringUtils.isEmpty(basePath) && savePath.startsWith(basePath)) {
- savePath = savePath.replace(basePath, ".");
+ if (savePath.length()> basePath.length()) {
+ if ("/".equals(savePath.substring(basePath.length(), basePath.length() + 1))) {
+ savePath = savePath.replace(basePath, ".");
+ }
+ } else {
+ savePath = savePath.replace(basePath, ".");
+ }
 }
-
 // 保存配置
 TableInfo tableInfo = tableInfoService.getTableInfoAndConfig(cacheDataUtils.getSelectDbTable());
 tableInfo.setSavePath(savePath);
 tableInfo.setSavePackageName(packageField.getText());
+ tableInfo.setPreName(preField.getText());
+ tableInfo.setTemplateGroupName((String) groupComboBox.getSelectedItem());
 Module module = getSelectModule();
 if (module != null) {
 tableInfo.setSaveModelName(module.getName());
@@ -231,19 +241,36 @@ private void onCancel() {
 }
 
 /**
- * 初始化方法
+ * 初始化模板组
 */
- private void init() {
+ private void initTemplateGroup() {
 //添加模板组
 checkBoxList.clear();
+ templatePanel.removeAll();
 templatePanel.setLayout(new GridLayout(6, 2));
 templateGroup.getElementList().forEach(template -> {
 JCheckBox checkBox = new JCheckBox(template.getName());
 checkBoxList.add(checkBox);
 templatePanel.add(checkBox);
 });
+ // 移除所有旧事件
+ ActionListener[] actionListeners = allCheckBox.getActionListeners();
+ if (actionListeners != null && actionListeners.length> 0) {
+ for (ActionListener actionListener : actionListeners) {
+ allCheckBox.removeActionListener(actionListener);
+ }
+ }
 //添加全选事件
 allCheckBox.addActionListener(e -> checkBoxList.forEach(jCheckBox -> jCheckBox.setSelected(allCheckBox.isSelected())));
+ allCheckBox.setSelected(false);
+ }
+
+ /**
+ * 初始化方法
+ */
+ private void init() {
+ // 初始化模板组
+ initTemplateGroup();
 
 //初始化Module选择
 for (Module module : this.moduleList) {
@@ -258,38 +285,14 @@ private void init() {
 
 //添加包选择事件
 packageChooseButton.addActionListener(e -> {
- // 这里不知道发生了什么,明明类是存在的但是编译时就是找不到,只用通过反射来使用
- try {
- // 构建dialog
- Class<?> cls = Class.forName("com.intellij.ide.util.PackageChooserDialog");
- Constructor<?> constructor = cls.getConstructor(String.class, Project.class);
- Object dialog = constructor.newInstance("Package Chooser", project);
- // 打开dialog窗口
- Method show = dialog.getClass().getMethod("show");
- show.invoke(dialog);
- // 获取选中的包信息
- Method getSelectedPackage = dialog.getClass().getMethod("getSelectedPackage");
- Object psiPackage = getSelectedPackage.invoke(dialog);
- // 获取名字
- if (psiPackage != null) {
- Method getQualifiedName = psiPackage.getClass().getMethod("getQualifiedName");
- String packageName = (String) getQualifiedName.invoke(psiPackage);
- packageField.setText(packageName);
- // 刷新路径
- refreshPath();
- }
- } catch (IllegalAccessException &#124; InvocationTargetException &#124; NoSuchMethodException &#124; InstantiationException &#124; ClassNotFoundException e1) {
- // 抛出异常信息
- ExceptionUtil.rethrow(e1);
+ PackageChooserDialog dialog = new PackageChooserDialog("Package Chooser", project);
+ dialog.show();
+ PsiPackage psiPackage = dialog.getSelectedPackage();
+ if (psiPackage != null) {
+ packageField.setText(psiPackage.getQualifiedName());
+ // 刷新路径
+ refreshPath();
 }
-// PackageChooserDialog dialog = new PackageChooserDialog("Package Chooser", project);
-// dialog.show();
-// PsiPackage psiPackage = dialog.getSelectedPackage();
-// if (psiPackage != null) {
-// packageField.setText(psiPackage.getQualifiedName());
-// // 刷新路径
-// refreshPath();
-// }
 });
 
 // 添加包编辑框失去焦点事件
@@ -307,7 +310,7 @@ public void focusLost(FocusEvent e) {
 //选择路径
 pathChooseButton.addActionListener(e -> {
 //将当前选中的model设置为基础路径
- VirtualFile path = project.getBaseDir();
+ VirtualFile path = ProjectUtils.getBaseDir(project);
 Module module = getSelectModule();
 if (module != null) {
 path = ModuleUtils.getSourcePath(module);
@@ -327,6 +330,33 @@ public void focusLost(FocusEvent e) {
 if (!StringUtils.isEmpty(tableInfo.getSavePackageName())) {
 packageField.setText(tableInfo.getSavePackageName());
 }
+ if (!StringUtils.isEmpty(tableInfo.getPreName())) {
+ preField.setText(tableInfo.getPreName());
+ }
+ Settings settings = Settings.getInstance();
+ String groupName = settings.getCurrTemplateGroupName();
+ if (!StringUtils.isEmpty(tableInfo.getTemplateGroupName())) {
+ if (settings.getTemplateGroupMap().containsKey(tableInfo.getTemplateGroupName())) {
+ groupName = tableInfo.getTemplateGroupName();
+ this.templateGroup = settings.getTemplateGroupMap().get(groupName);
+ // 选中的模板组发生变化,尝试重新初始化
+ initTemplateGroup();
+ }
+ }
+ for (String key : settings.getTemplateGroupMap().keySet()) {
+ groupComboBox.addItem(key);
+ }
+ groupComboBox.setSelectedItem(groupName);
+ groupComboBox.addActionListener(e -> {
+ String selectedItem = (String) groupComboBox.getSelectedItem();
+ if (this.templateGroup.getName().equals(selectedItem)) {
+ return;
+ }
+ this.templateGroup = settings.getTemplateGroupMap().get(selectedItem);
+ // 选中的模板组发生变化,尝试重新初始化
+ initTemplateGroup();
+ this.open();
+ });
 String savePath = tableInfo.getSavePath();
 if (!StringUtils.isEmpty(savePath)) {
 // 判断是否需要拼接项目路径
@@ -358,9 +388,17 @@ private Module getSelectModule() {
 */
 private String getBasePath() {
 Module module = getSelectModule();
- String baseDir = project.getBasePath();
+ VirtualFile baseVirtualFile = ProjectUtils.getBaseDir(project);
+ if (baseVirtualFile == null) {
+ Messages.showWarningDialog("无法获取到项目基本路径!", MsgValue.TITLE_INFO);
+ return "";
+ }
+ String baseDir = baseVirtualFile.getPath();
 if (module != null) {
- baseDir = ModuleUtils.getSourcePath(module).getPath();
+ VirtualFile virtualFile = ModuleUtils.getSourcePath(module);
+ if (virtualFile != null) {
+ baseDir = virtualFile.getPath();
+ }
 }
 return baseDir;
 }
diff --git a/src/main/java/com/sjhy/plugin/ui/TableSettingPanel.java b/src/main/java/com/sjhy/plugin/ui/TableSettingPanel.java
index 28af1546..68acb4c0 100644
--- a/src/main/java/com/sjhy/plugin/ui/TableSettingPanel.java
+++ b/src/main/java/com/sjhy/plugin/ui/TableSettingPanel.java
@@ -62,6 +62,17 @@ public String getDisplayName() {
 return "Table Editor Config";
 }
 
+ /**
+ * Returns the topic in the help file which is shown when help for the configurable is requested.
+ *
+ * @return the help topic, or {@code null} if no help is available
+ */
+ @Nullable
+ @Override
+ public String getHelpTopic() {
+ return null;
+ }
+
 @Nullable
 @Override
 public JComponent createComponent() {
diff --git a/src/main/java/com/sjhy/plugin/ui/TemplateSettingPanel.java b/src/main/java/com/sjhy/plugin/ui/TemplateSettingPanel.java
index 00c90909..ded71ab8 100644
--- a/src/main/java/com/sjhy/plugin/ui/TemplateSettingPanel.java
+++ b/src/main/java/com/sjhy/plugin/ui/TemplateSettingPanel.java
@@ -139,6 +139,17 @@ public String getDisplayName() {
 return "Template Setting";
 }
 
+ /**
+ * Returns the topic in the help file which is shown when help for the configurable is requested.
+ *
+ * @return the help topic, or {@code null} if no help is available
+ */
+ @Nullable
+ @Override
+ public String getHelpTopic() {
+ return null;
+ }
+
 /**
 * 获取主面板对象
 *
diff --git a/src/main/java/com/sjhy/plugin/ui/TypeMapperSetting.java b/src/main/java/com/sjhy/plugin/ui/TypeMapperSetting.java
index 6192c879..6b1e21dd 100644
--- a/src/main/java/com/sjhy/plugin/ui/TypeMapperSetting.java
+++ b/src/main/java/com/sjhy/plugin/ui/TypeMapperSetting.java
@@ -187,6 +187,17 @@ public String getDisplayName() {
 return "Type Mapper";
 }
 
+ /**
+ * Returns the topic in the help file which is shown when help for the configurable is requested.
+ *
+ * @return the help topic, or {@code null} if no help is available
+ */
+ @Nullable
+ @Override
+ public String getHelpTopic() {
+ return null;
+ }
+
 @Nullable
 @Override
 public JComponent createComponent() {
diff --git a/src/main/java/com/sjhy/plugin/ui/base/TemplateEditor.java b/src/main/java/com/sjhy/plugin/ui/base/TemplateEditor.java
index 52de598d..3ad15781 100644
--- a/src/main/java/com/sjhy/plugin/ui/base/TemplateEditor.java
+++ b/src/main/java/com/sjhy/plugin/ui/base/TemplateEditor.java
@@ -11,16 +11,15 @@
 import com.intellij.openapi.editor.event.DocumentListener;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
+import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
 import com.intellij.testFramework.LightVirtualFile;
 import com.intellij.ui.BrowserHyperlinkListener;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.SeparatorFactory;
+import com.intellij.util.LocalTimeCounter;
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.UIUtil;
 import lombok.Getter;
@@ -107,12 +106,13 @@ public JComponent createComponent() {
 if (editor != null) {
 editorFactory.releaseEditor(editor);
 }
- PsiFileFactory psiFileFactory = PsiFileFactory.getInstance(project);
- PsiFile psiFile = psiFileFactory.createFileFromText(EASY_CODE_TEMPLATE, fileType, content, 0, true);
+
+ LightVirtualFile virtualFile = new LightVirtualFile(EASY_CODE_TEMPLATE, fileType, content, LocalTimeCounter.currentTime());
 // 标识为模板,让velocity跳过语法校验
- psiFile.getViewProvider().putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(project).getDefaultProperties());
+ virtualFile.putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(project).getDefaultProperties());
+
 // 创建文档对象
- Document document = PsiDocumentManager.getInstance(project).getDocument(psiFile);
+ Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
 assert document != null;
 // 创建编辑框
 editor = editorFactory.createEditor(document, project);
@@ -120,7 +120,12 @@ public JComponent createComponent() {
 // 添加修改事件
 editor.getDocument().addDocumentListener(new DocumentListener() {
 @Override
- public void documentChanged(DocumentEvent event) {
+ public void beforeDocumentChange(DocumentEvent event) {
+
+ }
+
+ @Override
+ public void documentChanged(@NotNull DocumentEvent event) {
 String text = editor.getDocument().getText();
 // 回调事件
 if (callback != null && !Objects.equals(text, content)) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 04897931..60890687 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,8 +1,7 @@
 <idea-plugin>
 <id>com.sjhy.plugin.easycode</id>
 <name>Easy Code</name>
- <version>1.2.3</version>
- <vendor email="1353036300@qq.com" url="http://www.shujuhaiyang.com">数据海洋</vendor>
+ <vendor email="1353036300@qq.com" url="http://www.shujuhaiyang.com">Easy Code Office Website</vendor>
 
 <description><![cdata[ <tag>EasyCode,Easy Code,easy,code,code generate,code tools</tag>
@@ -21,6 +20,41 @@
 
 
 <change-notes><![cdata[ + <p>1.2.4-RC2</p>
+ <ul>
+ <li>1.Fix the incorrect configuration information of some user prompt tables</li>
+ </ul>
+ <ul>
+ <li>1.修复部分用户提示表配置信息不正确问题</li>
+ </ul>
+ <p>1.2.4-RC</p>
+ <ul>
+ <li>1.Fix the incorrect configuration information of some user prompt tables</li>
+ </ul>
+ <ul>
+ <li>1.修复部分用户提示表配置信息不正确问题</li>
+ </ul>
+ <p>1.2.4-SNAPSHOT</p>
+ <ul>
+ <li>1.Add code auto format support (enabled by default), and use idea's own code format</li>
+ <li>2.New code will automatically prompt you to add to VCS (version control)</li>
+ <li>3.Add dasUtil dbUtil advanced tool class</li>
+ <li>4.Partial optimization for version 20.1</li>
+ <li>5.When the generated file exists, it supports three operations: overlay, comparison and cancellation</li>
+ <li>6.The code generation panel adds a table prefix, which is provided by feiyan99</li>
+ <li>7.Add template group selection function to code generation panel</li>
+ <li>8.Compatible with IDEA 17.1</li>
+ </ul>
+ <ul>
+ <li>1.加入代码自动格式化支持(默认开启),使用IDEA自带代码格式化实现</li>
+ <li>2.新增的代码会自动提示添加到VCS(版本控制)</li>
+ <li>3.新增dasUtil dbUtil高级工具类</li>
+ <li>4.针对20.1版本进行部分优化</li>
+ <li>5.生成文件存在时支持覆盖、对比、取消三种操作</li>
+ <li>6.代码生成面板加入表前缀,该功能由feiyan99提供PR</li>
+ <li>7.代码生成面板加入模板组选中功能</li>
+ <li>8.兼容至IDEA 17.1版本</li>
+ </ul>
 <p>1.2.3-RELEASE</p>
 <ul>
 <li>1.Compatible with idea2020.1</li>
@@ -152,7 +186,7 @@
 ]]></change-notes>
 
 
- <idea-version since-build="172"/>
+ <idea-version since-build="171.3780.107"/>
 
 
@@ -165,6 +199,8 @@
 <depends>com.intellij.database</depends>
 
 <depends>com.intellij.velocity</depends>
+ 
+ <depends>com.intellij.modules.java</depends>
 
 
 <extensions defaultExtensionNs="com.intellij">
diff --git a/src/main/resources/description/templateDescription.html b/src/main/resources/description/templateDescription.html
index afc00bfc..4ba14d57 100644
--- a/src/main/resources/description/templateDescription.html
+++ b/src/main/resources/description/templateDescription.html
@@ -7,7 +7,6 @@
 <pre>
 属性
 $author 设置中的作者 java.lang.String
- $encode 设置的编码 java.lang.String
 $modulePath 选中的module路径 java.lang.String
 $projectPath 项目绝对路径 java.lang.String
 
@@ -34,14 +33,16 @@
 $importList 所有需要导入的包集合 java.util.Set&lt;java.lang.String&gt;
 
 回调
- &callback
+ &callback 回调对象
 setFileName(String) 设置文件储存名字
 setSavePath(String) 设置文件储存路径,默认使用选中路径
+ setReformat(Boolean) 设置是否重新格式化生成后的代码,默认为true
 
 工具
 $tool
 firstUpperCase(String name) 首字母大写方法
 firstLowerCase(String name) 首字母小写方法
+ underScoreToHyphen(String name) 下划线转中划线
 getClsNameByFullName(String fullName) 通过包全名获取类名
 getJavaName(String name) 将下划线分割字符串转驼峰命名(属性名)
 getClassName(String name) 将下划线分割字符串转驼峰命名(类名)
@@ -58,11 +59,14 @@
 service(String serviceName, Object... param)远程服务调用
 parseJson(String) 将字符串转Map对象
 toJson(Object, Boolean) 将对象转json对象,Boolean:是否格式化json,不填时为不格式化。
+ uuid() 生成UUID
 toUnicode(String, Boolean) 将String转换为unicode形式,Boolean:是否转换所有符号,不填时只转换中文及中文符号。
 $time
 currTime(String format) 获取当前时间,指定时间格式(默认:yyyy-MM-dd HH:mm:ss)
 $generateService
 run(String, Map&lt;String,Object&gt;) 代码生成服务,参数1:模板名称,参数2:附加参数。
+ $dasUtil Database提供的工具类,具体可方法请查看源码,适用于高端玩家
+ $dbUtil Database提供的工具类,具体可方法请查看源码,适用于高端玩家
 </pre>
 </div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/makejavas/EasyCode/compare/master...litgh:EasyCode:master.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/makejavas/EasyCode/compare/master...litgh:EasyCode:master.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>		
</body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/globalConfig/Default/define.vm b/src/main/resources/globalConfig/Default/define.vm
index 4460b105..b7aee2ff 100644
--- a/src/main/resources/globalConfig/Default/define.vm
+++ b/src/main/resources/globalConfig/Default/define.vm
@@ -1,5 +1,11 @@
 ##(Velocity宏定义)
 
+#foreach($column in $tableInfo.fullColumn)
+ #if($column.name.startsWith("is"))
+ $column.setName($tool.firstLowerCase($column.name.substring(2)))
+ #end
+#end
+
 ##定义设置表名后缀的宏定义,调用方式:#setTableSuffix("Test")
 #macro(setTableSuffix $suffix)
 #set($tableName = $!tool.append($tableInfo.name, $suffix))
diff --git a/src/main/resources/globalConfig/Default/mybatisSupport.vm b/src/main/resources/globalConfig/Default/mybatisSupport.vm
index cd741b75..ba003105 100644
--- a/src/main/resources/globalConfig/Default/mybatisSupport.vm
+++ b/src/main/resources/globalConfig/Default/mybatisSupport.vm
@@ -23,6 +23,12 @@
 #set($jdbcType="OTHER")
 #end
 $tool.call($column.ext.put("jdbcType", $jdbcType))
+ #if($column.name.startsWith("is"))
+ $column.setName($tool.firstLowerCase($column.name.substring(2)))
+ #end
+ #if($column.ext.logicDelete)
+ #set($logicDelete = $column)
+ #end
 #end
 
 ##定义宏,查询所有列
diff --git a/src/main/resources/string.properties b/src/main/resources/string.properties
index 4a06432c..c2d79114 100644
--- a/src/main/resources/string.properties
+++ b/src/main/resources/string.properties
@@ -1,15 +1,17 @@
 button.reset=\u91CD\u7F6E\u9ED8\u8BA4\u8BBE\u7F6E
 button.type.mapper.copy.group=Copy Group
 label.all=&All
-label.version=&\u5f53\u524d\u7248\u672c\uFF1A
+label.version=&\u5F53\u524D\u7248\u672C\uFF1A
+label.configServer=&\u914d\u7f6e\u670d\u52a1\u5668
 label.author.name=&\u4F5C\u8005\u540D\u79F0\uFF1A
 label.cancel=&Cancel
 label.choose=&Choose
-label.default.encode=&\u9ED8\u8BA4\u7F16\u7801\uFF1A
+label.group=&Group
 label.module=&Module:
 label.ok=&OK
 label.package=&Package:
 label.path=&Path:
+label.removePre=&RemovePre:
 label.template=Template:
 label.template.group=&\u6A21\u677F\u7EC4\uFF1A
 label.type.mapper=&\u7C7B\u578B\u6620\u5C04\u7EC4\uFF1A
diff --git a/src/main/resources/template/Default/dao.java.vm b/src/main/resources/template/Default/dao.java.vm
index c7ccadbe..a42f6a96 100644
--- a/src/main/resources/template/Default/dao.java.vm
+++ b/src/main/resources/template/Default/dao.java.vm
@@ -57,6 +57,22 @@ public interface $!{tableName} {
 */
 int insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));
 
+ /**
+ * 批量新增数据(MyBatis原生foreach方法)
+ *
+ * @param entities List<$!{tableinfo.name}> 实例对象列表
+ * @return 影响行数
+ */
+ int insertBatch(@Param("entities") List<$!{tableinfo.name}> entities);
+
+ /**
+ * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+ *
+ * @param entities List<$!{tableinfo.name}> 实例对象列表
+ * @return 影响行数
+ */
+ int insertOrUpdateBatch(@Param("entities") List<$!{tableinfo.name}> entities);
+
 /**
 * 修改数据
 *
@@ -73,4 +89,4 @@ public interface $!{tableName} {
 */
 int deleteById($!pk.shortType $!pk.name);
 
-}
\ No newline at end of file
+}
diff --git a/src/main/resources/template/Default/mapper.xml.vm b/src/main/resources/template/Default/mapper.xml.vm
index 1c45308d..6299d5e0 100644
--- a/src/main/resources/template/Default/mapper.xml.vm
+++ b/src/main/resources/template/Default/mapper.xml.vm
@@ -59,6 +59,24 @@ $!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
 values (#foreach($column in $tableInfo.otherColumn)#{$!{column.name}}#if($velocityHasNext), #end#end)
 </insert>
 
+ <insert id="insertBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+ insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+ </foreach>
+ </insert>
+
+ <insert id="insertOrUpdateBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+ insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+ </foreach>
+ on duplicate key update
+ #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name) #if($velocityHasNext), #end#end
+ </insert>
+
 
 <update id="update">
 update $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}
@@ -77,4 +95,4 @@ $!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
 delete from $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name} where $!pk.obj.name = #{$!pk.name}
 </delete>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/src/main/resources/template/MybatisPlus-Mixed/controller.vm b/src/main/resources/template/MybatisPlus-Mixed/controller.vm
new file mode 100644
index 00000000..4546bbaa
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/controller.vm
@@ -0,0 +1,97 @@
+##导入宏定义
+$!define
+
+##设置表后缀(宏定义)
+#setTableSuffix("Controller")
+
+##保存文件(宏定义)
+#save("/controller", "Controller.java")
+
+##包路径(宏定义)
+#setPackageSuffix("controller")
+
+##定义服务名
+#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), "Service"))
+
+##定义实体对象名
+#set($entityName = $!tool.firstLowerCase($!tableInfo.name))
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.api.ApiController;
+import com.baomidou.mybatisplus.extension.api.R;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+import $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.util.List;
+
+##表注释(宏定义)
+#tableComment("表控制层")
+@RestController
+@RequestMapping("$!tool.firstLowerCase($!tableInfo.name)")
+public class $!{tableName} extends ApiController {
+ /**
+ * 服务对象
+ */
+ @Resource
+ private $!{tableInfo.name}Service $!{serviceName};
+
+ /**
+ * 分页查询所有数据
+ *
+ * @param page 分页对象
+ * @param $!entityName 查询实体
+ * @return 所有数据
+ */
+ @GetMapping
+ public R selectAll(Page<$!tableinfo.name> page, $!tableInfo.name $!entityName) {
+ return success(this.$!{serviceName}.page(page, new QueryWrapper<strong>($!entityName)));
+ }
+
+ /**
+ * 通过主键查询单条数据
+ *
+ * @param id 主键
+ * @return 单条数据
+ */
+ @GetMapping("{id}")
+ public R selectOne(@PathVariable Serializable id) {
+ return success(this.$!{serviceName}.getById(id));
+ }
+
+ /**
+ * 新增数据
+ *
+ * @param $!entityName 实体对象
+ * @return 新增结果
+ */
+ @PostMapping
+ public R insert(@RequestBody $!tableInfo.name $!entityName) {
+ return success(this.$!{serviceName}.save($!entityName));
+ }
+
+ /**
+ * 修改数据
+ *
+ * @param $!entityName 实体对象
+ * @return 修改结果
+ */
+ @PutMapping
+ public R update(@RequestBody $!tableInfo.name $!entityName) {
+ return success(this.$!{serviceName}.updateById($!entityName));
+ }
+
+ /**
+ * 删除数据
+ *
+ * @param idList 主键结合
+ * @return 删除结果
+ */
+ @DeleteMapping
+ public R delete(@RequestParam("idList") List<long> idList) {
+ return success(this.$!{serviceName}.removeByIds(idList));
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/template/MybatisPlus-Mixed/dao.vm b/src/main/resources/template/MybatisPlus-Mixed/dao.vm
new file mode 100644
index 00000000..853ab05b
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/dao.vm
@@ -0,0 +1,39 @@
+##导入宏定义
+$!define
+
+##设置表后缀(宏定义)
+#setTableSuffix("Dao")
+
+##保存文件(宏定义)
+#save("/dao", "Dao.java")
+
+##包路径(宏定义)
+#setPackageSuffix("dao")
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+
+##表注释(宏定义)
+#tableComment("表数据库访问层")
+public interface $!{tableName} extends BaseMapper<$!tableinfo.name> {
+
+/**
+* 批量新增数据(MyBatis原生foreach方法)
+*
+* @param entities List<$!{tableinfo.name}> 实例对象列表
+* @return 影响行数
+*/
+int insertBatch(@Param("entities") List<$!{tableinfo.name}> entities);
+
+/**
+* 批量新增或按主键更新数据(MyBatis原生foreach方法)
+*
+* @param entities List<$!{tableinfo.name}> 实例对象列表
+* @return 影响行数
+*/
+int insertOrUpdateBatch(@Param("entities") List<$!{tableinfo.name}> entities);
+
+}
diff --git a/src/main/resources/template/MybatisPlus-Mixed/entity.vm b/src/main/resources/template/MybatisPlus-Mixed/entity.vm
new file mode 100644
index 00000000..812ad525
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/entity.vm
@@ -0,0 +1,41 @@
+##导入宏定义
+$!define
+
+##保存文件(宏定义)
+#save("/entity", ".java")
+
+##包路径(宏定义)
+#setPackageSuffix("entity")
+
+##自动导入包(全局变量)
+$!autoImport
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.io.Serializable;
+
+##表注释(宏定义)
+#tableComment("表实体类")
+@SuppressWarnings("serial")
+public class $!{tableInfo.name} extends Model<$!{tableinfo.name}> {
+#foreach($column in $tableInfo.fullColumn)
+ #if(${column.comment})//${column.comment}#end
+
+ private $!{tool.getClsNameByFullName($column.type)} $!{column.name};
+#end
+
+#foreach($column in $tableInfo.fullColumn)
+#getSetMethod($column)
+#end
+
+#foreach($column in $tableInfo.pkColumn)
+ /**
+ * 获取主键值
+ *
+ * @return 主键值
+ */
+ @Override
+ protected Serializable pkVal() {
+ return this.$!column.name;
+ }
+ #break
+#end
+}
\ No newline at end of file
diff --git a/src/main/resources/template/MybatisPlus-Mixed/mapper.xml.vm b/src/main/resources/template/MybatisPlus-Mixed/mapper.xml.vm
new file mode 100644
index 00000000..0868c9ef
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/mapper.xml.vm
@@ -0,0 +1,42 @@
+##引入mybatis支持
+$!mybatisSupport
+
+##设置保存名称与保存位置
+$!callback.setFileName($tool.append($!{tableInfo.name}, "Dao.xml"))
+$!callback.setSavePath($tool.append($modulePath, "/src/main/resources/mapper"))
+
+##拿到主键
+#if(!$tableInfo.pkColumn.isEmpty())
+ #set($pk = $tableInfo.pkColumn.get(0))
+#end
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!doctype mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<ul class="image_map">
+
+ <resultmap type="$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}" id="$!{tableInfo.name}Map">
+#foreach($column in $tableInfo.fullColumn)
+ <result property="$!column.name" column="$!column.obj.name" jdbcType="$!column.ext.jdbcType"/>
+#end
+ </resultmap>
+
+ 
+ <insert id="insertBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+ insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+ </foreach>
+ </insert>
+ 
+ <insert id="insertOrUpdateBatch" keyProperty="$!pk.name" useGeneratedKeys="true">
+ insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)
+ values
+ <foreach collection="entities" item="entity" separator=",">
+ (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)
+ </foreach>
+ on duplicate key update
+ #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name) #if($velocityHasNext), #end#end
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/template/MybatisPlus-Mixed/service.vm b/src/main/resources/template/MybatisPlus-Mixed/service.vm
new file mode 100644
index 00000000..7a6b28e7
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/service.vm
@@ -0,0 +1,20 @@
+##导入宏定义
+$!define
+
+##设置表后缀(宏定义)
+#setTableSuffix("Service")
+
+##保存文件(宏定义)
+#save("/service", "Service.java")
+
+##包路径(宏定义)
+#setPackageSuffix("service")
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import $!{tableInfo.savePackageName}.entity.$!tableInfo.name;
+
+##表注释(宏定义)
+#tableComment("表服务接口")
+public interface $!{tableName} extends IService<$!tableinfo.name> {
+
+}
\ No newline at end of file
diff --git a/src/main/resources/template/MybatisPlus-Mixed/serviceImpl.vm b/src/main/resources/template/MybatisPlus-Mixed/serviceImpl.vm
new file mode 100644
index 00000000..fad1b29b
--- /dev/null
+++ b/src/main/resources/template/MybatisPlus-Mixed/serviceImpl.vm
@@ -0,0 +1,24 @@
+##导入宏定义
+$!define
+
+##设置表后缀(宏定义)
+#setTableSuffix("ServiceImpl")
+
+##保存文件(宏定义)
+#save("/service/impl", "ServiceImpl.java")
+
+##包路径(宏定义)
+#setPackageSuffix("service.impl")
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;
+import $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};
+import $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;
+import org.springframework.stereotype.Service;
+
+##表注释(宏定义)
+#tableComment("表服务实现类")
+@Service("$!tool.firstLowerCase($tableInfo.name)Service")
+public class $!{tableName} extends ServiceImpl<$!{tableinfo.name}dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {
+
+}
\ No newline at end of file
diff --git a/tpl_server.go b/tpl_server.go
new file mode 100644
index 00000000..60f6e27d
--- /dev/null
+++ b/tpl_server.go
@@ -0,0 +1,51 @@
+package main
+
+import (
+	"crypto/md5"
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+)
+
+func main() {
+	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+		b, _ := ioutil.ReadAll(r.Body)
+		h := md5.New()
+		h.Write(b)
+		md5Sum := fmt.Sprintf("%x", h.Sum(nil))
+		fmt.Println(md5Sum, string(b))
+		ioutil.WriteFile(md5Sum, b, 0444)
+		rs := make(map[string]interface{})
+		rs["code"] = 0
+		rs["data"] = "token:" + md5Sum
+		j, _ := json.Marshal(rs)
+		fmt.Println(string(j))
+		w.Write(j)
+	})
+	http.HandleFunc("/template", func(w http.ResponseWriter, r *http.Request) {
+		token := r.URL.Query().Get("token")
+		fmt.Println(token)
+		b, err := ioutil.ReadFile(token)
+		if err != nil {
+			d, _ := json.Marshal(struct {
+				Code int `json:"code"`
+				Msg string `json:"msg"`
+			}{
+				1,
+				err.Error(),
+			})
+			w.Write(d)
+			return
+		}
+		d, _ := json.Marshal(struct {
+			Code int `json:"code"`
+			Data string `json:"data"`
+		}{
+			0,
+			string(b),
+		})
+		w.Write(d)
+	})
+	http.ListenAndServe(":8899", nil)
+}