diff --git a/pig-register/Dockerfile b/pig-register/Dockerfile index 6645aaaa..db2786bf 100644 --- a/pig-register/Dockerfile +++ b/pig-register/Dockerfile @@ -4,7 +4,7 @@ ARG JAR_FILE=target/pig-register.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar -FROM moxm/java:1.8-full +FROM openjdk:8-jre LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-register diff --git a/pig-visual/pig-sentinel-dashboard/src/main/resources/bootstrap.yml b/pig-visual/pig-sentinel-dashboard/src/main/resources/bootstrap.yml index 0e47b57b..626ba0f8 100644 --- a/pig-visual/pig-sentinel-dashboard/src/main/resources/bootstrap.yml +++ b/pig-visual/pig-sentinel-dashboard/src/main/resources/bootstrap.yml @@ -10,6 +10,6 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848} profiles: active: @profiles.active@ \ No newline at end of file diff --git a/pig-visual/pig-xxl-job-admin/src/main/resources/application.yml b/pig-visual/pig-xxl-job-admin/src/main/resources/application.yml index e36e355f..9942da88 100644 --- a/pig-visual/pig-xxl-job-admin/src/main/resources/application.yml +++ b/pig-visual/pig-xxl-job-admin/src/main/resources/application.yml @@ -14,7 +14,7 @@ mybatis: # spring spring: datasource: - url: jdbc:mysql://${MYSQL_HOST:pigx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pigxx_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://${MYSQL_HOST:pig-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pig_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true driver-class-name: com.mysql.cj.jdbc.Driver username: ${MYSQL-PWD:root} password: ${MYSQL-PWD:root} diff --git a/pig-visual/pig-xxl-job-admin/src/main/resources/bootstrap.yml b/pig-visual/pig-xxl-job-admin/src/main/resources/bootstrap.yml index 15e5c900..df2cee1e 100644 --- a/pig-visual/pig-xxl-job-admin/src/main/resources/bootstrap.yml +++ b/pig-visual/pig-xxl-job-admin/src/main/resources/bootstrap.yml @@ -10,7 +10,7 @@ spring: cloud: nacos: discovery: - server-addr: ${NACOS_HOST:pigx-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848} metadata: management.context-path: ${server.servlet.context-path}/actuator profiles: