fix: searchdropdown新增空state、

修改主页各section间距

.env.example

@@ -80,26 +80,39 @@ WEBPUSH_PRIVATE_KEY=
 LOG_LEVEL=INFO
 
 # === Frontend (Nuxt) ===
-
+# 本地开发
 NUXT_PUBLIC_API_BASE_URL=http://localhost:8080
+# 线上环境
 # NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
+# 测试环境
 # NUXT_PUBLIC_API_BASE_URL=https://www.staging.open-isle.com
 
+# 本地开发
 NUXT_PUBLIC_WEBSOCKET_URL=http://localhost:8082
-# NUXT_PUBLIC_WEBSOCKET_URL=https://www.open-isle.com
-# NUXT_PUBLIC_WEBSOCKET_URL=https://www.staging.open-isle.com
+# 线上环境
+# NUXT_PUBLIC_WEBSOCKET_URL=https://www.open-isle.com/websocket
+# 测试环境 
+# NUXT_PUBLIC_WEBSOCKET_URL=https://www.staging.open-isle.com/websocket
 
+# 本地开发
 NUXT_PUBLIC_WEBSITE_BASE_URL=http://localhost:3000
-# 线上 & 本地均可使用
+# 线上 & 测试 (www.staging.open-isle.com) & 本地均可使用
 NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
 # 线上
 NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ
+# 测试环境 (www.staging.open-isle.com)
+# NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23li6GHPxx4MwipWnM
 # 本地
 # NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liOlrZnPKRF7s7NN
+
 # 线上 & 本地均可使用
 NUXT_PUBLIC_DISCORD_CLIENT_ID=1394985417044000779
+
 # 线上 & 本地均可使用
 NUXT_PUBLIC_TWITTER_CLIENT_ID=ZTRTU05KSk9KTTJrTTdrVC1tc1E6MTpjaQ
+
 # 线上
 NUXT_PUBLIC_TELEGRAM_BOT_ID=8450237135
+# 测试环境 (www.staging.open-isle.com)
+# NUXT_PUBLIC_TELEGRAM_BOT_ID=7832207011
 

backend/src/main/java/com/openisle/controller/CommentController.java

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -131,6 +132,7 @@ public class CommentController {
             c.getId(),
             "comment",
             c.getCreatedAt(),
+            c.getPinnedAt(),
             c // payload 是 CommentDto
           )
         )
@@ -145,17 +147,39 @@ public class CommentController {
             l.getId(),
             "log",
             l.getTime(), // 注意字段名不一样
+            null,
             l // payload 是 PostChangeLogDto
           )
         )
         .toList()
     );
     // 排序
-    Comparator<TimelineItemDto<?>> comparator = Comparator.comparing(TimelineItemDto::getCreatedAt);
+    Comparator<TimelineItemDto<?>> pinnedOrderComparator = (a, b) -> {
+      LocalDateTime aPinned = a.getPinnedAt();
+      LocalDateTime bPinned = b.getPinnedAt();
+      if (aPinned == null && bPinned == null) {
+        return 0;
+      }
+      if (aPinned == null) {
+        return 1;
+      }
+      if (bPinned == null) {
+        return -1;
+      }
+      return bPinned.compareTo(aPinned);
+    };
+
+    Comparator<TimelineItemDto<?>> comparator = Comparator.<TimelineItemDto<?>, Boolean>comparing(
+      item -> item.getPinnedAt() == null
+    ).thenComparing(pinnedOrderComparator);
+
+    Comparator<TimelineItemDto<?>> createdAtComparator = Comparator.comparing(
+      TimelineItemDto::getCreatedAt
+    );
     if (CommentSort.NEWEST.equals(sort)) {
-      comparator = comparator.reversed();
+      createdAtComparator = createdAtComparator.reversed();
     }
-    itemDtoList.sort(comparator);
+    itemDtoList.sort(comparator.thenComparing(createdAtComparator));
     log.debug("listComments returning {} comments", itemDtoList.size());
     return itemDtoList;
   }

backend/src/main/java/com/openisle/dto/TimelineItemDto.java

@@ -15,5 +15,6 @@ public class TimelineItemDto<T> {
   private Long id;
   private String kind; // "comment" | "log"
   private LocalDateTime createdAt;
+  private LocalDateTime pinnedAt;
   private T payload; // 泛型，具体类型由外部决定
 }

docker/docker-compose.yaml

@@ -226,6 +226,8 @@ services:
       websocket-service:
         condition: service_healthy
     restart: unless-stopped
+    profiles: ["staging", "prod"]
+
 
   loopback_8080:
     image: alpine/socat

frontend_nuxt/components/Dropdown.vue

@@ -49,7 +49,11 @@
       </slot>
     </div>
     <div
-      v-if="open && !isMobile && (loading || filteredOptions.length > 0 || showSearch)"
+      v-if="
+        open &&
+        !isMobile &&
+        (loading || filteredOptions.length > 0 || showSearch || (remote && search))
+      "
       :class="['dropdown-menu', menuClass]"
       v-click-outside="close"
       ref="menuRef"
@@ -62,26 +66,29 @@
         <l-hatch size="20" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
       </div>
       <template v-else>
-        <div
-          v-for="o in filteredOptions"
-          :key="o.id"
-          @click="select(o.id)"
-          :class="['dropdown-option', optionClass, { selected: isSelected(o.id) }]"
-        >
-          <slot name="option" :option="o" :isSelected="isSelected(o.id)">
-            <template v-if="o.icon">
-              <BaseImage
-                v-if="isImageIcon(o.icon)"
-                :src="o.icon"
-                class="option-icon"
-                :alt="o.name"
-              />
-              <component v-else :is="o.icon" class="option-icon" :size="16" />
-            </template>
-            <span>{{ o.name }}</span>
-          </slot>
-        </div>
-        <slot name="footer" :close="close" :loading="loading" />
+        <div v-if="filteredOptions.length === 0" class="dropdown-empty">没有搜索结果</div>
+        <template v-else>
+          <div
+            v-for="o in filteredOptions"
+            :key="o.id"
+            @click="select(o.id)"
+            :class="['dropdown-option', optionClass, { selected: isSelected(o.id) }]"
+          >
+            <slot name="option" :option="o" :isSelected="isSelected(o.id)">
+              <template v-if="o.icon">
+                <BaseImage
+                  v-if="isImageIcon(o.icon)"
+                  :src="o.icon"
+                  class="option-icon"
+                  :alt="o.name"
+                />
+                <component v-else :is="o.icon" class="option-icon" :size="16" />
+              </template>
+              <span>{{ o.name }}</span>
+            </slot>
+          </div>
+          <slot name="footer" :close="close" :loading="loading" />
+        </template>
       </template>
     </div>
     <Teleport to="body">
@@ -99,26 +106,29 @@
             <l-hatch size="20" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
           </div>
           <template v-else>
-            <div
-              v-for="o in filteredOptions"
-              :key="o.id"
-              @click="select(o.id)"
-              :class="['dropdown-option', optionClass, { selected: isSelected(o.id) }]"
-            >
-              <slot name="option" :option="o" :isSelected="isSelected(o.id)">
-                <template v-if="o.icon">
-                  <BaseImage
-                    v-if="isImageIcon(o.icon)"
-                    :src="o.icon"
-                    class="option-icon"
-                    :alt="o.name"
-                  />
-                  <component v-else :is="o.icon" class="option-icon" :size="16" />
-                </template>
-                <span>{{ o.name }}</span>
-              </slot>
-            </div>
-            <slot name="footer" :close="close" :loading="loading" />
+            <div v-if="filteredOptions.length === 0" class="dropdown-empty">没有搜索结果</div>
+            <template v-else>
+              <div
+                v-for="o in filteredOptions"
+                :key="o.id"
+                @click="select(o.id)"
+                :class="['dropdown-option', optionClass, { selected: isSelected(o.id) }]"
+              >
+                <slot name="option" :option="o" :isSelected="isSelected(o.id)">
+                  <template v-if="o.icon">
+                    <BaseImage
+                      v-if="isImageIcon(o.icon)"
+                      :src="o.icon"
+                      class="option-icon"
+                      :alt="o.name"
+                    />
+                    <component v-else :is="o.icon" class="option-icon" :size="16" />
+                  </template>
+                  <span>{{ o.name }}</span>
+                </slot>
+              </div>
+              <slot name="footer" :close="close" :loading="loading" />
+            </template>
           </template>
         </div>
       </div>
@@ -283,6 +293,7 @@ export default {
       isImageIcon,
       setSearch,
       isMobile,
+      remote: props.remote,
     }
   },
 }
@@ -384,6 +395,13 @@ export default {
   padding: 10px 0;
 }
 
+.dropdown-empty {
+  padding: 20px;
+  text-align: center;
+  color: var(--muted-text-color, #8c8c8c);
+  font-size: 14px;
+}
+
 .dropdown-mobile-page {
   position: fixed;
   top: 0;

frontend_nuxt/pages/users/[id].vue

@@ -849,7 +849,8 @@ watch(selectedTab, async (val) => {
   display: flex;
   flex-direction: column;
   padding: 20px;
-  gap: 20px;
+  row-gap: 40px;     /* 行间距 */
+  column-gap: 20px;  /* 列间距 */
 }
 
 .summary-title {
@@ -888,10 +889,10 @@ watch(selectedTab, async (val) => {
 }
 
 .summary-divider {
-  margin-top: 20px;
   display: flex;
   flex-direction: row;
-  gap: 20px;
+  row-gap: 40px;     /* 行间距 */
+  column-gap: 20px;  /* 列间距 */
   width: 100%;
   flex-wrap: wrap;
 }

nginx/openisle

@@ -18,51 +18,6 @@ server {
         add_header X-Upstream $upstream_addr always;
     }
 
-    location ^~ /api/ws {
-        proxy_pass         http://127.0.0.1:8080;
-        proxy_http_version 1.1;
-
-        # 升级所需
-        proxy_set_header   Upgrade              $http_upgrade;
-        proxy_set_header   Connection           $connection_upgrade;
-
-        # 统一透传这些头（你在 /api/ 有，/api/ws 也要有）
-        proxy_set_header   Host                 $host;
-        proxy_set_header   X-Real-IP            $remote_addr;
-        proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Proto    $scheme;
-        proxy_set_header   X-Forwarded-Host     $host;
-
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_buffering    off;
-        proxy_cache        off;
-    }
-
-    # 2) SockJS（包含 /info、/iframe.html、/.../websocket 等）
-    location ^~ /api/sockjs {
-        proxy_pass         http://127.0.0.1:8080;
-        proxy_http_version 1.1;
-
-        proxy_set_header   Upgrade              $http_upgrade;
-        proxy_set_header   Connection           $connection_upgrade;
-
-        proxy_set_header   Host                 $host;
-        proxy_set_header   X-Real-IP            $remote_addr;
-        proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
-        proxy_set_header   X-Forwarded-Proto    $scheme;
-        proxy_set_header   X-Forwarded-Host     $host;
-
-        proxy_read_timeout 300s;
-        proxy_send_timeout 300s;
-        proxy_buffering    off;
-        proxy_cache        off;
-
-        # 如要同源 iframe 回退，下面两行二选一（或者交给 Spring Security 的 sameOrigin）
-        # proxy_hide_header  X-Frame-Options;
-        # add_header         X-Frame-Options "SAMEORIGIN" always;
-    }
-
     location /api/ {
         proxy_pass http://127.0.0.1:8080/api/;
         proxy_http_version 1.1;
@@ -148,7 +103,7 @@ server {
 
     # ---------- WEBSOCKET GATEWAY TO :8082 ----------
     location ^~ /websocket/ {
-        proxy_pass         http://127.0.0.1:8082/; 
+        proxy_pass         http://127.0.0.1:8084/; 
         proxy_http_version 1.1;
 
         proxy_set_header   Upgrade              $http_upgrade;
@@ -167,6 +122,7 @@ server {
         add_header         Cache-Control "no-store" always;
     }
 }
+
 server {
     listen 80;
     server_name open-isle.com www.open-isle.com;