Merge remote-tracking branch 'origin/div' into div

Administrator

2020-03-03 4c4646819beb205c070c34737c0b94d7084d548f

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/DynamicControllerV2.java

@@ -239,7 +239,7 @@
            // 2.0.7返回发圈+活动+学院+素材
            list.add(map.get(TYPE_FAQUAN));
            list.add(map.get(TYPE_HUODONG));
            // list.add(map.get(TYPE_XUEYUAN));
//            list.add(map.get(TYPE_XUEYUAN));
            list.add(map.get(TYPE_SUCAI));

        } else if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {

 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java

@@ -56,7 +56,10 @@
        orderFindPDD("京东订单找回"),

        shareSingle("商品详情单图分享"),

        dynamicShareSingle("动态单图分享"),

        dynamicShareMulti("动态多图分享");

        dynamicShareMulti("动态多图分享"),

        fastShare1("快捷分享-淘宝"),

        fastShare2("快捷分享-京东"),

        fastShare3("快捷分享-拼多多");



        private final String desc;




 fanli/src/main/java/com/yeshi/fanli/service/impl/order/LostOrderServiceImpl.java

@@ -238,11 +238,11 @@
                update.setId(lo.getId());

                update.setResultCode(LostOrder.RESULT_CODE_SUCCESS);

                lostOrderMapper.updateByPrimaryKeySelective(update);

                Order order = orderService.findOrderByOrderIdAndType(orderId, Order.ORDER_TYPE_TAOBAO);

                Order order = orderService.findOrderByOrderIdAndType(orderId, orderType);

                if (order != null)

                    // 添加通知

                    userOrderMsgNotificationService.orderFoundSuccess(lo.getUserInfo().getId(), lo.getOrderId(),

                            order.getMoney(), 1, new Date(lo.getHandleTime()));

                            order.getMoney(), orderType, new Date(lo.getHandleTime()));

            }

        }

    }


 fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.manger;



import java.io.IOException;

import java.io.UnsupportedEncodingException;

import java.net.URLDecoder;

import java.util.HashSet;

@@ -11,6 +12,10 @@


import javax.annotation.Resource;



import org.apache.commons.httpclient.Header;

import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.HttpException;

import org.apache.commons.httpclient.methods.PostMethod;

import org.springframework.stereotype.Component;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.NumberUtil;


 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java

@@ -15,7 +15,9 @@
import javax.script.ScriptEngineManager;

import javax.script.ScriptException;



import org.apache.commons.httpclient.Header;

import org.apache.commons.httpclient.HttpClient;

import org.apache.commons.httpclient.HttpException;

import org.apache.commons.httpclient.methods.PostMethod;

import org.jsoup.Jsoup;

import org.jsoup.nodes.Document;

@@ -368,7 +370,8 @@


        HttpClient client = new HttpClient();

        PostMethod pm = new PostMethod("https://jinbao.pinduoduo.com/network/api/common/queryTopGoodsList");

        pm.setRequestHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.25 Safari/537.36 Core/1.70.3730.400 QQBrowser/10.5.3805.400");

        pm.setRequestHeader("User-Agent",

                "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.25 Safari/537.36 Core/1.70.3730.400 QQBrowser/10.5.3805.400");

        pm.setRequestHeader("Content-Type", "application/json;charset=UTF-8");

        pm.setRequestHeader("Referer", "https://jinbao.pinduoduo.com/promotion/hot-promotion");

        pm.setRequestBody(params.toString());

@@ -512,12 +515,30 @@
    }



    public static String getPDDGoodsId(String url) {

        if (url == null)

            return null;

        String link = url;

        if (link.contains("://p.pinduoduo.com/")) {// 拼多多的短链

            HttpClient client = new HttpClient();

            client.getHttpConnectionManager().getParams().setConnectionTimeout(5000);

            PostMethod pm = new PostMethod(link);

            try {

                client.executeMethod(pm);

                Header location = pm.getResponseHeader("Location");

                if (location != null)

                    link = location.getValue();

            } catch (HttpException e) {

                e.printStackTrace();

            } catch (IOException e) {

                e.printStackTrace();

            }

        }



        try {

            if (engine instanceof Invocable) {

                Invocable in = (Invocable) engine;

                Object goodsId = in.invokeFunction("getGoodsId", url);

                if (goodsId!=null)

                Object goodsId = in.invokeFunction("getGoodsId", link);

                if (goodsId != null)

                    return goodsId.toString().trim();

            }

        } catch (Exception e) {

@@ -525,12 +546,13 @@
        }

        return null;

    }

	
	


    public static PDDGoodsDetail getPDDGoodsInfo(String id) {

        try {

            Document doc = Jsoup.connect("http://yangkeduo.com/goods.html?goods_id=" + id)

                    .userAgent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36").get();

                    .userAgent(

                            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 Safari/537.36")

                    .get();

            Elements els = doc.getElementsByTag("script");

            for (int i = 0; i < els.size(); i++) {

                if (els.get(i).html().contains("window.rawData")) {

@@ -545,23 +567,22 @@
                            Invocable in = (Invocable) engine;

                            String jsonStr = in.invokeFunction("getData").toString();

                            JSONObject json = JSONObject.fromObject(jsonStr);

							


                            JSONObject goods = json.optJSONObject("store").optJSONObject("initDataObj")

                                    .optJSONObject("goods");

							


                            String imageData = goods.optString("viewImageData");

                            imageData = imageData.replace("[", "").replace("]", "");

                            String[] images = imageData.split(",");

							


                            String image = images[0].trim();

                            if (image.startsWith("\""))

                                image =image.substring(1, image.length()-1);

                                image = image.substring(1, image.length() - 1);

                            if (image.endsWith("\""))

                                image =image.substring(0, image.length()-2);

							
							
                                image = image.substring(0, image.length() - 2);



                            PDDGoodsDetail goodsDetail = new PDDGoodsDetail();

                            goodsDetail.setGoodsImageUrl("http:"  +  image);

                            goodsDetail.setGoodsImageUrl("http:" + image);

                            goodsDetail.setGoodsThumbnailUrl("http:" + image);

                            goodsDetail.setGoodsName(goods.optString("goodsName"));

                            goodsDetail.setGoodsId(goods.optLong("goodsID"));