From 5bfd35b07b72c4e318ccf5b0a8a76dc54223ca7b Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Wed, 6 Dec 2023 15:44:35 +0800
Subject: [PATCH] bug

---
 src/main/resources/application-test.yml | 13 +++++++------
 src/main/resources/logback-spring.xml   | 15 +++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 763abd26..0976d4bc 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -2,7 +2,7 @@ spring:
   redis:
     open: false  # 是否开启redis缓存  true开启   false关闭
     database: 0
-    host: 59.110.212.44
+    host: 47.93.127.115
     port: 6379
     password: Jgll2015   # 密码（默认为空）
     timeout: 6000000ms  # 连接超时时长（毫秒）
@@ -52,7 +52,7 @@ spring:
       initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci
 
   rabbitmq:
-    host: 39.106.36.183
+    host: 47.93.127.115
     port: 5672
     username: admin
     password: 751019
@@ -80,13 +80,14 @@ wxpay:
   payUrl: https://api.mch.weixin.qq.com/v3/pay/transactions/app
   notifyUrl: https://testapi.nuttyreading.com/pay/payNotify
   refundNotifyUrl: http://pjm6m9.natappfree.cc/pay/refundNotify
-  keyPemPath: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
+#  keyPemPath: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
+  keyPemPath: /home/wwwroot/hs/cent/apiclient_key.pem
   serialNo: 679AECB2F7AC4183033F713828892BA640E4EEE3
   apiV3Key: 4aYFklzaULeGlr7oJPZ6rHWKcxjihZUF
-  wechatPayCertificateUrl: /usr/local/hs/peanut_book/target/classes/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
-  privateKeyUrl: /usr/local/hs/peanut_book/target/classes/cent/apiclient_key.pem
+  wechatPayCertificateUrl: /home/wwwroot/hs/cent/wechatpay_7B5676E3CDF56680D0414A009CE501C844DBE2D6.pem
+  privateKeyUrl: /home/wwwroot/hs/cent/apiclient_key.pem
 
 
 
-redisAddress: redis://59.110.212.44:6379
+redisAddress: redis://47.93.127.115:6379
 redisPassword: Jgll2015
\ No newline at end of file
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index 11930f8e..d39ed691 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-        <include resource="org/springframework/boot/logging/logback/base.xml" />
+<!--        <include resource="org/springframework/boot/logging/logback/base.xml" />-->
     <!--    <logger name="org.springframework.web" level="${logging.my.webLevel}" additivity="false" />-->
     <!--    <logger name="org.springboot.sample" level="${logging.my.sampleLevel}" additivity="false"/>-->
 <!--    <logger name="com.peanut" level="DEBUG"/>-->
@@ -187,6 +187,7 @@
     <!--    &lt;!&ndash; 4.1 开发环境:打印控制台&ndash;&gt;-->
 
     <springProfile name="dev">
+        <include resource="org/springframework/boot/logging/logback/base.xml" />
 <!--        <logger name="org.springframework.web" level="DEBUG"/>-->
 <!--        <logger name="org.springboot.sample" level="DEBUG" />-->
         <logger name="com.peanut" level="DEBUG" additivity="false">
@@ -199,16 +200,6 @@
     </springProfile>
 
 
-    <springProfile name="test">
-        <root level="info">
-            <appender-ref ref="CONSOLE"/>
-            <appender-ref ref="DEBUG_FILE"/>
-            <appender-ref ref="INFO_FILE"/>
-            <appender-ref ref="WARN_FILE"/>
-            <appender-ref ref="ERROR_FILE"/>
-        </root>
-    </springProfile>
-
     <!--    <root level="info">-->
     <!--&lt;!&ndash;        <appender-ref ref="CONSOLE" />&ndash;&gt;-->
     <!--        <appender-ref ref="DEBUG_FILE" />-->
@@ -218,7 +209,7 @@
     <!--    </root>-->
 
     <!--    &lt;!&ndash; 4.2 生产环境:输出到文档&ndash;&gt;-->
-    <springProfile name="prod">
+    <springProfile name="test,prod">
         <root level="info">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="ERROR_FILE"/>