From e433921abeb43172bcb4a2b8a2c20d7a1bc38c26 Mon Sep 17 00:00:00 2001
From: litianxiang <litianxiangxtt@163.com>
Date: Tue, 28 Apr 2026 09:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflows/master_sellrt_build_manual.yaml |  4 +--
 pom.xml                                       |  2 +-
 .../aida/seller/config/MyBatisPlusConfig.java |  6 ++---
 .../listing/service/ListingServiceImpl.java   | 25 +++++++++++--------
 src/main/resources/bootstrap.yml              |  5 ++--
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/master_sellrt_build_manual.yaml b/.gitea/workflows/master_sellrt_build_manual.yaml
index 8c836ff..8ba7a57 100644
--- a/.gitea/workflows/master_sellrt_build_manual.yaml
+++ b/.gitea/workflows/master_sellrt_build_manual.yaml
@@ -141,8 +141,8 @@ jobs:
             cd ${{ env.REMOTE_DEPLOY_PATH }}
             echo "停止旧容器..."
             docker compose down || true
-            echo "清理Docker资源..."
-            docker system prune -f
+#            echo "清理Docker资源..."
+#            docker system prune -f
             echo "构建镜像..."
             docker compose build --no-cache
             echo "启动服务..."
diff --git a/pom.xml b/pom.xml
index e08001d..01bb32e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <mybatis-plus.version>3.5.6</mybatis-plus.version>
+        <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <minio.version>8.5.7</minio.version>
         <jwt.version>0.12.3</jwt.version>
         <hutool.version>5.8.26</hutool.version>
diff --git a/src/main/java/com/aida/seller/config/MyBatisPlusConfig.java b/src/main/java/com/aida/seller/config/MyBatisPlusConfig.java
index 4bbfded..8bc8277 100644
--- a/src/main/java/com/aida/seller/config/MyBatisPlusConfig.java
+++ b/src/main/java/com/aida/seller/config/MyBatisPlusConfig.java
@@ -25,13 +25,13 @@ public class MyBatisPlusConfig {
         return new MetaObjectHandler() {
             @Override
             public void insertFill(MetaObject metaObject) {
-                this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
-                this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+                this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime::now);
+                this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime::now);
             }
 
             @Override
             public void updateFill(MetaObject metaObject) {
-                this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+                this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime::now);
             }
         };
     }
diff --git a/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java b/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java
index ff066c9..9d0ee09 100644
--- a/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java
+++ b/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java
@@ -140,7 +140,7 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
             List<ListingImageDTO> imageDTOs = images.stream().map(img -> {
                 ListingImageDTO imgDto = new ListingImageDTO();
                 BeanUtils.copyProperties(img, imgDto);
-                imgDto.setImageUrl(minioUtil.processMinioResource(imgDto.getImageUrl(),CommonConstants.MINIO_PATH_TIMEOUT));
+                imgDto.setImageUrl(minioUtil.processMinioResource(imgDto.getImageUrl(), CommonConstants.MINIO_PATH_TIMEOUT));
                 imgDto.setIsSelected(img.getIsSelected() != null && img.getIsSelected() == 1);
                 return imgDto;
             }).collect(Collectors.toList());
@@ -224,18 +224,21 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
 
             for (int i = 0; i < categoryImages.size(); i++) {
                 ListingImageDTO imgDto = categoryImages.get(i);
-                ListingImageEntity imgEntity = new ListingImageEntity();
-                imgEntity.setListingId(listingId);
-                imgEntity.setCategory(category);
-                imgEntity.setImageUrl(minioUtil.convertToLogicalPath(imgDto.getImageUrl()));
-                imgEntity.setSortOrder(imgDto.getSortOrder() != null ? imgDto.getSortOrder() : i);
+                if (imgDto.getImageUrl() != null && !imgDto.getImageUrl().isEmpty()) {
+                    ListingImageEntity imgEntity = new ListingImageEntity();
+                    imgEntity.setListingId(listingId);
+                    imgEntity.setCategory(category);
 
-                if (supportsSelection) {
-                    imgEntity.setIsSelected(Boolean.TRUE.equals(imgDto.getIsSelected()) ? 1 : 0);
-                } else {
-                    imgEntity.setIsSelected(0);
+                    imgEntity.setImageUrl(minioUtil.convertToLogicalPath(imgDto.getImageUrl()));
+                    imgEntity.setSortOrder(imgDto.getSortOrder() != null ? imgDto.getSortOrder() : i);
+
+                    if (supportsSelection) {
+                        imgEntity.setIsSelected(Boolean.TRUE.equals(imgDto.getIsSelected()) ? 1 : 0);
+                    } else {
+                        imgEntity.setIsSelected(0);
+                    }
+                    listingImageMapper.insert(imgEntity);
                 }
-                listingImageMapper.insert(imgEntity);
             }
         }
     }
diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
index fcbb190..587703e 100644
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@
 # ============================================================
 
 nacos:
-  namespace: ltx
+  namespace: dev
   host: 18.167.251.121:28848
   username: nacos
   password: Aidlab123123!
@@ -22,7 +22,8 @@ spring:
         namespace: ${nacos.namespace}
         username: ${nacos.username}
         password: ${nacos.password}
-        hostname: master-aida-seller
+#        ip: ${HOSTNAME}
+#        hostname: master-aida-seller
       config:
         server-addr: ${nacos.host}
         namespace: ${nacos.namespace}