Merge branch 'main' into test
# Conflicts: # deployment.yaml # pom.xml
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
namespace: ns-f16a3067ca7b434aad127d15eac82503
|
||||
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a
|
||||
name: zt-module-bpm
|
||||
labels:
|
||||
app: zt-module-bpm
|
||||
@@ -22,7 +22,7 @@ spec:
|
||||
spec:
|
||||
containers:
|
||||
- name: zt-module-bpm
|
||||
image: 172.16.46.66:10043/zt/dsc-bpm:VERSION_PLACEHOLDER
|
||||
image: 172.17.19.16:10043/zt-jygk/dsc-bpm:VERSION_PLACEHOLDER
|
||||
imagePullPolicy: Always
|
||||
env:
|
||||
- name: TZ
|
||||
@@ -65,7 +65,7 @@ spec:
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
namespace: ns-f16a3067ca7b434aad127d15eac82503
|
||||
namespace: ns-766b45fbd7464ccb86d5fd046054cf0a
|
||||
name: zt-module-bpm
|
||||
spec:
|
||||
type: NodePort
|
||||
|
||||
74
pom.xml
74
pom.xml
@@ -15,15 +15,15 @@
|
||||
<description>项目基础脚手架</description>
|
||||
|
||||
<properties>
|
||||
<revision>3.0.47-SNAPSHOT</revision>
|
||||
<business.supply.version>3.0.47-SNAPSHOT</business.supply.version>
|
||||
<business.base.version>3.0.47-SNAPSHOT</business.base.version>
|
||||
<business.logistic.version>3.0.47-SNAPSHOT</business.logistic.version>
|
||||
<business.manage.version>3.0.47-SNAPSHOT</business.manage.version>
|
||||
<business.qms.version>3.0.47-SNAPSHOT</business.qms.version>
|
||||
<business.mes.version>3.0.47-SNAPSHOT</business.mes.version>
|
||||
<business.capital.version>3.0.47-SNAPSHOT</business.capital.version>
|
||||
<business.product.version>3.0.47-SNAPSHOT</business.product.version>
|
||||
<revision>3.0.46</revision>
|
||||
<business.supply.version>3.0.46</business.supply.version>
|
||||
<business.base.version>3.0.46</business.base.version>
|
||||
<business.logistic.version>3.0.46</business.logistic.version>
|
||||
<business.manage.version>3.0.46</business.manage.version>
|
||||
<business.qms.version>3.0.46</business.qms.version>
|
||||
<business.mes.version>3.0.46</business.mes.version>
|
||||
<business.capital.version>3.0.46</business.capital.version>
|
||||
<business.product.version>3.0.46</business.product.version>
|
||||
<!-- Maven 相关 -->
|
||||
<java.version>17</java.version>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
@@ -162,17 +162,61 @@
|
||||
</resources>
|
||||
</build>
|
||||
|
||||
<!-- 使用 huawei / aliyun 的 Maven 源,提升下载速度 -->
|
||||
<repositories>
|
||||
<repository>
|
||||
<id>huaweicloud</id>
|
||||
<name>huawei</name>
|
||||
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>aliyunmaven</id>
|
||||
<name>aliyun</name>
|
||||
<url>https://maven.aliyun.com/repository/public</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>spring-milestones</id>
|
||||
<name>Spring Milestones</name>
|
||||
<url>https://repo.spring.io/milestone</url>
|
||||
<snapshots>
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>spring-snapshots</id>
|
||||
<name>Spring Snapshots</name>
|
||||
<url>https://repo.spring.io/snapshot</url>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>ZT</id>
|
||||
<name>中铜 ZStack 私服</name>
|
||||
<url>http://172.16.46.63:30708/repository/prod/</url>
|
||||
<releases>
|
||||
<updatePolicy>always</updatePolicy>
|
||||
<checksumPolicy>warn</checksumPolicy>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
<updatePolicy>always</updatePolicy>
|
||||
</snapshots>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>ZT</id>
|
||||
<name>中铜 ZStack 私服</name>
|
||||
<url>http://172.16.46.63:30708/repository/test/</url>
|
||||
<url>http://172.16.46.63:30708/repository/prod/</url>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>ZT-snap</id>
|
||||
<name>中铜 ZStack 私服</name>
|
||||
<url>http://172.16.46.63:30708/repository/test-snap/</url>
|
||||
</snapshotRepository>
|
||||
<!-- <snapshotRepository>-->
|
||||
<!-- <id>ZT</id>-->
|
||||
<!-- <name>中铜 ZStack 私服</name>-->
|
||||
<!-- <url>https://your-nexus.example.com/repository/maven-snapshots/</url>-->
|
||||
<!-- </snapshotRepository>-->
|
||||
</distributionManagement>
|
||||
|
||||
<profiles>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
## AdoptOpenJDK 停止发布 OpenJDK 二进制,而 Eclipse Temurin 是它的延伸,提供更好的稳定性
|
||||
|
||||
FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre
|
||||
FROM 172.17.19.16:10043/zt-cloud-base-service/eclipse-temurin:21-jre
|
||||
|
||||
## 创建目录,并使用它作为工作目录
|
||||
RUN mkdir -p /zt-module-bpm-server
|
||||
|
||||
Reference in New Issue
Block a user