Merge remote-tracking branch 'origin/release' into release

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 分组

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());

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 登录密码

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

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 分组

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 分组

dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/FpqsServiceImpl.java

@@ -728,7 +728,9 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
             }
         }
         //uuid
-        scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));
+        String uuid = (StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode")) + pramsMap.get("invoiceNo");
+       // scanInvoicce.setUuid(StringUtils.isBlank(pramsMap.get("invoiceCode"))?"":pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo"));
+        scanInvoicce.setUuid(uuid);
         // 开票日期
         if (pramsMap.get("invoiceDate").length() == 8) {
             scanInvoicce.setInvoiceDate(DateTimeHelper.parseDateTime(pramsMap.get("invoiceDate"), "yyyyMMdd"));

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>