java/DolphinEnglish.git

			@@ -17,9 +17,10 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.Date;
			import java.util.List;
			import java.util.concurrent.TimeUnit;
			import java.util.regex.Matcher;
			import java.util.regex.Pattern;

			/**
			* <p>
			@@ -44,11 +45,20 @@

			@Autowired
			private HWSendSms hwSendSms;

			@Override
			public Boolean phoneCode(String phone) throws Exception {
			// 生成随机 6位数字验证码
			String phoneCode = RandomUtil.randomNumbers(6);

			String regex = Constants.PHONE;
			// 编译正则表达式
			Pattern pattern = Pattern.compile(regex);
			// 创建Matcher对象
			Matcher matcher = pattern.matcher(phone);
			// 判断是否匹配
			if (!matcher.matches()) {
			throw new GlobalException("手机号不合法！");
			}
			hwSendSms.sendSms(phoneCode, phone);
			// 判断redis中是否存在手机验证码
			Object phoneCodeRedis = redisTemplate.opsForValue().get(RedisConstants.PHONE_CODE + phone);
			@@ -79,15 +89,16 @@

			@Override
			public Boolean isVip() {
			TUser user = lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid())
			.eq(TUser::getDisabled, 0).eq(TUser::getState,1).one();
			// 是否为vip 逻辑
			if (null == user) {
			return false;
			}
			// vip过期时间，字段为空也表示当前用户不是vip
			Date vipEndTime = user.getVipEndTime();
			return null != vipEndTime && System.currentTimeMillis() <= vipEndTime.getTime();
			// TUser user = lambdaQuery().eq(TUser::getId, tokenService.getLoginUserStudy().getUserid())
			// .eq(TUser::getDisabled, 0).eq(TUser::getState,1).one();
			// // 是否为vip 逻辑
			// if (null == user) {
			// return false;
			// }
			// // vip过期时间，字段为空也表示当前用户不是vip
			// Date vipEndTime = user.getVipEndTime();
			// return null != vipEndTime && System.currentTimeMillis() <= vipEndTime.getTime();
			return true;
			}

			}