From 1e7c54e5e8d309edb2caa4681888d3c6a3ea7626 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 17:05:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MD5Util.java | 31 ++++++++++++-------------------
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java | 14 --------------
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java | 5 ++++-
4 files changed, 17 insertions(+), 35 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MD5Util.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MD5Util.java
index 0f28ea6..1037459 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MD5Util.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/MD5Util.java
@@ -52,27 +52,20 @@
public static String getMD5(String str) {
if (StringUtils.isNotEmpty(str)) {
try {
+ // 创建MD5加密实例
MessageDigest md = MessageDigest.getInstance("MD5");
- md.update(str.getBytes());
- byte b[] = md.digest();
- int i;
- StringBuffer buf = new StringBuffer("");
- for (int offset = 0; offset < b.length; offset++) {
- i = b[offset];
- if (i < 0)
- i += 256;
- if (i < 16)
- buf.append("0");
- buf.append(Integer.toHexString(i));
+
+ // 执行加密操作
+ byte[] messageDigest = md.digest(str.getBytes());
+
+ // 将得到的散列值转换为十六进制
+ StringBuilder sb = new StringBuilder();
+ for (byte b : messageDigest) {
+ sb.append(String.format("%02x", b));
}
- //32位加密(小写)
- return buf.toString();
- //32位加密(大写)
- //return buf.toString().toUpperCase();
- // 16位的加密(小写)
- //return buf.toString().substring(8, 24);
- // 16位的加密(大写)
- //return buf.toString().substring(8, 24).toUpperCase();
+
+ // 返回MD5散列值
+ return sb.toString();
} catch (NoSuchAlgorithmException e) {
e.printStackTrace();
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java
index 2ab74a0..c7750d3 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java
@@ -1,9 +1,13 @@
package com.ruoyi.integration.barrierGate.model;
+import com.alibaba.nacos.common.utils.MD5Utils;
import com.ruoyi.common.core.utils.MD5Util;
import lombok.Data;
import lombok.experimental.Accessors;
import lombok.extern.slf4j.Slf4j;
+import org.apache.tomcat.util.security.MD5Encoder;
+
+import java.nio.charset.Charset;
/**
* @author zhibing.pu
@@ -46,5 +50,4 @@
this.setSign(encoder);
return this;
}
-
}
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
index 4904d6b..ab49ae7 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/SwitchwayGateService.java
@@ -40,18 +40,4 @@
}
return success;
}
-
-
-// public static void main(String[] args) {
-// SwitchwayGateService switchwayGateService = new SwitchwayGateService();
-// SwitchwayGateReq req = new SwitchwayGateReq();
-// req.setAction("close");
-// req.setChannel("001");
-// Boolean success = switchwayGateService.gateService(req);
-// if(success){
-// log.info("调用成功");
-// }else{
-// log.info("调用失败");
-// }
-// }
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index cccca0d..72623e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -387,7 +387,7 @@
TChargingOrder one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, addChargingOrder.getId())
.in(TChargingOrder::getStatus, Arrays.asList(1, 2, 3)).eq(TChargingOrder::getDelFlag, 0));
if(null != one){
- return AjaxResult.error("充电枪正在充电桩中，启动失败");
+ return AjaxResult.error("充电枪正在充电中，启动失败");
}
//查询当前充电枪是否有正在支付的订单
one = this.getOne(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getChargingGunId, addChargingOrder.getId())
--
Gitblit v1.7.1