From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
index ccb60d5..9363814 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -4,6 +4,7 @@
import com.ycl.exception.ApiException;
import com.ycl.service.apiKey.IApiKeyService;
import com.ycl.utils.MD5Util;
+import com.ycl.vo.cockpit.CockpitVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -23,28 +24,28 @@
/**
* 椹鹃┒鑸�
*
- * @param appId appId
- * @param appKey appKey
- * @param sign sign
- * @param beginTime 寮�濮嬫椂闂�
- * @param endTime 缁撴潫鏃堕棿
- * @param regionId 鍖哄煙Id
+ * @param params
*/
- public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime, String regionId) {
- apiKeyService.checkIsExist(appId, appKey, "椹鹃┒浠�");
+ public void cockpit(CockpitVO params) {
+ apiKeyService.checkIsExist(params.getAppId(), params.getAppKey(), "椹鹃┒浠�");
StringBuffer sb = new StringBuffer();
- sb.append(appId);
- sb.append(appKey);
+ sb.append("appId=");
+ sb.append(params.getAppId());
+ sb.append("&appKey=");
+ sb.append(params.getAppKey());
String result;
- if (!StringUtils.isBlank(beginTime) && !StringUtils.isBlank(endTime)) {
- sb.append(beginTime);
- sb.append(endTime);
+ if (!StringUtils.isBlank(params.getBeginTime()) && !StringUtils.isBlank(params.getEndTime())) {
+ sb.append("&beginTime=");
+ sb.append(params.getBeginTime());
+ sb.append("&endTime=");
+ sb.append(params.getEndTime());
}
- if (!StringUtils.isBlank(regionId)) {
- sb.append(regionId);
+ if (params.getStreetId() != null) {
+ sb.append("&streetId=");
+ sb.append(params.getStreetId());
}
result = MD5Util.md5Encrypt32Lower(sb.toString());
- if (!sign.equals(result)) {
+ if (!params.getSign().equals(result)) {
throw new ApiException(ResultCode.SIGN_ERROR);
}
}
--
Gitblit v1.8.0