1、bug处理

2、格式调整

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/IcCardServiceImpl.java

@@ -75,7 +75,7 @@ public class IcCardServiceImpl implements IcCardService {
                             messageInfo.setTemplateId(templateId);
                             String accNo = accTransDetail.getAccNo();
                             String cardNo = StringUtils.isEmpty(accNo) ? null : accNo.substring(accTransDetail.getAccNo().length() - 4);
-                            String header = "您好,您的小孩" + accTransDetail.getEmpName() + "在校的校园卡(卡号：*** " + cardNo + ")发生如下交易";
+                            String header = "您好,您孩子" + accTransDetail.getEmpName() + "的校园卡(卡号：*** " + cardNo + ")发生如下交易";
                             messageInfo.setTitle(header);
                             Date accTransDay = accTransDetail.getAccTransDay();
                             if (null != accTransDay) {
@@ -88,7 +88,7 @@ public class IcCardServiceImpl implements IcCardService {
                             }
                             messageInfo.setKeyword3(accTransDetail.getAccTransType());
                             messageInfo.setKeyword4(String.format("%.2f", accTransDetail.getCardMoneyValue()));
-                            messageInfo.setRemark("感谢您使用!");
+                            messageInfo.setRemark("谢谢使用!");
                             messageInfoList.add(messageInfo);
                         } else {
                             logger.info("GUID={}未找到对应的推送人", accTransDetail.getGuid());

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/ScoreServiceImpl.java

@@ -252,7 +252,7 @@ public class ScoreServiceImpl implements ScoreService{
         }
         noticers.forEach(noticer -> {
             MessageInfoDTO msg = new MessageInfoDTO();
-            msg.setTitle("您好，请查收您小孩" + noticer.getStuName() + "的成绩单");
+            msg.setTitle("您好，请查收您孩子" + noticer.getStuName() + "的成绩单");
             msg.setKeyword1(noticer.getStuName());
             msg.setKeyword2(noticer.getStuNo());
             msg.setKeyword3(main.getSi_examtitle());

applications/wechat/wechat-dto/src/main/java/com/usoftchina/smartschool/wechat/dto/TransferDTO.java

@@ -22,4 +22,8 @@ public class TransferDTO implements Serializable{
     public TransferDTO(List<MessageInfoDTO> data) {
         this.data = data;
     }
+    public TransferDTO() {
+    }
+
+
 }

base-servers/file/file-server-qcloud/src/main/resources/config/application-docker-cloud.yml

@@ -20,10 +20,4 @@ spring:
       maximum-pool-size: 50
       idle-timeout: 30000
       max-lifetime: 1800000
-      connection-timeout: 30000
-rabbitmq:
-  host: 132.232.174.14
-  port: 5672
-  virtual-host: school
-  username: saas
-  password: select123***
+      connection-timeout: 30000