From 0aa9ea1a619406f8a8aa8b6d17e61772538584e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 18 Sep 2024 09:54:44 +0800
Subject: [PATCH] =?UTF-8?q?debug:=E5=BD=92=E9=9B=B6=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=A4=B1?=
=?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruoyi/common/utils/http/HttpUtils.java | 14 ++++++------
.../impl/TransactionBillServiceImpl.java | 22 ++++++++++---------
.../src/main/resources/application-dev.yml | 3 ++-
.../src/main/resources/logback.xml | 20 ++++++++---------
4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
index 38d6aefd..7e0e456f 100644
--- a/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
+++ b/smart-switch-ruoyi/smart-switch-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
@@ -27,7 +27,7 @@ import com.ruoyi.common.utils.StringUtils;
/**
* 通用http发送方法
- *
+ *
* @author ruoyi
*/
public class HttpUtils
@@ -85,7 +85,7 @@ public class HttpUtils
{
result.append(line);
}
- log.info("recv - {}", result);
+ log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@@ -153,7 +153,7 @@ public class HttpUtils
{
result.append(line);
}
- log.info("recv - {}", result);
+ log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@@ -224,7 +224,7 @@ public class HttpUtils
result.append(new String(ret.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8));
}
}
- log.info("recv - {}", result);
+ log.debug("recv - {}", result);
conn.disconnect();
br.close();
}
@@ -329,7 +329,7 @@ public class HttpUtils
{
result.append(line);
}
- log.info("recv - {}", result);
+ log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@@ -396,7 +396,7 @@ public class HttpUtils
{
result.append(line);
}
- log.info("recv - {}", result);
+ log.debug("recv - {}", result);
}
catch (ConnectException e)
{
@@ -430,4 +430,4 @@ public class HttpUtils
}
return result.toString();
}
-}
\ No newline at end of file
+}
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
index 2a250d48..2f293e36 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/transactionBill/service/impl/TransactionBillServiceImpl.java
@@ -975,11 +975,12 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
TransactionBillQuery query = new TransactionBillQuery();
query.setBillId(order.getBillId());
query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
- if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
- query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
- } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
- query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
- }
+ query.setIsFinished(false);
+// if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
+// query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
+// } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
+// query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
+// }
int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());
@@ -1071,11 +1072,12 @@ public class TransactionBillServiceImpl implements TransactionBillService, After
TransactionBillQuery query = new TransactionBillQuery();
query.setBillId(order.getBillId());
query.setStatus(TransactionBillStatus.SUCCESS.getStatus());
- if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
- query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
- } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
- query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
- }
+ query.setIsFinished(false);
+// if (SuitFeeType.TIME.getType().equals(order.getSuitFeeType())) {
+// query.setStartSuitEndTime(endTime); // 计时的话，需要结束时间在这之后的订单
+// } else if (SuitFeeType.COUNT.getType().equals(order.getSuitFeeType())) {
+// query.setStartSuitEndEle(totalEle); // 计量的话，需要结束电量比这个大的订单
+// }
int update = this.updateByQuery(data, query);
ServiceUtil.assertion(update != 1, "修改订单信息失败，请重试：" + order.getBillNo());
diff --git a/smart-switch-web/src/main/resources/application-dev.yml b/smart-switch-web/src/main/resources/application-dev.yml
index 1d527908..2b846d01 100644
--- a/smart-switch-web/src/main/resources/application-dev.yml
+++ b/smart-switch-web/src/main/resources/application-dev.yml
@@ -26,7 +26,8 @@ wx:
# 转账回调地址
transferNotifyUrl: https://kg-dev.chuangtewl.com/dev-api/app/pay/notify/wx/transfer
# 密钥所在位置
- privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem
+# privateKeyPath: H:/project/创特/证书/wxpay-kg/apiclient_key.pem
+ privateKeyPath: D:/project/证书/wxpay-kg/apiclient_key.pem
# 证书序列号
merchantSerialNumber: 6AD69237C0F22A9AE51A64F1927E3A0962AC1FB0
diff --git a/smart-switch-web/src/main/resources/logback.xml b/smart-switch-web/src/main/resources/logback.xml
index a360583f..30a94eab 100644
--- a/smart-switch-web/src/main/resources/logback.xml
+++ b/smart-switch-web/src/main/resources/logback.xml
@@ -11,7 +11,7 @@
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
+
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
@@ -19,8 +19,8 @@
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
+ <!-- 日志最大的历史 7天 -->
+ <maxHistory>7</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
@@ -34,7 +34,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
+
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
@@ -56,7 +56,7 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
+
<!-- 用户访问日志输出 -->
<appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-user.log</file>
@@ -64,13 +64,13 @@
<!-- 按天回滚 daily -->
<fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
+ <maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
</encoder>
</appender>
-
+
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
@@ -79,15 +79,15 @@
<root level="info">
<appender-ref ref="console" />
</root>
-
+
<!--系统操作日志-->
<root level="info">
<appender-ref ref="file_info" />
<appender-ref ref="file_error" />
</root>
-
+
<!--系统用户操作日志-->
<logger name="sys-user" level="info">
<appender-ref ref="sys-user"/>
</logger>
-</configuration>
\ No newline at end of file
+</configuration>