From 64c474c993bf70c94c44b8e11dca52e5b796706a Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 20 Apr 2023 08:45:17 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-admin/src/main/resources/dxhy-logback.xml |  2 +-
 .../src/main/resources/logback-spring.xml      |  2 +-
 .../controller/SDNYMainProcessController.java  |  9 +++++++++
 dxhy-erp/src/main/resources/bootstrap-dev.yaml | 18 ++++++++++--------
 .../service/fpqs/impl/FpqsServiceImpl.java     |  2 +-
 pom.xml                                        | 12 ++++++------
 6 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/dxhy-admin/src/main/resources/dxhy-logback.xml b/dxhy-admin/src/main/resources/dxhy-logback.xml
index ac4e26d6..d2d6386a 100644
--- a/dxhy-admin/src/main/resources/dxhy-logback.xml
+++ b/dxhy-admin/src/main/resources/dxhy-logback.xml
@@ -16,7 +16,7 @@
         </rollingPolicy>
         <!--临界值过滤器，过滤掉低于指定临界值的日志。当日志级别等于或高于临界值时，过滤器返回NEUTRAL；当日志级别低于临界值时，日志会被拒绝。-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>DEBUG</level>
+            <level>INFO</level>
         </filter>
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
             <pattern>${PATTERN}</pattern>
diff --git a/dxhy-admin/src/main/resources/logback-spring.xml b/dxhy-admin/src/main/resources/logback-spring.xml
index 1675cc6c..98e953ff 100644
--- a/dxhy-admin/src/main/resources/logback-spring.xml
+++ b/dxhy-admin/src/main/resources/logback-spring.xml
@@ -25,7 +25,7 @@
     <!-- 引用logback 日志配置 -->
     <include resource="dxhy-logback.xml"/>
 
-    <logger name="com.dxhy" level="debug"/>
+    <logger name="com.dxhy" level="info"/>
     <logger name="springfox.documentation.spring.web" level="error"/>
 
     <property name="LOG_FILE" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}spring.log}"/>
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index dc409676..762082b0 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -228,6 +228,15 @@ public class SDNYMainProcessController extends AbstractController {
 
         checkInvoice.put("invoiceCode", invoiceCode);
         checkInvoice.put("invoiceNumber", checkInvoice.get("invoiceNo").toString());
+        String uuid = "";
+        if(invoiceCode != null && StringUtils.isNoneBlank(invoiceCode)){
+            uuid = invoiceCode + checkInvoice.get("invoiceNo").toString();
+            checkInvoice.put("uuid",uuid);
+        }else{
+            uuid = checkInvoice.get("invoiceNo").toString();
+            checkInvoice.put("uuid",uuid);
+        }
+
 
         String kprq = checkInvoice.get("invoiceDate").toString();
         SimpleDateFormat sdf = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US);
diff --git a/dxhy-erp/src/main/resources/bootstrap-dev.yaml b/dxhy-erp/src/main/resources/bootstrap-dev.yaml
index aa8b3494..d2241fff 100644
--- a/dxhy-erp/src/main/resources/bootstrap-dev.yaml
+++ b/dxhy-erp/src/main/resources/bootstrap-dev.yaml
@@ -4,22 +4,24 @@ spring:
     nacos:
       config:
         # Nacos config 地址
-        server-addr: 10.1.2.202:8848
+        server-addr: 172.31.36.147:33000
         # Nacos config 命名空间,对应配置中的名称（dxhy-jxpt-namespace）
-        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
+        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
         # Nacos config 分组
         group: dxhy-erp-group
         # Nacos config 登录用户名
-        username: dxhy-jxpt
+        username: nacos
         # Nacos config 登录密码
-        password: dxhy-jxpt
+        password: Invoice.nacos.!1
         # Nacos config 配置文件前缀
         prefix: dxhy-erp
         # Nacos config 配置文件后缀,拼接完URL需要对应NacosServer中的dataId对应配置,${prefix}-${spring.profiles.active}.${file-extension}
         file-extension: yaml
       # Nacos discovery 配置
       discovery:
-        server-addr: 10.1.2.202:8848
-        username: dxhy-jxpt
-        password: dxhy-jxpt
-        namespace: b271ba8e-84d9-4393-88b8-9271aff9465c
\ No newline at end of file
+        server-addr: 172.31.36.147:33000
+        # Nacos config 登录用户名
+        username: nacos
+        # Nacos config 登录密码
+        password: Invoice.nacos.!1
+        namespace: eb6eab27-62a4-4ccf-8640-b8e91df0a1a6
\ No newline at end of file
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 6d0d2e7f..a24970b6 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
@@ -92,7 +92,7 @@ public class FpqsServiceImpl extends MpBaseServiceImpl<SignRecordInvoiceDao, TDx
         // 1、基础信息校验
         String note ="";
         String uuid ="";
-        if(pramsMap.get("invoiceCode") != null) {
+        if(pramsMap.get("invoiceCode") != null && StringUtils.isNotBlank(pramsMap.get("invoiceCode"))) {
             uuid = pramsMap.get("invoiceCode") + pramsMap.get("invoiceNo");
         }else{
             uuid = pramsMap.get("invoiceNo");
diff --git a/pom.xml b/pom.xml
index 883cfd98..a93680a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,9 +176,9 @@
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
             <!-- 默认激活 -->
-<!--            <activation>-->
-<!--                <activeByDefault>true</activeByDefault>-->
-<!--            </activation>-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <!-- 测试环境 -->
         <profile>
@@ -220,9 +220,9 @@
                 <logging.file>/home/dxhy/logs/</logging.file>
             </properties>
             <!-- 默认激活 -->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+<!--            <activation>-->
+<!--                <activeByDefault>true</activeByDefault>-->
+<!--            </activation>-->
         </profile>
     </profiles>