Compare commits
21 Commits
abb2d31d11
...
lims_dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
4d0738487b | ||
|
05967b855b | ||
|
|
be44c5b4f3 | ||
|
|
aa688680d3 | ||
|
|
4029beca5b | ||
|
|
ae48f77d9d | ||
|
|
13d3016a53 | ||
|
|
f2dffc6ef0 | ||
|
|
e257273b13 | ||
|
|
265d317e3e | ||
|
|
63490962bb | ||
|
|
5613cc4209 | ||
|
|
aae4f1cbda | ||
|
|
d6d7858c1b | ||
|
|
da0214b2a4 | ||
|
|
460baf050f | ||
|
|
d36dd2aee2 | ||
|
|
1d056119eb | ||
|
|
3ec1be28e2 | ||
|
|
6b3acc955c | ||
|
|
5d1a685c9e |
@@ -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:
|
||||
|
||||
31
pom.xml
31
pom.xml
@@ -16,13 +16,15 @@
|
||||
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
|
||||
|
||||
<properties>
|
||||
<revision>3.0.42</revision>
|
||||
<business.supply.version>3.0.42</business.supply.version>
|
||||
<business.base.version>3.0.42</business.base.version>
|
||||
<business.logistic.version>3.0.42</business.logistic.version>
|
||||
<business.manage.version>3.0.42</business.manage.version>
|
||||
<business.qms.version>3.0.42</business.qms.version>
|
||||
<business.mes.version>3.0.42</business.mes.version>
|
||||
<revision>3.0.45</revision>
|
||||
<business.supply.version>3.0.44</business.supply.version>
|
||||
<business.base.version>3.0.44</business.base.version>
|
||||
<business.logistic.version>3.0.44</business.logistic.version>
|
||||
<business.manage.version>3.0.44</business.manage.version>
|
||||
<business.qms.version>3.0.44</business.qms.version>
|
||||
<business.mes.version>3.0.44</business.mes.version>
|
||||
<business.capital.version>3.0.44</business.capital.version>
|
||||
<business.product.version>3.0.44</business.product.version>
|
||||
<!-- Maven 相关 -->
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
@@ -195,8 +197,13 @@
|
||||
<name>中铜 ZStack 私服</name>
|
||||
<url>http://172.16.46.63:30708/repository/test/</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
<updatePolicy>always</updatePolicy>
|
||||
<checksumPolicy>warn</checksumPolicy>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
<updatePolicy>always</updatePolicy>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
@@ -222,8 +229,8 @@
|
||||
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
||||
<config.namespace>dev</config.namespace>
|
||||
<config.group>DEFAULT_GROUP</config.group>
|
||||
<config.username/>
|
||||
<config.password/>
|
||||
<config.username>nacos</config.username>
|
||||
<config.password>P@ssword25</config.password>
|
||||
<config.version>1.0.0</config.version>
|
||||
</properties>
|
||||
</profile>
|
||||
@@ -235,8 +242,8 @@
|
||||
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
||||
<config.namespace>prod</config.namespace>
|
||||
<config.group>DEFAULT_GROUP</config.group>
|
||||
<config.username/>
|
||||
<config.password/>
|
||||
<config.username>nacos</config.username>
|
||||
<config.password>P@ssword25</config.password>
|
||||
<config.version>1.0.0</config.version>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -36,12 +36,12 @@
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-capital-api</artifactId>
|
||||
<version>${business.supply.version}</version>
|
||||
<version>${business.capital.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-product-api</artifactId>
|
||||
<version>${business.mes.version}</version>
|
||||
<version>${business.product.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
@@ -54,6 +54,12 @@
|
||||
<version>${business.qms.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- qms模块api-->
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
<artifactId>zt-module-qms-api</artifactId>
|
||||
<version>${business.qms.version}</version>
|
||||
</dependency>
|
||||
<!-- 业务组件 -->
|
||||
<dependency>
|
||||
<groupId>com.zt.plat</groupId>
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
package com.zt.plat.module.bpm.service.qms.listener;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zt.plat.framework.common.pojo.CommonResult;
|
||||
import com.zt.plat.module.qms.api.task.QmsApi;
|
||||
import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO;
|
||||
import com.zt.plat.module.qms.enums.ErrorCodeConstants;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import jakarta.annotation.Resource;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.flowable.engine.delegate.TaskListener;
|
||||
import org.flowable.task.service.delegate.DelegateTask;
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user