From b96f371a4ca4cb54df456f52d3bf3872bcc93791 Mon Sep 17 00:00:00 2001 From: BAWEI Date: Sun, 19 Mar 2023 14:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-pro.yml | 14 +++++++------- .../service/impl/DataInterfaceServiceImpl.java | 6 ++---- 3 files changed, 10 insertions(+), 12 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 9efafc2d..3e8e6ce2 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -44,7 +44,7 @@ spring: host: 222.71.165.188 port: 6379 password: qweasd,.123 - timeout: 3000 #超时时间(单位：秒) + timeout: 8000 #超时时间(单位：秒) lettuce: #Lettuce为Redis的Java驱动包 pool: max-active: 8 # 连接池最大连接数 diff --git a/SC-boot/linkage-admin/src/main/resources/application-pro.yml b/SC-boot/linkage-admin/src/main/resources/application-pro.yml index d2997746..75eb2bdd 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-pro.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-pro.yml @@ -17,11 +17,11 @@ spring: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid datasource: db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 192.168.0.10 - port: 3306 - username: java_boot_test - password: pBx5HaW6WMGSTdDf - db-name: java_boot_test + host: 222.71.165.188 + port: 3309 + username: root + password: qawsed,.123 + db-name: sc-product db-schema: #金仓达梦选填 prepare-url: #自定义url @@ -41,9 +41,9 @@ spring: #===================== Redis配置 ===================== redis: database: 1 #缓存库编号 - host: 127.0.0.1 + host: 222.71.165.188 port: 6379 - password: + password: qweasd,.123 timeout: 3000 #超时时间(单位：秒) lettuce: #Lettuce为Redis的Java驱动包 pool: diff --git a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java index 6a5df231..3378b9d5 100644 --- a/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java +++ b/SC-boot/linkage-system/src/main/java/jnpf/base/service/impl/DataInterfaceServiceImpl.java @@ -199,11 +199,9 @@ public class DataInterfaceServiceImpl extends ServiceImpl 0) { dataList = dataList.stream().filter(datas -> !(page.getExcludeFields().contains(datas.get("license_num")))).collect(Collectors.toList()); } - total = dataList.size(); } - //modified by 巴卫 - //dataList = PageUtil.getListPage((int) page.getCurrentPage(), total , dataList); - //dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList); + /* modified by 巴卫 */ +// dataList = PageUtil.getListPage((int) page.getCurrentPage(), (int) page.getPageSize(), dataList); } // if (StringUtil.isNotEmpty(page.getRelationField())) { // //dataList = dataList.stream().filter(t -> page.getKeyword().equals(String.valueOf(t.get(page.getRelationField())))).collect(Collectors.toList());