yt-advertise/advertise-feign/src/main/java/com/ytpm/feign/AdvertiseFeign.java

@@ -19,13 +19,13 @@ public interface AdvertiseFeign {
     @PostMapping("/advertise/saveApp")
     Result<AddAppResponse> saveApp(@RequestBody AddAppParam param);
     @GetMapping("/advertise/delApp")
-    Result<?> delApp(@RequestParam("appId") String appId);
+    Result<?> delApp(@RequestParam("appId") String appId,@RequestParam("takuPublicKey") String takuPublicKey);
     @PostMapping("/advertise/relativePlatform")
     Result<?> relativePlatform(@RequestBody RelativeChannelParam channelParam);
     @PostMapping("/advertise/savePlacement")
     ResultTable<AddPlacementResponse> savePlacement(@RequestBody AddPlacementParam param);
     @GetMapping("/advertise/delPlacement")
-    Result<?> delPlacement(@RequestParam("placementId")String placementId);
+    Result<?> delPlacement(@RequestParam("placementId")String placementId,@RequestParam("takuPublicKey") String takuPublicKey);
     @PostMapping("/advertise/getAppReport")
     List<ComprehensiveAppReport> getAppReport(@RequestBody ComprehensiveReportParam param);
     @PostMapping("/advertise/comprehensive")
@@ -37,11 +37,11 @@ public interface AdvertiseFeign {
     @PostMapping("/advertise/concurrentHourReports")
     Result<List<HourReportRes>> concurrentHourReports(@RequestBody ConcurrentHourReportsParams param);
 
-    @GetMapping("/delAdSource")
-    Result<?> delAdSource(@RequestParam("adSourceId") Integer adSourceId);
-    @PostMapping("/saveAdSource")
+    @GetMapping("/advertise/delAdSource")
+    Result<?> delAdSource(@RequestParam("adSourceId") Integer adSourceId,@RequestParam("takuPublicKey") String takuPublicKey);
+    @PostMapping("/advertise/saveAdSource")
     Result<?> saveAdSource(@RequestBody UnitsParam param);
 
-    @PostMapping("/updateAdSource")
+    @PostMapping("/advertise/updateAdSource")
     Result<?> updateAdSource(@RequestBody UnitsParam param);
 }

yt-advertise/advertise-service/src/main/java/com/ytpm/controller/AdvertiseController.java

@@ -52,8 +52,8 @@ public class AdvertiseController {
      */
     @ApiOperation("查询应用列表")
     @GetMapping("/getAppList")
-    public ResultTable<AppV1View> getAppList() {
-        return takuApiService.getAppList();
+    public ResultTable<AppV1View> getAppList(@RequestParam(value = "takuPublicKey", required = false) String takuPublicKey) {
+        return takuApiService.getAppList(takuPublicKey);
     }
 
     /**
@@ -70,8 +70,8 @@ public class AdvertiseController {
      */
     @ApiOperation("删除应用")
     @GetMapping("/delApp")
-    public Result<AddAppResponse> delApp(@RequestParam("appId")String appId) {
-        return takuApiService.delApp(appId);
+    public Result<AddAppResponse> delApp(@RequestParam("appId")String appId,@RequestParam("takuPublicKey") String takuPublicKey) {
+        return takuApiService.delApp(appId,takuPublicKey);
     }
 
     /**
@@ -88,8 +88,8 @@ public class AdvertiseController {
      */
     @ApiOperation("删除广告位")
     @GetMapping("/delPlacement")
-    public Result<?> delPlacement(@RequestParam("placementId")String placementId) {
-        return takuApiService.delPlacement(Collections.singletonList(placementId));
+    public Result<?> delPlacement(@RequestParam("placementId")String placementId,@RequestParam("takuPublicKey") String takuPublicKey) {
+        return takuApiService.delPlacement(Collections.singletonList(placementId),takuPublicKey);
     }
 
     /**
@@ -97,8 +97,8 @@ public class AdvertiseController {
      */
     @ApiOperation("删除广告源")
     @GetMapping("/delAdSource")
-    public Result<?> delAdSource(@RequestParam("adSourceId")Integer adSourceId) {
-        return takuApiService.delUnits(Collections.singletonList(adSourceId));
+    public Result<?> delAdSource(@RequestParam("adSourceId")Integer adSourceId,@RequestParam("takuPublicKey") String takuPublicKey) {
+        return takuApiService.delUnits(Collections.singletonList(adSourceId),takuPublicKey);
     }
 
     /**

yt-advertise/advertise-service/src/main/java/com/ytpm/service/TakuApiService.java

@@ -13,6 +13,7 @@ import com.ytpm.agent.param.ChannelParam;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.advertise.param.AddAppParam;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -24,11 +25,11 @@ public interface TakuApiService {
     /**
      * 查询应用列表
      */
-    ResultTable<AppV1View> getAppList();
+    ResultTable<AppV1View> getAppList(String takuPublicKey);
     /**
      * 删除应用
      */
-    Result<AddAppResponse> delApp(String appId);
+    Result<AddAppResponse> delApp(String appId,String takuPublicKey);
     /**
      * Taku应用关联广告平台
      */
@@ -36,7 +37,7 @@ public interface TakuApiService {
     /**
      * 获取广告平台信息
      */
-    ResultTable<Network> getNetworks();
+    ResultTable<Network> getNetworks(String takuPublicKey);
     /**
      * 新增广告位
      */
@@ -50,7 +51,7 @@ public interface TakuApiService {
     /**
      * 删除广告位
      */
-    Result<?> delPlacement(List<String> placementIds);
+    Result<?> delPlacement(List<String> placementIds,String takuPublicKey);
 
     /**
      * 获取广告源列表
@@ -60,7 +61,7 @@ public interface TakuApiService {
     /**
      * 获取广告源详情
      */
-    ResultTable<UnitsView> getUnitsView(List<Integer> ids);
+    ResultTable<UnitsView> getUnitsView(List<Integer> ids,String takuPublicKey);
 
     /**
      * 保存广告源信息
@@ -75,7 +76,7 @@ public interface TakuApiService {
     /**
      * 删除广告源
      */
-    Result<?> delUnits(List<Integer> adsource_ids);
+    Result<?> delUnits(List<Integer> adsource_ids,String takuPublicKey);
 
     /**
      * 查询综合报表

yt-advertise/advertise-service/src/main/java/com/ytpm/service/impl/TakuApiServiceImpl.java

@@ -63,7 +63,7 @@ public class TakuApiServiceImpl implements TakuApiService {
         object.put("items", Collections.singletonList(param));
         //若添加成功，API返回应用uuid和 app_key
         //修改时应该使用put 新增使用post
-        String res=TakuRequestUtil.doRequest(StringUtils.isNotBlank(param.getUuid())? HttpPut.METHOD_NAME:HttpPost.METHOD_NAME, API_VERSION_V3 + "/apps", object.toJSONString());
+        String res=TakuRequestUtil.doRequest(StringUtils.isNotBlank(param.getUuid())? HttpPut.METHOD_NAME:HttpPost.METHOD_NAME, API_VERSION_V3 + "/apps", object.toJSONString(),param.getTakuPublicKey());
         JSONObject jsonObject = JSON.parseObject(res);
         // 1. 优先检查错误列表 (errs)
         if (jsonObject.containsKey("errs")) {
@@ -96,8 +96,8 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 查询应用列表
      */
     @Override
-    public ResultTable<AppV1View> getAppList() {
-        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/apps", null);
+    public ResultTable<AppV1View> getAppList(String takuPublicKey) {
+        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/apps", null,takuPublicKey);
         List<AppV1View> v1View = JSONArray.parseArray(res, AppV1View.class);
         return ResultTable.resultTableOk(new PageInfo<>(v1View));
     }
@@ -106,10 +106,10 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 删除应用
      */
     @Override
-    public Result<AddAppResponse> delApp(String appId) {
+    public Result<AddAppResponse> delApp(String appId,String takuPublicKey) {
         JSONObject object = new JSONObject();
         object.put("app_ids", Collections.singletonList(appId));
-        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_apps", object.toJSONString());
+        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_apps", object.toJSONString(),takuPublicKey);
         return Result.resultOk(RepMessage.DELETE_SUCCESS);
     }
 
@@ -137,7 +137,7 @@ public class TakuApiServiceImpl implements TakuApiService {
         appAuthContent.setApp_id(channelParam.getNetworkAppId());
         networkAppInfo.setApp_auth_content(appAuthContent);
         network.setNetwork_app_info(Collections.singletonList(networkAppInfo));
-        String res = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/set_networks", JSONObject.toJSONString(network));
+        String res = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/set_networks", JSONObject.toJSONString(network),channelParam.getTakuPublicKey());
         Network result = JSONObject.parseObject(res, Network.class);
         return Result.resultOk(RepMessage.RELATIVE_SUCCESS, result);
     }
@@ -146,9 +146,9 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 获取广告平台维度信息
      */
     @Override
-    public ResultTable<Network> getNetworks() {
+    public ResultTable<Network> getNetworks(String takuPublicKey) {
         // 这个接口虽然没有参数但是要设置为 " ", 如果reqBody设置为NULL会报601
-        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/networks", "");
+        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/networks", "",takuPublicKey);
         return ResultTable.resultTableOk(new PageInfo<>(JSON.parseArray(res, Network.class)));
     }
 
@@ -157,7 +157,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<AddPlacementResponse> addPlacements(AddPlacementParam param) {
-        String res = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/deal_placement", JSON.toJSONString(param));
+        String res = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/deal_placement", JSON.toJSONString(param),param.getTakuPublicKey());
         List<AddPlacementResponse> placements = JSONArray.parseArray(res, AddPlacementResponse.class);
         return ResultTable.resultTableOk(new PageInfo<>(placements));
     }
@@ -167,7 +167,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<?> getPlacementList(AddPlacementParam param) {
-        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/placements", JSON.toJSONString(param));
+        String res = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V1 + "/placements", JSON.toJSONString(param),param.getTakuPublicKey());
         List<AddPlacementResponse> placements = JSONArray.parseArray(res, AddPlacementResponse.class);
         return ResultTable.resultTableOk(new PageInfo<>(placements));
     }
@@ -176,10 +176,10 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 删除广告位
      */
     @Override
-    public Result<?> delPlacement(List<String> placementIds) {
+    public Result<?> delPlacement(List<String> placementIds,String takuPublicKey) {
         JSONObject object = new JSONObject();
         object.put("placement_ids", placementIds);
-        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_placements", object.toJSONString());
+        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_placements", object.toJSONString(),takuPublicKey);
         return Result.resultOk(RepMessage.DELETE_SUCCESS);
     }
 
@@ -188,7 +188,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<UnitsListView> getUnitsList(UnitsListParam unitsListParam) {
-        String result = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V3 + "/units/list", JSON.toJSONString(unitsListParam));
+        String result = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V3 + "/units/list", JSON.toJSONString(unitsListParam),unitsListParam.getTakuPublicKey());
         return ResultTable.resultTableOk(new PageInfo<>(JSON.parseArray(result, UnitsListView.class)));
     }
 
@@ -196,10 +196,10 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 查询广告源详情
      */
     @Override
-    public ResultTable<UnitsView> getUnitsView(List<Integer> ids) {
+    public ResultTable<UnitsView> getUnitsView(List<Integer> ids,String takuPublicKey) {
         JSONObject object = new JSONObject();
         object.put("ids", ids);
-        String result = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(object));
+        String result = TakuRequestUtil.doRequest(HttpGet.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(object),takuPublicKey);
         return ResultTable.resultTableOk(new PageInfo<>(JSON.parseArray(result, UnitsView.class)));
     }
 
@@ -208,7 +208,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public Result<?> saveUnits(UnitsParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(param),param.getTakuPublicKey());
         return Result.resultObjOk(JSONObject.parseObject(result, UnitsAddResponse.class));
     }
 
@@ -217,7 +217,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public Result<?> updateUnits(UnitsParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3 + "/units", JSON.toJSONString(param),param.getTakuPublicKey());
         return Result.resultObjOk(JSONObject.parseObject(result, UnitsUpdateResponse.class));
     }
 
@@ -225,10 +225,10 @@ public class TakuApiServiceImpl implements TakuApiService {
      * 删除广告源
      */
     @Override
-    public Result<?> delUnits(List<Integer> adsource_ids) {
+    public Result<?> delUnits(List<Integer> adsource_ids,String takuPublicKey) {
         JSONObject object = new JSONObject();
         object.put("adsource_ids", adsource_ids);
-        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_units", JSON.toJSONString(object));
+        TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V1 + "/del_units", JSON.toJSONString(object),takuPublicKey);
         return Result.resultOk(RepMessage.DELETE_SUCCESS);
     }
 
@@ -237,7 +237,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public Result<ComprehensiveReportView> comprehensiveReport(ComprehensiveReportParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V2+"/fullreport", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V2+"/fullreport", JSON.toJSONString(param),param.getTakuPublicKey());
         return Result.resultObjOk(JSONObject.parseObject(result, ComprehensiveReportView.class));
     }
 
@@ -246,7 +246,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public List<ComprehensiveAppReport> getAppReport(ComprehensiveReportParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, "/v2/fullreport", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, "/v2/fullreport", JSON.toJSONString(param),param.getTakuPublicKey());
         JSONObject object = JSONObject.parseObject(result);
         String records = object.getString("records");
         List<ComprehensiveAppReport> appReports = JSONArray.parseArray(records, ComprehensiveAppReport.class);
@@ -258,7 +258,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<ReportRoiView> getReportRoi(RoiReportParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/roi", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/roi", JSON.toJSONString(param),param.getTakuPublicKey());
         JSONObject object = JSONObject.parseObject(result);
         Integer count = object.getInteger("count");
         if(Objects.nonNull(count)){
@@ -274,7 +274,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<ReportRoiView> getReportRoiLtv(RoiReportParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/roi_ltv", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/roi_ltv", JSON.toJSONString(param),param.getTakuPublicKey());
         JSONObject object = JSONObject.parseObject(result);
         Integer count = object.getInteger("count");
         if(Objects.nonNull(count)){
@@ -290,7 +290,7 @@ public class TakuApiServiceImpl implements TakuApiService {
      */
     @Override
     public ResultTable<HourReportView> hourReport(HourReportParam param) {
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/tk_hour", JSON.toJSONString(param));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, API_VERSION_V3+"/report/tk_hour", JSON.toJSONString(param),param.getTakuPublicKey());
         JSONObject object = JSONObject.parseObject(result);
         Integer count = object.getInteger("count");
         if(Objects.nonNull(count)){

yt-advertise/advertise-service/src/main/java/com/ytpm/util/TakuRequestUtil.java

@@ -49,12 +49,12 @@ public class TakuRequestUtil {
         object.put("adsource_id_list",Collections.singletonList(9308489));
 //        param.setApp_id_list(Arrays.asList("a685138d49cd2d","a684009039113d"));
 //        param.setGroup_by(Collections.singletonList("app"));
-        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, "/v3/report/tk_hour", JSON.toJSONString(object));
+        String result = TakuRequestUtil.doRequest(HttpPost.METHOD_NAME, "/v3/report/tk_hour", JSON.toJSONString(object),PUBLISHER_KEY);
         ComprehensiveAppReport report = JSONObject.parseObject(result, ComprehensiveAppReport.class);
         System.err.println(result);
     }
 
-    public static String doRequest(String httpMethod, String reqUrl, String reqBody) {
+    public static String doRequest(String httpMethod, String reqUrl, String reqBody,String takuPublicKey) {
         String result = null;
         try {
             CloseableHttpClient httpClient = HttpClients.createDefault();
@@ -74,13 +74,13 @@ public class TakuRequestUtil {
             // create the final signature
             String contentMD5 = Objects.nonNull(reqBody)?DigestUtils.md5Hex(reqBody).toUpperCase():"";
             String nowMillis = System.currentTimeMillis() + "";
-            String headerStr = "X-Up-Key:" + PUBLISHER_KEY + "\n" + "X-Up-Timestamp:" + nowMillis;
+            String headerStr = "X-Up-Key:" + takuPublicKey + "\n" + "X-Up-Timestamp:" + nowMillis;
             String relativePath = new URL(DOMAIN+reqUrl).getPath();
             String finalSign = genSignature(httpMethod, contentMD5, CONTENT_TYPE, headerStr, relativePath);
             // set the headers
             httpRequest.setHeader("Content-Type", CONTENT_TYPE);
             httpRequest.setHeader("X-Up-Timestamp", nowMillis);
-            httpRequest.setHeader("X-Up-Key", PUBLISHER_KEY);
+            httpRequest.setHeader("X-Up-Key", takuPublicKey);
             httpRequest.setHeader("X-Up-Signature", finalSign);
             log.error("尝试向{}发送请求：请求类型{}， 请求内容：{}", httpMethod, reqUrl, reqBody);
             HttpResponse response = httpClient.execute(httpRequest);

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentAdSourceController.java

@@ -55,8 +55,8 @@ public class AgentAdSourceController {
      */
     @ApiOperation("删除广告源")
     @GetMapping("/deleteOne")
-    public Result<?> deleteOne(@RequestParam("adSourceId")Integer adSourceId){
-        return adSourceService.deleteOne(adSourceId);
+    public Result<?> deleteOne(@RequestParam("adSourceId")Integer adSourceId,@ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo){
+        return adSourceService.deleteOne(adSourceId,userInfo.getUserId());
     }
 
 }

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -16,7 +16,6 @@ import com.ytpm.agent.view.AgentAppView;
 import com.ytpm.agent.view.AgentChannelView;
 import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.agent.view.IndexHourReportView;
-import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppQueryUserTodayTimeParam;
 import com.ytpm.app.param.AppUserQueryParam;
 import com.ytpm.dao.ChannelMapper;
@@ -27,6 +26,7 @@ import com.ytpm.general.Result;
 import com.ytpm.service.AgentAppService;
 import com.ytpm.util.DateUtil;
 import com.ytpm.util.RedisService;
+import com.ytpm.utils.GetTakuInfoUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -47,16 +47,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -84,6 +78,9 @@ public class AgentIndexController {
     @Resource
     private AgentAppService agentAppService;
 
+    @Resource
+    private GetTakuInfoUtil getTakuInfoUtil;
+
     /**
      * 查询广告平台收益
      */
@@ -136,6 +133,9 @@ public class AgentIndexController {
                 .collect(Collectors.toList()));
         AppListParam appListParam = new AppListParam();
         appListParam.setUserId(userInfo.getUserId());
+        //设置takuPublicKey
+        String takuPublicKey = getTakuInfoUtil.getTakuPublicKey(userInfo.getUserId());
+        param.setTakuPublicKey(takuPublicKey);
         //增加appId查询
         List<AgentAppView> agentAppViews = agentAppService.searchAppIdList(appListParam);
         ArrayList<String> list = new ArrayList<>();
@@ -317,6 +317,8 @@ public class AgentIndexController {
             else {
                 return Result.resultObjOk(indexHourReportViews);
             }
+            //查询takuPublicKey
+            String takuPublicKey = getTakuInfoUtil.getTakuPublicKey(userInfo.getUserId());
             for (AgentChannelView agentChannelView : agentChannelViews) {
                 HourReportParam param = new HourReportParam();
                 Integer networkId = agentChannelView.getNetworkId();
@@ -329,6 +331,8 @@ public class AgentIndexController {
                 param.setTime_zone("UTC+8");
                 param.setChannelName(agentChannelView.getChannelName());
                 param.setApp_id_list(appIdList);
+                //增加taku公钥
+                param.setTakuPublicKey(takuPublicKey);
                 hourReportParams.add(param);
             }
             concurrentHourReportsParams.setParam(hourReportParams);

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentPlacementController.java

@@ -3,17 +3,20 @@ package com.ytpm.controller;
 import com.ytpm.agent.param.PlacementListParam;
 import com.ytpm.agent.param.PlacementParam;
 import com.ytpm.agent.view.AgentPlacementView;
+import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.service.PlacementService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 
@@ -39,8 +42,8 @@ public class AgentPlacementController {
      */
     @ApiOperation("保存广告位")
     @PostMapping("/save")
-    public Result<?> savePlacement(@RequestBody PlacementParam param){
-        return placementService.savePlacement(param);
+    public Result<?> savePlacement(@RequestBody PlacementParam param,@ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo){
+        return placementService.savePlacement(param,userInfo.getUserId());
     }
 
     /**
@@ -48,7 +51,7 @@ public class AgentPlacementController {
      */
     @ApiOperation("删除广告位")
     @GetMapping("/del")
-    public Result<?> delPlacement(@RequestParam("placementId") String placementId){
-        return placementService.delPlacement(placementId);
+    public Result<?> delPlacement(@RequestParam("placementId") String placementId,@ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo){
+        return placementService.delPlacement(placementId,userInfo.getUserId());
     }
 }

yt-agent/agent-service/src/main/java/com/ytpm/dao/AgentMiddleEnterpriseMapper.java

@@ -0,0 +1,13 @@
+package com.ytpm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ytpm.middle.model.YtMiddleEnterprise;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 企业mapper
+ */
+public interface AgentMiddleEnterpriseMapper extends BaseMapper<YtMiddleEnterprise> {
+
+    YtMiddleEnterprise queryTakuPublicKey(@Param("userId") String userId);
+}

yt-agent/agent-service/src/main/java/com/ytpm/service/AdSourceService.java

@@ -19,5 +19,5 @@ public interface AdSourceService {
 
     Result<?> updateOne(AdSourceParam param);
 
-    Result<?> deleteOne(Integer adSourceId);
+    Result<?> deleteOne(Integer adSourceId,String userId);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/PlacementService.java

@@ -15,9 +15,9 @@ public interface PlacementService {
     /**
      * 保存广告位
      */
-    Result<?> savePlacement(PlacementParam param);
+    Result<?> savePlacement(PlacementParam param,String userId);
     /**
      * 删除广告位
      */
-    Result<?> delPlacement(String placementId);
+    Result<?> delPlacement(String placementId,String userId);
 }

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/AdSourceServiceImpl.java

@@ -12,6 +12,7 @@ import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.service.AdSourceService;
+import com.ytpm.utils.GetTakuInfoUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +27,9 @@ public class AdSourceServiceImpl implements AdSourceService {
     @Resource
     private AdvertiseFeign advertiseFeign;
 
+    @Resource
+    private GetTakuInfoUtil getTakuInfoUtil;
+
     @Override
     public ResultTable<AgentAdSourceView> adSourceList(AdSourceListParam param) {
         PageHelper.startPage(param.getPage(), param.getLimit());
@@ -61,8 +65,9 @@ public class AdSourceServiceImpl implements AdSourceService {
     }
 
     @Override
-    public Result<?> deleteOne(Integer adSourceId) {
-        advertiseFeign.delAdSource(adSourceId);
+    public Result<?> deleteOne(Integer adSourceId,String userId) {
+        String takuPublicKey = getTakuInfoUtil.getTakuPublicKey(userId);
+        advertiseFeign.delAdSource(adSourceId,takuPublicKey);
         YtAppAdSource ytAppAdSource = new YtAppAdSource();
         ytAppAdSource.setEnabled(0);
         ytAppAdSource.setAdSourceId(adSourceId);

yt-agent/agent-service/src/main/java/com/ytpm/service/impl/PlacementServiceImpl.java

@@ -16,6 +16,7 @@ import com.ytpm.general.RepMessage;
 import com.ytpm.general.Result;
 import com.ytpm.general.ResultTable;
 import com.ytpm.service.PlacementService;
+import com.ytpm.utils.GetTakuInfoUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,6 +29,9 @@ public class PlacementServiceImpl implements PlacementService {
     @Resource
     private AdvertiseFeign advertiseFeign;
 
+    @Resource
+    private GetTakuInfoUtil getTakuInfoUtil;
+
     /**
      * 查询广告位列表
      */
@@ -42,10 +46,13 @@ public class PlacementServiceImpl implements PlacementService {
      * PS: 如需改变顺序请加上事务处理
      */
     @Override
-    public Result<?> savePlacement(PlacementParam param) {
+    public Result<?> savePlacement(PlacementParam param,String userId) {
         AddPlacementParam placementParam = new AddPlacementParam(param);
         //设置数量为1
         placementParam.setCount(1);
+        //获取takuPublicKey
+        String takuPublicKey = getTakuInfoUtil.getTakuPublicKey(userId);
+        placementParam.setTakuPublicKey(takuPublicKey);
         ResultTable<AddPlacementResponse> resultTable = advertiseFeign.savePlacement(placementParam);
         AddPlacementResponse response = resultTable.getData().get(0);
         YtAppPlacement placement = new YtAppPlacement();
@@ -64,9 +71,13 @@ public class PlacementServiceImpl implements PlacementService {
      * 删除广告位
      */
     @Override
-    public Result<?> delPlacement(String placementId) {
-        advertiseFeign.delPlacement(placementId);
+    public Result<?> delPlacement(String placementId,String userId) {
+        //获取takuPublicKey
+        String takuPublicKey = getTakuInfoUtil.getTakuPublicKey(userId);
+        advertiseFeign.delPlacement(placementId,takuPublicKey);
         placementMapper.deleteOne(placementId);
         return Result.resultOk(RepMessage.DELETE_SUCCESS);
     }
+
+
 }

yt-agent/agent-service/src/main/java/com/ytpm/utils/GetTakuInfoUtil.java

@@ -0,0 +1,27 @@
+package com.ytpm.utils;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ytpm.dao.AgentMiddleEnterpriseMapper;
+import com.ytpm.handle.CustomerException;
+import com.ytpm.middle.model.YtMiddleEnterprise;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Component
+public class GetTakuInfoUtil {
+
+    @Resource
+    private AgentMiddleEnterpriseMapper agentMiddleEnterpriseMapper;
+
+    public String getTakuPublicKey(String userId){
+        YtMiddleEnterprise enterprise = agentMiddleEnterpriseMapper.queryTakuPublicKey(userId);
+        if (enterprise!=null && StrUtil.isNotBlank(enterprise.getTakuPublicKey())){
+            return enterprise.getTakuPublicKey();
+        }
+        else {
+            throw new CustomerException("请配置taku公钥");
+        }
+    }
+}

yt-agent/agent-service/src/main/resources/mapper/AgentMiddleEnterpriseMapper.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ytpm.dao.AgentMiddleEnterpriseMapper">
+    <select id="queryTakuPublicKey" resultType="com.ytpm.middle.model.YtMiddleEnterprise">
+        select
+        taku_public_key
+        from yt_middle_enterprise
+        where user_id = #{userId}
+    </select>
+
+</mapper>

yt-common/src/main/java/com/ytpm/advertise/param/AddAppParam.java

@@ -34,6 +34,8 @@ public class AddAppParam {
     private Integer ccpa;
     @ApiModelProperty(value = "应用ID",required = false, notes = "修改时传新增时不传")
     private String uuid;
+    @ApiModelProperty(value = "taku公钥",required = true)
+    private String takuPublicKey;
 
     public AddAppParam(AppParam param) {
         this.platform = param.getAppType();

yt-common/src/main/java/com/ytpm/advertise/param/AddPlacementParam.java

@@ -12,7 +12,7 @@ import java.util.List;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class    AddPlacementParam {
+public class  AddPlacementParam {
     /** 创建或修改的广告位数量 */
     private Integer count;
     /** 创建或修改的广告位的应用ID */
@@ -20,6 +20,10 @@ public class    AddPlacementParam {
     /** 创建或修改的广告位信息列表 */
     @Size(min = 1,max = 100)
     private List<PlacementParam> placements;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 
     public AddPlacementParam(com.ytpm.agent.param.PlacementParam param) {
         this.app_id = param.getAppId();

yt-common/src/main/java/com/ytpm/advertise/param/ComprehensiveReportParam.java

@@ -50,4 +50,8 @@ public class ComprehensiveReportParam {
     private Integer start;
     /** 每次拉取数据的最大条数，默认是1000，可选[1,1000] */
     private Integer limit;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/advertise/param/HourReportParam.java

@@ -57,4 +57,8 @@ public class HourReportParam {
      * 与api请求无关
      */
     private String channelName;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/advertise/param/RelativeChannelParam.java

@@ -20,4 +20,8 @@ public class RelativeChannelParam extends ChannelParam {
     /** 测试应用 优量汇 好运答题王 */
     @ApiModelProperty("绑定的广告平台应用ID")
     private String networkAppId;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/advertise/param/RoiReportParam.java

@@ -40,4 +40,8 @@ public class RoiReportParam {
      * adgroup_id（广告计划ID），
      **/
     private List<String> group_by;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/advertise/param/UnitsListParam.java

@@ -23,4 +23,6 @@ public class UnitsListParam {
     @Max(value = 1000)
     @ApiModelProperty(value = "获取个数")
     private Integer limit;
+    @ApiModelProperty(value = "taku公钥")
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/advertise/param/UnitsParam.java

@@ -12,4 +12,8 @@ public class UnitsParam {
     private String placement_id;
     /** 广告源信息列表 */
     private List<UnitsItemParam> items;
+    /**
+     * taku公钥
+     */
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/middle/model/YtMiddleEnterprise.java

@@ -41,4 +41,9 @@ public class YtMiddleEnterprise extends BaseParam {
     /** 注册地址 */
     @ApiModelProperty("注册地址")
     private String registryAddress;
+    /**
+     * taku公钥
+     */
+    @ApiModelProperty("taku公钥")
+    private String takuPublicKey;
 }

yt-common/src/main/java/com/ytpm/middle/param/AgentForm.java

@@ -43,4 +43,7 @@ public class AgentForm extends AgentBaseInfoParam {
     /** 账号类型 */
     @ApiModelProperty("账号类型")
     private Integer userType;
+    /** taku公钥 */
+    @ApiModelProperty("taku公钥")
+    private String takuPubilcKey;
 }

yt-common/src/main/java/com/ytpm/middle/view/AgentBaseInfoListVO.java

@@ -50,4 +50,7 @@ public class AgentBaseInfoListVO extends BaseParam {
     /** 用户类型 */
     @ApiModelProperty("用户类型")
     private Integer userType;
+
+    @ApiModelProperty("taku公钥")
+    private String takuPubilcKey;
 }