From d2dc89d73268f3e9aaa52a3a5a701316a5d255c9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 09:48:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E6=A0=87=E9=A2=98=E4=B8=8E=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/UserPointActionLogServiceImpl.java      | 9 ++++++---
 .../src/main/java/com/epmet/utils/ModuleConstant.java    | 2 ++
 2 files changed, 8 insertions(+), 3 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 f57c3d4fbe..763bc831c4 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
@@ -243,11 +243,14 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             String eventStatement = eventName;
 
             if(EventEnum.ACTIVE_INSERT_LIVE.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
-            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_PARTICIPATED_ACT;
+                eventName = ModuleConstant.EVENT_NAME_ADD_LIVE;
                 eventStatement = event.getRemark();
+            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
+                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
+                //志愿者认证不需要备注
             }else{
+                //如果不是添加实况和志愿者注册
+                //则统一使用EventEnum中的eventDesc作为eventStatement，eventTag作为eventId
                 eventName = EventEnum.getEnum(eventCode).getEventDesc();
                 eventStatement = event.getRemark();
             }
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
index e30dac5c21..0d66e32fba 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java
@@ -118,4 +118,6 @@ public interface ModuleConstant extends Constant {
     String EVENT_NAME_VOLUNTEER = "志愿者认证";
 
     String EVENT_NAME_PARTICIPATED_ACT = "参与活动";
+
+    String EVENT_NAME_ADD_LIVE = "添加活动实况";
 }

From 043909d9013dbfb80728be02666b1bcce4687ece Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 10:11:31 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=AF=E5=88=86=20=20=2021=20=20=20->=20?=
 =?UTF-8?q?=20=20=2022?=
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 +-
 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 d1f4e31009..f06ae5ae1a 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.21
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.22
     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 14295d4bfd..ef7c14771a 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.21</version>
+    <version>0.0.22</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

From 9cdda03fbd09efc75d54f93b2e5f6c465f75d874 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 4 Aug 2020 10:36:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?paUser=E6=8F=92=E5=85=A5=E6=B7=BB=E5=8A=A0S?=
 =?UTF-8?q?ource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/PaCustomerServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
index ae9d730829..8ff724fb1d 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             userEntity.setPhone(formDTO.getPhone());
             userEntity.setRealName(formDTO.getSurName());
             userEntity.setGender(formDTO.getGender().toString());
+            userEntity.setSource(formDTO.getSource());
             if (paUserDao.insert(userEntity) < NumConstant.ONE) {
                 throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
             }

From e2c98ddf0d3b6c80e7f4c2cfb5dc15ec478f6b01 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 4 Aug 2020 10:37:40 +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 73010e453f..7860ed04ee 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.93
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.94
     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 571cad941d..10634b56e1 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 @@
 <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.93</version>
+    <version>0.0.94</version>
 
     <parent>
         <groupId>com.epmet</groupId>