Commit b4a3273d by huluobin

# update

parent cf2ec08a
...@@ -29,6 +29,43 @@ ...@@ -29,6 +29,43 @@
<target>8</target> <target>8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.3.RELEASE</version>
<configuration>
<mainClass>com.bailuntec.task.EbayReportConsumerTaskApp</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<skipDockerBuild>false</skipDockerBuild>
<imageName>ccr.ccs.tencentyun.com/blt.data.job/ebay-report-consumer:latest
</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
<serverId>bailuntec-docker</serverId>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM openjdk:8-jdk-alpine
VOLUME /tmp
ADD ebay-report-consumer-1.0-SNAPSHOT.jar ebay-report-consumer-1.0-SNAPSHOT.jar
RUN echo "Asia/Shanghai" > /etc/timezone
ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","/ebay-report-consumer-1.0-SNAPSHOT.jar"]
EXPOSE 8080
...@@ -175,15 +175,15 @@ public class CustomerReader implements ItemReader<EbayItem> { ...@@ -175,15 +175,15 @@ public class CustomerReader implements ItemReader<EbayItem> {
if (accountEntryTypes != null && accountEntryTypes.length > 0) { if (accountEntryTypes != null && accountEntryTypes.length > 0) {
accountEntryTypeList = Lists.newArrayList(accountEntryTypes); accountEntryTypeList = Lists.newArrayList(accountEntryTypes);
} }
ebayAccountReportTask.setStatus(1);
} catch (Exception ex) { } catch (Exception ex) {
String errMsg = MessageFormat.format("请求ebay广告服务异常,当前账号:{1},当前页码:{2}", dcBaseCompanyAccount.getAccountName(), pageNum); String errMsg = MessageFormat.format("请求ebay广告服务异常,当前账号:{},当前页码:{}", dcBaseCompanyAccount.getAccountName(), pageNum);
log.error(errMsg); log.error(errMsg);
//todo log ebay exception //todo log ebay exception
ebayAccountReportTask.setStatus(2); ebayAccountReportTask.setStatus(2);
ebayAccountReportTask.setErrorMsg(errMsg); ebayAccountReportTask.setErrorMsg(errMsg);
} finally { } finally {
log.info("请求ebay广告服务结束,当前账号:{},当前页码:{}", dcBaseCompanyAccount.getAccountName(), pageNum); log.info("请求ebay广告服务结束,当前账号:{},当前页码:{}", dcBaseCompanyAccount.getAccountName(), pageNum);
ebayAccountReportTask.setStatus(1);
} }
} }
} }
...@@ -20,6 +20,42 @@ ...@@ -20,6 +20,42 @@
<target>8</target> <target>8</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.3.RELEASE</version>
<configuration>
<mainClass>com.bailuntec.task.EbayReportProduceTaskApp</mainClass>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.0.0</version>
<configuration>
<skipDockerBuild>false</skipDockerBuild>
<imageName>ccr.ccs.tencentyun.com/blt.data.job/ebay-report-produce:latest
</imageName>
<dockerDirectory>src/main/docker</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>${project.build.finalName}.jar</include>
</resource>
</resources>
<serverId>bailuntec-docker</serverId>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
......
FROM openjdk:8-jdk-alpine
VOLUME /tmp
ADD ebay-report-produce-1.0-SNAPSHOT.jar ebay-report-produce-1.0-SNAPSHOT.jar
RUN echo "Asia/Shanghai" > /etc/timezone
ENTRYPOINT ["java","-jar","-Dspring.profiles.active=prod","/ebay-report-produce-1.0-SNAPSHOT.jar"]
EXPOSE 8080
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