From 5d1a685c9e9ed2efdc87650be32f5f17304b7622 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 22 Oct 2025 16:06:26 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=8B=AC=E7=AB=8B?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zt-module-bpm-server/src/main/resources/application.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 6b3acc955cb7b9d09f4f060d97b2b7e2604a1675 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 28 Oct 2025 14:45:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f0113de..89b2be4 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,8 @@ https://github.com/YunaiV/ruoyi-vue-pro - 3.0.41 - 3.0.41 + 3.0.43 + 3.0.43 17 ${java.version} From 1d056119ebdaaeaa9bead63f4f041a6463e4aec3 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 28 Oct 2025 14:47:29 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 89b2be4..5d8dde5 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,12 @@ 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} From 460baf050fb8a97230ef54bb80a5eaaed282e707 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Tue, 28 Oct 2025 16:54:26 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=9A=84=20bpm=20=E7=89=88=E6=9C=AC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 ++ zt-module-bpm/zt-module-bpm-server/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5d8dde5..ef1bc33 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,8 @@ 3.0.43 3.0.43 3.0.43 + 3.0.43 + 3.0.43 17 ${java.version} diff --git a/zt-module-bpm/zt-module-bpm-server/pom.xml b/zt-module-bpm/zt-module-bpm-server/pom.xml index aef8316..818c707 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.version} + ${business.capital.version} com.zt.plat zt-module-product-api - ${business.version} + ${business.product.version} From da0214b2a4df9d03a39230fac6931867dca185b5 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Wed, 29 Oct 2025 18:23:28 +0800 Subject: [PATCH 5/8] =?UTF-8?q?ZT=20=E8=BF=9C=E7=A8=8B=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=BC=BA=E5=88=B6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef1bc33..6a6ddab 100644 --- a/pom.xml +++ b/pom.xml @@ -197,8 +197,13 @@ 中铜 ZStack 私服 http://172.16.46.63:30708/repository/test/ - false + always + warn + + true + always + From aae4f1cbda418d5c6c410709d2a5ce2e58d2f800 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 6 Nov 2025 09:23:43 +0800 Subject: [PATCH 6/8] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=20base=20=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF=202.=20build=20=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=20skywalking=20=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zt-module-bpm/zt-module-bpm-server/Dockerfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 From 5613cc420998d7baf4ab6843e2841fee362dc093 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 6 Nov 2025 13:58:19 +0800 Subject: [PATCH 7/8] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=20bpm=20=E8=B5=84?= =?UTF-8?q?=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment.yaml b/deployment.yaml index c98cfaa..8a20fb0 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -46,7 +46,7 @@ spec: cpu: "500m" memory: "1024Mi" limits: - cpu: "700m" + cpu: "1" memory: "2048Mi" terminationGracePeriodSeconds: 30 strategy: From 63490962bbd62df935d8ceafaf693d799207d947 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 6 Nov 2025 14:04:31 +0800 Subject: [PATCH 8/8] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=20pod=20=E8=B5=84=E6=BA=90=E6=A3=80=E6=9F=A5=E7=9A=84=E5=BB=B6?= =?UTF-8?q?=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment.yaml b/deployment.yaml index 8a20fb0..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: