From 36a2d9a19b0b9ca2209555f6479ae1ef0198efd3 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 02 十一月 2022 09:35:12 +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 |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 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 1d3b50c..ccb60d5 100644
--- a/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
+++ b/ycl-platform/src/main/java/com/ycl/util/CheckApiUtil.java
@@ -23,14 +23,14 @@
     /**
      * 椹鹃┒鑸�
      *
-     * @param appId
-     * @param appKey
-     * @param sign
-     * @param name
-     * @param beginTime
-     * @param endTime
+     * @param appId     appId
+     * @param appKey    appKey
+     * @param sign      sign
+     * @param beginTime 寮�濮嬫椂闂�
+     * @param endTime   缁撴潫鏃堕棿
+     * @param regionId  鍖哄煙Id
      */
-    public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime) {
+    public void cockpit(String appId, String appKey, String sign, String beginTime, String endTime, String regionId) {
         apiKeyService.checkIsExist(appId, appKey, "椹鹃┒浠�");
         StringBuffer sb = new StringBuffer();
         sb.append(appId);
@@ -40,6 +40,9 @@
             sb.append(beginTime);
             sb.append(endTime);
         }
+        if (!StringUtils.isBlank(regionId)) {
+            sb.append(regionId);
+        }
         result = MD5Util.md5Encrypt32Lower(sb.toString());
         if (!sign.equals(result)) {
             throw new ApiException(ResultCode.SIGN_ERROR);

--
Gitblit v1.8.0