From 37b9ca48901065e906e4795ecb1412746a05a3a9 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 18:07:31 +0800
Subject: [PATCH 1/3] =?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<PointVerifi
         String userNickname = ModuleConstant.EMPTY_STR;
         if(userResult.success() && null != userResult.getData() && !userResult.getData().isEmpty()){
             userHeadPhoto = userResult.getData().get(NumConstant.ZERO).getHeadImgUrl();
-            userNickname = userResult.getData().get(NumConstant.ZERO).getShowName();
+            userNickname = StringUtils.isBlank(userResult.getData().get(NumConstant.ZERO).getShowName()) ? StringUtils.isBlank(userResult.getData().get(NumConstant.ZERO).getRealName()) ? userResult.getData().get(NumConstant.ZERO).getNickname() : userResult.getData().get(NumConstant.ZERO).getRealName(): userResult.getData().get(NumConstant.ZERO).getShowName();
         }
         result.setUserHeadPhoto(userHeadPhoto);
         result.setUserNickname(userNickname);

From 6dfae90379c32a09437a4d81780f1e2aabc4e832 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 4 Aug 2020 18:14:06 +0800
Subject: [PATCH 2/3] 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.29</version>
+    <version>0.0.30</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

From f056f99cfa9195db89cbddac5e1034994fa7b529 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Tue, 4 Aug 2020 18:27:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V0.0.2__add_event.sql   | 6 +++---
 epmet-module/epmet-heart/epmet-heart-server/pom.xml         | 6 +++---
 .../java/com/epmet/service/impl/PointRuleServiceImpl.java   | 5 +++++
 .../src/main/resources/db/migration/epmet_point.sql         | 4 ++--
 .../db/migration/V0.0.3__add_heart_function_record.sql      | 1 +
 5 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.3__add_heart_function_record.sql

diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
index 72b53eb87b..25bc72de1d 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/db/migration/V0.0.2__add_event.sql
@@ -17,6 +17,6 @@ CREATE TABLE `event` (
   PRIMARY KEY (`ID`),
   UNIQUE KEY `unx_event_code` (`EVENT_CODE`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件表';
-INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'register_volunteer', '注册志愿者', '注册志愿者获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17');
-INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'active_send_point', '活动发放积分', '参加活动获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
-INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '202007161443499985fa2d397436d10356542134c8f008c48', '党群e事通', 'publist_active_live', '添加活动实况', '添加活动实况获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
\ No newline at end of file
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'epmet_heart', '20200804181646184507453a2e9aab76edc550405f80920af', '党群e事通', 'register_volunteer', '注册志愿者', '注册志愿者获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:19:17', 'APP_USER', '2020-07-23 14:19:17');
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'epmet_heart', '20200804181646184507453a2e9aab76edc550405f80920af', '党群e事通', 'active_send_point', '活动发放积分', '参加活动获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
+INSERT INTO `epmet_common_service`.`event`(`ID`, `CLASS_ID`, `APP_ID`, `APP_NAME`, `EVENT_CODE`, `EVENT_NAME`, `EVENT_DESC`, `FUNCTION_ID`, `IS_COMMON`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'epmet_heart', '20200804181646184507453a2e9aab76edc550405f80920af', '党群e事通', 'publist_active_live', '添加活动实况', '添加活动实况获得积分', '43addd0735230c01eedbb38d721076b0', '0', '0', 0, 'APP_USER', '2020-07-23 14:16:49', 'APP_USER', '2020-07-23 14:16:49');
\ No newline at end of file
diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
index 44cedf7a6f..7e56df42a7 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml
@@ -183,8 +183,8 @@
                 <!--亿联云消息网关配置-->
                 <elink.mq.host>https://epmet-dev.elinkservice.cn/estos/</elink.mq.host>
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
-                <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
-                <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
+                <elink.mq.appId>20200804181646184507453a2e9aab76edc550405f80920af</elink.mq.appId>
+                <elink.mq.token>96d788191a10ff57a125157183413004</elink.mq.token>
                 <!--测试钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
@@ -222,7 +222,7 @@
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <openapi.scan.server.url>https://epmet-open.elinkservice.cn/api/epmetscan/api</openapi.scan.server.url>
                 <!--亿联云消息网关配置-->
-                <elink.mq.host>https://epmet-dev.elinkservice.cn/estos/</elink.mq.host>
+                <elink.mq.host>https://epmet-cloud.elinkservice.cn/estos/</elink.mq.host>
                 <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
                 <elink.mq.appId>202007161443499985fa2d397436d10356542134c8f008c48</elink.mq.appId>
                 <elink.mq.token>52d9d9b0e7d0eb5b8b81c205b579e07c</elink.mq.token>
diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index f16259b3a2..538615aaf0 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -58,6 +58,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -217,6 +218,10 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 				}
 				PointRuleEntity entity = ConvertUtils.sourceToTarget(defaultRule, PointRuleEntity.class);
 				entity.setId("");
+				entity.setCreatedBy("");
+				entity.setCreatedTime(new Date());
+				entity.setUpdatedBy("");
+				entity.setUpdatedTime(new Date());
 				entity.setCustomerId(customerDTO.getId());
 				insertList.add(entity);
 			}
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 5c9c0c8dd4..da1bc7a45e 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
@@ -65,8 +65,8 @@ CREATE TABLE `point_rule_default` (
   UNIQUE KEY `unx_event_code` (`EVENT_CODE`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分规则默认表';
 
-INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', '注册志愿者', '首次注册志愿者获得积分 ', 'register_volunteer', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', '', 'first', 7, 'time', '0', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
-INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', '添加实况', '添加活动实况获得积分', 'active_insert_live', '43addd0735230c01eedbb38d721076b0', 'plus', 30, '每日该项所得积分总和上限，为0时表示没有积分上限', '每日获得积分上限', 'day', 20, 'time', '0', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
+INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', '注册志愿者', '首次注册志愿者获得积分 ', 'register_volunteer', '43addd0735230c01eedbb38d721076b0', 'plus', 0, '无', '', 'first', 5, 'time', '0', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
+INSERT INTO `epmet_point`.`point_rule_default`(`ID`, `RULE_NAME`, `RULE_DESC`, `EVENT_CODE`, `FUNCTION_ID`, `OPERATE_TYPE`, `UP_LIMIT`, `UP_LIMIT_DESC`, `UP_LIMIT_PREFIX`, `RULE_PERIOD`, `POINT`, `POINT_UNIT`, `ENABLED_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', '添加实况', '添加活动实况获得积分', 'active_insert_live', '43addd0735230c01eedbb38d721076b0', 'plus', 5, '每日该项所得积分总和上限，为0时表示没有积分上限', '每日获得积分上限', 'day', 5, 'time', '0', '0', 0, 'APP_USER', '2020-07-23 14:48:56', 'APP_USER', '2020-07-23 14:48:56');
 
 
 CREATE TABLE `point_verification_log` (
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.3__add_heart_function_record.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.3__add_heart_function_record.sql
new file mode 100644
index 0000000000..bed1fe3b64
--- /dev/null
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.3__add_heart_function_record.sql
@@ -0,0 +1 @@
+INSERT INTO `epmet_oper_customize`.`function`(`ID`, `FUNCTION_NAME`, `FUNCTION_ICON`, `FUNCTION_GROUP`, `SHOPPING_STATUS`, `FUNCTION_EXPLAIN`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('43addd0735230c01eedbb38d721076b0', '爱心互助', 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20200723/9fafa710255b431fb59b877179abb79c.png', 0, 1, '爱心互助功能', 0, 0, '12', '2020-07-23 13:47:30', '12', '2020-07-23 13:47:30');
\ No newline at end of file