fanli-server.git

			@@ -53,7 +53,7 @@
			* @param out
			*/
			@RequestMapping(value = "getSuperHongBaoToken")
			public void getSuperHongBaoToken(String sign, Long uid, String callback, PrintWriter out) {
			public void getSuperHongBaoToken(String sign, Long uid, String callback, String sceneId, PrintWriter out) {
			if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "签名错误")));
			return;
			@@ -77,7 +77,7 @@
			try {
			TaoKeOfficialActivityConvertResultDTO dto = null;
			try {
			dto = convertLinkManager.taobaoOfficialActivityConvert(uid, "mm_124933865_56750082_19507100253", "20150318020005224", info.getRelationId(), false);
			dto = convertLinkManager.taobaoOfficialActivityConvert(uid, "mm_124933865_56750082_19507100253", sceneId, info.getRelationId(), false);
			} catch (ConvertLinkException e) {
			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getCode(), e.getMessage())));
			return;
			@@ -85,7 +85,7 @@
			String link = dto.getClick_url();

			if (!StringUtil.isNullOrEmpty(link)) {
			token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "【天猫双12】上亿红包等你来拆！",
			token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "【年货节】上亿红包等你来拆！",
			link);
			if (!StringUtil.isNullOrEmpty(token))
			redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缓存1天
			@@ -112,7 +112,7 @@
			}

			@RequestMapping(value = "getYuShouToken")
			public void getYuShouToken(String sign, Long uid, String callback, PrintWriter out) {
			public void getYuShouToken(String sign, Long uid, String callback, String sceneId, PrintWriter out) {
			if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "签名错误")));
			return;
			@@ -138,7 +138,7 @@
			TaoKeOfficialActivityConvertResultDTO dto = null;
			try {
			dto = convertLinkManager.taobaoOfficialActivityConvert(uid, "mm_124933865_56750082_19507100253",
			"20150318020005224", info.getRelationId(), true);
			sceneId, info.getRelationId(), true);
			} catch (ConvertLinkException e) {
			out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getCode(), e.getMessage())));
			return;