parent: 8195b07c | 补丁 | 提交 | show whitespace
admin
2020-11-25 604be616a6ba9e2604c8616be562c5a1c49f073c 
大淘客接口编码修改
5个文件已修改
185 ■■■■■ 已修改文件
facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/fanli.iml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/resource/env-dev/redis.properties 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
utils/src/test/java/com/yeshi/utils/AlipayTest.java 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 facade-goods/src/main/java/com/yeshi/goods/facade/utils/taobao/DaTaoKeApiUtil.java


@@ -14,6 +14,7 @@


import org.apache.commons.httpclient.HttpClient;


import org.apache.commons.httpclient.HttpException;


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


import org.apache.commons.io.IOUtils;


import org.jsoup.Jsoup;


import org.jsoup.nodes.Document;


import org.jsoup.nodes.Element;


@@ -23,13 +24,15 @@


import org.yeshi.utils.StringUtil;


import org.yeshi.utils.TimeUtil;




import java.io.IOException;


import java.io.UnsupportedEncodingException;


import java.io.*;


import java.math.BigDecimal;


import java.net.URLEncoder;


import java.util.*;




public class DaTaoKeApiUtil {




    final static String API_CHARSET = "ISO-8859-1";




    final static String API_KEY = "a083abb893";


    final static String API_KEY_2 = "b7a5ea2cd9";




@@ -55,6 +58,7 @@


    final static String[] APP_SECRETS = new String[] { APP_KEY_SECRET, APP_KEY_SECRET_2 };




    static Gson gson = null;




    static {


        gson = new GsonBuilder().setExclusionStrategies(new ExclusionStrategy() {


            @Override


@@ -84,6 +88,27 @@


        }


        return "";


    }




    private static String baseGet(String url, Map<String, String> params) {


        HttpClient client = new HttpClient();


        try {


            Iterator<String> keys = params.keySet().iterator();


            String key;


            for (url = url + "?"; keys.hasNext(); url = url + String.format("%s=%s&", key, URLEncoder.encode((String) params.get(key), "UTF-8"))) {


                key = keys.next();


            }




            GetMethod method = new GetMethod(url);


            client.executeMethod(method);


            InputStream inputStream = method.getResponseBodyAsStream();


            String result = IOUtils.toString(inputStream, API_CHARSET);


            return result;


        } catch (Exception var7) {


            var7.printStackTrace();


            return "";


        }


    }






    private static String request(String url) {


        String result = null;


@@ -183,7 +208,7 @@


            params.put("pageId", pageId);


        }


        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-list", params, new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-goods-list", params);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


        if (dataJson != null) {


@@ -221,8 +246,7 @@


            params.put("pageId", pageId);




        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-stale-goods-by-time", params,


                new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-stale-goods-by-time", params);


        System.out.println(result);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


@@ -255,8 +279,7 @@


            params.put("pageId", pageId);




        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/pull-goods-by-time", params,


                new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/pull-goods-by-time", params);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


        if (dataJson != null) {


@@ -289,7 +312,7 @@


            params.put("pageId", pageId);




        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-newest-goods", params, new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-newest-goods", params);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


        if (dataJson != null) {


@@ -311,8 +334,7 @@


        params.put("appKey", app.getAppKey());


        params.put("id", id + "");


        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,


                new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-goods-details", params);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


        if (dataJson != null) {


@@ -328,8 +350,7 @@


        params.put("appKey", app.getAppKey());


        params.put("goodsId", goodsId + "");


        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-details", params,


                new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-goods-details", params);


        System.out.println(result);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


@@ -350,7 +371,14 @@


                e.printStackTrace();


            }


        }


        return HttpUtil.get(url, 10000);


        String result = HttpUtil.get(url, 10000);




        try {


            if (result != null)


                return new String(result.getBytes("ISO-8859-1"), "UTF-8");


        } catch (UnsupportedEncodingException e) {


        }


        return result;


    }




    public static DaTaoKeGoodsResult search(String key, List<Integer> cidList, BigDecimal priceLowerLimit,


@@ -497,7 +525,7 @@


        }




        params.put("sign", getSign(params, app.getAppSecret()));


        String result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-goods-list", params, new HashMap<>());


        String result = baseGet("https://openapi.dataoke.com/api/goods/get-goods-list", params);


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


        if (dataJson != null) {


@@ -543,7 +571,7 @@


        int userType = 0;


        List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>();




        String result = HttpUtil.get("http://www.dataoke.com/brandGoods?id=" + brandId + "&page=1");


        String result = baseGet("http://www.dataoke.com/brandGoods?id=" + brandId + "&page=1", new HashMap<>());


        JSONObject json = JSONObject.fromObject(result);


        JSONArray arrayGoods = json.optJSONArray("goods");




@@ -606,10 +634,22 @@


        // 做2次请求


        String result = null;


        try {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/get-ranking-list", params);


        } catch (Exception e) {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/get-ranking-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/get-ranking-list", params);


        }




        try {




//            System.out.println("GBK:"+new String(result.getBytes("GBK"),"UTF-8"));


//            System.out.println("ISO-8859-1:"+new String(result.getBytes("ISO-8859-1"),"UTF-8"));


//            System.out.println("GB2312:"+new String(result.getBytes("GB2312"),"UTF-8"));




            result = new String(result.getBytes("ISO-8859-1"), "UTF-8");


        } catch (UnsupportedEncodingException e) {


            e.printStackTrace();


        }




        JSONObject json = JSONObject.fromObject(result);


        if (json != null) {


            JSONArray array = json.optJSONArray("data");


@@ -665,9 +705,9 @@




        String result = null;


        try {


            result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/category/get-top100", params);


        } catch (Exception e) {


            result = HttpUtil.get("https://openapi.dataoke.com/api/category/get-top100", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/category/get-top100", params);


        }




        String hotWords = null;


@@ -683,12 +723,12 @@




    /**


     * 高效转链


     *


     * @param auctionId


     * @param pid       void 返回类型


     * @throws


     * @Title: convertLink


     * @Description: 


     * @param auctionId


     * @param pid 


     * void 返回类型


     * @throws


     */


    public static String convertLink(Long auctionId, String pid) {


        TaoKeAppInfo app = APP_KEYS[0];


@@ -701,11 +741,9 @@




        String result = null;


        try {


            result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params,


                    new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params);


        } catch (Exception e) {


            result = HttpUtil.get("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params,


                    new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/tb-service/get-privilege-link", params);


        }


        


        System.out.println(result);


@@ -722,6 +760,7 @@


    


    /**


     * 朋友圈


     *


     * @param pageId


     * @return


     */


@@ -739,9 +778,9 @@




        String result = null;


        try {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/friends-circle-list", params);


        } catch (Exception e) {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/friends-circle-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/friends-circle-list", params);


        }


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");


@@ -758,9 +797,9 @@


    }


    


    




    /**


     * 9.9包邮精选


     *


     * @param pageId


     * @return


     */


@@ -780,9 +819,9 @@




        String result = null;


        try {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params);


        } catch (Exception e) {


            result = HttpUtil.get("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params, new HashMap<>());


            result = baseGet("https://openapi.dataoke.com/api/goods/nine/op-goods-list", params);


        }


        JSONObject json = JSONObject.fromObject(result);


        JSONObject dataJson = json.optJSONObject("data");




 fanli/fanli.iml


@@ -39,7 +39,7 @@


    <orderEntry type="sourceFolder" forTests="false" />


    <orderEntry type="inheritedJdk" />


    <orderEntry type="library" name="javas" level="project" />


    <orderEntry type="module" module-name="utils" />


    <orderEntry type="library" name="Maven: com.yeshi:utils:0.0.1-SNAPSHOT" level="project" />


    <orderEntry type="library" name="Maven: com.opencsv:opencsv:4.3.2" level="project" />


    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.3" level="project" />


    <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.2" level="project" />




 fanli/src/main/java/com/yeshi/fanli/job/UpdateDaTaoKeJob.java


@@ -7,6 +7,13 @@






import javax.annotation.Resource;







import com.xxl.job.core.biz.model.ReturnT;



import com.xxl.job.core.handler.annotation.XxlJob;



import com.yeshi.fanli.entity.AppVersionInfo;



import com.yeshi.fanli.entity.SystemEnum;



import com.yeshi.fanli.entity.common.Config;



import com.yeshi.fanli.entity.system.ConfigKeyEnum;



import com.yeshi.fanli.util.StringUtil;



import org.springframework.scheduling.annotation.Scheduled;



import org.springframework.stereotype.Component;







@@ -18,6 +25,7 @@


import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;



import com.yeshi.goods.facade.service.DaTaoKeGoodsDetailV2Service;



import com.yeshi.fanli.util.Constant;



import org.yeshi.utils.AppMarketUtil;



import org.yeshi.utils.TimeUtil;



import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import com.yeshi.fanli.util.taobao.TaoKeApiUtil;



@@ -58,6 +66,15 @@


        }



    }











    //同步大淘客所有商品



    @XxlJob("dataoke-syncAllGoods")



    public ReturnT<String> doSyncJobNew(String param) throws Exception {



        daTaoKeGoodsDetailV2Service.startSyncGoods();



        return ReturnT.SUCCESS;



    }











    @Scheduled(cron = "0 0/10 * * * ? ")



    public void doUpdateJobNew() {



        if (!Constant.IS_TASK)





 fanli/src/main/resource/env-dev/redis.properties


@@ -1,9 +1,9 @@


redis.addr=192.168.3.253



redis.port=6379



redis.auth=123456



#redis.addr=193.112.34.40



#redis.addr=192.168.3.253



#redis.port=6379



#redis.auth=weikou2014



#redis.auth=123456



redis.addr=193.112.34.40



redis.port=6379



redis.auth=weikou2014



redis.max_total=1024



redis.max_idle=200



redis.max_wait=10000





 utils/src/test/java/com/yeshi/utils/AlipayTest.java


@@ -2,13 +2,11 @@




import com.alipay.api.AlipayApiException;


import org.yeshi.utils.alipay.AlipayUtil;


import org.yeshi.utils.entity.alipay.AlipayAppInfo;


import org.yeshi.utils.alipay.AlipayXcxUtil;


import org.yeshi.utils.entity.alipay.AlipayAppInfo;


import org.yeshi.utils.entity.alipay.AlipayCertInfo;


import org.yeshi.utils.entity.alipay.AlipayTransferAccount;


import org.yeshi.utils.entity.alipay.AlipayTransferInfo;


import org.yeshi.utils.exception.AlipayCommonException;


import org.yeshi.utils.exception.AlipayTransferException;




import java.io.FileInputStream;


import java.io.FileNotFoundException;


@@ -49,34 +47,33 @@


        }


    }




    private static void transfer() {


        AlipayTransferInfo info = new AlipayTransferInfo();


        new AlipayTransferAccount("2088812685461771");


        info.setAccount(new AlipayTransferAccount("贺小辉", "18581318252"));


        info.setMark("备注");


        info.setMoney(new BigDecimal("0.01"));


        info.setOrderTitle("标题");


        info.setOutBizNo("TEST-6");


        info.setPayerName("*");


        info.setBizScene(AlipayTransferInfo.AlipayBizSceneEnum.DIRECT_TRANSFER);


        info.setProductCode(AlipayTransferInfo.AlipayProductCodeEnum.STD_RED_PACKET);


        try {


            AlipayUtil.alipayFundTransUniTransfer(getAppInfo(), info, getCertInfo());


        } catch (FileNotFoundException e) {


            e.printStackTrace();


        } catch (AlipayApiException e) {


            e.printStackTrace();


        } catch (AlipayTransferException e) {


            e.printStackTrace();


        }




    }


//    private static void transfer() {


//        AlipayTransferInfo info = new AlipayTransferInfo();


//        new AlipayTransferAccount("2088812685461771");


//        info.setAccount(new AlipayTransferAccount("贺小辉", "18581318252"));


//        info.setMark("备注");


//        info.setMoney(new BigDecimal("0.01"));


//        info.setOrderTitle("标题");


//        info.setOutBizNo("TEST-6");


//        info.setPayerName("*");


//        info.setBizScene(AlipayTransferInfo.AlipayBizSceneEnum.DIRECT_TRANSFER);


//        info.setProductCode(AlipayTransferInfo.AlipayProductCodeEnum.STD_RED_PACKET);


//        try {


//            AlipayUtil.alipayFundTransUniTransfer(getAppInfo(), info, getCertInfo());


//        } catch (FileNotFoundException e) {


//            e.printStackTrace();


//        } catch (AlipayApiException e) {


//            e.printStackTrace();


//        } catch (AlipayTransferException e) {


//            e.printStackTrace();


//        }


//


//    }




    private static void getBalance() {


        try {


            BigDecimal balance = AlipayUtil.getAccountBalance(getAppInfo(), getCertInfo(), "2088431211483485");


            BigDecimal balance = AlipayUtil.getAccountBalance(getAppInfo(), "2088431211483485");


            System.out.println(balance);


        } catch (FileNotFoundException e) {


        } catch (AlipayApiException e) {


            e.printStackTrace();


        } catch (AlipayCommonException e) {


@@ -87,7 +84,7 @@




    private static void getOrderDetail() {


        try {


            AlipayUtil.getOrderDetail(getAppInfo(), getCertInfo(), AlipayTransferInfo.AlipayProductCodeEnum.STD_RED_PACKET, AlipayTransferInfo.AlipayBizSceneEnum.DIRECT_TRANSFER, "TEST-5");


            AlipayUtil.getOrderDetail(getAppInfo(), AlipayTransferInfo.AlipayProductCodeEnum.STD_RED_PACKET, AlipayTransferInfo.AlipayBizSceneEnum.DIRECT_TRANSFER, "TEST-5");


        } catch (Exception e) {


            e.printStackTrace();


        }