diff --git a/deployment.yaml b/deployment.yaml index c98cfaa..d05c631 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -31,14 +31,14 @@ spec: httpGet: path: /actuator/health port: 48083 - initialDelaySeconds: 10 + initialDelaySeconds: 50 periodSeconds: 5 failureThreshold: 3 livenessProbe: httpGet: path: /actuator/health port: 48083 - initialDelaySeconds: 30 + initialDelaySeconds: 50 periodSeconds: 10 failureThreshold: 5 resources: @@ -46,7 +46,7 @@ spec: cpu: "500m" memory: "1024Mi" limits: - cpu: "700m" + cpu: "1" memory: "2048Mi" terminationGracePeriodSeconds: 30 strategy: diff --git a/pom.xml b/pom.xml index 17c01ce..baef98e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,13 +16,15 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.42 - 3.0.42 - 3.0.42 - 3.0.42 - 3.0.42 - 3.0.42 - 3.0.42 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 + 3.0.43 17 ${java.version} @@ -195,8 +197,13 @@ 中铜 ZStack 私服 http://172.16.46.63:30708/repository/test/ - true + always + warn + + true + always + diff --git a/zt-module-bpm/zt-module-bpm-server/Dockerfile b/zt-module-bpm/zt-module-bpm-server/Dockerfile index 230aa5c..eceda19 100644 --- a/zt-module-bpm/zt-module-bpm-server/Dockerfile +++ b/zt-module-bpm/zt-module-bpm-server/Dockerfile @@ -1,6 +1,7 @@ ## AdoptOpenJDK 停止发布 OpenJDK 二进制,而 Eclipse Temurin 是它的延伸,提供更好的稳定性 -FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre +ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0 +FROM ${BASE_IMAGE} ## 创建目录,并使用它作为工作目录 RUN mkdir -p /zt-module-bpm-server @@ -10,10 +11,15 @@ COPY ./target/zt-module-bpm-server.jar app.jar ## 设置 TZ 时区 ## 设置 JAVA_OPTS 环境变量,可通过 docker run -e "JAVA_OPTS=" 进行覆盖 -ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m" +ENV TZ=Asia/Shanghai +ENV JAVA_OPTS="-Xms512m -Xmx512m" +ENV SW_AGENT_HOME=/opt/skywalking/agent +ENV SW_AGENT_NAME=zt-module-bpm-server +ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201 +ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}" ## 暴露后端项目的 48080 端口 EXPOSE 48083 ## 启动后端项目 -CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar +CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar diff --git a/zt-module-bpm/zt-module-bpm-server/pom.xml b/zt-module-bpm/zt-module-bpm-server/pom.xml index 73fa3b7..24aac65 100644 --- a/zt-module-bpm/zt-module-bpm-server/pom.xml +++ b/zt-module-bpm/zt-module-bpm-server/pom.xml @@ -36,12 +36,12 @@ com.zt.plat zt-module-capital-api - ${business.supply.version} + ${business.capital.version} com.zt.plat zt-module-product-api - ${business.mes.version} + ${business.product.version} com.zt.plat diff --git a/zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml b/zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml index 07020c5..09a74df 100644 --- a/zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml +++ b/zt-module-bpm/zt-module-bpm-server/src/main/resources/application.yaml @@ -141,8 +141,8 @@ zt: exclude-urls: # 如下 url,仅仅是为了演示,去掉配置也没关系 - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 swagger: - title: 管理后台 - description: 提供管理员管理的所有功能 + title: Bpm 模块 + description: 提供 Bpm 管理的所有功能 version: ${zt.info.version} tenant: # 多租户相关配置项 enable: true