From 614fc77b627a95c4b3b77ed8bb9516d62d891e33 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Sun, 30 Jul 2023 22:48:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20Controller=20=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?@Validated,=20=E5=B9=B6=E5=BC=95=E5=85=A5=20spring-boot-starter?=
 =?UTF-8?q?-validation=20maven=20pom?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 workflow-engine-server/pom.xml                | 61 ++-----------------
 .../bpmn/BpmnProcessDefinitionController.java |  2 +
 .../bpmn/BpmnProcessInstanceController.java   |  2 +
 .../web/bpmn/BpmnTaskController.java          |  2 +
 .../web/category/CategoryController.java      |  2 +
 .../web/form/FormDefinitionController.java    |  2 +
 .../web/form/FormInstanceController.java      |  2 +
 .../web/form/FormModelController.java         |  3 +-
 8 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/workflow-engine-server/pom.xml b/workflow-engine-server/pom.xml
index 41281774a..ec5886672 100644
--- a/workflow-engine-server/pom.xml
+++ b/workflow-engine-server/pom.xml
@@ -22,6 +22,10 @@
             <groupId>cn.axzo.framework</groupId>
             <artifactId>axzo-web-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.axzo.workflow</groupId>
             <artifactId>workflow-engine-core</artifactId>
@@ -64,63 +68,6 @@
             <artifactId>axzo-spring-cloud-starter</artifactId>
         </dependency>
 
-        <!--        <dependency>-->
-        <!--            <groupId>cn.axzo.framework</groupId>-->
-        <!--            <artifactId>axzo-consumer-spring-cloud-starter</artifactId>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>cn.axzo.framework</groupId>-->
-        <!--            <artifactId>axzo-processor-spring-boot-starter</artifactId>-->
-        <!--        </dependency>-->
-        <!--        &lt;!&ndash;mybatis-plus&ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>cn.axzo.framework</groupId>-->
-<!--            <artifactId>axzo-mybatisplus-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash; swagger-yapi &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>cn.axzo.framework</groupId>-->
-<!--            <artifactId>axzo-swagger-yapi-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-<!--        &lt;!&ndash; druid &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba</groupId>-->
-<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-
-<!--        <dependency>-->
-<!--            <groupId>cn.axzo.framework</groupId>-->
-<!--            <artifactId>axzo-logger-spring-boot-starter</artifactId>-->
-<!--        </dependency>-->
-
-        <!--        <dependency>-->
-        <!--            <groupId>org.activiti</groupId>-->
-        <!--            <artifactId>activiti-spring-boot-starter</artifactId>-->
-        <!--            <version>${activiti.version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>de.odysseus.juel</groupId>-->
-        <!--                    <artifactId>juel-api</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>de.odysseus.juel</groupId>-->
-        <!--                    <artifactId>juel-spi</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <groupId>org.mybatis</groupId>-->
-        <!--                    <artifactId>mybatis</artifactId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>el-api</artifactId>-->
-        <!--                    <groupId>javax.el</groupId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.activiti</groupId>-->
-        <!--            <artifactId>activiti-image-generator</artifactId>-->
-        <!--            <version>${activiti.version}</version>-->
-        <!--        </dependency>-->
     </dependencies>
 
 </project>
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
index 025b2fcd0..69cc4de30 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessDefinitionController.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.common.engine.impl.db.SuspensionState;
 import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -22,6 +23,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/process/definition")
 @RestController
+@Validated
 public class BpmnProcessDefinitionController {
     @Resource
     private BpmnProcessDefinitionService bpmnProcessDefinitionService;
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
index e31bd2f18..115ef62cb 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
@@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -22,6 +23,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/process/instance")
 @RestController
+@Validated
 public class BpmnProcessInstanceController {
 
     @Autowired
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java
index 74a24a66e..7a9d2f496 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnTaskController.java
@@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.flowable.form.api.FormInfo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -22,6 +23,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/process/task")
 @RestController
+@Validated
 public class BpmnTaskController {
 
     @Autowired
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/category/CategoryController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/category/CategoryController.java
index 220c5ddb4..3c6520559 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/category/CategoryController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/category/CategoryController.java
@@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -23,6 +24,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/category")
 @RestController
+@Validated
 public class CategoryController {
 
     @Autowired
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormDefinitionController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormDefinitionController.java
index 343139fd2..4ab23be2b 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormDefinitionController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormDefinitionController.java
@@ -8,6 +8,7 @@ import cn.azxo.framework.common.model.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -27,6 +28,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/form/definition")
 @RestController
+@Validated
 public class FormDefinitionController {
 
     @Resource
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormInstanceController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormInstanceController.java
index 40d7c26b7..ba4bea171 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormInstanceController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormInstanceController.java
@@ -5,6 +5,7 @@ import cn.axzo.workflow.core.service.dto.request.form.instance.FormContentUpdate
 import cn.azxo.framework.common.model.CommonResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +24,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/form/instance")
 @RestController
+@Validated
 public class FormInstanceController {
 
     @Autowired
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormModelController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormModelController.java
index 962a0e0db..d659bd05f 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormModelController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/form/FormModelController.java
@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiParam;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,7 +30,7 @@ import static cn.azxo.framework.common.model.CommonResponse.success;
 @Slf4j
 @RequestMapping("/web/v1/api/form/model")
 @RestController
-@Valid
+@Validated
 public class FormModelController {
 
     @Resource