diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 5354c67..39b0f5e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.EncryptDecryptUtil; +import com.ruoyi.common.utils.StringUtils; import org.quickssl.api.CryptoClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -46,7 +47,7 @@ public class SysOperlogController extends BaseController boolean verifyName; boolean verifyTime; try { - verifyName=encryptDecryptUtil.sm3Verify(sysOperLog.getOperName(),sysOperLog.getOperNameCipher()); + verifyName=!StringUtils.isBlank(sysOperLog.getOperName())?encryptDecryptUtil.sm3Verify(sysOperLog.getOperName(),sysOperLog.getOperNameCipher()):true; verifyTime=encryptDecryptUtil.sm3Verify(sysOperLog.getOperTime(),sysOperLog.getOperTimeCipher()); } catch (CryptoClient.CryptoException e) { verifyName = false; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/BussinessOperlogController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/BussinessOperlogController.java index 613f8ee..a9a983b 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/BussinessOperlogController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/BussinessOperlogController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.EncryptDecryptUtil; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -45,7 +46,7 @@ public class BussinessOperlogController extends BaseController boolean verifyName; boolean verifyTime; try { - verifyName=encryptDecryptUtil.sm3Verify(bussinessOperLog.getOperName(),bussinessOperLog.getOperNameCipher()); + verifyName=!StringUtils.isBlank(bussinessOperLog.getOperName())?encryptDecryptUtil.sm3Verify(bussinessOperLog.getOperName(),bussinessOperLog.getOperNameCipher()):true; verifyTime=encryptDecryptUtil.sm3Verify(bussinessOperLog.getOperTime(),bussinessOperLog.getOperTimeCipher()); } catch (CryptoClient.CryptoException e) { verifyName = false; diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/BussinessOperLogMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/BussinessOperLogMapper.xml index ff772c1..4770ece 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/BussinessOperLogMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/BussinessOperLogMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index b020a2a..0fbab4e 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -13,10 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time, create_time_cipher from sys_job_log diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index a3cf484..a8ee055 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +