From 443b557623367f2cc81d035c5055aba6485a5011 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 25 Jun 2025 17:10:56 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:1=E3=80=81design=20=E6=B8=90=E5=8F=98?=
 =?UTF-8?q?=E8=89=B2=E6=B2=A1=E5=AD=98=202=E3=80=81=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=9B=B4=E6=96=B0=203=E3=80=81=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8B=BC=E8=B4=B4=E5=9B=BE=E5=85=A5=E5=8F=82=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/impl/CollectionServiceImpl.java  | 6 +-----
 .../java/com/ai/da/service/impl/GenerateServiceImpl.java    | 2 +-
 .../com/ai/da/service/impl/UserLikeGroupServiceImpl.java    | 4 ++++
 src/main/resources/messages_en.properties                   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
index af14e0c7..1969faa5 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
@@ -280,11 +280,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
             }
             d.setRgbValue(o.getColorRgb());
             // 渐变色
-            Gradient gradient = JSONObject.parseObject(o.getGradientString(), Gradient.class);
-            if (!Objects.isNull(gradient) && !StringUtil.isNullOrEmpty(gradient.getColorImg())){
-                gradient.setColorImg(null);
-            }
-            d.setGradient(gradient);
+            d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class));
         });
     }
 }
diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
index c7f4ee35..ec73827e 100644
--- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
@@ -1361,7 +1361,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
      */
     @Transactional(rollbackFor = Exception.class)
     public GenerateResultVO sketchReconstructionGenerate(SketchReconstructionDTO sketchReconstructionDTO){
-        log.info("sketchReconstructionGenerate params: {}", sketchReconstructionDTO);
+//        log.info("sketchReconstructionGenerate params: {}", sketchReconstructionDTO);
 
         Long accountId = UserContext.getUserHolder().getId();
         // 1、线稿生成
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index ecc19384..21d145cd 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -2128,6 +2128,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                     collectionElement.setHasPin((byte) 0);
                     collectionElement.setColorRgb(board.getRgbValue());
                     collectionElement.setMd5("0");
+                    // 渐变色
+                    if (!Objects.isNull(board.getGradient()) && !StringUtil.isNullOrEmpty(board.getGradient().getColorImg())){
+                        board.getGradient().setColorImg(null);
+                    }
                     collectionElement.setGradientString(JSON.toJSONString(board.getGradient()));
                     collectionElement.setCreateDate(new Date());
                     collectionElementMapper.insert(collectionElement);
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 5a331452..f726a44b 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -207,8 +207,8 @@ BLOUSE=Blouse
 DRESS=Dress
 TROUSERS=Trousers
 SKIRT=Skirt
-FEMALE=Women's wear
-MALE=Men's wear
+FEMALE=Women's Fashion
+MALE=Men's Fashion
 
 SLOGAN=Slogan
 LOGO=Logo