diff --git a/shoulder-generator/pom.xml b/shoulder-generator/pom.xml index a5cab5b..00ae181 100644 --- a/shoulder-generator/pom.xml +++ b/shoulder-generator/pom.xml @@ -3,10 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - cn.itlym.platform - shoulder-platform-parent - 1.0-SNAPSHOT - ../../shoulder-platform-common/shoulder-platform-parent/pom.xml + cn.itlym + shoulder-parent + 0.4 4.0.0 @@ -21,16 +20,6 @@ 1.7 - - cn.itlym.platform - shoulder-platform-starter-db - - - - cn.itlym.platform - shoulder-platform-starter-config-client - - commons-io commons-io @@ -42,68 +31,44 @@ - cn.itlym.platform - shoulder-platform-starter-rpc-server + org.springframework.boot + spring-boot-starter-jdbc + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.3 + + + com.github.pagehelper + pagehelper-spring-boot-starter + + + + mysql + mysql-connector-java + + + + + cn.itlym + shoulder-starter-web - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - repackage - - - - - - - - com.spotify - docker-maven-plugin - - - - ${docker.image.prefix}/${project.artifactId} - src/main/docker - - ${docker.host} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - - - ${project.artifactId} - src/main/java - - **/*.properties - **/*.xml - **/*.yml - - - true + + **/*.java + src/main/resources + + **/*.* + - - - - + \ No newline at end of file diff --git a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java index ec5e57e..501c330 100644 --- a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java +++ b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/GeneratorApp.java @@ -1,14 +1,17 @@ package cn.itlym.shoulder.generator; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Configuration; /** - * 启动类 + * 代码生成器，根据数据库表，生成 Entity、RestApi、Controller、Service、ServiceImpl、Repository、Mapper、Mapper.xml、前端视图 * * @author lym */ + +@MapperScan(value = "cn.itlym.shoulder.generator.mapper") @Configuration @SpringBootApplication public class GeneratorApp { diff --git a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/controller/GeneratorController.java b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/controller/GeneratorController.java index 607ec7b..a0f4a03 100644 --- a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/controller/GeneratorController.java +++ b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/controller/GeneratorController.java @@ -43,7 +43,7 @@ public class GeneratorController { /** * 生成代码 * web 中不需要主动关闭流 - * http://localhost:8080/generator/code?tables=* + * 所有表 */ @RequestMapping("/code") public void code(String tables, HttpServletResponse response) throws IOException { @@ -52,22 +52,18 @@ public class GeneratorController { throw new IllegalArgumentException("tableName can't be empty"); } response.reset(); - byte[] data = "*".equals(tables) ? sysGeneratorService.generatorCode(response.getOutputStream()) :sysGeneratorService.generatorCode(tables.split(","), response.getOutputStream()); - if (data != null && data.length > 0) { - /* - // file out put stream 必须及时关闭 - OutputStream out = new FileOutputStream("F:/te.zip"); - IOUtils.write(data, out); - IOUtils.closeQuietly(out); - */ - - response.setHeader("Content-Disposition", "attachment; filename=\"generator.zip\""); - response.setContentType("application/octet-stream; charset=UTF-8"); - response.addHeader("Content-Length", String.valueOf(data.length)); - - // response out put stream 会自动关闭 - IOUtils.write(data, response.getOutputStream()); + byte[] data = "_all".equals(tables) ? sysGeneratorService.generatorCode(response.getOutputStream()) + :sysGeneratorService.generatorCode(tables.split(","), response.getOutputStream()); + if (data == null || data.length == 0) { + return; } + response.setHeader("Content-Disposition", "attachment; filename=\"generator.zip\""); + response.setContentType("application/octet-stream; charset=UTF-8"); + // ClientAbortException: java.io.IOException: 你的主机中的软件中止了一个已建立的连接。加上这行有下载进度，不加可能报错 + response.addHeader("Content-Length", String.valueOf(data.length)); + + // response out put stream 会自动关闭 + IOUtils.write(data, response.getOutputStream()); } diff --git a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.java b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.java similarity index 90% rename from shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.java rename to shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.java index ae21dd5..754d928 100644 --- a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.java +++ b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.java @@ -1,4 +1,4 @@ -package cn.itlym.shoulder.generator.dao; +package cn.itlym.shoulder.generator.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; @@ -12,7 +12,7 @@ import java.util.Map; */ @Mapper @Repository -public interface SysGeneratorDao { +public interface SysGeneratorMapper { List> queryList(Map map); diff --git a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.xml b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.xml similarity index 95% rename from shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.xml rename to shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.xml index 6bbbe47..f5f2f37 100644 --- a/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/dao/SysGeneratorDao.xml +++ b/shoulder-generator/src/main/java/cn/itlym/shoulder/generator/mapper/SysGeneratorMapper.xml @@ -1,7 +1,7 @@ - +