diff --git a/backend/mci-server/Dockerfile b/backend/mci-server/Dockerfile index 600383d..2e14e54 100644 --- a/backend/mci-server/Dockerfile +++ b/backend/mci-server/Dockerfile @@ -1,26 +1,10 @@ -FROM maven:3.9-eclipse-temurin-21-alpine AS builder - -WORKDIR /app -COPY pom.xml ./pom.xml -COPY mci-shared ./mci-shared -COPY mci-channel-common ./mci-channel-common -COPY mci-channel-wecom/pom.xml ./mci-channel-wecom/pom.xml -COPY mci-channel-wecom/src ./mci-channel-wecom/src -COPY mci-server/pom.xml ./mci-server/pom.xml -COPY mci-server/src ./mci-server/src - -RUN mvn -N install && \ - mvn -f mci-shared/pom.xml install -DskipTests && \ - mvn -f mci-channel-common/pom.xml install -DskipTests && \ - mvn -f mci-channel-wecom/pom.xml install -DskipTests && \ - mvn -f mci-server/pom.xml package -DskipTests - +# syntax=docker/dockerfile:1 FROM eclipse-temurin:21-jre-alpine RUN apk add --no-cache curl WORKDIR /app -COPY --from=builder /app/mci-server/target/*.jar app.jar +COPY target/*.jar app.jar EXPOSE 8080 ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/backend/mci-server/src/main/java/com/sino/mci/policy/dto/CreatePolicyGroupRequest.java b/backend/mci-server/src/main/java/com/sino/mci/policy/dto/CreatePolicyGroupRequest.java index a3e697f..a84cc5d 100644 --- a/backend/mci-server/src/main/java/com/sino/mci/policy/dto/CreatePolicyGroupRequest.java +++ b/backend/mci-server/src/main/java/com/sino/mci/policy/dto/CreatePolicyGroupRequest.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.util.List; import java.util.Map; @Data @@ -18,5 +19,5 @@ public class CreatePolicyGroupRequest { private String channelType; @NotNull - private Map policies; + private List> policies; } diff --git a/backend/mci-server/src/main/java/com/sino/mci/policy/dto/UpdatePolicyGroupRequest.java b/backend/mci-server/src/main/java/com/sino/mci/policy/dto/UpdatePolicyGroupRequest.java index b3205df..7ac6333 100644 --- a/backend/mci-server/src/main/java/com/sino/mci/policy/dto/UpdatePolicyGroupRequest.java +++ b/backend/mci-server/src/main/java/com/sino/mci/policy/dto/UpdatePolicyGroupRequest.java @@ -4,6 +4,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.util.List; import java.util.Map; @Data @@ -15,5 +16,5 @@ public class UpdatePolicyGroupRequest { private String channelType; @NotNull - private Map policies; + private List> policies; } diff --git a/docker-compose.yml b/docker-compose.yml index 90e36aa..32840e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,8 +70,8 @@ services: mci-server: build: - context: ./backend - dockerfile: mci-server/Dockerfile + context: ./backend/mci-server + dockerfile: Dockerfile container_name: mci-server profiles: ["app"] ports: