From 9b0de793af5ec6a3a423074424b534b92a01e350 Mon Sep 17 00:00:00 2001 From: log6262635 <35033981+log6262635@users.noreply.github.com> Date: Sat, 19 Feb 2022 17:58:54 +0800 Subject: [PATCH 1/2] Update Dockerfile --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index e74f99f7..68ee4b2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ #FROM maven:3.6.1-jdk-8-alpine AS build # https://github.com/nekolr/maven-image/tree/master/3.6.1-jdk-8 -FROM nekolr/maven:3.6.1 AS build +FROM maven:3.6-jdk-11 as builder -RUN mkdir -p /usr/src/app -WORKDIR /usr/src/app +WORKDIR /app COPY . . @@ -13,8 +12,8 @@ RUN mvn clean package FROM openjdk:8-jdk-alpine -COPY --from=build /usr/src/app/spider-flow-web/target/spider-flow.jar . +COPY --from=build /app/spider-flow-web/target/spider-flow.jar . EXPOSE 8088 -CMD java -jar spider-flow.jar \ No newline at end of file +CMD java -jar spider-flow.jar From 9fd4570cec62fce402f1c7b02edb861f7a889977 Mon Sep 17 00:00:00 2001 From: log6262635 <35033981+log6262635@users.noreply.github.com> Date: Sat, 19 Feb 2022 18:01:04 +0800 Subject: [PATCH 2/2] Update application.properties --- spider-flow-web/src/main/resources/application.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spider-flow-web/src/main/resources/application.properties b/spider-flow-web/src/main/resources/application.properties index aaba7793..7132f036 100644 --- a/spider-flow-web/src/main/resources/application.properties +++ b/spider-flow-web/src/main/resources/application.properties @@ -30,8 +30,8 @@ spring.mvc.favicon.enabled=false spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.username=root -spring.datasource.password=123456789 -spring.datasource.url=jdbc:mysql://localhost:3306/spiderflow?useSSL=false&useUnicode=true&characterEncoding=UTF8&autoReconnect=true +spring.datasource.password=kong@1108yuan +spring.datasource.url=jdbc:mysql://sh-cynosdbmysql-grp-7cwwsldg.sql.tencentcdb.com:24252/spiderflow?useSSL=false&useUnicode=true&characterEncoding=UTF8&autoReconnect=true #JavaMailSender 邮件发送的配置 spring.mail.protocol=smtp @@ -60,4 +60,4 @@ selenium.driver.firefox=E:/driver/geckodriver.exe spider.notice.subject=spider-flow流程通知 spider.notice.content.start=流程开始执行:{name},开始时间:{currentDate} spider.notice.content.end=流程执行完毕:{name},结束时间:{currentDate} -spider.notice.content.exception=流程发生异常:{name},异常时间:{currentDate} \ No newline at end of file +spider.notice.content.exception=流程发生异常:{name},异常时间:{currentDate}