diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java index ab709d5..d956ba7 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogErrorMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-03-21T15:03:34+0800", + date = "2023-03-21T16:41:41+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component diff --git a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java index 1cd2818..d555fe7 100644 --- a/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java +++ b/eladmin-logging/target/generated-sources/annotations/me/zhengjie/service/mapstruct/LogSmallMapperImpl.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2023-03-21T15:03:34+0800", + date = "2023-03-21T16:41:41+0800", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 1.8.0_251 (Oracle Corporation)" ) @Component diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/sms/util/SmsUtil.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/sms/util/SmsUtil.java index 518d2ec..45b9de6 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/sms/util/SmsUtil.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/sms/util/SmsUtil.java @@ -1,6 +1,5 @@ package me.zhengjie.modules.system.domain.sms.util; -import cn.hutool.crypto.SecureUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; import com.aliyuncs.DefaultAcsClient; @@ -12,15 +11,14 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; +import com.google.common.collect.Lists; import me.zhengjie.constant.SmsConstant; import me.zhengjie.modules.constant.DefaultConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * @author aliyunsms @@ -139,7 +137,10 @@ public class SmsUtil { } public static void main(String[] args) { - sendSms("13586541001", "【浩才旗舰店】链接为 123456", 30L); + String str = new String(" [\"13586541001\",\"13586541002\",\"13586541003\"]"); + String[] split = str.split(","); + ArrayList strings = Lists.newArrayList(Arrays.asList(split)); + System.out.println(JSONUtil.toJsonStr(strings)); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java index c93a922..b48c2ab 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/uploadnew/task/SaveToFileNewTask.java @@ -172,7 +172,7 @@ public class SaveToFileNewTask { ? TxtUtils.txtParseListVyUrl(filePath) : fileFormat.contains(FileConstant.CSV_FILE_SUB_NAME) ? ToolExcelUtils.csvParseListByUrl(filePath) - : ToolExcelUtils.excelParseListByUrl(filePath); + : ToolExcelUtils.excelParseListByUrl(filePath); Map> preEncryptNumMap = listT.stream().filter (phone -> StringUtils.isNotBlank(phone.trim())).collect(Collectors.groupingBy(String::length)); if (CollectionUtil.isNotEmpty(preEncryptNumMap)) { @@ -236,9 +236,9 @@ public class SaveToFileNewTask { if (StringUtils.isNotBlank(decryptionDTO.getReason()) && "success".equals(decryptionDTO.getReason())) { if (StringUtils.isNotBlank(decryptionDTO.getCellPhone())) { - String[] split = decryptionDTO.getCellPhone().split(StrUtil.COMMA); - if (split.length > 0) { - stringList.addAll(Lists.newArrayList(Arrays.asList(split))); + List parseArray = JSON.parseArray(decryptionDTO.getCellPhone(), String.class); + if (!parseArray.isEmpty()) { + stringList.addAll(parseArray); } } }