Merge branch 'main' of github.com:nagisa77/OpenIsle

This commit is contained in:
Tim
2025-08-06 11:34:46 +08:00
2 changed files with 16 additions and 3 deletions

View File

@@ -10,7 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import java.util.Map; import java.util.Map;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -71,7 +72,7 @@ public class NotificationService {
} }
n = notificationRepository.save(n); n = notificationRepository.save(n);
notificationExecutor.execute(() -> { // Runnable asyncTask = () -> {
if (type == NotificationType.COMMENT_REPLY && user.getEmail() != null && post != null && comment != null) { if (type == NotificationType.COMMENT_REPLY && user.getEmail() != null && post != null && comment != null) {
String url = String.format("%s/posts/%d#comment-%d", websiteUrl, post.getId(), comment.getId()); String url = String.format("%s/posts/%d#comment-%d", websiteUrl, post.getId(), comment.getId());
emailSender.sendEmail(user.getEmail(), "有人回复了你", url); emailSender.sendEmail(user.getEmail(), "有人回复了你", url);
@@ -95,7 +96,18 @@ public class NotificationService {
// } // }
// } // }
} }
}); // };
// if (TransactionSynchronizationManager.isSynchronizationActive()) {
// TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
// @Override
// public void afterCommit() {
// notificationExecutor.execute(asyncTask);
// }
// });
// } else {
// notificationExecutor.execute(asyncTask);
// }
return n; return n;
} }

View File

@@ -22,6 +22,7 @@ export default {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 100%;
} }
.callback-page-text { .callback-page-text {