From ed649460a233f76a91c9e2b34819da98d250dd9a Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 4 Aug 2020 13:47:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=84=E5=88=99=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/entity/PointRuleEntity.java | 5 +++++ .../src/main/resources/db/migration/epmet_point.sql | 1 + .../src/main/resources/mapper/PointRuleDao.xml | 1 + 3 files changed, 7 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java index 47d84305a2..ce47c3ca40 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRuleEntity.java @@ -82,6 +82,11 @@ public class PointRuleEntity extends BaseEpmetEntity { */ private String upLimitPrefix; + /** + * 上限积分计算周期；不限：unlimit；首次：first；天：day；月：周：week；month；年：year + */ + private String rulePeriod; + /** * 获得积分值 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql index de6294d923..88088724de 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/epmet_point.sql @@ -9,6 +9,7 @@ CREATE TABLE `point_rule` ( `UP_LIMIT` int(11) DEFAULT '-1' COMMENT '积分上限 -1表示不涉及积分上限；', `UP_LIMIT_DESC` varchar(64) DEFAULT NULL COMMENT '积分上限描述', `UP_LIMIT_PREFIX` varchar(64) DEFAULT '' COMMENT '积分示例中 积分上限前缀', + `RULE_PERIOD` varchar(32) DEFAULT NULL COMMENT '上限积分计算周期；不限：unlimit；首次：first；天：day；月：周：week；month；年：year', `POINT` int(11) DEFAULT '0' COMMENT '单位积分值', `POINT_UNIT` varchar(32) DEFAULT NULL COMMENT '获得积分单位 次：time；分钟：minute；小时：hour', `ENABLED_FLAG` varchar(1) DEFAULT '0' COMMENT '是否启用 0-否，1-是', diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml index f1001ae7d9..5171f21a59 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml @@ -13,6 +13,7 @@ + From 12022593715d6782a424984ca51b33fba1e2f818 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 4 Aug 2020 14:34:25 +0800 Subject: [PATCH 2/4] heart+1=>34 --- .../deploy/docker-compose-dev.yml | 2 +- .../epmet-heart/epmet-heart-server/pom.xml | 2 +- .../service/impl/WorkActServiceImpl.java | 28 +++++++++++++------ 3 files changed, 21 insertions(+), 11 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 3c8a292991..361df3c0cb 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.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.34 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 252207487f..5acb62bf73 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.33 + 0.0.34 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index a627207faa..02e047bf58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -413,8 +413,10 @@ public class WorkActServiceImpl implements WorkActService { textScanParamDTO.getTasks().add(taskDTO); }); Result contentSyncScanRes = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("内容审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("内容审核返参:"+JSON.toJSONString(contentSyncScanRes)); if (!contentSyncScanRes.success()) { - logger.error("活动详情内容审核接口失败,返参:", JSON.toJSONString(contentSyncScanRes)); + logger.warn("活动详情内容审核接口失败,返参:", JSON.toJSONString(contentSyncScanRes)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!contentSyncScanRes.getData().isAllPass()) { @@ -433,8 +435,10 @@ public class WorkActServiceImpl implements WorkActService { imgScanParamDTO.getTasks().add(task); }); Result imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO); + logger.info("图片审核入参:"+JSON.toJSONString(imgScanParamDTO)); + logger.info("图片审核返参:"+JSON.toJSONString(imgScanResult)); if (!imgScanResult.success()){ - logger.error("活动详情图片审核接口失败,返参:", JSON.toJSONString(imgScanResult)); + logger.warn("活动详情图片审核接口失败,返参:", JSON.toJSONString(imgScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!imgScanResult.getData().isAllPass()) { @@ -459,12 +463,14 @@ public class WorkActServiceImpl implements WorkActService { taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); textScanParamDTO.getTasks().add(taskDTO); Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("活动报名条件审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("活动报名条件审核返参:"+JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { - logger.error("活动报名条件审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); + logger.warn("活动报名条件审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.error("活动报名条件审核失败,报名条件:",requirement); + logger.warn("活动报名条件审核失败,报名条件:",requirement); throw new RenException(EpmetErrorCode.ACT_REQ_SCAN_FAILED.getCode()); } } @@ -485,16 +491,18 @@ public class WorkActServiceImpl implements WorkActService { coverImgtask.setUrl(coverPic); coverPicScanParamDTO.getTasks().add(coverImgtask); Result coverPicScanRes = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), coverPicScanParamDTO); + logger.info("活动封面图审核入参:"+JSON.toJSONString(coverPicScanParamDTO)); + logger.info("活动封面图审核返参:"+JSON.toJSONString(coverPicScanRes)); if (!coverPicScanRes.success()){ - logger.error("活动封面审核失败接口返回失败,返参:", JSON.toJSONString(coverPicScanRes)); + logger.warn("活动封面审核失败接口返回失败,返参:", JSON.toJSONString(coverPicScanRes)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!coverPicScanRes.getData().isAllPass()) { - logger.error("活动封面审核失败,封面图片地址:",coverPic); + logger.warn("活动封面审核失败,封面图片地址:",coverPic); throw new RenException(EpmetErrorCode.ACT_COVER_PIC_SCAN_FAILED.getCode()); } } - logger.info("活动封面审核成功"); + logger.info("活动封面图审核成功"); } /** @@ -511,12 +519,14 @@ public class WorkActServiceImpl implements WorkActService { taskDTO.setDataId(UUID.randomUUID().toString().replace("-", "")); textScanParamDTO.getTasks().add(taskDTO); Result textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO); + logger.info("活动标题审核入参:"+JSON.toJSONString(textScanParamDTO)); + logger.info("活动标题审核返参:"+JSON.toJSONString(textSyncScanResult)); if (!textSyncScanResult.success()) { - logger.error("活动标题审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); + logger.warn("活动标题审核接口返回失败,返参:", JSON.toJSONString(textSyncScanResult)); throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); } else { if (!textSyncScanResult.getData().isAllPass()) { - logger.error("活动标题审核失败,标题内容:",title); + logger.warn("活动标题审核失败,标题内容:",title); throw new RenException(EpmetErrorCode.ACT_TITLE_SCAN_FAILED.getCode()); } } From 15d802318f8c41f0d97f0cd761783619f4938287 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 14:43:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=9F=8E=E9=98=B3=EF=BD=9C=EF=BD=9C?= =?UTF-8?q?=E5=85=9A=E7=BE=A4e=E4=BA=8B=E9=80=9A=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/ComponentVerifyTicketServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 0a513f7ae6..6d4aba484a 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 @@ -430,6 +430,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe authCodeDao.insertRedirectAuthCode(formDTO); //authCode存缓存 redisThird.setAuthCode(formDTO); + this.authInfoByAuthCode(authCode, masterCustomerId, clientType); log.info("=======================公众号的客户id为："+finalCustomerId); From 26b85e1ad9269f0175de587204109290bcf07659 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 4 Aug 2020 14:44:35 +0800 Subject: [PATCH 4/4] =?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 ba47e33980..3f887b709c 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.98 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.99 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 613f9ba7d5..952e9f8fb9 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.98 + 0.0.99 com.epmet