fanli-server.git

			@@ -887,10 +887,8 @@
			} catch (Exception e) {
			e.printStackTrace();
			}

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

			return userInfo;
			}
			} catch (Exception e) {
			@@ -903,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,
			@@ -1311,6 +1395,129 @@

			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
			public void forbiddenUserAll(Long uid, String reason) {