anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正server api签名错误问题

Browse Source
This commit is contained in:
imhao183
2020-09-01 07:49:16 +08:00
parent 06fe70bd6f
commit e5d63a8d5f
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
+4 -3
View File
@@ -46,17 +46,18 @@ abstract public class AdminAction extends Action {
} }
String nonce = request.getHeader("nonce"); String nonce = request.getHeader("nonce");
if (!StringUtil.isNullOrEmpty(nonce)) { if (StringUtil.isNullOrEmpty(nonce)) {
nonce = request.getHeader("Nonce"); nonce = request.getHeader("Nonce");
} }
String timestamp = request.getHeader("timestamp"); String timestamp = request.getHeader("timestamp");
if (!StringUtil.isNullOrEmpty(timestamp)) { if (StringUtil.isNullOrEmpty(timestamp)) {
timestamp = request.getHeader("Timestamp"); timestamp = request.getHeader("Timestamp");
} }
String sign = request.getHeader("sign"); String sign = request.getHeader("sign");
if (!StringUtil.isNullOrEmpty(sign)) { if (StringUtil.isNullOrEmpty(sign)) {
sign = request.getHeader("Sign"); sign = request.getHeader("Sign");
} }
if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) { if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) {
return ErrorCode.INVALID_PARAMETER; return ErrorCode.INVALID_PARAMETER;
} }
broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java
+4 -4
View File
@@ -34,19 +34,19 @@ abstract public class ChannelAction extends Action {
@Override @Override
public ErrorCode preAction(Request request, Response response) { public ErrorCode preAction(Request request, Response response) {
String nonce = request.getHeader("nonce"); String nonce = request.getHeader("nonce");
if (!StringUtil.isNullOrEmpty(nonce)) { if (StringUtil.isNullOrEmpty(nonce)) {
nonce = request.getHeader("Nonce"); nonce = request.getHeader("Nonce");
} }
String timestamp = request.getHeader("timestamp"); String timestamp = request.getHeader("timestamp");
if (!StringUtil.isNullOrEmpty(timestamp)) { if (StringUtil.isNullOrEmpty(timestamp)) {
timestamp = request.getHeader("Timestamp"); timestamp = request.getHeader("Timestamp");
} }
String sign = request.getHeader("sign"); String sign = request.getHeader("sign");
if (!StringUtil.isNullOrEmpty(sign)) { if (StringUtil.isNullOrEmpty(sign)) {
sign = request.getHeader("Sign"); sign = request.getHeader("Sign");
} }
String cid = request.getHeader("cid"); String cid = request.getHeader("cid");
if (!StringUtil.isNullOrEmpty(cid)) { if (StringUtil.isNullOrEmpty(cid)) {
cid = request.getHeader("Cid"); cid = request.getHeader("Cid");
} }
broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java
+5 -4
View File
@@ -38,21 +38,22 @@ abstract public class RobotAction extends Action {
@Override @Override
public ErrorCode preAction(Request request, Response response) { public ErrorCode preAction(Request request, Response response) {
String nonce = request.getHeader("nonce"); String nonce = request.getHeader("nonce");
if (!StringUtil.isNullOrEmpty(nonce)) { if (StringUtil.isNullOrEmpty(nonce)) {
nonce = request.getHeader("Nonce"); nonce = request.getHeader("Nonce");
} }
String timestamp = request.getHeader("timestamp"); String timestamp = request.getHeader("timestamp");
if (!StringUtil.isNullOrEmpty(timestamp)) { if (StringUtil.isNullOrEmpty(timestamp)) {
timestamp = request.getHeader("Timestamp"); timestamp = request.getHeader("Timestamp");
} }
String sign = request.getHeader("sign"); String sign = request.getHeader("sign");
if (!StringUtil.isNullOrEmpty(sign)) { if (StringUtil.isNullOrEmpty(sign)) {
sign = request.getHeader("Sign"); sign = request.getHeader("Sign");
} }
String rid = request.getHeader("rid"); String rid = request.getHeader("rid");
if (!StringUtil.isNullOrEmpty(rid)) { if (StringUtil.isNullOrEmpty(rid)) {
rid = request.getHeader("Rid"); rid = request.getHeader("Rid");
} }
if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) { if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) {
return ErrorCode.INVALID_PARAMETER; return ErrorCode.INVALID_PARAMETER;
} }