Commit 8ab5e334 by huluobin

update

parent 5a746809
...@@ -25,7 +25,7 @@ import java.net.URI; ...@@ -25,7 +25,7 @@ import java.net.URI;
* @author robbendev * @author robbendev
* @since 2020/8/20 3:30 下午 * @since 2020/8/20 3:30 下午
*/ */
@FeignClient(name = "amazon", url = "https://advertising-api.amazon.com", fallback = AmazonAdApi.AmazonAdApiFallback.class) @FeignClient(name = "amazonApi", url = "https://advertising-api.amazon.com", fallback = AmazonAdApi.AmazonAdApiFallback.class)
public interface AmazonAdApi { public interface AmazonAdApi {
......
...@@ -4,7 +4,6 @@ import com.bailuntec.api.bailuntec.pams.response.GetAccountTokenResp; ...@@ -4,7 +4,6 @@ import com.bailuntec.api.bailuntec.pams.response.GetAccountTokenResp;
import com.bailuntec.api.bailuntec.pams.response.GetPayPalAccountsResp; import com.bailuntec.api.bailuntec.pams.response.GetPayPalAccountsResp;
import com.bailuntec.api.bailuntec.pams.response.PamsResult; import com.bailuntec.api.bailuntec.pams.response.PamsResult;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import java.util.List; import java.util.List;
...@@ -17,7 +16,7 @@ import java.util.List; ...@@ -17,7 +16,7 @@ import java.util.List;
* @author robbendev * @author robbendev
* @since 2020/9/29 10:37 上午 * @since 2020/9/29 10:37 上午
*/ */
@FeignClient(name = "pams", url = "http://pams.bailuntec.com/", fallback = PamsApi.PamsApiFallback.class) @FeignClient(name = "pams", url = "http://pams.bailuntec.com/")
public interface PamsApi { public interface PamsApi {
/** /**
...@@ -37,18 +36,4 @@ public interface PamsApi { ...@@ -37,18 +36,4 @@ public interface PamsApi {
*/ */
@GetMapping("/Api/getPayPalAccounts") @GetMapping("/Api/getPayPalAccounts")
PamsResult<List<GetPayPalAccountsResp>> getPayPalAccounts(); PamsResult<List<GetPayPalAccountsResp>> getPayPalAccounts();
@Component
class PamsApiFallback implements PamsApi {
@Override
public PamsResult<List<GetAccountTokenResp>> getAccountToken() {
return null;
}
@Override
public PamsResult<List<GetPayPalAccountsResp>> getPayPalAccounts() {
return null;
}
}
} }
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
@Data @Data
public class GetAccountTokenResp { public class GetAccountTokenResp {
@JsonProperty("UserId") @JsonProperty(value = "UserId")
private Integer companyId; private Integer companyId;
@JsonProperty("Id") @JsonProperty("Id")
......
package com.bailuntec.api.bailuntec.pams.response; package com.bailuntec.api.bailuntec.pams.response;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
/** /**
...@@ -13,7 +14,12 @@ import lombok.Data; ...@@ -13,7 +14,12 @@ import lombok.Data;
@Data @Data
public class PamsResult<T> { public class PamsResult<T> {
private T Data; @JsonProperty("Data")
private Boolean Success; private T data;
private String Message;
@JsonProperty("Success")
private Boolean success;
@JsonProperty("Message")
private String message;
} }
package com.bailuntec.api.bailuntec.pams;
import com.bailuntec.api.Application;
import com.bailuntec.api.amazon.api.JsonUtilByFsJson;
import com.bailuntec.api.bailuntec.pams.response.GetAccountTokenResp;
import com.bailuntec.api.bailuntec.pams.response.PamsResult;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.netflix.hystrix.EnableHystrix;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
import java.util.List;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2020/10/28 5:37 下午
*/
@ActiveProfiles(value = "test")
@Slf4j
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class)
class PamsApiTest {
@Resource
PamsApi pamsApi;
@Test
void getAccountToken() {
PamsResult<List<GetAccountTokenResp>> result = pamsApi.getAccountToken();
log.info(JsonUtilByFsJson.beanToJson(result));
}
}
...@@ -11,7 +11,8 @@ spring: ...@@ -11,7 +11,8 @@ spring:
profiles: profiles:
active: test active: test
main:
allow-bean-definition-overriding: true
metrics: metrics:
campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU campaignName,campaignId,impressions,clicks,cost,currency,attributedConversions1d,attributedConversions7d,attributedConversions14d,attributedConversions30d,attributedConversions1dSameSKU,attributedConversions7dSameSKU,attributedConversions14dSameSKU,attributedConversions30dSameSKU,attributedUnitsOrdered1d,attributedUnitsOrdered7d,attributedUnitsOrdered14d,attributedUnitsOrdered30d,attributedSales1d,attributedSales7d,attributedSales14d,attributedSales30d,attributedSales1dSameSKU,attributedSales7dSameSKU,attributedSales14dSameSKU,attributedSales30dSameSKU,attributedUnitsOrdered1dSameSKU,attributedUnitsOrdered7dSameSKU,attributedUnitsOrdered14dSameSKU,attributedUnitsOrdered30dSameSKU
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment