注册党员、注册居民、工作端登录，验证码修改v1

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

@@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -55,4 +57,13 @@ public interface EpmetMessageOpenFeignClient {
      **/
     @PostMapping(value = "message/sms/sendVerificationCode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     Result<SendVerificationCodeResultDTO> sendVerificationCode(@RequestBody SendVerificationCodeFormDTO formDTO);
+
+    /**
+     * @param msgList
+     * @return com.epmet.commons.tools.utils.Result
+     * @Author sun
+     * @Description 热心居民申请给网格长们发送消息
+     **/
+    @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    Result saveUserMessageList(List<UserMessageFormDTO> msgList);
 }

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java

@@ -10,6 +10,8 @@ import com.epmet.dto.result.SendVerificationCodeResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 本服务对外开放的API,其他服务通过引用此client调用该服务
  *
@@ -39,4 +41,8 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig
         return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendVerificationCode", formDTO);
     }
 
+    @Override
+    public Result saveUserMessageList(List<UserMessageFormDTO> msgList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList);
+    }
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -10,19 +10,14 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
 import com.epmet.constant.PartyMemberMessageConstant;
 import com.epmet.constant.ReadFlagConstant;
+import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.CustomerStaffGridDTO;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserRoleDTO;
-import com.epmet.dto.form.CustomerGridFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.StaffRoleFormDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.form.UserMessageFormDTO;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.result.AgencyAndStaffsResultDTO;
-import com.epmet.dto.result.GovStaffRoleResultDTO;
-import com.epmet.dto.result.GridInfoResultDTO;
-import com.epmet.dto.result.UserResiInfoResultDTO;
-import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.GovOrgFeignClient;
 import com.epmet.modules.feign.ResiGroupFeignClient;
@@ -48,6 +43,7 @@ import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO
 import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO;
 import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 党员认证
@@ -86,7 +81,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 	@Autowired
 	private PartymemberRegisterRelationService partymemberRegisterRelationService;
 	@Autowired
-	private EpmetMessageFeignClient messageFeignClient;
+	private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 	@Autowired
 	private GovOrgFeignClient govOrgFeignClient;
 	@Autowired
@@ -152,15 +147,20 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//生成短信验证码
-		Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData();
+		SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO();
-		if (null == message) {
+		sendVerificationCodeFormDTO.setMobile(fromDTO.getMobile());
+		sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER);
+		Result<SendVerificationCodeResultDTO> sendVerificationCodeResult = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO);
+		if(!sendVerificationCodeResult.success()||
+				null==sendVerificationCodeResult.getData()
+				|| StringUtils.isBlank(sendVerificationCodeResult.getData().getCode())){
 			return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
 		}
 		//删除旧验证码
 		partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile());
 
 		//将验证码存入Redis
-		partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code"));
+		partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), sendVerificationCodeResult.getData().getCode());
 
 		//将访问记录更新到热心居民申请行为记录表
 		saveOrUpdateVisit(fromDTO.getVisitId(), null, PartyMemberConstant.OPERATE_OPERATE_SMS_CODE);
@@ -618,7 +618,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		userMessageFormDTO.setMessageContent(messageContent);
 		userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ);
 		//保存消息
-		return messageFeignClient.saveUserMessage(userMessageFormDTO);
+		return epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO);
 	}
 
 	/**
@@ -673,7 +673,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			});
 		});
 		if (msgList.size() > NumConstant.ZERO) {
-			result = messageFeignClient.saveUserMessageList(msgList);
+			result = epmetMessageOpenFeignClient.saveUserMessageList(msgList);
 		}
 		return result;
 	}

epmet-user/epmet-user-server/pom.xml

@@ -82,6 +82,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>