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-integration/src/main/java/com/ruoyi/integration/barrierGate/model/SwitchwayGate.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) 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×tamp=%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; } - } -- Gitblit v1.7.1