|
|
@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import java.net.URLDecoder;
|
|
|
+import java.nio.charset.StandardCharsets;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
@@ -50,8 +52,8 @@ public class ERPServiceImpl implements ERPService {
|
|
|
try {
|
|
|
|
|
|
ObjectMapper objectMapper = new ObjectMapper();
|
|
|
- //String decode = URLDecoder.decode(data, StandardCharsets.UTF_8.toString());
|
|
|
- String jsonString = X5StringUtils.decodeBase64(data);
|
|
|
+ String decode = URLDecoder.decode(data, StandardCharsets.UTF_8.toString());
|
|
|
+ String jsonString = X5StringUtils.decodeBase64(decode);
|
|
|
logger.info("前2:"+data);
|
|
|
logger.info("前3:"+jsonString);
|
|
|
Map<String, Object> map = objectMapper.readValue(jsonString, Map.class);
|