Commit 824a8392 by huluobin

update

parent d4f1d91c
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<maven.compiler.encoding>UTF-8</maven.compiler.encoding> <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
<skipTests>true</skipTests>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -20,6 +20,9 @@ public class OaDepartmentResp { ...@@ -20,6 +20,9 @@ public class OaDepartmentResp {
@ApiModelProperty("部门编码") @ApiModelProperty("部门编码")
private String code; private String code;
@ApiModelProperty("部门全名")
private String fullName;
@ApiModelProperty("公司id") @ApiModelProperty("公司id")
private Integer companyId; private Integer companyId;
......
...@@ -14,6 +14,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients; ...@@ -14,6 +14,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
*/ */
@EnableFeignClients @EnableFeignClients
@SpringBootApplication @SpringBootApplication
public class Application { public class TestApplication {
} }
package com.bailuntec.api.amazon.api; package com.bailuntec.api.amazon.api;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.bailuntec.api.Application; import com.bailuntec.api.TestApplication;
import com.bailuntec.api.amazon.AmazonAdApi; import com.bailuntec.api.amazon.AmazonAdApi;
import com.bailuntec.api.amazon.request.*; import com.bailuntec.api.amazon.request.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -39,7 +39,7 @@ import java.util.zip.GZIPInputStream; ...@@ -39,7 +39,7 @@ import java.util.zip.GZIPInputStream;
@ActiveProfiles(value = "test") @ActiveProfiles(value = "test")
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class) @SpringBootTest(classes = TestApplication.class)
public class AmazonAdApiTest { public class AmazonAdApiTest {
@Resource @Resource
......
...@@ -2,7 +2,8 @@ package com.bailuntec.api.bailuntec.cw; ...@@ -2,7 +2,8 @@ package com.bailuntec.api.bailuntec.cw;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.bailuntec.api.Application; import com.bailuntec.api.TestApplication;
import com.bailuntec.api.amazon.api.JsonUtilByFsJson;
import com.bailuntec.api.bailuntec.cw.request.PostApplyReq; import com.bailuntec.api.bailuntec.cw.request.PostApplyReq;
import com.bailuntec.api.bailuntec.cw.response.CwResult; import com.bailuntec.api.bailuntec.cw.response.CwResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -27,7 +28,7 @@ import java.util.Date; ...@@ -27,7 +28,7 @@ import java.util.Date;
@ActiveProfiles(value = "test") @ActiveProfiles(value = "test")
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class) @SpringBootTest(classes = TestApplication.class)
class CwApiTest { class CwApiTest {
...@@ -79,6 +80,7 @@ class CwApiTest { ...@@ -79,6 +80,7 @@ class CwApiTest {
req.setItemColumn(""); req.setItemColumn("");
req.setCustomerCode(""); req.setCustomerCode("");
log.info(JsonUtilByFsJson.beanToJson(req));
CwResult<String> string = cwApi.postApply(req); CwResult<String> string = cwApi.postApply(req);
log.info(string.toString()); log.info(string.toString());
......
package com.bailuntec.api.bailuntec.oa; package com.bailuntec.api.bailuntec.oa;
import com.bailuntec.api.Application; import com.bailuntec.api.TestApplication;
import com.bailuntec.api.amazon.api.JsonUtilByFsJson; import com.bailuntec.api.amazon.api.JsonUtilByFsJson;
import com.bailuntec.api.bailuntec.oa.response.ExchangeRate; import com.bailuntec.api.bailuntec.oa.response.ExchangeRate;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -23,7 +23,7 @@ import javax.annotation.Resource; ...@@ -23,7 +23,7 @@ import javax.annotation.Resource;
@ActiveProfiles(value = "test") @ActiveProfiles(value = "test")
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class) @SpringBootTest(classes = TestApplication.class)
class OaApiTest { class OaApiTest {
@Resource @Resource
......
package com.bailuntec.api.bailuntec.pams; package com.bailuntec.api.bailuntec.pams;
import com.bailuntec.api.Application; import com.bailuntec.api.TestApplication;
import com.bailuntec.api.amazon.api.JsonUtilByFsJson; import com.bailuntec.api.amazon.api.JsonUtilByFsJson;
import com.bailuntec.api.bailuntec.pams.response.GetAccountTokenResp; import com.bailuntec.api.bailuntec.pams.response.GetAccountTokenResp;
import com.bailuntec.api.bailuntec.pams.response.PamsResult; import com.bailuntec.api.bailuntec.pams.response.PamsResult;
...@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest; 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.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.junit4.SpringRunner;
...@@ -26,7 +25,7 @@ import java.util.List; ...@@ -26,7 +25,7 @@ import java.util.List;
@ActiveProfiles(value = "test") @ActiveProfiles(value = "test")
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class) @SpringBootTest(classes = TestApplication.class)
class PamsApiTest { class PamsApiTest {
@Resource @Resource
......
package com.bailuntec.api.bailuntec.pps; package com.bailuntec.api.bailuntec.pps;
import com.bailuntec.api.Application; import com.bailuntec.api.TestApplication;
import com.bailuntec.api.amazon.api.JsonUtilByFsJson; import com.bailuntec.api.amazon.api.JsonUtilByFsJson;
import com.bailuntec.api.bailuntec.pps.request.GetListingSkuMapPagesReq; import com.bailuntec.api.bailuntec.pps.request.GetListingSkuMapPagesReq;
import com.bailuntec.api.bailuntec.pps.response.GetListingSkuMapPagesItem; import com.bailuntec.api.bailuntec.pps.response.GetListingSkuMapPagesItem;
...@@ -28,7 +28,7 @@ import java.time.LocalDateTime; ...@@ -28,7 +28,7 @@ import java.time.LocalDateTime;
@ActiveProfiles(value = "test") @ActiveProfiles(value = "test")
@Slf4j @Slf4j
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@SpringBootTest(classes = Application.class) @SpringBootTest(classes = TestApplication.class)
class PpsApiTest { class PpsApiTest {
@Resource @Resource
......
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