wms / wms4 · Commits

Commit 62c539308e8c5dd81cb36fd333732d0bb2d123b0

Authored by 周鸿
2 parents a1c92bd2 c10ea85b

Merge remote-tracking branch 'origin/develop' into develop

Inline Side-by-side
Showing 3 changed files with 9 additions and 9 deletions
huaheng-wms-core/src/main/resources/application-dev.yml
  View file @62c5393
... ... @@ -49,7 +49,7 @@ spring:
49 49 org:
50 50 quartz:
51 51 scheduler:
52   - batchTriggerAcquisitionMaxCount: 50
  52 + batchTriggerAcquisitionMaxCount: 1
53 53 instanceName: dev
54 54 instanceId: AUTO
55 55 # wrapJobExecutionInUserTransaction: false
... ... @@ -59,9 +59,9 @@ spring:
59 59 tablePrefix: QRTZ_
60 60 isClustered: true
61 61 # 10秒后丢弃等待执行的任务
62   - misfireThreshold: 60000
  62 + misfireThreshold: 10000
63 63 clusterCheckinInterval: 20000
64   - acquireTriggersWithinLock: false
  64 + acquireTriggersWithinLock: true
65 65 # 使用sqlServer数据源时需放开此配置
66 66 # selectWithLockSQL: SELECT* FROM {0}LOCKS WITH (ROWLOCK, UPDLOCK) WHERE LOCK_NAME = ?
67 67 threadPool:
... ...
huaheng-wms-core/src/main/resources/application-prod.yml
  View file @62c5393
... ... @@ -49,7 +49,7 @@ spring:
49 49 org:
50 50 quartz:
51 51 scheduler:
52   - batchTriggerAcquisitionMaxCount: 50
  52 + batchTriggerAcquisitionMaxCount: 1
53 53 instanceName: prod
54 54 instanceId: AUTO
55 55 # wrapJobExecutionInUserTransaction: false
... ... @@ -59,9 +59,9 @@ spring:
59 59 tablePrefix: QRTZ_
60 60 isClustered: true
61 61 # 10秒后丢弃等待执行的任务
62   - misfireThreshold: 60000
  62 + misfireThreshold: 10000
63 63 clusterCheckinInterval: 20000
64   - acquireTriggersWithinLock: false
  64 + acquireTriggersWithinLock: true
65 65 # 使用sqlServer数据源时需放开此配置
66 66 # selectWithLockSQL: SELECT* FROM {0}LOCKS WITH (ROWLOCK, UPDLOCK) WHERE LOCK_NAME = ?
67 67 threadPool:
... ...
huaheng-wms-core/src/main/resources/application-test.yml
  View file @62c5393
... ... @@ -49,7 +49,7 @@ spring:
49 49 org:
50 50 quartz:
51 51 scheduler:
52   - batchTriggerAcquisitionMaxCount: 50
  52 + batchTriggerAcquisitionMaxCount: 1
53 53 instanceName: test
54 54 instanceId: AUTO
55 55 # wrapJobExecutionInUserTransaction: false
... ... @@ -59,9 +59,9 @@ spring:
59 59 tablePrefix: QRTZ_
60 60 isClustered: true
61 61 # 10秒后丢弃等待执行的任务
62   - misfireThreshold: 60000
  62 + misfireThreshold: 10000
63 63 clusterCheckinInterval: 20000
64   - acquireTriggersWithinLock: false
  64 + acquireTriggersWithinLock: true
65 65 # 使用sqlServer数据源时需放开此配置
66 66 # selectWithLockSQL: SELECT* FROM {0}LOCKS WITH (ROWLOCK, UPDLOCK) WHERE LOCK_NAME = ?
67 67 threadPool:
... ...