Skip to content

Feature add data grip support #20

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,6 @@
out
*.iml

*.idea
*.idea
.DS_Store
*.zip
Binary file removed lib/gene-plugin-1.0-SNAPSHOT.jar
Binary file not shown.
Binary file removed lib/javaparser-core-3.6.25.jar
Binary file not shown.
Binary file removed lib/mybatis-generator-core-1.3.7.jar
Binary file not shown.
Binary file added lib/mybatis-generator-core-1.4.0.jar
Binary file not shown.
15 changes: 0 additions & 15 deletions mybatis-generator-plus.iml

This file was deleted.

20 changes: 18 additions & 2 deletions resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -6,6 +6,19 @@

<description>
<![CDATA[
<ul>
<li>
支持DataGrip<br/>
支持自定义domain后缀<br/>
支持自动识别mysql版本<br/>
支持xml默认包设置<br/>
支持选择mgb运行时<br/>
project tools 配置界面去除package相关配置<br/>
数据库用户名密码改为明文存储在插件持久化xml中(解决每次都要输入主机登录密码的烦恼)<br/>
</li>
</ul>
]]>
<![CDATA[
<ul>
<li>
Integrate with the Idea Database tool<br/>
@@ -92,13 +105,16 @@
]]>
</change-notes>

<idea-version since-build="143"/>
<idea-version since-build="193.5233.102"/>

<depends optional="true">com.intellij.database</depends>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.database</depends>
<extensions defaultExtensionNs="com.intellij">
<!-- 持久化配置 -->
<projectService
serviceInterface="com.github.leecho.idea.plugin.mybatis.generator.setting.MyBatisGeneratorConfiguration"
serviceImplementation="com.github.leecho.idea.plugin.mybatis.generator.setting.MyBatisGeneratorConfiguration"/>
<!-- 全局设置中的配置 -->
<projectConfigurable groupId="tools" displayName="Mybatis Generator Plus" id="Mybatis.Generator.Plus.Plugin"
instance="com.github.leecho.idea.plugin.mybatis.generator.setting.SettingConfigurable"/>
</extensions>
Original file line number Diff line number Diff line change
@@ -39,9 +39,6 @@ public void actionPerformed(AnActionEvent e) {
}
GenerateSettingUI ui = new GenerateSettingUI(e);
ui.show();
/*if (ui.showAndGet()) {
ui.generate();
}*/
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.github.leecho.idea.plugin.mybatis.generator.enums;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

public enum MbgJavaClientConfigTypeEnum {
MAPPER("MAPPER", "包含 Mapper 接口和 XML 文件,不包含注解"),
XMLMAPPER("XMLMAPPER", "包含 Mapper 接口和 XML 文件,不包含注解"),
ANNOTATEDMAPPER("ANNOTATEDMAPPER", "包含 Mapper 接口和 SqlProvider 辅助类,全注解,不包含 XML 文件"),
MIXEDMAPPER("MIXEDMAPPER", "包含 Mapper 接口和 XML 文件,简单的 CRUD 使用注解,高级条件查询使用 XML 文件"),
;
private String name;
private String desc;

MbgJavaClientConfigTypeEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getDesc() {
return desc;
}

public void setDesc(String desc) {
this.desc = desc;
}

public static List<String> getValuesByTargetRuntime(MbgTargetRuntimeEnum runtimeEnum) {
List<String> list = new ArrayList<>();
switch (runtimeEnum) {
case MY_BATIS3_DYNAMIC_SQL:
case MY_BATIS3_KOTLIN:
break;
case MY_BATIS3:
list = Arrays.stream(MbgJavaClientConfigTypeEnum.values())
.map(MbgJavaClientConfigTypeEnum::getName).collect(
Collectors.toList());
break;
case MY_BATIS3_SIMPLE:
list = Arrays.stream(MbgJavaClientConfigTypeEnum.values())
.filter(i -> !Objects.equals(i, MbgJavaClientConfigTypeEnum.MIXEDMAPPER))
.map(MbgJavaClientConfigTypeEnum::getName).collect(
Collectors.toList());
break;
}
return list;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.github.leecho.idea.plugin.mybatis.generator.enums;

import java.util.Objects;

public enum MbgTargetRuntimeEnum {
MY_BATIS3_DYNAMIC_SQL("MyBatis3DynamicSql","动态sql"),
MY_BATIS3_KOTLIN("MyBatis3Kotlin","支持Kotlin语言"),
MY_BATIS3("MyBatis3","最基础的"),
MY_BATIS3_SIMPLE("MyBatis3Simple","简单的(没有example)"),
;
private String name;
private String desc;

MbgTargetRuntimeEnum(String name, String desc) {
this.name = name;
this.desc = desc;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getDesc() {
return desc;
}

public void setDesc(String desc) {
this.desc = desc;
}

public static MbgTargetRuntimeEnum getByName(String name){
for (MbgTargetRuntimeEnum value : MbgTargetRuntimeEnum.values()) {
if (Objects.equals(name,value.name)) {
return value;
}
}
return null;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.github.leecho.idea.plugin.mybatis.generator.enums;

public enum PackageTypeEnum {
SOURCE_ROOT(0, "sourceRoot"),
RESOURCE_ROOT(1, "resourceRoot"),
BASE(2, "basePackage"),
DOMAIN(3, "domainPackage"),
MAPPER(4, "mapperPackage"),
EXAMPLE(5, "examplePackage"),
XML(6, "xmlPackage"),
;
private Integer code;
private String desc;

PackageTypeEnum(Integer code, String desc) {
this.code = code;
this.desc = desc;
}


}
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ public void saveStarted(int i) {
@Override
public void startTask(String s) {
System.out.println("Start Task: " + s);
indicator.setIndeterminate(false);
indicator.setText(s);
indicator.setFraction(indicator.getFraction() + 0.1);
}

This file was deleted.

Loading