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/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 分组 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 50a040d4..8560c64c 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 @@ -728,7 +728,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpltest /home/dxhy/logs/ + + + true + @@ -219,10 +223,6 @@ std /home/dxhy/logs/ - - - true -