diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index e3ad61dcc8..d9cb56b758 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.59 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.62 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 68b4f14a67..e434ae4f2e 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.59 + 0.3.62 com.epmet epmet-cloud diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 5f32f7d497..cece305fd2 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -221,6 +221,8 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { //2.用户不存在时不允许登陆 Map map1 = (Map)jsonObject.get("paUserResult"); PaUserDTO userDTO = ConvertUtils.mapToEntity(map1, PaUserDTO.class); + logger.info("map1的值："+map1); + logger.info("userDTO的值："+userDTO); if (null == userDTO || StringUtils.isBlank(userDTO.getId())) { throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode()); } @@ -238,13 +240,15 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { String token = this.generateGovWxmpToken(userDTO.getId()); //4-2.判断是否存在信息，给customerId赋值 Map map2 = (Map)jsonObject.get("paCustomerResult"); + logger.info("map2的值："+map2); PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class); String customerId = ""; if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) { customerId = customerDTO.getId(); } //4-3.token存入redis - Map map3 = (Map)jsonObject.get("PaUserWechatDTO"); + Map map3 = (Map)jsonObject.get("paUserWechatResult"); + logger.info("map3的值："+map3); PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class); String openid = wechatDTO.getWxOpenId(); String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId()); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java index edc8633f02..93c653e178 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ConvertUtils.java @@ -62,6 +62,9 @@ public class ConvertUtils { } public static T mapToEntity(Map map, Class entity) { + if (null == map){ + return null; + } T t = null; try { t = entity.newInstance(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 5c8cd6a427..01160456be 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.20 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.21 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 65bc2961f6..c98249795d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.20 + 0.0.21 com.epmet epmet-heart diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql new file mode 100644 index 0000000000..f97ef2b681 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.3__thirdUpdate.sql @@ -0,0 +1,3 @@ +alter table pa_user add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL; +alter table pa_user_visited add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL; +alter table pa_customer add SOURCE varchar(32) comment '数据来源(dev:开发 test:体验 prod:生产)' NOT NULL; diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index c47df434d3..72c895307d 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.33 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 8ca040d22a..7b2dbcaf2d 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.32 + 0.3.33 com.epmet resi-mine