From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAuthController.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 1ddf583..96905a5 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
@@ -12,8 +12,8 @@
import com.yeshi.fanli.entity.accept.AcceptData;
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.taobao.TaoBaoUtil;
@@ -26,6 +26,9 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private ConfigService configService;
/**
* 鑾峰彇娣樺疂鎺堟潈淇℃伅
@@ -53,6 +56,16 @@
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)) {
@@ -69,7 +82,7 @@
}
String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(Constant.TAOBAO_AUTH_APPKEY,
- "http://192.168.1.122:8080/fanli/client/v1/auth/callback/tb", uid, source);
+ "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)}";
@@ -86,6 +99,6 @@
if (first)
out.print(JsonUtil.loadTrueResult(data));
else
- out.print(JsonUtil.loadTrue(0, data, "缁戝畾娣樺疂澶辫触"));
+ out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�"));
}
}
--
Gitblit v1.8.0