fix: 频道聊天，点击写个回复没反应，点击小箭头才行 #916

Article UI fixes

backend/src/main/java/com/openisle/config/CachingConfig.java

@@ -22,6 +22,8 @@ import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Redis 缓存配置类
@@ -80,13 +82,16 @@ public class CachingConfig {
                 .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
                 .disableCachingNullValues(); // 禁止缓存 null 值
-//        个别缓存单独设置TTL时间
-//        Map<String, RedisCacheConfiguration> cacheConfigs = new HashMap<>();
-//        cacheConfigs.put("openisle_tags", RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ZERO));
-//        cacheConfigs.put("openisle_categories", RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ZERO));
+
+        // 个别缓存单独设置 TTL 时间
+        Map<String, RedisCacheConfiguration> cacheConfigs = new HashMap<>();
+        RedisCacheConfiguration oneHourConfig = config.entryTtl(Duration.ofHours(1));
+        cacheConfigs.put(TAG_CACHE_NAME, oneHourConfig);
+        cacheConfigs.put(CATEGORY_CACHE_NAME, oneHourConfig);
 
         return RedisCacheManager.builder(connectionFactory)
                 .cacheDefaults(config)
+                .withInitialCacheConfigurations(cacheConfigs)
                 .build();
     }
 

backend/src/main/java/com/openisle/repository/PointHistoryRepository.java

@@ -10,6 +10,7 @@ import java.util.List;
 
 public interface PointHistoryRepository extends JpaRepository<PointHistory, Long> {
     List<PointHistory> findByUserOrderByIdDesc(User user);
+    List<PointHistory> findByUserOrderByIdAsc(User user);
     long countByUser(User user);
 
     List<PointHistory> findByUserAndCreatedAtAfterOrderByCreatedAtDesc(User user, LocalDateTime createdAt);

backend/src/main/java/com/openisle/service/PointService.java

@@ -225,17 +225,20 @@ public class PointService {
      */
     public int recalculateUserPoints(User user) {
         // 获取用户所有的积分历史记录（由于@Where注解，已删除的记录会被自动过滤）
-        List<PointHistory> histories = pointHistoryRepository.findByUserOrderByIdDesc(user);
-        
+        List<PointHistory> histories = pointHistoryRepository.findByUserOrderByIdAsc(user);
+
         int totalPoints = 0;
         for (PointHistory history : histories) {
             totalPoints += history.getAmount();
+            // 重新计算每条历史记录的余额
+            history.setBalance(totalPoints);
         }
-        
-        // 更新用户积分
+
+        // 批量更新历史记录及用户积分
+        pointHistoryRepository.saveAll(histories);
         user.setPoint(totalPoints);
         userRepository.save(user);
-        
+
         return totalPoints;
     }
 

backend/src/main/java/com/openisle/service/UsernameValidator.java

@@ -1,6 +1,7 @@
 package com.openisle.service;
 
 import com.openisle.exception.FieldException;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +18,11 @@ public class UsernameValidator {
         if (username == null || username.isEmpty()) {
             throw new FieldException("username", "Username cannot be empty");
         }
+
+        if (NumberUtils.isDigits(username)) {
+            throw new FieldException("username", "Username cannot be pure number");
+        }
     }
+
 }
 

backend/src/main/resources/application.properties

@@ -12,7 +12,7 @@ spring.jpa.hibernate.ddl-auto=update
 # for redis
 spring.data.redis.host=${REDIS_HOST:localhost}
 spring.data.redis.port=${REDIS_PORT:6379}
-spring.data.redis.database=0
+spring.data.redis.database=${REDIS_DATABASE:0}
 
 # for jwt
 app.jwt.secret=${JWT_SECRET:jwt_sec}
@@ -56,9 +56,10 @@ app.captcha.comment-enabled=${CAPTCHA_COMMENT_ENABLED:false}
 # ========= Optional =========
 # for resend email send service, you can improve your service by yourself
 resend.api.key=${RESEND_API_KEY:}
-resend.from.email=${RESEND.FROM.EMAIL}
+resend.from.email=${RESEND_FROM_EMAIL:}
 # your email services: ...
 
+
 # for tencent cloud image upload service, you can improve your service by yourself
 cos.base-url=${:https://example.com}
 cos.secret-id=${COS_SECRET_ID:}

backend/src/test/java/com/openisle/service/PointServiceRecalculateUserPointsTest.java

@@ -0,0 +1,67 @@
+package com.openisle.service;
+
+import com.openisle.model.PointHistory;
+import com.openisle.model.PointHistoryType;
+import com.openisle.model.Role;
+import com.openisle.model.User;
+import com.openisle.repository.PointHistoryRepository;
+import com.openisle.repository.UserRepository;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.context.annotation.Import;
+
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DataJpaTest
+@Import(PointService.class)
+class PointServiceRecalculateUserPointsTest {
+
+    @Autowired
+    private PointService pointService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private PointHistoryRepository pointHistoryRepository;
+
+    @Test
+    void recalculatesBalanceAfterDeletion() {
+        User user = new User();
+        user.setUsername("u");
+        user.setEmail("u@example.com");
+        user.setPassword("p");
+        user.setRole(Role.USER);
+        userRepository.save(user);
+
+        PointHistory h1 = new PointHistory();
+        h1.setUser(user);
+        h1.setType(PointHistoryType.POST);
+        h1.setAmount(30);
+        h1.setBalance(30);
+        h1.setCreatedAt(LocalDateTime.now().minusMinutes(2));
+        pointHistoryRepository.save(h1);
+
+        PointHistory h2 = new PointHistory();
+        h2.setUser(user);
+        h2.setType(PointHistoryType.COMMENT);
+        h2.setAmount(10);
+        h2.setBalance(40);
+        h2.setCreatedAt(LocalDateTime.now().minusMinutes(1));
+        pointHistoryRepository.save(h2);
+
+        user.setPoint(40);
+        userRepository.save(user);
+
+        pointHistoryRepository.delete(h1);
+
+        int total = pointService.recalculateUserPoints(user);
+
+        assertEquals(10, total);
+        assertEquals(10, userRepository.findById(user.getId()).orElseThrow().getPoint());
+        assertEquals(10, pointHistoryRepository.findById(h2.getId()).orElseThrow().getBalance());
+    }
+}

frontend_nuxt/.env.production.example

@@ -1,10 +1,10 @@
 
 ; 生产环境后端
-NUXT_PUBLIC_API_BASE_URL=https://open-isle.com
+NUXT_PUBLIC_API_BASE_URL=https://www.open-isle.com
 ; 正式环境/生产环境
-NUXT_PUBLIC_WEBSITE_BASE_URL=https://open-isle.com
+NUXT_PUBLIC_WEBSITE_BASE_URL=https://www.open-isle.com
 ; 生产环境ws后端
-NUXT_PUBLIC_WEBSOCKET_URL=https://open-isle.com/websocket
+NUXT_PUBLIC_WEBSOCKET_URL=https://www.open-isle.com/websocket
 
 NUXT_PUBLIC_GOOGLE_CLIENT_ID=777830451304-nt8afkkap18gui4f9entcha99unal744.apps.googleusercontent.com
 NUXT_PUBLIC_GITHUB_CLIENT_ID=Ov23liVkO1NPAX5JyWxJ

frontend_nuxt/assets/global.css

@@ -18,7 +18,9 @@
   --background-color-blur: rgba(255, 255, 255, 0.57);
   --menu-border-color: lightgray;
   --normal-border-color: lightgray;
-  --menu-selected-background-color: rgba(242, 242, 242, 0.884);
+  --menu-selected-background-color: rgba(88, 241, 255, 0.166);
+  --normal-light-background-color: rgba(242, 242, 242, 0.884);
+  --menu-selected-background-color-hover: rgba(242, 242, 242, 0.884);
   --menu-text-color: rgb(99, 99, 99);
   --scroller-background-color: rgba(130, 175, 180, 0.5);
   /* --normal-background-color: rgb(241, 241, 241); */
@@ -58,6 +60,8 @@
   --menu-border-color: #555;
   --normal-border-color: #555;
   --menu-selected-background-color: rgba(255, 255, 255, 0.1);
+  --normal-light-background-color: rgba(255, 255, 255, 0.1);
+  --menu-selected-background-color-hover: rgba(17, 182, 197, 0.082);
   --menu-text-color: rgb(173, 173, 173);
   /* --normal-background-color: #000000; */
   --normal-background-color: #333;
@@ -162,7 +166,7 @@ body {
   padding-left: 1em;
   border-left: 4px solid #d0d7de;
   color: var(--blockquote-text-color);
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
   padding-top: 1px;
   padding-bottom: 1px;
 }
@@ -295,7 +299,7 @@ body {
 
 /* 鼠标悬停行高亮 */
 .info-content-text tbody tr:hover {
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
   transition: background-color 0.2s ease;
 }
 

frontend_nuxt/components/ArticleCategory.vue

@@ -2,11 +2,12 @@
   <div class="article-category-container" v-if="category">
     <div class="article-info-item" @click="gotoCategory">
       <BaseImage
-        v-if="category.smallIcon"
+        v-if="isImageIcon(category.smallIcon)"
         class="article-info-item-img"
         :src="category.smallIcon"
         :alt="category.name"
       />
+      <component v-else :is="category.smallIcon || category.icon" class="article-info-item-img" />
       <div class="article-info-item-text">{{ category.name }}</div>
     </div>
   </div>
@@ -22,6 +23,11 @@ const gotoCategory = async () => {
   const value = encodeURIComponent(props.category.id ?? props.category.name)
   await navigateTo({ path: '/', query: { category: value } }, { replace: true })
 }
+
+const isImageIcon = (icon) => {
+  if (!icon) return false
+  return /^https?:\/\//.test(icon) || icon.startsWith('/')
+}
 </script>
 
 <style scoped>

frontend_nuxt/components/ArticleTags.vue

@@ -7,11 +7,17 @@
       @click="gotoTag(tag)"
     >
       <BaseImage
-        v-if="tag.smallIcon"
+        v-if="isImageIcon(tag.smallIcon)"
         class="article-info-item-img"
         :src="tag.smallIcon"
         :alt="tag.name"
       />
+      <component
+        v-else-if="tag.smallIcon || tag.icon"
+        :is="tag.smallIcon || tag.icon"
+        class="article-info-item-img"
+      />
+      <tag-one v-else class="article-info-item-img" />
       <div class="article-info-item-text">{{ tag.name }}</div>
     </div>
   </div>
@@ -26,6 +32,11 @@ const gotoTag = async (tag) => {
   const value = encodeURIComponent(tag.id ?? tag.name)
   await navigateTo({ path: '/', query: { tags: value } }, { replace: true })
 }
+
+const isImageIcon = (icon) => {
+  if (!icon) return false
+  return /^https?:\/\//.test(icon) || icon.startsWith('/')
+}
 </script>
 
 <style scoped>

frontend_nuxt/components/CategorySelect.vue

@@ -15,7 +15,7 @@
               class="option-icon"
               :alt="option.name"
             />
-            <!-- <i v-else :class="['option-icon', option.icon]"></i> -->
+            <component v-else :is="option.smallIcon || option.icon" class="option-icon" />
           </template>
           <span>{{ option.name }}</span>
           <span class="option-count" v-if="option.count > 0"> x {{ option.count }}</span>

frontend_nuxt/components/CommentItem.vue

@@ -404,7 +404,6 @@ const handleContentClick = (e) => {
   margin-left: 10px;
   margin-right: 10px;
   opacity: 0.5;
-  transform: scaleX(-1);
 }
 
 .reply-user-name {

frontend_nuxt/components/HeaderComponent.vue

@@ -4,7 +4,9 @@
       <div class="header-content-left">
         <div v-if="showMenuBtn" class="menu-btn-wrapper">
           <button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')">
-            <application-menu class="micon"></application-menu>
+            <ToolTip content="展开/收起菜单" placement="bottom">
+              <application-menu class="micon"></application-menu>
+            </ToolTip>
           </button>
           <span
             v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)"

frontend_nuxt/components/MenuComponent.vue

@@ -122,6 +122,11 @@
                 class="section-item-icon"
                 :alt="t.name"
               />
+              <component
+                v-else-if="t.smallIcon || t.icon"
+                :is="t.smallIcon || t.icon"
+                class="section-item-icon"
+              />
               <tag-one v-else class="section-item-icon" />
               <span class="section-item-text"
                 >{{ t.name }} <span class="section-item-text-count">x {{ t.count }}</span></span
@@ -311,6 +316,10 @@ const gotoTag = (t) => {
   align-items: center;
 }
 
+.menu-item:hover {
+  background-color: var(--menu-selected-background-color-hover);
+}
+
 .menu-item.selected {
   font-weight: bold;
   background-color: var(--menu-selected-background-color);
@@ -402,7 +411,7 @@ const gotoTag = (t) => {
 }
 
 .section-item:hover {
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--menu-selected-background-color-hover);
 }
 
 .section-item-text-count {

frontend_nuxt/components/PostEditor.vue

@@ -136,7 +136,7 @@ export default {
   left: 0;
   width: 100%;
   height: 100%;
-  background: var(--menu-selected-background-color);
+  background: var(--normal-light-background-color);
   display: flex;
   align-items: center;
   justify-content: center;

frontend_nuxt/components/ReactionsGroup.vue

@@ -331,11 +331,11 @@ onMounted(async () => {
 
 .reactions-viewer-item.placeholder,
 .reactions-viewer-single-item.selected {
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
 }
 
 .reaction-option.selected {
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
 }
 
 @media (max-width: 768px) {

frontend_nuxt/pages/index.vue

@@ -65,16 +65,17 @@
           class="article-item"
           v-for="article in articles"
           :key="article.id"
+          @click="navigateTo(`/posts/${article.id}`)"
         >
           <div class="article-main-container">
-            <NuxtLink class="article-item-title main-item" :to="`/posts/${article.id}`">
+            <NuxtLink class="article-item-title main-item">
               <pin v-if="article.pinned" theme="outline" class="pinned-icon" />
               <gift v-if="article.type === 'LOTTERY'" class="lottery-icon" />
               <ranking-list v-else-if="article.type === 'POLL'" class="poll-icon" />
               <star v-if="!article.rssExcluded" class="featured-icon" />
               {{ article.title }}
             </NuxtLink>
-            <NuxtLink class="article-item-description main-item" :to="`/posts/${article.id}`">
+            <NuxtLink class="article-item-description main-item">
               {{ sanitizeDescription(article.description) }}
             </NuxtLink>
             <div class="article-info-container main-item">
@@ -488,6 +489,11 @@ const sanitizeDescription = (text) => stripMarkdown(text)
   border-bottom: 1px solid var(--normal-border-color);
 }
 
+.article-item:hover {
+  background-color: var(--menu-selected-background-color-hover);
+  cursor: pointer;
+}
+
 .article-main-container,
 .header-item.main-item {
   width: calc(60% - 20px);
@@ -529,7 +535,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
 }
 
 .article-item-title {
-  margin-top: 10px;
+  margin-top: 15px;
   font-size: 18px;
   text-decoration: none;
   color: var(--text-color);
@@ -558,7 +564,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
 
 .article-item-description {
   max-width: 100%;
-  margin-top: 10px;
+  margin-top: 5px;
   font-size: 13px;
   color: rgba(140, 140, 140, 0.888);
   display: -webkit-box;
@@ -605,6 +611,7 @@ const sanitizeDescription = (text) => stripMarkdown(text)
   display: flex;
   flex-direction: column;
   align-items: flex-start;
+  padding-bottom: 5px;
 }
 
 .article-member-avatars-container {
@@ -719,10 +726,15 @@ const sanitizeDescription = (text) => stripMarkdown(text)
   }
 
   .article-item-title {
+    margin-top: 10px;
     font-size: 16px;
     font-weight: bold;
   }
 
+  .article-main-container {
+    padding-bottom: 0px;
+  }
+
   .article-item-description {
     margin-top: 2px;
     font-size: 10px;

frontend_nuxt/pages/message-box/[id].vue

@@ -48,7 +48,7 @@
               :content-id="item.id"
               @update:modelValue="(v) => (item.reactions = v)"
             >
-              <div class="reply-btn"><next @click="setReply(item)" /> 写个回复...</div>
+              <div @click="setReply(item)" class="reply-btn"><next /> 写个回复...</div>
             </ReactionsGroup>
           </template>
         </BaseTimeline>
@@ -614,7 +614,7 @@ function goBack() {
   border-left: 5px solid var(--primary-color);
   margin-bottom: 5px;
   font-size: 13px;
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
 }
 
 .reply-author {
@@ -634,7 +634,7 @@ function goBack() {
 }
 
 .active-reply {
-  background-color: var(--bg-color-soft);
+  background-color: var(--normal-light-background-color);
   padding: 5px 10px;
   border-left: 5px solid var(--primary-color);
   margin-bottom: 5px;

frontend_nuxt/pages/message-box/index.vue

@@ -419,7 +419,7 @@ function minimize() {
 }
 
 .conversation-item:hover {
-  background-color: var(--menu-selected-background-color);
+  background-color: var(--normal-light-background-color);
 }
 
 .conversation-avatar {

frontend_nuxt/plugins/iconpark.client.ts

@@ -63,6 +63,16 @@ import {
   History,
   Lightning,
   PeoplesTwo,
+  Code,
+  GoodTwo,
+  Twitter,
+  Bitcoin,
+  Fire,
+  Communication,
+  WaterLevel,
+  RobotOne,
+  Server,
+  Protection,
 } from '@icon-park/vue-next'
 
 export default defineNuxtPlugin((nuxtApp) => {
@@ -129,4 +139,14 @@ export default defineNuxtPlugin((nuxtApp) => {
   nuxtApp.vueApp.component('HistoryIcon', History)
   nuxtApp.vueApp.component('Lightning', Lightning)
   nuxtApp.vueApp.component('PeoplesTwo', PeoplesTwo)
+  nuxtApp.vueApp.component('CodeIcon', Code)
+  nuxtApp.vueApp.component('GoodTwo', GoodTwo)
+  nuxtApp.vueApp.component('Twitter', Twitter)
+  nuxtApp.vueApp.component('Bitcoin', Bitcoin)
+  nuxtApp.vueApp.component('Fire', Fire)
+  nuxtApp.vueApp.component('Communication', Communication)
+  nuxtApp.vueApp.component('WaterLevel', WaterLevel)
+  nuxtApp.vueApp.component('RobotOne', RobotOne)
+  nuxtApp.vueApp.component('ServerIcon', Server)
+  nuxtApp.vueApp.component('Protection', Protection)
 })