From adc62d16e38e0c024392bbe27f79b5b8fe5b519a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 25 Apr 2023 09:25:24 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-admin/src/main/resources/bootstrap-test.yaml         | 2 +-
 .../service/export/impl/CustomsCollectServiceImpl.java    | 1 +
 pom.xml                                                   | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dxhy-admin/src/main/resources/bootstrap-test.yaml b/dxhy-admin/src/main/resources/bootstrap-test.yaml
index 54878275..4d7a266b 100644
--- a/dxhy-admin/src/main/resources/bootstrap-test.yaml
+++ b/dxhy-admin/src/main/resources/bootstrap-test.yaml
@@ -4,7 +4,7 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.143:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
         namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
         # Nacos config 分组
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
index 442e00ed..666fde9a 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/export/impl/CustomsCollectServiceImpl.java
@@ -267,6 +267,7 @@ public class CustomsCollectServiceImpl extends MpBaseServiceImpl<CustomsCollectD
 
             PageHelper.startPage(curr, size);
             List<CustomsRzcxVO> pageList = super.baseMapper.queryRzcxByPage(pramsMap);
+            log.info("pageList={}",pageList.size());
             PageInfo<CustomsRzcxVO> pageInfo = new PageInfo<>(pageList);
             json.put("hasNext", pageInfo.isHasNextPage());
             json.put("nextPage", pageInfo.getNextPage());
diff --git a/pom.xml b/pom.xml
index 883cfd98..8bfe4ada 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,6 +187,10 @@
                 <deployType>test</deployType>
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
+            <!-- 默认激活 -->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <!-- 伊利测试环境 -->
         <profile>
@@ -219,10 +223,6 @@
                 <deployType>std</deployType>
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
-            <!-- 默认激活 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
     </profiles>