From 08ff5ff4b7e3f58fd0713320d8492dceb91946f8 Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Sat, 2 Apr 2022 09:54:54 +0800 Subject: [PATCH] =?UTF-8?q?vo=20=E8=A1=A5=E5=85=85=202022-4-2=20sxm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +- docker-compose.yml | 4 +- pom.xml | 87 +++++++++++++------ .../vo/SoReceiveBoxesEntityVo.java | 19 ++++ 4 files changed, 83 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/finishedProduct/vo/SoReceiveBoxesEntityVo.java diff --git a/Dockerfile b/Dockerfile index 7a051a2..8fe4931 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM java:8 -EXPOSE 8080 +EXPOSE 8004 VOLUME /tmp -ADD gaotao-fast.jar /app.jar +ADD target/rongxing-java.jar app.jar RUN bash -c 'touch /app.jar' ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/docker-compose.yml b/docker-compose.yml index c5bc016..cd0b835 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: '2' services: gaotao-fast: - image: gaotao/fast + image: 116.62.65.118:2375/root/sxm ports: - - "8080:8080" + - "8004:8004" environment: - spring.profiles.active=dev \ No newline at end of file diff --git a/pom.xml b/pom.xml index 957ba73..c9a77e9 100644 --- a/pom.xml +++ b/pom.xml @@ -48,9 +48,9 @@ /root/gataofast/java ${project.artifactId}-${project.version}.jar - 0.0.0.0:22 + 116.62.165.118:22 root - mima + 951212.Sl @@ -356,31 +356,64 @@ - - com.spotify - docker-maven-plugin - 0.4.14 - - - - - - - - - - gaotao/fast - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/gaotao/modules/finishedProduct/vo/SoReceiveBoxesEntityVo.java b/src/main/java/com/gaotao/modules/finishedProduct/vo/SoReceiveBoxesEntityVo.java new file mode 100644 index 0000000..599796d --- /dev/null +++ b/src/main/java/com/gaotao/modules/finishedProduct/vo/SoReceiveBoxesEntityVo.java @@ -0,0 +1,19 @@ +package com.gaotao.modules.finishedProduct.vo; + +import com.gaotao.modules.finishedProduct.entity.SoReceiveBoxesEntity; +import lombok.Data; + +import java.util.Date; + +/** + * @CLASSNAME SoReceiveBoxesEntityVo + * @AUTHOR sxm + * @DESCRIPTION + * @DATE 2022/4/1 17:25 + * @VERSION 1.0 + **/ +@Data +public class SoReceiveBoxesEntityVo extends SoReceiveBoxesEntity { + private Date startDate; + private Date endDate; +}