wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(REQ-2774): 页面元素上报增加秘钥和上报人

Browse Source
This commit is contained in:
李昆鹏 2024-07-26 09:15:42 +08:00
parent d333091bbc
commit 8b5c575206
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tyr-api/src/main/java/cn/axzo/tyr/client/model/req/PageElementReportReq.java
View File

@ -26,6 +26,18 @@ public class PageElementReportReq {
@NotBlank(message = "端信息不能为空")
private String terminal;
/**
* 上报秘钥
*/
@NotBlank(message = "上报秘钥不能为空")
private String secretKey;
/**
* 创建人名
*/
@NotBlank(message = "创建人名不能为空")
private String createName;
/**
* 页面元素列表
*/

6
tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasPageElement.java
View File

@ -55,4 +55,10 @@ public class SaasPageElement extends BaseEntity<SaasPageElement> {
*/
@TableField("terminal")
private String terminal;
/**
* 创建人名
*/
@TableField("create_name")
private String createName;
}

5
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasPageElementServiceImpl.java
View File

@ -74,12 +74,15 @@ public class SaasPageElementServiceImpl implements SaasPageElementService {
private ExecutorService asyncExecutor;
@Value("${not.auth.featureCodes:}")
private Set<String> notAuthFeatureCodes;
@Value("#{'${pageElement.report.secretKeys:1qaz@WSX}'.split(',')}")
private List<String> 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()));
}
}