From e283023f8193d5d9da75bcbbb0c8746d90a8985f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:26:14 +0800
Subject: [PATCH] Merge branch 'div_11'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java
index ebe12fa..e0b2c6d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java
@@ -14,9 +14,8 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
-import com.yeshi.fanli.util.AESUtil;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import net.sf.json.JSONObject;
@@ -61,8 +60,7 @@
out.print(JsonUtil.loadFalseResult(1, "鏆備笉寮�鏀剧敵璇�"));
return;
}
-
- //
+
UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);
if ("share".equalsIgnoreCase(source)) {
if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {
@@ -70,18 +68,17 @@
return;
}
- } else {
+ } else if ("zigou".equalsIgnoreCase(source)) {
if (user != null && !StringUtil.isNullOrEmpty(user.getSpecialId()) && user.getSpecialValid()) {
out.print(JsonUtil.loadFalseResult(1, "鏃犻渶鎺堟潈"));
return;
}
}
- String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(Constant.TAOBAO_AUTH_APPKEY,
- "http://test.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);
+ String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
+ "http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);
- String orderJS = "var orderId= document.getElementById('tp-bought-root').getElementsByClassName('js-order-container')[0].getElementsByTagName('div')[0].getAttribute('data-id');";
- orderJS += "if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href='yestv://taobaoorder#'+orderId;} else {window.handle.showOrder(orderId)}";
+ String orderJS=configService.get("taobao_order_parse_js");
JSONObject data = new JSONObject();
data.put("authLink", link);
try {
@@ -95,6 +92,11 @@
if (first)
out.print(JsonUtil.loadTrueResult(data));
else
- out.print(JsonUtil.loadTrue(0, data, "缁戝畾娣樺疂澶辫触"));
+ out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�"));
}
+
}
+
+
+
+
--
Gitblit v1.8.0