热门功能添加版本区分

admin

2019-09-19 6d09f465da0600c21ea2f75ea67be460451f0bfc

热门功能添加版本区分

 fanli/src/main/java/com/yeshi/fanli/controller/DouYinCallBackController.java

@@ -8,13 +8,19 @@
import org.springframework.web.bind.annotation.RequestMapping;



import com.yeshi.fanli.entity.ad.DouYinClickEvent;

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

import com.yeshi.fanli.util.ad.DouYinAdUtil;



@Controller

@RequestMapping("ad/callback/douyin")

public class DouYinCallBackController {

    @Resource

    private DouYinClickEventService douYinClickEventService;



    @Resource

    private DeviceActiveService deviceActiveService;



    /**

     * 抖音下载回调

@@ -24,6 +30,12 @@
    @RequestMapping("monitor")

    public void download(DouYinClickEvent event, PrintWriter out) {

        douYinClickEventService.save(event);

        if (event.getOs() == 0) {

            DeviceActive active = deviceActiveService.getFirstActiveInfo(event.getAndroidId());

            if (active != null) {

                DouYinAdUtil.activeAndroid(event.getCallback(), event.getImei(), active.getCreateTime().getTime());

            }

        }

        out.print("success");

    }




 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ConfigController.java

@@ -154,7 +154,8 @@
        } else {// 老人

            data.put("userTimeType", 1);

        }

        data.put("hotFuctionLink", configService.get("hot_function_url"));

        data.put("hotFuctionLink",

                configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));//

        out.print(JsonUtil.loadTrueResult(data));

    }




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

@@ -155,7 +155,7 @@
        } else {// 老人

            data.put("userTimeType", 1);

        }

        data.put("hotFuctionLink", configService.get("hot_function_url"));

        data.put("hotFuctionLink",configService.getByVersion("hot_function_url", platform, Integer.parseInt(acceptData.getVersion())));

        out.print(JsonUtil.loadTrueResult(data));

    }




 fanli/src/main/java/com/yeshi/fanli/dao/ad/DouYinClickEventDao.java

@@ -2,10 +2,12 @@


import org.springframework.data.mongodb.core.query.Criteria;

import org.springframework.data.mongodb.core.query.Query;

import org.springframework.stereotype.Repository;



import com.yeshi.fanli.dao.MongodbBaseDao;

import com.yeshi.fanli.entity.ad.DouYinClickEvent;



@Repository

public class DouYinClickEventDao extends MongodbBaseDao<DouYinClickEvent> {



    public DouYinClickEvent selectByAid(String aid) {


 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -693,7 +693,7 @@
        }



        String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);

        // System.out.println("resultStr"+ resultStr);

//         System.out.println("resultStr"+ resultStr);

        JSONObject data = JSONObject.fromObject(resultStr);

        if (data.optJSONObject("tbk_dg_material_optional_response") != null

                && data.optJSONObject("tbk_dg_material_optional_response").optJSONObject("result_list") != null) {