diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 67b288c92..3d09f0d74 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -50,6 +50,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # ROCKETMQ rocketmq: nameServer: 127.0.0.1:9876 diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 77ede8192..028948c64 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index ecb63ec51..827263411 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index cde001b8b..d43000b27 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -50,6 +50,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory aws: clientRegion: cn-northwest-1 bucketName: iformall-net diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index dab302677..69cbb6e34 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -47,6 +47,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index b35b0bfad..4141683a9 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -47,6 +47,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index d2dd7cfc0..a412f6cab 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -49,6 +49,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory aws: clientRegion: cn-northwest-1 bucketName: iformall-net diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 6305d420e..ccb70a731 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -47,6 +47,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 84aaf924c..9a8511358 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -47,6 +47,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index edcc81afe..554af1227 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -51,6 +51,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory rocketmq: nameServer: 127.0.0.1:9876 producer: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 3d9fee875..2f0b29d9b 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index ca26cbaf6..f3c9256e4 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 23a4f20b5..fd0290da1 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -51,6 +51,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory aws: clientRegion: cn-northwest-1 bucketName: iformall-net diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 71de10c00..65fa94c2b 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: localhost diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 4f3a2535c..4965fb3df 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -48,6 +48,9 @@ spring: auth: true starttls: enable: true + socketFactory: + port: 465 + class: javax.net.ssl.SSLSocketFactory # RABBITMQ rabbitmq: host: 127.0.0.1 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 5806693a8..11f0a7101 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1661,13 +1661,13 @@ public class WxChartServiceImpl implements WxChartDataService { Map successListMap = successlist.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (String) x.get("total"); + return x.get("total").toString(); })); Map verifyListMap = verifyList.parallelStream().collect(Collectors.toMap(x -> { return x.get("time").toString(); }, x -> { - return (String) x.get("total"); + return x.get("total").toString(); })); successMap.putAll(successListMap); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index c69a79acf..0ace5279c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -226,15 +226,19 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { List userList = new ArrayList<>(); for (WxOrder order : orderList) { WxCUser user = wxCUserMapper.selectByPrimaryKey(order.getCUserId()); - userList.add(user); + if (user != null) { + userList.add(user); + } + } + if (!userList.isEmpty()) { + userList = userList.parallelStream().map(u -> { + WxCUser temp = new WxCUser(); + temp.setId(u.getId()); + temp.setNickName(u.getNickName()); + temp.setAvatarUrl(u.getAvatarUrl()); + return temp; + }).collect(Collectors.toList()); } - userList = userList.parallelStream().map(u -> { - WxCUser temp = new WxCUser(); - temp.setId(u.getId()); - temp.setNickName(u.getNickName()); - temp.setAvatarUrl(u.getAvatarUrl()); - return temp; - }).collect(Collectors.toList()); couponOrderGroup.put("userList", userList); } return new ResultData(couponOrderGroup);