- 移除旧版前端页面

- 修复「副本数显示异常」fixed #50

Author: dushixiang

Dockerfile

@@ -1,21 +1,52 @@
 #
 # Build stage
 #
-FROM maven:3.6.0-jdk-11-slim AS build
+FROM node:16 AS front-build
+
+WORKDIR /app
+
+COPY web .
+
+RUN yarn && yarn build
+
+FROM maven:3.8.7-amazoncorretto-17 AS build
 
 WORKDIR /app
 
 COPY src src
 COPY pom.xml pom.xml
 COPY LICENSE LICENSE
+COPY --from=front-build /app/dist src/main/resources/static
 
 RUN mvn -f pom.xml clean package -Dmaven.test.skip=true
 
 
+# base image to build a JRE
+FROM amazoncorretto:17.0.6-alpine as corretto-jdk
+
+# required for strip-debug to work
+RUN apk add --no-cache binutils
+
+# Build small JRE image
+RUN $JAVA_HOME/bin/jlink \
+         --verbose \
+         --add-modules ALL-MODULE-PATH \
+         --strip-debug \
+         --no-man-pages \
+         --no-header-files \
+         --compress=2 \
+         --output /customjre
+
 #
 # Package stage
 #
-FROM openjdk:11-jre-slim
+FROM alpine:latest
+
+ENV JAVA_HOME=/jre
+ENV PATH="${JAVA_HOME}/bin:${PATH}"
+
+# copy JRE from the base image
+COPY --from=corretto-jdk /customjre $JAVA_HOME
 
 ENV SERVER_PORT 8080
 ENV DEFAULT_USERNAME admin
@@ -28,4 +59,4 @@ COPY --from=build /app/LICENSE LICENSE
 
 EXPOSE $SERVER_PORT
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/usr/local/kafka-map/kafka-map.jar", "--server.port=${SERVER_PORT}", "--default.username=${DEFAULT_USERNAME}", "--default.password=${DEFAULT_PASSWORD}"]
+ENTRYPOINT ["/jre/bin/java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/usr/local/kafka-map/kafka-map.jar", "--server.port=${SERVER_PORT}", "--default.username=${DEFAULT_USERNAME}", "--default.password=${DEFAULT_PASSWORD}"]

build.sh

@@ -0,0 +1,10 @@
+cd web
+yarn && yarn build | exit
+mv dist ../src/main/resources/static
+
+echo "build frontend success"
+
+cd ../
+mvn -f pom.xml clean package -Dmaven.test.skip=true | exit
+
+echo "build kafka-map success"

graalvm/reflect-config.json

@@ -26,5 +26,9 @@
   {
     "name": "com.github.benmanes.caffeine.cache.PSAMS",
     "allDeclaredConstructors": true
+  },
+  {
+    "name": "org.hibernate.community.dialect.SQLiteDialect",
+    "allDeclaredConstructors": true
   }
 ]

pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.0</version>
+        <version>3.0.1</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -35,6 +35,7 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/cn/typesafe/km/service/TopicService.java

@@ -7,9 +7,11 @@
 import org.apache.kafka.common.*;
 import org.apache.kafka.common.config.ConfigResource;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import jakarta.annotation.Resource;
+
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
@@ -59,6 +61,10 @@ public List<Topic> topics(String clusterId, Set<String> topicNames) throws Inter
                     topic.setPartitionsCount(e.getValue().partitions().size());
                     topic.setTotalLogSize(0L);
                     topic.setReplicaCount(0);
+                    List<TopicPartitionInfo> partitions = e.getValue().partitions();
+                    if (!CollectionUtils.isEmpty(partitions)) {
+                        topic.setReplicaCount(partitions.get(0).replicas().size());
+                    }
                     return topic;
                 })
                 .collect(Collectors.toList());
@@ -85,7 +91,6 @@ public List<Topic> topics(String clusterId, Set<String> topicNames) throws Inter
                             }
                             ReplicaInfo replicaInfo = replicaInfoEntry.getValue();
                             long size = replicaInfo.size();
-                            topic.setReplicaCount(topic.getReplicaCount() + 1);
                             topic.setTotalLogSize(topic.getTotalLogSize() + size);
                         }
                     }
@@ -99,17 +104,18 @@ public List<Topic> topics(String clusterId, Set<String> topicNames) throws Inter
     public TopicInfo info(String clusterId, String topicName) throws ExecutionException, InterruptedException {
         AdminClient adminClient = clusterService.getAdminClient(clusterId);
         try (KafkaConsumer<String, String> kafkaConsumer = clusterService.createConsumer(clusterId)) {
-            TopicDescription topicDescription = adminClient.describeTopics(Collections.singletonList(topicName)).all().get().get(topicName);
+            TopicDescription topicDescription = adminClient.describeTopics(Collections.singletonList(topicName)).allTopicNames().get().get(topicName);
             TopicInfo topicInfo = new TopicInfo();
             topicInfo.setClusterId(clusterId);
             topicInfo.setName(topicName);
 
             List<TopicPartitionInfo> partitionInfos = topicDescription.partitions();
-            int replicaCount = 0;
-            for (TopicPartitionInfo topicPartitionInfo : partitionInfos) {
-                replicaCount += topicPartitionInfo.replicas().size();
+            if (!CollectionUtils.isEmpty(partitionInfos)) {
+                int replicaCount = partitionInfos.get(0).replicas().size();
+                topicInfo.setReplicaCount(replicaCount);
+            } else {
+                topicInfo.setReplicaCount(0);
             }
-            topicInfo.setReplicaCount(replicaCount);
 
             List<TopicPartition> topicPartitions = partitionInfos.stream().map(x -> new TopicPartition(topicName, x.partition())).collect(Collectors.toList());
             Map<TopicPartition, Long> beginningOffsets = kafkaConsumer.beginningOffsets(topicPartitions);
@@ -293,7 +299,7 @@ public void setConfigs(String topic, String clusterId, Map<String, String> confi
         adminClient.incrementalAlterConfigs(data).all().get();
     }
 
-    public void deleteDelayMessageTopics(String clusterId){
+    public void deleteDelayMessageTopics(String clusterId) {
         List<String> topics = List.of(
                 "delay-message",
                 "__delay-seconds-1",

src/main/resources/application.yml

@@ -9,6 +9,10 @@ spring:
     properties:
       hibernate:
         dialect: org.hibernate.community.dialect.SQLiteDialect
+    defer-datasource-initialization: true
+  sql:
+    init:
+      mode: always
 server:
   port: 8080