From 2a2bf99239e8bc65a833ce94aafe904ed9e9e257 Mon Sep 17 00:00:00 2001
From: liulu <lu.liu@sunyard.com>
Date: Thu, 31 Oct 2024 11:14:32 +0800
Subject: [PATCH] fix

---
 .../main/java/com/sunyard/chsm/model/entity/KeyInfo.java  | 2 ++
 .../com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java | 2 +-
 chsm-web-manage/src/main/resources/application.yml        | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java b/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
index 5186170..6459483 100644
--- a/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
+++ b/chsm-common/src/main/java/com/sunyard/chsm/model/entity/KeyInfo.java
@@ -1,6 +1,7 @@
 package com.sunyard.chsm.model.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
@@ -30,6 +31,7 @@ public class KeyInfo {
     private LocalDateTime expiredTime;
 
     private String remark;
+    @TableLogic
     private Boolean deleted;
     private LocalDateTime createTime;
     private LocalDateTime updateTime;
diff --git a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
index a352129..11da00c 100644
--- a/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
+++ b/chsm-web-manage/src/main/java/com/sunyard/chsm/service/impl/KeyInfoServiceImpl.java
@@ -91,7 +91,7 @@ public class KeyInfoServiceImpl implements KeyInfoService {
         LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<KeyInfo>()
                 .eq(StringUtils.hasText(query.getKeyType()), KeyInfo::getKeyType, query.getKeyType())
                 .eq(StringUtils.hasText(query.getStatus()), KeyInfo::getStatus, query.getStatus())
-                .eq(KeyInfo::getDeleted, false)
+//                .eq(KeyInfo::getDeleted, false)
                 .orderByDesc(KeyInfo::getCreateTime);
         if (StringUtils.hasText(query.getStatus())) {
             KeyStatus queryStatus = KeyStatus.of(query.getStatus());
diff --git a/chsm-web-manage/src/main/resources/application.yml b/chsm-web-manage/src/main/resources/application.yml
index f943dde..046c57f 100644
--- a/chsm-web-manage/src/main/resources/application.yml
+++ b/chsm-web-manage/src/main/resources/application.yml
@@ -55,6 +55,7 @@ mybatis-plus:
   mapper-locations: classpath*:mapper/**/*Mapper.xml
   # 原生配置
   configuration:
+    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     map-underscore-to-camel-case: true
     cache-enabled: false
     lazy-loading-enabled: false
@@ -123,9 +124,10 @@ ignored:
     - /ushield/init/bindUPublickey
     - /status/set
     - /test/setALL
-#logging:
-#  level:
-#    root: debug
+logging:
+  level:
+    root: info
+    com.sunyard.chsm.mapper: debug
 #    org.springframework.web: trace
 #  config: classpath:log4j2.xml