调整整个项目采用gradle进行构建

.gitignore

@@ -1,32 +1,10 @@
 ### IntelliJ IDEA ###
 
 ## 忽略其他配置文件，防止冲突
-.idea/*
+.idea/
+.gradle/
 
 ##忽略输出文件夹
 out/
 target/
-
-
-## IDEA主要文件，用于保证项目结构正常
-!*.iml
-
-## IDEA 代码样式文件，保证代码样式的一致性
-!.idea/codeStyles
-!.idea/codeStyles/codeStyleConfig.xml
-
-## IDEA 编译文件
-!.idea/compiler.xml
-
-## IDEA 项目编码文件
-!.idea/encodings.xml
-
-## IDEA JDK版本文件
-!.idea/misc.xml
-
-## IDEA modules 配置
-!.idea/modules.xml
-
-## IDEA 版本控制配置
-!.idea/vcs.xml
-
+build/

.idea/EasyCode.iml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PLUGIN_MODULE" version="4">
-  <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager">
-    <output url="file://$MODULE_DIR$/target" />
-    <output-test url="file://$MODULE_DIR$/target/test" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-    </content>
-    <orderEntry type="jdk" jdkName="IntelliJ IDEA IU-173.4127.27" jdkType="IDEA JDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/compiler.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="EasyCode_main" target="1.8" />
+      <module name="EasyCode_test" target="1.8" />
+      <module name="plugin_main" target="1.8" />
+      <module name="plugin_test" target="1.8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/misc.xml

@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="IntelliJ IDEA IU-173.4127.27" project-jdk-type="IDEA JDK" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>

.idea/modules.xml

@@ -2,7 +2,9 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/EasyCode.iml" filepath="$PROJECT_DIR$/.idea/EasyCode.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/EasyCode.iml" filepath="$PROJECT_DIR$/.idea/modules/EasyCode.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/EasyCode_main.iml" filepath="$PROJECT_DIR$/.idea/modules/EasyCode_main.iml" group="EasyCode" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/EasyCode_test.iml" filepath="$PROJECT_DIR$/.idea/modules/EasyCode_test.iml" group="EasyCode" />
     </modules>
   </component>
 </project>

.idea/vcs.xml

@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

README.md

@@ -1,2 +1,3 @@
 # EasyCode
-idea plugin
+idea plugin
+主要用与代码生成

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Tue Jul 17 10:19:47 CST 2018
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1 @@
+rootProject.name = 'EasyCode'

src/main/java/com/sjhy/plugin/action/MainActionGroup.java

@@ -15,14 +15,15 @@ import java.util.List;
 
 public class MainActionGroup extends ActionGroup {
     private CacheDataUtils cacheDataUtils = CacheDataUtils.getInstance();
+
     @NotNull
     @Override
     public AnAction[] getChildren(@Nullable AnActionEvent anActionEvent) {
-        if (anActionEvent==null) {
+        if (anActionEvent == null) {
             return AnAction.EMPTY_ARRAY;
         }
         Project project = anActionEvent.getProject();
-        if (project==null) {
+        if (project == null) {
             return AnAction.EMPTY_ARRAY;
         }
         //获取模型
@@ -33,7 +34,7 @@ public class MainActionGroup extends ActionGroup {
         if (psiElement instanceof DbTable) {
             selectDbTable = (DbTable) psiElement;
         }
-        if (selectDbTable==null) {
+        if (selectDbTable == null) {
             return AnAction.EMPTY_ARRAY;
         }
         //获取选中的所有表
@@ -65,12 +66,12 @@ public class MainActionGroup extends ActionGroup {
         String configActionId = "com.sjhy.easy.code.action.config";
         ActionManager actionManager = ActionManager.getInstance();
         AnAction mainAction = actionManager.getAction(mainActionId);
-        if (mainAction==null) {
+        if (mainAction == null) {
             mainAction = new MainAction("Generate Code");
             actionManager.registerAction(mainActionId, mainAction);
         }
         AnAction configAction = actionManager.getAction(configActionId);
-        if (configAction==null) {
+        if (configAction == null) {
             configAction = new ConfigAction("Config Table");
             actionManager.registerAction(configActionId, configAction);
         }

src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java

@@ -44,6 +44,7 @@ public class ConfigTableDialog extends JDialog {
         // call onCancel() when cross is clicked
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         addWindowListener(new WindowAdapter() {
+            @Override
             public void windowClosing(WindowEvent e) {
                 onCancel();
             }
@@ -68,9 +69,6 @@ public class ConfigTableDialog extends JDialog {
     }
 
 
-
-
-
     private void init() {
         initFlag = false;
         ConfigService configService = ConfigService.getInstance();
@@ -94,8 +92,8 @@ public class ConfigTableDialog extends JDialog {
             dataList.add(columnInfo.getType());
             dataList.add(columnInfo.getComment());
             //渲染附加数据
-            if (columnInfo.getExt()!=null && !columnInfo.getExt().isEmpty()){
-                for (int i=3; i<tableModel.getColumnCount(); i++) {
+            if (columnInfo.getExt() != null && !columnInfo.getExt().isEmpty()) {
+                for (int i = 3; i < tableModel.getColumnCount(); i++) {
                     dataList.add(columnInfo.getExt().get(tableModel.getColumnName(i)));
                 }
             }
@@ -107,14 +105,14 @@ public class ConfigTableDialog extends JDialog {
 
         //添加数据修改事件
         tableModel.addTableModelListener(e -> {
-            if (e.getFirstRow()!=e.getLastRow()){
+            if (e.getFirstRow() != e.getLastRow()) {
                 return;
             }
             int row = e.getFirstRow();
             int column = e.getColumn();
             Object val = tableModel.getValueAt(row, column);
             ColumnInfo columnInfo = tableInfo.getFullColumn().get(row);
-            if (column==0){
+            if (column == 0) {
                 for (ColumnInfo info : tableInfo.getFullColumn()) {
                     if (info.getName().equals(val) && !info.getName().equals(columnInfo.getName())) {
                         JOptionPane.showMessageDialog(null, "Column Name Already exist!");
@@ -133,9 +131,11 @@ public class ConfigTableDialog extends JDialog {
                 case 2:
                     columnInfo.setComment((String) val);
                     break;
+                default:
+                    break;
             }
-            if (column>2) {
-                if (columnInfo.getExt()==null) {
+            if (column > 2) {
+                if (columnInfo.getExt() == null) {
                     columnInfo.setExt(new HashMap<>());
                 }
                 String title = tableModel.getColumnName(column);
@@ -151,16 +151,16 @@ public class ConfigTableDialog extends JDialog {
                 return;
             }
             String value = JOptionPane.showInputDialog(null, "Input Column Name:", "Demo");
-            if (value==null) {
+            if (value == null) {
                 return;
             }
-            if (value.trim().length()==0){
+            if (value.trim().length() == 0) {
                 JOptionPane.showMessageDialog(null, "Column Name Can't Is Empty!");
                 return;
             }
 
             for (ColumnInfo columnInfo : tableInfo.getFullColumn()) {
-                if (columnInfo.getName().equals(value)){
+                if (columnInfo.getName().equals(value)) {
                     JOptionPane.showMessageDialog(null, "Column Name Already exist!");
                     return;
                 }
@@ -190,13 +190,15 @@ public class ConfigTableDialog extends JDialog {
                     break;
                 case BOOLEAN:
                     //给空列赋初始值
-                    for (int row=0; row< tableModel.getRowCount(); row++) {
-                        if (tableModel.getValueAt(row, index)==null){
+                    for (int row = 0; row < tableModel.getRowCount(); row++) {
+                        if (tableModel.getValueAt(row, index) == null) {
                             tableModel.setValueAt(false, row, index);
                         }
                     }
                     tableColumn.setCellEditor(new BooleanTableCellEditor());
                     break;
+                default:
+                    break;
             }
         });
     }
@@ -211,7 +213,7 @@ public class ConfigTableDialog extends JDialog {
     }
 
     public void open() {
-        setTitle("Config Table "+cacheDataUtils.getSelectDbTable().getName());
+        setTitle("Config Table " + cacheDataUtils.getSelectDbTable().getName());
         pack();
         setLocationRelativeTo(null);
         setVisible(true);

src/main/resources/META-INF/plugin.xml

@@ -16,16 +16,14 @@
     ]]>
     </change-notes>
 
-    <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="173.0"/>
-
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
     <!-- uncomment to enable plugin in all products
     <depends>com.intellij.modules.lang</depends>
     -->
-
-    <!--suppress PluginXmlValidity -->
+    <depends>com.intellij.modules.lang</depends>
+    <!--必须运行在企业版-->
+    <depends optional="true">com.intellij.modules.ultimate</depends>
     <depends optional="true">com.intellij.database</depends>
 
     <extensions defaultExtensionNs="com.intellij">

src/main/resources/template/entity.vm

@@ -33,31 +33,31 @@ $tool
     getJavaName(String) 将下划线分割字符串转驼峰命名
     append(... Object) 多个数据进行拼接
 *#
-$callback.setFileName($tool.append($tableInfo.name, ".java"))
+$!callback.setFileName($tool.append($tableInfo.name, ".java"))
 
-package $packageName;
+package $!packageName;
 
 #foreach($import in $importList)
-import $import;
+import $!import;
 #end
 
 /**
- * $!{tableInfo.comment}(${tableInfo.name})表实体类
- * @author $author
+ * $!{tableInfo.comment}($!{tableInfo.name})表实体类
+ * @author $!author
  */
-public class ${tableInfo.name} {
+public class $!{tableInfo.name} {
 #foreach($column in $tableInfo.fullColumn)
     #if(${column.comment})//${column.comment}#end
 
-    private ${tool.getClsNameByFullName($column.type)} ${column.name};
+    private $!{tool.getClsNameByFullName($column.type)} $!{column.name};
 #end
 
 #foreach($column in $tableInfo.fullColumn)
-    public ${tool.getClsNameByFullName($column.type)} get${tool.firstUpperCase($column.name)}() {
-        return ${column.name};
+    public $!{tool.getClsNameByFullName($column.type)} get$!{tool.firstUpperCase($column.name)}() {
+        return $!{column.name};
     }
-    public void set${tool.firstUpperCase($column.name)}(${tool.getClsNameByFullName($column.type)} ${column.name}) {
-        this.${column.name} = ${column.name};
+    public void set$!{tool.firstUpperCase($column.name)}($!{tool.getClsNameByFullName($column.type)} $!{column.name}) {
+        this.$!{column.name} = $!{column.name};
     }
 #end