20191029 接口幂等性

server/src/main/java/com/pica/cloud/account/account/server/controller/PasswordController.java

@@ -48,7 +48,6 @@ public class PasswordController extends AccountBaseController {
     @PostMapping(value = "/modify")
     public PicaResponse modifyPassword(@RequestBody EncryptEntity entity) throws Exception {
         Long doctorId= super.getDoctorIdByToken();
-//        AESUtil.encryptV0(picaUser.getMobile())
         Doctor doctorInfo = doctorService.getDoctorInfo(doctorId.intValue());
         String mobile = doctorInfo.getMobilePhone();
         AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobile);

server/src/main/java/com/pica/cloud/account/account/server/controller/RegisterController.java

@@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class RegisterController extends AccountBaseController {
 
 
-    private final String REPEAT_REGISTER_PREFIX = "repeat-register—";
+
 
     @Autowired
     private RegisterService registerService;
@@ -47,32 +47,18 @@ public class RegisterController extends AccountBaseController {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         String mobile = request.getMobile();
         //接口幂等性处理(redis中没有就进行注册逻辑，如果已经存在，就不处理)
-        String exist = redisClient.get(REPEAT_REGISTER_PREFIX + mobile);
-        if (StringUtils.isBlank(exist)) {
-            String authCode = request.getAuthCode();
-            String flag = AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode() + "";
-            accountUtils.checkMobilePhoneAndAuthCode(mobile, flag, authCode);
-            accountUtils.checkPassword(request.getPassword());
-            redisClient.set(REPEAT_REGISTER_PREFIX + mobile, mobile, 30);
-            LoginResult result = null;
-            try {
-                request.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
-                request.setProductType(super.getProductType());
-                request.setSourceType(super.getSourceType());
-                request.setLoginIp(super.getIpAddr());
-                result = registerService.register(request);
-            } catch (Exception e) {
-                //向上抛出异常，让异常处理框架捕获到
-                throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
-            } finally {
-                //如果在注册过程中抛出异常，就删除redis中的注册标记
-                redisClient.del(REPEAT_REGISTER_PREFIX + mobile);
-            }
-            redisClient.del(REPEAT_REGISTER_PREFIX + mobile);
-            return PicaResponse.toResponse(result);
-        } else {
-            return PicaResponse.toResponse(null, AccountExceptionEnum.PICA_ALREADY_REGISTER.getCode(), "正在注册中,请勿重复提交");
-        }
+        String authCode = request.getAuthCode();
+        String flag = AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode() + "";
+        accountUtils.checkMobilePhoneAndAuthCode(mobile, flag, authCode);
+        accountUtils.checkPassword(request.getPassword());
+
+        LoginResult result = null;
+        request.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
+        request.setProductType(super.getProductType());
+        request.setSourceType(super.getSourceType());
+        request.setLoginIp(super.getIpAddr());
+        result = registerService.register(request);
+        return PicaResponse.toResponse(result);
     }
 
     //"sourceType":6 表示长海项目

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -16,10 +16,13 @@ import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
 import com.pica.cloud.account.account.server.util.TokenUtils;
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.redis.ICacheClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.io.ByteArrayOutputStream;
@@ -31,6 +34,8 @@ import java.util.concurrent.ExecutorService;
 @Service
 public class RegisterServiceImpl implements RegisterService {
 
+    private final String REPEAT_REGISTER_PREFIX = "repeat-register—";
+
     private Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
@@ -61,7 +66,8 @@ public class RegisterServiceImpl implements RegisterService {
     private AgreementLogEntityMapper agreementLogEntityMapper;
 
     @Autowired
-    private DoctorMapper doctorMapper;
+    @Qualifier("cacheMigrateClient")
+    private ICacheClient redisClient;
 
     /**
      * 1)注册功能：默认未完善信息；
@@ -74,83 +80,99 @@ public class RegisterServiceImpl implements RegisterService {
     @Override
     public LoginResult register(BaseRequest baseRequest) {
         String mobile = baseRequest.getMobile();
-        String mobileEncrypt = AESUtil.encryptV0(mobile);
-        AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
-        if (accountInfoEntity == null) {
-            Date currentTime = new Date();
-            int productType = baseRequest.getProductType();
-            int sourceType = baseRequest.getSourceType();
-            String password = baseRequest.getPassword();
-            AccountInfoEntity accountInfo = new AccountInfoEntity();
-            accountInfo.setMobilePhone(mobileEncrypt);
-            if (StringUtils.isEmpty(password)) {
-                password = "";
-            }
-            accountInfo.setPassword(password);
-            accountInfo.setCreatedTime(currentTime);
-            accountInfo.setCreatedId(0);
-            accountInfo.setModifiedId(0);
-            accountInfo.setModifiedTime(currentTime);
-            accountInfo.setRegTime(currentTime);
-            accountInfo.setDeleteFlag(1);
-            accountInfo.setSex(0);
-            accountInfo.setRegisterProduct(productType);
-            accountInfo.setRegisterSource(sourceType);
-            accountInfoDetailMapper.insertSelective(accountInfo);
-            Integer acctId = accountInfo.getId();
-            accountInfoDetailMapper.updateCreateInfo(acctId);
-            if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
-                AccountPatientInfoEntity accountPatientInfoEntity = new AccountPatientInfoEntity();
-                accountPatientInfoEntity.setAcctId(acctId);
-                accountPatientInfoEntity.setDeleteFlag(1);
-                accountPatientInfoEntity.setCreateId(acctId);
-                accountPatientInfoEntity.setModifyId(acctId);
-                accountPatientInfoEntity.setCreateTime(currentTime);
-                accountPatientInfoEntity.setModifyTime(currentTime);
-                accountUserInfoMapper.insertSelective(accountPatientInfoEntity);
+        //对注册接口做幂等性处理：注册成功，删除缓存，注册失败提示用户
+        String exist = redisClient.get(REPEAT_REGISTER_PREFIX + mobile);
+        if (StringUtils.isBlank(exist)) {
+            String mobileEncrypt = AESUtil.encryptV0(mobile);
+            AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobileEncrypt);
+            if (accountInfoEntity == null) {
+                redisClient.set(REPEAT_REGISTER_PREFIX + mobile, mobile, 30);
+                try {
+                    Date currentTime = new Date();
+                    int productType = baseRequest.getProductType();
+                    int sourceType = baseRequest.getSourceType();
+                    String password = baseRequest.getPassword();
+                    AccountInfoEntity accountInfo = new AccountInfoEntity();
+                    accountInfo.setMobilePhone(mobileEncrypt);
+                    if (StringUtils.isEmpty(password)) {
+                        password = "";
+                    }
+                    accountInfo.setPassword(password);
+                    accountInfo.setCreatedTime(currentTime);
+                    accountInfo.setCreatedId(0);
+                    accountInfo.setModifiedId(0);
+                    accountInfo.setModifiedTime(currentTime);
+                    accountInfo.setRegTime(currentTime);
+                    accountInfo.setDeleteFlag(1);
+                    accountInfo.setSex(0);
+                    accountInfo.setRegisterProduct(productType);
+                    accountInfo.setRegisterSource(sourceType);
+                    accountInfoDetailMapper.insertSelective(accountInfo);
+                    Integer acctId = accountInfo.getId();
+                    accountInfoDetailMapper.updateCreateInfo(acctId);
+                    if (productType == AccountTypeEnum.PRODUCT_TYPE_HEALTH.getCode()) {
+                        AccountPatientInfoEntity accountPatientInfoEntity = new AccountPatientInfoEntity();
+                        accountPatientInfoEntity.setAcctId(acctId);
+                        accountPatientInfoEntity.setDeleteFlag(1);
+                        accountPatientInfoEntity.setCreateId(acctId);
+                        accountPatientInfoEntity.setModifyId(acctId);
+                        accountPatientInfoEntity.setCreateTime(currentTime);
+                        accountPatientInfoEntity.setModifyTime(currentTime);
+                        accountUserInfoMapper.insertSelective(accountPatientInfoEntity);
+                    } else {
+                        Account account = new Account();
+                        account.setAcctId(acctId);
+                        account.setMobilePhone(mobileEncrypt);
+                        account.setDeleteFlag(1);
+                        account.setCreatId(0L);
+                        account.setModifyId(0L);
+                        account.setCreatTime(currentTime);
+                        account.setModifyTime(currentTime);
+                        account.setFirstLoginTime(currentTime);
+                        account.setLastLoginTime(currentTime);
+                        account.setPassword(password);
+                        accountMapper.insertSelective(account);
+                    }
+                    Long userId = accountUtils.getUserIdByAcctId(productType, acctId);
+                    Account account = new Account();
+                    account.setId(userId);
+                    account.setAcctId(acctId);
+                    account.setCreatTime(currentTime);
+                    account.setMobilePhone(mobile);
+                    account.setRegisterSource(sourceType);
+                    String newToken = tokenUtils.generateToken(account);
+
+                    LoginResult result = new LoginResult();
+                    result.setToken(newToken);
+                    result.setUserId(userId);
+                    result.setEntireFlag(1);
+                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                    DataOutputStream dos = new DataOutputStream(bos);
+                    try {
+                        dos.writeLong(userId);
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                    queueProducer.send(bos.toByteArray());
+                    LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, baseRequest.getSourceType(),
+                            AccountTypeEnum.LOGIN_REGISTER.getCode(), baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
+                            AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
+                    picaLogUtils.info(entity);
+                    processAgreement(userId);
+                    redisClient.del(REPEAT_REGISTER_PREFIX + mobile);
+                    return result;
+                } catch (Exception e) {
+                    //向上抛出异常，让异常处理框架捕获到
+                    throw new AccountException(AccountExceptionEnum.PICA_REGISTER_FAIL);
+                } finally {
+                    //如果在注册过程中抛出异常，就删除redis中的注册标记
+                    redisClient.del(REPEAT_REGISTER_PREFIX + mobile);
+                }
             } else {
-                Account account = new Account();
-                account.setAcctId(acctId);
-                account.setMobilePhone(mobileEncrypt);
-                account.setDeleteFlag(1);
-                account.setCreatId(0L);
-                account.setModifyId(0L);
-                account.setCreatTime(currentTime);
-                account.setModifyTime(currentTime);
-                account.setFirstLoginTime(currentTime);
-                account.setLastLoginTime(currentTime);
-                account.setPassword(password);
-                accountMapper.insertSelective(account);
-            }
-            Long userId = accountUtils.getUserIdByAcctId(productType, acctId);
-            Account account = new Account();
-            account.setId(userId);
-            account.setAcctId(acctId);
-            account.setCreatTime(currentTime);
-            account.setMobilePhone(mobile);
-            account.setRegisterSource(sourceType);
-            String newToken = tokenUtils.generateToken(account);
-
-            LoginResult result = new LoginResult();
-            result.setToken(newToken);
-            result.setUserId(userId);
-            result.setEntireFlag(1);
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            DataOutputStream dos = new DataOutputStream(bos);
-            try {
-                dos.writeLong(userId);
-            } catch (IOException e) {
-                e.printStackTrace();
+                throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
             }
-            queueProducer.send(bos.toByteArray());
-            LogLoginEntity entity = AccountLogEntityUtils.getLogLoginEntity(acctId, productType, baseRequest.getSourceType(),
-                    AccountTypeEnum.LOGIN_REGISTER.getCode(), baseRequest.getLoginIp(), AccountTypeEnum.LOGIN_STATUS_SUCCESS.getCode(),
-                    AccountTypeEnum.LOG_TYPE_LOGIN.getCode());
-            picaLogUtils.info(entity);
-            processAgreement(userId);
-            return result;
         } else {
-            throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
+            throw  new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER);
         }
     }
 
@@ -204,7 +226,7 @@ public class RegisterServiceImpl implements RegisterService {
             doctorServiceClient.prefectInfo(prefectInfoReq);
             */
         } else {
-           throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER.getCode(), AccountExceptionEnum.PICA_ALREADY_REGISTER.getCode());
+            throw new AccountException(AccountExceptionEnum.PICA_ALREADY_REGISTER.getCode(), AccountExceptionEnum.PICA_ALREADY_REGISTER.getCode());
         }
     }