diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageElementReportReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageElementReportReq.java index 591493e4..668a982d 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageElementReportReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageElementReportReq.java @@ -26,6 +26,18 @@ public class PageElementReportReq { @NotBlank(message = "端信息不能为空") private String terminal; + /** + * 上报秘钥 + */ + @NotBlank(message = "上报秘钥不能为空") + private String secretKey; + + /** + * 创建人名 + */ + @NotBlank(message = "创建人名不能为空") + private String createName; + /** * 页面元素列表 */ diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java index a66f89f3..f5327ea1 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java @@ -55,4 +55,10 @@ public class SaasPageElement extends BaseEntity { */ @TableField("terminal") private String terminal; + + /** + * 创建人名 + */ + @TableField("create_name") + private String createName; } 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 66c14583..93f664b8 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 @@ -74,12 +74,15 @@ public class SaasPageElementServiceImpl implements SaasPageElementService { private ExecutorService asyncExecutor; @Value("${not.auth.featureCodes:}") private Set notAuthFeatureCodes; + @Value("#{'${pageElement.report.secretKeys:1qaz@WSX}'.split(',')}") + private List reportSecretKeys; @Override @Transactional(rollbackFor = Exception.class) public void report(PageElementReportReq request) { StopWatchUtil watch = StopWatchUtil.createStarted("saasPageElement-report"); watch.start("report"); + AssertUtil.isTrue(reportSecretKeys.contains(request.getSecretKey()), "上报秘钥有误。"); // 根据端删除所有的元素 saasPageElementDao.deleteAllByTerminal(request.getTerminal()); @@ -273,6 +276,7 @@ public class SaasPageElementServiceImpl implements SaasPageElementService { .type(pageElement.getType()) .name(pageElement.getName()) .linkUrl(pageElement.getLinkUrl()) + .createName(request.getCreateName()) .build()); if (CollectionUtils.isNotEmpty(pageElement.getChildren())) { @@ -282,6 +286,7 @@ public class SaasPageElementServiceImpl implements SaasPageElementService { .code(e.getCode()) .type(e.getType()) .name(e.getName()) + .createName(request.getCreateName()) .build()).collect(Collectors.toList())); } }