选中发生OOM的两个账号测试

data-base/base-sync-amazon-ad/Dockerfile

-FROM maven:3.6.0-alpine
+FROM maven:3.6.1-alpine
 
 RUN apk add ca-certificates && \
     apk add tzdata && \
@@ -20,4 +20,4 @@ RUN cd /usr/app/data-parent && mvn -T 1C install  -pl ../data-base/base-sync-ama
 
 #指定容器启动程序及参数   <ENTRYPOINT> "<CMD>"
 EXPOSE 8080
-ENTRYPOINT ["java","-Xms333m","-Xmx333m","-jar","/usr/app/data-base/base-sync-amazon-ad/target/base-sync-amazon-ad-1.0-SNAPSHOT.jar"]
\ No newline at end of file
+ENTRYPOINT ["java","-jar","/usr/app/data-base/base-sync-amazon-ad/target/base-sync-amazon-ad-1.0-SNAPSHOT.jar"]
\ No newline at end of file

data-base/base-sync-amazon-ad/src/main/java/com/bailuntec/job/AmazonAdProductJob.java

@@ -177,7 +177,9 @@ public class AmazonAdProductJob extends PointJob {
                 GZIPInputStream gzin = null;
                 try {
                     gzin = new GZIPInputStream(response.body().byteStream());
+                    response.close();
                     List<AmazonAdProduct> amazonAdProductList = JSON.parseObject(gzin,new TypeReference<List<AmazonAdProduct>>(){}.getType());
+                    gzin.close();
                     if (amazonAdProductList != null && amazonAdProductList.size() > 0) {
                         DcBaseFinanceAmazonAdProduct dcBaseFinanceAmazonAdProduct = new DcBaseFinanceAmazonAdProduct();
                         DcBaseFinanceAmazonAdProductMapper mapper = SessionUtil.getSession().getMapper(DcBaseFinanceAmazonAdProductMapper.class);

data-base/base-sync-amazon-ad/src/test/java/AmazonAdProductTest.java

@@ -44,9 +44,9 @@ public class AmazonAdProductTest {
     public void test2() {
         AmazonAdProductJob amazonAdProductJob = new AmazonAdProductJob();
         JobAccountLogMapper mapper = SessionUtil.getSession().getMapper(JobAccountLogMapper.class);
-        JobAccountLog dcBaseCompanyAccount = mapper.selectOneByExample(JobAccountLogExample.newAndCreateCriteria().andAccountIdEqualTo(640).example());
-        dcBaseCompanyAccount.setStartTime(LocalDateTime.of(2019, 6, 23, 10, 0));
-        dcBaseCompanyAccount.setEndTime(LocalDateTime.of(2019, 6, 23, 11, 0));
+        JobAccountLog dcBaseCompanyAccount = mapper.selectOneByExample(JobAccountLogExample.newAndCreateCriteria().andAccountIdEqualTo(572).example());
+        dcBaseCompanyAccount.setStartTime(LocalDateTime.of(2019, 5, 30, 10, 0));
+        dcBaseCompanyAccount.setEndTime(LocalDateTime.of(2019, 5, 30, 11, 0));
         while (dcBaseCompanyAccount.getStartTime().isBefore(LocalDateTime.now().plusDays(1L))) {
             amazonAdProductJob.callAmazonAdApi(dcBaseCompanyAccount);
             log.warn("TEST----" +dcBaseCompanyAccount.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) );

data-common/src/main/java/com/bailuntec/mapper/JobAccountLogMapper.xml

@@ -616,6 +616,6 @@
 
   <select id="getListByPage" resultType="com.bailuntec.domain.entity.JobAccountLog">
       SELECT t2.message,t2.id,t1.company_id, t1.account_id, t2.job_name,t2.page_index,t2.page_size,t2.type,t2.interval_time,t2.start_time,t2.end_time, t2.task_ids FROM
-    (SELECT * FROM dc_base_company_account WHERE 1=1 and platform_id=15) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id  WHERE t2.message != '授权信息为空'order by id  limit 1,24
+    (SELECT * FROM dc_base_company_account WHERE 1=1 and platform_id=15) t1 LEFT JOIN job_account_log t2 on t1.account_id = t2.account_id  WHERE t2.message != '授权信息为空'order by id  limit 1,2
   </select>
 </mapper>
\ No newline at end of file