Merge remote-tracking branch 'origin/jtdev' into jtdev

zhongrj

2023-10-19 aa6fd3986a72524dea1547f2b1cce85ea71228bd

 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