Merge remote-tracking branch 'origin/dev' into release

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 # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.33</version>
+    <version>0.0.34</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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<SyncScanResult> 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<SyncScanResult> 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<SyncScanResult> 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<SyncScanResult> 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<SyncScanResult> 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());
             }
         }

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;
+
     /**
      * 获得积分值
      */

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-是',

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRuleDao.xml

@@ -13,6 +13,7 @@
         <result property="upLimit" column="UP_LIMIT"/>
         <result property="upLimitDesc" column="UP_LIMIT_DESC"/>
         <result property="upLimitPrefix" column="UP_LIMIT_PREFIX"/>
+        <result property="rulePeriod" column="RULE_PERIOD"/>
         <result property="point" column="POINT"/>
         <result property="pointUnit" column="POINT_UNIT"/>
         <result property="enabledFlag" column="ENABLED_FLAG"/>

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 # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.98</version>
+    <version>0.0.99</version>
 
     <parent>
         <groupId>com.epmet</groupId>

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);