ziin/keyboard_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改个人键盘多语言兜底策略

Browse Source
This commit is contained in:
ziin
2026-04-03 16:43:43 +08:00
parent dbc7ee365d
commit 02dd37ffaf
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yolo/keyborad/service/impl/KeyboardCharacterServiceImpl.java
View File

@@ -159,6 +159,9 @@ public class KeyboardCharacterServiceImpl extends ServiceImpl<KeyboardCharacterM
public List<KeyboardUserCharacterVO> selectListByUserId(String acceptLanguage) { public List<KeyboardUserCharacterVO> selectListByUserId(String acceptLanguage) {
long loginId = StpUtil.getLoginIdAsLong(); long loginId = StpUtil.getLoginIdAsLong();
String locale = RequestLocaleUtils.resolveLanguage(acceptLanguage); String locale = RequestLocaleUtils.resolveLanguage(acceptLanguage);
if (!StringUtils.hasText(locale)) {
locale = DEFAULT_FALLBACK_LOCALE;
}
return keyboardUserCharacterMapper.selectByUserId(loginId, locale); return keyboardUserCharacterMapper.selectByUserId(loginId, locale);
} }

5
src/main/resources/mapper/KeyboardUserCharacterMapper.xml
View File

@@ -9,7 +9,7 @@
SELECT SELECT
kuc.id, kuc.id,
kuc.character_id, kuc.character_id,
kci.character_name, COALESCE(kci.character_name, kci_en.character_name) AS character_name,
kuc.emoji kuc.emoji
FROM keyboard_user_character kuc FROM keyboard_user_character kuc
JOIN keyboard_user_sort kus JOIN keyboard_user_sort kus
@@ -17,6 +17,9 @@
LEFT JOIN keyboard_character_i18n kci LEFT JOIN keyboard_character_i18n kci
ON kuc.character_id = kci.character_id ON kuc.character_id = kci.character_id
AND kci."locale" = #{locale} AND kci."locale" = #{locale}
LEFT JOIN keyboard_character_i18n kci_en
ON kuc.character_id = kci_en.character_id
AND kci_en."locale" = 'en'
WHERE kuc.user_id = #{loginId} WHERE kuc.user_id = #{loginId}
AND kuc.deleted = FALSE AND kuc.deleted = FALSE
ORDER BY array_position(kus.user_characteu_id_sort, kuc.id) NULLS LAST; ORDER BY array_position(kus.user_characteu_id_sort, kuc.id) NULLS LAST;