diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index acdd543ed8..55b559232f 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.66 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 16361f102a..b4ca71a0e4 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.66 + 0.3.67 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 cece305fd2..82c6875518 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 @@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { public UserTokenResultDTO register(RegisterFormDTO formDTO) { //1.调用epmet-third服务，完成信息注册 String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData(); + logger.info("data数据为："+data); JSONObject toResult = JSON.parseObject(data); Result result = ConvertUtils.mapToEntity(toResult, Result.class); + logger.info("转换的result结果为："+result); if (!result.success()) { logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId())); throw new RenException(result.getCode()); } Object RegisterResult = result.getData(); + logger.info("getData()数据为："+RegisterResult); JSONObject jsonObject = JSON.parseObject(RegisterResult.toString()); RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class); 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 7147290341..9cc42e154b 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.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.31 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 fd1aeb191c..a2a079992c 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.30 + 0.0.31 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java index 5fcbb51334..9806de9b80 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java @@ -26,16 +26,6 @@ public interface ActMessageConstant { */ String ACT_POINTS_EVENT_REMARK="参与%s"; - /** - * 居民端-用户认证志愿者，发送消息 - */ - String POINTS_EVENT_VOLUNTEER_AUTHENTICATE="用户%s，认证志愿者"; - - /** - * 居民端-添加实况，发送消息 - */ - String ACT_POINTS_EVENT_VOLUNTEER_LIVE="用户%s，添加活动实况,活动:%s"; - /** * 工作端-重新发布活动，通知待审核+已经审核通过的用户 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index 2470f86c76..01b232aa3b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl NOW() then 'end_sign_up' when NOW() - and = ]]> NOW() then 'in_progress' end as actCurrentState FROM act_info i @@ -311,7 +310,6 @@ WHERE i.DEL_FLAG = '0' AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled' - AND ]]> NOW() ORDER BY i.CREATED_TIME DESC LIMIT 0, #{num} 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 8c875a988a..facc0b366f 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.35 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.36 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 6f369105ae..0f7dd8c6a3 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.35 + 0.3.36 com.epmet resi-mine diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java index 0b5553599b..641b6b410f 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java @@ -55,7 +55,7 @@ public class ResiMineGridController { * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ - @PostMapping("latestgridinfo") + @GetMapping("latestgridinfo") public Result latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); formDTO.setUserId(token.getUserId()); diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 8ea872a683..c986552e72 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient { * @Description 单客户-获取用户最近访问网格 * @Date 2020/8/3 **/ - @PostMapping(value = "epmetuser/gridlatest/latestgridinfo") + @GetMapping(value = "epmetuser/gridlatest/latestgridinfo") Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 4bd1f6c90b..6c7f840ba8 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.104 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.105 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 9d162cf21c..0876fd15f0 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.104 + 0.3.105 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java index ba8fd626ce..61452175ba 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java @@ -138,7 +138,7 @@ public class GridLatestController { * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格 * @Date 2020/8/3 **/ - @PostMapping("latestgridinfo") + @GetMapping("latestgridinfo") public Result latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){ return new Result().ok(gridLatestService.latestGridInfo(formDTO)); }