openfeignclient提交

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

@@ -19,7 +19,6 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.redis.CaptchaRedis;
@@ -50,8 +49,6 @@ public class GovLoginServiceImpl implements GovLoginService {
     @Autowired
     private CaptchaRedis captchaRedis;
     @Autowired
-    private MessageFeignClient messageFeignClient;
-    @Autowired
     private JwtTokenUtils jwtTokenUtils;
     @Autowired
     private JwtTokenProperties jwtTokenProperties;

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

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.epmet.common.token.constant.LoginConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.security.password.PasswordUtils;
@@ -17,7 +16,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.PasswordLoginUserInfoResultDTO;
 import com.epmet.dto.result.UserTokenResultDTO;
 import com.epmet.feign.EpmetUserFeignClient;
-import com.epmet.feign.OperAccessFeignClient;
+import com.epmet.feign.OperAccessOpenFeignClient;
 import com.epmet.jwt.JwtTokenProperties;
 import com.epmet.jwt.JwtTokenUtils;
 import com.epmet.service.CaptchaService;
@@ -63,7 +62,7 @@ public class LoginServiceImpl implements LoginService {
 	private CaptchaService captchaService;
 
 	@Autowired
-	private OperAccessFeignClient operAccessFeignClient;
+	private OperAccessOpenFeignClient operAccessOpenFeignClient;
 
 	/**
 	 * 居民端微信小程序登录
@@ -321,7 +320,7 @@ public class LoginServiceImpl implements LoginService {
 		}
 		cpUserDetailRedis.logout(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId());
 		//web端清空菜单栏和权限
-		Result operAccessResult = operAccessFeignClient.clearOperUserAccess();
+		Result operAccessResult = operAccessOpenFeignClient.clearOperUserAccess();
 		if (operAccessResult.success()) {
 			logger.info(String.format("运营人员%s退出成功,清空菜单和权限redis成功", tokenDto.getUserId()));
 		} else {

epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java

@@ -34,8 +34,8 @@ import com.epmet.dto.form.SaveCustomerFormDTO;
 import com.epmet.dto.result.ValidCustomerResultDTO;
 import com.epmet.entity.DemoEntity;
 import com.epmet.feign.AdminFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.feign.OperCrmFeignClient;
 import com.epmet.redis.DemoRedis;
 import com.epmet.service.DemoService;
@@ -70,7 +70,7 @@ public class DemoServiceImpl extends BaseServiceImpl<DemoDao, DemoEntity> implem
     @Autowired
     private AdminFeignClient adminFeignClient;
     @Autowired
-    private MessageFeignClient messageFeignClient;
+    private EpmetMessageOpenFeignClient messageFeignClient;
 
     @Override
     public PageData<DemoDTO> page(Map<String, Object> params) {

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/MessageFeignClient.java → epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java

@@ -1,10 +1,5 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.SysSmsDTO;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.feign.fallback.MessageFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -12,9 +7,20 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class)
-public interface MessageFeignClient {
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.SysSmsDTO;
+import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallback;
 
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:47
+ */
+@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = EpmetMessageOpenFeignClientFallback.class)
+public interface EpmetMessageOpenFeignClient {
     /**
      * 发送短信
      * @return
@@ -37,5 +43,5 @@ public interface MessageFeignClient {
      * @Date 2020/4/7 15:36
      **/
     @PostMapping(value = "message/usermessage/saveusermessage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    Result saveUserMessage(UserMessageFormDTO formDto);
+    Result saveUserMessage(@RequestBody UserMessageFormDTO formDto);
 }

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -22,7 +22,7 @@ import com.epmet.dao.SysSmsDao;
 import com.epmet.dto.SysSmsDTO;
 import com.epmet.entity.SysSmsEntity;
 import com.epmet.exception.ModuleErrorCode;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.service.SysSmsService;
 import com.epmet.sms.AbstractSmsService;
 import com.epmet.sms.SmsFactory;
@@ -34,7 +34,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 @Service
 public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity> implements SysSmsService {
@@ -42,7 +44,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
     private Logger logger = LoggerFactory.getLogger(getClass());
 
     @Autowired
-    private MessageFeignClient messageFeignClient;
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<SysSmsDTO> page(Map<String, Object> params) {
@@ -125,7 +127,7 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
             sysSmsDTO.setMobile(mobile);
             sysSmsDTO.setParams(paramJson);
 
-            Result result = messageFeignClient.send(sysSmsDTO);
+            Result result = epmetMessageOpenFeignClient.send(sysSmsDTO);
             if (result != null && result.success()) {
                 HashMap<String, String> data = new HashMap<>();
                 data.put("code", codeStr);

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovIssueOpenFeignClientFallBack;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:37
+ */
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+public interface GovIssueOpenFeignClient {
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/fallback/GovIssueOpenFeignClientFallBack.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovIssueOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:43
+ */
+@Component
+public class GovIssueOpenFeignClientFallBack implements GovIssueOpenFeignClient {
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.GovProjectOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:32
+ */
+@FeignClient(name = ServiceConstant.GOV_PROJECT_SERVER, fallback = GovProjectOpenFeignClientFallback.class)
+public interface GovProjectOpenFeignClient {
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.GovProjectOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:33
+ */
+@Component
+public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignClient {
+}

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java

@@ -32,7 +32,6 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.constant.UserMessageConstant;
 import com.epmet.dao.ProjectProcessDao;
 import com.epmet.dao.ProjectStaffDao;
-import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.ProjectProcessDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -41,7 +40,6 @@ import com.epmet.entity.ProjectProcessEntity;
 import com.epmet.entity.ProjectStaffEntity;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.MessageFeignClient;
 import com.epmet.redis.ProjectProcessRedis;
 import com.epmet.service.ProjectProcessService;
 import com.epmet.service.ProjectService;
@@ -52,7 +50,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessFeignClient.java → epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/OperAccessOpenFeignClient.java

@@ -1,19 +1,20 @@
 package com.epmet.feign;
 
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.feign.fallback.OperAccessFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.fallback.OperAccessOpenFeignClientFallback;
+
 /**
  * @Description 运营端权限模块
  * @Author yinzuomei
- * @Date 2020/5/21 15:17
+ * @Date 2020/5/21 15:17 本服务对外开放的API,其他服务通过引用此client调用该服务
  */
 // , url = "http://localhost:8093"
-@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessFeignClientFallback.class)
-public interface OperAccessFeignClient {
+@FeignClient(name = ServiceConstant.OPER_ACCESS_SERVER, fallback = OperAccessOpenFeignClientFallback.class)
+public interface OperAccessOpenFeignClient {
     /**
      * @param
      * @return com.epmet.commons.tools.utils.Result

epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessFeignClientFallback.java → epmet-module/oper-access/oper-access-client/src/main/java/com/epmet/feign/fallback/OperAccessOpenFeignClientFallback.java

@@ -3,7 +3,7 @@ package com.epmet.feign.fallback;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.feign.OperAccessFeignClient;
+import com.epmet.feign.OperAccessOpenFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @Date 2020/5/21 15:47
  */
 @Component
-public class OperAccessFeignClientFallback implements OperAccessFeignClient {
+public class OperAccessOpenFeignClientFallback implements OperAccessOpenFeignClient {
     @Override
     public Result clearOperUserAccess() {
         return ModuleUtils.feignConError(ServiceConstant.OPER_ACCESS_SERVER, "clearOperUserAccess");

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.OperCrmOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:25
+ */
+@FeignClient(name = ServiceConstant.OPER_CRM_SERVER, fallback = OperCrmOpenFeignClientFallback.class)
+public interface OperCrmOpenFeignClient {
+}

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/fallback/OperCrmOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.OperCrmOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:26
+ */
+@Component
+public class OperCrmOpenFeignClientFallback implements OperCrmOpenFeignClient {
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -0,0 +1,17 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.OperCustomizeOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:16
+ */
+@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallback = OperCustomizeOpenFeignClientFallback.class)
+public interface OperCustomizeOpenFeignClient {
+
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.OperCustomizeOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:23
+ */
+@Component
+public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFeignClient {
+}

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

@@ -0,0 +1,16 @@
+package com.epmet.resi.group.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:16
+ */
+@FeignClient(name = ServiceConstant.RESI_GROUP_SERVER, fallback = ResiGroupOpenFeignClientFallback.class)
+public interface ResiGroupOpenFeignClient {
+}

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

@@ -0,0 +1,14 @@
+package com.epmet.resi.group.feign.fallback;
+
+import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:17
+ */
+@Component
+public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClient {
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -33,8 +33,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.dto.result.UserRoleResultDTO;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.ResiGuideFeignClient;
@@ -96,7 +95,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	private GroupMemeberOperationService groupMemeberOperationService;
 
 	@Autowired
-	private MessageFeignClient messageFeignClient;
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 	@Autowired
 	private ResiGroupDao resiGroupDao;
 
@@ -436,7 +435,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(groupInvitationDTO.getInviterUserId());
-		Result result = messageFeignClient.saveUserMessage(userMessage);
+		Result result = epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 		if (result.success()) {
 			logger.info("通知群主有新成员入群成功");
 		} else {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -35,7 +35,7 @@ import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.UserResiInfoListFormDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.feign.MessageFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -69,7 +69,6 @@ import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import com.epmet.resi.group.dto.member.result.VotableCountResultDTO;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +102,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	private EpmetUserFeignClient epmetUserFeignClient;
 
 	@Autowired
-	private MessageFeignClient messageFeignClient;
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 	@Autowired
 	private ResiGroupStatisticalService resiGroupStatisticalService;
@@ -270,7 +269,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 			//通知群主
 			userMessage.setUserId(groupLeader.getCustomerUserId());
-			messageFeignClient.saveUserMessage(userMessage);
+			epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 		} catch (Exception e) {
 			logger.error("居民申请入群，给组长发送消息通知异常");
 			e.printStackTrace();
@@ -445,7 +444,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(resiGroupMemberDTO.getCustomerUserId());
-		messageFeignClient.saveUserMessage(userMessage);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 	}
 
 	/**
@@ -510,7 +509,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		userMessage.setTitle(UserMessageConstant.GROUP_TITLE);
 		//通知群主
 		userMessage.setUserId(groupMemeberOperationDTO.getCustomerUserId());
-		messageFeignClient.saveUserMessage(userMessage);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessage);
 	}
 
     /**
@@ -597,7 +596,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		String messageContent=String.format(UserMessageConstant.SLIENT_IN_GROUP, dateStr);
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
-		messageFeignClient.saveUserMessage(userMessageFormDTO);
+		epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
 		result.setMsg(GroupMemberConstant.SLIENT_SUCCESS);
         return result;
     }
@@ -625,8 +624,9 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 **/
 	@Override
 	public GridVotableCountResultDTO votableCount(CommonGridIdListFormDTO gridList) {
-		if(null == gridList || null == gridList.getGridIds() || gridList.getGridIds().size() < NumConstant.ONE)
+		if(null == gridList || null == gridList.getGridIds() || gridList.getGridIds().size() < NumConstant.ONE){
 			return null;
+		}
 		GridVotableCountResultDTO result = new GridVotableCountResultDTO();
 		Map<String,Integer> votableCountMap = new HashMap<>();
 		gridList.getGridIds().forEach(gridId -> {

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.resi.partymember.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.resi.partymember.feign.fallback.ResiPartyMemberOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:12
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartyMemberOpenFeignClientFallback.class)
+public interface ResiPartyMemberOpenFeignClient {
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.resi.partymember.feign.fallback;
+
+import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:14
+ */
+@Component
+public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOpenFeignClient {
+}

epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/ResiVoiceOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.ResiVoiceOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:01
+ */
+@FeignClient(name = ServiceConstant.RESI_VOICE_SERVER, fallback = ResiVoiceOpenFeignClientFallback.class)
+public interface ResiVoiceOpenFeignClient {
+}

epmet-module/resi-voice/resi-voice-client/src/main/java/com/epmet/feign/fallback/ResiVoiceOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.ResiVoiceOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:05
+ */
+@Component
+public class ResiVoiceOpenFeignClientFallback implements ResiVoiceOpenFeignClient {
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -0,0 +1,16 @@
+package com.epmet.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.feign.fallback.EpmetUserOpenFeignClientFallback;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:09
+ */
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+public interface EpmetUserOpenFeignClient {
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -0,0 +1,14 @@
+package com.epmet.feign.fallback;
+
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * 本服务对外开放的API,其他服务通过引用此client调用该服务
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/6/4 13:10
+ */
+@Component
+public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClient {
+}