Ver código fonte

maven 适配完成

hubin 1 ano atrás
pai
commit
d734666f64

+ 55 - 6
pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.7.0</version>
+		<version>3.1.1</version>
 		<relativePath/>
 	</parent>
 	<groupId>com.aizuda</groupId>
@@ -15,27 +15,62 @@
 	<description>爱组搭低代码组件化开发平台 Spring Boot 版本</description>
 
 	<properties>
-		<java.version>1.8</java.version>
+		<java.version>17</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<skipTests>true</skipTests>
 	</properties>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.aizuda</groupId>
+				<artifactId>aizuda-bom</artifactId>
+				<version>1.0.2</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<dependencies>
 		<dependency>
 			<groupId>com.aizuda</groupId>
 			<artifactId>aizuda-service-parent</artifactId>
 			<version>1.0.0</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<artifactId>caffeine</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+
+		<!-- 工作流引擎 -->
+		<dependency>
+			<groupId>com.aizuda</groupId>
+			<artifactId>flowlong-spring-boot-starter</artifactId>
+			<version>0.0.1</version>
+		</dependency>
+
+		<!-- 服务监听 -->
 		<dependency>
 			<groupId>com.aizuda</groupId>
 			<artifactId>aizuda-monitor</artifactId>
-			<version>1.0.0</version>
 		</dependency>
+
+		<!-- 文件存储 -->
+		<dependency>
+			<groupId>com.aizuda</groupId>
+			<artifactId>aizuda-oss</artifactId>
+		</dependency>
+
 		<!-- SpringBootAdmin 监控管理客户端,未使用可以删除
 		<dependency>
 			<groupId>de.codecentric</groupId>
@@ -43,16 +78,29 @@
 			<version>3.0.2</version>
 		</dependency>
 		-->
+
+		<!-- 日志 -->
 		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.1.0</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-log4j2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.lmax</groupId>
+			<artifactId>disruptor</artifactId>
+			<version>3.4.4</version>
 		</dependency>
 		<dependency>
 			<groupId>p6spy</groupId>
 			<artifactId>p6spy</artifactId>
 			<version>3.9.1</version>
 		</dependency>
+
+		<!-- 文档 https://springdoc.org/v2/#demos -->
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<version>2.2.0</version>
+		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -65,6 +113,7 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<version>3.2.4</version>
 			</plugin>
 		</plugins>
 	</build>

+ 6 - 7
src/main/java/com/aizuda/boot/modules/flw/controller/ProcessTaskController.java

@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
-import org.simpleframework.xml.core.Validate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -136,42 +135,42 @@ public class ProcessTaskController extends ApiController {
     @Operation(summary = "流程实例撤销(用于错误发起审批申请,发起人主动撤销)")
     @Permission("flw:processTask:revoke")
     @PostMapping("/revoke")
-    public boolean revoke(@Validate @RequestBody ProcessApprovalDTO dto) {
+    public boolean revoke(@Validated @RequestBody ProcessApprovalDTO dto) {
         return processTaskService.revoke(dto, FlowHelper.getFlowCreator());
     }
 
     @Operation(summary = "转交任务")
     @Permission("flw:processTask:transfer")
     @PostMapping("/transfer")
-    public boolean transfer(@Validate @RequestBody TaskAssigneeDTO dto) {
+    public boolean transfer(@Validated @RequestBody TaskAssigneeDTO dto) {
         return processTaskService.transfer(dto);
     }
 
     @Operation(summary = "执行任务")
     @Permission("flw:processTask:execute")
     @PostMapping("/execute")
-    public boolean execute(@Validate @RequestBody ExecuteTaskDTO dto) {
+    public boolean execute(@Validated @RequestBody ExecuteTaskDTO dto) {
         return processTaskService.execute(dto);
     }
 
     @Operation(summary = "驳回至上一步任务")
     @Permission("flw:processTask:reject")
     @PostMapping("/reject")
-    public boolean reject(@Validate @RequestBody RejectTaskDTO dto) {
+    public boolean reject(@Validated @RequestBody RejectTaskDTO dto) {
         return processTaskService.reject(dto);
     }
 
     @Operation(summary = "审批加签")
     @Permission("flw:processTask:appendNode")
     @PostMapping("/append-node")
-    public boolean appendNode(@Validate @RequestBody TaskAppendNodeDTO dto) {
+    public boolean appendNode(@Validated @RequestBody TaskAppendNodeDTO dto) {
         return processTaskService.appendNode(dto);
     }
 
     @Operation(summary = "跳到指定节点任务")
     @Permission("flw:processTask:withdraw")
     @PostMapping("/jump")
-    public boolean jump(@Validate @RequestBody TaskJumpDTO dto) {
+    public boolean jump(@Validated @RequestBody TaskJumpDTO dto) {
         return processTaskService.jump(dto);
     }