Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.64
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.65
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/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.3.64</version>
+    <version>0.3.65</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -516,7 +516,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
         }
         Object PublicCustomerResultDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
-        Map<String,Object> map = (Map)jsonObject.get("customer");
+        Map<String,Object> map = (Map)json.get("customer");
         PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
         logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
         return customer;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql

@@ -11,7 +11,7 @@
  Target Server Version : 50728
  File Encoding         : 65001
 
- Date: 30/07/2020 14:11:45
+ Date: 31/07/2020 17:50:23
 */
 
 SET NAMES utf8mb4;
@@ -64,13 +64,13 @@ CREATE TABLE `act_customized`  (
 DROP TABLE IF EXISTS `act_grant_point_log`;
 CREATE TABLE `act_grant_point_log`  (
   `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `REWARD` int(11) NOT NULL,
-  `REMARK` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
-  `OPERATOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-  `SEND_MSG` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
-  `RESPONSE_MSG` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL,
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `REWARD` int(11) NOT NULL COMMENT '积分值，其实就是活动设置的积分',
+  `REMARK` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+  `OPERATOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '当前操作工作人员id',
+  `SEND_MSG` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发送消息体',
+  `RESPONSE_MSG` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '返回消息体',
   `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
   `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
   `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
@@ -423,6 +423,24 @@ CREATE TABLE `latest_act_info`  (
   PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近一次编辑的活动信息' ROW_FORMAT = Compact;
 
+-- ----------------------------
+-- Table structure for user_kindness_time_log
+-- ----------------------------
+DROP TABLE IF EXISTS `user_kindness_time_log`;
+CREATE TABLE `user_kindness_time_log`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `RESI_USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '居民端用户id',
+  `KINDNESS_TIME` int(11) NOT NULL COMMENT '服务时长',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人(工作人员id)',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（操作的时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户爱心时长记录表' ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for volunteer_info
 -- ----------------------------
@@ -443,17 +461,3 @@ CREATE TABLE `volunteer_info`  (
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '志愿者信息' ROW_FORMAT = Dynamic;
 
 SET FOREIGN_KEY_CHECKS = 1;
-
-CREATE TABLE `user_kindness_time_log` (
-  `ID` varchar(64) NOT NULL COMMENT '主键',
-  `ACT_ID` varchar(64) NOT NULL COMMENT '活动id',
-  `RESI_USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id',
-  `KINDNESS_TIME` int(11) NOT NULL COMMENT '服务时长',
-  `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
-  `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
-  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人(工作人员id)',
-  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间（操作的时间）',
-  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
-  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
-  PRIMARY KEY (`ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户爱心时长记录表';

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.14
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.15
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

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.14</version>
+    <version>0.0.15</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.2__addCutomerApp.sql → epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/addCutomerApp.sql

@@ -1,3 +1,4 @@
+#由于程序启动顺序问题 暂不加入flyway
 CREATE TABLE `customer_app` (
   `ID` varchar(64) NOT NULL COMMENT '主键',
   `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id',