diff --git a/metis-applicant/pom.xml b/metis-applicant/pom.xml index 4d278ce..6900ad5 100644 --- a/metis-applicant/pom.xml +++ b/metis-applicant/pom.xml @@ -23,8 +23,13 @@ metis-starter 1.0.0-SNAPSHOT - + + com.github.xiaoymin + knife4j-openapi3-jakarta-spring-boot-starter + 4.4.0 + + @@ -39,39 +44,49 @@ + + + + + org.projectlombok + lombok + + + org.mapstruct + mapstruct-processor + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + org.apache.maven.plugins + maven-compiler-plugin + + 17 + 17 + UTF-8 + + -parameters + --add-opens + java.base/java.lang=ALL-UNNAMED + + + + + + org.projectlombok + lombok + ${lombok.version} + + + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} + + + + diff --git a/metis-applicant/src/main/java/com/metisapp/controller/TestController.java b/metis-applicant/src/main/java/com/metisapp/controller/TestController.java index 0926ed8..be0f467 100644 --- a/metis-applicant/src/main/java/com/metisapp/controller/TestController.java +++ b/metis-applicant/src/main/java/com/metisapp/controller/TestController.java @@ -1,10 +1,10 @@ package com.metisapp.controller; -import com.metis.flow.domain.bo.BuildApp; -import com.metis.flow.engine.AppFlowEngineRunnerService; -import com.metis.flow.runner.FlowRunningContext; -import com.metis.flow.runner.RunnerResult; -import com.metis.flow.validator.ValidatorService; +import com.metis.domain.bo.BuildApp; +import com.metis.engine.AppFlowEngineRunnerService; +import com.metis.runner.FlowRunningContext; +import com.metis.runner.RunnerResult; +import com.metis.validator.ValidatorService; import com.metis.result.Result; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.PostMapping; diff --git a/metis-applicant/src/main/resources/application.yml b/metis-applicant/src/main/resources/application.yml index 57c0935..d183ce5 100644 --- a/metis-applicant/src/main/resources/application.yml +++ b/metis-applicant/src/main/resources/application.yml @@ -34,10 +34,6 @@ springdoc: swagger-ui: tags-sorter: alpha group-configs: - - group: bis - display-name: "业务接口文档" - paths-to-match: '/**' - packages-to-scan: org.shi9.module.bis - group: system display-name: "系统接口文档" paths-to-match: '/**' diff --git a/metis-starter/pom.xml b/metis-starter/pom.xml index 0a888fd..ea66a81 100644 --- a/metis-starter/pom.xml +++ b/metis-starter/pom.xml @@ -11,13 +11,62 @@ metis-starter - - 17 - 17 - UTF-8 - - - + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-validation + + + dev.langchain4j + langchain4j-open-ai + + + dev.langchain4j + langchain4j-mcp + + + com.alibaba.fastjson2 + fastjson2 + 2.0.52 + + + org.projectlombok + lombok + + + com.mikesamuel + json-sanitizer + + + com.baomidou + mybatis-plus-spring-boot3-starter + + + mysql + mysql-connector-java + + + cn.hutool + hutool-all + + + + org.mapstruct + mapstruct + + + org.projectlombok + lombok-mapstruct-binding + + + org.springdoc + springdoc-openapi-starter-webmvc-api + + @@ -36,20 +85,15 @@ - - org.mapstruct - mapstruct-processor - 1.6.2 - org.projectlombok lombok - 1.18.34 + ${lombok.version} - org.projectlombok - lombok-mapstruct-binding - 0.2.0 + org.mapstruct + mapstruct-processor + ${org.mapstruct.version} diff --git a/metis-starter/src/main/java/com/metis/config/MetisStarterAutoConfiguration.java b/metis-starter/src/main/java/com/metis/config/MetisStarterAutoConfiguration.java index 2a2571b..f96631b 100644 --- a/metis-starter/src/main/java/com/metis/config/MetisStarterAutoConfiguration.java +++ b/metis-starter/src/main/java/com/metis/config/MetisStarterAutoConfiguration.java @@ -7,7 +7,13 @@ import org.springframework.context.annotation.Configuration; @Slf4j @Configuration -@MapperScan(basePackages = {"com.metis.flow.mapper"}) +@MapperScan(basePackages = {"com.metis.mapper"}) @ComponentScan("com.metis.*") public class MetisStarterAutoConfiguration { + + + static { + + } + } diff --git a/metis-starter/src/main/java/com/metis/flow/constant/BaseConstant.java b/metis-starter/src/main/java/com/metis/constant/BaseConstant.java similarity index 67% rename from metis-starter/src/main/java/com/metis/flow/constant/BaseConstant.java rename to metis-starter/src/main/java/com/metis/constant/BaseConstant.java index 7e0011a..bfac152 100644 --- a/metis-starter/src/main/java/com/metis/flow/constant/BaseConstant.java +++ b/metis-starter/src/main/java/com/metis/constant/BaseConstant.java @@ -1,4 +1,4 @@ -package com.metis.flow.constant; +package com.metis.constant; public interface BaseConstant { diff --git a/metis-applicant/src/main/java/com/metisapp/controller/ProcessDefinitionController.java b/metis-starter/src/main/java/com/metis/controller/ProcessDefinitionController.java similarity index 94% rename from metis-applicant/src/main/java/com/metisapp/controller/ProcessDefinitionController.java rename to metis-starter/src/main/java/com/metis/controller/ProcessDefinitionController.java index 0409e2f..8f16bc5 100644 --- a/metis-applicant/src/main/java/com/metisapp/controller/ProcessDefinitionController.java +++ b/metis-starter/src/main/java/com/metis/controller/ProcessDefinitionController.java @@ -1,8 +1,8 @@ -package com.metisapp.controller; +package com.metis.controller; import com.metis.domain.bo.ProcessBo; import com.metis.facade.ProcessDefinitionFacade; -import com.metis.flow.domain.entity.App; +import com.metis.domain.entity.App; import com.metis.result.Result; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/metis-starter/src/main/java/com/metis/flow/convert/BaseAppConvert.java b/metis-starter/src/main/java/com/metis/convert/BaseAppConvert.java similarity index 59% rename from metis-starter/src/main/java/com/metis/flow/convert/BaseAppConvert.java rename to metis-starter/src/main/java/com/metis/convert/BaseAppConvert.java index 54b2ca4..7a1122b 100644 --- a/metis-starter/src/main/java/com/metis/flow/convert/BaseAppConvert.java +++ b/metis-starter/src/main/java/com/metis/convert/BaseAppConvert.java @@ -1,9 +1,10 @@ -package com.metis.flow.convert; +package com.metis.convert; -import com.metis.flow.domain.entity.*; -import com.metis.flow.domain.bo.BuildApp; -import com.metis.flow.domain.bo.CreateApp; -import com.metis.flow.domain.bo.UpdateApp; +import com.metis.domain.bo.BuildApp; +import com.metis.domain.bo.CreateApp; +import com.metis.domain.bo.UpdateApp; +import com.metis.domain.entity.App; +import com.metis.domain.entity.BaseApp; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Mappings; @@ -23,6 +24,13 @@ public interface BaseAppConvert { * @param buildApp 基础应用 * @return {@link App } */ + @Mappings({ + @Mapping(target = "id", ignore = true), + @Mapping(target = "workflowId", ignore = true), + @Mapping(target = "createTime", ignore = true), + @Mapping(target = "version", ignore = true), + @Mapping(target = "defaultUse", ignore = true), + }) App toApp(BuildApp buildApp); /** @@ -32,7 +40,7 @@ public interface BaseAppConvert { * @return {@link App } */ @Mappings({ - @Mapping(target = "graph", expression = "java(com.alibaba.fastjson2.JSON.parseObject(baseApp.getGraphJson(), com.metis.flow.domain.entity.base.Graph.class))"), + @Mapping(target = "graph", expression = "java(com.alibaba.fastjson2.JSON.parseObject(baseApp.getGraphJson(), com.metis.domain.entity.base.Graph.class))"), @Mapping(target = "workflowId", source = "id") }) App toApp(BaseApp baseApp); @@ -45,6 +53,12 @@ public interface BaseAppConvert { */ @Mappings({ @Mapping(target = "graphJson", expression = "java(com.alibaba.fastjson2.JSON.toJSONString(buildApp.getGraph()))"), + @Mapping(target = "createTime", ignore = true), + @Mapping(target = "updateTime", ignore = true), + @Mapping(target = "isDeleted", ignore = true), + @Mapping(target = "id", ignore = true), + @Mapping(target = "createUserId", ignore = true), + @Mapping(target = "defaultUse", ignore = true) }) BaseApp toBaseApp(BuildApp buildApp); @@ -63,7 +77,9 @@ public interface BaseAppConvert { * @param createApp 创建应用程序 * @return {@link BuildApp } */ - + @Mappings({ + @Mapping(target = "appId", ignore = true) + }) BuildApp toBuildApp(CreateApp createApp); /** @@ -72,6 +88,9 @@ public interface BaseAppConvert { * @param updateApp 更新应用程序 * @return {@link BuildApp } */ + @Mappings({ + @Mapping(target = "userId", ignore = true) + }) BuildApp toBuildApp(UpdateApp updateApp); } diff --git a/metis-starter/src/main/java/com/metis/flow/convert/GraphConvert.java b/metis-starter/src/main/java/com/metis/convert/GraphConvert.java similarity index 64% rename from metis-starter/src/main/java/com/metis/flow/convert/GraphConvert.java rename to metis-starter/src/main/java/com/metis/convert/GraphConvert.java index 930ab9d..da2fa78 100644 --- a/metis-starter/src/main/java/com/metis/flow/convert/GraphConvert.java +++ b/metis-starter/src/main/java/com/metis/convert/GraphConvert.java @@ -1,8 +1,8 @@ -package com.metis.flow.convert; +package com.metis.convert; -import com.metis.flow.domain.bo.GraphBO; -import com.metis.flow.domain.entity.base.Graph; +import com.metis.domain.bo.GraphBO; +import com.metis.domain.entity.base.Graph; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/BuildApp.java b/metis-starter/src/main/java/com/metis/domain/bo/BuildApp.java similarity index 87% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/BuildApp.java rename to metis-starter/src/main/java/com/metis/domain/bo/BuildApp.java index 1e44ddf..28d6540 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/BuildApp.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/BuildApp.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; -import com.metis.flow.domain.entity.base.Graph; +import com.metis.domain.entity.base.Graph; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/CreateApp.java b/metis-starter/src/main/java/com/metis/domain/bo/CreateApp.java similarity index 86% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/CreateApp.java rename to metis-starter/src/main/java/com/metis/domain/bo/CreateApp.java index e99d0b1..a8a9c1a 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/CreateApp.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/CreateApp.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; -import com.metis.flow.domain.entity.base.Graph; +import com.metis.domain.entity.base.Graph; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/EdgeBO.java b/metis-starter/src/main/java/com/metis/domain/bo/EdgeBO.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/EdgeBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/EdgeBO.java index 240aa5c..0de8c4b 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/EdgeBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/EdgeBO.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; -import com.metis.flow.enums.EdgeType; +import com.metis.enums.EdgeType; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/GraphBO.java b/metis-starter/src/main/java/com/metis/domain/bo/GraphBO.java similarity index 94% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/GraphBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/GraphBO.java index 7d0c565..a5b51f5 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/GraphBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/GraphBO.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/HandleBO.java b/metis-starter/src/main/java/com/metis/domain/bo/HandleBO.java similarity index 83% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/HandleBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/HandleBO.java index 07e0f67..510557d 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/HandleBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/HandleBO.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; -import com.metis.flow.enums.HandleType; -import com.metis.flow.enums.PositionType; +import com.metis.enums.HandleType; +import com.metis.enums.PositionType; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/NodeBO.java b/metis-starter/src/main/java/com/metis/domain/bo/NodeBO.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/NodeBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/NodeBO.java index 3fb483b..9bab140 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/NodeBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/NodeBO.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; -import com.metis.flow.enums.NodeType; +import com.metis.enums.NodeType; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/NodeDataBO.java b/metis-starter/src/main/java/com/metis/domain/bo/NodeDataBO.java similarity index 90% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/NodeDataBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/NodeDataBO.java index 39b9983..04e0c82 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/NodeDataBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/NodeDataBO.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; import com.alibaba.fastjson2.JSONObject; -import com.metis.flow.enums.PositionType; +import com.metis.enums.PositionType; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/PositionBO.java b/metis-starter/src/main/java/com/metis/domain/bo/PositionBO.java similarity index 89% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/PositionBO.java rename to metis-starter/src/main/java/com/metis/domain/bo/PositionBO.java index f91a540..00f0b50 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/PositionBO.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/PositionBO.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/domain/bo/ProcessBo.java b/metis-starter/src/main/java/com/metis/domain/bo/ProcessBo.java index 30fd785..c0075af 100644 --- a/metis-starter/src/main/java/com/metis/domain/bo/ProcessBo.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/ProcessBo.java @@ -1,7 +1,7 @@ package com.metis.domain.bo; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.domain.bo.GraphBO; +import com.metis.domain.bo.GraphBO; import lombok.Data; @Data diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/UpdateApp.java b/metis-starter/src/main/java/com/metis/domain/bo/UpdateApp.java similarity index 87% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/UpdateApp.java rename to metis-starter/src/main/java/com/metis/domain/bo/UpdateApp.java index 8d6d119..e4c3238 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/UpdateApp.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/UpdateApp.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.domain.entity.base.Graph; +import com.metis.domain.entity.base.Graph; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/bo/ViewportBo.java b/metis-starter/src/main/java/com/metis/domain/bo/ViewportBo.java similarity index 78% rename from metis-starter/src/main/java/com/metis/flow/domain/bo/ViewportBo.java rename to metis-starter/src/main/java/com/metis/domain/bo/ViewportBo.java index efe7eab..7209088 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/bo/ViewportBo.java +++ b/metis-starter/src/main/java/com/metis/domain/bo/ViewportBo.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.bo; +package com.metis.domain.bo; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/context/RunningContext.java b/metis-starter/src/main/java/com/metis/domain/context/RunningContext.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/domain/context/RunningContext.java rename to metis-starter/src/main/java/com/metis/domain/context/RunningContext.java index 87d99d4..4d43f8d 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/context/RunningContext.java +++ b/metis-starter/src/main/java/com/metis/domain/context/RunningContext.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.context; +package com.metis.domain.context; import com.alibaba.fastjson2.JSONObject; -import com.metis.flow.runner.FlowRunningContext; +import com.metis.runner.FlowRunningContext; import lombok.Builder; import lombok.Getter; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/context/RunningResult.java b/metis-starter/src/main/java/com/metis/domain/context/RunningResult.java similarity index 97% rename from metis-starter/src/main/java/com/metis/flow/domain/context/RunningResult.java rename to metis-starter/src/main/java/com/metis/domain/context/RunningResult.java index bb5b598..4b43f76 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/context/RunningResult.java +++ b/metis-starter/src/main/java/com/metis/domain/context/RunningResult.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.context; +package com.metis.domain.context; import com.alibaba.fastjson2.JSONObject; import lombok.Builder; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/context/SysContext.java b/metis-starter/src/main/java/com/metis/domain/context/SysContext.java similarity index 94% rename from metis-starter/src/main/java/com/metis/flow/domain/context/SysContext.java rename to metis-starter/src/main/java/com/metis/domain/context/SysContext.java index 54bc818..a2327e9 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/context/SysContext.java +++ b/metis-starter/src/main/java/com/metis/domain/context/SysContext.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.context; +package com.metis.domain.context; import lombok.Builder; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/App.java b/metis-starter/src/main/java/com/metis/domain/entity/App.java similarity index 87% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/App.java rename to metis-starter/src/main/java/com/metis/domain/entity/App.java index e7546b5..ef48d44 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/App.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/App.java @@ -1,8 +1,8 @@ -package com.metis.flow.domain.entity; +package com.metis.domain.entity; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.domain.entity.base.Graph; +import com.metis.domain.entity.base.Graph; import lombok.Data; import java.time.LocalDateTime; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/BaseApp.java b/metis-starter/src/main/java/com/metis/domain/entity/BaseApp.java similarity index 97% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/BaseApp.java rename to metis-starter/src/main/java/com/metis/domain/entity/BaseApp.java index 48e9521..53204e0 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/BaseApp.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/BaseApp.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.entity; +package com.metis.domain.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/GraphDemo.java b/metis-starter/src/main/java/com/metis/domain/entity/GraphDemo.java similarity index 91% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/GraphDemo.java rename to metis-starter/src/main/java/com/metis/domain/entity/GraphDemo.java index 1a2f441..79dc4aa 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/GraphDemo.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/GraphDemo.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.entity; +package com.metis.domain.entity; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; import java.util.*; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Edge.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Edge.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Edge.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Edge.java index 96e72d2..d389fec 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Edge.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Edge.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; -import com.metis.flow.enums.EdgeType; +import com.metis.enums.EdgeType; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Graph.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Graph.java similarity index 80% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Graph.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Graph.java index 96bd053..c440eb3 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Graph.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Graph.java @@ -1,12 +1,16 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import jakarta.validation.Valid; import jakarta.validation.constraints.NotEmpty; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @Data +@AllArgsConstructor +@NoArgsConstructor public class Graph { /** diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Handle.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Handle.java similarity index 82% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Handle.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Handle.java index acaa9b5..f0e3e32 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Handle.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Handle.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; -import com.metis.flow.enums.HandleType; -import com.metis.flow.enums.PositionType; +import com.metis.enums.HandleType; +import com.metis.enums.PositionType; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Node.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Node.java similarity index 92% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Node.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Node.java index d1def2c..c5d976b 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Node.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Node.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import cn.hutool.core.util.ObjectUtil; -import com.metis.flow.enums.NodeType; +import com.metis.enums.NodeType; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; import lombok.Data; @@ -54,8 +54,7 @@ public class Node { */ private Boolean selected; - - private Class configClass; + private transient Class configClass; /** diff --git a/metis-starter/src/main/java/com/metis/domain/entity/base/NodeConfig.java b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeConfig.java new file mode 100644 index 0000000..f96afd2 --- /dev/null +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeConfig.java @@ -0,0 +1,4 @@ +package com.metis.domain.entity.base; + +public abstract class NodeConfig { +} diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeData.java b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeData.java similarity index 89% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeData.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/NodeData.java index 42d65bb..9aa53f7 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeData.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeData.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import com.alibaba.fastjson2.JSONObject; -import com.metis.flow.enums.PositionType; +import com.metis.enums.PositionType; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeVariable.java b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeVariable.java similarity index 94% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeVariable.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/NodeVariable.java index 0a93469..3058bbd 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeVariable.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/NodeVariable.java @@ -1,11 +1,11 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson2.JSONObject; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.metis.flow.enums.FileUploadType; -import com.metis.flow.enums.NodeVariableType; +import com.metis.enums.FileUploadType; +import com.metis.enums.NodeVariableType; import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Position.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Position.java similarity index 87% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Position.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Position.java index 291cf55..2beec9f 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Position.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Position.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import jakarta.validation.constraints.NotNull; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/VariableOption.java b/metis-starter/src/main/java/com/metis/domain/entity/base/VariableOption.java similarity index 85% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/VariableOption.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/VariableOption.java index cc3a4ef..7ac3e13 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/VariableOption.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/VariableOption.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import jakarta.validation.constraints.NotNull; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Viewport.java b/metis-starter/src/main/java/com/metis/domain/entity/base/Viewport.java similarity index 74% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/base/Viewport.java rename to metis-starter/src/main/java/com/metis/domain/entity/base/Viewport.java index 5b279b3..039f996 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/Viewport.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/base/Viewport.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.entity.base; +package com.metis.domain.entity.base; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/DocumentExtractorNodeConfig.java b/metis-starter/src/main/java/com/metis/domain/entity/config/node/DocumentExtractorNodeConfig.java similarity index 73% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/DocumentExtractorNodeConfig.java rename to metis-starter/src/main/java/com/metis/domain/entity/config/node/DocumentExtractorNodeConfig.java index 1fbb852..eae223c 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/DocumentExtractorNodeConfig.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/config/node/DocumentExtractorNodeConfig.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.entity.config.node; +package com.metis.domain.entity.config.node; -import com.metis.flow.domain.entity.base.NodeConfig; +import com.metis.domain.entity.base.NodeConfig; import jakarta.validation.constraints.NotBlank; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/EndNodeConfig.java b/metis-starter/src/main/java/com/metis/domain/entity/config/node/EndNodeConfig.java similarity index 58% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/EndNodeConfig.java rename to metis-starter/src/main/java/com/metis/domain/entity/config/node/EndNodeConfig.java index 8e79214..202e601 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/EndNodeConfig.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/config/node/EndNodeConfig.java @@ -1,6 +1,6 @@ -package com.metis.flow.domain.entity.config.node; +package com.metis.domain.entity.config.node; -import com.metis.flow.domain.entity.base.NodeConfig; +import com.metis.domain.entity.base.NodeConfig; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/StartNodeConfig.java b/metis-starter/src/main/java/com/metis/domain/entity/config/node/StartNodeConfig.java similarity index 62% rename from metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/StartNodeConfig.java rename to metis-starter/src/main/java/com/metis/domain/entity/config/node/StartNodeConfig.java index 883dad8..4f37e13 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/node/StartNodeConfig.java +++ b/metis-starter/src/main/java/com/metis/domain/entity/config/node/StartNodeConfig.java @@ -1,7 +1,7 @@ -package com.metis.flow.domain.entity.config.node; +package com.metis.domain.entity.config.node; -import com.metis.flow.domain.entity.base.NodeConfig; -import com.metis.flow.domain.entity.base.NodeVariable; +import com.metis.domain.entity.base.NodeConfig; +import com.metis.domain.entity.base.NodeVariable; import jakarta.validation.Valid; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/metis-starter/src/main/java/com/metis/domain/entity/config/package-info.java b/metis-starter/src/main/java/com/metis/domain/entity/config/package-info.java new file mode 100644 index 0000000..e836bd2 --- /dev/null +++ b/metis-starter/src/main/java/com/metis/domain/entity/config/package-info.java @@ -0,0 +1 @@ +package com.metis.domain.entity.config; \ No newline at end of file diff --git a/metis-starter/src/main/java/com/metis/flow/domain/query/AppQuery.java b/metis-starter/src/main/java/com/metis/domain/query/AppQuery.java similarity index 82% rename from metis-starter/src/main/java/com/metis/flow/domain/query/AppQuery.java rename to metis-starter/src/main/java/com/metis/domain/query/AppQuery.java index 2cd0ebe..5fb28ce 100644 --- a/metis-starter/src/main/java/com/metis/flow/domain/query/AppQuery.java +++ b/metis-starter/src/main/java/com/metis/domain/query/AppQuery.java @@ -1,4 +1,4 @@ -package com.metis.flow.domain.query; +package com.metis.domain.query; import lombok.Builder; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/engine/AppEngineService.java b/metis-starter/src/main/java/com/metis/engine/AppEngineService.java similarity index 86% rename from metis-starter/src/main/java/com/metis/flow/engine/AppEngineService.java rename to metis-starter/src/main/java/com/metis/engine/AppEngineService.java index 4ce22c8..dac3ee6 100644 --- a/metis-starter/src/main/java/com/metis/flow/engine/AppEngineService.java +++ b/metis-starter/src/main/java/com/metis/engine/AppEngineService.java @@ -1,9 +1,10 @@ -package com.metis.flow.engine; +package com.metis.engine; -import com.metis.flow.domain.query.AppQuery; -import com.metis.flow.domain.entity.App; -import com.metis.flow.domain.bo.CreateApp; -import com.metis.flow.domain.bo.UpdateApp; + +import com.metis.domain.bo.CreateApp; +import com.metis.domain.bo.UpdateApp; +import com.metis.domain.entity.App; +import com.metis.domain.query.AppQuery; import java.util.List; diff --git a/metis-starter/src/main/java/com/metis/flow/engine/AppFlowEngineRunnerService.java b/metis-starter/src/main/java/com/metis/engine/AppFlowEngineRunnerService.java similarity index 70% rename from metis-starter/src/main/java/com/metis/flow/engine/AppFlowEngineRunnerService.java rename to metis-starter/src/main/java/com/metis/engine/AppFlowEngineRunnerService.java index dfb85c3..fe0d367 100644 --- a/metis-starter/src/main/java/com/metis/flow/engine/AppFlowEngineRunnerService.java +++ b/metis-starter/src/main/java/com/metis/engine/AppFlowEngineRunnerService.java @@ -1,7 +1,7 @@ -package com.metis.flow.engine; +package com.metis.engine; -import com.metis.flow.runner.FlowRunningContext; -import com.metis.flow.runner.RunnerResult; +import com.metis.runner.FlowRunningContext; +import com.metis.runner.RunnerResult; /** * 应用引擎运行器服务 diff --git a/metis-starter/src/main/java/com/metis/flow/engine/impl/AppEngineServiceImpl.java b/metis-starter/src/main/java/com/metis/engine/impl/AppEngineServiceImpl.java similarity index 90% rename from metis-starter/src/main/java/com/metis/flow/engine/impl/AppEngineServiceImpl.java rename to metis-starter/src/main/java/com/metis/engine/impl/AppEngineServiceImpl.java index 92c5bc1..2547843 100644 --- a/metis-starter/src/main/java/com/metis/flow/engine/impl/AppEngineServiceImpl.java +++ b/metis-starter/src/main/java/com/metis/engine/impl/AppEngineServiceImpl.java @@ -1,19 +1,20 @@ -package com.metis.flow.engine.impl; +package com.metis.engine.impl; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import com.metis.constant.BaseConstant; +import com.metis.convert.BaseAppConvert; +import com.metis.domain.bo.BuildApp; +import com.metis.domain.bo.CreateApp; +import com.metis.domain.bo.UpdateApp; +import com.metis.domain.entity.App; +import com.metis.domain.entity.BaseApp; +import com.metis.domain.query.AppQuery; +import com.metis.engine.AppEngineService; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.constant.BaseConstant; -import com.metis.flow.convert.BaseAppConvert; -import com.metis.flow.domain.bo.BuildApp; -import com.metis.flow.domain.bo.CreateApp; -import com.metis.flow.domain.bo.UpdateApp; -import com.metis.flow.domain.query.AppQuery; -import com.metis.flow.domain.entity.*; -import com.metis.flow.engine.AppEngineService; -import com.metis.flow.service.BaseAppService; -import com.metis.flow.validator.ValidatorService; +import com.metis.service.BaseAppService; +import com.metis.validator.ValidatorService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/engine/impl/AppFlowEngineRunnerServiceImpl.java b/metis-starter/src/main/java/com/metis/engine/impl/AppFlowEngineRunnerServiceImpl.java similarity index 86% rename from metis-starter/src/main/java/com/metis/flow/engine/impl/AppFlowEngineRunnerServiceImpl.java rename to metis-starter/src/main/java/com/metis/engine/impl/AppFlowEngineRunnerServiceImpl.java index 5d46a8f..a98ba67 100644 --- a/metis-starter/src/main/java/com/metis/flow/engine/impl/AppFlowEngineRunnerServiceImpl.java +++ b/metis-starter/src/main/java/com/metis/engine/impl/AppFlowEngineRunnerServiceImpl.java @@ -1,24 +1,24 @@ -package com.metis.flow.engine.impl; +package com.metis.engine.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.metis.flow.domain.context.RunningContext; -import com.metis.flow.domain.context.RunningResult; -import com.metis.flow.domain.context.SysContext; -import com.metis.flow.domain.entity.App; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Graph; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.engine.AppEngineService; -import com.metis.flow.engine.AppFlowEngineRunnerService; -import com.metis.flow.enums.NodeType; -import com.metis.flow.runner.FlowRunningContext; -import com.metis.flow.runner.NodeRunner; -import com.metis.flow.runner.RunnerResult; -import com.metis.flow.runner.factory.NodeRunnerFactory; +import com.metis.domain.context.RunningContext; +import com.metis.domain.context.RunningResult; +import com.metis.domain.context.SysContext; +import com.metis.domain.entity.App; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Graph; +import com.metis.domain.entity.base.Node; +import com.metis.engine.AppEngineService; +import com.metis.engine.AppFlowEngineRunnerService; +import com.metis.enums.NodeType; +import com.metis.runner.FlowRunningContext; +import com.metis.runner.NodeRunner; +import com.metis.runner.RunnerResult; +import com.metis.runner.factory.NodeRunnerFactory; import com.metis.utils.GenericInterfacesUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -39,6 +39,7 @@ public class AppFlowEngineRunnerServiceImpl implements AppFlowEngineRunnerServic @Override public RunnerResult running(FlowRunningContext context) { App app = getApp(context); + Assert.isTrue(ObjectUtil.isNotNull(app), "app为空"); // todo 构建运行实例, 并将运行实例放入上下文 Long instanceId = IdUtil.getSnowflakeNextId(); // 构建系统上下文信息 diff --git a/metis-starter/src/main/java/com/metis/flow/enums/EdgeType.java b/metis-starter/src/main/java/com/metis/enums/EdgeType.java similarity index 96% rename from metis-starter/src/main/java/com/metis/flow/enums/EdgeType.java rename to metis-starter/src/main/java/com/metis/enums/EdgeType.java index 4113c13..0a53b1a 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/EdgeType.java +++ b/metis-starter/src/main/java/com/metis/enums/EdgeType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/flow/enums/FileUploadType.java b/metis-starter/src/main/java/com/metis/enums/FileUploadType.java similarity index 96% rename from metis-starter/src/main/java/com/metis/flow/enums/FileUploadType.java rename to metis-starter/src/main/java/com/metis/enums/FileUploadType.java index 15181df..f1bde0a 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/FileUploadType.java +++ b/metis-starter/src/main/java/com/metis/enums/FileUploadType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/flow/enums/HandleType.java b/metis-starter/src/main/java/com/metis/enums/HandleType.java similarity index 96% rename from metis-starter/src/main/java/com/metis/flow/enums/HandleType.java rename to metis-starter/src/main/java/com/metis/enums/HandleType.java index 37dc51e..227ac69 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/HandleType.java +++ b/metis-starter/src/main/java/com/metis/enums/HandleType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/flow/enums/NodeType.java b/metis-starter/src/main/java/com/metis/enums/NodeType.java similarity index 97% rename from metis-starter/src/main/java/com/metis/flow/enums/NodeType.java rename to metis-starter/src/main/java/com/metis/enums/NodeType.java index caa5849..aed1d1a 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/NodeType.java +++ b/metis-starter/src/main/java/com/metis/enums/NodeType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/flow/enums/NodeVariableType.java b/metis-starter/src/main/java/com/metis/enums/NodeVariableType.java similarity index 97% rename from metis-starter/src/main/java/com/metis/flow/enums/NodeVariableType.java rename to metis-starter/src/main/java/com/metis/enums/NodeVariableType.java index e9617ca..09ca06d 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/NodeVariableType.java +++ b/metis-starter/src/main/java/com/metis/enums/NodeVariableType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/flow/enums/PositionType.java b/metis-starter/src/main/java/com/metis/enums/PositionType.java similarity index 97% rename from metis-starter/src/main/java/com/metis/flow/enums/PositionType.java rename to metis-starter/src/main/java/com/metis/enums/PositionType.java index 98eb1d0..a5d67a1 100644 --- a/metis-starter/src/main/java/com/metis/flow/enums/PositionType.java +++ b/metis-starter/src/main/java/com/metis/enums/PositionType.java @@ -1,4 +1,4 @@ -package com.metis.flow.enums; +package com.metis.enums; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/metis-starter/src/main/java/com/metis/facade/ProcessDefinitionFacade.java b/metis-starter/src/main/java/com/metis/facade/ProcessDefinitionFacade.java index 216102d..9e6b1e3 100644 --- a/metis-starter/src/main/java/com/metis/facade/ProcessDefinitionFacade.java +++ b/metis-starter/src/main/java/com/metis/facade/ProcessDefinitionFacade.java @@ -1,12 +1,12 @@ package com.metis.facade; import com.metis.domain.bo.ProcessBo; -import com.metis.flow.convert.GraphConvert; -import com.metis.flow.domain.bo.CreateApp; -import com.metis.flow.domain.bo.UpdateApp; -import com.metis.flow.domain.entity.App; -import com.metis.flow.domain.entity.base.Graph; -import com.metis.flow.engine.AppEngineService; +import com.metis.convert.GraphConvert; +import com.metis.domain.bo.CreateApp; +import com.metis.domain.bo.UpdateApp; +import com.metis.domain.entity.App; +import com.metis.domain.entity.base.Graph; +import com.metis.engine.AppEngineService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeConfig.java b/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeConfig.java deleted file mode 100644 index e16787d..0000000 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/base/NodeConfig.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.metis.flow.domain.entity.base; - -public abstract class NodeConfig { -} diff --git a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/package-info.java b/metis-starter/src/main/java/com/metis/flow/domain/entity/config/package-info.java deleted file mode 100644 index a2ccdb1..0000000 --- a/metis-starter/src/main/java/com/metis/flow/domain/entity/config/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.metis.flow.domain.entity.config; \ No newline at end of file diff --git a/metis-starter/src/main/java/com/metis/flow/mapper/BaseAppMapper.java b/metis-starter/src/main/java/com/metis/mapper/BaseAppMapper.java similarity index 76% rename from metis-starter/src/main/java/com/metis/flow/mapper/BaseAppMapper.java rename to metis-starter/src/main/java/com/metis/mapper/BaseAppMapper.java index cb09b20..e9b88fc 100644 --- a/metis-starter/src/main/java/com/metis/flow/mapper/BaseAppMapper.java +++ b/metis-starter/src/main/java/com/metis/mapper/BaseAppMapper.java @@ -1,6 +1,6 @@ -package com.metis.flow.mapper; +package com.metis.mapper; -import com.metis.flow.domain.entity.BaseApp; +import com.metis.domain.entity.BaseApp; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/CustomNodeRunner.java b/metis-starter/src/main/java/com/metis/runner/CustomNodeRunner.java similarity index 78% rename from metis-starter/src/main/java/com/metis/flow/runner/CustomNodeRunner.java rename to metis-starter/src/main/java/com/metis/runner/CustomNodeRunner.java index 16887d3..8247f5d 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/CustomNodeRunner.java +++ b/metis-starter/src/main/java/com/metis/runner/CustomNodeRunner.java @@ -1,7 +1,7 @@ -package com.metis.flow.runner; +package com.metis.runner; -import com.metis.flow.domain.entity.base.NodeConfig; -import com.metis.flow.enums.NodeType; +import com.metis.domain.entity.base.NodeConfig; +import com.metis.enums.NodeType; /** * 自定义节点运行器 diff --git a/metis-starter/src/main/java/com/metis/flow/runner/FlowRunningContext.java b/metis-starter/src/main/java/com/metis/runner/FlowRunningContext.java similarity index 95% rename from metis-starter/src/main/java/com/metis/flow/runner/FlowRunningContext.java rename to metis-starter/src/main/java/com/metis/runner/FlowRunningContext.java index 5159a44..022f693 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/FlowRunningContext.java +++ b/metis-starter/src/main/java/com/metis/runner/FlowRunningContext.java @@ -1,4 +1,4 @@ -package com.metis.flow.runner; +package com.metis.runner; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/NodeRunner.java b/metis-starter/src/main/java/com/metis/runner/NodeRunner.java similarity index 65% rename from metis-starter/src/main/java/com/metis/flow/runner/NodeRunner.java rename to metis-starter/src/main/java/com/metis/runner/NodeRunner.java index d85fdfa..d219fcb 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/NodeRunner.java +++ b/metis-starter/src/main/java/com/metis/runner/NodeRunner.java @@ -1,11 +1,11 @@ -package com.metis.flow.runner; +package com.metis.runner; -import com.metis.flow.domain.context.RunningContext; -import com.metis.flow.domain.context.RunningResult; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.base.NodeConfig; -import com.metis.flow.enums.NodeType; +import com.metis.domain.context.RunningContext; +import com.metis.domain.context.RunningResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.base.NodeConfig; +import com.metis.enums.NodeType; import java.util.List; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/RunnerResult.java b/metis-starter/src/main/java/com/metis/runner/RunnerResult.java similarity index 78% rename from metis-starter/src/main/java/com/metis/flow/runner/RunnerResult.java rename to metis-starter/src/main/java/com/metis/runner/RunnerResult.java index 0b573f4..b24e84b 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/RunnerResult.java +++ b/metis-starter/src/main/java/com/metis/runner/RunnerResult.java @@ -1,7 +1,7 @@ -package com.metis.flow.runner; +package com.metis.runner; -import com.metis.flow.domain.context.SysContext; +import com.metis.domain.context.SysContext; import lombok.Builder; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/factory/NodeRunnerFactory.java b/metis-starter/src/main/java/com/metis/runner/factory/NodeRunnerFactory.java similarity index 89% rename from metis-starter/src/main/java/com/metis/flow/runner/factory/NodeRunnerFactory.java rename to metis-starter/src/main/java/com/metis/runner/factory/NodeRunnerFactory.java index f46ad58..a2204fa 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/factory/NodeRunnerFactory.java +++ b/metis-starter/src/main/java/com/metis/runner/factory/NodeRunnerFactory.java @@ -1,9 +1,9 @@ -package com.metis.flow.runner.factory; +package com.metis.runner.factory; import cn.hutool.core.lang.Assert; -import com.metis.flow.enums.NodeType; -import com.metis.flow.runner.CustomNodeRunner; -import com.metis.flow.runner.NodeRunner; +import com.metis.enums.NodeType; +import com.metis.runner.CustomNodeRunner; +import com.metis.runner.NodeRunner; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/factory/RunnerInitialize.java b/metis-starter/src/main/java/com/metis/runner/factory/RunnerInitialize.java similarity index 86% rename from metis-starter/src/main/java/com/metis/flow/runner/factory/RunnerInitialize.java rename to metis-starter/src/main/java/com/metis/runner/factory/RunnerInitialize.java index 940cece..0a730b9 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/factory/RunnerInitialize.java +++ b/metis-starter/src/main/java/com/metis/runner/factory/RunnerInitialize.java @@ -1,9 +1,9 @@ -package com.metis.flow.runner.factory; +package com.metis.runner.factory; import cn.hutool.core.lang.Assert; -import com.metis.flow.enums.NodeType; -import com.metis.flow.runner.CustomNodeRunner; -import com.metis.flow.runner.NodeRunner; +import com.metis.enums.NodeType; +import com.metis.runner.CustomNodeRunner; +import com.metis.runner.NodeRunner; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/impl/EndNodeRunner.java b/metis-starter/src/main/java/com/metis/runner/impl/EndNodeRunner.java similarity index 52% rename from metis-starter/src/main/java/com/metis/flow/runner/impl/EndNodeRunner.java rename to metis-starter/src/main/java/com/metis/runner/impl/EndNodeRunner.java index 8bd104d..c25b7b4 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/impl/EndNodeRunner.java +++ b/metis-starter/src/main/java/com/metis/runner/impl/EndNodeRunner.java @@ -1,13 +1,13 @@ -package com.metis.flow.runner.impl; +package com.metis.runner.impl; -import com.metis.flow.domain.context.RunningContext; -import com.metis.flow.domain.context.RunningResult; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.config.node.EndNodeConfig; -import com.metis.flow.enums.NodeType; -import com.metis.flow.runner.NodeRunner; +import com.metis.domain.context.RunningContext; +import com.metis.domain.context.RunningResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.config.node.EndNodeConfig; +import com.metis.enums.NodeType; +import com.metis.runner.NodeRunner; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/runner/impl/StartNodeRunner.java b/metis-starter/src/main/java/com/metis/runner/impl/StartNodeRunner.java similarity index 76% rename from metis-starter/src/main/java/com/metis/flow/runner/impl/StartNodeRunner.java rename to metis-starter/src/main/java/com/metis/runner/impl/StartNodeRunner.java index d5c2be3..0aeca90 100644 --- a/metis-starter/src/main/java/com/metis/flow/runner/impl/StartNodeRunner.java +++ b/metis-starter/src/main/java/com/metis/runner/impl/StartNodeRunner.java @@ -1,15 +1,15 @@ -package com.metis.flow.runner.impl; +package com.metis.runner.impl; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson2.JSONObject; -import com.metis.flow.domain.context.RunningContext; -import com.metis.flow.domain.context.RunningResult; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.base.NodeVariable; -import com.metis.flow.domain.entity.config.node.StartNodeConfig; -import com.metis.flow.enums.NodeType; -import com.metis.flow.runner.NodeRunner; +import com.metis.domain.context.RunningContext; +import com.metis.domain.context.RunningResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.base.NodeVariable; +import com.metis.domain.entity.config.node.StartNodeConfig; +import com.metis.enums.NodeType; +import com.metis.runner.NodeRunner; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/service/BaseAppService.java b/metis-starter/src/main/java/com/metis/service/BaseAppService.java similarity index 92% rename from metis-starter/src/main/java/com/metis/flow/service/BaseAppService.java rename to metis-starter/src/main/java/com/metis/service/BaseAppService.java index 2fa231b..96d1c31 100644 --- a/metis-starter/src/main/java/com/metis/flow/service/BaseAppService.java +++ b/metis-starter/src/main/java/com/metis/service/BaseAppService.java @@ -1,8 +1,8 @@ -package com.metis.flow.service; +package com.metis.service; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.domain.query.AppQuery; -import com.metis.flow.domain.entity.BaseApp; +import com.metis.domain.query.AppQuery; +import com.metis.domain.entity.BaseApp; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/metis-starter/src/main/java/com/metis/flow/service/impl/BaseAppServiceImpl.java b/metis-starter/src/main/java/com/metis/service/impl/BaseAppServiceImpl.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/service/impl/BaseAppServiceImpl.java rename to metis-starter/src/main/java/com/metis/service/impl/BaseAppServiceImpl.java index 5cbe09a..c9263ab 100644 --- a/metis-starter/src/main/java/com/metis/flow/service/impl/BaseAppServiceImpl.java +++ b/metis-starter/src/main/java/com/metis/service/impl/BaseAppServiceImpl.java @@ -1,4 +1,4 @@ -package com.metis.flow.service.impl; +package com.metis.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.metis.enums.YesOrNoEnum; -import com.metis.flow.domain.query.AppQuery; -import com.metis.flow.domain.entity.BaseApp; -import com.metis.flow.mapper.BaseAppMapper; -import com.metis.flow.service.BaseAppService; +import com.metis.domain.query.AppQuery; +import com.metis.domain.entity.BaseApp; +import com.metis.mapper.BaseAppMapper; +import com.metis.service.BaseAppService; import com.metis.utils.PageConditionUtil; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/CustomNodeValidator.java b/metis-starter/src/main/java/com/metis/validator/CustomNodeValidator.java similarity index 78% rename from metis-starter/src/main/java/com/metis/flow/validator/CustomNodeValidator.java rename to metis-starter/src/main/java/com/metis/validator/CustomNodeValidator.java index ace602a..dab89c6 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/CustomNodeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/CustomNodeValidator.java @@ -1,7 +1,7 @@ -package com.metis.flow.validator; +package com.metis.validator; -import com.metis.flow.domain.entity.base.NodeConfig; -import com.metis.flow.enums.NodeType; +import com.metis.domain.entity.base.NodeConfig; +import com.metis.enums.NodeType; /** * 自定义节点验证器 diff --git a/metis-starter/src/main/java/com/metis/flow/validator/EdgeValidator.java b/metis-starter/src/main/java/com/metis/validator/EdgeValidator.java similarity index 70% rename from metis-starter/src/main/java/com/metis/flow/validator/EdgeValidator.java rename to metis-starter/src/main/java/com/metis/validator/EdgeValidator.java index a02d1e2..74f87b7 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/EdgeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/EdgeValidator.java @@ -1,7 +1,7 @@ -package com.metis.flow.validator; +package com.metis.validator; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.enums.EdgeType; +import com.metis.domain.entity.base.Edge; +import com.metis.enums.EdgeType; public interface EdgeValidator { diff --git a/metis-starter/src/main/java/com/metis/flow/validator/NodeValidator.java b/metis-starter/src/main/java/com/metis/validator/NodeValidator.java similarity index 73% rename from metis-starter/src/main/java/com/metis/flow/validator/NodeValidator.java rename to metis-starter/src/main/java/com/metis/validator/NodeValidator.java index 7c6274e..27aac24 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/NodeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/NodeValidator.java @@ -1,9 +1,9 @@ -package com.metis.flow.validator; +package com.metis.validator; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.base.NodeConfig; -import com.metis.flow.enums.NodeType; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.base.NodeConfig; +import com.metis.enums.NodeType; import java.util.List; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorCodeService.java b/metis-starter/src/main/java/com/metis/validator/ValidatorCodeService.java similarity index 98% rename from metis-starter/src/main/java/com/metis/flow/validator/ValidatorCodeService.java rename to metis-starter/src/main/java/com/metis/validator/ValidatorCodeService.java index 9ee3d25..a05e326 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorCodeService.java +++ b/metis-starter/src/main/java/com/metis/validator/ValidatorCodeService.java @@ -1,4 +1,4 @@ -package com.metis.flow.validator; +package com.metis.validator; import cn.hutool.core.collection.CollUtil; import jakarta.validation.ConstraintViolation; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorResult.java b/metis-starter/src/main/java/com/metis/validator/ValidatorResult.java similarity index 93% rename from metis-starter/src/main/java/com/metis/flow/validator/ValidatorResult.java rename to metis-starter/src/main/java/com/metis/validator/ValidatorResult.java index 8666b6e..a9e502a 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorResult.java +++ b/metis-starter/src/main/java/com/metis/validator/ValidatorResult.java @@ -1,4 +1,4 @@ -package com.metis.flow.validator; +package com.metis.validator; import lombok.Data; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorService.java b/metis-starter/src/main/java/com/metis/validator/ValidatorService.java similarity index 66% rename from metis-starter/src/main/java/com/metis/flow/validator/ValidatorService.java rename to metis-starter/src/main/java/com/metis/validator/ValidatorService.java index ac5f11f..6cf5afb 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/ValidatorService.java +++ b/metis-starter/src/main/java/com/metis/validator/ValidatorService.java @@ -1,6 +1,6 @@ -package com.metis.flow.validator; +package com.metis.validator; -import com.metis.flow.domain.bo.BuildApp; +import com.metis.domain.bo.BuildApp; public interface ValidatorService { diff --git a/metis-starter/src/main/java/com/metis/flow/validator/factory/EdgeValidatorFactory.java b/metis-starter/src/main/java/com/metis/validator/factory/EdgeValidatorFactory.java similarity index 81% rename from metis-starter/src/main/java/com/metis/flow/validator/factory/EdgeValidatorFactory.java rename to metis-starter/src/main/java/com/metis/validator/factory/EdgeValidatorFactory.java index d3e357f..03c2eab 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/factory/EdgeValidatorFactory.java +++ b/metis-starter/src/main/java/com/metis/validator/factory/EdgeValidatorFactory.java @@ -1,7 +1,7 @@ -package com.metis.flow.validator.factory; +package com.metis.validator.factory; -import com.metis.flow.enums.EdgeType; -import com.metis.flow.validator.EdgeValidator; +import com.metis.enums.EdgeType; +import com.metis.validator.EdgeValidator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/factory/NodeValidatorFactory.java b/metis-starter/src/main/java/com/metis/validator/factory/NodeValidatorFactory.java similarity index 87% rename from metis-starter/src/main/java/com/metis/flow/validator/factory/NodeValidatorFactory.java rename to metis-starter/src/main/java/com/metis/validator/factory/NodeValidatorFactory.java index 92bf27e..14a501b 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/factory/NodeValidatorFactory.java +++ b/metis-starter/src/main/java/com/metis/validator/factory/NodeValidatorFactory.java @@ -1,9 +1,9 @@ -package com.metis.flow.validator.factory; +package com.metis.validator.factory; import cn.hutool.core.lang.Assert; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.CustomNodeValidator; -import com.metis.flow.validator.NodeValidator; +import com.metis.enums.NodeType; +import com.metis.validator.CustomNodeValidator; +import com.metis.validator.NodeValidator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/factory/ValidatorInitialize.java b/metis-starter/src/main/java/com/metis/validator/factory/ValidatorInitialize.java similarity index 85% rename from metis-starter/src/main/java/com/metis/flow/validator/factory/ValidatorInitialize.java rename to metis-starter/src/main/java/com/metis/validator/factory/ValidatorInitialize.java index 9b038d6..743d8ac 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/factory/ValidatorInitialize.java +++ b/metis-starter/src/main/java/com/metis/validator/factory/ValidatorInitialize.java @@ -1,11 +1,11 @@ -package com.metis.flow.validator.factory; +package com.metis.validator.factory; import cn.hutool.core.lang.Assert; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.CustomNodeValidator; -import com.metis.flow.validator.EdgeValidator; -import com.metis.flow.validator.NodeValidator; +import com.metis.enums.NodeType; +import com.metis.validator.CustomNodeValidator; +import com.metis.validator.EdgeValidator; +import com.metis.validator.NodeValidator; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/impl/ValidatorServiceImpl.java b/metis-starter/src/main/java/com/metis/validator/impl/ValidatorServiceImpl.java similarity index 95% rename from metis-starter/src/main/java/com/metis/flow/validator/impl/ValidatorServiceImpl.java rename to metis-starter/src/main/java/com/metis/validator/impl/ValidatorServiceImpl.java index a3d9df7..48bffd0 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/impl/ValidatorServiceImpl.java +++ b/metis-starter/src/main/java/com/metis/validator/impl/ValidatorServiceImpl.java @@ -1,18 +1,18 @@ -package com.metis.flow.validator.impl; +package com.metis.validator.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.metis.flow.domain.bo.BuildApp; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Graph; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.enums.EdgeType; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.*; -import com.metis.flow.validator.factory.EdgeValidatorFactory; -import com.metis.flow.validator.factory.NodeValidatorFactory; +import com.metis.domain.bo.BuildApp; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Graph; +import com.metis.domain.entity.base.Node; +import com.metis.enums.EdgeType; +import com.metis.enums.NodeType; +import com.metis.validator.*; +import com.metis.validator.factory.EdgeValidatorFactory; +import com.metis.validator.factory.NodeValidatorFactory; import com.metis.utils.GenericInterfacesUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/impl/edge/DefaultEdgeValidator.java b/metis-starter/src/main/java/com/metis/validator/impl/edge/DefaultEdgeValidator.java similarity index 61% rename from metis-starter/src/main/java/com/metis/flow/validator/impl/edge/DefaultEdgeValidator.java rename to metis-starter/src/main/java/com/metis/validator/impl/edge/DefaultEdgeValidator.java index 3012647..086d98e 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/impl/edge/DefaultEdgeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/impl/edge/DefaultEdgeValidator.java @@ -1,9 +1,9 @@ -package com.metis.flow.validator.impl.edge; +package com.metis.validator.impl.edge; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.enums.EdgeType; -import com.metis.flow.validator.EdgeValidator; -import com.metis.flow.validator.ValidatorResult; +import com.metis.domain.entity.base.Edge; +import com.metis.enums.EdgeType; +import com.metis.validator.EdgeValidator; +import com.metis.validator.ValidatorResult; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/DocumentExtractorNodeValidator.java b/metis-starter/src/main/java/com/metis/validator/impl/node/DocumentExtractorNodeValidator.java similarity index 73% rename from metis-starter/src/main/java/com/metis/flow/validator/impl/node/DocumentExtractorNodeValidator.java rename to metis-starter/src/main/java/com/metis/validator/impl/node/DocumentExtractorNodeValidator.java index b9187cc..7fd2ca8 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/DocumentExtractorNodeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/impl/node/DocumentExtractorNodeValidator.java @@ -1,13 +1,13 @@ -package com.metis.flow.validator.impl.node; +package com.metis.validator.impl.node; import cn.hutool.core.lang.Assert; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.config.node.DocumentExtractorNodeConfig; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.NodeValidator; -import com.metis.flow.validator.ValidatorCodeService; -import com.metis.flow.validator.ValidatorResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.config.node.DocumentExtractorNodeConfig; +import com.metis.enums.NodeType; +import com.metis.validator.NodeValidator; +import com.metis.validator.ValidatorCodeService; +import com.metis.validator.ValidatorResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/EndNodeValidator.java b/metis-starter/src/main/java/com/metis/validator/impl/node/EndNodeValidator.java similarity index 75% rename from metis-starter/src/main/java/com/metis/flow/validator/impl/node/EndNodeValidator.java rename to metis-starter/src/main/java/com/metis/validator/impl/node/EndNodeValidator.java index 8ba8281..f1eb8c1 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/EndNodeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/impl/node/EndNodeValidator.java @@ -1,12 +1,12 @@ -package com.metis.flow.validator.impl.node; +package com.metis.validator.impl.node; import cn.hutool.core.lang.Assert; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.config.node.EndNodeConfig; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.NodeValidator; -import com.metis.flow.validator.ValidatorResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.config.node.EndNodeConfig; +import com.metis.enums.NodeType; +import com.metis.validator.NodeValidator; +import com.metis.validator.ValidatorResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/StartNodeValidator.java b/metis-starter/src/main/java/com/metis/validator/impl/node/StartNodeValidator.java similarity index 88% rename from metis-starter/src/main/java/com/metis/flow/validator/impl/node/StartNodeValidator.java rename to metis-starter/src/main/java/com/metis/validator/impl/node/StartNodeValidator.java index d2fbee7..62d39e5 100644 --- a/metis-starter/src/main/java/com/metis/flow/validator/impl/node/StartNodeValidator.java +++ b/metis-starter/src/main/java/com/metis/validator/impl/node/StartNodeValidator.java @@ -1,16 +1,16 @@ -package com.metis.flow.validator.impl.node; +package com.metis.validator.impl.node; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import com.metis.flow.domain.entity.base.Edge; -import com.metis.flow.domain.entity.base.Node; -import com.metis.flow.domain.entity.base.NodeVariable; -import com.metis.flow.domain.entity.config.node.StartNodeConfig; -import com.metis.flow.enums.NodeType; -import com.metis.flow.validator.NodeValidator; -import com.metis.flow.validator.ValidatorCodeService; -import com.metis.flow.validator.ValidatorResult; +import com.metis.domain.entity.base.Edge; +import com.metis.domain.entity.base.Node; +import com.metis.domain.entity.base.NodeVariable; +import com.metis.domain.entity.config.node.StartNodeConfig; +import com.metis.enums.NodeType; +import com.metis.validator.NodeValidator; +import com.metis.validator.ValidatorCodeService; +import com.metis.validator.ValidatorResult; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/pom.xml b/pom.xml index 183d12b..299c6b8 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,9 @@ 17 UTF-8 3.3.4 - 2.0.45 + 2.0.56 1.18.34 + 1.6.2 1.2.3 1.0.0-beta2 3.5.8 @@ -41,77 +42,60 @@ pom import + + dev.langchain4j + langchain4j-open-ai + ${langchain4j.version} + + + dev.langchain4j + langchain4j-mcp + 1.0.0-beta2 + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson.version} + + + com.mikesamuel + json-sanitizer + ${sanitizer.version} + + + com.baomidou + mybatis-plus-spring-boot3-starter + ${mybatis-plus.version} + + + mysql + mysql-connector-java + 8.0.33 + + + cn.hutool + hutool-all + 5.8.24 + + + + org.mapstruct + mapstruct + ${org.mapstruct.version} + + + org.projectlombok + lombok-mapstruct-binding + 0.2.0 + + + org.springdoc + springdoc-openapi-starter-webmvc-api + 2.2.0 + - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-validation - - - dev.langchain4j - langchain4j-open-ai - ${langchain4j.version} - - - dev.langchain4j - langchain4j-mcp - 1.0.0-beta2 - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - - org.projectlombok - lombok - - - com.mikesamuel - json-sanitizer - ${sanitizer.version} - - - com.baomidou - mybatis-plus-spring-boot3-starter - ${mybatis-plus.version} - - - mysql - mysql-connector-java - 8.0.33 - - - cn.hutool - hutool-all - 5.8.24 - - - org.mapstruct - mapstruct - 1.6.2 - - - org.projectlombok - lombok-mapstruct-binding - 0.2.0 - - - org.springdoc - springdoc-openapi-starter-webmvc-api - 2.2.0 - - - com.github.xiaoymin - knife4j-openapi3-jakarta-spring-boot-starter - 4.4.0 - - + \ No newline at end of file