diff --git a/src/main/java/com/xuxd/kafka/console/service/impl/MessageServiceImpl.java b/src/main/java/com/xuxd/kafka/console/service/impl/MessageServiceImpl.java
index 82a0052..1240e29 100644
--- a/src/main/java/com/xuxd/kafka/console/service/impl/MessageServiceImpl.java
+++ b/src/main/java/com/xuxd/kafka/console/service/impl/MessageServiceImpl.java
@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 import kafka.console.ConsumerConsole;
 import kafka.console.MessageConsole;
 import kafka.console.TopicConsole;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.kafka.clients.admin.TopicDescription;
@@ -40,6 +41,7 @@ import org.springframework.stereotype.Service;
  * @author xuxd
  * @date 2021-12-11 09:43:44
  **/
+@Slf4j
 @Service
 public class MessageServiceImpl implements MessageService, ApplicationContextAware {
 
@@ -69,7 +71,9 @@ public class MessageServiceImpl implements MessageService, ApplicationContextAwa
         int maxNums = 10000;
 
         Set<TopicPartition> partitions = getPartitions(queryMessage);
+        long startTime = System.currentTimeMillis();
         List<ConsumerRecord<byte[], byte[]>> records = messageConsole.searchBy(partitions, queryMessage.getStartTime(), queryMessage.getEndTime(), maxNums);
+        log.info("search message by time, cost time: {}", (System.currentTimeMillis() - startTime));
         List<ConsumerRecordVO> vos = records.stream().filter(record -> record.timestamp() <= queryMessage.getEndTime())
             .map(ConsumerRecordVO::fromConsumerRecord).collect(Collectors.toList());
         Map<String, Object> res = new HashMap<>();
diff --git a/src/main/scala/kafka/console/MessageConsole.scala b/src/main/scala/kafka/console/MessageConsole.scala
index 6f1c937..324f87b 100644
--- a/src/main/scala/kafka/console/MessageConsole.scala
+++ b/src/main/scala/kafka/console/MessageConsole.scala
@@ -55,25 +55,26 @@ class MessageConsole(config: KafkaConfig) extends KafkaConsole(config: KafkaConf
                     } else {
                         val records = consumer.poll(Duration.ofMillis(timeoutMs))
 
-                        for ((tp, endOff) <- endOffTable) {
-                            if (!terminate) {
-                                val recordList = records.records(tp)
-                                if (recordList.isEmpty) {
-                                    arrive.remove(tp)
-                                } else {
-                                    val first = recordList.get(0)
-                                    if (first.offset() >= endOff) {
-                                        arrive.remove(tp)
-                                    } else {
-                                        res.addAll(recordList)
-                                        if (recordList.get(recordList.size() - 1).offset() >= endOff) {
+                        if (records.isEmpty) {
+                            terminate = true
+                        } else {
+                            for ((tp, endOff) <- endOffTable) {
+                                if (!terminate) {
+                                    val recordList = records.records(tp)
+                                    if (!recordList.isEmpty) {
+                                        val first = recordList.get(0)
+                                        if (first.offset() >= endOff) {
                                             arrive.remove(tp)
+                                        } else {
+                                            res.addAll(recordList)
+                                            if (recordList.get(recordList.size() - 1).offset() >= endOff) {
+                                                arrive.remove(tp)
+                                            }
                                         }
                                     }
-                                }
-
-                                if (arrive.isEmpty) {
-                                    terminate = true;
+                                    if (arrive.isEmpty) {
+                                        terminate = true;
+                                    }
                                 }
                             }
                         }
diff --git a/ui/src/utils/request.js b/ui/src/utils/request.js
index 27b6755..0af83fa 100644
--- a/ui/src/utils/request.js
+++ b/ui/src/utils/request.js
@@ -6,7 +6,7 @@ import { VueAxios } from "./axios";
 const request = axios.create({
   // API 请求的默认前缀
   baseURL: process.env.VUE_APP_API_BASE_URL,
-  timeout: 30000, // 请求超时时间
+  timeout: 120000, // 请求超时时间
 });
 
 // 异常拦截处理器
diff --git a/ui/src/views/message/MessageDetail.vue b/ui/src/views/message/MessageDetail.vue
index 6852bb0..74eca06 100644
--- a/ui/src/views/message/MessageDetail.vue
+++ b/ui/src/views/message/MessageDetail.vue
@@ -150,7 +150,7 @@ export default {
   },
   methods: {
     getMessageDetail() {
-      this.loading = false;
+      this.loading = true;
       const params = Object.assign({}, this.record, {
         keyDeserializer: this.keyDeserializer,
         valueDeserializer: this.valueDeserializer,
diff --git a/ui/src/views/message/SearchByOffset.vue b/ui/src/views/message/SearchByOffset.vue
index ab13e12..9b36cbf 100644
--- a/ui/src/views/message/SearchByOffset.vue
+++ b/ui/src/views/message/SearchByOffset.vue
@@ -8,10 +8,10 @@
           @submit="handleSearch"
         >
           <a-row :gutter="24">
-            <a-col :span="6">
+            <a-col :span="9">
               <a-form-item label="topic">
                 <a-select
-                  class="type-select"
+                  class="topic-select"
                   @change="handleTopicChange"
                   show-search
                   option-filter-prop="children"
@@ -44,7 +44,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="10">
+            <a-col :span="7">
               <a-form-item label="偏移">
                 <a-input
                   v-decorator="[
@@ -185,7 +185,9 @@ const defaultData = [];
   text-align: center;
   padding-top: 80px;
 }
-
+.topic-select {
+  width: 400px !important;
+}
 .type-select {
   width: 200px !important;
 }
diff --git a/ui/src/views/message/SearchByTime.vue b/ui/src/views/message/SearchByTime.vue
index 1a7f12b..c825968 100644
--- a/ui/src/views/message/SearchByTime.vue
+++ b/ui/src/views/message/SearchByTime.vue
@@ -8,10 +8,10 @@
           @submit="handleSearch"
         >
           <a-row :gutter="24">
-            <a-col :span="6">
+            <a-col :span="9">
               <a-form-item label="topic">
                 <a-select
-                  class="type-select"
+                  class="topic-select"
                   @change="handleTopicChange"
                   show-search
                   option-filter-prop="children"
@@ -29,7 +29,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="6">
+            <a-col :span="5">
               <a-form-item label="分区">
                 <a-select
                   class="type-select"
@@ -44,7 +44,7 @@
                 </a-select>
               </a-form-item>
             </a-col>
-            <a-col :span="10">
+            <a-col :span="8">
               <a-form-item label="时间">
                 <a-range-picker
                   v-decorator="['time', rangeConfig]"
@@ -190,8 +190,11 @@ const defaultData = { realNum: 0, maxNum: 0 };
   text-align: center;
   padding-top: 80px;
 }
+.topic-select {
+  width: 400px !important;
+}
 
 .type-select {
-  width: 200px !important;
+  width: 150px !important;
 }
 </style>