From 7b854fe180e8138486f359c6ef5a8a42d54b4144 Mon Sep 17 00:00:00 2001 From: litao Date: Mon, 26 Jun 2017 21:05:30 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 2 +- .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java | 2 +- regional-etl/src/main/resources/application-prod.yml | 6 +++--- regional-etl/src/main/resources/application.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 85ec94e..a0681de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1078,7 +1078,7 @@ public class BookbuildingFacade { PregnantInfoResult result = new PregnantInfoResult(); /** 是否发放过优惠券 */ - result.setSendCoupon(p.isSendCoupon()); + result.setSendCoupon(p.isSendCoupon() == null ? false : p.isSendCoupon()); result.setId(p.getId()); /**********孕妇基本信息***************/ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index e97f7a5..d68dc42 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -104,7 +104,7 @@ public class ViewFacade { Map map = new HashMap<>(); - map.put("isSendCoupon", data.isSendCoupon()); + map.put("isSendCoupon", data.isSendCoupon() == null ? false : data.isSendCoupon()); map.put("id", data.getId()); /* 孕妇基础数据 */ diff --git a/regional-etl/src/main/resources/application-prod.yml b/regional-etl/src/main/resources/application-prod.yml index eb17fbb..ca6d2cf 100644 --- a/regional-etl/src/main/resources/application-prod.yml +++ b/regional-etl/src/main/resources/application-prod.yml @@ -1,14 +1,14 @@ spring: datasource: - url: jdbc:mysql://192.168.200.119:3306/platform + url: jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 username: platform password: platform123 driver-class-name: com.mysql.jdbc.Driver data: mongodb: - host: 192.168.200.119 - port: 27017 + host: 192.168.1.41 + port: 27018 database: platform username: platform password: platform123 diff --git a/regional-etl/src/main/resources/application.properties b/regional-etl/src/main/resources/application.properties index ed70ba0..28dd6a9 100644 --- a/regional-etl/src/main/resources/application.properties +++ b/regional-etl/src/main/resources/application.properties @@ -22,4 +22,4 @@ mybatis.typeAliasesPackage=com.lyms.etl.model mybatis.mapperLocations=classpath:mappers/*.xml #spring.profiles.active=prod, etl -spring.profiles.active=patient \ No newline at end of file +spring.profiles.active=prod, patient \ No newline at end of file -- 1.8.3.1