From b9accccb81e48f17f18e95da970a65e42f1b8a63 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Thu, 20 Jul 2023 13:21:26 +0800
Subject: [PATCH] header

---
 .../java/com/nsgk/agentcentersdk/api/NSSDKClient.java    | 9 +++++----
 .../java/com/nsgk/agentcentersdk/api/NSSDKServer.java    | 4 ++--
 .../java/com/nsgk/agentcentersdk/core/NSConstants.java   | 7 ++++---
 .../java/com/nsgk/agentcentersdk/message/NSMessage.java  | 4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
index ec1086f..e08bb7a 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
@@ -81,10 +81,11 @@ public final class NSSDKClient
     {
         String dataStr;
 
-        request.ClearHeaders().AddHeader(NSConstants.HEADER_SIGN, object.getSign());
-        request.ClearQueries().AddQuery(NSConstants.QUERY_IDENTIFIER, object.getIdentifier())
-                      .AddQuery(NSConstants.QUERY_PROTOCOL, object.getProtocol())
-                      .AddQuery(NSConstants.QUERY_TIMESTAMP, object.getTimestamp())
+        request.ClearHeaders().AddHeader(NSConstants.HEADER_SIGN, object.getSign())
+               .AddHeader(NSConstants.HEADER_IDENTIFIER, object.getIdentifier())
+               .AddHeader(NSConstants.HEADER_TIMESTAMP, object.getTimestamp())
+               ;
+        request.AddQuery(NSConstants.QUERY_PROTOCOL, object.getProtocol())
         ;
         dataStr = object.getDataStr();
         try
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
index 432e647..2138407 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
@@ -49,8 +49,8 @@ public final class NSSDKServer
         data = NSHttp.GetRequestBody(request);
         NSAssert.NotEmpty(data, NSErrno.ERRNO_CLI_DATA_MISSING);
         res = new NSReportObject<>();
-        res.SetTimestampStr(request.getParameter(NSConstants.QUERY_TIMESTAMP))
-                .setIdentifier(request.getParameter(NSConstants.QUERY_IDENTIFIER))
+        res.SetTimestampStr(request.getHeader(NSConstants.HEADER_TIMESTAMP))
+                .setIdentifier(request.getHeader(NSConstants.HEADER_IDENTIFIER))
                 .SetProtocolStr(request.getParameter(NSConstants.QUERY_PROTOCOL))
         ;
         try
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSConstants.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSConstants.java
index 2822833..95f8138 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSConstants.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSConstants.java
@@ -3,9 +3,10 @@ package com.nsgk.agentcentersdk.core;
 // 常量
 public final class NSConstants
 {
-    public static final String HEADER_SIGN = "SIGN";
-    public static final String QUERY_TIMESTAMP = "timestamp";
-    public static final String QUERY_IDENTIFIER = "identifier";
+    public static final String HEADER_SIGN       = "X-NS-SIGN";
+    public static final String HEADER_TIMESTAMP  = "X-NS-TIMESTAMP";
+    public static final String HEADER_IDENTIFIER = "X-NS-IDENTIFIER";
+
     public static final String QUERY_PROTOCOL = "protocol";
 
     public static final int MAX_TIME_DIFF = 300; // 秒
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/message/NSMessage.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/message/NSMessage.java
index 27e149c..3660f9a 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/message/NSMessage.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/message/NSMessage.java
@@ -44,10 +44,10 @@ public class NSMessage implements Serializable
     public boolean IsValid()
     {
         return null != bookId
-                && null != deptId
+                //&& null != deptId
                 && null != outId
                 && NSStr.IsNotEmpty(orgCode)
-                && NSStr.IsNotEmpty(bookName)
+                //&& NSStr.IsNotEmpty(bookName)
                 ;
     }