From 3462a19f48a250ab53caa814407ee08007275b55 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 3 Aug 2020 17:56:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5-=20=E6=B4=BB=E5=8A=A8=E5=BD=93=E5=89=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ActInfoServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 Date: Tue, 4 Aug 2020 09:39:16 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 532a1ec5b2..2c11d426dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -303,7 +303,6 @@ and 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} From 7a7176796e3ed5b3ac2087bbf6f43dd659221a85 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 4 Aug 2020 09:44:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?post=E8=AF=B7=E6=B1=82=E6=94=B9get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/grid/controller/ResiMineGridController.java | 2 +- .../src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 2 +- .../main/java/com/epmet/controller/GridLatestController.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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/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)); } From e77218de593ccd6c71ce998da6cedb303968d821 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 4 Aug 2020 09:47:48 +0800 Subject: [PATCH 4/8] =?UTF-8?q?post=E8=AF=B7=E6=B1=82=E6=94=B9get=20=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi-mine/resi-mine-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-mine/resi-mine-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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-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 From d34509f12aa29b7a8b7fbbf7456b65f50cff3839 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 4 Aug 2020 09:56:43 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E3=80=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9E=E5=86=B5=EF=BC=8C=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/constant/ActMessageConstant.java | 10 ---------- .../epmet/service/impl/ActLiveRecServiceImpl.java | 12 +++++++++--- .../epmet/service/impl/VolunteerInfoServiceImpl.java | 3 --- 3 files changed, 9 insertions(+), 16 deletions(-) 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/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java index d1f11ccf68..30d9b151ec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils; import com.epmet.constant.ActMessageConstant; import com.epmet.dao.ActLivePicDao; import com.epmet.dao.ActLiveRecDao; +import com.epmet.dto.ActInfoDTO; import com.epmet.dto.ActLivePicDTO; import com.epmet.dto.ActLiveRecDTO; import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO; @@ -48,6 +49,7 @@ import com.epmet.entity.ActLivePicEntity; import com.epmet.entity.ActLiveRecEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.redis.ActLiveRecRedis; +import com.epmet.service.ActInfoService; import com.epmet.service.ActLiveRecService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -77,6 +79,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 09:59:00 +0800 Subject: [PATCH 6/8] heart+1=>31 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 From 202debaf950317a98a085ae5382008ff1f87064e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 10:13:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E6=B7=BB=E5=8A=A0log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PublicUserLoginServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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); From 4e7fff03b6f36a37be9cabb07de0329342154e4b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 10:15:09 +0800 Subject: [PATCH 8/8] =?UTF-8?q?auth=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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