Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

src/main/resources/application-dev.properties

@@ -85,6 +85,7 @@ redis.key.SRExceptionMap=SRExceptionMap
 redis.key.taskList=TaskList
 redis.key.credits.pre-deduction=Credits:PreDeduction
 redis.key.generateResult=Generate:Result
+redis.key.toProductImageResultKey=ToProductImage:Result
 
 aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ
 aws.s3.secretKey=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

src/main/resources/messages_en.properties

@@ -186,6 +186,17 @@ TROUSERS=Trousers
 SKIRT=Skirt
 FEMALE=Women's wear
 MALE=Men's wear
+
 SLOGAN=Slogan
 LOGO=Logo
-PATTERN=Pattern
+PATTERN=Pattern
+
+EMBROIDERY=Embroidery
+BEADING=Beading
+PEARL=Pearl
+RIVET=Rivet
+BUTTON=Button
+BELT=Belt
+CORSAGE=Corsage
+ZIPPER=Zipper
+POCKET=Pocket

src/main/resources/messages_zh.properties

@@ -179,6 +179,17 @@ TROUSERS=裤子
 SKIRT=短裙
 FEMALE=女装
 MALE=男装
+
 SLOGAN=标语
 LOGO=标志
-PATTERN=图案
+PATTERN=图案
+
+EMBROIDERY=刺绣
+BEADING=钉珠
+PEARL=珍珠
+RIVET=铆钉
+BUTTON=纽扣
+BELT=腰带
+CORSAGE=胸花
+ZIPPER=拉链
+POCKET=口袋