bug修复

jyy

2021-07-11 8620da68bd89af3d8bfd4ad393c6697c3ca9d822

bug修复

 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>

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

 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

 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">