修正分享逻辑

05bc67e6 · 郝增润 · ef36fb7e · 05bc67e6 · 05bc67e6 · 05bc67e6
Commit 05bc67e6 authored Dec 02, 2021 by 郝增润
8 changed files
--- a/src/main/java/cn/com/duiba/jdactivity/controller/IndexController.java
+++ b/src/main/java/cn/com/duiba/jdactivity/controller/IndexController.java
@@ -34,4 +34,17 @@ public class IndexController {
        return modelAndView;
    }

+    @GetMapping("/jdshare")
+    public ModelAndView jdshare() {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jdshare");
+        return modelAndView;
+    }
+
+    @GetMapping("/jdfission")
+    public ModelAndView jdfission() {
+        ModelAndView modelAndView = new ModelAndView();
+        modelAndView.setViewName("jdfission");
+        return modelAndView;
+    }
 }
--- a/src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java
+++ b/src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java
@@ -658,7 +658,7 @@ public class Open2DuibaController {


    /**
-     * 通过用户pin加入购物车
+     * 发送京豆
     */
    @PostMapping("/sendBean")
    public Result<Boolean> sendBean(@RequestBody DuibaSendBeanParam param) {

--- a/src/main/java/cn/com/duiba/jdactivity/controller/TaobaoController.java
+++ b/src/main/java/cn/com/duiba/jdactivity/controller/TaobaoController.java
@@ -361,7 +361,7 @@ public class TaobaoController {


    /**
-     * 通过用户pin加入购物车
+     * 发送京豆
     */
    @PostMapping("/sendBean")
    public Result<Boolean> sendBean(@RequestBody DuibaSendBeanParam param) {

--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
 spring.application.name=jd-activity
-spring.profiles.active=dev
+spring.profiles.active=prod
 # 先排除一些autoconfigure
 spring.autoconfigure.exclude=
 # tomcat

--- a/src/main/resources/templates/autologin.html
+++ b/src/main/resources/templates/autologin.html
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
    <meta charset="UTF-8">
    <title>正在加载..</title>
@@ -46,7 +45,6 @@
 <script language="javascript">
    (function () {
        openLoginPanel();
-
    })()

    function openLoginPanel() {

--- a/src/main/resources/templates/autologin2.html
+++ b/src/main/resources/templates/autologin2.html
@@ -47,14 +47,19 @@
    (function () {
        console.log(2)
        openLoginPanel();
+        if (window.location.href.indexOf('JDSHARE') !== -1) {}
    })()
    function openLoginPanel() {
        console.log("登录面板")
        var isWechat = JSSDK.Client.isWeixin();
        var isQQ = JSSDK.Client.isQQ();
-        if (isWechat || isQQ) {
+        alert('进来了')
+        if (isWechat || isQQ || window.location.href.indexOf('JDSHARE') !== -1) {
+            alert('进来了wx')
            var redirectUrlPrimary = window.location.href.replace('autologin2', 'autologin3') + '&source=02'
+            alert(redirectUrlPrimary)
            var url = 'https://wq.jd.com/pinbind/pintokenredirect?biz=jm-business-center&url=' + encodeURIComponent(redirectUrlPrimary)
+            alert(url)
            window.location.href = url;
            return;
        }
@@ -63,6 +68,7 @@

    function isLogin(res) {
        console.log("login回调/打开登录面板的回调", res)
+        alert('isLogin')
        setTimeout(function () {
            console.log(res.data)
            if (res.data == 1) {
@@ -76,6 +82,7 @@
    }

    function getToken() {
+        alert('getToken')
        console.log("进入获取token方法", window.location.href)
        JSSDK.Isv.requestIsvToken({
            url: window.location.href
@@ -96,7 +103,8 @@
        var venderId = getUrlParam("venderId");
        var appKey = getUrlParam("appKey");
        var needCredits = getUrlParam("needCredits");
-
+        alert('token')
+alert(token)
        $.ajax({
            type: 'post',
            url: `/open2Duiba/autologin`,

--- a/src/main/resources/templates/autologin3.html
+++ b/src/main/resources/templates/autologin3.html
@@ -91,14 +91,13 @@
        var source = getUrlParam("source");
        var appKey = getUrlParam("appKey");
        var needCredits = getUrlParam("needCredits");
-
        $.ajax({
            type: 'post',
            url: `/open2Duiba/autologin`,
            data: JSON.stringify({
                token: token,
                redirectUrl: redirect,
-                source: source,
+                source: '02',
                env: env,
                shopId: shopId,
                venderId: venderId,

--- a/src/main/resources/templates/jdfission.html
+++ b/src/main/resources/templates/jdfission.html
+<!doctype html><html lang="zh"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><title>京购分享流水线</title><script src="//yun.duiba.com.cn/spark/v2/spark.base.fz.wxpollyfill.js"></script><script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script><script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script><script src="//h5static.m.jd.com/act/jm-jdshare/2.0.0/jm-jdshare.js"></script><script src="//yun.duiba.com.cn/js-libs/vConsole/3.3.4/vconsole.min.js"></script><script>// new VConsole();
+function getApp() {
+    return {
+        cloud: {},
+        cloudName: "clientTemplate2C",
+        requestType: "mock"
+    }
+}
+
+var CFG = CFG || {};
+CFG.projectId = location.pathname.split('/')[2] || '1';
+
+function getUrlParam(name) {
+    var search = window.location.search;
+    var matched = search
+        .slice(1)
+        .match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
+    return search.length ? matched && matched[2] : null;
+}
+
+CFG.appID = '${APPID}';
+if (!getUrlParam("appID")) {
+    // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
+}
+
+CFG.SOURCEVERSION = `p3f8c428b_index`;
+CFG.MONITOR = true;
+CFG.projectName = `冈本流水线-京东端 `
+
+function classnames() {
+    var args = Array.prototype.slice.call(arguments)
+    var classList = []
+    args.forEach(function (item) {
+        if (typeof item === 'object') {
+            for (var k in item) {
+                var kv = item[k]
+                if (kv) {
+                    classList.push(k)
+                }
+            }
+        } else if (typeof item === 'string') {
+            classList.push(item)
+        }
+    })
+    return classList.join(' ')
+}
+
+if (location.origin.indexOf("duibadev") >= 0) {
+    CFG.activityUrl = "http://activity.m.duibadev.com.cn/projectx/" + CFG.projectId + "/index.html?appID=1"
+    CFG.appKey = "oZ1hxUrKW95Qn9P4BZpSGSTdUDZ";
+    CFG.duibaEnv = "test"; // 环境
+    CFG.shopId = 10139787;
+    CFG.venderId = 10276497;
+
+} else if (location.origin.indexOf("duibatest") >= 0) {
+    CFG.activityUrl = "http://activity.m.duibatest.com.cn/projectx/" + CFG.projectId + "/index.html"
+    CFG.appKey = "oZ1hxUrKW95Qn9P4BZpSGSTdUDZ";
+    CFG.duibaEnv = "test"; // 环境
+    // CFG.shopId = 10139787;
+    // CFG.venderId = 10276497;
+    CFG.shopId = 1000001469;
+    CFG.venderId = 1000001469;
+} else {
+    if (CFG.projectId === "pecc0cf7a") {
+        // 线上测试
+        CFG.activityUrl = "https://84507.activity-1.m.duiba.com.cn/projectx/" + CFG.projectId + "/index.html";
+        CFG.appKey = "2NWc2qqfEzMoCDzFpF2q7cTPYJWc";
+        CFG.duibaEnv = ""; // 环境
+        CFG.shopId = 10139787;
+        CFG.venderId = 10276497;
+
+    } else {
+        // 线上正式
+        CFG.activityUrl = "https://84507.activity-1.m.duiba.com.cn/projectx/" + CFG.projectId + "/index.html";
+        CFG.appKey = "2NWc2qqfEzMoCDzFpF2q7cTPYJWc";
+        CFG.duibaEnv = ""; // 环境，不填则为正式环境
+        CFG.shopId = 1000001469;
+        CFG.venderId = 1000001469;
+    }
+
+}
+
+CFG.otherInviteCode = "";
+CFG.cbUrlInviteCode = "";
+CFG.myInviteCode = "";
+
+
+CFG.jdUrl = "https://shopmember.m.jd.com/shopcard/?venderId=" + CFG.venderId + "&shopId=" + CFG.shopId +
+    "&venderType=5&channel=401&returnUrl="; // 京东入会链接
+
+CFG.shareInfo = {
+    title: '冈本东京的秘密 冲榜赢限量礼品',
+    desc: '探索秘密 会员限定活动',
+    img: 'https://yun.duiba.com.cn/spark/assets/31f77bbb63d5114ba096777c4b1f908d2e63b444.jpg'
+}
+CFG.defaultName = "京东用户"
+
+function jumpUrl() {
+    var callbackUrl = CFG.otherInviteCode ? (CFG.activityUrl + '?cbUrlInviteCode=' + CFG.otherInviteCode) : CFG
+        .activityUrl;
+    var jumpUrl = CFG.jdUrl + encodeURIComponent(callbackUrl);
+    console.info('非会员')
+    console.info('jumpUrl', jumpUrl)
+
+    window.location.href = jumpUrl
+}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1638428130495/styles/main.81180ec275f7823d7802.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script src="//yun.duiba.com.cn/spark/v2/temp_base/1638428130495/js/runtime-main.800f07de.js"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1638428130495/js/vendors.6e4237fe.js"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1638428130495/js/main.23b1e2b2.js"></script></body></html>
\ No newline at end of file