From 0ba168165b09585589d3e01a72b4b3e072cc17d9 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Sat, 1 Apr 2023 09:22:43 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8?=
=?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/scm/basicInformation/contractfile/ImportForm.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue
index 2eb5eae6..3785354b 100644
--- a/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue
+++ b/SC-web/src/views/scm/basicInformation/contractfile/ImportForm.vue
@@ -35,7 +35,6 @@
-
From f71eb3eb3e6a36063caae2398a53073895dc7794 Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Sat, 1 Apr 2023 09:59:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=90=88=E5=90=8Cnull=E5=80=BC=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/ContractFileServiceImpl.java | 16 ++++++++++++++--
.../service/impl/SalebackServiceImpl.java | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
index 83f5fe81..47ea355e 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java
@@ -342,8 +342,20 @@ public class ContractFileServiceImpl extends ServiceImpl page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize());
- //加权限
+// //加权限
// IPage IPage = this.page(page, salebackQueryWrapper);
// List list = IPage.getRecords();
// Optional firstElement = list.stream().findFirst();
@@ -172,7 +172,7 @@ public class SalebackServiceImpl extends ServiceImpl userIPage=salebackMapper.querySaleBack(page, salebackPagination);
return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
From 3081c7a353f9405c5d62c8fee5839d91629cf61a Mon Sep 17 00:00:00 2001
From: mhsnet
Date: Sat, 1 Apr 2023 14:14:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8B=96=E6=8B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/scm/basicInformation/poundlist/VechicleForm.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
index f5381fab..d0e21a20 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
@@ -6,14 +6,14 @@
-
-
+
+
-
-
+
+
From 6fb2fd4d45923732a6169552b167a5280b312218 Mon Sep 17 00:00:00 2001
From: BAWEI
Date: Sat, 1 Apr 2023 15:19:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3Token=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SC-boot/linkage-admin/src/main/resources/application-dev.yml | 2 +-
.../linkage-common/src/main/java/jnpf/util/RandomUtil.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
index 3c177192..b552a994 100644
--- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml
+++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml
@@ -54,7 +54,7 @@ spring:
config:
#===================== 是否开启测试环境 =====================
- TestVersion: true
+ TestVersion: false
#===================== 文件模板配置 =====================
fileType: local #文件存储类型(local-本地存储,minio-网络存储)
diff --git a/SC-boot/linkage-common/src/main/java/jnpf/util/RandomUtil.java b/SC-boot/linkage-common/src/main/java/jnpf/util/RandomUtil.java
index df51e504..192e8e5c 100644
--- a/SC-boot/linkage-common/src/main/java/jnpf/util/RandomUtil.java
+++ b/SC-boot/linkage-common/src/main/java/jnpf/util/RandomUtil.java
@@ -35,9 +35,9 @@ public class RandomUtil {
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
//ID缓存有效时间 定时刷新有效期
- private static long CacheTimeout = 60 * 60 * 24;
+ private static long CacheTimeout = 60 * 60 * 24 * 1000;
//30分钟续期一次 如果Redis被清空可以早点续期
- private static long ScheduleTimeout = 60 * 30;
+ private static long ScheduleTimeout = 60 * 60 * 1000;
private static byte WorkerIdBitLength = 16;
//65535 参数为shot 最大值为Short.MAX_VALUE
private static int MaxWorkerIdNumberByMode = (1 << WorkerIdBitLength) -1 >Short.MAX_VALUE?Short.MAX_VALUE : (1 << WorkerIdBitLength) -1 ;