From 92d4161294b8af322ea4e8dd9ff1615ba5ee9012 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 9 Oct 2025 23:35:12 +0800
Subject: [PATCH] code optimization

---
 .../java/com/jeesite/common/mapper/JsonMapper.java     | 10 ++++------
 .../main/java/com/jeesite/common/mapper/XmlMapper.java | 10 ++++------
 .../java/com/jeesite/common/web/http/ResultUtils.java  | 10 ++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
index 8cee41be..3f1a57a7 100644
--- a/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/JsonMapper.java
@@ -74,15 +74,13 @@ public class JsonMapper extends ObjectMapper {
 	public JsonMapper setLocaleTimeZoneDateFormat(){
 		PropertiesUtils props = PropertiesUtils.getInstance();
 		// 设置默认语言环境
-		String defaultLocale = props.getProperty("lang.defaultLocale");
-		if (StringUtils.isNotBlank(defaultLocale)) {
+		props.getPropertyIfNotBlank("lang.defaultLocale", (defaultLocale) -> {
 			this.setLocale(LocaleUtils.toLocale(defaultLocale));
-		}
+		});
 		// 设置默认时区
-		String defaultTimeZone = props.getProperty("lang.defaultTimeZone");
-		if (StringUtils.isNotBlank(defaultTimeZone)) {
+		props.getPropertyIfNotBlank("lang.defaultTimeZone", (defaultTimeZone) -> {
 			this.setTimeZone(TimeZone.getTimeZone(defaultTimeZone));
-		}
+		});
 		this.setAnnotationIntrospector(new JacksonAnnotationIntrospector() {
 			@Serial
 			private static final long serialVersionUID = 1L;
diff --git a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
index 70b79a0c..89ee35c5 100644
--- a/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
+++ b/common/src/main/java/com/jeesite/common/mapper/XmlMapper.java
@@ -40,15 +40,13 @@ public class XmlMapper extends com.fasterxml.jackson.dataformat.xml.XmlMapper{
 	public XmlMapper() {
 		PropertiesUtils props = PropertiesUtils.getInstance();
 		// 设置默认语言环境
-		String defaultLocale = props.getProperty("lang.defaultLocale");
-		if (StringUtils.isNotBlank(defaultLocale)) {
+		props.getPropertyIfNotBlank("lang.defaultLocale", (defaultLocale) -> {
 			this.setLocale(LocaleUtils.toLocale(defaultLocale));
-		}
+		});
 		// 设置默认时区
-		String defaultTimeZone = props.getProperty("lang.defaultTimeZone");
-		if (StringUtils.isNotBlank(defaultTimeZone)) {
+		props.getPropertyIfNotBlank("lang.defaultTimeZone", (defaultTimeZone) -> {
 			this.setTimeZone(TimeZone.getTimeZone(defaultTimeZone));
-		}
+		});
 		// Spring ObjectMapper 初始化配置，支持 @JsonView
 		new Jackson2ObjectMapperBuilder().configure(this);
 	}
diff --git a/common/src/main/java/com/jeesite/common/web/http/ResultUtils.java b/common/src/main/java/com/jeesite/common/web/http/ResultUtils.java
index baa9d14e..133c1941 100644
--- a/common/src/main/java/com/jeesite/common/web/http/ResultUtils.java
+++ b/common/src/main/java/com/jeesite/common/web/http/ResultUtils.java
@@ -15,12 +15,10 @@ import jakarta.servlet.http.HttpServletResponse;
  */
 public class ResultUtils {
 
-	private static final boolean isDefaultResult = PropertiesUtils.getInstance()
-			.getPropertyToBoolean("web.isDefaultResult", "false");
-	private static final String resultParamName = PropertiesUtils.getInstance()
-			.getProperty("web.resultParamName", "__data");
-	private static final String headerParamName = PropertiesUtils.getInstance()
-			.getProperty("web.headerParamName", "x-data");
+	private static final PropertiesUtils props = PropertiesUtils.getInstance();
+	private static final boolean isDefaultResult = props.getPropertyToBoolean("web.isDefaultResult", "false");
+	private static final String resultParamName = props.getProperty("web.resultParamName", "__data");
+	private static final String headerParamName = props.getProperty("web.headerParamName", "x-data");
 
 	/**
 	 * 设置 web.isResult 参数可强制全局使用统一结果输出，否则，传递 __data=true 参数，或 x-data 请求头为 true 时启用