From 98261b96dacdba9d210790112248d798e292ae0b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Fri, 8 Mar 2024 22:33:39 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.Spring Boot 3.1.8 => 3.1.9
2.Redisson 3.26.0 => 3.27.1
3.Crane4j 2.5.0 => 2.6.0（适配条件注解）
4.Hutool 5.8.25 => 5.8.26
5.CosId 2.6.5 => 2.6.6
6.AWS S3 1.12.651 => 1.12.675
7.IP2Region 3.1.7 => 3.1.9
8.ttl 2.14.4 => 2.14.5
---
 continew-starter-dependencies/pom.xml            | 16 ++++++++--------
 .../crud/model/resp/BaseDetailResp.java          |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/continew-starter-dependencies/pom.xml b/continew-starter-dependencies/pom.xml
index e7b7eea2..799b14aa 100644
--- a/continew-starter-dependencies/pom.xml
+++ b/continew-starter-dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>3.1.8</version>
+        <version>3.1.9</version>
         <relativePath/>
     </parent>
 
@@ -60,21 +60,21 @@
         <dynamic-datasource.version>4.3.0</dynamic-datasource.version>
         <p6spy.version>3.9.1</p6spy.version>
         <jetcache.version>2.7.5</jetcache.version>
-        <redisson.version>3.26.0</redisson.version>
-        <cosid.version>2.6.5</cosid.version>
+        <redisson.version>3.27.1</redisson.version>
+        <cosid.version>2.6.6</cosid.version>
         <sms4j.version>3.1.1</sms4j.version>
         <aj-captcha.version>1.3.0</aj-captcha.version>
         <easy-captcha.version>1.6.2</easy-captcha.version>
         <easy-excel.version>3.3.3</easy-excel.version>
         <nashorn.version>15.4</nashorn.version>
         <x-file-storage.version>2.1.0</x-file-storage.version>
-        <aws-s3.version>1.12.651</aws-s3.version>
-        <crane4j.version>2.5.0</crane4j.version>
+        <aws-s3.version>1.12.675</aws-s3.version>
+        <crane4j.version>2.6.0</crane4j.version>
         <knife4j.version>4.5.0</knife4j.version>
         <tlog.version>1.5.1</tlog.version>
-        <ttl.version>2.14.4</ttl.version>
-        <ip2region.version>3.1.7</ip2region.version>
-        <hutool.version>5.8.25</hutool.version>
+        <ttl.version>2.14.5</ttl.version>
+        <ip2region.version>3.1.9</ip2region.version>
+        <hutool.version>5.8.26</hutool.version>
         <!-- Maven Plugin Versions -->
         <flatten.version>1.6.0</flatten.version>
         <spotless.version>2.43.0</spotless.version>
diff --git a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java
index 87809440..b82bd7b2 100644
--- a/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java
+++ b/continew-starter-extension/continew-starter-extension-crud/src/main/java/top/charles7c/continew/starter/extension/crud/model/resp/BaseDetailResp.java
@@ -18,6 +18,7 @@ package top.charles7c.continew.starter.extension.crud.model.resp;
 
 import cn.crane4j.annotation.Assemble;
 import cn.crane4j.annotation.Mapping;
+import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -41,6 +42,7 @@ public class BaseDetailResp extends BaseResp {
      * 修改人
      */
     @JsonIgnore
+    @ConditionOnPropertyNotNull
     @Assemble(container = ContainerPool.USER_NICKNAME, props = @Mapping(ref = "updateUserString"))
     private Long updateUser;