From adc62d16e38e0c024392bbe27f79b5b8fe5b519a Mon Sep 17 00:00:00 2001 From: yefei Date: Tue, 25 Apr 2023 09:25:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=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 pageList = super.baseMapper.queryRzcxByPage(pramsMap); + log.info("pageList={}",pageList.size()); PageInfo 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 @@ test /home/dxhy/logs/ + + + true + @@ -219,10 +223,6 @@ std /home/dxhy/logs/ - - - true - From 1b78674bda8c2425d478abd0d7cc0c47cbbff361 Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Tue, 25 Apr 2023 09:28:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A8=E7=94=B5=E5=8F=91=E7=A5=A8uuid?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=8D=E5=AF=B9=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java index 3060ad40..7ec504ad 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java @@ -727,7 +727,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl Date: Tue, 25 Apr 2023 09:28:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dxhy-core/src/main/resources/bootstrap-test.yaml | 2 +- dxhy-erp/src/main/resources/bootstrap-test.yaml | 10 +++++----- dxhy-gateway/src/main/resources/bootstrap-test.yaml | 2 +- .../src/main/resources/bootstrap-test.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dxhy-core/src/main/resources/bootstrap-test.yaml b/dxhy-core/src/main/resources/bootstrap-test.yaml index 76a3f1d5..c4522dab 100644 --- a/dxhy-core/src/main/resources/bootstrap-test.yaml +++ b/dxhy-core/src/main/resources/bootstrap-test.yaml @@ -19,7 +19,7 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 172.31.36.147:33000 + server-addr: 172.31.36.143:33000 # Nacos config 登录用户名 username: admin # Nacos config 登录密码 diff --git a/dxhy-erp/src/main/resources/bootstrap-test.yaml b/dxhy-erp/src/main/resources/bootstrap-test.yaml index fdf23215..4977cff7 100644 --- a/dxhy-erp/src/main/resources/bootstrap-test.yaml +++ b/dxhy-erp/src/main/resources/bootstrap-test.yaml @@ -4,13 +4,13 @@ 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 分组 group: dxhy-erp-group # Nacos config 登录用户名 - username: nacos + username: admin # Nacos config 登录密码 password: Invoice.nacos.!1 # Nacos config 配置文件前缀 @@ -19,7 +19,7 @@ spring: file-extension: yaml # Nacos discovery 配置 discovery: - server-addr: 10.1.3.224:8848 - username: nacos - password: nacos + server-addr: 172.31.36.143:33000 + username: admin + password: Invoice.nacos.!1 namespace: b271ba8e-84d9-4393-88b8-9271aff9465c \ No newline at end of file diff --git a/dxhy-gateway/src/main/resources/bootstrap-test.yaml b/dxhy-gateway/src/main/resources/bootstrap-test.yaml index ec92f982..93d8103d 100644 --- a/dxhy-gateway/src/main/resources/bootstrap-test.yaml +++ b/dxhy-gateway/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-operation-flow/src/main/resources/bootstrap-test.yaml b/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml index 9bb0a7aa..306a4294 100644 --- a/dxhy-operation-flow/src/main/resources/bootstrap-test.yaml +++ b/dxhy-operation-flow/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 分组