From 8620da68bd89af3d8bfd4ad393c6697c3ca9d822 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sun, 11 Jul 2021 11:06:34 +0800
Subject: [PATCH] bug修复

---
 zq-erp/pom.xml                                                                         |    4 ++--
 zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java                                |    4 ++--
 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html |    2 +-
 zq-erp/src/main/resources/config/application.properties                                |   12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index bb6f6d3..661933d 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -408,11 +408,11 @@
                     <exclude>config/xcx/*</exclude>
                     <exclude>config/xcshop/*</exclude>
 
-                    <!---->
+                    <!--
                     <exclude>config/config.json</exclude>
                     <exclude>config/application.properties</exclude>
                     <exclude>config/system.properties</exclude>
-
+                    -->
 
 
                     <exclude>**/*.woff</exclude>
diff --git a/zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java b/zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java
index 24f6098..c3c0a67 100644
--- a/zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java
+++ b/zq-erp/src/main/java/com/matrix/core/tools/MdcUtil.java
@@ -13,12 +13,12 @@
 	private static final String TR_KEY = "Tr";
 
 	public static void setRequestId() {
-		MDC.clear();
+		MDC.remove(TR_KEY);
 		MDC.put(TR_KEY, "TR = " + StringUtils.getRandomString(16) + "");
 	}
 
 	public static void clearRequestId() {
-		MDC.clear();
+		MDC.remove(TR_KEY);
 	}
 
 	public static String getMdc() {
diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties
index 496ce97..863a592 100644
--- a/zq-erp/src/main/resources/config/application.properties
+++ b/zq-erp/src/main/resources/config/application.properties
@@ -4,9 +4,9 @@
 
 #线上测试环境
 #
-spring.datasource.username=ct_test
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+#spring.datasource.username=ct_test
+#spring.datasource.password=123456
+#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
 #spring.datasource.username=xc_shop
 #spring.datasource.password=xc_shop123!@#
@@ -17,9 +17,9 @@
 #spring.datasource.password=hive123!@#
 #spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
-#spring.datasource.username=meidu_data
-#spring.datasource.password=meidu_4321#&@
-#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=meidu_data
+spring.datasource.password=meidu_4321#&@
+spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
 
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
index 3dafa6f..64b1195 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html
@@ -48,7 +48,7 @@
             </el-row>
             <el-row class="order-info" type="flex" justify="space-around"  style="height: 150px; padding: 30px 30px;">
                 <el-col :span="5">
-                    <p>会员姓名:{{serviceOrderInfo.vipInfo.staffName}}</p>
+                    <p>会员姓名:{{serviceOrderInfo.vipInfo.vipName}}</p>
                     <p>会员电话:{{serviceOrderInfo.vipInfo.phone}}</p>
                 </el-col>
                 <el-col :span="5">

--
Gitblit v1.9.1