fanli-server.git

			@@ -98,7 +98,7 @@
			String key = "useractive-" + uidStr;
			Jedis jedis = jedisPool.getResource();
			try {
			if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) {
			if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(Constant.IS_TEST?10:300)))) {
			try {
			Long uid = Long.parseLong(uidStr);
			// if (!Constant.IS_TEST) { // 活跃通知

			@@ -385,7 +385,7 @@
			inner.put("link", userVipConfigService.getValueByKey("vip_link"));
			inner.put("ion", "http://img.flqapp.com/resource/vip/icon_tearcher.png");
			inner.put("title", "拿五险与津贴享导师权益");
			inner.put("btnName", "升级会员");
			inner.put("btnName", "升级导师");
			} else {
			UserVIPPreInfo userVIPPreInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
			if (userVIPPreInfo != null) {

			@@ -7,11 +7,8 @@
			import org.springframework.stereotype.Component;
			import org.springframework.transaction.annotation.Transactional;

			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
			import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
			import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
			import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
			import com.yeshi.fanli.exception.user.vip.UserVIPPreInfoException;
			import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
			import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;

	fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/manger/user/UserLevelManager.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史