Merge remote-tracking branch 'origin/dev' into futuer/boot4

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java

@@ -13,7 +13,7 @@ public interface TransConstant {
     String USER_ID_TO_NAME = "user_id_to_name";
 
     /**
-     * 用户id转用户名称
+     * 用户id转用户昵称
      */
     String USER_ID_TO_NICKNAME = "user_id_to_nickname";
 

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java

@@ -29,7 +29,18 @@ public class TranslationHandler extends ValueSerializer<Object> {
      */
     public static final Map<String, TranslationInterface<?>> TRANSLATION_MAPPER = new ConcurrentHashMap<>();
 
-    private Translation translation;
+    private final Translation translation;
+
+    /**
+     * 提供给 jackson 创建上下文序列化器时使用 不然会报错
+     */
+    public TranslationHandler() {
+        this.translation = null;
+    }
+
+    public TranslationHandler(Translation translation) {
+        this.translation = translation;
+    }
 
     @Override
     public void serialize(Object value, JsonGenerator gen, SerializationContext ctxt) throws JacksonException {
@@ -61,8 +72,7 @@ public class TranslationHandler extends ValueSerializer<Object> {
     public ValueSerializer<?> createContextual(SerializationContext ctxt, BeanProperty property) {
         Translation translation = property.getAnnotation(Translation.class);
         if (Objects.nonNull(translation)) {
-            this.translation = translation;
-            return this;
+            return new TranslationHandler(translation);
         }
         return super.createContextual(ctxt, property);
     }

ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java

@@ -7,7 +7,7 @@ import org.dromara.common.translation.constant.TransConstant;
 import org.dromara.common.translation.core.TranslationInterface;
 
 /**
- * 用户名称翻译实现
+ * 用户昵称翻译实现
  *
  * @author may
  */