Merge branches 'dev' and 'dev_bugfix' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

5 years ago · f687059b2c
43 changed files with 150 additions and 122 deletions
--- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
@ -221,8 +221,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
        //2.用户不存在时不允许登陆
        Map<String,Object> map1 = (Map)jsonObject.get("paUserResult");
        PaUserDTO userDTO = ConvertUtils.mapToEntity(map1, PaUserDTO.class);
-        logger.info("map1的值："+map1);
-        logger.info("userDTO的值："+userDTO);
        if (null == userDTO || StringUtils.isBlank(userDTO.getId())) {
            throw new RenException(EpmetErrorCode.PUBLIC_NOT_EXISTS.getCode());
        }
@ -240,7 +238,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
        String token = this.generateGovWxmpToken(userDTO.getId());
        //4-2.判断是否存在信息，给customerId赋值
        Map<String,Object> map2 = (Map)jsonObject.get("paCustomerResult");
-        logger.info("map2的值："+map2);
        PaCustomerDTO customerDTO = ConvertUtils.mapToEntity(map2, PaCustomerDTO.class);
        String customerId = "";
        if (null != customerDTO && !StringUtils.isBlank(customerDTO.getId())) {
@ -248,7 +245,6 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
        }
        //4-3.token存入redis
        Map<String,Object> map3 = (Map)jsonObject.get("paUserWechatResult");
-        logger.info("map3的值："+map3);
        PaUserWechatDTO wechatDTO = ConvertUtils.mapToEntity(map3, PaUserWechatDTO.class);
        String openid = wechatDTO.getWxOpenId();
        String unionId = (null == wechatDTO.getUnionId() ? "" : wechatDTO.getUnionId());
@ -283,16 +279,13 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
    public UserTokenResultDTO register(RegisterFormDTO formDTO) {
        //1.调用epmet-third服务，完成信息注册
        String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
-        logger.info("data数据为："+data);
        JSONObject toResult = JSON.parseObject(data);
        Result result = ConvertUtils.mapToEntity(toResult, Result.class);
-        logger.info("转换的result结果为："+result);
        if (!result.success()) {
            logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
            throw new RenException(result.getCode());
        }
        Object RegisterResult = result.getData();
-        logger.info("getData()数据为："+RegisterResult);
        JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
        RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);

--- a/epmet-gateway/deploy/docker-compose-dev.yml
+++ b/epmet-gateway/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.29
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.30
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/deploy/docker-compose-test.yml
+++ b/epmet-gateway/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.30
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/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.29</version>
+    <version>0.3.30</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-cloud</artifactId>
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-statistical-server:
    container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.41
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.42
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-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">
-    <version>0.3.41</version>
+    <version>0.3.42</version>
    <parent>
        <artifactId>data-statistical</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java
@ -23,6 +23,7 @@ import com.epmet.entity.voice.ArticleEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

+import java.util.Date;
 import java.util.List;

 /**
@ -45,11 +46,12 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType);

 	/**
-	 * desc:根据客户Id 和发布时间 获取文章数据
+	 * desc:根据客户Id 和创建时间 获取文章数据
 	 *
 	 * @param customerId
-	 * @param publishDate
+	 * @param startTime
+	 * @param endTime
 	 * @return
 	 */
-	List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate);
+	List<ArticleEntity> getPublishedArticleByDay(@Param("customerId") String customerId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java
@ -598,14 +598,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		//转换为 需要插入的Entity
 		Map<String, DimAgencyEntity> dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o));

+		Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
+		Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
 		//获取当天的业务数据
 		//1获取文章及机关id,网格Id
-		List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate));
+		List<ArticleEntity> publishedArticleList = articleService.getPublishedArticleByCreateTime(customerId, startTime, endTime);
 		if (!CollectionUtils.isEmpty(publishedArticleList)) {
 			//KEY 文章Id
 			Map<String, ArticleEntity> articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o));
-			Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN);
-			Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, NumConstant.ONE), DateUtils.DATE_PATTERN);
 			//2 获取文章标签
 			List<ArticleTagsEntity> articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime);
 			if (!CollectionUtils.isEmpty(articleTagsList)) {
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java
@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO;
 import com.epmet.entity.voice.ArticleEntity;

+import java.util.Date;
 import java.util.List;

 /**
@ -56,12 +57,13 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	List<ArticleGridPublishedSummaryDTO> getAllGridPublishedCount(String customerId, String publishDate);

 	/**
-	 * desc：根据客户id，发布时间 获取文章数据
+	 * desc：根据客户id，创建时间 获取文章数据，因为存在当天可以发布之前时间点的数据 所以采用创建时间
 	 * @param customerId
-	 * @param publishDate
+	 * @param startTime
+	 * @param endTime
 	 * @return
 	 */
-	List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate);
+	List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime);

 	ArticleEntity selectArticleById(String articleId);
 }
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java
@ -30,6 +30,7 @@ import com.epmet.service.voice.ArticleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;

+import java.util.Date;
 import java.util.List;

 /**
@ -63,9 +64,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit


 	@Override
-	public List<ArticleEntity> getPublishedArticleByPublishTime(String customerId, String publishDate) {
-		checkParam(customerId, publishDate);
-		return baseDao.getPublishedArticleByDay(customerId,publishDate);
+	public List<ArticleEntity> getPublishedArticleByCreateTime(String customerId, Date startTime, Date endTime) {
+		if (StringUtils.isBlank(customerId) || startTime == null || endTime == null) {
+			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+		}
+		return baseDao.getPublishedArticleByDay(customerId, startTime, endTime);
 	}

 	@Override
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml
@ -65,7 +65,7 @@
        FROM
            article
        WHERE
-            PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR}
+            CREATED_TIME BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP}
            AND DEL_FLAG = 0
            AND TAGS IS NOT NULL
            AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  common-service-server:
    container_name: common-service-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.6
+    image: 192.168.1.130:10080/epmet-cloud-dev/common-service-server:0.3.7
    ports:
      - "8103:8103"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  common-service-server:
    container_name: common-service-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.5
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/common-service-server:0.3.7
    ports:
      - "8103:8103"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-common-service/common-service-server/pom.xml
+++ b/epmet-module/epmet-common-service/common-service-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.3.6</version>
+    <version>0.3.7</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-common-service</artifactId>
@ -153,6 +153,11 @@
                <nacos.ip/>

                <spring.flyway.enabled>true</spring.flyway.enabled>
+                <!--亿联云消息网关配置-->
+                <elink.mq.host>https://epmet-dev.elinkservice.cn/estos/</elink.mq.host>
+                <elink.mq.sendMsgPath>producerService/producer/sendMsg</elink.mq.sendMsgPath>
+                <elink.mq.appId>20200804181646184507453a2e9aab76edc550405f80920af</elink.mq.appId>
+                <elink.mq.token>96d788191a10ff57a125157183413004</elink.mq.token>
            </properties>
        </profile>
        <profile>
--- 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');
+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');
--- 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.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.37
    ports:
      - "8111:8111"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-heart-server:
    container_name: epmet-heart-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.37
    ports:
      - "8111:8111"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml
+++ b/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.36</version>
+    <version>0.0.37</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>epmet-heart</artifactId>
@ -159,11 +159,11 @@
                <spring.profiles.active>test</spring.profiles.active>

                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
+                <datasource.druid.url>
                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                </datasource.druid.url>
+                <datasource.druid.username>epmet</datasource.druid.username>
+                <datasource.druid.password>elink@833066</datasource.druid.password>
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@ -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>
@ -200,11 +200,11 @@
                <spring.profiles.active>test</spring.profiles.active>

                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
+                <datasource.druid.url>
                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_heart_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                </datasource.druid.url>
+                <datasource.druid.username>epmet_heart_user</datasource.druid.username>
+                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
@ -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>
--- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-message-server:
    container_name: epmet-message-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.27
    ports:
      - "8085:8085"
    network_mode: host # 使用现有网络
--- 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.31
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-point-server:
    container_name: epmet-point-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.31
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
--- 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.31</version>
    <parent>
        <artifactId>epmet-point</artifactId>
        <groupId>com.epmet</groupId>
@ -158,11 +158,11 @@
                <spring.profiles.active>test</spring.profiles.active>

                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
+                <datasource.druid.url>
                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
+                </datasource.druid.url>
+                <datasource.druid.username>epmet</datasource.druid.username>
+                <datasource.druid.password>elink@833066</datasource.druid.password>
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@ -193,11 +193,11 @@
                <spring.profiles.active>test</spring.profiles.active>

                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
+                <datasource.druid.url>
                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_point_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
+                </datasource.druid.url>
+                <datasource.druid.username>epmet_point_user</datasource.druid.username>
+                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                <!-- redis配置 -->
                <spring.redis.index>0</spring.redis.index>
                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
--- 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);
 			}
--- 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` (
--- 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.100
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.101
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
--- 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.100</version>
+    <version>0.0.101</version>

    <parent>
        <groupId>com.epmet</groupId>
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java
@ -91,6 +91,9 @@ public interface ModuleConstant {
    String FROM_CALLBACK = "from_callback";
    String APPLICATION_JSON = "application/json";
    String _FROM_API = "_from_api";
+    String WE_APP_AUDIT = "we_app_audit";
+    String TO_USER_NAME = "ToUserName";
+    String FROM_USER_NAME = "FromUserName";

    /**
     * 微信模推送给第三方平台方 Content固定格式
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdRunTimeInfoConstant.java
@ -109,4 +109,6 @@ public interface ThirdRunTimeInfoConstant {
    String SEND_MESSAGE_XML = "要发送的xml内容为：%s";

    String CONTENT = "content为：%s";
+
+    String MSG_TYPE = "消息类型为：%s";
 }
--- 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
@ -417,23 +417,17 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
        String authAppId = authorizationInfoResultDTO.getAuthorizer_appid();
        List<FixationAppIdResultDTO> fixationAppIdResultDTOS = fixationAppIdDao.selectFixationInfos();
        String finalCustomerId = customerId;//
-        log.info("新customerId为："+customerId);
-        log.info("新finalCustomerId为："+finalCustomerId);
        fixationAppIdResultDTOS.forEach(fixationAppId -> {
            if (fixationAppId.getAppId().equals(authAppId)){
                // TODO 是城阳项目或者党群e事通
                //  crm表中的customerId【原customerId】
                String masterCustomerId = fixationAppId.getMasterCustomerId();
-                log.info("老customerId为："+masterCustomerId);
                formDTO.setCustomerId(masterCustomerId);
                authCodeDao.deleteCustomerAuthCode(finalCustomerId,clientType);
                authCodeDao.insertRedirectAuthCode(formDTO);
                //authCode存缓存
                redisThird.setAuthCode(formDTO);
                this.authInfoByAuthCode(authCode, masterCustomerId, clientType);
-
-                log.info("=======================公众号的客户id为："+finalCustomerId);
-
                ModifyCustomerFormDTO modifyCustomer = new ModifyCustomerFormDTO();
                modifyCustomer.setOldCustomerId(finalCustomerId);
                modifyCustomer.setNewCustomerId(masterCustomerId);
@ -441,7 +435,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe

                // 管理员授权
                CustomerManagerFormDTO customerManager = paUserDao.selectManagerInfo(userId);
-                log.info("=======================公众号的客户id为："+finalCustomerId);
                customerManager.setCustomerId(finalCustomerId);
                operCrmOpenFeignClient.addManager(customerManager);
            }
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@ -106,12 +106,24 @@ public class WarrantServiceImpl implements WarrantService {
        // 将xml转为map
        Map<String, Object> result = WXXmlToMapUtil.multilayerXmlToMap(msg);
        Map<String,Object> xml = (Map<String, Object>) result.get(ModuleConstant.XML);
-        if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.EVENT_LOW)) {
+        String msgType = xml.get(ModuleConstant.MSG_TYPE).toString();
+        log.info(String.format(ThirdRunTimeInfoConstant.MSG_TYPE,msgType));
+        String toUserName = null;
+        String fromUserName = null;
+        if (msgType.equals(ModuleConstant.EVENT_LOW)) {
+            String event = xml.get(ModuleConstant.EVENT).toString();
+            if (xml.containsKey(ModuleConstant.TO_USER_NAME)){
+                toUserName = xml.get(ModuleConstant.TO_USER_NAME).toString();
+            }
+            if (xml.containsKey(ModuleConstant.FROM_USER_NAME)){
+                fromUserName = xml.get(ModuleConstant.FROM_USER_NAME).toString();
+            }
+            if (event.startsWith(ModuleConstant.WE_APP_AUDIT)) {
                // TODO 目前来看，msgType = ‘event’ 的是代码审核结果
                Long createTime = Long.valueOf(xml.get(ModuleConstant.CREATE_TIME).toString());
                CodeAuditRecordFormDTO codeAuditRecord = ConvertUtils.mapToEntity(xml, CodeAuditRecordFormDTO.class);
                codeAuditRecord.setWechatCreateTime(componentVerifyTicketServiceImpl.sToDate(createTime.toString()));
-            String toUserName = codeAuditRecord.getToUserName();//小程序原始ID
+//                String toUserName = codeAuditRecord.getToUserName();//小程序原始ID
                CustomerIdAndClientResultDTO customerIdAndClientResultDTO = miniInfoDao.selectCustomerIdAndClientByToUserName(toUserName);
                String clientType = customerIdAndClientResultDTO.getClientType();
                String customerId = customerIdAndClientResultDTO.getCustomerId();
@ -126,7 +138,7 @@ public class WarrantServiceImpl implements WarrantService {
                log.info(String.format(ThirdRunTimeInfoConstant.CODE_AUDIT_RESULT, xml));
                codeAuditRecordDao.insertCodeAuditRecord(codeAuditRecord);
                // 修改 code_audit_result 中的代码审核结果
-            String event = codeAuditRecord.getEvent();
+//                String event = codeAuditRecord.getEvent();
                String codeResult = null;
                switch (event) {
                    case ModuleConstant.WEAPP_AUDIT_SUCCESS:
@ -141,7 +153,10 @@ public class WarrantServiceImpl implements WarrantService {
                }
                String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
                codeAuditResultDao.updateAuditResult(customerId, codeCustomerId, codeResult);
-        }else if (xml.get(ModuleConstant.MSG_TYPE).equals(ModuleConstant.TEXT)){
+            }else {
+                this.replyEventMessage(request,response,event,toUserName,fromUserName);
+            }
+        }else if (msgType.equals(ModuleConstant.TEXT)){
            // TODO 公众号回复消息
            MessagePushTextFormDTO messagePushTextFormDTO = ConvertUtils.mapToEntity(xml, MessagePushTextFormDTO.class);
            Object createTime = xml.get(ModuleConstant.CREATE_TIME);
@ -157,7 +172,7 @@ public class WarrantServiceImpl implements WarrantService {
             * 1）微信模推送给第三方平台方：文本消息，其中 Content 字段的内容固定为：TESTCOMPONENT_MSG_TYPE_TEXT
             * 2）第三方平台方立马回应文本消息并最终触达粉丝：Content 必须固定为：TESTCOMPONENT_MSG_TYPE_TEXT_callback
             */
-            if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){
+            /*if (content.equals(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT)){


            }else if (content.startsWith(ModuleConstant.QUERY_AUTH_CODE)){
@ -166,7 +181,10 @@ public class WarrantServiceImpl implements WarrantService {
                //auth_code
                String queryAuthCode = content.substring(contentBefore.length() + NumConstant.ONE, content.length());

-            }
+            }*/
+
+            this.processTextMessage(request,response,content,toUserName,fromUserName);
+
        }
        log.info("消息与事件接收URL【代码审核结果】结束......");
        return ModuleConstant.SUCCESS;
--- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-access-server:
    container_name: gov-access-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.38
    ports:
      - "8099:8099"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.66
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67
    ports:
      - "8105:8105"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
+++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-voice-server:
    container_name: gov-voice-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.67
    ports:
      - "8105:8105"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-voice/gov-voice-server/pom.xml
+++ b/epmet-module/gov-voice/gov-voice-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.3.66</version>
+    <version>0.3.67</version>
    <parent>
        <artifactId>gov-voice</artifactId>
        <groupId>com.epmet</groupId>
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql
@ -1,6 +1,7 @@
-ALTER TABLE `epmet_gov_voice`.`article`
-ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`;
-ALTER TABLE `epmet_gov_voice`.`draft`
-ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
-ALTER TABLE `epmet_gov_voice`.`article`
-ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
+-- ALTER TABLE `epmet_gov_voice`.`article`
+-- ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`;
+-- ALTER TABLE `epmet_gov_voice`.`draft`
+-- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
+-- ALTER TABLE `epmet_gov_voice`.`article`
+-- ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
+select 0;
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-crm-server:
    container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.62
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.63
    ports:
      - "8090:8090"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-crm-server:
    container_name: oper-crm-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.62
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.63
    ports:
      - "8090:8090"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-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.3.62</version>
+    <version>0.3.63</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>oper-crm</artifactId>
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-dev.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-customize-server:
    container_name: oper-customize-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.24
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-customize-server:0.3.25
    ports:
      - "8089:8089"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-customize-server:
    container_name: oper-customize-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.24
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.25
    ports:
      - "8089:8089"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-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.3.24</version>
+    <version>0.3.25</version>
    <parent>
        <groupId>com.epmet</groupId>
        <artifactId>oper-customize</artifactId>
--- 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
@ -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');
--- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.106
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.108
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
			`@ -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');