From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S618Controller.java | 221 ++++++++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 107 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S618Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S618Controller.java
index a0196e7..9453a08 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S618Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5S618Controller.java
@@ -4,6 +4,8 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -25,127 +27,132 @@
@RequestMapping("api/apph5/v1/618")
public class H5S618Controller {
- @Resource
- private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
- @Resource
- private RedisManager redisManager;
+ @Resource
+ private RedisManager redisManager;
- @Resource
- private ConfigService configService;
+ @Resource
+ private ConfigService configService;
- /**
- * 鑾峰彇瓒呯骇绾㈠寘鍒嗕韩鍙ｄ护
- *
- * @param acceptData
- * @param uid
- * @param out
- */
- @RequestMapping(value = "getSuperHongBaoToken")
- public void getSuperHongBaoToken(String sign, Long uid, String callback, PrintWriter out) {
- if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "绛惧悕閿欒")));
- return;
- }
+ @Resource
+ private UserInfoService userInfoService;
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "璇风櫥褰�")));
- return;
- }
+ /**
+ * 鑾峰彇瓒呯骇绾㈠寘鍒嗕韩鍙ｄ护
+ *
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getSuperHongBaoToken")
+ public void getSuperHongBaoToken(String sign, Long uid, String callback, PrintWriter out) {
+ if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "绛惧悕閿欒")));
+ return;
+ }
- UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
- if (info == null || StringUtil.isNullOrEmpty(info.getRelationId()) || info.getRelationValid() == false) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(2, "鎮ㄥ皻鏈粦瀹氭窐瀹濓紝璇峰墠寰�鎴戠殑->涓汉淇℃伅 缁戝畾娣樺疂璐﹀彿")));
- return;
- }
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "璇风櫥褰�")));
+ return;
+ }
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() + "");
- String token = null;
- token = redisManager.getCommonString(key);
- if (StringUtil.isNullOrEmpty(token)) {
- try {
- TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
- "20150318019998255", info.getRelationId());
- String link = dto.getClick_url();
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
+ if (info == null || StringUtil.isNullOrEmpty(info.getRelationId()) || info.getRelationValid() == false) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(2, "鎮ㄥ皻鏈粦瀹氭窐瀹濓紝璇峰墠寰�鎴戠殑->涓汉淇℃伅 缁戝畾娣樺疂璐﹀彿")));
+ return;
+ }
- if (!StringUtil.isNullOrEmpty(link)) {
- token = TaoKeApiUtil.getTKToken("https://gw.alicdn.com/tfs/TB1alz7HYY1gK0jSZTEXXXDQVXa-800-450.jpg", "澶╃尗618娲诲姩涓婁嚎绾㈠寘绛変綘鏉ユ姠",
- link);
- if (!StringUtil.isNullOrEmpty(token))
- redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
- }
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11SuperHongBao, info.getRelationId() + "");
+ String token = null;
+ token = redisManager.getCommonString(key);
+ if (StringUtil.isNullOrEmpty(token)) {
+ try {
+ TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
+ "20150318019998255", info.getRelationId());
+ String link = dto.getClick_url();
- if (StringUtil.isNullOrEmpty(token)) {
- if (!StringUtil.isNullOrEmpty(callback))
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "鍙ｄ护鐢熸垚澶辫触锛岃绋嶅悗閲嶈瘯")));
- return;
- }
+ if (!StringUtil.isNullOrEmpty(link)) {
+ token = TaoKeApiUtil.getTKToken("https://gw.alicdn.com/tfs/TB1alz7HYY1gK0jSZTEXXXDQVXa-800-450.jpg", "澶╃尗618娲诲姩涓婁嚎绾㈠寘绛変綘鏉ユ姠",
+ link);
+ if (!StringUtil.isNullOrEmpty(token))
+ redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
- String desc = configService.get(ConfigKeyEnum.superHongBaoShareDesc.getKey());
- desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
- try {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
- } catch (Exception e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1002, "鏈煡閿欒")));
- }
- }
+ if (StringUtil.isNullOrEmpty(token)) {
+ if (!StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "鍙ｄ护鐢熸垚澶辫触锛岃绋嶅悗閲嶈瘯")));
+ return;
+ }
- @RequestMapping(value = "getYuShouToken")
- public void getYuShouToken(String sign, Long uid, String callback, PrintWriter out) {
- if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "绛惧悕閿欒")));
- return;
- }
+ SystemEnum system = userInfoService.getUserSystem(uid);
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "璇风櫥褰�")));
- return;
- }
+ String desc = configService.getValue(ConfigKeyEnum.superHongBaoShareDesc.getKey(), system);
+ desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
+ try {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1002, "鏈煡閿欒")));
+ }
+ }
- UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
- if (info == null || StringUtil.isNullOrEmpty(info.getRelationId()) || info.getRelationValid() == false) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(2, "鎮ㄥ皻鏈粦瀹氭窐瀹濓紝璇峰墠寰�鎴戠殑->涓汉淇℃伅 缁戝畾娣樺疂璐﹀彿")));
- return;
- }
+ @RequestMapping(value = "getYuShouToken")
+ public void getYuShouToken(String sign, Long uid, String callback, PrintWriter out) {
+ if (!StringUtil.Md5(uid + "@?,223Hbb88lll").equalsIgnoreCase(sign)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1001, "绛惧悕閿欒")));
+ return;
+ }
- String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11YuShou, info.getRelationId() + "");
- String token = null;
- if (Constant.IS_OUTNET)
- token = redisManager.getCommonString(key);
- if (StringUtil.isNullOrEmpty(token)) {
- try {
- TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
- "1574926757600", info.getRelationId());
- String link = dto.getShort_click_url();
- if (!StringUtil.isNullOrEmpty(link)) {
- token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "棰勫敭鍟嗗搧浠樺畾閲戯紝寰楀閲戯紒",
- link);
- if (Constant.IS_OUTNET)
- if (!StringUtil.isNullOrEmpty(token))
- redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
- }
- } catch (Exception e) {
- LogHelper.errorDetailInfo(e);
- }
- }
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "璇风櫥褰�")));
+ return;
+ }
- if (StringUtil.isNullOrEmpty(token)) {
- if (!StringUtil.isNullOrEmpty(callback))
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "鍙ｄ护鐢熸垚澶辫触锛岃绋嶅悗閲嶈瘯")));
- return;
- }
+ UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByUid(uid);
+ if (info == null || StringUtil.isNullOrEmpty(info.getRelationId()) || info.getRelationValid() == false) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(2, "鎮ㄥ皻鏈粦瀹氭窐瀹濓紝璇峰墠寰�鎴戠殑->涓汉淇℃伅 缁戝畾娣樺疂璐﹀彿")));
+ return;
+ }
- String desc = configService.get(ConfigKeyEnum.superYuShouShareDesc.getKey());
- desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
- try {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
- } catch (Exception e) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1002, "鏈煡閿欒")));
- }
- }
+ String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.S11YuShou, info.getRelationId() + "");
+ String token = null;
+ if (Constant.IS_OUTNET)
+ token = redisManager.getCommonString(key);
+ if (StringUtil.isNullOrEmpty(token)) {
+ try {
+ TaoKeOfficialActivityConvertResultDTO dto = TaoKeApiUtil.officialActivityConvert("19507100253",
+ "1574926757600", info.getRelationId());
+ String link = dto.getShort_click_url();
+ if (!StringUtil.isNullOrEmpty(link)) {
+ token = TaoKeApiUtil.getTKToken("http://img.flqapp.com/resource/s11/banner.jpg", "棰勫敭鍟嗗搧浠樺畾閲戯紝寰楀閲戯紒",
+ link);
+ if (Constant.IS_OUTNET)
+ if (!StringUtil.isNullOrEmpty(token))
+ redisManager.cacheCommonString(key, token, 60 * 60 * 24);// 缂撳瓨1澶�
+ }
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+
+ if (StringUtil.isNullOrEmpty(token)) {
+ if (!StringUtil.isNullOrEmpty(callback))
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1, "鍙ｄ护鐢熸垚澶辫触锛岃绋嶅悗閲嶈瘯")));
+ return;
+ }
+
+ SystemEnum system = userInfoService.getUserSystem(uid);
+ String desc = configService.getValue(ConfigKeyEnum.superYuShouShareDesc.getKey(), system);
+ desc = desc.replace("[娣樺彛浠", TaoBaoUtil.filterTaoToken(token));
+ try {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(StringUtil.getBase64String(desc))));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(1002, "鏈煡閿欒")));
+ }
+ }
}
--
Gitblit v1.8.0