diff --git a/pom.xml b/pom.xml index 24f31c231..85a9abf62 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.71 + 2.3.72 UTF-8 2.4.0 diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java index c720c729b..6b6d47c40 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskUploadServiceIpml.java @@ -1,32 +1,22 @@ package au.com.royalpay.payment.manage.riskbusiness.core.impl; -import au.com.royalpay.payment.core.exceptions.EmailException; import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper; import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskFileMapper; import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskMaterialMapper; -import au.com.royalpay.payment.manage.mappers.system.ClientMapper; -import au.com.royalpay.payment.manage.notice.core.MailService; -import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskProcessLogService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskUploadService; import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum; import au.com.royalpay.payment.tools.exceptions.BadRequestException; -import au.com.royalpay.payment.tools.threadpool.RoyalThreadPoolExecutor; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.time.DateFormatUtils; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.thymeleaf.context.Context; -import org.thymeleaf.spring5.SpringTemplateEngine; import javax.annotation.Resource; -import java.text.ParseException; import java.util.Date; -import java.util.List; @Service public class RiskUploadServiceIpml implements RiskUploadService { @@ -61,7 +51,7 @@ public class RiskUploadServiceIpml implements RiskUploadService { continue; for(Object url:urls){ JSONObject file = new JSONObject(); - file.put("file_url",url); + file.put("file_url",url.toString()); file.put("file_type",i); file.put("material_id",material.getString("material_id")); riskFileMapper.save(file); diff --git a/src/test/java/au/com/royalpay/payment/manage/valid/TestJodaFormat.java b/src/test/java/au/com/royalpay/payment/manage/valid/TestJodaFormat.java index dc877a3c6..0205c7a92 100644 --- a/src/test/java/au/com/royalpay/payment/manage/valid/TestJodaFormat.java +++ b/src/test/java/au/com/royalpay/payment/manage/valid/TestJodaFormat.java @@ -1,5 +1,7 @@ package au.com.royalpay.payment.manage.valid; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -17,4 +19,29 @@ public class TestJodaFormat { String dateStr = formatter.print(new DateTime(new Date())); System.out.println(dateStr); } + + @Test + public void testSubmitMaterial() { + + JSONObject material = new JSONObject(); + + material.put("file1_url",new JSONArray(){{ + add("https://open.yeepay.com/docs/v2/products/cbp/apis/options__rest__v1.0__kj__fe__query/index.html"); + add("https://www.baidu.com"); + }}); + + for(int i=1;i<=10;i++){ + if(material.containsKey("file"+i+"_url")){ + JSONArray urls = material.getJSONArray("file" + i + "_url"); + if (urls == null || urls.isEmpty()) + continue; + for(Object url:urls){ + JSONObject file = new JSONObject(); + file.put("file_url",url); + file.put("file_type",i); + } + } + } + + } }