From 4990f8809cf213fc5b5eaccfc24fbd3d5b60e7d8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Aug 2020 17:08:33 +0800 Subject: [PATCH 01/27] heart36 --- .../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 cab00271a7..df7b9c1d18 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.35 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.36 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 44cedf7a6f..9d64ff6c04 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.35 + 0.0.36 com.epmet epmet-heart From c97b8d5df5fc6b42136e99bcca880fb501ea1394 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 4 Aug 2020 17:09:41 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index bd8d3a498f..44cda06ec4 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.59 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.62 ports: - "8090:8090" network_mode: host # 使用现有网络 From c9a68a2154d9cf93772433fc3961d6d9b098dadf Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 4 Aug 2020 17:15:19 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E7=A7=AF=E5=88=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MqPointCallbackController.java | 2 +- .../impl/UserPointActionLogServiceImpl.java | 4 +-- .../java/com/epmet/utils/ModuleConstant.java | 5 +--- .../mapper/UserPointActionLogDao.xml | 2 +- .../resources/mapper/UserPointTotalDao.xml | 2 +- .../com/epmet/redis/UserBaseInfoRedis.java | 30 ++++++++++++++++++- 6 files changed, 35 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java index 47cf9bd8b7..df85fc7a91 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java @@ -77,7 +77,7 @@ public class MqPointCallbackController { try { //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. formList.forEach(obj -> { - userPointActionLogService.grantPointByEvent(EventEnum.ACTIVE_INSERT_LIVE.getEventTag(),obj); + userPointActionLogService.grantPointByEvent(EventEnum.REGISTER_VOLUNTEER.getEventTag(),obj); }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 3bac5c525f..0f33787a49 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -361,8 +361,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl SELECT EVENT_NAME AS TITLE, - EVENT_STATEMENT AS REMARK, + IFNULL(EVENT_STATEMENT,'') AS REMARK, CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT) ELSE POINT END AS point, DATE_FORMAT(CREATED_TIME,'%Y-%m-%d') AS DATE, DATE_FORMAT(CREATED_TIME,'%H:%i') AS TIME diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml index cc797271a4..db72188a9e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml @@ -40,7 +40,7 @@ point.total_point, @point := point.total_point FROM - ( SELECT * FROM user_point_total ORDER BY total_point DESC ) point, + ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} ORDER BY total_point DESC ) point, ( SELECT @point := NULL, @rank := 1 ) a diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index ceb8b5c4d1..5da4155b92 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -26,12 +26,14 @@ import com.epmet.constant.UserRedisKeys; import com.epmet.dao.GridLatestDao; import com.epmet.dao.RegisterRelationDao; import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dao.UserWechatDao; import com.epmet.dto.form.BelongGridNameFormDTO; import com.epmet.dto.result.BelongGridNameResultDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserBaseInfoEntity; +import com.epmet.entity.UserWechatEntity; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; @@ -39,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.lang.reflect.Field; +import java.util.List; import java.util.Map; import static com.epmet.commons.tools.redis.RedisUtils.NOT_EXPIRE; @@ -61,6 +64,8 @@ public class UserBaseInfoRedis { private GovOrgOpenFeignClient govOrgOpenFeignClient; @Autowired private GridLatestDao gridLatestDao; + @Autowired + private UserWechatDao userWechatDao; public void delete(Object[] ids) { @@ -102,9 +107,11 @@ public class UserBaseInfoRedis { } //缓存中没有数据，先查数据库，放入缓存后再返回 UserBaseInfoResultDTO baseInfo = userBaseInfoDao.selectListByUserIdList(userId); + if(null != baseInfo && StringUtils.isNotBlank(baseInfo.getId())){ - RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + //如果没有首次注册网格，则没有网格名称(xx机关-xx网格)、显示昵称(xx网格-x先生/女士) + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ baseInfo.setCustomerId(relation.getCustomerId()); BelongGridNameFormDTO gridParam = new BelongGridNameFormDTO(); @@ -140,6 +147,27 @@ public class UserBaseInfoRedis { } set(baseInfo); return baseInfo; + }else{ + //如果没有，说明这里是陌生人 + //陌生人不放入缓存，也不更新用户基础信息表 + baseInfo = new UserBaseInfoResultDTO(); + baseInfo.setUserId(userId); + List wechatInfo = userWechatDao.selectByUserId(userId); + if(null != wechatInfo && !wechatInfo.isEmpty()){ + baseInfo.setNickname(wechatInfo.get(NumConstant.ZERO).getNickname()); + }else{ + return null; + } + RegisterRelationEntity relation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + if(null != relation && StringUtils.isNotBlank(relation.getGridId())){ + baseInfo.setCustomerId(relation.getCustomerId()); + }else{ + LatestGridInfoResultDTO gridLatest = + gridLatestDao.selectLatestGridInfoByUserId(userId); + if(null != gridLatest){ + baseInfo.setCustomerId(gridLatest.getCustomerId()); + } + } } } From 84ebd0d0d07ed93f8f365946ac0af9ec6c4ad8c5 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 4 Aug 2020 17:18:37 +0800 Subject: [PATCH 04/27] =?UTF-8?q?user=20=20=20point=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-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/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index de879b6140..6568614a58 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.28 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.29 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 192bf1dba9..14f20cec2b 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.28 + 0.0.29 epmet-point com.epmet 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 d409fc8a91..3c0801797b 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.106 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.107 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 427be0755d..173587ae25 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.106 + 0.3.107 com.epmet epmet-user From bf6467c2a24c65b6d8aa0cd78d29f93f0dd4b05c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 17:34:17 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E9=83=A8=E7=BD=B2voice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index dc3fd19cdc..205d8b40ba 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.64 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.65 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index acf7b00cf9..2f4f961274 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.64 + 0.3.65 gov-voice com.epmet From 63aeeb9b7a26be88704c7c48102733554ab35e18 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 4 Aug 2020 17:43:25 +0800 Subject: [PATCH 06/27] =?UTF-8?q?user=20=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- .../src/main/java/com/epmet/redis/UserBaseInfoRedis.java | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) 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 3c0801797b..212fd27bf0 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.107 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.108 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 173587ae25..c914d5b088 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.107 + 0.3.108 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index 5da4155b92..bfb4ff6110 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -155,6 +155,9 @@ public class UserBaseInfoRedis { List wechatInfo = userWechatDao.selectByUserId(userId); if(null != wechatInfo && !wechatInfo.isEmpty()){ baseInfo.setNickname(wechatInfo.get(NumConstant.ZERO).getNickname()); + if(StringUtils.isBlank(baseInfo.getNickname())){ + baseInfo.setNickname(ModuleConstant.EMPTY_STR); + } }else{ return null; } @@ -170,6 +173,8 @@ public class UserBaseInfoRedis { } } + return baseInfo; + } return null; From 723207f55d9c10548c44accbd97fdb6def732e4a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 17:47:50 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E9=83=A8=E7=BD=B2voice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 205d8b40ba..4050fb0548 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.65 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.66 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 2f4f961274..9267448dea 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.65 + 0.3.66 gov-voice com.epmet From fc451092eaba0bc355cba8e67fce3d2817ac142f Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 4 Aug 2020 17:54:43 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 3f21aa2d58..1549c94c27 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.66 ports: - "8105:8105" network_mode: host # 使用现有网络 From 97b957f976efec4eb6d9fd7d1ac8ad760a25602a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 17:56:40 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E5=8E=BB=E9=99=A4bug=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PublicUserLoginServiceImpl.java | 7 ------- .../service/impl/ComponentVerifyTicketServiceImpl.java | 7 ------- 2 files changed, 14 deletions(-) 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 82c6875518..52b8fce60b 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,8 +221,6 @@ 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()); } @@ -240,7 +238,6 @@ 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())) { @@ -248,7 +245,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService { } //4-3.token存入redis 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()); @@ -283,16 +279,13 @@ 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-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index 6d4aba484a..5994769f3e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -417,23 +417,17 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe String authAppId = authorizationInfoResultDTO.getAuthorizer_appid(); List fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos(); String finalCustomerId = customerId;// - log.info("新customerId为："+customerId); - log.info("新finalCustomerId为："+finalCustomerId); fixationAppIdResultDTOS.forEach(fixationAppId -> { if (fixationAppId.getAppId().equals(authAppId)){ // TODO 是城阳项目或者党群e事通 // crm表中的customerId【原customerId】 String masterCustomerId = fixationAppId.getMasterCustomerId(); - log.info("老customerId为："+masterCustomerId); formDTO.setCustomerId(masterCustomerId); authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType); authCodeDao.insertRedirectAuthCode(formDTO); //authCode存缓存 redisThird.setAuthCode(formDTO); this.authInfoByAuthCode(authCode, masterCustomerId, clientType); - - log.info("=======================公众号的客户id为："+finalCustomerId); - ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO(); modifyCustomer.setOldCustomerId(finalCustomerId); modifyCustomer.setNewCustomerId(masterCustomerId); @@ -441,7 +435,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe // 管理员授权 CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId); - log.info("=======================公众号的客户id为："+finalCustomerId); customerManager.setCustomerId(finalCustomerId); operCrmOpenFeignClient.addManager(customerManager); } From 37b9ca48901065e906e4795ecb1412746a05a3a9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 4 Aug 2020 18:07:31 +0800 Subject: [PATCH 10/27] =?UTF-8?q?point=E7=A7=AF=E5=88=86=E6=A0=B8=E9=94=80?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=94=A8=E6=88=B7=E7=9A=84=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=EF=BC=88=E9=99=8C=E7=94=9F=E4=BA=BA=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PointVerificationLogServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index f4f0a88b7b..f32e1f607f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -355,7 +355,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl Date: Tue, 4 Aug 2020 18:14:06 +0800 Subject: [PATCH 11/27] point +1 30 --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 6568614a58..70059b5963 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.29 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.30 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 14f20cec2b..75c0e6f4e2 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.29 + 0.0.30 epmet-point com.epmet From a85dce3f510cdc12f040b7096d518ae6a86dbb5c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 18:40:13 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20voice=E9=94=99?= =?UTF-8?q?=E8=AF=AF=20=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice-server/deploy/docker-compose-dev.yml | 2 +- .../gov-voice-server/deploy/docker-compose-test.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- .../db/migration/V0.0.2__addAutoPublish.sql | 13 +++++++------ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 4050fb0548..7fa5341481 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.66 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 1549c94c27..5c68cbb0c9 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.66 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.67 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 9267448dea..a593e507c0 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.66 + 0.3.67 gov-voice com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql index d900552fc2..330edc5ea7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql @@ -1,6 +1,7 @@ -ALTER TABLE `epmet_gov_voice`.`article` -ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`; -ALTER TABLE `epmet_gov_voice`.`draft` -ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`; -ALTER TABLE `epmet_gov_voice`.`article` -ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`; \ No newline at end of file +-- ALTER TABLE `epmet_gov_voice`.`article` +-- ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`; +-- ALTER TABLE `epmet_gov_voice`.`draft` +-- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`; +-- ALTER TABLE `epmet_gov_voice`.`article` +-- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`; +select 0; \ No newline at end of file From b76fbb99625e89c565bcbc8be999e88dfed3f685 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 21:08:03 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E9=83=A8=E7=BD=B2common-service=EF=BC=8C?= =?UTF-8?q?point=EF=BC=8Cheart=EF=BC=8Ccrm=EF=BC=8Ccustomize=EF=BC=8Cacces?= =?UTF-8?q?s=EF=BC=8Cuser=EF=BC=8Cmessage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-test.yml | 2 +- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- .../epmet-message-server/deploy/docker-compose-test.yml | 2 +- .../epmet-point-server/deploy/docker-compose-test.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-test.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/deploy/docker-compose-dev.yml | 2 +- .../oper-customize-server/deploy/docker-compose-test.yml | 2 +- epmet-module/oper-customize/oper-customize-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index e44c92ddd7..65d713b149 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.5 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.6 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 1156199182..8d93ac0714 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.36 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml index 739e063a0a..110a88c288 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.25 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.27 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index adaebe09d4..a0e2b2defc 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.30 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml index f70a8a27cc..197b6e3b6d 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.38 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index ef997b58c6..2d7934af8e 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.62 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.63 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index 44cda06ec4..19896e77f4 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.63 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 46d0c5d004..e46d11bcc9 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.62 + 0.3.63 com.epmet oper-crm diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml index 859970bc4c..406908df87 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.24 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.25 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml index 43b168ab93..b8ab5e096e 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.25 ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 73c01696fa..88da5bc668 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.24 + 0.3.25 com.epmet oper-customize diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index 741d364bfe..4e08b6b333 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.106 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.108 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From 1fd821fc4dcb127a7c54414149509111bf29084c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 21:33:19 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E9=83=A8=E7=BD=B2common-service=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BF=E8=81=94=E4=BA=91=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common-service-server/deploy/docker-compose-dev.yml | 2 +- .../common-service-server/deploy/docker-compose-test.yml | 2 +- .../epmet-common-service/common-service-server/pom.xml | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml index d60cd48b38..35de411d07 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.6 + image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.7 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml index 65d713b149..ff123e8c38 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.6 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.7 ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 58ace53b09..8c65ae7e4a 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.6 + 0.3.7 com.epmet epmet-common-service @@ -153,6 +153,11 @@ true + + https://epmet-dev.elinkservice.cn/estos/ + producerService/producer/sendMsg + 20200804181646184507453a2e9aab76edc550405f80920af + 96d788191a10ff57a125157183413004 From 9b8825a6a055f1e78e397882fedc41242918a90e Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 22:13:55 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E5=8D=87=E7=BA=A7gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/deploy/docker-compose-dev.yml | 2 +- epmet-gateway/deploy/docker-compose-test.yml | 2 +- epmet-gateway/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-gateway/deploy/docker-compose-dev.yml b/epmet-gateway/deploy/docker-compose-dev.yml index ff64fc7166..c15a722894 100644 --- a/epmet-gateway/deploy/docker-compose-dev.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.30 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index 8c74d8c67a..0dffa528b7 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.30 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 197c44b18b..d6d74e1b5b 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.30 com.epmet epmet-cloud From cec1c30db5efa5d503572bb28c95f26adc46eedc Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 4 Aug 2020 22:39:11 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84pom=E9=85=8D=E7=BD=AE=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 18 +++++++++--------- .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../epmet-point/epmet-point-server/pom.xml | 18 +++++++++--------- 6 files changed, 22 insertions(+), 22 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 df7b9c1d18..808e933cd6 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.36 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.37 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 8d93ac0714..2c181a2d06 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.37 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 66b9bbbbfa..dba3114f69 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.36 + 0.0.37 com.epmet epmet-heart @@ -159,11 +159,11 @@ test - + - - epmet - elink@833066 + + epmet + elink@833066 0 r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com @@ -200,11 +200,11 @@ test - + - - epmet_heart_user - EpmEt-db-UsEr + + epmet_heart_user + EpmEt-db-UsEr 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 70059b5963..17fb954689 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.30 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.31 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index a0e2b2defc..d21875e037 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.30 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.31 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 75c0e6f4e2..55a2f16d7e 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.30 + 0.0.31 epmet-point com.epmet @@ -158,11 +158,11 @@ test - + - - epmet - elink@833066 + + epmet + elink@833066 0 r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com @@ -193,11 +193,11 @@ test - + - - epmet_point_user - EpmEt-db-UsEr + + epmet_point_user + EpmEt-db-UsEr 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com From d6053a8bfbca590c08e37c11c7fd39e0364144b4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 5 Aug 2020 09:35:39 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=BA=E5=89=8D=E5=A4=A9=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E8=A2=AB=E4=BD=BF=E7=94=A8=E6=AC=A1=E6=95=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/voice/ArticleDao.java | 8 +++++--- .../epmet/service/impl/StatsPublicityServiceImpl.java | 6 +++--- .../java/com/epmet/service/voice/ArticleService.java | 8 +++++--- .../com/epmet/service/voice/impl/ArticleServiceImpl.java | 9 ++++++--- .../src/main/resources/mapper/voice/ArticleDao.xml | 2 +- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java index 8ad5156de5..1d0d92784b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java @@ -23,6 +23,7 @@ import com.epmet.entity.voice.ArticleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -45,11 +46,12 @@ public interface ArticleDao extends BaseDao { List getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType); /** - * desc:根据客户Id 和发布时间 获取文章数据 + * desc:根据客户Id 和创建时间 获取文章数据 * * @param customerId - * @param publishDate + * @param startTime + * @param endTime * @return */ - List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate); + List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index bcc55ede28..e507b0e8ec 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -598,14 +598,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //转换为 需要插入的Entity Map dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o)); + Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); + Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN); //获取当天的业务数据 //1获取文章及机关id,网格Id - List publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate)); + List publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime); if (!CollectionUtils.isEmpty(publishedArticleList)) { //KEY 文章Id Map articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o)); - Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); - Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN); //2 获取文章标签 List articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime); if (!CollectionUtils.isEmpty(articleTagsList)) { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java index ce6025a17a..0cd4e5838a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO; import com.epmet.entity.voice.ArticleEntity; +import java.util.Date; import java.util.List; /** @@ -56,12 +57,13 @@ public interface ArticleService extends BaseService { List getAllGridPublishedCount(String customerId, String publishDate); /** - * desc：根据客户id，发布时间 获取文章数据 + * desc：根据客户id，创建时间 获取文章数据，因为存在当天可以发布之前时间点的数据 所以采用创建时间 * @param customerId - * @param publishDate + * @param startTime + * @param endTime * @return */ - List getPublishedArticleByPublishTime(String customerId, String publishDate); + List getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime); ArticleEntity selectArticleById(String articleId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java index 2a9bd8d17e..8325d99fb0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.service.voice.ArticleService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -63,9 +64,11 @@ public class ArticleServiceImpl extends BaseServiceImpl getPublishedArticleByPublishTime(String customerId, String publishDate) { - checkParam(customerId, publishDate); - return baseDao.getPublishedArticleByDay(customerId,publishDate); + public List getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime) { + if (StringUtils.isBlank(customerId) || startTime == null || endTime == null) { + throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + return baseDao.getPublishedArticleByDay(customerId, startTime, endTime); } @Override diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml index 0ecf25fb1b..4ac5086bf9 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml @@ -65,7 +65,7 @@ FROM article WHERE - PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR} + CREATED_TIME BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP} AND DEL_FLAG = 0 AND TAGS IS NOT NULL AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} From f996118c5524c267e3ca4eba9db6bc25b4dc9a41 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 5 Aug 2020 09:38:24 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E5=85=A8=E7=BD=91=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/ModuleConstant.java | 3 + .../constant/ThirdRunTimeInfoConstant.java | 2 + .../service/impl/WarrantServiceImpl.java | 92 +++++++++++-------- 3 files changed, 60 insertions(+), 37 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index bbe5ac73b9..bdf4ea37bb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -91,6 +91,9 @@ public interface ModuleConstant { String FROM_CALLBACK = "from_callback"; String APPLICATION_JSON = "application/json"; String _FROM_API = "_from_api"; + String WE_APP_AUDIT = "we_app_audit"; + String TO_USER_NAME = "ToUserName"; + String FROM_USER_NAME = "FromUserName"; /** * 微信模推送给第三方平台方 Content固定格式 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java index 2f0a2f103f..6821a3c1ad 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java @@ -109,4 +109,6 @@ public interface ThirdRunTimeInfoConstant { String SEND_MESSAGE_XML = "要发送的xml内容为：%s"; String CONTENT = "content为：%s"; + + String MSG_TYPE = "消息类型为：%s"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java index 2adf60adeb..d9b753172c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java @@ -106,42 +106,57 @@ public class WarrantServiceImpl implements WarrantService { // 将xml转为map Map result = WXXmlToMapUtil.multilayerXmlToMap(msg); Map xml = (Map) result.get(ModuleConstant.XML); - if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.EVENT_LOW)) { - // TODO 目前来看，msgType = ‘event’ 的是代码审核结果 - Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString()); - CodeAuditRecordFormDTO codeAuditRecord = ConvertUtils.mapToEntity(xml, CodeAuditRecordFormDTO.class); - codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString())); - String toUserName = codeAuditRecord.getToUserName();//小程序原始ID - CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName); - String clientType = customerIdAndClientResultDTO.getClientType(); - String customerId = customerIdAndClientResultDTO.getCustomerId(); - TemplateAndAppIdResultDTO templateAndAppId = codeCustomerDao.selectTemplateAndAppId(customerId, clientType); - String authAppId = templateAndAppId.getAuthAppId(); - String templateId = templateAndAppId.getTemplateId(); - codeAuditRecord.setClientType(clientType); - codeAuditRecord.setCustomerId(customerId); - codeAuditRecord.setAuthAppId(authAppId); - codeAuditRecord.setTemplateId(templateId); - //插入 代码审核 记录 - log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT,xml)); - codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); - // 修改 code_audit_result 中的代码审核结果 - String event = codeAuditRecord.getEvent(); - String codeResult = null; - switch (event) { - case ModuleConstant.WEAPP_AUDIT_SUCCESS: - codeResult = ModuleConstant.AUDIT_SUCCESS; - break; - case ModuleConstant.WEAPP_AUDIT_FAIL: - codeResult = ModuleConstant.AUDIT_FAILED; - break; - case ModuleConstant.WEAPP_AUDIT_DELAY: - codeResult = ModuleConstant.DELAY; - break; + String msgType = xml.get(ModuleConstant.MSG_TYPE).toString(); + log.info(String.format(ThirdRunTimeInfoConstant.MSG_TYPE,msgType)); + String toUserName = null; + String fromUserName = null; + if (msgType.equals(ModuleConstant.EVENT_LOW)) { + String event = xml.get(ModuleConstant.EVENT).toString(); + if (xml.containsKey(ModuleConstant.TO_USER_NAME)){ + toUserName = xml.get(ModuleConstant.TO_USER_NAME).toString(); } - String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); - codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); - }else if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.TEXT)){ + if (xml.containsKey(ModuleConstant.FROM_USER_NAME)){ + fromUserName = xml.get(ModuleConstant.FROM_USER_NAME).toString(); + } + if (event.startsWith(ModuleConstant.WE_APP_AUDIT)) { + // TODO 目前来看，msgType = ‘event’ 的是代码审核结果 + Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString()); + CodeAuditRecordFormDTO codeAuditRecord = ConvertUtils.mapToEntity(xml, CodeAuditRecordFormDTO.class); + codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString())); +// String toUserName = codeAuditRecord.getToUserName();//小程序原始ID + CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName); + String clientType = customerIdAndClientResultDTO.getClientType(); + String customerId = customerIdAndClientResultDTO.getCustomerId(); + TemplateAndAppIdResultDTO templateAndAppId = codeCustomerDao.selectTemplateAndAppId(customerId, clientType); + String authAppId = templateAndAppId.getAuthAppId(); + String templateId = templateAndAppId.getTemplateId(); + codeAuditRecord.setClientType(clientType); + codeAuditRecord.setCustomerId(customerId); + codeAuditRecord.setAuthAppId(authAppId); + codeAuditRecord.setTemplateId(templateId); + //插入 代码审核 记录 + log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml)); + codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord); + // 修改 code_audit_result 中的代码审核结果 +// String event = codeAuditRecord.getEvent(); + String codeResult = null; + switch (event) { + case ModuleConstant.WEAPP_AUDIT_SUCCESS: + codeResult = ModuleConstant.AUDIT_SUCCESS; + break; + case ModuleConstant.WEAPP_AUDIT_FAIL: + codeResult = ModuleConstant.AUDIT_FAILED; + break; + case ModuleConstant.WEAPP_AUDIT_DELAY: + codeResult = ModuleConstant.DELAY; + break; + } + String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord); + codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult); + }else { + this.replyEventMessage(request,response,event,toUserName,fromUserName); + } + }else if (msgType.equals(ModuleConstant.TEXT)){ // TODO 公众号回复消息 MessagePushTextFormDTO messagePushTextFormDTO = ConvertUtils.mapToEntity(xml, MessagePushTextFormDTO.class); Object createTime = xml.get(ModuleConstant.CREATE_TIME); @@ -157,7 +172,7 @@ public class WarrantServiceImpl implements WarrantService { * 1）微信模推送给第三方平台方：文本消息，其中 Content 字段的内容固定为：TESTCOMPONENT_MSG_TYPE_TEXT * 2）第三方平台方立马回应文本消息并最终触达粉丝：Content 必须固定为：TESTCOMPONENT_MSG_TYPE_TEXT_callback */ - if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){ + /*if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){ }else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){ @@ -166,7 +181,10 @@ public class WarrantServiceImpl implements WarrantService { //auth_code String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length()); - } + }*/ + + this.processTextMessage(request,response,content,toUserName,fromUserName); + } log.info("消息与事件接收URL【代码审核结果】结束......"); return ModuleConstant.SUCCESS; From f5e4550ce483af43051fa42a112f3c9c51185020 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 5 Aug 2020 09:39:26 +0800 Subject: [PATCH 19/27] =?UTF-8?q?third=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-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 08e805f726..a509da86ad 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.100 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.101 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 4cc685ec5c..0dd8b4ce55 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.100 + 0.0.101 com.epmet From a8c5e8a16ba7e20af48ceef05a9dc814aed1676a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 5 Aug 2020 09:42:46 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index e86909b2c8..d507e12a9f 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.41 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.42 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 1709484e94..0dfdd97d91 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.41 + 0.3.42 data-statistical com.epmet From 1d43bf2091ec60e2b0c82ff893fe700da4467ef5 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 5 Aug 2020 10:58:12 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E9=9D=9E=E9=80=9A=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6=E8=8E=B7=E5=8F=96=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E6=9C=89=E6=95=88=E7=9A=84=E7=A7=AF=E5=88=86=E8=A7=84?= =?UTF-8?q?=E5=88=99=E6=97=B6=E6=89=93warn=E6=97=A5=E5=BF=97=E4=B8=8D?= =?UTF-8?q?=E6=8A=9B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/UserPointActionLogServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 0f33787a49..52e451ba6e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -333,8 +333,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl【%s】", JSON.toJSON(event))); - throw new RenException("未检测到该用户下有效的积分规则"); + log.warn(String.format("未检测到该用户下有效的积分规则，消息体->【%s】", JSON.toJSON(event))); } From f9b6fd8406b0be1d09217cc1c1fde3b14a7c6a5e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 5 Aug 2020 11:06:26 +0800 Subject: [PATCH 22/27] =?UTF-8?q?pagequery=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerDao.java | 9 +++++++++ .../com/epmet/service/impl/CustomerServiceImpl.java | 3 ++- .../src/main/resources/mapper/CustomerDao.xml | 13 +++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java index dea5f2f40b..49e3525ce9 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/dao/CustomerDao.java @@ -68,6 +68,15 @@ public interface CustomerDao extends BaseDao { **/ List selectCustomerList(@Param("customerName") String customerName); + /** + * @return int + * @param customerName + * @author yinzuomei + * @description 查询有效客户数据(不区分是否在有效期内)【按名称模糊查询】 - 总记录数 + * @Date 2020/8/5 11:02 + **/ + int selectCountByCustomerName(@Param("customerName") String customerName); + /** * desc：获取未删除的所有用户 * @return diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 55505076e7..4e944f2920 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -403,7 +403,8 @@ public class CustomerServiceImpl extends BaseServiceImpl list = baseDao.selectCustomerList(formDTO.getCustomerName()); //PageInfo pi = new PageInfo<>(list); - PageData resultDTO = new PageData(list,list.size()); + int total=baseDao.selectCountByCustomerName(formDTO.getCustomerName()); + PageData resultDTO = new PageData(list,total); return resultDTO; } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml index 1e1c8649d1..8d96205d62 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml @@ -70,6 +70,19 @@ AND customer_name LIKE concat('%', trim(#{customerName}), '%') + + + - -