From aa6fd3986a72524dea1547f2b1cce85ea71228bd Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 19 Oct 2023 17:16:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java
index 4405330..53041e4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/log/service/impl/ISmLogManageServiceImpl.java
@@ -1,6 +1,7 @@
package cn.gistack.sm.log.service.impl;
import cn.gistack.pwd.dto.CBCResultDTO;
+import cn.gistack.pwd.dto.ResultDTO;
import cn.gistack.pwd.fegin.IPwdClient;
import cn.gistack.sm.log.entity.SmLogManage;
import cn.gistack.sm.log.mapper.SmLogManageMapper;
@@ -46,7 +47,24 @@
@Override
public IPage<SmLogManageVO> selectPage(IPage<SmLogManageVO> page, SmLogManageVO smLogManage) {
- return page.setRecords(baseMapper.selectMyPage(page,smLogManage));
+ List<SmLogManageVO> list = baseMapper.selectMyPage(page, smLogManage);
+
+ list.forEach(smLogManageVO ->{
+ SmLogManage log = new SmLogManage();
+
+ log.setIp(smLogManageVO.getIp());
+ log.setOperationDescription(smLogManageVO.getOperationDescription());
+ log.setUrl(smLogManageVO.getUrl());
+ log.setSource(smLogManage.getSource());
+
+ String message = JSONObject.toJSONString(log);
+ pwdClient.verify(smLogManageVO.getMaced(),
+ smLogManageVO.getSm4iv(),
+ smLogManageVO.getKeyindexs(),
+ message,smLogManageVO.getId().toString(),"sm_log_manage");
+ });
+
+ return page.setRecords(list);
}
@Override
--
Gitblit v1.9.3