fanli-server.git

			@@ -20,7 +20,6 @@
			import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;
			import com.yeshi.fanli.entity.bus.user.LoginResult;
			import com.yeshi.fanli.entity.bus.user.SMSHistory;
			import com.yeshi.fanli.entity.bus.user.UserAccountBindingHistory;
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.bus.user.WeiXinUser;
			import com.yeshi.fanli.entity.system.BusinessSystem;

			@@ -42,12 +42,16 @@
			msgCode);
			// 发送短信
			// 发送间隔2分钟内的采用阿里云短信发送
			if (StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
			String cacheString = redisManager.getCommonString(key);
			if (StringUtil.isNullOrEmpty(cacheString) \|\| Integer.parseInt(cacheString) < 2) {
			TencentSMSUtil.sendSingleMsg(phone, msg);
			redisManager.cacheCommonString(key, "1", 120);
			redisManager.increase(key);
			redisManager.expire(key, 120);
			} else {
			redisManager.removeCommonString(key);
			// 发送阿里云短信
			JSONObject data = new JSONObject();
			data.put("code", msgCode);
			AliyunSMSUtil.sendSingleMsg(phone, Constant.smsConfig.getAliyunLoginTemplatecode(), data.toString());
			}
			// 缓存

			@@ -102,6 +102,24 @@
			}
			}

			public void increase(String key) {
			Jedis jedis = jedisPool.getResource();
			try {
			jedis.incr(key);
			} finally {
			jedisPool.returnResource(jedis);
			}
			}

			public void expire(String key,int seconds) {
			Jedis jedis = jedisPool.getResource();
			try {
			jedis.expire(key, 15);
			} finally {
			jedisPool.returnResource(jedis);
			}
			}

			public void cacheCommonString(String key, String value, int seconds) {
			setString(key, value, seconds);
			}
			@@ -284,37 +302,37 @@
			String value = "";
			if (Constant.IS_OUTNET)
			value = getCommonString(key);


			if (StringUtil.isNullOrEmpty(value)) {
			TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
			goods.setShopTitle(shopTitle);
			goods.setSellerId(sellerId);
			goods.setAuctionId(auctionId);
			TaoBaoShopInfo info = taoBaoShopService.getTaoBaoShopInfo(goods);

			if(info != null) {

			if (info != null) {
			String shopUrl = info.getShopUrl();
			if(shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
			if (shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
			shopUrl = "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
			info.setShopUrl(shopUrl);
			}
			}


			if (Constant.IS_OUTNET && info != null) {
			value = new Gson().toJson(info);
			cacheCommonString(key, value, 60 * 60 * 2);
			}


			return info;
			} else {
			TaoBaoShopInfo info = new Gson().fromJson(value, TaoBaoShopInfo.class);


			String shopUrl = info.getShopUrl();
			if(shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
			if (shopUrl != null && shopUrl.contains("tmall://page.tm/shop")) {
			shopUrl = "http://store.taobao.com/shop/view_shop.htm?user_number_id=" + sellerId;
			info.setShopUrl(shopUrl);
			}


			return info;
			}
			}
			@@ -336,10 +354,6 @@
			else
			return true;
			}





			/**
			* 设置短信60s倒计时

	fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/user/SMSServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史