From d66f0946e167bc1a0adc79a07d696384d06f22db Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Fri, 17 Jul 2020 15:20:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=86=E5=90=88=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/hswebframework/web/utils/ExpressionUtils.java | 2 +- .../org/hswebframework/web/utils/ExpressionUtilsTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hsweb-core/src/main/java/org/hswebframework/web/utils/ExpressionUtils.java b/hsweb-core/src/main/java/org/hswebframework/web/utils/ExpressionUtils.java index 90e4b7aa9..de2af2fb1 100644 --- a/hsweb-core/src/main/java/org/hswebframework/web/utils/ExpressionUtils.java +++ b/hsweb-core/src/main/java/org/hswebframework/web/utils/ExpressionUtils.java @@ -94,7 +94,7 @@ public class ExpressionUtils { if ("spel".equalsIgnoreCase(language) && !var.contains("#")) { try { - Object fast = BeanUtilsBean2.getInstance().getProperty(vars, var); + Object fast = BeanUtilsBean2.getInstance().getPropertyUtils().getProperty(vars, var); if (fast != null) { return fast.toString(); } diff --git a/hsweb-core/src/test/java/org/hswebframework/web/utils/ExpressionUtilsTest.java b/hsweb-core/src/test/java/org/hswebframework/web/utils/ExpressionUtilsTest.java index d66fce634..5f3b0cf11 100644 --- a/hsweb-core/src/test/java/org/hswebframework/web/utils/ExpressionUtilsTest.java +++ b/hsweb-core/src/test/java/org/hswebframework/web/utils/ExpressionUtilsTest.java @@ -4,11 +4,18 @@ import com.alibaba.fastjson.JSON; import org.junit.Assert; import org.junit.Test; +import java.util.Arrays; import java.util.Collections; public class ExpressionUtilsTest { + @Test + public void testArray() { + String expression = ExpressionUtils.analytical("test-${array}", Collections.singletonMap("array", Arrays.asList(1,2,3)), "spel"); + + Assert.assertEquals(expression,"test-[1, 2, 3]"); + } @Test public void test() {