From 18c567e98e797a8597d13e946cdee4dff4194bb7 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Tue, 10 Oct 2023 09:11:10 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20Translation=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BAtranslate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/translation/TranslationInterface.java | 2 +- .../ruoyi/common/translation/handler/TranslationHandler.java | 2 +- .../ruoyi/common/translation/impl/DeptNameTranslationImpl.java | 2 +- .../ruoyi/common/translation/impl/DictTypeTranslationImpl.java | 2 +- .../ruoyi/common/translation/impl/OssUrlTranslationImpl.java | 2 +- .../ruoyi/common/translation/impl/UserNameTranslationImpl.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java index 91af97cae..9a10bc25b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java @@ -13,5 +13,5 @@ public interface TranslationInterface { * @param key 需要被翻译的键(不为空) * @return 返回键对应的值 */ - T translation(Object key, String other); + T translate(Object key, String other); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java index ede720675..805f9d4ff 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java @@ -46,7 +46,7 @@ public class TranslationHandler extends JsonSerializer implements Contex gen.writeNull(); return; } - Object result = trans.translation(value, translation.other()); + Object result = trans.translate(value, translation.other()); gen.writeObject(result); } else { gen.writeObject(value); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java index ada3c253a..581454746 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java @@ -20,7 +20,7 @@ public class DeptNameTranslationImpl implements TranslationInterface { private final DeptService deptService; @Override - public String translation(Object key, String other) { + public String translate(Object key, String other) { return deptService.selectDeptNameByIds(key.toString()); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java index 1e97b66ce..fb0dac91a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java @@ -21,7 +21,7 @@ public class DictTypeTranslationImpl implements TranslationInterface { private final DictService dictService; @Override - public String translation(Object key, String other) { + public String translate(Object key, String other) { if (key instanceof String && StringUtils.isNotBlank(other)) { return dictService.getDictLabel(other, key.toString()); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java index 863e4d686..fbae8dc94 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java @@ -20,7 +20,7 @@ public class OssUrlTranslationImpl implements TranslationInterface { private final OssService ossService; @Override - public String translation(Object key, String other) { + public String translate(Object key, String other) { return ossService.selectUrlByIds(key.toString()); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java index eccf1c8b5..ab3eede85 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java @@ -20,7 +20,7 @@ public class UserNameTranslationImpl implements TranslationInterface { private final UserService userService; @Override - public String translation(Object key, String other) { + public String translate(Object key, String other) { if (key instanceof Long) { return userService.selectUserNameById((Long) key); }