Merge branch 'dev' into test
This commit is contained in:
@@ -27,6 +27,13 @@ spec:
|
|||||||
env:
|
env:
|
||||||
- name: TZ
|
- name: TZ
|
||||||
value: Asia/Shanghai
|
value: Asia/Shanghai
|
||||||
|
lifecycle:
|
||||||
|
preStop:
|
||||||
|
exec:
|
||||||
|
command:
|
||||||
|
- "/bin/sh"
|
||||||
|
- "-c"
|
||||||
|
- "sleep 35"
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /actuator/health
|
path: /actuator/health
|
||||||
@@ -48,7 +55,7 @@ spec:
|
|||||||
limits:
|
limits:
|
||||||
cpu: "1"
|
cpu: "1"
|
||||||
memory: "2048Mi"
|
memory: "2048Mi"
|
||||||
terminationGracePeriodSeconds: 30
|
terminationGracePeriodSeconds: 40
|
||||||
strategy:
|
strategy:
|
||||||
type: RollingUpdate
|
type: RollingUpdate
|
||||||
rollingUpdate:
|
rollingUpdate:
|
||||||
|
|||||||
16
pom.xml
16
pom.xml
@@ -17,14 +17,14 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>3.0.46</revision>
|
<revision>3.0.46</revision>
|
||||||
<business.supply.version>3.0.44</business.supply.version>
|
<business.supply.version>3.0.46</business.supply.version>
|
||||||
<business.base.version>3.0.44</business.base.version>
|
<business.base.version>3.0.46</business.base.version>
|
||||||
<business.logistic.version>3.0.44</business.logistic.version>
|
<business.logistic.version>3.0.46</business.logistic.version>
|
||||||
<business.manage.version>3.0.44</business.manage.version>
|
<business.manage.version>3.0.46</business.manage.version>
|
||||||
<business.qms.version>3.0.44</business.qms.version>
|
<business.qms.version>3.0.46</business.qms.version>
|
||||||
<business.mes.version>3.0.44</business.mes.version>
|
<business.mes.version>3.0.46</business.mes.version>
|
||||||
<business.capital.version>3.0.44</business.capital.version>
|
<business.capital.version>3.0.46</business.capital.version>
|
||||||
<business.product.version>3.0.44</business.product.version>
|
<business.product.version>3.0.46</business.product.version>
|
||||||
<!-- Maven 相关 -->
|
<!-- Maven 相关 -->
|
||||||
<java.version>17</java.version>
|
<java.version>17</java.version>
|
||||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||||
|
|||||||
Reference in New Issue
Block a user