From a470a34edbaa8c52cb5a860c3ca24d1a50a92dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= <likunpeng@axzo.cn>
Date: Mon, 29 Jul 2024 13:51:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(REQ-2774):=20=E9=A1=B5=E9=9D=A2=E5=85=83?=
 =?UTF-8?q?=E7=B4=A0=E4=B8=8A=E6=8A=A5=E5=A2=9E=E5=8A=A0=E7=A7=98=E9=92=A5?=
 =?UTF-8?q?=E5=92=8C=E4=B8=8A=E6=8A=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/impl/SaasPageElementServiceImpl.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
index 93f664b8..80c7e091 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
@@ -5,6 +5,7 @@ import cn.axzo.basics.common.util.AssertUtil;
 import cn.axzo.basics.common.util.StopWatchUtil;
 import cn.axzo.basics.profiles.api.UserProfileServiceApi;
 import cn.axzo.basics.profiles.dto.basic.PersonProfileDto;
+import cn.axzo.foundation.exception.BusinessException;
 import cn.axzo.framework.domain.page.PageResp;
 import cn.axzo.pokonyan.config.mybatisplus.BaseEntity;
 import cn.axzo.tyr.client.common.enums.FeatureResourceType;
@@ -17,7 +18,6 @@ import cn.axzo.tyr.client.model.res.IdentityAuthRes;
 import cn.axzo.tyr.client.model.res.PageElementBasicDTO;
 import cn.axzo.tyr.client.model.res.PageElementResp;
 import cn.axzo.tyr.server.model.RelationOperateLogResourceBindElementDO;
-import cn.axzo.tyr.server.model.RelationOperateLogResourceBindRoleDO;
 import cn.axzo.tyr.server.repository.dao.SaasFeatureResourceDao;
 import cn.axzo.tyr.server.repository.dao.SaasPageElementDao;
 import cn.axzo.tyr.server.repository.dao.SaasPageElementFeatureResourceRelationDao;
@@ -82,7 +82,10 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
     public void report(PageElementReportReq request) {
         StopWatchUtil watch = StopWatchUtil.createStarted("saasPageElement-report");
         watch.start("report");
-        AssertUtil.isTrue(reportSecretKeys.contains(request.getSecretKey()), "上报秘钥有误。");
+//        AssertUtil.isTrue(reportSecretKeys.contains(request.getSecretKey()), "上报秘钥有误。");
+        if (!reportSecretKeys.contains(request.getSecretKey())) {
+            throw new BusinessException("403", "上报秘钥有误。");
+        }
         // 根据端删除所有的元素
         saasPageElementDao.deleteAllByTerminal(request.getTerminal());