From e5d63a8d5f39547330c31f18265e3da6eb800e7b Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Tue, 1 Sep 2020 07:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3server=20api=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xiaoleilu/loServer/action/admin/AdminAction.java | 7 ++++---
 .../xiaoleilu/loServer/action/channel/ChannelAction.java | 8 ++++----
 .../com/xiaoleilu/loServer/action/robot/RobotAction.java | 9 +++++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
index 8e4aebf4..4f84956a 100644
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
@@ -46,17 +46,18 @@ abstract public class AdminAction extends Action {
         }
         
         String nonce = request.getHeader("nonce");
-        if (!StringUtil.isNullOrEmpty(nonce)) {
+        if (StringUtil.isNullOrEmpty(nonce)) {
             nonce = request.getHeader("Nonce");
         }
         String timestamp = request.getHeader("timestamp");
-        if (!StringUtil.isNullOrEmpty(timestamp)) {
+        if (StringUtil.isNullOrEmpty(timestamp)) {
             timestamp = request.getHeader("Timestamp");
         }
         String sign = request.getHeader("sign");
-        if (!StringUtil.isNullOrEmpty(sign)) {
+        if (StringUtil.isNullOrEmpty(sign)) {
             sign = request.getHeader("Sign");
         }
+        
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) {
             return ErrorCode.INVALID_PARAMETER;
         }
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 8c9bfa6d..2d8771b9 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,19 +34,19 @@ abstract public class ChannelAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
-        if (!StringUtil.isNullOrEmpty(nonce)) {
+        if (StringUtil.isNullOrEmpty(nonce)) {
             nonce = request.getHeader("Nonce");
         }
         String timestamp = request.getHeader("timestamp");
-        if (!StringUtil.isNullOrEmpty(timestamp)) {
+        if (StringUtil.isNullOrEmpty(timestamp)) {
             timestamp = request.getHeader("Timestamp");
         }
         String sign = request.getHeader("sign");
-        if (!StringUtil.isNullOrEmpty(sign)) {
+        if (StringUtil.isNullOrEmpty(sign)) {
             sign = request.getHeader("Sign");
         }
         String cid = request.getHeader("cid");
-        if (!StringUtil.isNullOrEmpty(cid)) {
+        if (StringUtil.isNullOrEmpty(cid)) {
             cid = request.getHeader("Cid");
         }
 
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 399513c1..a619af82 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,21 +38,22 @@ abstract public class RobotAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
-        if (!StringUtil.isNullOrEmpty(nonce)) {
+        if (StringUtil.isNullOrEmpty(nonce)) {
             nonce = request.getHeader("Nonce");
         }
         String timestamp = request.getHeader("timestamp");
-        if (!StringUtil.isNullOrEmpty(timestamp)) {
+        if (StringUtil.isNullOrEmpty(timestamp)) {
             timestamp = request.getHeader("Timestamp");
         }
         String sign = request.getHeader("sign");
-        if (!StringUtil.isNullOrEmpty(sign)) {
+        if (StringUtil.isNullOrEmpty(sign)) {
             sign = request.getHeader("Sign");
         }
         String rid = request.getHeader("rid");
-        if (!StringUtil.isNullOrEmpty(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;
         }