diff --git a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java index 1a711ada..7cc0a123 100644 --- a/common/src/main/java/com/jeesite/common/lang/NumberUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/NumberUtils.java @@ -4,6 +4,7 @@ package com.jeesite.common.lang; import java.math.BigDecimal; +import java.text.DecimalFormat; /** * BigDecimal工具类 @@ -92,4 +93,19 @@ public class NumberUtils extends org.apache.commons.lang3.math.NumberUtils { return bg.setScale(0, BigDecimal.ROUND_HALF_UP).toString(); } + /** + * 格式化数值类型 + * @param data + * @param pattern + */ + public static String formatNumber(Object data, String pattern) { + DecimalFormat df = null; + if (pattern == null) { + df = new DecimalFormat(); + } else { + df = new DecimalFormat(pattern); + } + return df.format(data); + } + } diff --git a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java index aeb466c3..8300cf14 100644 --- a/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java +++ b/modules/core/src/test/java/com/jeesite/test/MsgPushTest.java @@ -5,6 +5,7 @@ package com.jeesite.test; import java.util.Date; +import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -21,6 +22,8 @@ import com.jeesite.modules.msg.entity.content.SmsMsgContent; import com.jeesite.modules.msg.task.impl.MsgLocalMergePushTask; import com.jeesite.modules.msg.task.impl.MsgLocalPushTask; import com.jeesite.modules.msg.utils.MsgPushUtils; +import com.jeesite.modules.sys.entity.User; +import com.jeesite.modules.sys.utils.UserUtils; /** * 消息推送测试类 @@ -34,6 +37,10 @@ public class MsgPushTest extends BaseSpringContextTests { @Test public void testSend(){ + User user = UserUtils.get("system"); + if (StringUtils.isAnyBlank(user.getMobile(), user.getEmail())){ + throw new RuntimeException("请设置system用户的手机号码和邮箱地址"); + } for (int i=0; i<1; i++){ testPC(); testApp();