From e7b6173a930a15c84cb90bd15d2ab9cc4e7d9cac Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 29 十月 2024 16:59:33 +0800
Subject: [PATCH] 合并代码

---
 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/model/SwitchwayGate.java |    6 ++++--
 3 files changed, 17 insertions(+), 22 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 d04d29a..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,10 +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
@@ -40,12 +43,11 @@
 		String str = String.format("action=%s&appkey=%s&channel=%s&timestamp=%s&key=%s", this.getAction(), this.getAppkey(), this.getChannel(), this.getTimestamp(), secretkey);
 		log.info("待签名串:{}", str);
 		//MD5加密
-		String encoder = MD5Util.encoder(str);
+		String encoder = MD5Util.getMD5(str);
 		//将签名结果转大写
 		encoder = encoder.toUpperCase();
 		log.info("签名结果:{}", encoder);
 		this.setSign(encoder);
 		return this;
 	}
-	
 }
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