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