From 9ed60f22de26f724e68f89d30f2db9eef2c5d652 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 14:28:11 +0800
Subject: [PATCH] update 优化 minio安装警告 使用新版本参数
---
ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
index 7ef60d1..caa059b 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java
@@ -1,5 +1,6 @@
package com.ruoyi.common.jackson;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.BeanProperty;
@@ -9,6 +10,7 @@
import com.fasterxml.jackson.databind.ser.ContextualSerializer;
import com.ruoyi.common.annotation.DictDataMapper;
import com.ruoyi.common.core.service.DictService;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException;
@@ -29,9 +31,10 @@
@Override
public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
try {
- String label = SpringUtils.getBean(DictService.class).getDictLabel(dictType, value);
- if (StrUtil.isNotBlank(label)) {
- gen.writeString(label);
+ DictService dictService = SpringUtils.getBean(DictService.class);
+ if (ObjectUtil.isNotNull(dictService)) {
+ String label = dictService.getDictLabel(dictType, value);
+ gen.writeString(StringUtils.isNotBlank(label) ? label : value);
} else {
gen.writeString(value);
}
--
Gitblit v1.9.3