From 5a14b2f2f053f5b5c2ba99e6ea039c7455a17364 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Sat, 29 Aug 2020 09:38:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9golang=E7=9A=84http=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loServer/action/channel/ChannelAction.java | 12 ++++++++++++ .../xiaoleilu/loServer/action/robot/RobotAction.java | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java index 043602ee..8c9bfa6d 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java @@ -34,9 +34,21 @@ abstract public class ChannelAction extends Action { @Override public ErrorCode preAction(Request request, Response response) { String nonce = request.getHeader("nonce"); + if (!StringUtil.isNullOrEmpty(nonce)) { + nonce = request.getHeader("Nonce"); + } String timestamp = request.getHeader("timestamp"); + if (!StringUtil.isNullOrEmpty(timestamp)) { + timestamp = request.getHeader("Timestamp"); + } String sign = request.getHeader("sign"); + if (!StringUtil.isNullOrEmpty(sign)) { + sign = request.getHeader("Sign"); + } String cid = request.getHeader("cid"); + if (!StringUtil.isNullOrEmpty(cid)) { + cid = request.getHeader("Cid"); + } if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(cid)) { return ErrorCode.INVALID_PARAMETER; diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java index b285c0bd..399513c1 100644 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java @@ -38,9 +38,21 @@ abstract public class RobotAction extends Action { @Override public ErrorCode preAction(Request request, Response response) { String nonce = request.getHeader("nonce"); + if (!StringUtil.isNullOrEmpty(nonce)) { + nonce = request.getHeader("Nonce"); + } String timestamp = request.getHeader("timestamp"); + if (!StringUtil.isNullOrEmpty(timestamp)) { + timestamp = request.getHeader("Timestamp"); + } String sign = request.getHeader("sign"); + if (!StringUtil.isNullOrEmpty(sign)) { + sign = request.getHeader("Sign"); + } String rid = request.getHeader("rid"); + if (!StringUtil.isNullOrEmpty(rid)) { + rid = request.getHeader("Rid"); + } if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) { return ErrorCode.INVALID_PARAMETER; }