From 1fe0f52848ca31775ae77daf353e35645ca1a732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 6 Oct 2019 20:49:05 +0800 Subject: [PATCH] =?UTF-8?q?:ok=5Fhand:=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=20=E6=BB=A1=E8=B6=B3P3C=20=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/properties/XxlExecutorProperties.java | 2 +- .../java/com/pig4cloud/pigx/act/dto/ModelForm.java | 13 +++++++++---- .../codegen/controller/GeneratorController.java | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java index b451dab50..09f56cec7 100644 --- a/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java +++ b/pigx-common/pigx-common-job/src/main/java/com/pig4cloud/pigx/common/job/properties/XxlExecutorProperties.java @@ -39,7 +39,7 @@ public class XxlExecutorProperties { /** * 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口； */ - private Integer port = 9999; + private Integer port = 0; /** * 执行器通讯TOKEN [选填]：非空时启用； diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/ModelForm.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/ModelForm.java index 1d01397d6..08f026918 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/ModelForm.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/dto/ModelForm.java @@ -25,12 +25,17 @@ import javax.validation.constraints.NotBlank; * @date 2018/9/25 */ public class ModelForm { - private String category; - @NotBlank + + @NotBlank(message = "名称不能为空") private String name; - @NotBlank + + @NotBlank(message = "标识不能为空") private String key; - @NotBlank + + @NotBlank(message = "分类不能为空") + private String category; + + @NotBlank(message = "描述不能为空") private String desc; public String getCategory() { diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java index df0ef9236..debc95f5c 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GeneratorController.java @@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse; @AllArgsConstructor @RequestMapping("/generator") public class GeneratorController { - private final GeneratorService GeneratorService; + private final GeneratorService generatorService; /** * 列表 @@ -50,7 +50,7 @@ public class GeneratorController { */ @GetMapping("/page") public R getPage(Page page, String tableName, Integer id) { - return R.ok(GeneratorService.getPage(page, tableName, id)); + return R.ok(generatorService.getPage(page, tableName, id)); } /** @@ -59,7 +59,7 @@ public class GeneratorController { @SneakyThrows @PostMapping("/code") public void generatorCode(@RequestBody GenConfig genConfig, HttpServletResponse response) { - byte[] data = GeneratorService.generatorCode(genConfig); + byte[] data = generatorService.generatorCode(genConfig); response.reset(); response.setHeader(HttpHeaders.CONTENT_DISPOSITION, String.format("attachment; filename=%s.zip", genConfig.getTableName())); response.addHeader(HttpHeaders.CONTENT_LENGTH, String.valueOf(data.length));