From 179b39401c406579a0d10c442a665aeb2802e931 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 20 五月 2019 09:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
index 10fd233..25945d3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/AuthCallBackController.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.controller;
import java.io.IOException;
+import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Date;
@@ -225,9 +226,11 @@
if (errCode == 0)// 鎴愬姛
{
if ("share".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+ // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=0");
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+ // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=0");
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
String script = String.format(
"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎭枩浣狅紝娣樺疂缁戝畾鎴愬姛\");yestv.finishPage();}</script>",
@@ -236,9 +239,11 @@
}
} else {// 澶辫触
if ("share".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+ // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_bonusState.html?code=1");
+ closeWebPage(response.getWriter());
} else if ("zigou".equalsIgnoreCase(source)) {
- response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+ // response.sendRedirect("http://apph5.yeshitv.com/apppage/flq_rebateState.html?code=1");
+ closeWebPage(response.getWriter());
} else if ("bind".equalsIgnoreCase(source)) {
String script = String.format(
"<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.toast(\"鎶辨瓑锛屾窐瀹濈粦瀹氬け璐");yestv.finishPage();}</script>",
@@ -252,6 +257,11 @@
}
+ private void closeWebPage(PrintWriter out) {
+ String script = "<script>if(/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)) {window.location.href = 'yestv://toast#%s';setTimeout(function(){window.location.href = 'yestv://finishPage';},100);} else {yestv.finishPage();}</script>";
+ out.print(script);
+ }
+
@RequestMapping(value = "pinduoduo")
public void pinDuoDuo(HttpServletResponse response) {
--
Gitblit v1.8.0