v2.2 正式发布，移除jpa升级后台为mytisplus

2020-05-19 12:29:07 +08:00
parent 7a69a2abaf
commit 5db1bd8b35
902 changed files with 22572 additions and 18839 deletions
--- a/yshop-generator/pom.xml
+++ b/yshop-generator/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>yshop</artifactId>
        <groupId>co.yixiang</groupId>
-        <version>2.1</version>
+        <version>2.2</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -20,7 +20,7 @@
        <dependency>
            <groupId>co.yixiang</groupId>
            <artifactId>yshop-common</artifactId>
-            <version>2.1</version>
+            <version>2.2</version>
        </dependency>

        <!--模板引擎-->
@ -36,4 +36,4 @@
            <version>${configuration.version}</version>
        </dependency>
    </dependencies>
-</project>
+</project>
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java
@ -1,25 +1,27 @@
-package co.yixiang.domain;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.utils.GenUtil;
+ */
+package co.yixiang.gen.domain;
+
+import co.yixiang.gen.utils.GenUtil;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-import javax.persistence.*;
-
 /**
 * 列的数据信息
 * @author Zheng Jie
 * @date 2019-01-02
 */
@Data
-@Entity
@NoArgsConstructor
-@Table(name = "column_config")
-public class ColumnInfo {
+@TableName("column_config")
+public class ColumnConfig {

-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
+    @TableId
    private Long id;

    private String tableName;
@ -60,7 +62,7 @@ public class ColumnInfo {
    /** 日期注解 */
    private String dateAnnotation;

-    public ColumnInfo(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) {
+    public ColumnConfig(String tableName, String columnName, Boolean notNull, String columnType, String remark, String keyType, String extra) {
        this.tableName = tableName;
        this.columnName = columnName;
        this.columnType = columnType;
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java
@ -1,9 +1,14 @@
-package co.yixiang.domain;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

+ */
+package co.yixiang.gen.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import javax.persistence.*;
-import javax.validation.constraints.NotBlank;

 /**
 * 代码生成配置
@ -11,9 +16,8 @@ import javax.validation.constraints.NotBlank;
 * @date 2019-01-03
 */
@Data
-@Entity
@NoArgsConstructor
-@Table(name = "gen_config")
+@TableName("gen_config")
 public class GenConfig {

    public GenConfig(String tableName) {
@ -22,32 +26,25 @@ public class GenConfig {
        this.tableName = tableName;
    }

-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id")
+    @TableId
    private Long id;

-    @NotBlank
+    /**表明**/
    private String tableName;

    /** 接口名称 **/
    private String apiAlias;

    /** 包路径 */
-    @NotBlank
    private String pack;

    /** 模块名 */
-    @Column(name = "module_name")
-    @NotBlank
    private String moduleName;

    /** 前端文件路径 */
-    @NotBlank
    private String path;

    /** 前端文件路径 */
-    @Column(name = "api_path")
    private String apiPath;

    /** 作者 */
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/ColumnInfo.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/ColumnInfo.java
@ -1,4 +1,9 @@
-package co.yixiang.domain.vo;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.domain.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/TableInfo.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/TableInfo.java
@ -1,4 +1,9 @@
-package co.yixiang.domain.vo;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.domain.vo;

 import lombok.AllArgsConstructor;
 import lombok.Data;
--- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java
@ -1,7 +1,12 @@
-package co.yixiang.rest;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.domain.GenConfig;
-import co.yixiang.service.GenConfigService;
+ */
+package co.yixiang.gen.rest;
+
+import co.yixiang.gen.service.GenConfigService;
+import co.yixiang.gen.domain.GenConfig;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.HttpStatus;
--- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java
@ -1,8 +1,13 @@
-package co.yixiang.rest;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.domain.ColumnInfo;
-import co.yixiang.service.GenConfigService;
-import co.yixiang.service.GeneratorService;
+ */
+package co.yixiang.gen.rest;
+
+import co.yixiang.gen.domain.ColumnConfig;
+import co.yixiang.gen.service.GenConfigService;
+import co.yixiang.gen.service.GeneratorService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import co.yixiang.exception.BadRequestException;
@ -54,13 +59,13 @@ public class GeneratorController {
    @ApiOperation("查询字段数据")
    @GetMapping(value = "/columns")
    public ResponseEntity<Object> getTables(@RequestParam String tableName){
-        List<ColumnInfo> columnInfos = generatorService.getColumns(tableName);
+        List<ColumnConfig> columnInfos = generatorService.getColumns(tableName);
        return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK);
    }

    @ApiOperation("保存字段数据")
    @PutMapping
-    public ResponseEntity<HttpStatus> save(@RequestBody List<ColumnInfo> columnInfos){
+    public ResponseEntity<HttpStatus> save(@RequestBody List<ColumnConfig> columnInfos){
        generatorService.save(columnInfos);
        return new ResponseEntity<>(HttpStatus.OK);
    }
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/GenConfigService.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/GenConfigService.java
@ -1,6 +1,11 @@
-package co.yixiang.service;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.domain.GenConfig;
+ */
+package co.yixiang.gen.service;
+
+import co.yixiang.gen.domain.GenConfig;

 /**
 * @author Zheng Jie
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java
@ -1,7 +1,12 @@
-package co.yixiang.service;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.domain.ColumnInfo;
-import co.yixiang.domain.GenConfig;
+ */
+package co.yixiang.gen.service;
+
+import co.yixiang.gen.domain.ColumnConfig;
+import co.yixiang.gen.domain.GenConfig;
 import org.springframework.http.ResponseEntity;
 import org.springframework.scheduling.annotation.Async;
 import javax.servlet.http.HttpServletRequest;
@ -27,7 +32,7 @@ public interface GeneratorService {
     * @param name 表名
     * @return /
     */
-    List<ColumnInfo> getColumns(String name);
+    List<ColumnConfig> getColumns(String name);

    /**
     * 同步表数据
@ -35,13 +40,13 @@ public interface GeneratorService {
     * @param columnInfoList
     */
    @Async
-    void sync(List<ColumnInfo> columnInfos, List<ColumnInfo> columnInfoList);
+    void sync(List<ColumnConfig> columnInfos, List<ColumnConfig> columnInfoList);

    /**
     * 保持数据
     * @param columnInfos /
     */
-    void save(List<ColumnInfo> columnInfos);
+    void save(List<ColumnConfig> columnInfos);

    /**
     * 获取所有table
@ -54,7 +59,7 @@ public interface GeneratorService {
     * @param genConfig 配置信息
     * @param columns 字段信息
     */
-    void generator(GenConfig genConfig, List<ColumnInfo> columns);
+    void generator(GenConfig genConfig, List<ColumnConfig> columns);

    /**
     * 预览
@ -62,7 +67,7 @@ public interface GeneratorService {
     * @param columns 字段信息
     * @return /
     */
-    ResponseEntity<Object> preview(GenConfig genConfig, List<ColumnInfo> columns);
+    ResponseEntity<Object> preview(GenConfig genConfig, List<ColumnConfig> columns);

    /**
     * 打包下载
@ -71,12 +76,12 @@ public interface GeneratorService {
     * @param request /
     * @param response /
     */
-    void download(GenConfig genConfig, List<ColumnInfo> columns, HttpServletRequest request, HttpServletResponse response);
+    void download(GenConfig genConfig, List<ColumnConfig> columns, HttpServletRequest request, HttpServletResponse response);

    /**
     * 查询数据库的表字段数据数据
     * @param table /
     * @return /
     */
-    List<ColumnInfo> query(String table);
+    List<ColumnConfig> query(String table);
 }
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java
@ -1,12 +1,16 @@
-package co.yixiang.service.impl;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co

-import co.yixiang.domain.GenConfig;
-import co.yixiang.repository.GenConfigRepository;
-import co.yixiang.service.GenConfigService;
+ */
+package co.yixiang.gen.service.impl;
+
+import co.yixiang.gen.service.mapper.GenConfigMapper;
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.gen.domain.GenConfig;
+import co.yixiang.gen.service.GenConfigService;
 import co.yixiang.utils.StringUtils;
-import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.cache.annotation.CachePut;
-import org.springframework.cache.annotation.Cacheable;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import java.io.File;

@ -15,19 +19,13 @@ import java.io.File;
 * @date 2019-01-14
 */
@Service
-@CacheConfig(cacheNames = "genConfig")
-public class GenConfigServiceImpl implements GenConfigService {
-
-    private final GenConfigRepository genConfigRepository;
-
-    public GenConfigServiceImpl(GenConfigRepository genConfigRepository) {
-        this.genConfigRepository = genConfigRepository;
-    }
+//@CacheConfig(cacheNames = "genConfig")
+public class GenConfigServiceImpl extends BaseServiceImpl<GenConfigMapper, GenConfig> implements GenConfigService {

    @Override
-    @Cacheable(key = "#p0")
+//    @Cacheable(key = "#p0")
    public GenConfig find(String tableName) {
-        GenConfig genConfig = genConfigRepository.findByTableName(tableName);
+        GenConfig genConfig = this.getOne(new QueryWrapper<GenConfig>().eq("table_name",tableName));
        if(genConfig == null){
            return new GenConfig(tableName);
        }
@ -35,7 +33,7 @@ public class GenConfigServiceImpl implements GenConfigService {
    }

    @Override
-    @CachePut(key = "#p0")
+//    @CachePut(key = "#p0")
    public GenConfig update(String tableName, GenConfig genConfig) {
        // 如果 api 路径为空，则自动生成路径
        if(StringUtils.isBlank(genConfig.getApiPath())){
@ -58,6 +56,7 @@ public class GenConfigServiceImpl implements GenConfigService {
            }
            genConfig.setApiPath(api.toString());
        }
-        return genConfigRepository.save(genConfig);
+        this.saveOrUpdate(genConfig);
+        return genConfig;
    }
 }
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java
@ -1,18 +1,25 @@
-package co.yixiang.service.impl;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.service.impl;

 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ZipUtil;
-import co.yixiang.domain.ColumnInfo;
-import co.yixiang.domain.GenConfig;
-import co.yixiang.utils.GenUtil;
-import co.yixiang.domain.vo.TableInfo;
+import co.yixiang.gen.domain.ColumnConfig;
+import co.yixiang.gen.service.mapper.ColumnInfoMapper;
+import co.yixiang.gen.utils.GenUtil;
+import co.yixiang.common.service.impl.BaseServiceImpl;
+import co.yixiang.gen.domain.GenConfig;
+import co.yixiang.gen.domain.vo.TableInfo;
 import co.yixiang.exception.BadRequestException;
-import co.yixiang.repository.ColumnInfoRepository;
-import co.yixiang.service.GeneratorService;
+import co.yixiang.gen.service.GeneratorService;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.utils.PageUtil;
 import co.yixiang.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@ -34,16 +41,11 @@ import java.util.stream.Collectors;
 */
@Service
@SuppressWarnings({"unchecked","all"})
-public class GeneratorServiceImpl implements GeneratorService {
+public class GeneratorServiceImpl extends BaseServiceImpl<ColumnInfoMapper, ColumnConfig> implements GeneratorService {

    @PersistenceContext
    private EntityManager em;

-    private final ColumnInfoRepository columnInfoRepository;
-
-    public GeneratorServiceImpl(ColumnInfoRepository columnInfoRepository) {
-        this.columnInfoRepository = columnInfoRepository;
-    }

    @Override
    public Object getTables() {
@ -71,35 +73,39 @@ public class GeneratorServiceImpl implements GeneratorService {
            Object[] arr = (Object[]) obj;
            tableInfos.add(new TableInfo(arr[0],arr[1],arr[2],arr[3], ObjectUtil.isNotEmpty(arr[4])? arr[4] : "-"));
        }
-        Query query1 = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database())");
+        Query query1 = em.createNativeQuery("SELECT COUNT(*) from information_schema.tables where table_schema = (select database()) " +
+                "and table_name like ? order by create_time desc");
+        query1.setParameter(1, StringUtils.isNotBlank(name) ? ("%" + name + "%") : "%%");
        Object totalElements = query1.getSingleResult();
        return PageUtil.toPage(tableInfos,totalElements);
    }

    @Override
-    public List<ColumnInfo> getColumns(String tableName) {
-        List<ColumnInfo> columnInfos = columnInfoRepository.findByTableNameOrderByIdAsc(tableName);
+    public List<ColumnConfig> getColumns(String tableName) {
+        List<ColumnConfig> columnInfos = this.list(new QueryWrapper<ColumnConfig>()
+                .eq("table_name",tableName).orderByAsc("id"));
        if(CollectionUtil.isNotEmpty(columnInfos)){
            return columnInfos;
        } else {
            columnInfos = query(tableName);
-            return columnInfoRepository.saveAll(columnInfos);
+            this.saveBatch(columnInfos);
+            return columnInfos;
        }
    }

    @Override
-    public List<ColumnInfo> query(String tableName){
+    public List<ColumnConfig> query(String tableName){
        // 使用预编译防止sql注入
        String sql = "select column_name, is_nullable, data_type, column_comment, column_key, extra from information_schema.columns " +
                "where table_name = ? and table_schema = (select database()) order by ordinal_position";
        Query query = em.createNativeQuery(sql);
        query.setParameter(1,tableName);
        List result = query.getResultList();
-        List<ColumnInfo> columnInfos = new ArrayList<>();
+        List<ColumnConfig> columnInfos = new ArrayList<>();
        for (Object obj : result) {
            Object[] arr = (Object[]) obj;
            columnInfos.add(
-                    new ColumnInfo(
+                    new ColumnConfig(
                            tableName,
                            arr[0].toString(),
                            "NO".equals(arr[1]),
@ -113,44 +119,44 @@ public class GeneratorServiceImpl implements GeneratorService {
    }

    @Override
-    public void sync(List<ColumnInfo> columnInfos, List<ColumnInfo> columnInfoList) {
+    public void sync(List<ColumnConfig> columnInfos, List<ColumnConfig> columnInfoList) {
        // 第一种情况，数据库类字段改变或者新增字段
-        for (ColumnInfo columnInfo : columnInfoList) {
+        for (ColumnConfig columnInfo : columnInfoList) {
            // 根据字段名称查找
-            List<ColumnInfo> columns = new ArrayList<ColumnInfo>(columnInfos.stream().filter(c-> c.getColumnName().equals(columnInfo.getColumnName())).collect(Collectors.toList()));
+            List<ColumnConfig> columns = new ArrayList<ColumnConfig>(columnInfos.stream().filter(c-> c.getColumnName().equals(columnInfo.getColumnName())).collect(Collectors.toList()));
            // 如果能找到，就修改部分可能被字段
            if(CollectionUtil.isNotEmpty(columns)){
-                ColumnInfo column = columns.get(0);
+                ColumnConfig column = columns.get(0);
                column.setColumnType(columnInfo.getColumnType());
                column.setExtra(columnInfo.getExtra());
                column.setKeyType(columnInfo.getKeyType());
                if(StringUtils.isBlank(column.getRemark())){
                    column.setRemark(columnInfo.getRemark());
                }
-                columnInfoRepository.save(column);
+                this.save(column);
            } else {
                // 如果找不到，则保存新字段信息
-                columnInfoRepository.save(columnInfo);
+                this.save(columnInfo);
            }
        }
        // 第二种情况，数据库字段删除了
-        for (ColumnInfo columnInfo : columnInfos) {
+        for (ColumnConfig columnInfo : columnInfos) {
            // 根据字段名称查找
-            List<ColumnInfo> columns = new ArrayList<ColumnInfo>(columnInfoList.stream().filter(c-> c.getColumnName().equals(columnInfo.getColumnName())).collect(Collectors.toList()));
+            List<ColumnConfig> columns = new ArrayList<ColumnConfig>(columnInfoList.stream().filter(c-> c.getColumnName().equals(columnInfo.getColumnName())).collect(Collectors.toList()));
            // 如果找不到，就代表字段被删除了，则需要删除该字段
            if(CollectionUtil.isEmpty(columns)){
-                columnInfoRepository.delete(columnInfo);
+                this.removeById(columnInfo.getId());
            }
        }
    }

    @Override
-    public void save(List<ColumnInfo> columnInfos) {
-        columnInfoRepository.saveAll(columnInfos);
+    public void save(List<ColumnConfig> columnInfos) {
+        this.saveOrUpdateBatch(columnInfos);
    }

    @Override
-    public void generator(GenConfig genConfig, List<ColumnInfo> columns) {
+    public void generator(GenConfig genConfig, List<ColumnConfig> columns) {
        if(genConfig.getId() == null){
            throw new BadRequestException("请先配置生成器");
        }
@ -163,7 +169,7 @@ public class GeneratorServiceImpl implements GeneratorService {
    }

    @Override
-    public ResponseEntity<Object> preview(GenConfig genConfig, List<ColumnInfo> columns) {
+    public ResponseEntity<Object> preview(GenConfig genConfig, List<ColumnConfig> columns) {
        if(genConfig.getId() == null){
            throw new BadRequestException("请先配置生成器");
        }
@ -172,7 +178,7 @@ public class GeneratorServiceImpl implements GeneratorService {
    }

    @Override
-    public void download(GenConfig genConfig, List<ColumnInfo> columns, HttpServletRequest request, HttpServletResponse response) {
+    public void download(GenConfig genConfig, List<ColumnConfig> columns, HttpServletRequest request, HttpServletResponse response) {
        if(genConfig.getId() == null){
            throw new BadRequestException("请先配置生成器");
        }
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java
@ -0,0 +1,16 @@
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.service.mapper;
+
+import co.yixiang.gen.domain.ColumnConfig;
+import co.yixiang.common.mapper.CoreMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface ColumnInfoMapper extends CoreMapper<ColumnConfig> {
+}
--- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java
@ -0,0 +1,16 @@
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.service.mapper;
+
+import co.yixiang.gen.domain.GenConfig;
+import co.yixiang.common.mapper.CoreMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+@Mapper
+public interface GenConfigMapper extends CoreMapper<GenConfig> {
+}
--- a/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java
@ -1,4 +1,9 @@
-package co.yixiang.utils;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.utils;

 import org.apache.commons.configuration.*;

--- a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java
+++ b/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java
@ -1,10 +1,17 @@
-package co.yixiang.utils;
+/**
+ * Copyright (C) 2018-2020
+ * All rights reserved, Designed By www.yixiang.co
+
+ */
+package co.yixiang.gen.utils;

 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.template.*;
+import co.yixiang.gen.domain.GenConfig;
+import co.yixiang.utils.FileUtil;
+import co.yixiang.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
-import co.yixiang.domain.GenConfig;
-import co.yixiang.domain.ColumnInfo;
+import co.yixiang.gen.domain.ColumnConfig;
 import org.springframework.util.ObjectUtils;
 import java.io.File;
 import java.io.FileWriter;
@ -36,14 +43,22 @@ public class GenUtil {
     */
    private static List<String> getAdminTemplateNames() {
        List<String> templateNames = new ArrayList<>();
-        templateNames.add("Entity");
+        /*templateNames.add("Entity");
        templateNames.add("Dto");
        templateNames.add("Mapper");
        templateNames.add("Controller");
        templateNames.add("QueryCriteria");
        templateNames.add("Service");
        templateNames.add("ServiceImpl");
-        templateNames.add("Repository");
+        templateNames.add("Repository");*/
+        templateNames.add("EntityP");
+        templateNames.add("DtoP");
+        templateNames.add("MapperP");
+        templateNames.add("ControllerP");
+        templateNames.add("QueryCriteriaP");
+        templateNames.add("ServiceP");
+        templateNames.add("ServiceImplP");
+        //templateNames.add("Repository");
        return templateNames;
    }

@ -58,7 +73,7 @@ public class GenUtil {
        return templateNames;
    }

-    public static List<Map<String, Object>> preview(List<ColumnInfo> columns, GenConfig genConfig) {
+    public static List<Map<String, Object>> preview(List<ColumnConfig> columns, GenConfig genConfig) {
        Map<String,Object> genMap = getGenMap(columns, genConfig);
        List<Map<String,Object>> genList = new ArrayList<>();
        // 获取后端模版
@ -84,7 +99,7 @@ public class GenUtil {
        return genList;
    }

-    public static String download(List<ColumnInfo> columns, GenConfig genConfig) throws IOException {
+    public static String download(List<ColumnConfig> columns, GenConfig genConfig) throws IOException {
        String tempPath =System.getProperty("java.io.tmpdir") + "yshop-gen-temp" + File.separator + genConfig.getTableName() + File.separator;
        Map<String,Object> genMap = getGenMap(columns, genConfig);
        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
@ -122,7 +137,7 @@ public class GenUtil {
        return tempPath;
    }

-    public static void generatorCode(List<ColumnInfo> columnInfos, GenConfig genConfig) throws IOException {
+    public static void generatorCode(List<ColumnConfig> columnInfos, GenConfig genConfig) throws IOException {
        Map<String,Object> genMap = getGenMap(columnInfos, genConfig);
        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("template", TemplateConfig.ResourceMode.CLASSPATH));
        // 生成后端代码
@ -161,7 +176,7 @@ public class GenUtil {
    }

    // 获取模版数据
-    private static Map<String,Object> getGenMap(List<ColumnInfo> columnInfos, GenConfig genConfig) {
+    private static Map<String,Object> getGenMap(List<ColumnConfig> columnInfos, GenConfig genConfig) {
        // 存储模版字段数据
        Map<String,Object> genMap = new HashMap<>(16);
        // 接口别名
@ -191,6 +206,8 @@ public class GenUtil {
        genMap.put("changeClassName", changeClassName);
        // 存在 Timestamp 字段
        genMap.put("hasTimestamp",false);
+        // 存在 Images 字段
+        genMap.put("hasImages",false);
        // 查询类中存在 Timestamp 字段
        genMap.put("queryHasTimestamp",false);
        // 存在 BigDecimal 字段
@ -216,7 +233,7 @@ public class GenUtil {
        // 存储不为空的字段信息
        List<Map<String,Object>> isNotNullColumns = new ArrayList<>();

-        for (ColumnInfo column : columnInfos) {
+        for (ColumnConfig column : columnInfos) {
            Map<String,Object> listMap = new HashMap<>(16);
            // 字段描述
            listMap.put("remark",column.getRemark());
@ -236,6 +253,10 @@ public class GenUtil {
                // 存储大写开头的字段名
                genMap.put("pkCapitalColName",capitalColumnName);
            }
+            if("Images".equals(column.getFormType())){
+                // 存在 Images 字段
+                genMap.put("hasImages",true);
+            }
            // 是否存在 Timestamp 类型的字段
            if(TIMESTAMP.equals(colType)){
                genMap.put("hasTimestamp",true);
@ -331,30 +352,50 @@ public class GenUtil {
        if ("Entity".equals(templateName)) {
            return packagePath + "domain" + File.separator + className + ".java";
        }
-
+        if ("EntityP".equals(templateName)) {
+            return packagePath + "domain" + File.separator + className + ".java";
+        }
        if ("Controller".equals(templateName)) {
            return packagePath + "rest" + File.separator + className + "Controller.java";
        }
-
+        if ("ControllerP".equals(templateName)) {
+            return packagePath + "rest" + File.separator + className + "Controller.java";
+        }
        if ("Service".equals(templateName)) {
            return packagePath + "service" + File.separator + className + "Service.java";
        }
+        if ("ServiceP".equals(templateName)) {
+            return packagePath + "service" + File.separator + className + "Service.java";
+        }

        if ("ServiceImpl".equals(templateName)) {
            return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
        }
+        if ("ServiceImplP".equals(templateName)) {
+            return packagePath + "service" + File.separator + "impl" + File.separator + className + "ServiceImpl.java";
+        }

        if ("Dto".equals(templateName)) {
            return packagePath + "service" + File.separator + "dto" + File.separator + className + "Dto.java";
        }
+        if ("DtoP".equals(templateName)) {
+            return packagePath + "service" + File.separator + "dto" + File.separator + className + "Dto.java";
+        }
+

        if ("QueryCriteria".equals(templateName)) {
            return packagePath + "service" + File.separator + "dto" + File.separator + className + "QueryCriteria.java";
        }
+        if ("QueryCriteriaP".equals(templateName)) {
+            return packagePath + "service" + File.separator + "dto" + File.separator + className + "QueryCriteria.java";
+        }

        if ("Mapper".equals(templateName)) {
            return packagePath + "service" + File.separator + "mapper" + File.separator + className + "Mapper.java";
        }
+        if ("MapperP".equals(templateName)) {
+            return packagePath + "service" + File.separator + "mapper" + File.separator + className + "Mapper.java";
+        }

        if ("Repository".equals(templateName)) {
            return packagePath + "repository" + File.separator + className + "Repository.java";
--- a/yshop-generator/src/main/java/co/yixiang/repository/ColumnInfoRepository.java
+++ b/yshop-generator/src/main/java/co/yixiang/repository/ColumnInfoRepository.java
@ -1,19 +0,0 @@
-package co.yixiang.repository;
-
-import co.yixiang.domain.ColumnInfo;
-import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.List;
-
-/**
- * @author Zheng Jie
- * @date 2019-01-14
- */
-public interface ColumnInfoRepository extends JpaRepository<ColumnInfo,Long> {
-
-    /**
-     * 查询表信息
-     * @param tableName 表格名
-     * @return 表信息
-     */
-    List<ColumnInfo> findByTableNameOrderByIdAsc(String tableName);
-}
--- a/yshop-generator/src/main/java/co/yixiang/repository/GenConfigRepository.java
+++ b/yshop-generator/src/main/java/co/yixiang/repository/GenConfigRepository.java
@ -1,18 +0,0 @@
-package co.yixiang.repository;
-
-import co.yixiang.domain.GenConfig;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-/**
- * @author Zheng Jie
- * @date 2019-01-14
- */
-public interface GenConfigRepository extends JpaRepository<GenConfig,Long> {
-
-    /**
-     * 查询表配置
-     * @param tableName 表名
-     * @return /
-     */
-    GenConfig findByTableName(String tableName);
-}