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 | 78 +--------------------------------------
1 files changed, 2 insertions(+), 76 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 237f361..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
@@ -61,80 +61,6 @@
return;
}
-
-
-
-
-
- //
- UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);
- if ("share".equalsIgnoreCase(source)) {
- if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {
- out.print(JsonUtil.loadFalseResult(1, "鏃犻渶鎺堟潈"));
- return;
- }
-
- } else {
- if (user != null && !StringUtil.isNullOrEmpty(user.getSpecialId()) && user.getSpecialValid()) {
- out.print(JsonUtil.loadFalseResult(1, "鏃犻渶鎺堟潈"));
- return;
- }
- }
-
- 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)}";
- JSONObject data = new JSONObject();
- data.put("authLink", link);
- try {
- data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
- StringUtil.getBase64String("*M#34f?,")));
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- data.put("orderUrl", "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm");
- if (first)
- out.print(JsonUtil.loadTrueResult(data));
- else
- out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�"));
- }
-
-
- /**
- * 鑾峰彇娣樺疂鎺堟潈淇℃伅
- *
- * @param acceptData
- * @param uid
- * @param source
- * @param out
- */
- @RequestMapping(value = "getTaoBaoAuthInfoNew", method = RequestMethod.POST)
- public void getTaoBaoAuthInfoNew(AcceptData acceptData, Long uid, String source, Boolean first, PrintWriter out) {
-
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(2, "鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(source)) {
- out.print(JsonUtil.loadFalseResult(3, "鏉ユ簮閿欒"));
- return;
- }
-
- if (first == null) {
- out.print(JsonUtil.loadFalseResult(4, "璇蜂紶first"));
- return;
- }
-
- if (!"1".equalsIgnoreCase(configService.get("open_speical_and_relation_apply"))) {
- out.print(JsonUtil.loadFalseResult(1, "鏆備笉寮�鏀剧敵璇�"));
- return;
- }
-
- //
UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);
if ("share".equalsIgnoreCase(source)) {
if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {
@@ -152,8 +78,7 @@
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 {
@@ -169,6 +94,7 @@
else
out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�"));
}
+
}
--
Gitblit v1.8.0