v1.0.0

build.sh

@@ -6,8 +6,14 @@ mvn clean package
 
 echo "复制文件到build目录"
 
-cp -r generator/target/*.jar build
+build_dir="build"
+
+if [ ! -d "$build_dir" ]; then
+  mkdir $build_dir
+fi
+
+cp -r gen/target/*.jar build
 cp -r script/* build
-cp -r db/generator.db build/generator.db
+cp -r db/gen.db build/gen.db
 
 echo "构建完毕"

front/README.md

@@ -13,4 +13,4 @@
 ## 打包放入到服务端步骤
 
 - 执行`npm run build:prod`进行打包，结果在dest下
-- 把dest中的所有文件，放到`generator/src/main/resources/public`下
+- 把dest中的所有文件，放到`gen/src/main/resources/public`下

front/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "code-generator",
+  "name": "code-gen",
   "version": "4.1.0",
-  "description": "code-generator",
+  "description": "code-gen",
   "author": "tanghc",
   "license": "MIT",
   "scripts": {

generator/pom.xml

@@ -8,10 +8,10 @@
         <version>2.3.1.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
-    <groupId>com.gitee.codegenerator</groupId>
-    <artifactId>generator</artifactId>
+    <groupId>com.gitee.codegen</groupId>
+    <artifactId>gen</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <description>A code generator - 一款代码生成器</description>
+    <description>一款代码生成器</description>
 
     <properties>
         <java.version>1.8</java.version>
@@ -27,11 +27,7 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.1.3</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.9.4</version>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>

generator/src/main/java/com/gitee/generator/GeneratorApplication.java

@@ -1,13 +1,13 @@
-package com.gitee.generator;
+package com.gitee.gen;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class GeneratorApplication {
+public class GenApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(GeneratorApplication.class, args);
+        SpringApplication.run(GenApplication.class, args);
     }
 
 }

generator/src/main/java/com/gitee/generator/common/Action.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.common;
+package com.gitee.gen.common;
 
 /**
  * @author tanghc

generator/src/main/java/com/gitee/generator/common/DbType.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.common;
+package com.gitee.gen.common;
 
 /**
  * @author tanghc

generator/src/main/java/com/gitee/generator/common/GeneratorParam.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.common;
+package com.gitee.gen.common;
 
 import java.util.List;
 

generator/src/main/java/com/gitee/generator/common/PropertiesManager.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.common;
+package com.gitee.gen.common;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;

generator/src/main/java/com/gitee/generator/common/Result.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.common;
+package com.gitee.gen.common;
 
 public class Result {
     private String code;

generator/src/main/java/com/gitee/generator/config/GeneratorConfig.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.config;
+package com.gitee.gen.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;

generator/src/main/java/com/gitee/generator/controller/DatasourceConfigController.java

@@ -1,15 +1,15 @@
-package com.gitee.generator.controller;
+package com.gitee.gen.controller;
 
-import com.gitee.generator.common.Action;
-import com.gitee.generator.common.DbType;
-import com.gitee.generator.common.Result;
-import com.gitee.generator.entity.DatasourceConfig;
-import com.gitee.generator.gen.DBConnect;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.SQLService;
-import com.gitee.generator.gen.SQLServiceFactory;
-import com.gitee.generator.gen.TableDefinition;
-import com.gitee.generator.service.DatasourceConfigService;
+import com.gitee.gen.common.Action;
+import com.gitee.gen.common.DbType;
+import com.gitee.gen.common.Result;
+import com.gitee.gen.entity.DatasourceConfig;
+import com.gitee.gen.gen.DBConnect;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.SQLService;
+import com.gitee.gen.gen.SQLServiceFactory;
+import com.gitee.gen.gen.TableDefinition;
+import com.gitee.gen.service.DatasourceConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;

generator/src/main/java/com/gitee/generator/controller/GeneratorController.java

@@ -1,12 +1,12 @@
-package com.gitee.generator.controller;
+package com.gitee.gen.controller;
 
-import com.gitee.generator.common.Action;
-import com.gitee.generator.common.GeneratorParam;
-import com.gitee.generator.common.Result;
-import com.gitee.generator.entity.DatasourceConfig;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.service.DatasourceConfigService;
-import com.gitee.generator.service.GeneratorService;
+import com.gitee.gen.common.Action;
+import com.gitee.gen.common.GeneratorParam;
+import com.gitee.gen.common.Result;
+import com.gitee.gen.entity.DatasourceConfig;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.service.DatasourceConfigService;
+import com.gitee.gen.service.GeneratorService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

generator/src/main/java/com/gitee/generator/controller/TemplateConfigController.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.controller;
+package com.gitee.gen.controller;
 
-import com.gitee.generator.common.Action;
-import com.gitee.generator.common.Result;
-import com.gitee.generator.entity.TemplateConfig;
-import com.gitee.generator.service.TemplateConfigService;
+import com.gitee.gen.common.Action;
+import com.gitee.gen.common.Result;
+import com.gitee.gen.entity.TemplateConfig;
+import com.gitee.gen.service.TemplateConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;

generator/src/main/java/com/gitee/generator/entity/DatasourceConfig.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.entity;
+package com.gitee.gen.entity;
 
 
 /**

generator/src/main/java/com/gitee/generator/entity/TemplateConfig.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.entity;
+package com.gitee.gen.entity;
 
 
 /**

generator/src/main/java/com/gitee/generator/gen/CodeFile.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
 public class CodeFile {
 	public CodeFile(String tableName, String templateName, String content) {

generator/src/main/java/com/gitee/generator/gen/ColumnDefinition.java

@@ -1,7 +1,7 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.util.FieldUtil;
-import com.gitee.generator.util.SqlTypeUtil;
+import com.gitee.gen.util.FieldUtil;
+import com.gitee.gen.util.SqlTypeUtil;
 
 /**
  * 表字段信息

generator/src/main/java/com/gitee/generator/gen/ColumnSelector.java

@@ -1,6 +1,6 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.util.SqlHelper;
+import com.gitee.gen.util.SqlHelper;
 
 import java.util.ArrayList;
 import java.util.List;

generator/src/main/java/com/gitee/generator/gen/DBConnect.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
 
 import java.sql.Connection;

generator/src/main/java/com/gitee/generator/gen/GeneratorConfig.java

@@ -1,6 +1,6 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.entity.DatasourceConfig;
+import com.gitee.gen.entity.DatasourceConfig;
 import org.springframework.beans.BeanUtils;
 
 import java.util.HashMap;

generator/src/main/java/com/gitee/generator/gen/SQLContext.java

@@ -1,6 +1,6 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.util.FieldUtil;
+import com.gitee.gen.util.FieldUtil;
 
 import java.util.List;
 

generator/src/main/java/com/gitee/generator/gen/SQLService.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
 
 public interface SQLService {

generator/src/main/java/com/gitee/generator/gen/SQLServiceFactory.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.gen.mysql.MySqlService;
-import com.gitee.generator.gen.oracle.OracleService;
-import com.gitee.generator.gen.sqlserver.SqlServerService;
+import com.gitee.gen.gen.mysql.MySqlService;
+import com.gitee.gen.gen.oracle.OracleService;
+import com.gitee.gen.gen.sqlserver.SqlServerService;
 
 import java.util.HashMap;
 import java.util.Map;

generator/src/main/java/com/gitee/generator/gen/TableBean.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
 public class TableBean {
 	

generator/src/main/java/com/gitee/generator/gen/TableDefinition.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

generator/src/main/java/com/gitee/generator/gen/TableSelector.java

@@ -1,6 +1,6 @@
-package com.gitee.generator.gen;
+package com.gitee.gen.gen;
 
-import com.gitee.generator.util.SqlHelper;
+import com.gitee.gen.util.SqlHelper;
 
 import java.util.ArrayList;
 import java.util.List;

generator/src/main/java/com/gitee/generator/gen/mysql/MySqlColumnSelector.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.gen.mysql;
+package com.gitee.gen.gen.mysql;
 
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.ColumnDefinition;
-import com.gitee.generator.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.ColumnDefinition;
+import com.gitee.gen.gen.ColumnSelector;
 import org.springframework.util.StringUtils;
 
 import java.util.Map;

generator/src/main/java/com/gitee/generator/gen/mysql/MySqlService.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.mysql;
+package com.gitee.gen.gen.mysql;
 
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.SQLService;
-import com.gitee.generator.gen.TableSelector;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.SQLService;
+import com.gitee.gen.gen.TableSelector;
 
 public class MySqlService implements SQLService {
 

generator/src/main/java/com/gitee/generator/gen/mysql/MySqlTableSelector.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.mysql;
+package com.gitee.gen.gen.mysql;
 
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.TableSelector;
-import com.gitee.generator.gen.TableDefinition;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.TableSelector;
+import com.gitee.gen.gen.TableDefinition;
 
 import java.util.Map;
 

generator/src/main/java/com/gitee/generator/gen/oracle/OracleColumnSelector.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.gen.oracle;
+package com.gitee.gen.gen.oracle;
 
-import com.gitee.generator.gen.ColumnDefinition;
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
+import com.gitee.gen.gen.ColumnDefinition;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
 import org.springframework.util.StringUtils;
 
 import java.util.Map;

generator/src/main/java/com/gitee/generator/gen/oracle/OracleService.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.oracle;
+package com.gitee.gen.gen.oracle;
 
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.SQLService;
-import com.gitee.generator.gen.TableSelector;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.SQLService;
+import com.gitee.gen.gen.TableSelector;
 
 public class OracleService implements SQLService {
 

generator/src/main/java/com/gitee/generator/gen/oracle/OracleTableSelector.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.oracle;
+package com.gitee.gen.gen.oracle;
 
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.TableSelector;
-import com.gitee.generator.gen.TableDefinition;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.TableSelector;
+import com.gitee.gen.gen.TableDefinition;
 
 import java.util.Map;
 

generator/src/main/java/com/gitee/generator/gen/sqlserver/SqlServerColumnSelector.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.gen.sqlserver;
+package com.gitee.gen.gen.sqlserver;
 
-import com.gitee.generator.gen.ColumnDefinition;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.ColumnSelector;
+import com.gitee.gen.gen.ColumnDefinition;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.ColumnSelector;
 
 import java.util.Map;
 import java.util.Set;

generator/src/main/java/com/gitee/generator/gen/sqlserver/SqlServerService.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.sqlserver;
+package com.gitee.gen.gen.sqlserver;
 
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.SQLService;
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.TableSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.SQLService;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.TableSelector;
 
 public class SqlServerService implements SQLService {
 

generator/src/main/java/com/gitee/generator/gen/sqlserver/SqlServerTableSelector.java

@@ -1,9 +1,9 @@
-package com.gitee.generator.gen.sqlserver;
+package com.gitee.gen.gen.sqlserver;
 
-import com.gitee.generator.gen.ColumnSelector;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.TableSelector;
-import com.gitee.generator.gen.TableDefinition;
+import com.gitee.gen.gen.ColumnSelector;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.TableSelector;
+import com.gitee.gen.gen.TableDefinition;
 
 import java.util.Map;
 

generator/src/main/java/com/gitee/generator/mapper/DatasourceConfigMapper.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.mapper;
+package com.gitee.gen.mapper;
 
 import java.util.List;
 
-import com.gitee.generator.entity.DatasourceConfig;
+import com.gitee.gen.entity.DatasourceConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

generator/src/main/java/com/gitee/generator/mapper/TemplateConfigMapper.java

@@ -1,8 +1,8 @@
-package com.gitee.generator.mapper;
+package com.gitee.gen.mapper;
 
 import java.util.List;
 
-import com.gitee.generator.entity.TemplateConfig;
+import com.gitee.gen.entity.TemplateConfig;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

generator/src/main/java/com/gitee/generator/service/DatasourceConfigService.java

@@ -1,7 +1,7 @@
-package com.gitee.generator.service;
+package com.gitee.gen.service;
 
-import com.gitee.generator.entity.DatasourceConfig;
-import com.gitee.generator.mapper.DatasourceConfigMapper;
+import com.gitee.gen.entity.DatasourceConfig;
+import com.gitee.gen.mapper.DatasourceConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

generator/src/main/java/com/gitee/generator/service/GeneratorService.java

@@ -1,15 +1,15 @@
-package com.gitee.generator.service;
-
-import com.gitee.generator.common.GeneratorParam;
-import com.gitee.generator.entity.TemplateConfig;
-import com.gitee.generator.gen.CodeFile;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.gen.SQLContext;
-import com.gitee.generator.gen.SQLService;
-import com.gitee.generator.gen.SQLServiceFactory;
-import com.gitee.generator.gen.TableDefinition;
-import com.gitee.generator.gen.TableSelector;
-import com.gitee.generator.util.VelocityUtil;
+package com.gitee.gen.service;
+
+import com.gitee.gen.common.GeneratorParam;
+import com.gitee.gen.entity.TemplateConfig;
+import com.gitee.gen.gen.CodeFile;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.gen.SQLContext;
+import com.gitee.gen.gen.SQLService;
+import com.gitee.gen.gen.SQLServiceFactory;
+import com.gitee.gen.gen.TableDefinition;
+import com.gitee.gen.gen.TableSelector;
+import com.gitee.gen.util.VelocityUtil;
 import org.apache.velocity.VelocityContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

generator/src/main/java/com/gitee/generator/service/TemplateConfigService.java

@@ -1,7 +1,7 @@
-package com.gitee.generator.service;
+package com.gitee.gen.service;
 
-import com.gitee.generator.entity.TemplateConfig;
-import com.gitee.generator.mapper.TemplateConfigMapper;
+import com.gitee.gen.entity.TemplateConfig;
+import com.gitee.gen.mapper.TemplateConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

generator/src/main/java/com/gitee/generator/util/CopyUtil.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
 import org.springframework.beans.BeanUtils;
 

generator/src/main/java/com/gitee/generator/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

generator/src/main/java/com/gitee/generator/util/FieldUtil.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
 import org.springframework.util.StringUtils;
 

generator/src/main/java/com/gitee/generator/util/SqlHelper.java

@@ -1,6 +1,6 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
-import com.gitee.generator.gen.GeneratorConfig;
+import com.gitee.gen.gen.GeneratorConfig;
 import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
 import org.apache.ibatis.jdbc.SqlRunner;
 import org.apache.ibatis.mapping.BoundSql;

generator/src/main/java/com/gitee/generator/util/SqlTypeUtil.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
 import java.util.HashMap;
 import java.util.Map;

generator/src/main/java/com/gitee/generator/util/VelocityUtil.java

@@ -1,4 +1,4 @@
-package com.gitee.generator.util;
+package com.gitee.gen.util;
 
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.Velocity;

generator/src/main/resources/application.properties

@@ -1,8 +1,8 @@
-spring.application.name=generator
+spring.application.name=gen
 server.port=6969
 
 spring.datasource.driver-class-name=org.sqlite.JDBC
-spring.datasource.url=jdbc:sqlite:generator.db
+spring.datasource.url=jdbc:sqlite:gen.db
 spring.datasource.username=
 spring.datasource.password=
 
@@ -14,7 +14,7 @@ spring.datasource.password=
 # ==========================================
 # mysql
 #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://localhost:3306/generator?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+#spring.datasource.url=jdbc:mysql://localhost:3306/gen?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #spring.datasource.username=root
 #spring.datasource.password=root
 

generator/src/main/resources/mybatis/DatasourceConfigMapper.xml

@@ -1,7 +1,7 @@
 <?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" >
-<mapper namespace="com.gitee.generator.mapper.DatasourceConfigMapper">
-    <resultMap id="BaseResultMap" type="com.gitee.generator.entity.DatasourceConfig">
+<mapper namespace="com.gitee.gen.mapper.DatasourceConfigMapper">
+    <resultMap id="BaseResultMap" type="com.gitee.gen.entity.DatasourceConfig">
         <result column="id" property="id" jdbcType="INTEGER" />
         <result column="db_type" property="dbType" jdbcType="INTEGER" />
         <result column="driver_class" property="driverClass" jdbcType="VARCHAR" />
@@ -43,7 +43,7 @@
     </select>
 
     <!-- 插入全部字段 -->
-    <insert id="insert" parameterType="com.gitee.generator.entity.DatasourceConfig"
+    <insert id="insert" parameterType="com.gitee.gen.entity.DatasourceConfig"
             keyProperty="id" keyColumn="id" useGeneratedKeys="true"
     >
         INSERT INTO datasource_config
@@ -70,7 +70,7 @@
     </insert>
 
     <!-- 插入不为NULL的字段 -->
-    <insert id="insertIgnoreNull" parameterType="com.gitee.generator.entity.DatasourceConfig"
+    <insert id="insertIgnoreNull" parameterType="com.gitee.gen.entity.DatasourceConfig"
             keyProperty="id" keyColumn="id" useGeneratedKeys="true"
     >
         INSERT INTO datasource_config
@@ -130,7 +130,7 @@
     </insert>
 
     <!-- 更新,更新全部字段 -->
-    <update id="update" parameterType="com.gitee.generator.entity.DatasourceConfig">
+    <update id="update" parameterType="com.gitee.gen.entity.DatasourceConfig">
         UPDATE datasource_config
         <set>
             db_type=#{dbType},
@@ -147,7 +147,7 @@
 
 
     <!-- 更新不为NULL的字段 -->
-    <update id="updateIgnoreNull" parameterType="com.gitee.generator.entity.DatasourceConfig">
+    <update id="updateIgnoreNull" parameterType="com.gitee.gen.entity.DatasourceConfig">
         UPDATE datasource_config
         <set>
             <if test="dbType != null" >
@@ -180,7 +180,7 @@
 
 
     <!-- 根据主键删除记录 -->
-    <delete id="delete" parameterType="com.gitee.generator.entity.DatasourceConfig">
+    <delete id="delete" parameterType="com.gitee.gen.entity.DatasourceConfig">
 		UPDATE datasource_config
 		SET is_deleted=1
 		WHERE id = #{id}

generator/src/main/resources/mybatis/TemplateConfigMapper.xml

@@ -1,7 +1,7 @@
 <?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" >
-<mapper namespace="com.gitee.generator.mapper.TemplateConfigMapper">
-    <resultMap id="BaseResultMap" type="com.gitee.generator.entity.TemplateConfig">
+<mapper namespace="com.gitee.gen.mapper.TemplateConfigMapper">
+    <resultMap id="BaseResultMap" type="com.gitee.gen.entity.TemplateConfig">
         <result column="id" property="id" jdbcType="INTEGER" />
         <result column="name" property="name" jdbcType="VARCHAR" />
         <result column="file_name" property="fileName" jdbcType="VARCHAR" />
@@ -35,7 +35,7 @@
     </select>
 
     <!-- 插入全部字段 -->
-    <insert id="insert" parameterType="com.gitee.generator.entity.TemplateConfig"
+    <insert id="insert" parameterType="com.gitee.gen.entity.TemplateConfig"
             keyProperty="id" keyColumn="id" useGeneratedKeys="true"
     >
         INSERT INTO template_config
@@ -54,7 +54,7 @@
     </insert>
 
     <!-- 插入不为NULL的字段 -->
-    <insert id="insertIgnoreNull" parameterType="com.gitee.generator.entity.TemplateConfig"
+    <insert id="insertIgnoreNull" parameterType="com.gitee.gen.entity.TemplateConfig"
             keyProperty="id" keyColumn="id" useGeneratedKeys="true"
     >
         INSERT INTO template_config
@@ -90,7 +90,7 @@
     </insert>
 
     <!-- 更新,更新全部字段 -->
-    <update id="update" parameterType="com.gitee.generator.entity.TemplateConfig">
+    <update id="update" parameterType="com.gitee.gen.entity.TemplateConfig">
         UPDATE template_config
         <set>
             name=#{name},
@@ -103,7 +103,7 @@
 
 
     <!-- 更新不为NULL的字段 -->
-    <update id="updateIgnoreNull" parameterType="com.gitee.generator.entity.TemplateConfig">
+    <update id="updateIgnoreNull" parameterType="com.gitee.gen.entity.TemplateConfig">
         UPDATE template_config
         <set>
             <if test="name != null" >
@@ -124,7 +124,7 @@
 
 
     <!-- 根据主键删除记录 -->
-    <delete id="delete" parameterType="com.gitee.generator.entity.TemplateConfig">
+    <delete id="delete" parameterType="com.gitee.gen.entity.TemplateConfig">
 		UPDATE template_config
 		SET is_deleted=1
 		WHERE id = #{id}

generator/src/test/java/com/gitee/generator/GeneratorApplicationTests.java

@@ -1,13 +1,13 @@
-package com.gitee.generator;
+package com.gitee.gen;
 
-import com.gitee.generator.common.GeneratorParam;
-import com.gitee.generator.entity.DatasourceConfig;
-import com.gitee.generator.entity.TemplateConfig;
-import com.gitee.generator.gen.CodeFile;
-import com.gitee.generator.gen.GeneratorConfig;
-import com.gitee.generator.mapper.DatasourceConfigMapper;
-import com.gitee.generator.mapper.TemplateConfigMapper;
-import com.gitee.generator.service.GeneratorService;
+import com.gitee.gen.common.GeneratorParam;
+import com.gitee.gen.entity.DatasourceConfig;
+import com.gitee.gen.entity.TemplateConfig;
+import com.gitee.gen.gen.CodeFile;
+import com.gitee.gen.gen.GeneratorConfig;
+import com.gitee.gen.mapper.DatasourceConfigMapper;
+import com.gitee.gen.mapper.TemplateConfigMapper;
+import com.gitee.gen.service.GeneratorService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

generator/src/main/java/com/gitee/generator/util/FileUtil.java

@@ -1,295 +0,0 @@
-package com.gitee.generator.util;
-
-import org.apache.tools.zip.ZipOutputStream;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStreamWriter;
-import java.util.Date;
-import java.util.List;
-
-public class FileUtil {
-	
-	public static final String UTF8 = "UTF-8";
-	public static final String NEXT_LINE = "\r\n";
-	
-	private static final String ZIP_COMMENT = "本文件由代码生成工具autoCode生成.\r\n项目地址:https://git.oschina.net/durcframework/autoCode";
-
-	/**
-	 * 读文件
-	 * 
-	 * @param fileName
-	 * @return
-	 */
-	public static String readFromClassPath(String fileName) {
-		Resource resource = new ClassPathResource(fileName);
-		StringBuilder sb = new StringBuilder();
-		BufferedReader read = null;
-		try {
-			read = new BufferedReader(new FileReader(resource.getFile()));
-			char[] buf = new char[(int) resource.contentLength()];
-			read.read(buf);
-			sb.append(buf);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				read.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return sb.toString();
-	}
-
-	public static String read(String fileName) {
-		StringBuilder sb = new StringBuilder();
-		BufferedReader read = null;
-		try {
-			File file = new File(fileName);
-			read = new BufferedReader(new FileReader(file));
-			char[] buf = new char[(int) file.length()];
-			read.read(buf);
-			sb.append(buf);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				read.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * 写文件
-	 */
-	public static void write(String txt, String fileName,String charset) {
-		OutputStreamWriter osw = null;
-		try {
-			if(charset == null) {
-				charset = UTF8;
-			}
-			osw = new OutputStreamWriter(new FileOutputStream(fileName), charset);
-			osw.write(txt);
-			osw.flush();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				osw.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	public static void write(String txt, String fileName) {
-		write(txt, fileName, UTF8);
-	}
-
-	/**
-	 * copy file or folder
-	 * 
-	 * @param srcFile
-	 * @param desFile
-	 * @throws IOException
-	 */
-	public static void copy(File srcFile, File desFile) {
-		if (!srcFile.exists()) {
-			return;
-		}
-		if (!desFile.exists()) {
-			desFile.mkdirs();
-		}
-		if (srcFile.isFile()) {
-			doCopy(srcFile, desFile);
-		} else {
-			String objFolder = desFile.getPath() + File.separator
-					+ srcFile.getName();
-			File _objFolderFile = new File(objFolder);
-			_objFolderFile.mkdirs();
-			for (File sf : srcFile.listFiles()) {
-				copy(sf, new File(objFolder));
-			}
-		}
-	}
-
-	private static void doCopy(File srcFile, File desFile) {
-		InputStream ins = null;
-		FileOutputStream outs = null;
-		try {
-			File objFile = new File(desFile.getPath() + File.separator
-					+ srcFile.getName());
-			ins = new FileInputStream(srcFile);
-			outs = new FileOutputStream(objFile);
-			byte[] buffer = new byte[ins.available()];
-			int length;
-			while ((length = ins.read(buffer)) != -1) {
-				outs.write(buffer, 0, length);
-			}
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				ins.close();
-				outs.flush();
-				outs.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-
-		}
-
-	}
-
-	/**
-	 * 创建文件夹
-	 * 
-	 * @param folderName
-	 */
-	public static void createFolder(String folderName) {
-		File file = new File(folderName);
-		if (file.exists()) {
-			return;
-		}
-		file.mkdirs();
-	}
-	
-	/**
-     * 删除空目录
-     * @param dir 将要删除的目录路径
-     */
-	public static void doDeleteEmptyDir(String dir) {
-        (new File(dir)).delete();
-    }
-
-    /**
-     * 递归删除目录下的所有文件及子目录下所有文件
-     * @param dir 将要删除的文件目录
-     * @return boolean Returns "true" if all deletions were successful.
-     *                 If a deletion fails, the method stops attempting to
-     *                 delete and returns "false".
-     */
-	public static boolean deleteDir(File dir) {
-        if (dir.isDirectory()) {
-            String[] children = dir.list();
-            //递归删除目录中的子目录下
-            for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
-                    return false;
-                }
-            }
-        }
-        // 目录此时为空，可以删除
-        return dir.delete();
-    }
-
-	public static void createFolders(List<String> folders) {
-		for (String folder : folders) {
-			createFolder(folder);
-		}
-	}
-
-	/**
-	 * 重命名
-	 * 
-	 * @param srcFileName
-	 * @param desFileName
-	 */
-	public static void renameFile(String srcFileName, String desFileName) {
-		File desFile = new File(desFileName);
-		if (desFile.exists()) {
-			return;
-		}
-		File srcFile = new File(srcFileName);
-		srcFile.renameTo(desFile);
-	}
-
-	/**
-	 * 把"."操作符转化成"/"
-	 * 
-	 * @param path
-	 * @return
-	 */
-	public static String replacePointToSep(String path) {
-		return path.replaceAll("\\.", "/");
-	}
-
-	/**
-	 * zip("D:/ccc", "D:/ccc.zip");
-	 * @param inputFileName 目标文件夹
-	 * @param desZipFile 生成zip
-	 * @throws Exception
-	 */
-	public static void zip(String inputFileName, String desZipFile)
-			throws Exception {
-		zip(desZipFile, new File(inputFileName));
-	}
-
-	private static void zip(String zipFileName, File inputFile)
-			throws Exception {
-		ZipOutputStream out = new ZipOutputStream(new FileOutputStream(
-				zipFileName));
-		out.setComment(String.format(ZIP_COMMENT, inputFile.getName(),
-				DateUtil.ymdFormat(new Date())));
-		out.setEncoding("GBK");
-		zip(out, inputFile, "");
-		out.close();
-	}
-
-	private static void zip(ZipOutputStream out, File f, String base) {
-		FileInputStream in = null;
-		if (f.isDirectory()) {
-			File[] fl = f.listFiles();
-			// 如果不加最外层文件夹作为zip名
-			//base = (base.length() == 0 ? f.getName() : base);
-			try {
-				out.putNextEntry(new org.apache.tools.zip.ZipEntry(base + "/"));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-			base = base.length() == 0 ? "" : base + "/";
-			for (File file : fl) {
-				zip(out, file, base + file.getName());
-			}
-		} else {
-			try {
-				out.putNextEntry(new org.apache.tools.zip.ZipEntry(base));
-				in = new FileInputStream(f);
-				byte[] buf = new byte[in.available()];
-				in.read(buf);
-				out.write(buf);
-				in.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public static void main(String[] args) {
-	
-		try {
-			zip("D:/ccc", "D:/ccc.zip");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

pom.xml

@@ -4,13 +4,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.giee.codegenerator</groupId>
-    <artifactId>code-generator</artifactId>
+    <groupId>com.giee.codegen</groupId>
+    <artifactId>code-gen</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
-        <module>generator</module>
+        <module>gen</module>
     </modules>
 
 </project>

readme.md

@@ -1,4 +1,4 @@
-# code-generator
+# code-gen
 
 一款代码生成工具，可自定义模板生成各种不同的代码。
 
@@ -6,20 +6,20 @@
 
 默认提供了实体类、mybatis接口、mybatis配置文件模板，可以快速开发mybatis应用。
 
-教程：[快速搭建SpringBoot+Mybatis应用](https://gitee.com/durcframework/code-generator/wikis/pages?sort_id=2478942&doc_id=27724)
+教程：[快速搭建SpringBoot+Mybatis应用](https://gitee.com/durcframework/code-gen/wikis/pages?sort_id=2478942&doc_id=27724)
 
 ## 使用步骤
 
-- 前往[发行版页面](https://gitee.com/durcframework/code-generator/releases)，下载最新版本zip文件
-- 解压zip，如果是Mac/Linux操作系统，可执行运行`startup.sh`，或者在命令行输入`java -jar generator-xx-SNAPSHOT.jar`（xx表示版本号）
+- 前往[发行版页面](https://gitee.com/durcframework/code-gen/releases)，下载最新版本zip文件
+- 解压zip，如果是Mac/Linux操作系统，可执行运行`startup.sh`，或者在命令行输入`java -jar gen-xx-SNAPSHOT.jar`（xx表示版本号）
 - 浏览器访问`http://localhost:6969/`
 
-默认端口是6969，更改端口号可执行：`java -jar generator-xx-SNAPSHOT.jar --server.port=端口号`
+默认端口是6969，更改端口号可执行：`java -jar gen-xx-SNAPSHOT.jar --server.port=端口号`
 
 ## 工程说明
 
 - front：前端vue
-- generator：后端服务
+- gen：后端服务
 - db：数据库初始化文件
 - script：辅助脚本
 
@@ -33,9 +33,9 @@ Mac/Linux系统可直接执行`build.sh`进行构建，构建结果在build文
 
 - 手动构建：
 
-    -  在工程根目录执行`mvn clean package`，在code-generator/generator/target下会生成一个`generator-xx-SNAPSHOT.jar`（xx表示本号）
-    - 将`generator-1.0.0-SNAPSHOT.jar`和db下的`generator.db`放在同一个文件夹下
-    - 执行`java -jar generator-xx-SNAPSHOT.jar`
+    -  在工程根目录执行`mvn clean package`，在code-gen/gen/target下会生成一个`gen-xx-SNAPSHOT.jar`（xx表示本号）
+    - 将`gen-1.0.0-SNAPSHOT.jar`和db下的`gen.db`放在同一个文件夹下
+    - 执行`java -jar gen-xx-SNAPSHOT.jar`
     - 浏览器访问`http://localhost:6969/`
 
 ## 效果图

script/shutdown.sh

@@ -1,5 +1,5 @@
-echo "Stopping generator-1.0.0-SNAPSHOT.jar"
-pid=`ps -ef | grep generator-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.0-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid

script/startup.sh

@@ -1,9 +1,9 @@
-echo "Stopping generator-1.0.0-SNAPSHOT.jar"
-pid=`ps -ef | grep generator-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
+echo "Stopping gen-1.0.0-SNAPSHOT.jar"
+pid=`ps -ef | grep gen-1.0.0-SNAPSHOT.jar | grep -v grep | awk '{print $2}'`
 if [ -n "$pid" ]
 then
    echo "kill -9 的id:" $pid
    kill -9 $pid
 fi
-nohup java -jar -Xms128m -Xmx128m generator-1.0.0-SNAPSHOT.jar &
+nohup java -jar -Xms128m -Xmx128m gen-1.0.0-SNAPSHOT.jar &