Merge branch 'dev_mess_party' into dev_temp

# Conflicts:
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
#	epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -524,7 +524,11 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
 //        epmetMessageOpenFeignClient.saveUserMessageList(msgList);
         //对关注此话题的用户推送订阅
         try {
-            resiGroupOpenFeignClient.sendWxmpUpdateSubscribe(token,app2update.getIssueId(),"shiftIssue");
+            SendWxmpUpdateSubscribeFormDTO formDTO = new SendWxmpUpdateSubscribeFormDTO();
+            formDTO.setTokenDto(token);
+            formDTO.setSourceId(app2update.getIssueId());
+            formDTO.setSourceType("shiftIssue");
+            resiGroupOpenFeignClient.sendWxmpUpdateSubscribe(formDTO);
         }catch (Exception e){
             logger.warn("话题转议题-发送订阅消息失败 错误信息:"+e.getMessage());
         }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/SendWxmpUpdateSubscribeFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.resi.group.dto.topic.form;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: liushaowen
+ * @date: 2021/1/12 13:44
+ */
+@Data
+public class SendWxmpUpdateSubscribeFormDTO implements Serializable {
+    @NotNull
+    private TokenDto tokenDto;
+    @NotBlank
+    private String  sourceId;
+    @NotBlank
+    private String sourceType;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -2,7 +2,6 @@ package com.epmet.resi.group.feign;
 
 
 import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.group.dto.group.form.*;
 import com.epmet.resi.group.dto.group.ResiGroupDTO;
@@ -16,6 +15,7 @@ import com.epmet.resi.group.dto.topic.form.*;
 import com.epmet.resi.group.dto.topic.result.*;
 import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
+import com.epmet.resi.group.dto.group.form.CreateGroupCodeFormDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.HashMap;
 import java.util.List;
+import org.springframework.http.MediaType;
 
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
@@ -189,13 +190,10 @@ public interface ResiGroupOpenFeignClient {
 
     /**
      * @Description 发送内容更新类的微信订阅
-     * @param tokenDto
-     * @param sourceId
-     * @param sourceType
      * @return void
      * @Author liushaowen
      * @Date 2021/1/12 11:22
      */
     @PostMapping("resi/group/topic/sendwxmpupdatesubscribe")
-    void sendWxmpUpdateSubscribe(TokenDto tokenDto,String sourceId,String sourceType);
+    void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO);
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -132,8 +132,10 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
         return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "sendEvent",param);
     }
 
+
     @Override
-    public void sendWxmpUpdateSubscribe(TokenDto tokenDto, String sourceId, String sourceType) {
+    public void sendWxmpUpdateSubscribe(SendWxmpUpdateSubscribeFormDTO fromDTO) {
-       //不报错
+
     }
+
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java

@@ -359,16 +359,13 @@ public class ResiTopicController {
 
     /**
      * @Description 发送内容更新类的微信订阅
-     * @param tokenDto
-     * @param sourceId
-     * @param sourceType
      * @return void
      * @Author liushaowen
      * @Date 2021/1/12 11:21
      */
     @PostMapping("sendwxmpupdatesubscribe")
-    public void sendWxmpUpdateSubscribe(TokenDto tokenDto,String sourceId,String sourceType){
+    public void sendWxmpUpdateSubscribe(@RequestBody SendWxmpUpdateSubscribeFormDTO fromDTO){
-        topicService.sendWxmpUpdateSubscribe(tokenDto,sourceId,sourceType);
+        topicService.sendWxmpUpdateSubscribe(fromDTO.getTokenDto(),fromDTO.getSourceId(),fromDTO.getSourceType());
     }