Merge remote-tracking branch 'origin/div' into div

admin

2020-06-30 e40d1c22c7202aac843c66f9ee9cc000744f9e10

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -141,8 +141,7 @@
            }

            userInfo = getUserInfoByTaoBaoOpenId(appId, tbUserInfo.getOpenid());

            // 判断用户是否被删除

            if (userInfo != null && userInfo.getState() != null

                  && (userInfo.getState() != UserInfo.STATE_NORMAL))

            if (userInfo != null && userInfo.getState() != null && (userInfo.getState() != UserInfo.STATE_NORMAL))

               userInfo = null;

            if (userInfo == null) {// 原先的账号不存在

               userInfo = new UserInfo();

@@ -185,9 +184,7 @@


            userInfo = getUserInfoByWXUnionId(appId, weiXinUser.getUnionid());

            // 判断用户是否被删除

            if (userInfo != null && userInfo.getState() != null

                  && (userInfo.getState() != UserInfo.STATE_NORMAL

                     ))

            if (userInfo != null && userInfo.getState() != null && (userInfo.getState() != UserInfo.STATE_NORMAL))

               userInfo = null;

            // 直接用的微信登录

            if (lastUser == null) {

@@ -324,8 +321,7 @@


            userInfo = getUserInfoByPhone(appId, phone);

            // 判断用户是否被删除

            if (userInfo != null && userInfo.getState() != null

                  && (userInfo.getState() != UserInfo.STATE_NORMAL))

            if (userInfo != null && userInfo.getState() != null && (userInfo.getState() != UserInfo.STATE_NORMAL))

               userInfo = null;



            if (userInfo == null) {// 原先的账号不存在

@@ -451,7 +447,6 @@
      }

   }





   /**

    * 根据系统与unionid寻找用户

    * 

@@ -524,7 +519,7 @@


      // 剔除被删除掉的用户

      for (int i = 0; i < list.size(); i++) {

         if (list.get(i).getState() !=UserInfo.STATE_NORMAL) {

         if (list.get(i).getState() != UserInfo.STATE_NORMAL) {

            list.remove(i);

            i--;

         }

@@ -856,7 +851,6 @@
      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone);

      redisManager.removeCommonString(key);





      // 采用redis事务防止一个手机号多次注册问题

      String watchKey = StringUtil.Md5("REGISTER:" + phone);

      Jedis jedis = jedisPool.getResource();

@@ -893,10 +887,8 @@
               } catch (Exception e) {

                  e.printStackTrace();

               }



               userInfoModifyRecordService.addModifyRecord(userInfo.getId(), ModifyTypeEnum.bindPhone, phone);

            }



            return userInfo;

         }

      } catch (Exception e) {

@@ -909,6 +901,92 @@
      throw new UserAccountException(10, "请稍后再试");

   }



	
   @Transactional(rollbackFor = Exception.class)

   @Override

   public UserInfo loginPhoneNew(HttpServletRequest request, int loginType, String vcode, String phone, String appId)

         throws UserAccountException {

      // 空额清理

      if (phone == null || phone.trim().length() == 0) {

         throw new UserAccountException(1, "请输入手机号码");

      }

      phone = phone.replaceAll(" ", "");



      // 苹果应用商店上线测试号码

      if ("17316780233".equalsIgnoreCase(phone) && "2581".equalsIgnoreCase(vcode)) {

         ;

      } else {

         if (StringUtil.isNullOrEmpty(vcode)) {

            throw new UserAccountException(1, "请输入验证码");

         }



         String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_LOGIN);

         LogHelper.test("----------------------登录验证码： " + oldVcode);

         if (!Constant.IS_TEST)

            if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {

               throw new UserAccountException(1, "验证码错误，重新输入");

            } else {// 验证码输入正确

               redisManager.clearSMSVCode(phone, SMSHistory.TYPE_LOGIN);

            }

      }



      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("phone", phone);

      logInfo.put("loginType", loginType);

      LogHelper.lgoinInfo(logInfo.toString());



      // 判断手机号码是否被封禁

      ForbiddenUserIdentifyCode identifyCode1 = forbiddenUserIdentifyCodeService

            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.phone, phone);

      if (identifyCode1 != null && identifyCode1.getEffective() != null && identifyCode1.getEffective()) {

         throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }

      // 清空限制

      redisManager.clearSMSFrequencyLimit(phone, SMSHistory.TYPE_LOGIN);

      // 清理次数

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.SMSLoginCount, phone);

      redisManager.removeCommonString(key);



      // 采用redis事务防止一个手机号多次注册问题

      String watchKey = StringUtil.Md5("REGISTER:" + phone);

      Jedis jedis = jedisPool.getResource();

      try {

         jedis.watch(watchKey);

         if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1)

            throw new UserAccountException(10, "请稍后再试");

         Transaction tran = jedis.multi();

         tran.incr(watchKey);

         List<Object> exec = tran.exec();

         if (exec == null || exec.size() == 0) {

            throw new UserAccountException(10, "请稍后再试");

         } else {



            // 查询是否存在该电话历史用户

            UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByPhone(phone);

            if (userInfo != null) {

               // 更新账户登录信息

               updateLonginInfo(userInfo, loginType, request);

            } else {

               // 绑定微信

               String keylogin = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5("phoneLogin:" + phone));

               redisManager.cacheCommonString(keylogin, phone, 60 * 20);

               throw new UserAccountException(102, keylogin);

            }

            return userInfo;

         }

      } catch (Exception e) {

         e.printStackTrace();

      } finally {

         jedis.del(watchKey);

         jedis.unwatch();

         jedis.close();

      }

      throw new UserAccountException(10, "请稍后再试");

   }



	
	
   @Transactional(rollbackFor = Exception.class)

   @Override

   public UserInfo loginWinXin(HttpServletRequest request, AcceptData acceptData, int loginType, String code,

@@ -965,8 +1043,8 @@
                  InputStream asInputStream = HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl());

                  if (asInputStream != null) {

                     FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                           String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(),

                                 System.currentTimeMillis() + ""));

                           String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg",

                                 weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

                     if (result != null && !StringUtil.isNullOrEmpty(result.getUrl()))

                        portrait = result.getUrl();

                  } else {

@@ -1042,7 +1120,8 @@


      UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

      if (userInfo == null) {

         String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5("WXLogin:" + weiXinUser.getUnionid()));

         String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey,

               StringUtil.Md5("WXLogin:" + weiXinUser.getUnionid()));

         redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(weiXinUser), 60 * 20);

         throw new UserAccountException(101, key);

      }

@@ -1115,7 +1194,7 @@


   }



   @Transactional(rollbackFor=UserAccountException.class)

   @Transactional(rollbackFor = UserAccountException.class)

   @Override

   public void bindWeiXin(AcceptData acceptData, Long uid, String code) throws UserAccountException {

      WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

@@ -1130,18 +1209,15 @@
      }

      bindWeiXin(uid, weiXinUser);

   }

	
	
	
	
   @Transactional(rollbackFor=UserAccountException.class)



   @Transactional(rollbackFor = UserAccountException.class)

   @Override

   public void bindWeiXin(Long uid,WeiXinUser weiXinUser) throws UserAccountException {

   public void bindWeiXin(Long uid, WeiXinUser weiXinUser) throws UserAccountException {

      UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

      if (user == null) {

         throw new UserAccountException(1, "用户不存在");

      }

		


      if (weiXinUser == null) {

         throw new UserAccountException(2, "微信帐号授权失败");

      }

@@ -1189,8 +1265,9 @@
         if (asInputStream == null) {

            LogHelper.test("微信头像下载失败: " + weiXinUser.getUnionid() + " " + headimgurl);

         } else {

            FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String

                  .format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

            FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                  String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(),

                        System.currentTimeMillis() + ""));

            if (result != null && !StringUtil.isNullOrEmpty(result.getUrl())) {

               headimgurl = result.getUrl();

            } else {

@@ -1222,9 +1299,6 @@
   @Override

   public UserInfo bindPhoneToLogin(String phone, String key, String appId, HttpServletRequest request)

         throws UserAccountException {

      UserInfo phoneUser = userInfoMapper.getEffectiveUserInfoByPhone(phone);

      if (phoneUser != null)

         throw new UserAccountException(1, "号码已经被占用");



      // 判断手机号码是否被封禁

      ForbiddenUserIdentifyCode identifyCode1 = forbiddenUserIdentifyCodeService

@@ -1249,8 +1323,9 @@
      if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {

         InputStream asInputStream = HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl());

         if (asInputStream != null) {

            FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream, String

                  .format(FilePathEnum.userWXPortrait.getPath() +"%s_%s.jpg", weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

            FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                  String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg", weiXinUser.getUnionid(),

                        System.currentTimeMillis() + ""));

            if (result != null && !StringUtil.isNullOrEmpty(result.getUrl()))

               portrait = result.getUrl();

         } else {

@@ -1261,21 +1336,37 @@
      if (StringUtil.isNullOrEmpty(portrait))

         portrait = Constant.systemCommonConfig.getDefaultPortrait();



      // 创建新账户

      userInfo = new UserInfo();

      userInfo.setPhone(phone);

      userInfo.setPortrait(portrait);

      userInfo.setAppId(appId);

      userInfo.setNickName(weiXinUser.getNickname());

      userInfo.setWxName(weiXinUser.getNickname());

      userInfo.setWxOpenId(weiXinUser.getOpenid());

      userInfo.setWxUnionId(weiXinUser.getUnionid());

      userInfo.setWxPic(weiXinUser.getHeadimgurl());

      userInfo.setLastLoginTime(System.currentTimeMillis());

      userInfo.setLoginType(2);

      userInfo.setLastLoginIp(request.getRemoteHost());

      userInfo.setState(UserInfo.STATE_NORMAL);

      addUser(userInfo);

      // 是否需要创建新账户

      UserInfo phoneUser = userInfoMapper.getEffectiveUserInfoByPhone(phone);

      if (phoneUser != null) {

         // 绑定微信

         if (StringUtil.isNullOrEmpty(phoneUser.getWxUnionId())) {

            try {

               bindWeiXin(phoneUser.getId(), weiXinUser);

            } catch (Exception e) {

               throw new UserAccountException(1, "微信绑定失败");

            }

         } else {

            throw new UserAccountException(1, "该微信已被绑定");

         }

         userInfo = userInfoMapper.selectAvailableByPrimaryKey(phoneUser.getId());

      } else {

         // 创建新账户

         userInfo = new UserInfo();

         userInfo.setPhone(phone);

         userInfo.setPortrait(portrait);

         userInfo.setAppId(appId);

         userInfo.setNickName(weiXinUser.getNickname());

         userInfo.setWxName(weiXinUser.getNickname());

         userInfo.setWxOpenId(weiXinUser.getOpenid());

         userInfo.setWxUnionId(weiXinUser.getUnionid());

         userInfo.setWxPic(weiXinUser.getHeadimgurl());

         userInfo.setLastLoginTime(System.currentTimeMillis());

         userInfo.setLoginType(2);

         userInfo.setLastLoginIp(request.getRemoteHost());

         userInfo.setState(UserInfo.STATE_NORMAL);

         addUser(userInfo);

      }



      Long uid = userInfo.getId();

      ThreadUtil.run(new Runnable() {

@@ -1303,6 +1394,129 @@
      redisManager.removeCommonString(key);



      return userInfo;

   }

	
	
   @Override

   public UserInfo bindWXToLogin(HttpServletRequest request, AcceptData acceptData, String code, String appId, String key) throws UserAccountException { 
      // 日志信息

      JSONObject logInfo = new JSONObject();

      logInfo.put("appId", appId);

      logInfo.put("code", code);

      logInfo.put("loginType", 2);

      LogHelper.lgoinInfo(logInfo.toString());



      // 通过Code换取信息

      WXAccountInfoDTO wxAccount = Constant.getWXAccount(acceptData.getPlatform(), acceptData.getVersion());

      WeiXinUser weiXinUser = WXLoginUtil.getWeiXinUser(code, wxAccount.getAppId(), wxAccount.getAppSecret());

      if (weiXinUser == null) {

         throw new UserAccountException(1, "微信帐号授权失败");

      }

      LogHelper.test("微信授权用户信息：" + new Gson().toJson(weiXinUser));



      // 判断微信unionid是否被封禁

      ForbiddenUserIdentifyCode identifyCode = forbiddenUserIdentifyCodeService

            .listByTypeAndIdentifyCode(ForbiddenUserIdentifyCodeTypeEnum.wxUnionId, weiXinUser.getUnionid());

      if (identifyCode != null && identifyCode.getEffective() != null && identifyCode.getEffective()) {

         throw new UserAccountException(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC);

      }



      String phone = redisManager.getCommonString(key);

      if (StringUtil.isNullOrEmpty(phone))

         throw new UserAccountException(1, "手机号登录失效，请使发送短信登录");

		
      // 采用redis事务防止一个微信号多次注册问题

      String watchKey = StringUtil.Md5("REGISTER:" + weiXinUser.getUnionid());

      Jedis jedis = jedisPool.getResource();

      try {

         jedis.watch(watchKey);

         if (jedis.get(watchKey) != null && Integer.parseInt(jedis.get(watchKey)) > 1)

            throw new UserAccountException(10, "请稍后再试");

         Transaction tran = jedis.multi();

         tran.incr(watchKey);

         List<Object> exec = tran.exec();

         if (exec == null || exec.size() == 0) {

            throw new UserAccountException(10, "请稍后再试");

         } else {



            UserInfo userInfo = userInfoMapper.getEffectiveUserInfoByWXUnionId(weiXinUser.getUnionid());

            // 直接用的微信登录

            if (userInfo != null) {

               // 绑定微信

               if (!StringUtil.isNullOrEmpty(userInfo.getPhone()) && !phone.equals(userInfo.getPhone().trim())) {

                  throw new UserAccountException(1, "该微信已被绑定");

               }  
               // 删除邀请分享图

               //spreadUserImgService.deleteImgUrl(userInfo.getId());

            } else {

               LogHelper.test("微信unionID不存在:" + weiXinUser.getUnionid());



               String portrait = null;

               if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) {

                  InputStream asInputStream = HttpUtil.getAsInputStream(weiXinUser.getHeadimgurl());

                  if (asInputStream != null) {

                     FileUploadResult result = COSManager.getInstance().uploadFile(asInputStream,

                           String.format(FilePathEnum.userWXPortrait.getPath() + "%s_%s.jpg",

                                 weiXinUser.getUnionid(), System.currentTimeMillis() + ""));

                     if (result != null && !StringUtil.isNullOrEmpty(result.getUrl()))

                        portrait = result.getUrl();

                  } else {

                     portrait = weiXinUser.getHeadimgurl();

                  }

               }



               if (StringUtil.isNullOrEmpty(portrait))

                  portrait = Constant.systemCommonConfig.getDefaultPortrait();



               // 创建新账户

               userInfo = new UserInfo();

               userInfo.setPhone(phone);

               userInfo.setPortrait(portrait);

               userInfo.setAppId(appId);

               userInfo.setNickName(weiXinUser.getNickname());

               userInfo.setWxName(weiXinUser.getNickname());

               userInfo.setWxOpenId(weiXinUser.getOpenid());

               userInfo.setWxUnionId(weiXinUser.getUnionid());

               userInfo.setWxPic(weiXinUser.getHeadimgurl());

               userInfo.setLastLoginTime(System.currentTimeMillis());

               userInfo.setLoginType(2);

               userInfo.setLastLoginIp(request.getRemoteHost());

               userInfo.setState(UserInfo.STATE_NORMAL);

               addUser(userInfo);



               Long uid = userInfo.getId();

               ThreadUtil.run(new Runnable() {

                  public void run() {

                     try {

                        // 第一次登录时创建用户额外信息

                        userInfoExtraService.createUserInfoExtra(uid);

                     } catch (Exception e) {

                        e.printStackTrace();

                     }



                     // 加入绑定记录

                     UserAccountBindingHistory history = new UserAccountBindingHistory();

                     history.setContent(phone);

                     history.setType(UserAccountBindingHistory.TYPE_PHONE);

                     history.setUid(uid);

                     history.setFirst(true);

                     userAccountBindingHistoryService.addUserAccountBindingHistory(history);



                     userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindPhone, phone);

                     userInfoModifyRecordService.addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, weiXinUser.getUnionid());

                  }

               });

            }

            return userInfo;

         }

      } catch (Exception e) {

         e.printStackTrace();

      } finally {

         jedis.del(watchKey);

         jedis.unwatch();

         jedis.close();

      }

      throw new UserAccountException(10, "请稍后再试");

   }



   @Override

@@ -1427,6 +1641,5 @@
      // 插入记录

      userInfoDeleteRecordService.addDeleteRecord(uid, UserInfo.STATE_DELETE_OUT_OF_DATE, reason);

   }





}