管理员系统优化-1

管理员系统优化
to prod
2024-11-06 17:51:51 +08:00 · 2024-11-06 17:27:16 +08:00 · 2024-11-04 10:49:29 +08:00 · 2024-11-04 10:42:35 +08:00 · 2024-10-29 16:53:17 +08:00 · 2024-10-29 10:33:48 +08:00
387 changed files with 9189 additions and 4627 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,18 @@
            <artifactId>gson</artifactId>
            <version>2.10.1</version>
        </dependency>
+
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
    </dependencies>

    <build>
--- a/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
@@ -14,6 +14,7 @@ import org.apache.tomcat.jni.Time;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

@@ -30,6 +31,9 @@ public class GenerateConsumer {
    @Resource
    private GenerateService generateService;

+    @Autowired
+    private RabbitMQProperties rabbitMQProperties;
+
    @Resource
    private RedisUtil redisUtil;

@@ -243,73 +247,73 @@ public class GenerateConsumer {
        log.info("============ProcessRelightResult End listening==========");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer1(Message msg, Channel channel) {
        generate(msg, channel, "consumer 1");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer2(Message msg, Channel channel) {
        generate(msg, channel, "consumer 2");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer3(Message msg, Channel channel) {
        generate(msg, channel, "consumer 3");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer4(Message msg, Channel channel) {
        generate(msg, channel, "consumer 4");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer5(Message msg, Channel channel) {
        generate(msg, channel, "consumer 5");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer6(Message msg, Channel channel) {
        generate(msg, channel, "consumer 6");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer7(Message msg, Channel channel) {
        generate(msg, channel, "consumer 7");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer8(Message msg, Channel channel) {
        generate(msg, channel, "consumer 8");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generate}")
    @RabbitHandler
    public void generateConsumer9(Message msg, Channel channel) {
        generate(msg, channel, "consumer 9");
    }

-    @RabbitListener(queues = MQConfig.GENERATE_RESULT_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.generateResult}")
    @RabbitHandler
    public void getGenerateResult(Message msg, Channel channel) {
        processGenerateResult(msg, channel);
    }

-    @RabbitListener(queues = MQConfig.TO_PRODUCT_IMAGE_RESULT_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.toProductImageResult}")
    @RabbitHandler
    public void getToProductImageResult(Message msg, Channel channel) {
        processToProductImageResult(msg, channel);
    }

-    @RabbitListener(queues = MQConfig.RELIGHT_RESULT_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.relightResult}")
    @RabbitHandler
    public void getRelightResult(Message msg, Channel channel) {
        processRelightResult(msg, channel);
--- a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
@@ -1,66 +1,43 @@
 package com.ai.da.common.RabbitMQ;

 import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

@Configuration
 public class MQConfig {

-    public static final String GENERATE_EXCHANGE_FANOUT = "generate-exchange";
-    //    public static final String GENERATE_QUEUE = "generate-queue-prod";
-//    public static final String GENERATE_QUEUE = "generate-queue-test";
-//     ==================================================================
-//    public static final String GENERATE_QUEUE = "generate-queue-local";
-//    public static final String GENERATE_QUEUE = "generate-queue-dev";
-    public static final String GENERATE_QUEUE = "generate-queue-prod";
-//
-//    public static final String SR_QUEUE = "SR-queue-local";
-//    public static final String SR_QUEUE = "SR-queue-dev";
-        public static final String SR_QUEUE = "SR-queue-prod";
-//
-//        public static final String SR_RESULT_QUEUE = "SuperResolution-local";
-//        public static final String SR_RESULT_QUEUE = "SuperResolution-dev";
-    public static final String SR_RESULT_QUEUE = "SuperResolution-prod";
-//
-//    public static final String GENERATE_RESULT_QUEUE = "GenerateImage-local";
-    public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
+    @Autowired
+    private RabbitMQProperties rabbitMQProperties;

-    public static final String TO_PRODUCT_IMAGE_RESULT_QUEUE = "ToProductImage-prod";
-
-    public static final String RELIGHT_RESULT_QUEUE = "Relight-prod";
-    public MQConfig() {
-    }
-
-//    @Bean
-//    FanoutExchange fanoutRasaExchange() {
-//        return new FanoutExchange(GENERATE_EXCHANGE_FANOUT);
-//    }
-
-    /**
-     * 创建队列,使用工作模式，不用定义交换机
-     */
    @Bean
    public Queue generateQueue() {
-        return new Queue(GENERATE_QUEUE);
+        return new Queue(rabbitMQProperties.getQueues().getGenerate());
    }

    @Bean
    public Queue SRQueue() {
-        return new Queue(SR_QUEUE);
+        return new Queue(rabbitMQProperties.getQueues().getSr());
    }

    @Bean
    public Queue SRResultQueue() {
-        return new Queue(SR_RESULT_QUEUE);
+        return new Queue(rabbitMQProperties.getQueues().getSrResult());
    }

-    /**
-     * 将队列绑定到交换机上【队列订阅交换机】
-     */
-//    @Bean
-//    Binding bindingExchangeRasa() {
-//        return BindingBuilder.bind(queueRasa()).to(fanoutRasaExchange());
-//    }
+    @Bean
+    public Queue generateResultQueue() {
+        return new Queue(rabbitMQProperties.getQueues().getGenerateResult());
+    }

+    @Bean
+    public Queue toProductImageResultQueue() {
+        return new Queue(rabbitMQProperties.getQueues().getToProductImageResult());
+    }
+
+    @Bean
+    public Queue relightResultQueue() {
+        return new Queue(rabbitMQProperties.getQueues().getRelightResult());
+    }
 }
--- a/src/main/java/com/ai/da/common/RabbitMQ/MQPublisher.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/MQPublisher.java
@@ -2,6 +2,7 @@ package com.ai.da.common.RabbitMQ;

 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;

 import javax.annotation.Resource;
@@ -10,19 +11,19 @@ import javax.annotation.Resource;
@Component
 public class MQPublisher {

-//    private final String url = "http://localhost:15672/api/queues/%2f/generate-queue";
+    @Autowired
+    private RabbitMQProperties rabbitMQProperties;

-    @Resource
+    @Autowired
    private AmqpTemplate amqpTemplate;

    public void sendGenerateMessage(String mm) {
-        log.info("send message:" + mm);
-        amqpTemplate.convertAndSend(MQConfig.GENERATE_QUEUE, mm);
+        log.info("send message: " + mm);
+        amqpTemplate.convertAndSend(rabbitMQProperties.getQueues().getGenerate(), mm);
    }

    public void sendSRMessage(String mm) {
-        log.info("send message:" + mm);
-        amqpTemplate.convertAndSend(MQConfig.SR_QUEUE, mm);
+        log.info("send message: " + mm);
+        amqpTemplate.convertAndSend(rabbitMQProperties.getQueues().getSr(), mm);
    }
-
 }
--- a/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/RabbitMQProperties.java
@@ -0,0 +1,30 @@
+package com.ai.da.common.RabbitMQ;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "rabbitmq")
+@Data
+public class RabbitMQProperties {
+
+    private Queues queues;
+    private Exchange exchange;
+
+    @Data
+    public static class Queues {
+        private String generate;
+        private String sr;
+        private String srResult;
+        private String generateResult;
+        private String toProductImageResult;
+        private String relightResult;
+    }
+
+    @Data
+    public static class Exchange {
+        private String generate;
+    }
+}
+
--- a/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
+++ b/src/main/java/com/ai/da/common/RabbitMQ/SRConsumer.java
@@ -15,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

@@ -27,6 +28,9 @@ import java.util.HashMap;
@Component
 public class SRConsumer {

+    @Autowired
+    private RabbitMQProperties rabbitMQProperties;
+
    @Resource
    private RedisUtil redisUtil;

@@ -218,14 +222,13 @@ public class SRConsumer {
        taskListService.updateTaskStatusOrOutputRedis(uniqueId, "fail", null);
    }

-    @RabbitListener(queues = MQConfig.SR_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.sr}")
    @RabbitHandler
    public void SRConsumer1(Message msg, Channel channel) {
        superResolution(msg, channel, "consumer 1");
    }

-
-    @RabbitListener(queues = MQConfig.SR_RESULT_QUEUE)
+    @RabbitListener(queues = "#{rabbitMQProperties.queues.srResult}")
    @RabbitHandler
    public void SRResultConsumer1(Message msg, Channel channel) {
        getSRResult(msg, channel, "consumer 1");
--- a/src/main/java/com/ai/da/common/config/MyTaskScheduler.java
+++ b/src/main/java/com/ai/da/common/config/MyTaskScheduler.java
@@ -6,7 +6,9 @@ import com.ai.da.common.utils.SendEmailUtil;
 import com.ai.da.mapper.primary.*;
 import com.ai.da.mapper.primary.entity.*;
 import com.ai.da.mapper.secondary.AttributeRetrievalMapper;
+import com.ai.da.model.enums.StyleEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -31,7 +33,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-
+@Slf4j
@Component
 public class MyTaskScheduler {

@@ -83,7 +85,7 @@ public class MyTaskScheduler {
            }
        }
    }
-    @Scheduled(cron = "0 0 8 * * ?")
+    @Scheduled(cron = "0 0 9 * * ?")
    public void sendTrialOrderExcelToManagements() {
        // 获取前一天日期
        LocalDate yesterday = LocalDate.now().minusDays(1);
@@ -219,29 +221,47 @@ public class MyTaskScheduler {
    private AttributeRetrievalMapper attributeRetrievalMapper;

    public void addSystemFileStyle() {
-        ExecutorService executorService = Executors.newFixedThreadPool(5);
+//        ExecutorService executorService = Executors.newFixedThreadPool(5);

-        try {
-            String[] filePaths = {
-                    "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Blouse style output updated25.6.2024.xlsx",
-                    "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Dress style output updated25.6.2024.xlsx",
-                    "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Outerwear style output.xlsx",
-                    "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Skirt style output .xlsx",
-                    "C:\\Users\\10233\\Documents\\WeChat Files\\wxid_h7l9im0r8ql922\\FileStorage\\File\\2024-06\\style\\Trousers style output.xlsx"
-            };
+//        try {
+//            String[] filePaths = {
+//                    "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens bottom style output.xlsx",
+//                    "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens outer style output.xlsx",
+//                    "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens top style output.xlsx"
+////                    "/workspace/shb/Mens_bottom_style_output.xlsx",
+////                    "/workspace/shb/Mens_outer_style_output.xlsx",
+////                    "/workspace/shb/Mens_top_style_output.xlsx"
+//            };
+//
+//            for (String filePath : filePaths) {
+////                executorService.submit(() -> processExcelFile(filePath));
+//                processExcelFile(filePath);
+//            }
+//        }catch (Exception e) {
+//
+//        }
+//        } finally {
+//            executorService.shutdown();
+//            try {
+//                if (!executorService.awaitTermination(60, TimeUnit.MINUTES)) {
+//                    executorService.shutdownNow();
+//                }
+//            } catch (InterruptedException e) {
+//                executorService.shutdownNow();
+//            }
+//        }
+        String[] filePaths = {
+                "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens bottom style output.xlsx",
+                "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens outer style output.xlsx",
+                "C:\\Users\\10233\\Downloads\\OneDrive_1_2024-10-3\\Mens top style output.xlsx"
+//                    "/workspace/shb/Mens_bottom_style_output.xlsx",
+//                    "/workspace/shb/Mens_outer_style_output.xlsx",
+//                    "/workspace/shb/Mens_top_style_output.xlsx"
+        };

-            for (String filePath : filePaths) {
-                executorService.submit(() -> processExcelFile(filePath));
-            }
-        } finally {
-            executorService.shutdown();
-            try {
-                if (!executorService.awaitTermination(60, TimeUnit.MINUTES)) {
-                    executorService.shutdownNow();
-                }
-            } catch (InterruptedException e) {
-                executorService.shutdownNow();
-            }
+        for (String filePath : filePaths) {
+//                executorService.submit(() -> processExcelFile(filePath));
+            processExcelFile(filePath);
        }
    }

@@ -263,6 +283,37 @@ public class MyTaskScheduler {
                        attributeRetrievalMapper.updateStyleByFileName("X", prefix + fileName, tableName);
                        System.out.println(fileName);
                    } else {
+//                        if (style.equals("Y2K 风")) {
+//                            StyleEnum.COUNTRY_STYLE
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }else if (style.equals("")) {
+//
+//                        }
                        attributeRetrievalMapper.updateStyleByFileName(style, prefix + fileName, tableName);
                        System.out.println(fileName);
                    }
@@ -284,6 +335,12 @@ public class MyTaskScheduler {
            return "female_skirt";
        } else if (filePath.contains("Trousers")) {
            return "female_pants";
+        } else if (filePath.contains("bottom")) {
+            return "male_bottom";
+        } else if (filePath.contains("outer")) {
+            return "male_outwear";
+        } else if (filePath.contains("top")) {
+            return "male_top";
        }
        return "";
    }
@@ -299,6 +356,12 @@ public class MyTaskScheduler {
            return "skirt/";
        } else if (filePath.contains("Trousers")) {
            return "trousers/";
+        } else if (filePath.contains("bottom")) {
+            return "bottom/";
+        } else if (filePath.contains("outer")) {
+            return "outer/";
+        } else if (filePath.contains("top")) {
+            return "top/";
        }
        return "";
    }
--- a/src/main/java/com/ai/da/common/constant/CommonConstant.java
+++ b/src/main/java/com/ai/da/common/constant/CommonConstant.java
@@ -1,5 +1,8 @@
 package com.ai.da.common.constant;

+import java.util.Arrays;
+import java.util.List;
+
 public class CommonConstant {
    // 单位 秒  10分钟过期
 //    public static final Long TASK_EXPIRE_TIME =  24 * 60 * 60L;
@@ -31,6 +34,46 @@ public class CommonConstant {

    public static final String PYTHON_PORT_9997 = "9997";

+    public static final List<String> AGES_EN = Arrays.asList("Below 20", "20-30", "30-40", "40+");
+
+    public static final List<String> AGES_CN = Arrays.asList("20岁以下", "20-30岁", "30-40岁", "40+岁");
+    public static final List<String> IF_HELPFUL_EN = Arrays.asList("Easy to learn and use", "Easy to get trend information",
+            "Lots of creative design proposals","The AIGC functions for moodboard is helpful","The AIGC functions for design sketches is helpful",
+            "Easy to select the right color","The Chatbot function is helpful","The print position function is helpful",
+            "The drawing function is helpful","The export function is useful","Easy to edit the design","Others");
+
+    public static final List<String> IF_HELPFUL_CN = Arrays.asList("易于学习和使用", "容易获取趋势信息",
+            "提供大量创意设计方案","AIGC功能对灵感板有帮助","AIGC功能对设计草图有帮助",
+            "容易选择合适的颜色","聊天机器人功能有帮助","打印位置功能有帮助",
+            "绘图功能有帮助","导出功能有用","设计编辑简单","其他");
+
+    public static final List<String> IF_IMPROVE_EN = Arrays.asList("Proposed designs are boring, need more interesting designs",
+            "Difficult to make changes on design","Only 2D output, no 3D results","Difficult to apply keywords for AIGC generation",
+            "Clothing is not in the right proportion","Not compatible with pattern making solutions","Improved user interface for better navigation",
+            "Lack of responsive customer support","Insufficient tutorial or guidance for new users","Limited personalization options for designs","Others");
+
+    public static final List<String> IF_IMPROVE_CN = Arrays.asList("提供的设计很无聊，需要更多有趣的设计",
+            "设计修改困难","只有2D输出，没有3D结果","难以选择合适的关键词应用于AIGC生成",
+            "服装比例不正确","与打版解决方案不兼容","改进用户界面以便更好导航",
+            "客户支持响应不及时","对新用户的教程或指导不足","设计个性化选项有限","其他");
+
+    public static final List<String> IS_SUBSCRIBE = Arrays.asList("yes", "no");
+
+//    public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.jpg";
+    public static final String DEFAULT_AVATAR = "aida-users/87/avatar/default.png";
+
+    /* 截止至2024/08/26，在Code-Create DB中pmr_users表中最大的用户id */
+    public static final Long MAXIMUM_USER_ID = 704L;
+//    public static final Long MAXIMUM_USER_ID = 225L;
+
+    // 激活更改邮箱 链接有效期 毫秒 3天
+    public static final Long CHANGE_MAILBOX_LINK_VALIDITY = 259200000L;
+
+    public static final String RCA_WORKSHOP_TAG = "#RCAworkshop_2024";
+
+    public static final String PORTFOLIO_DELETED_EN = "Portfolio has been deleted";
+
+    public static final String PORTFOLIO_DELETED_CN = "作品已删除";


 }
--- a/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java
+++ b/src/main/java/com/ai/da/common/enums/AuthenticationOperationTypeEnum.java
@@ -23,7 +23,11 @@ public enum AuthenticationOperationTypeEnum {
    /**
     * 忘记密码
     */
-    FORGET_PWD;
+    FORGET_PWD,
+    /**
+     * 更改邮箱
+     */
+    CHANGE_MAILBOX;

    public static AuthenticationOperationTypeEnum of(String name) {
        return Stream.of(AuthenticationOperationTypeEnum.values()).filter(v -> v.name().equals(name)).findFirst().orElse(null);
--- a/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java
+++ b/src/main/java/com/ai/da/common/enums/CreditsEventsEnum.java
@@ -31,6 +31,7 @@ public enum CreditsEventsEnum {
    TO_PRODUCT_IMAGE("ToProductImage","5"),
    RELIGHT("Relight","5"),
    QUESTIONNAIRE("Questionnaire","100"),
+    IMAGE_TO_SKETCH("ImageToSketch","5"),

    OTHER("Other","5");

--- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
+++ b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
@@ -1,133 +1,134 @@
-package com.ai.da.common.security.filter;
-
-import cn.hutool.core.util.StrUtil;
-import com.ai.da.common.context.UserContext;
-import com.ai.da.common.security.config.SecurityProperties;
-import com.ai.da.common.security.jwt.JWTTokenHelper;
-import com.ai.da.common.utils.LocalCacheUtils;
-import com.ai.da.common.utils.MultiReadHttpServletRequest;
-import com.ai.da.common.utils.MultiReadHttpServletResponse;
-import com.ai.da.common.utils.RequestInfoUtil;
-import com.ai.da.model.vo.AuthPrincipalVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.lang.NonNull;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.util.StopWatch;
-import org.springframework.util.StringUtils;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import javax.annotation.Resource;
-import javax.security.sasl.AuthenticationException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author: dangweijian
- * @description: 认证拦截器
- * @create: 2020-07-10 16:50
- **/
-@Slf4j
-@Configuration
-public class AuthenticationFilter extends OncePerRequestFilter {
-
-    @Resource
-    private JWTTokenHelper jwtTokenHelper;
-    @Resource
-    private SecurityProperties properties;
-
-    private static final List<String> FILTER_URL =
-            Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
-                    "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd",
-                    "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
-                    "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
-                    "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew",
-                    "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
-                    "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
-                    "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
-                    "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify"
-            );
-
-    @Override
-    protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
-        String requestURI = httpServletRequest.getRequestURI();
-
-        if (calculateUrl(requestURI) || hasAuthorizationToken(httpServletRequest)) {
-            StopWatch stopWatch = new StopWatch();
-            HttpServletRequest wrappedRequest = httpServletRequest;
-            HttpServletResponse wrappedResponse = httpServletResponse;
-            try {
-                stopWatch.start();
-                if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) {
-                    extracted(wrappedRequest);
-                    filterChain.doFilter(wrappedRequest, wrappedResponse);
-                } else {
-                    wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest);
-                    wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse);
-                    extracted(wrappedRequest);
-                    filterChain.doFilter(wrappedRequest, wrappedResponse);
-                }
-            } catch (Exception e) {
-                SecurityContextHolder.clearContext();
-                throw e;
-            } finally {
-                stopWatch.stop();
-            }
-        } else {
-            filterChain.doFilter(httpServletRequest, httpServletResponse);
-        }
-    }
-
-    private Boolean calculateUrl(String requestURI) {
-        String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
-        return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    private boolean hasAuthorizationToken(HttpServletRequest request) {
-        String authorizationHeader = request.getHeader("Authorization");
-        return authorizationHeader != null && authorizationHeader.startsWith("Bearer");
-    }
-
-    private void extracted(HttpServletRequest request) throws AuthenticationException {
-        String jwtToken = request.getHeader(properties.getJwtTokenHeader());
-//        log.debug("后台检查令牌:{}", jwtToken);
-
-        if (StrUtil.isBlank(jwtToken)) {
-            String ipAddress = RequestInfoUtil.getIpAddress(request);
-            log.info("本次请求的ip为 ： " + ipAddress);
-            throw new RuntimeException("请传入token！");
-        }
-        if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
-            //写死 暂时放行
-            return;
-        }
-        // 检查token
-        boolean validate = jwtTokenHelper.validateToken(jwtToken);
-        if (validate) {
-            AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken);
-            if (principal == null) {
-                throw new RuntimeException("TOKEN已过期，请重新登录！");
-            }
-            //先清空当前线程变量,防止上一个线程遗留
-            UserContext.delete();
-            //存取用户信息到缓存
-            UserContext.setUserHolder(principal);
-            //校验token
-            String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
-
-            if(StringUtils.isEmpty(cacheToken)){
-                throw new RuntimeException("TOKEN已过期，请重新登录！");
-            }
-            if(!cacheToken.equals(jwtToken) ){
-                throw new RuntimeException("TOKEN已过期，请重新登录！");
-            }
-//                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(null, null);
-//                SecurityContextHolder.getContext().setAuthentication(authentication);
-        }
-    }
-}
+package com.ai.da.common.security.filter;
+
+import cn.hutool.core.util.StrUtil;
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.security.config.SecurityProperties;
+import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.common.utils.LocalCacheUtils;
+import com.ai.da.common.utils.MultiReadHttpServletRequest;
+import com.ai.da.common.utils.MultiReadHttpServletResponse;
+import com.ai.da.common.utils.RequestInfoUtil;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.lang.NonNull;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.StopWatch;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.annotation.Resource;
+import javax.security.sasl.AuthenticationException;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author: dangweijian
+ * @description: 认证拦截器
+ * @create: 2020-07-10 16:50
+ **/
+@Slf4j
+@Configuration
+public class AuthenticationFilter extends OncePerRequestFilter {
+
+    @Resource
+    private JWTTokenHelper jwtTokenHelper;
+    @Resource
+    private SecurityProperties properties;
+
+    private static final List<String> FILTER_URL =
+            Arrays.asList("/favicon.ico", "/doc.html", "api/account/login", "api/account/preLogin", "api/account/sendEmail","api/account/noLoginRequired",
+                    "/webjars/", "/swagger-resources", "/v2/api-docs", "api/account/resetPwd",
+                    "/api/python/saveGeneratePicture", "/api/python/getLibraryByUserId",
+                    "/api/third/party/addUser","/api/third/party/addTrialUser", "/api/third/party/editUser", "/api/element/initDefaultSysFile",
+                    "/api/third/party/addNoLoginRequiredNew","/api/third/party/deleteNoLoginRequiredNew","/api/third/party/updateNoLoginRequiredNew",
+                    "/api/third/party/existNoLoginRequired","/api/third/party/getRedirectUrl",
+                    "/api/python/flush","/api/account/healthy","/api/ali-pay/trade/notify","/api/paypal/ipn/back","/api/alipay-hk/trade/notify",
+                    "/api/portfolio/page", "/api/portfolio/detail", "/api/portfolio/commentPage", "/api/portfolio/viewsIncrease",
+                    "/api/account/designWorksRegister","/api/account/questionnaire","/api/stripe/trade/notify",
+                    "/notification","/api/account/activateNewEmail"
+            );
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest httpServletRequest, @NonNull HttpServletResponse httpServletResponse, @NonNull FilterChain filterChain) throws ServletException, IOException {
+        String requestURI = httpServletRequest.getRequestURI();
+
+        if (calculateUrl(requestURI) || hasAuthorizationToken(httpServletRequest)) {
+            StopWatch stopWatch = new StopWatch();
+            HttpServletRequest wrappedRequest = httpServletRequest;
+            HttpServletResponse wrappedResponse = httpServletResponse;
+            try {
+                stopWatch.start();
+                if ((httpServletRequest.getContentType() == null && httpServletRequest.getContentLength() > 0) || (httpServletRequest.getContentType() != null && !httpServletRequest.getContentType().contains("application/json"))) {
+                    extracted(wrappedRequest);
+                    filterChain.doFilter(wrappedRequest, wrappedResponse);
+                } else {
+                    wrappedRequest = new MultiReadHttpServletRequest(httpServletRequest);
+                    wrappedResponse = new MultiReadHttpServletResponse(httpServletResponse);
+                    extracted(wrappedRequest);
+                    filterChain.doFilter(wrappedRequest, wrappedResponse);
+                }
+            } catch (Exception e) {
+                SecurityContextHolder.clearContext();
+                throw e;
+            } finally {
+                stopWatch.stop();
+            }
+        } else {
+            filterChain.doFilter(httpServletRequest, httpServletResponse);
+        }
+    }
+
+    private Boolean calculateUrl(String requestURI) {
+        String filterUrl = FILTER_URL.stream().filter(url -> requestURI.contains(url)).findFirst().orElse(null);
+        return null == filterUrl ? Boolean.TRUE : Boolean.FALSE;
+    }
+
+    private boolean hasAuthorizationToken(HttpServletRequest request) {
+        String authorizationHeader = request.getHeader("Authorization");
+        return authorizationHeader != null && authorizationHeader.startsWith("Bearer");
+    }
+
+    private void extracted(HttpServletRequest request) throws AuthenticationException {
+        String jwtToken = request.getHeader(properties.getJwtTokenHeader());
+//        log.debug("后台检查令牌:{}", jwtToken);
+
+        if (StrUtil.isBlank(jwtToken)) {
+            String ipAddress = RequestInfoUtil.getIpAddress(request);
+            log.info("本次请求的ip为 ： " + ipAddress);
+            throw new RuntimeException("请传入token！");
+        }
+        if(jwtToken.equals("Bearer-eyJhbGciOiJIUzUxMiJ9.eyJqdGkiOiIyIiwic3ViIjoie1wiaWRcIjoyLFwidXNlcm5hbWVcIjpcImxpcnNcIn0iLCJpYXQiOjE2NjU3NDEwODcsImlzcyI6IkRXSiIsImF1dGhvcml0aWVzIjoiW10iLCJleHAiOjE2NzQzODEwODd9.ShM9R_NNFD7oo1OvxrEgg7PFeWinOuAKkuInUCMQupp66s64Hhv8tN0Wwr83nIN4rHPqtn95wmd4msWcvaFYJA")){
+            //写死 暂时放行
+            return;
+        }
+        // 检查token
+        boolean validate = jwtTokenHelper.validateToken(jwtToken);
+        if (validate) {
+            AuthPrincipalVo principal = jwtTokenHelper.parserToUser(jwtToken);
+            if (principal == null) {
+                throw new RuntimeException("TOKEN已过期，请重新登录！");
+            }
+            //先清空当前线程变量,防止上一个线程遗留
+            UserContext.delete();
+            //存取用户信息到缓存
+            UserContext.setUserHolder(principal);
+            //校验token
+            String cacheToken = LocalCacheUtils.getTokenCache(String.valueOf(principal.getId()));
+
+            if(StringUtils.isEmpty(cacheToken)){
+                throw new RuntimeException("TOKEN已过期，请重新登录！");
+            }
+            if(!cacheToken.equals(jwtToken) ){
+                throw new RuntimeException("TOKEN已过期，请重新登录！");
+            }
+//                UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(null, null);
+//                SecurityContextHolder.getContext().setAuthentication(authentication);
+        }
+    }
+}
--- a/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java
+++ b/src/main/java/com/ai/da/common/security/jwt/JWTTokenHelper.java
@@ -2,6 +2,7 @@ package com.ai.da.common.security.jwt;

 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ai.da.common.constant.CommonConstant;
 import com.ai.da.common.security.config.SecurityProperties;
 import com.ai.da.model.vo.AuthPrincipalVo;
 import com.alibaba.fastjson.JSON;
@@ -30,6 +31,7 @@ public class JWTTokenHelper {

    private static final String ISSUER = "DWJ";
    private static final String AUTHORITIES = "authorities";
+    private static final String CHANGE_MAILBOX = "changeMailbox";

    public String createToken(AuthPrincipalVo principal) {
        String token = Jwts.builder()
@@ -65,4 +67,21 @@ public class JWTTokenHelper {
        token = token.replaceAll(securityProperties.getJwtTokenPrefix(), "");
        return Jwts.parser().setSigningKey(securityProperties.getJwtSecret()).parseClaimsJws(token).getBody();
    }
+
+    public String createToken(Long userId, String userEmail){
+        String token = Jwts.builder()
+                .setId(String.valueOf(userId))
+                .setSubject(userEmail + "_" + userId)
+                .setIssuedAt(new Date())
+                .setIssuer(ISSUER)
+                .claim(CHANGE_MAILBOX, JSON.toJSONString(new ArrayList<>()))//自定义属性  权限
+                .setExpiration(new Date(System.currentTimeMillis() + CommonConstant.CHANGE_MAILBOX_LINK_VALIDITY))
+                .signWith(SignatureAlgorithm.HS256, securityProperties.getJwtSecret())
+                .compact();
+        return token;
+    }
+
+    public String parseToEmailAndId(String token) {
+        return parser(token).getSubject();
+    }
 }
--- a/src/main/java/com/ai/da/common/task/AccountTask.java
+++ b/src/main/java/com/ai/da/common/task/AccountTask.java
@@ -1,11 +1,13 @@
 package com.ai.da.common.task;

+import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.service.AccountService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;

 import javax.annotation.Resource;
+import java.util.List;

@Component
@Slf4j
@@ -14,18 +16,55 @@ public class AccountTask {
    @Resource
    private AccountService accountService;

-    /** 每周日晚上刷新 年付用户、月付用户的积分 */
+    /**
+     * 每周日晚上刷新 年付用户、月付用户的积分
+     */
    @Scheduled(cron = "59 59 23 ? * SUN")
 //    @Scheduled(cron = "59 59 23 * * ?")
-    public void refreshCreditsMonthly(){
+    public void refreshCreditsMonthly() {
        log.info("每周日晚11：59：59刷新付费用户积分为 6000");
        accountService.refreshCreditsWeekly();
    }

-    // todo 多久执行一次？
    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
-    public void getPaidUser(){
+    public void getPaidUser() {
        // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
        accountService.extendValidityForCC();
    }
+
+    // 每天凌晨0点执行一次
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void cancelActivityBenefits() {
+        // 1、查询当前所有参与了活动且过期的用户
+        List<Account> accountList = accountService.getExpiredUserBySystemUser(4);
+
+        // 2、将到期用户置为游客
+        for (Account account : accountList) {
+            log.info("参与活动的用户{} : {} 于 {} 账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime());
+            accountService.toVisitor(account);
+        }
+    }
+
+    // 每天检测正式用户到期情况，每天凌晨0点执行
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void paidUserToVisitor() {
+        // 1、查询当前已过期正式用户或试用用户
+        List<Account> accountList = accountService.getExpiredUserBySystemUser(1);
+        accountList.addAll(accountService.getExpiredUserBySystemUser(2));
+        accountList.addAll(accountService.getExpiredUserBySystemUser(3));
+
+        // 2、将到期用户置为游客
+        for (Account account : accountList) {
+            log.info("用户{} : {} 于 {}账号有效期到期，置为游客", account.getId(), account.getUserEmail(), account.getValidEndTime());
+            accountService.toVisitor(account);
+        }
+    }
+
+    /**
+     * 将Code-Create上注册的用户添加为AiDA的游客
+     */
+    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    public void registerUserToVisitor() {
+        accountService.registerUserToVisitor();
+    }
 }
--- a/src/main/java/com/ai/da/common/task/MoveDataScheduler.java
+++ b/src/main/java/com/ai/da/common/task/MoveDataScheduler.java
@@ -0,0 +1,216 @@
+//package com.ai.da.common.task;
+//
+//import com.ai.da.common.utils.CopyUtil;
+//import com.ai.da.common.utils.ExcelReader;
+//import com.ai.da.common.utils.MinioUtil;
+//import com.ai.da.common.utils.SendEmailUtil;
+//import com.ai.da.mapper.primary.*;
+//import com.ai.da.mapper.primary.entity.*;
+//import com.ai.da.mapper.secondary.AttributeRetrievalMapper;
+//import com.ai.da.mapper.third.*;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.poi.ss.usermodel.Row;
+//import org.apache.poi.ss.usermodel.Sheet;
+//import org.apache.poi.ss.usermodel.Workbook;
+//import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+//import org.springframework.stereotype.Component;
+//import org.springframework.util.CollectionUtils;
+//
+//import javax.annotation.PostConstruct;
+//import javax.annotation.Resource;
+//import java.io.FileOutputStream;
+//import java.io.IOException;
+//import java.nio.file.Files;
+//import java.nio.file.Paths;
+//import java.time.LocalDate;
+//import java.time.format.DateTimeFormatter;
+//import java.util.List;
+//import java.util.concurrent.ExecutorService;
+//import java.util.concurrent.Executors;
+//import java.util.concurrent.TimeUnit;
+//import java.util.stream.Collectors;
+//
+//@Component
+//public class MoveDataScheduler {
+//
+//    @PostConstruct
+//    public void test() {
+//        moveData();
+//    }
+//
+//    @Resource
+//    private UserLikeGroupMapper userLikeGroupMapper;
+//    @Resource
+//    private UserLikeGroupZSMapper userLikeGroupZSMapper;
+//    @Resource
+//    private UserLikeMapper userLikeMapper;
+//    @Resource
+//    private UserLikeZSMapper userLikeZSMapper;
+//    @Resource
+//    private CollectionElementMapper collectionElementMapper;
+//    @Resource
+//    private CollectionElementZSMapper collectionElementZSMapper;
+//
+//    @Resource
+//    private CollectionMapper collectionMapper;
+//
+//    @Resource
+//    private CollectionZSMapper collectionZSMapper;
+//
+//    @Resource
+//    private DesignMapper designMapper;
+//
+//    @Resource
+//    private DesignZSMapper designZSMapper;
+//
+//    @Resource
+//    private DesignItemMapper designItemMapper;
+//
+//    @Resource
+//    private DesignItemZSMapper designItemZSMapper;
+//
+//    @Resource
+//    private TDesignPythonOutfitMapper designPythonOutfitMapper;
+//
+//    @Resource
+//    private TDesignPythonOutfitZSMapper designPythonOutfitZSMapper;
+//
+//    @Resource
+//    private TDesignPythonOutfitDetailMapper designPythonOutfitDetailMapper;
+//
+//    @Resource
+//    private TDesignPythonOutfitDetailZSMapper designPythonOutfitDetailZSMapper;
+//
+//    @Resource
+//    private DesignItemDetailMapper designItemDetailMapper;
+//    @Resource
+//    private DesignItemZSDetailMapper designItemDetailZSMapper;
+//
+//    @Resource
+//    private DesignItemDetailPrintMapper designItemDetailPrintMapper;
+//
+//    @Resource
+//    private DesignItemDetailPrintZSMapper designItemDetailPrintZSMapper;
+//
+//
+//    private void moveData() {
+//        // 查询用户所有history记录
+//        QueryWrapper<UserLikeGroup> userLikeGroupQueryWrapper = new QueryWrapper<>();
+//        userLikeGroupQueryWrapper.lambda().eq(UserLikeGroup::getAccountId, 11411);
+//        List<UserLikeGroup> userLikeGroupList = userLikeGroupMapper.selectList(userLikeGroupQueryWrapper);
+//
+//        for (UserLikeGroup userLikeGroup : userLikeGroupList) {
+//
+//            com.ai.da.mapper.third.entity.UserLikeGroup userLikeGroupZS = CopyUtil.copyObject(userLikeGroup, com.ai.da.mapper.third.entity.UserLikeGroup.class);
+//            userLikeGroupZS.setAccountId(11420L);
+//            userLikeGroupZS.setId(null);
+//            Collection collection = collectionMapper.selectById(userLikeGroup.getCollectionId());
+//            com.ai.da.mapper.third.entity.Collection collectionZS = CopyUtil.copyObject(collection, com.ai.da.mapper.third.entity.Collection.class);
+//            collectionZS.setAccountId(11420L);
+//            collectionZS.setId(null);
+//
+//            if (collection.getMoodTemplateId() != null) {
+//                CollectionElement element = collectionElementMapper.selectById(collection.getMoodTemplateId());
+//                com.ai.da.mapper.third.entity.CollectionElement collectionElementZS = CopyUtil.copyObject(element, com.ai.da.mapper.third.entity.CollectionElement.class);
+//                collectionElementZS.setAccountId(11420L);
+//                collectionElementZS.setId(null);
+//                collectionElementZSMapper.insert(collectionElementZS);
+//                collectionZS.setMoodTemplateId(String.valueOf(collectionElementZS.getId()));
+//            }
+//            collectionZSMapper.insert(collectionZS);
+//            userLikeGroupZS.setCollectionId(collectionZS.getId());
+//            userLikeGroupZSMapper.insert(userLikeGroupZS);
+//
+//            // 生成元素
+//            QueryWrapper<CollectionElement> collectionElementQueryWrapper = new QueryWrapper<>();
+//            collectionElementQueryWrapper.lambda().eq(CollectionElement::getCollectionId, userLikeGroup.getCollectionId());
+//            List<CollectionElement> collectionElements = collectionElementMapper.selectList(collectionElementQueryWrapper);
+//
+//            for (CollectionElement collectionElement : collectionElements) {
+//                com.ai.da.mapper.third.entity.CollectionElement collectionElementZS = CopyUtil.copyObject(collectionElement, com.ai.da.mapper.third.entity.CollectionElement.class);
+//                collectionElementZS.setId(null);
+//                collectionElementZS.setAccountId(11420L);
+//                collectionElementZS.setCollectionId(collectionZS.getId());
+//                collectionElementZSMapper.insert(collectionElementZS);
+//            }
+//
+//            // 查询记录关联
+//            QueryWrapper<UserLike> userLikeQueryWrapper = new QueryWrapper<>();
+//            userLikeQueryWrapper.lambda().eq(UserLike::getUserLikeGroupId, userLikeGroup.getId());
+//            List<UserLike> userLikes = userLikeMapper.selectList(userLikeQueryWrapper);
+//            for (UserLike userLike : userLikes) {
+//                Design design = designMapper.selectById(userLike.getDesignId());
+//                com.ai.da.mapper.third.entity.Design designZS = CopyUtil.copyObject(design, com.ai.da.mapper.third.entity.Design.class);
+//                designZS.setId(null);
+//                designZS.setAccountId(11420L);
+//                designZS.setCollectionId(collectionZS.getId());
+//                designZSMapper.insert(designZS);
+//
+//                com.ai.da.mapper.third.entity.UserLike userLikeZS = CopyUtil.copyObject(userLike, com.ai.da.mapper.third.entity.UserLike.class);
+////                Design design = designMapper.selectById(userLike.getDesignId());
+//                userLikeZS.setId(null);
+//                DesignItem designItem = designItemMapper.selectById(userLike.getDesignItemId());
+//                com.ai.da.mapper.third.entity.DesignItem designItemZS = CopyUtil.copyObject(designItem, com.ai.da.mapper.third.entity.DesignItem.class);
+//                designItemZS.setId(null);
+//                designItemZS.setAccountId(11420L);
+//                designItemZS.setDesignId(designZS.getId());
+//                designItemZSMapper.insert(designItemZS);
+//
+//                QueryWrapper<DesignItemDetail> designItemDetailQueryWrapper = new QueryWrapper<>();
+//                designItemDetailQueryWrapper.lambda().eq(DesignItemDetail::getDesignItemId, designItem.getId());
+//                List<DesignItemDetail> designItemDetails = designItemDetailMapper.selectList(designItemDetailQueryWrapper);
+//                for (DesignItemDetail designItemDetail : designItemDetails) {
+//                    com.ai.da.mapper.third.entity.DesignItemDetail designItemDetailZS = CopyUtil.copyObject(designItemDetail, com.ai.da.mapper.third.entity.DesignItemDetail.class);
+//                    designItemDetailZS.setId(null);
+//                    designItemDetailZS.setDesignItemId(designItemZS.getId());
+//                    designItemDetailZS.setAccountId(11420L);
+//                    designItemDetailZS.setDesignId(designZS.getId());
+//                    designItemDetailZSMapper.insert(designItemDetailZS);
+//
+//                    QueryWrapper<DesignItemDetailPrint> designItemDetailPrintQueryWrapper = new QueryWrapper<>();
+//                    designItemDetailPrintQueryWrapper.lambda().eq(DesignItemDetailPrint::getDesignItemDetailId, designItemDetail.getId());
+//                    List<DesignItemDetailPrint> designItemDetailPrintList = designItemDetailPrintMapper.selectList(designItemDetailPrintQueryWrapper);
+//                    if (!CollectionUtils.isEmpty(designItemDetailPrintList)) {
+//                        for (DesignItemDetailPrint designItemDetailPrint : designItemDetailPrintList) {
+//                            com.ai.da.mapper.third.entity.DesignItemDetailPrint designItemDetailPrintZS = CopyUtil.copyObject(designItemDetailPrint, com.ai.da.mapper.third.entity.DesignItemDetailPrint.class);
+//                            designItemDetailPrintZS.setId(null);
+//                            designItemDetailPrintZS.setDesignItemDetailId(designItemDetailZS.getId());
+//                            designItemDetailPrintZSMapper.insert(designItemDetailPrintZS);
+//                        }
+//                    }
+//                }
+//
+//                userLikeZS.setDesignItemId(designItemZS.getId());
+//                TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(userLike.getDesignOutfitId());
+//                com.ai.da.mapper.third.entity.TDesignPythonOutfit tDesignPythonOutfitZS = CopyUtil.copyObject(tDesignPythonOutfit, com.ai.da.mapper.third.entity.TDesignPythonOutfit.class);
+//                tDesignPythonOutfitZS.setId(null);
+//                tDesignPythonOutfitZS.setDesignItemId(designItemZS.getId());
+//                tDesignPythonOutfitZS.setCollectionId(collectionZS.getId());
+//                tDesignPythonOutfitZS.setUserId(11420L);
+//                tDesignPythonOutfitZS.setDesignId(designZS.getId());
+//                designPythonOutfitZSMapper.insert(tDesignPythonOutfitZS);
+//
+//                userLikeZS.setUserLikeGroupId(userLikeGroupZS.getId());
+//                userLikeZS.setDesignId(designZS.getId());
+//                userLikeZS.setDesignOutfitId(tDesignPythonOutfitZS.getId());
+//                userLikeZSMapper.insert(userLikeZS);
+//
+//                QueryWrapper<TDesignPythonOutfitDetail> designPythonOutfitDetailQueryWrapper = new QueryWrapper<>();
+//                designPythonOutfitDetailQueryWrapper.lambda().eq(TDesignPythonOutfitDetail::getDesignPythonOutfitId, tDesignPythonOutfit.getId());
+//                List<TDesignPythonOutfitDetail> tDesignPythonOutfitDetails = designPythonOutfitDetailMapper.selectList(designPythonOutfitDetailQueryWrapper);
+//                for (TDesignPythonOutfitDetail tDesignPythonOutfitDetail : tDesignPythonOutfitDetails) {
+//                    com.ai.da.mapper.third.entity.TDesignPythonOutfitDetail tDesignPythonOutfitDetailZS = CopyUtil.copyObject(tDesignPythonOutfitDetail, com.ai.da.mapper.third.entity.TDesignPythonOutfitDetail.class);
+//                    tDesignPythonOutfitDetailZS.setDesignPythonOutfitId(tDesignPythonOutfitZS.getId());
+//                    tDesignPythonOutfitDetailZS.setId(null);
+//                    tDesignPythonOutfitDetailZS.setDesignId(designZS.getId());
+//                    designPythonOutfitDetailZSMapper.insert(tDesignPythonOutfitDetailZS);
+//                }
+//            }
+//        }
+//
+//
+//    }
+//
+//
+//}
--- a/src/main/java/com/ai/da/common/utils/ExcelReader.java
+++ b/src/main/java/com/ai/da/common/utils/ExcelReader.java
@@ -1,6 +1,7 @@
 package com.ai.da.common.utils;

 import lombok.Data;
+import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -23,9 +24,28 @@ public class ExcelReader {
            for (int i = 0; i < numberOfColumns; i++) {
                List<String> columnData = new ArrayList<>();
                for (Row row : sheet) {
-                    columnData.add(row.getCell(i).getStringCellValue());
+                    Cell cell = row.getCell(i);
+                    if (cell != null) {
+                        switch (cell.getCellType()) {
+                            case STRING:
+                                columnData.add(cell.getStringCellValue());
+                                break;
+                            case NUMERIC:
+                                columnData.add(String.valueOf(cell.getNumericCellValue()));
+                                break;
+                            case BOOLEAN:
+                                columnData.add(String.valueOf(cell.getBooleanCellValue()));
+                                break;
+                            default:
+                                // 跳过空单元格或其他类型（比如错误类型）
+                                break;
+                        }
+                    }
+                }
+                // 只有当这一列有数据时，才添加到结果列表中
+                if (!columnData.isEmpty()) {
+                    data.add(columnData);
                }
-                data.add(columnData);
            }
        }
        return data;
--- a/src/main/java/com/ai/da/common/utils/RedisUtil.java
+++ b/src/main/java/com/ai/da/common/utils/RedisUtil.java
@@ -1,16 +1,14 @@
 package com.ai.da.common.utils;

 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;

@@ -154,6 +152,8 @@ public class RedisUtil {
        return redisTemplate.keys(key);
    }

+    public Long getSize(String key){return redisTemplate.opsForSet().size(key);}
+
    public List<String> getMultiValue(Set<String> keys){
        return redisTemplate.opsForValue().multiGet(keys);
    }
@@ -216,4 +216,66 @@ public class RedisUtil {
        return redisTemplate.opsForValue().increment(key, 0);
    }

+    public Long getViewCount(String key) {
+        Object value = redisTemplate.opsForValue().get(key);
+        if (value instanceof Integer) {
+            return Long.valueOf((Integer) value);
+        } else if (value instanceof Long) {
+            return (Long) value;
+        } else if (value instanceof String) {
+            return Long.valueOf((String) value);
+        } else {
+            throw new IllegalArgumentException("Unexpected value type");
+        }
+    }
+
+    public final static String PERSONAL_HOMEPAGE_VIEW_KEY = "PersonalHomepage:view:";
+
+    public void increasePersonalHomepageViewCount(Long accountId) {
+        String key = PERSONAL_HOMEPAGE_VIEW_KEY + accountId;
+        redisTemplate.opsForValue().increment(key);
+    }
+
+    public Long getPersonalHomepageViewCount(Long accountId) {
+        String key = PERSONAL_HOMEPAGE_VIEW_KEY + accountId;
+        return redisTemplate.opsForValue().increment(key, 0);
+    }
+
+    public final static String MOODBOARD_POSITION_KEY = "moodboard:position:";
+
+    public void saveMoodboardPosition(Long id, String moodboardPosition) {
+        addToString(MOODBOARD_POSITION_KEY + id, moodboardPosition);
+    }
+
+    public String getMoodboardPosition(Long id) {
+        return getFromString(MOODBOARD_POSITION_KEY + id);
+    }
+    public final static String NICKNAME_MODIFY_TIMES = "NicknameModifyTimes:";
+    public void increaseCount(String key) {
+        redisTemplate.opsForValue().increment(key);
+    }
+
+    public Long getIncrementCount(String key) {
+        return redisTemplate.opsForValue().increment(key, 0);
+    }
+
+    public void setKeyExpire(String key, Long expire) {
+        redisTemplate.expire(key, expire, TimeUnit.DAYS);
+    }
+
+    public final static String CHANGE_MAILBOX = "ChangeMailbox:";
+
+    // 每天允许通知3次
+    public final static String UPLOAD_TIMEOUT_REMINDER_COUNTER = "UploadTimeoutReminderCounter";
+
+    public void addProcessId(String processId, int progress) {
+        // Redis 中的键，可以通过 processId 来唯一标识
+        String redisKey = "process:progress:" + processId;
+
+        // 将当前进度存储到 Redis
+        redisTemplate.opsForValue().set(redisKey, String.valueOf(progress));
+
+        // 设置过期时间为 5 分钟（300 秒）
+        redisTemplate.expire(redisKey, 5, TimeUnit.MINUTES);
+    }
 }
--- a/src/main/java/com/ai/da/common/utils/S3Util.java
+++ b/src/main/java/com/ai/da/common/utils/S3Util.java
@@ -255,6 +255,22 @@ public class S3Util {
        }
    }

+    public String getPreSignedUrl(String path, int expiry, boolean resetCache) {
+        if (resetCache || LocalCacheUtils.getPresignedUrlCache(path) == null) {
+            if (!path.contains("/")) {
+                throw new BusinessException("The path is error!");
+            }
+            int index = path.indexOf("/");
+            String bucketName = path.substring(0, index);
+            String fileName = path.substring(index + 1);
+            String presignedUrl = getPreSignatureUrl(bucketName, fileName, expiry);
+            LocalCacheUtils.setPresignedUrlCache(path, presignedUrl);
+            return presignedUrl;
+        } else {
+            return LocalCacheUtils.getPresignedUrlCache(path);
+        }
+    }
+
    /**
     * @param keyName               key名称: test/2022/06/123.pdf
     * @param signatureDurationTime 有效期 单位：秒
--- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
+++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
@@ -53,6 +53,7 @@ public class SendEmailUtil {
     * 绑定邮箱
     */
    public static String BIND_MAILBOX_SUBJECT = "绑定邮箱";
+    public static String CHANGE_MAILBOX_SUBJECT = "Change Mailbox";
    /**
     * 登入模板id
     */
@@ -71,6 +72,8 @@ public class SendEmailUtil {
     */
    public static Long BIND_MAILBOX_TEMPLATE_ID = 45619L;

+    public static Long CHANGE_MAILBOX_TEMPLATE_ID = 128210L;
+

    public static Boolean send(String receiverAddress, String ip, Long templateId, String verifyCode) {
        try {
@@ -92,7 +95,8 @@ public class SendEmailUtil {
            req.setDestination(new String[]{receiverAddress});
            String subject = templateId == LOGIN_TEMPLATE_ID ? LOGIN_SUBJECT :
                    templateId == UPDATE_PWD_TEMPLATE_ID ? FORGET_PWD_SUBJECT :
-                            templateId == EXCEPTION_ID_TEMPLATE_ID ? EXCEPTION_ID_SUBJECT : BIND_MAILBOX_SUBJECT;
+                            templateId == EXCEPTION_ID_TEMPLATE_ID ? EXCEPTION_ID_SUBJECT :
+                                    templateId == CHANGE_MAILBOX_TEMPLATE_ID ? CHANGE_MAILBOX_SUBJECT : BIND_MAILBOX_SUBJECT;
            req.setSubject(subject);
            req.setTemplate(contractTemplate(templateId, verifyCode, ip));

@@ -385,20 +389,20 @@ public class SendEmailUtil {
            // 根据邮件类型设置不同的主题和模板
            String subject = "";
            Template template = new Template();
-//            if (type == 1) {
-//                subject = "Upcoming System Upgrade for AiDA 3.0";
-//                template.setTemplateID(UPGRADE_NOTIFICATION_ID);
-//            }else {
-//                subject = "即将到来的AiDA 3.0系统升级";
-//                template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE);
-//            }
            if (type == 1) {
-                subject = "Successful System Upgrade and New Features in AiDA 3.0";
-                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID);
+                subject = "Upcoming System Upgrade for AiDA 3.0";
+                template.setTemplateID(UPGRADE_NOTIFICATION_ID);
            }else {
-                subject = "系统升级成功和AiDA 3.0新功能";
-                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE);
+                subject = "即将到来的AiDA 3.0系统升级";
+                template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE);
            }
+//            if (type == 1) {
+//                subject = "Successful System Upgrade and New Features in AiDA 3.1";
+//                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID);
+//            }else {
+//                subject = "系统升级成功和AiDA 3.1新功能";
+//                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE);
+//            }
            template.setTemplateData(buildAccountData(account));

            req.setSubject(subject);
@@ -590,4 +594,177 @@ public class SendEmailUtil {
            throw new BusinessException("failed.to.send.mail");
        }
    }
+
+    private final static Long NEW_USER_REGISTER_NOTIFICATION_EN = 126919L;
+
+    public static void notificationForRegisterUser(String receiverAddress){
+        try{
+            // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
+            // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
+            // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            // 实例化一个http选项，可选的，没有特殊需求可以跳过
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            // 实例化一个client选项，可选的，没有特殊需求可以跳过
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            // 实例化要请求产品的client对象,clientProfile是可选的
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            // 实例化一个请求对象,每个接口都会对应一个request对象
+            SendEmailRequest req = new SendEmailRequest();
+            req.setFromEmailAddress(SEND_ADDRESS);
+            req.setDestination(new String[]{receiverAddress});
+
+            req.setSubject("Welcome to AiDa");
+            Template template = new Template();
+            template.setTemplateID(NEW_USER_REGISTER_NOTIFICATION_EN);
+            template.setTemplateData("{\"email\":\" " + receiverAddress + "\"}");
+            req.setTemplate(template);
+
+            // 返回的resp是一个SendEmailResponse的实例，与请求对象对应
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    private final static Long CHANGE_MAILBOX_CONFIRM_CN = 128278L;
+    private final static Long CHANGE_MAILBOX_CONFIRM_EN = 128277L;
+
+    public static void changeMailboxConfirm(String receiverAddress, String language, String name, String link){
+        try{
+            // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
+            // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
+            // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            // 实例化一个http选项，可选的，没有特殊需求可以跳过
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            // 实例化一个client选项，可选的，没有特殊需求可以跳过
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            // 实例化要请求产品的client对象,clientProfile是可选的
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            // 实例化一个请求对象,每个接口都会对应一个request对象
+            SendEmailRequest req = new SendEmailRequest();
+            req.setFromEmailAddress(SEND_ADDRESS);
+            req.setDestination(new String[]{receiverAddress});
+            Template template = new Template();
+            if (language.equals("ENGLISH")){
+                req.setSubject("Change the email address bound to the AiDA account");
+                template.setTemplateID(CHANGE_MAILBOX_CONFIRM_EN);
+            }else {
+                req.setSubject("更换AiDA账号绑定的邮箱地址");
+                template.setTemplateID(CHANGE_MAILBOX_CONFIRM_CN);
+            }
+            JSONObject param = new JSONObject();
+            param.put("userName", name);
+            param.put("link", link);
+
+            template.setTemplateData(param.toJSONString());
+            req.setTemplate(template);
+
+            // 返回的resp是一个SendEmailResponse的实例，与请求对象对应
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    private final static Long UPLOAD_TIMEOUT_REMINDER = 128324L;
+
+    public static void uploadTimeoutReminder(String userName, String time){
+        String xp = "xupei3360@163.com";
+        String shb = "shahaibodd99@gmail.com";
+        String wxd = "X1627315083@163.com";
+        String pkc = "kaicpang.pang@connect.polyu.hk";
+        try{
+            // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
+            // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
+            // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            // 实例化一个http选项，可选的，没有特殊需求可以跳过
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            // 实例化一个client选项，可选的，没有特殊需求可以跳过
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            // 实例化要请求产品的client对象,clientProfile是可选的
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            // 实例化一个请求对象,每个接口都会对应一个request对象
+            SendEmailRequest req = new SendEmailRequest();
+            req.setFromEmailAddress(SEND_ADDRESS);
+            req.setDestination(new String[]{shb, xp, wxd, pkc});
+            Template template = new Template();
+            req.setSubject("上传图片超时提醒");
+            template.setTemplateID(UPLOAD_TIMEOUT_REMINDER);
+            JSONObject param = new JSONObject();
+            param.put("userName", userName);
+            param.put("time", time);
+
+            template.setTemplateData(param.toJSONString());
+            req.setTemplate(template);
+
+            // 返回的resp是一个SendEmailResponse的实例，与请求对象对应
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
+
+    private final static Long HALFPRICEPROMOTION_CN_ID = 128582L;
+    private final static Long HALFPRICEPROMOTION_EN_ID = 128583L;
+    public static void halfPricePromotion(Account account, String senderAddress, int type) {
+        try {
+            // 实例化一个认证对象
+            Credential cred = new Credential(SECRET_ID, SECRET_KEy);
+            HttpProfile httpProfile = new HttpProfile();
+            httpProfile.setEndpoint("ses.tencentcloudapi.com");
+            ClientProfile clientProfile = new ClientProfile();
+            clientProfile.setHttpProfile(httpProfile);
+            SesClient client = new SesClient(cred, "ap-hongkong", clientProfile);
+            SendEmailRequest req = new SendEmailRequest();
+            if (StringUtils.isEmpty(senderAddress)) {
+                senderAddress = CODE_CREATE_SEND_ADDRESS;
+            }
+            req.setFromEmailAddress(senderAddress);
+            req.setDestination(new String[]{account.getUserEmail()});
+
+            // 根据邮件类型设置不同的主题和模板
+            String subject = "";
+            Template template = new Template();
+//            if (type == 1) {
+//                subject = "Upcoming System Upgrade for AiDA 3.0";
+//                template.setTemplateID(UPGRADE_NOTIFICATION_ID);
+//            }else {
+//                subject = "即将到来的AiDA 3.0系统升级";
+//                template.setTemplateID(UPGRADE_NOTIFICATION_ID_CHINESE);
+//            }
+            if (type == 1) {
+                subject = "AiDA workshop - Win a trip to Hong Kong！";
+                template.setTemplateID(HALFPRICEPROMOTION_EN_ID);
+            }else {
+                subject = "AiDA workshop - 赢取香港之旅";
+                template.setTemplateID(HALFPRICEPROMOTION_CN_ID);
+            }
+            template.setTemplateData(buildAccountData(account));
+
+            req.setSubject(subject);
+            req.setTemplate(template);
+
+            // 发送邮件
+            SendEmailResponse resp = client.SendEmail(req);
+            log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp));
+        } catch (TencentCloudSDKException e) {
+            log.info("邮件发送失败###{}", e.toString());
+            throw new BusinessException("failed.to.send.mail");
+        }
+    }
 }
--- a/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
+++ b/src/main/java/com/ai/da/common/websocket/NotificationConnection.java
@@ -0,0 +1,107 @@
+package com.ai.da.common.websocket;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.websocket.*;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+
+@ServerEndpoint(value = "/notification/{id}")
+@Component
+@Slf4j
+public class NotificationConnection {
+
+    static Map<String,Session> sessionMap = new ConcurrentHashMap<>();
+
+    private Session session;
+    // 这里用ConcurrentHashMap 因为他是一个线程安全的Map
+    private static ConcurrentHashMap<Long, NotificationConnection> websockets = new ConcurrentHashMap<>();
+    //连接建立时执行的操作
+    /*@OnOpen
+    public void onOpen(Session session){
+        sessionMap.put(session.getId(),session);
+        log.info("websocket is open, sessionId: {}",session.getId());
+    }*/
+
+    @OnOpen
+    public void onOpen(Session session, @PathParam("id") String id) {  // 接收到前端传来的用户ID
+        this.session = session;
+        websockets.put(Long.parseLong(id), this);  //将ID作为key，当前的对象作为Value
+        log.info("【建立连接】 用户为：{}", this.session);
+        log.info("【建立连接】 用户Id为：{}", id);
+        log.info("【建立连接】 总数为：{}", websockets.size());
+    }
+
+    @OnClose
+    public void onClose() {
+        websockets.remove(this); // 将当前的对象从集合中删除
+        log.info("【连接断开】 用户为：{}", this.session);
+//        log.info("【连接断开】 总数为：{}", websockets.size());
+    }
+
+    //收到了客户端消息执行的操作
+    @OnMessage
+    public void onMessage(String text){
+        log.info("收到了一条消息："+text);
+//        return "已收到你的消息";
+    }
+    /*//连接关闭的时候执行的操作
+    @OnClose
+    public void onClose(Session session){
+        sessionMap.remove(session.getId());
+        log.info("websocket is close, sessionId: {}",session.getId());
+    }
+
+    public void sendMsg(String message) throws IOException {
+        for(String key:sessionMap.keySet()){
+            sessionMap.get(key).getBasicRemote().sendText(message);
+        }
+    }*/
+
+    public void sendMsg(String message, Long userId) throws IOException {
+        if (userId == null) {  // 如果等于null则证明是群发
+            // 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
+            // 这个就是遍历这个集合的过程....
+            for (Map.Entry<Long, NotificationConnection> entry : websockets.entrySet()) {
+                // 获取每一个Entry实例
+                // 获取每一个Value，而这个Value就是WebSocket的实例
+                NotificationConnection webSocket = entry.getValue();
+                // 接下来就是遍历群发
+                log.info("广播消息 【给用户】 ：{}发送消息【{}】", webSocket, message);
+                webSocket.session.getBasicRemote().sendText(message); // 发送！！！！！！！！！
+            }
+        } else {  // 如果不是群发，则判断ID，其余步骤一致
+            // 获取当前Map的一个迭代器，遍历Map的方式有很多种，看着来
+            // 这个就是遍历这个集合的过程....
+            for (Map.Entry<Long, NotificationConnection> entry : websockets.entrySet()) {
+                // 获取每一个Entry实例
+                // 获取每一个Value，而这个Value就是WebSocket的实例
+                NotificationConnection webSocket = entry.getValue();
+                // 获取每一个Key，这个Key就是用户ID
+                Long key = entry.getKey();
+                // 判断用户ID与当前的Key相等
+                if (userId.equals(key)) {
+                    log.info("私发消息 【给用户】 ：{}发送消息【{}】", key, message); // 打印
+                    if (webSocket.session.isOpen()){
+                        // 避免因为网络问题或其他原因导致连接突然关闭而报错
+                        try {
+                            webSocket.session.getBasicRemote().sendText(message);  // 则发送给当前的用户即可
+                        } catch (IOException e) {
+                            log.error("Failed to send message to session {}: {}", webSocket.session.getId(), e.getMessage());
+                            // 这里可以选择移除关闭的 session
+                            websockets.remove(entry.getKey());
+                        }
+                    }else {
+                        log.info("连接已关闭，sessionId:{}, userId:{}", webSocket.session.getId(), key);
+                        websockets.remove(entry.getKey());
+                    }
+                }
+            }
+        }
+    }
+}
--- a/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
+++ b/src/main/java/com/ai/da/common/websocket/config/WebSocketConfig.java
@@ -0,0 +1,18 @@
+package com.ai.da.common.websocket.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+/**
+ * Configuration of WebSocket
+ *
+ * @author db1995
+ */
+@Configuration
+public class WebSocketConfig {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+}
--- a/src/main/java/com/ai/da/controller/AccountController.java
+++ b/src/main/java/com/ai/da/controller/AccountController.java
@@ -1,17 +1,21 @@
 package com.ai.da.controller;

+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.AccountLoginVO;
 import com.ai.da.model.vo.AccountPreLoginVO;
+import com.ai.da.model.vo.PersonalHomepageVO;
 import com.ai.da.service.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;

 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -177,4 +181,85 @@ public class AccountController {
    public Response<Boolean> questionnaire(@Valid @RequestBody String questionnaireInfo){
        return Response.success(accountService.collectQuestionnaires(questionnaireInfo));
    }
+
+    /**
+     * 参与活动 获取福利
+     * @return
+     */
+    @ApiOperation(value = "参与活动 获取福利")
+    @GetMapping("/activity")
+    public Response<String> getActivityBenefits(){
+        return Response.success(accountService.getActivityBenefits());
+    }
+
+    @ApiOperation(value = "将用户账号过期时间设置为过期当天的23：59：59")
+    @GetMapping("/setUserValidToDayEnd")
+    public Response<List<Long>> setUserValidToDayEnd(){
+        return Response.success(accountService.setUserValidToDayEnd());
+    }
+
+    // 用户上传头像
+    @ApiOperation(value = "上传头像")
+    @PostMapping(path = "/uploadAvatar")
+    public Response<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
+        if (null == file || StringUtils.isEmpty(file.getOriginalFilename())) {
+            throw new BusinessException("file.cannot.be.empty");
+        }
+        return Response.success(accountService.uploadAvatar(file));
+    }
+
+    @ApiOperation(value = "个人主页浏览量增加")
+    @GetMapping("/viewsIncrease")
+    public Response<Boolean> viewsGet(@RequestParam("id") Long id) {
+        return Response.success(accountService.viewsIncrease(id));
+    }
+
+    @ApiOperation(value = "获取个人主页信息")
+    @GetMapping("/personalHomepage")
+    public Response<PersonalHomepageVO> getPersonalHomepage(@RequestParam("id") Long id){
+        return Response.success(accountService.getPersonalHomepage(id));
+    }
+
+    @ApiOperation(value = "getUsernameModifyTimes")
+    @GetMapping("/getNicknameModifyTimes")
+    public Response<Map<String, Long>> getNicknameModifyTimes(){
+        return Response.success(accountService.getNicknameModifyTimes());
+    }
+
+    @ApiOperation(value = "editUserName")
+    @GetMapping("/editUserName")
+    public Response<String> editUserName(@RequestParam("newUserName") String newUserName){
+        accountService.editUserName(newUserName);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "verifyUserEmail")
+    @GetMapping("/verifyUserEmail")
+    public Response<String> verifyUserEmail(@RequestParam("verifyCode") String verifyCode){
+        accountService.verifyUserEmail(verifyCode);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "changeUserEmail")
+    @GetMapping("/changeUserEmail")
+    public Response<String> changeUserEmail(@RequestParam("newMailbox") String newMailbox){
+        accountService.changeUserEmail(newMailbox);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "activateNewEmail")
+    @GetMapping("/activateNewEmail")
+    public Response<String> activateNewEmail(@RequestParam("token") String token){
+        accountService.activateNewEmail(token);
+        return Response.success("success");
+    }
+
+    @PostMapping("halfPricePromotion")
+    @ApiOperation(value = "十月半价活动")
+    public Response<Boolean> halfPricePromotion() {
+        accountService.halfPricePromotion();
+        return Response.success(true);
+    }
+
+
 }
--- a/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
+++ b/src/main/java/com/ai/da/controller/ConvenientInquiryController.java
@@ -4,60 +4,167 @@ package com.ai.da.controller;
 import com.ai.da.common.context.UserContext;
 import com.ai.da.common.response.Response;
 import com.ai.da.mapper.primary.DesignMapper;
-import com.ai.da.mapper.primary.TrialOrderMapper;
+import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.mapper.primary.entity.TrialOrder;
+import com.ai.da.model.dto.AccountAddDTO;
 import com.ai.da.model.dto.UserDesignStatisticDTO;
+import com.ai.da.model.vo.QuestionnaireFeedbackVO;
+import com.ai.da.model.vo.QuestionnaireVO;
+import com.ai.da.model.vo.QueryUserConditionsVO;
+import com.ai.da.service.ConvenientInquiryService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.netty.util.internal.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

+import javax.annotation.Nullable;
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
+import java.util.*;

@Api(tags = "便利查询")
@Slf4j
@RestController
@RequestMapping("/api/inquiry")
 public class ConvenientInquiryController {
-
-    @Resource
-    private TrialOrderMapper trialOrderMapper;
-
    @Resource
    private DesignMapper designMapper;
+    @Resource
+    private ConvenientInquiryService convenientInquiryService;
+

    @ApiOperation("获取当前所有试用用户")
-    @GetMapping("/getTrial")
-    public Response<List<TrialOrder>> getTrial(){
+    @PostMapping("/getTrial")
+    public Response<IPage<TrialOrder>> getTrial(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
        Long accountId = UserContext.getUserHolder().getId();
-        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
-            List<TrialOrder> trialOrders = trialOrderMapper.selectList(null);
-            return Response.success(trialOrders);
-        }else {
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
+            return Response.success(convenientInquiryService.getTrial(queryUserConditionsVO));
+        } else {
            return Response.fail("Sorry, you don't have permission");
        }
    }

    @ApiOperation("获取指定时间区间内所有用户design的使用情况")
    @GetMapping("/getDesignStatistic")
-    public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime,@RequestParam String endTime){
+    public Response<List<UserDesignStatisticDTO>> getDesignStatistic(@RequestParam String startTime, @RequestParam String endTime,
+                                                                     @RequestParam(required = false) List<Long> ids, @RequestParam(required = false) String email) {
        Long accountId = UserContext.getUserHolder().getId();
-        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)){
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
            if (StringUtil.isNullOrEmpty(startTime)) startTime = "2024-02-01 00:00:00";
-            if (StringUtil.isNullOrEmpty(endTime)){
+            if (StringUtil.isNullOrEmpty(endTime)) {
                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
                Date date = new Date();
                endTime = simpleDateFormat.format(date);
            }
-            List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime);
+            if (!StringUtil.isNullOrEmpty(email)){
+                email = email.trim();
+            }
+            List<UserDesignStatisticDTO> designStatistic = designMapper.getDesignStatistic(startTime, endTime, ids, email);
            return Response.success(designStatistic);
-        }else {
+        } else {
            return Response.fail("Sorry, you don't have permission");
        }
    }

+
+    //调查问卷
+    @ApiOperation("获取调查问卷统计详情")
+    @GetMapping("/getQuestionnaireStatistic")
+    public Response<QuestionnaireFeedbackVO> getQuestionnaire() {
+        return Response.success(convenientInquiryService.getQuestionnaireInfo());
+    }
+
+    @ApiOperation("获取所有调查问卷")
+    @GetMapping("/getAllQuestionnaire")
+    public Response<List<QuestionnaireVO>> getAllQuestionnaire() {
+        return Response.success(convenientInquiryService.getAllQuestionnaire());
+    }
+
+    @ApiOperation("获取近期新用户")
+    @PostMapping("/recentNewUser")
+    public Response<IPage<Account>> recentNewUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
+        return Response.success(convenientInquiryService.recentNewUser(queryUserConditionsVO));
+    }
+
+    @ApiOperation("获取近期新用户图表数据")
+    @GetMapping("/recentNewUserChart")
+    public Response<Map<String, Object>> recentNewUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
+                                                            @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
+                                                            @ApiParam("userType") @RequestParam Integer userType) {
+        return Response.success(convenientInquiryService.recentNewUserChart(startTime, endTime, userType));
+    }
+
+    @ApiOperation("获取近期活跃用户")
+    @PostMapping("/recentActiveUser")
+    public Response<IPage<Account>> recentActiveUser(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
+        return Response.success(convenientInquiryService.recentActiveUser(queryUserConditionsVO));
+    }
+
+    @ApiOperation("获取近期活跃用户图表数据")
+    @GetMapping("/recentActiveUserChart")
+    public Response<Integer> recentActiveUserChart(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
+                                                   @ApiParam(value = "endTime") @RequestParam @Nullable String endTime) {
+        return Response.success(convenientInquiryService.recentActiveUserChart(startTime, endTime));
+    }
+
+    @ApiOperation("获取用户的各模块功能使用详情")
+    @GetMapping("/getActiveUserFunc")
+    public Response<Map<String, List<Object>>> getActiveUserFunc(@ApiParam(value = "startTime") @RequestParam @Nullable String startTime,
+                                                                 @ApiParam(value = "endTime") @RequestParam @Nullable String endTime,
+                                                                 @ApiParam("userIdList") @RequestParam @Nullable List<Long> userIdList) {
+        return Response.success(convenientInquiryService.getActiveUserFunc(startTime, endTime, userIdList));
+    }
+
+    @ApiOperation("试用用户到正式用户的转化率")
+    @GetMapping("/conversionRate")
+    public Response<Map<String, Object>> conversionRate(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
+                                                        @ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
+        return Response.success(convenientInquiryService.conversionRate(startTime, endTime));
+    }
+
+    @ApiOperation("试用用户国家/城市分布")
+    @GetMapping("/trialUserCountry")
+    public Response<Map<String, List<Object>>> trialUserCountry(@ApiParam(value = "startTime") @RequestParam(required = false) @Nullable String startTime,
+                                                                @ApiParam(value = "endTime") @RequestParam(required = false) @Nullable String endTime) {
+        return Response.success(convenientInquiryService.trialUserCountry(startTime, endTime));
+    }
+
+    @ApiOperation("添加用户")
+    @PostMapping("/addUser")
+    public Response<Boolean> addUser(@Valid @RequestBody AccountAddDTO accountAddDTO) {
+        return Response.success(convenientInquiryService.addUser(accountAddDTO));
+    }
+
+    @ApiOperation("修改用户信息")
+    @PostMapping("/modifyUser")
+    public Response<Boolean> modifyUser(@ApiParam(value = "用户id") @RequestParam @Nullable Long accountId,
+                                        @ApiParam(value = "有效期截止时间的毫秒级unix格式") @RequestParam @Nullable Long validEndTime,
+                                        @ApiParam(value = "用户类型 1/2/3/0 -> yearly/monthly/trial/visitor") @RequestParam @Nullable Integer systemUser,
+                                        @ApiParam("积分") @RequestParam @Nullable Long credits) {
+        return Response.success(convenientInquiryService.modifyUser(accountId, validEndTime, systemUser, credits));
+    }
+
+    @ApiOperation("获取用户信息")
+    @PostMapping("/getUserInfo")
+    public Response<IPage<Account>> getUserInfo(@Valid @RequestBody QueryUserConditionsVO queryUserConditionsVO) {
+        Long accountId = UserContext.getUserHolder().getId();
+        if (accountId.equals(31L) || accountId.equals(87L) || accountId.equals(83L) || accountId.equals(6L) || accountId.equals(4L) || accountId.equals(73L)) {
+            return Response.success(convenientInquiryService.getUserInfo(queryUserConditionsVO));
+        } else {
+            return Response.fail("Sorry, you don't have permission");
+        }
+    }
+
+    @ApiOperation("获取所有用户id")
+    @GetMapping("/getAllUserId")
+    public Response<List<Map<String, Object>>> getAllUsrIdList() {
+        return Response.success(convenientInquiryService.getAllUserIdList());
+    }
+
+
 }
--- a/src/main/java/com/ai/da/controller/DesignController.java
+++ b/src/main/java/com/ai/da/controller/DesignController.java
@@ -73,8 +73,8 @@ public class DesignController {

    @ApiOperation(value = "sketchBoard upload generate design前裁剪")
    @PostMapping("/sketchBoardsBoundingBox")
-    public Response<List<CollectionSketchVO>> sketchesBoundingBox(@Valid @RequestBody SketchesBoundingBoxDTO sketchesBoundingBoxDTO) {
-        return Response.success(designService.sketchesBoundingBox(sketchesBoundingBoxDTO));
+    public Response<List<CollectionSketchVO>> sketchesBoundingBox(@Valid @RequestBody ReDesignCollectionDTO reDesignCollectionDTO) {
+        return Response.success(designService.sketchesBoundingBox(reDesignCollectionDTO));
    }

    @ApiOperation(value = "通过designItemId获取模特图")
--- a/src/main/java/com/ai/da/controller/DesignDetailController.java
+++ b/src/main/java/com/ai/da/controller/DesignDetailController.java
@@ -5,6 +5,7 @@ import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.DesignItemService;
 import com.ai.da.service.DesignService;
+import com.ai.da.service.UserLikeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;


@Api(tags = "design Detail模块")
@@ -77,4 +80,18 @@ public class DesignDetailController {
    public Response<ComposeLayersVO> editPositionAndScale(@Valid @RequestBody EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException {
        return Response.success(designItemService.editLayersPositionAndScale(positionAndScaleVO));
    }
+
+    @ApiOperation(value = "mask数据兼容")
+    @GetMapping("/convertWithoutGradient")
+    public Response<String> convertHistoryMaskWithoutGradient(){
+        designItemService.convertHistoryMaskWithoutGradient();
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "mask数据库路径更新")
+    @GetMapping("/updateMaskUrl")
+    public Response<String> updateMaskUrl(){
+        designItemService.updateMaskUrl();
+        return Response.success("success");
+    }
 }
--- a/src/main/java/com/ai/da/controller/GenerateController.java
+++ b/src/main/java/com/ai/da/controller/GenerateController.java
@@ -2,7 +2,9 @@ package com.ai.da.controller;

 import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.GenerateLikeDTO;
+import com.ai.da.model.dto.GenerateModifyDTO;
 import com.ai.da.model.dto.GenerateThroughImageTextDTO;
+import com.ai.da.model.dto.ImageToSketchDTO;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.GenerateService;
 import io.swagger.annotations.Api;
@@ -83,5 +85,17 @@ public class GenerateController {
        return Response.success(generateResult);
    }

+    @ApiOperation(value = "imageToSketch")
+    @PostMapping("/imageToSketch")
+    public Response<GenerateResultVO> imageToSketch(@Valid @RequestBody ImageToSketchDTO imageToSketchDTO) {
+        return Response.success(generateService.imageToSketch(imageToSketchDTO));
+    }
+
+    // modifySketch
+    @ApiOperation(value = "modifySketch")
+    @PostMapping("/modifySketch")
+    public Response<GenerateResultVO> modifySketch(@Valid @RequestBody GenerateModifyDTO generateModifyDTO) {
+        return Response.success(generateService.modifySketch(generateModifyDTO));
+    }

 }
--- a/src/main/java/com/ai/da/controller/MessageCenterController.java
+++ b/src/main/java/com/ai/da/controller/MessageCenterController.java
@@ -0,0 +1,63 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.GetNotificationDTO;
+import com.ai.da.model.vo.NotificationVO;
+import com.ai.da.model.dto.PublishSysNotificationDTO;
+import com.ai.da.service.MessageCenterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+@Api(tags = "消息中心模块")
+@Slf4j
+@RestController
+@RequestMapping("/api/message")
+public class MessageCenterController {
+
+    @Resource
+    private MessageCenterService messageCenterService;
+
+    // 获取未读消息总数
+    @ApiOperation(value = "获取未读消息数")
+    @GetMapping("/getUnreadCount")
+    public Response<Map<String, Long>> getUnreadMessage(){
+        return Response.success(messageCenterService.getAllTypeMessageUnreadCount());
+    }
+
+    // 获取历史消息
+    @ApiOperation(value = "获取历史消息")
+    @PostMapping("/getHistoryNotification")
+    public Response<PageBaseResponse<NotificationVO>> getHistoryNotification(@Valid @RequestBody GetNotificationDTO getNotificationDTO) {
+        return Response.success(messageCenterService.getHistoryNotification(getNotificationDTO));
+    }
+
+    // 已读消息
+    @ApiOperation(value = "设置消息状态为已读")
+    @PostMapping("/setReadStatus")
+    public Response<Boolean> setReadStatus(@RequestParam("notificationIdList") List<Long> notificationIdList, @RequestParam("type") String type) {
+        return Response.success(messageCenterService.setReadStatus(notificationIdList, type));
+    }
+
+    // 发布系统消息
+    @ApiOperation(value = "发布系统消息")
+    @PostMapping("/publishSysMessage")
+    public Response<String> publishSysMessage(@Valid @RequestBody PublishSysNotificationDTO message) {
+        messageCenterService.publishSystemNotification(message);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "一键已读")
+    @PostMapping("/oneClickRead")
+    public Response<String> setReadAll(@RequestParam("type") String type) {
+        messageCenterService.setReadAll(type);
+        return Response.success("success");
+    }
+}
--- a/src/main/java/com/ai/da/controller/PortfolioController.java
+++ b/src/main/java/com/ai/da/controller/PortfolioController.java
@@ -1,12 +1,14 @@
 package com.ai.da.controller;

+import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.model.dto.*;
+import com.ai.da.model.vo.*;
 import com.ai.da.model.vo.CommentVO;
 import com.ai.da.model.vo.PortfolioVO;
 import com.ai.da.model.vo.UserLikeChooseVO;
-import com.ai.da.model.vo.UserLikeGroupVO;
 import com.ai.da.service.PortfolioService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;

 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;

@Api(tags = "Portfolio模块")
@Slf4j
@@ -28,7 +31,7 @@ public class PortfolioController {

    @ApiOperation(value = "发布作品集")
    @PostMapping("/publish")
-    public Response<Boolean> preLogin(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
+    public Response<Long> preLogin(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
        return Response.success(portfolioService.publish(canvas, data));
    }

@@ -117,4 +120,38 @@ public class PortfolioController {
    public Response<Boolean> commentDelete(@Valid @RequestBody CommentDTO commentDTO) {
        return Response.success(portfolioService.commentDelete(commentDTO));
    }
+
+    @ApiOperation(value = "关注")
+    @GetMapping("/follow")
+    public Response<String> follow(@RequestParam("followeeId") Long followeeId) {
+        portfolioService.follow(followeeId);
+        return Response.success(BusinessException.getMessageFromResource("subscription.success"));
+    }
+
+    @ApiOperation(value = "取消关注")
+    @GetMapping("/cancelFollow")
+    public Response<String> cancelFollow(@RequestParam("followeeId") Long followeeId) {
+        portfolioService.cancelFollow(followeeId);
+        return Response.success(BusinessException.getMessageFromResource("unsubscribe.success"));
+    }
+
+    @ApiOperation(value = "获取关注列表")
+    @PostMapping("/getFolloweeList")
+    public Response<List<AccountFollowVO>> getFolloweeList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
+        return Response.success(portfolioService.getFolloweeList(getFollowListDTO));
+    }
+
+    @ApiOperation(value = "获取粉丝列表")
+    @PostMapping("/getFollowerList")
+    public Response<List<AccountFollowVO>> getFollowerList(@Valid @RequestBody GetFollowListDTO getFollowListDTO) {
+        return Response.success(portfolioService.getFollowerList(getFollowListDTO));
+    }
+
+
+/*    @ApiOperation(value = "按标签名查询作品")
+    @GetMapping("/queryPortfolioByTag")
+    public Response<List<PortfolioVO>> queryPortfolioByTag(@RequestParam(value = "tagName", required = false) String tagName,
+                                                           @RequestParam(value = "tagId", required = false) Long tagId) {
+        return Response.success(portfolioService.queryPortfolioByTag(tagName, tagId));
+    }*/
 }
--- a/src/main/java/com/ai/da/controller/SavedCollectionController.java
+++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java
@@ -104,9 +104,9 @@ public class SavedCollectionController {
        }
        List<Long> groupIds = page.getRecords().stream().map(UserLikeGroup::getId).collect(Collectors.toList());
        List<UserLikeVO> groupDetails = userLikeService.getGroupDetails(groupIds);
-        if (CollectionUtils.isEmpty(groupDetails)) {
-            throw new BusinessException("groupDetails.not.found");
-        }
+//        if (CollectionUtils.isEmpty(groupDetails)) {
+//            throw new BusinessException("groupDetails.not.found");
+//        }
        Map<Long, List<UserLikeVO>> groupDetailMap = groupDetails.stream()
                .collect(Collectors.groupingBy(UserLikeVO::getUserLikeGroupId));

@@ -117,13 +117,17 @@ public class SavedCollectionController {
                userLikeGroupVO.setUpdateDate(group.getUpdateDate().getTime());
                userLikeGroupVO.setAuthor(account.getUserName());
                //count 和detail
-                List<UserLikeVO> details = groupDetailMap.get(group.getId());
-                for (UserLikeVO detail : details) {
-                    TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(detail.getDesignOutfitId());
-                    detail.setUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
+                if (groupDetailMap.keySet().contains(group.getId())) {
+                    List<UserLikeVO> details = groupDetailMap.get(group.getId());
+                    for (UserLikeVO detail : details) {
+                        TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(detail.getDesignOutfitId());
+                        detail.setUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
+                    }
+                    userLikeGroupVO.setGroupDetails(details);
+                    userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size());
+                }else {
+                    userLikeGroupVO.setSketchCount(0);
                }
-                userLikeGroupVO.setGroupDetails(details);
-                userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size());
                if (userLikeGroupVO.getOriginal() == 0) {
                    userLikeGroupVO.setOriginalAccountName(accountService.getById(userLikeGroupVO.getOriginalAccountId()).getUserName());
                    Portfolio byId = portfolioService.getByIdAll(userLikeGroupVO.getOriginalPortfolioId());
@@ -235,4 +239,10 @@ public class SavedCollectionController {
        List<MagicToolResultVO> magicToolResultVOList = userLikeGroupService.getRelightResult(taskIdList);
        return Response.success(magicToolResultVOList);
    }
+
+    @ApiOperation(value = "likeHistoryRelSketch")
+    @PostMapping("/likeHistoryRelSketch")
+    public Response<String> likeHistoryRelSketch() {
+        return Response.success(userLikeGroupService.likeHistoryRelSketch());
+    }
 }
--- a/src/main/java/com/ai/da/controller/TagsController.java
+++ b/src/main/java/com/ai/da/controller/TagsController.java
@@ -0,0 +1,31 @@
+package com.ai.da.controller;
+
+
+import com.ai.da.common.response.Response;
+import com.ai.da.mapper.primary.entity.Product;
+import com.ai.da.mapper.primary.entity.Tags;
+import com.ai.da.service.ProductService;
+import com.ai.da.service.TagsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@CrossOrigin //开放前端的跨域访问
+@Api(tags = "标签管理")
+@RestController
+@RequestMapping("/api/tags")
+public class TagsController {
+
+    @Resource
+    private TagsService tagsService;
+
+    @ApiOperation("获取标签")
+    @GetMapping("/getTags")
+    public Response<List<Tags>> getTags(@RequestParam("userInput") String userInput) {
+        return Response.success(tagsService.getTags(userInput));
+    }
+}
--- a/src/main/java/com/ai/da/controller/ThirdPartyController.java
+++ b/src/main/java/com/ai/da/controller/ThirdPartyController.java
@@ -107,4 +107,11 @@ public class ThirdPartyController {
    public Response<String> getRedirectUrl() {
        return Response.success(REDIRECT_URL);
    }
+
+    @CrossOrigin
+    @ApiOperation(value = "updateNoLoginRequiredNew")
+    @PostMapping("/updateNoLoginRequiredNew")
+    public Response<String> updateNoLoginRequiredNew(@RequestBody NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request) {
+        return Response.success(accountService.updateNoLoginRequiredNew(noLoginRequiredDTO, request));
+    }
 }
--- a/src/main/java/com/ai/da/mapper/primary/AccountMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/AccountMapper.java
@@ -3,6 +3,7 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Account;

+import java.util.Date;
 import java.util.List;

 /**
@@ -29,4 +30,6 @@ public interface AccountMapper extends CommonMapper<Account> {
     */
 //    Account findById(String id);

+    void toVisitor(Long id, Date date);
+
 }
--- a/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/DesignMapper.java
@@ -18,5 +18,5 @@ public interface DesignMapper extends CommonMapper<Design> {
    //返回插入数据后生成的主键
    Long insertDesign(Design design);

-    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime);
+    List<UserDesignStatisticDTO> getDesignStatistic(String startTime, String endTime, List<Long> ids, String email);
 }
--- a/src/main/java/com/ai/da/mapper/primary/GenerateMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/GenerateMapper.java
@@ -3,5 +3,10 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Generate;

+import java.util.List;
+import java.util.Map;
+
 public interface GenerateMapper extends CommonMapper<Generate> {
+
+    List<Map<String, Object>> getByTypeAndTime(String startTime, String endTime, List<Long> accountIdList);
 }
--- a/src/main/java/com/ai/da/mapper/primary/NotificationMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/NotificationMapper.java
@@ -0,0 +1,24 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Notification;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+public interface NotificationMapper extends CommonMapper<Notification> {
+
+    List<Map<String, Object>> getTypeCount(Long receiverId);
+
+    /** 解决mybatis-plus自动过滤 is_deleted为1的数据 问题 */
+    Notification getUniqueLikeAndFollow(String type, Long senderId, Long receiverId, Long portfolioId);
+
+    void updateUniqueLikeAndFollow(Long id, LocalDateTime time);
+
+    void deleteNotification(Long id, LocalDateTime time);
+
+    void setPersonalNotificationAllRead(String type, Long receiverId, LocalDateTime time);
+
+    List<Long> getUnreadSysNotification(Long accountId);
+}
--- a/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java
@@ -3,6 +3,10 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.Portfolio;

+import java.util.List;
+
 public interface PortfolioMapper extends CommonMapper<Portfolio> {
    Portfolio getByIdAll(Long originalPortfolioId);
+
+    List<Portfolio> getByTag(Long accountId, String tagName);
 }
--- a/src/main/java/com/ai/da/mapper/primary/PortfolioTagsMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/PortfolioTagsMapper.java
@@ -0,0 +1,15 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.PortfolioTags;
+
+import java.time.LocalDateTime;
+
+public interface PortfolioTagsMapper extends CommonMapper<PortfolioTags> {
+
+    void deleteByPortfolioId(Long portfolioId);
+
+    // portfolioId与tagId建立唯一约束， 如果组合 portfolio_id 和 tag_id 已经存在，插入操作会被忽略。
+    void insertIgnore(Long portfolioId, Long tagId, LocalDateTime time);
+
+}
--- a/src/main/java/com/ai/da/mapper/primary/SysNotificationReadStatusMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/SysNotificationReadStatusMapper.java
@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.SysNotificationReadStatus;
+
+public interface SysNotificationReadStatusMapper extends CommonMapper<SysNotificationReadStatus> {
+}
--- a/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitDetailMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/TDesignPythonOutfitDetailMapper.java
@@ -4,6 +4,8 @@ import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.TDesignPythonOutfitDetail;
 import com.ai.da.model.vo.TDesignPythonOutfitDetailVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.apache.ibatis.annotations.Delete;

 import java.util.List;

@@ -24,4 +26,7 @@ public interface TDesignPythonOutfitDetailMapper extends CommonMapper<TDesignPyt
     */
    List<TDesignPythonOutfitDetailVO> selectTDesignPythonOutfitDetailPage(IPage page, TDesignPythonOutfitDetailVO tDesignPythonOutfitDetail);

+    @Delete("DELETE FROM t_design_python_outfit_detail WHERE design_python_outfit_id = #{designPythonOutfitId}")
+    void deleteByDesignPythonOutfitIdPhysical(@Param("designPythonOutfitId") Long designPythonOutfitId);
+
 }
--- a/src/main/java/com/ai/da/mapper/primary/TagsMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/TagsMapper.java
@@ -0,0 +1,17 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Tags;
+import com.ai.da.model.dto.TagsDTO;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface TagsMapper extends CommonMapper<Tags> {
+
+    List<Map<String, String>> getMatchingTags(String userInput);
+
+    List<TagsDTO> getTagByPortfolioId(Long portfolioId);
+
+}
--- a/src/main/java/com/ai/da/mapper/primary/ToProductImageResultMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/ToProductImageResultMapper.java
@@ -3,5 +3,10 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.ToProductImageResult;

+import java.util.List;
+import java.util.Map;
+
 public interface ToProductImageResultMapper extends CommonMapper<ToProductImageResult> {
+
+    List<Map<String, Object>> getByTypeAndTime(String startTime, String endTime, List<Long> accountIdList);
 }
--- a/src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/TrialOrderMapper.java
@@ -3,6 +3,9 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.TrialOrder;

+import java.util.List;
+import java.util.Map;
+
 /**
 * Mapper 接口
 *
@@ -11,6 +14,6 @@ import com.ai.da.mapper.primary.entity.TrialOrder;
 */
 public interface TrialOrderMapper extends CommonMapper<TrialOrder> {

-
+    Map<String, Long> countOfficialUser();

 }
--- a/src/main/java/com/ai/da/mapper/primary/UserFollowMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/UserFollowMapper.java
@@ -0,0 +1,19 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.UserFollow;
+import com.ai.da.model.vo.AccountFollowVO;
+
+import java.util.List;
+
+
+public interface UserFollowMapper extends CommonMapper<UserFollow> {
+    List<AccountFollowVO> getFolloweeListByFollower(Long followerAccountId, Integer limit, Integer offset, String order);
+
+    List<AccountFollowVO> getFollowerListByFollowee(Long followeeAccountId, Integer limit, Integer offset, String order);
+
+    List<AccountFollowVO> getFolloweeListByName(String name, Long followerId);
+
+    List<AccountFollowVO> getFollowerListByName(String name, Long followeeId);
+
+}
--- a/src/main/java/com/ai/da/mapper/primary/UserLikeMapper.java
+++ b/src/main/java/com/ai/da/mapper/primary/UserLikeMapper.java
@@ -3,6 +3,9 @@ package com.ai.da.mapper.primary;
 import com.ai.da.common.config.mybatis.plus.CommonMapper;
 import com.ai.da.mapper.primary.entity.UserLike;

+import java.util.List;
+import java.util.Map;
+
 /**
 * Mapper 接口
 *
--- a/src/main/java/com/ai/da/mapper/primary/entity/Account.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Account.java
@@ -3,6 +3,7 @@ package com.ai.da.mapper.primary.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -69,11 +70,13 @@ public class Account implements Serializable {
    /**
     * 创建时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date createDate;

    /**
     * 更新时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private Date updateDate;

    private Integer isTrial;
@@ -93,6 +96,12 @@ public class Account implements Serializable {
     * 1 ： 年付用户
     * 2 ： 月付用户
     * 3 ： 试用用户
+     * 4 ： 参加活动获取30天有效期和6000个积分的用户
     */
    private Integer systemUser;
+
+    /**
+     * 头像
+     */
+    private String avatar;
 }
--- a/src/main/java/com/ai/da/mapper/primary/entity/Collection.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Collection.java
@@ -40,6 +40,8 @@ public class Collection implements Serializable {
     */
    private String moodTemplateId;

+    private String moodboardPosition;
+
    /**
     * 创建时间
     */
--- a/src/main/java/com/ai/da/mapper/primary/entity/Generate.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Generate.java
@@ -72,6 +72,19 @@ public class Generate {
     */
    private String seed;

+    /**
+     * 1 -> 粗
+     * 2 -> 中
+     * 3 -> 细
+     * custom -> 自定义
+     */
+    private String sketchStyle;
+
+    /**
+     * sketch 风格参考图的collection_element_id
+     */
+    private Long styleImageElementId;
+
    /**
     * 创建时间
     */
--- a/src/main/java/com/ai/da/mapper/primary/entity/Notification.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Notification.java
@@ -0,0 +1,73 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_notification")
+@Data
+public class Notification extends BaseEntity{
+    /**
+     * 操作类型 system/like/comment/follow
+     */
+    private String type;
+    /**
+     * 发起操作者用户id
+     */
+    private Long senderId;
+    /**
+     * 被操作对象用户id
+     */
+    private Long receiverId;
+    /**
+     * 点赞评论时的作品id
+     */
+    private Long portfolioId;
+    /**
+     * 消息内容
+     */
+    private String content;
+    /**
+     * 评论id
+     */
+    private Long commentId;
+    /**
+     * 个人消息已读状态
+     */
+    private Integer isRead;
+    /**
+     * 系统消息发布状态
+     */
+    private Integer publishFlag;
+
+    /**
+     * 是否被删除
+     */
+    private Integer isDeleted;
+
+    public Notification() {
+    }
+
+    public Notification(String type, Long senderId, Long receiverId) {
+        this.type = type;
+        this.senderId = senderId;
+        this.receiverId = receiverId;
+    }
+
+    public Notification(String type, Long senderId, Long receiverId, Long portfolioId) {
+        this.type = type;
+        this.senderId = senderId;
+        this.receiverId = receiverId;
+        this.portfolioId = portfolioId;
+    }
+
+    public Notification(String type, Long senderId, Long receiverId, Long portfolioId, String content, Long commentId) {
+        this.type = type;
+        this.senderId = senderId;
+        this.receiverId = receiverId;
+        this.portfolioId = portfolioId;
+        this.content = content;
+        this.commentId = commentId;
+    }
+}
--- a/src/main/java/com/ai/da/mapper/primary/entity/PortfolioTags.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/PortfolioTags.java
@@ -0,0 +1,14 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_portfolio_tags")
+@Data
+public class PortfolioTags extends BaseEntity{
+    private Long portfolioId;
+
+    private Long tagId;
+}
--- a/src/main/java/com/ai/da/mapper/primary/entity/SysNotificationReadStatus.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/SysNotificationReadStatus.java
@@ -0,0 +1,26 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_sys_notification_read_status")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysNotificationReadStatus extends BaseEntity{
+    /**
+     * 系统消息id
+     */
+    private Long system_notification_id;
+
+    /**
+     * 已读当前消息的用户id将被存储
+     */
+    private Long account_id;
+}
--- a/src/main/java/com/ai/da/mapper/primary/entity/Tags.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/Tags.java
@@ -0,0 +1,13 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_tags")
+@Data
+public class Tags extends BaseEntity{
+
+    private String tagName;
+}
--- a/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java
@@ -42,4 +42,6 @@ public class ToProductImageResult implements Serializable {

    @ApiModelProperty(value = "generate 结果类型")
    private String resultType;
+
+    private Double brightenValue;
 }
--- a/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/TrialOrder.java
@@ -3,6 +3,7 @@ package com.ai.da.mapper.primary.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -49,11 +50,13 @@ public class TrialOrder implements Serializable {
    /**
     * 创建时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private LocalDateTime createTime;

    /**
     * 更新时间
     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
    private LocalDateTime updateTime;


--- a/src/main/java/com/ai/da/mapper/primary/entity/UserFollow.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/UserFollow.java
@@ -0,0 +1,26 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_user_follow")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class UserFollow extends BaseEntity{
+
+    /**
+     * 被关注者用户id
+     */
+    private Long followeeId;
+    /**
+     * 关注者用户id
+     */
+    private Long followerId;
+
+
+}
--- a/src/main/java/com/ai/da/mapper/primary/entity/UserLike.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/UserLike.java
@@ -59,4 +59,9 @@ public class UserLike implements Serializable {
     * 更新时间
     */
    private Date updateDate;
+
+    /**
+     * design对应的mask是否已替换为最新的
+     */
+    private Integer converted;
 }
--- a/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java
+++ b/src/main/java/com/ai/da/mapper/secondary/AttributeRetrievalMapper.java
@@ -28,4 +28,6 @@ public interface AttributeRetrievalMapper {
    void updateStyleById(Long idByFileName, String style, String tableName);

    void updateStyleByFileName(String style, String fileName, String tableName);
+
+    String getStyleByUrl(String replace,String tableName);
 }
--- a/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java
+++ b/src/main/java/com/ai/da/model/dto/DesignCollectionDTO.java
@@ -27,10 +27,6 @@ public class DesignCollectionDTO {
    @ApiModelProperty("手稿板图片id  数组")
    private List<CollectionSketchDTO> sketchBoards;

-    // 2023.10版本去除该入参
-//    @ApiModelProperty("市场手稿板图片id  数组")
-//    private List<DesignCollectionElementDTO> marketingSketchs;
-
    @NotNull(message = "systemScale.cannot.be.empty")
    @ApiModelProperty("系统取图比列")
    private BigDecimal systemScale;
@@ -65,4 +61,6 @@ public class DesignCollectionDTO {
    @ApiModelProperty("python端design进程ID")
    private String processId;

+    private String moodboardPostion;
+
 }
--- a/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
+++ b/src/main/java/com/ai/da/model/dto/DesignSingleItemDTO.java
@@ -59,4 +59,10 @@ public class DesignSingleItemDTO implements Serializable {
    @ApiModelProperty("衣服上的装饰")
    private DesignSinglePrintDTO trims;

+    @ApiModelProperty("标注后的mask 的base64")
+    private String maskUrl;
+
+    @ApiModelProperty("mask 的minio地址")
+    private String maskMinioUrl;
+
 }
--- a/src/main/java/com/ai/da/model/dto/EmailSendDTO.java
+++ b/src/main/java/com/ai/da/model/dto/EmailSendDTO.java
@@ -15,7 +15,7 @@ public class EmailSendDTO {
    private String email;

    @NotBlank(message = "operationType.cannot.be.empty")
-    @ApiModelProperty("操作类型  LOGIN 注册  FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱")
+    @ApiModelProperty("操作类型  LOGIN 注册  FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 CHANGE_MAILBOX 更改邮箱")
    private String operationType;

    @ApiModelProperty("异常ip")
--- a/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GenerateModifyDTO.java
@@ -0,0 +1,30 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@ApiModel("修改imageToSketch提取出的sketch")
+@Data
+public class GenerateModifyDTO {
+    @NotNull(message = "image cannot be empty")
+    @ApiModelProperty(value = "需要保存的图片的base64格式", required = true)
+    private String base64;
+
+    @NotNull(message = "gender cannot be empty")
+    @ApiModelProperty(value = "sketch所属性别", required = true)
+    private String gender;
+
+    @NotNull(message = "category cannot be empty")
+    @ApiModelProperty(value = "sketch所属分类", required = true)
+    private String category;
+
+    @NotNull(message = "id cannot be empty")
+    @ApiModelProperty(value = "原图id", required = true)
+    private String originalId;
+
+    @ApiModelProperty("是否覆盖原图")
+    private Boolean isOverride;
+}
--- a/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java
@@ -25,7 +25,7 @@ public class GenerateThroughImageTextDTO {
    @ApiModelProperty("text  image  text-image")
    String generateType;

-    @ApiModelProperty("图片是update，还是从library中选择 collection || library")
+    @ApiModelProperty("图片来源：update，从library中选择,从toProductImage结果中选择 collection || library || productImage")
    String designType;

    @NotBlank(message = "level1Type cannot be empty!")
--- a/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GetFollowListDTO.java
@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("按条件分页查询关注列表")
+public class GetFollowListDTO extends PageQueryBaseVo {
+
+    @ApiModelProperty("查找指定用户名")
+    private String searchByName;
+
+    @ApiModelProperty("按关注时间排序 DESC 降序 || ASC 升序")
+    private String order;
+}
--- a/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java
+++ b/src/main/java/com/ai/da/model/dto/GetNotificationDTO.java
@@ -0,0 +1,16 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.model.vo.PageQueryBaseVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@ApiModel
+@Data
+public class GetNotificationDTO extends PageQueryBaseVo {
+
+    @ApiModelProperty("system/like/comment/follow/newPosted")
+    private String type;
+}
--- a/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java
+++ b/src/main/java/com/ai/da/model/dto/ImageToSketchDTO.java
@@ -0,0 +1,22 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("image to sketch")
+@Data
+public class ImageToSketchDTO {
+
+    @ApiModelProperty("上传图片的collection_element_id")
+    private Long elementId;
+
+    @ApiModelProperty("sketch线条风格 1->粗， 2->中， 3->细，传数字，自定义风格时，传空 ")
+    private String style;
+
+    @ApiModelProperty("自定义线条风格，上传图片的collection_element_id")
+    private Long styleImageId;
+
+    @ApiModelProperty("性别")
+    private String gender;
+}
--- a/src/main/java/com/ai/da/model/dto/PortfolioDTO.java
+++ b/src/main/java/com/ai/da/model/dto/PortfolioDTO.java
@@ -2,11 +2,11 @@ package com.ai.da.model.dto;

 import com.ai.da.mapper.primary.entity.Portfolio;
 import lombok.Data;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
+import java.util.List;

@Data
 public class PortfolioDTO extends Portfolio {
    private Long userLikeGroupId;
+
+    private List<TagsDTO> tagsDTO;
 }
--- a/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java
+++ b/src/main/java/com/ai/da/model/dto/PublishSysNotificationDTO.java
@@ -0,0 +1,19 @@
+package com.ai.da.model.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("发布系统消息")
+public class PublishSysNotificationDTO {
+
+    @ApiModelProperty("系统消息标题")
+    private String title;
+
+    @ApiModelProperty("系统消息内容")
+    private String content;
+
+    @ApiModelProperty("系统消息 活动链接")
+    private String link;
+}
--- a/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
+++ b/src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java
@@ -2,11 +2,8 @@ package com.ai.da.model.dto;

 import com.ai.da.model.vo.PageQueryBaseVo;
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

-import java.util.List;
-
@Data
@ApiModel("作品集分页查询")
 public class QueryPortfolioPageDTO extends PageQueryBaseVo {
@@ -14,4 +11,8 @@ public class QueryPortfolioPageDTO extends PageQueryBaseVo {
    private Integer getMyPortfolio;

    private Integer getLikePortfolio;
+
+    private Long accountId;
+
+    private Long tagId;
 }
--- a/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java
+++ b/src/main/java/com/ai/da/model/dto/ReDesignCollectionDTO.java
@@ -14,7 +14,6 @@ import java.util.List;
@ApiModel("重新设计Collection 入参")
 public class ReDesignCollectionDTO {

-    @NotNull(message = "collectionId.cannot.be.empty")
    @ApiModelProperty("collectionId")
    private Long collectionId;

@@ -64,4 +63,8 @@ public class ReDesignCollectionDTO {
    @NotBlank(message = "processId.cannot.be.empty")
    @ApiModelProperty("python端design进程ID")
    private String processId;
+
+    private String moodboardPosition;
+
+    private String moodTemplateId;
 }
--- a/src/main/java/com/ai/da/model/dto/TagsDTO.java
+++ b/src/main/java/com/ai/da/model/dto/TagsDTO.java
@@ -0,0 +1,6 @@
+package com.ai.da.model.dto;
+
+import com.ai.da.mapper.primary.entity.Tags;
+
+public class TagsDTO extends Tags {
+}
--- a/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java
+++ b/src/main/java/com/ai/da/model/dto/ToProductImageDTO.java
@@ -13,4 +13,5 @@ public class ToProductImageDTO {
    private String prompt;
    private BigDecimal imageStrength;
    private String direction;
+    private Double brightenValue;
 }
--- a/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java
+++ b/src/main/java/com/ai/da/model/dto/UserDesignStatisticDTO.java
@@ -15,6 +15,8 @@ public class UserDesignStatisticDTO {

    private String isTrial;

+    private String credits;
+
    private String trialOrderId;

    private String title;
--- a/src/main/java/com/ai/da/model/enums/SketchGenerateType.java
+++ b/src/main/java/com/ai/da/model/enums/SketchGenerateType.java
@@ -0,0 +1,18 @@
+package com.ai.da.model.enums;
+
+public enum SketchGenerateType implements IEnumDisplay{
+    GENERATE("generate"),
+
+    EXTRACT("extract"),;
+
+    private String value;
+
+    SketchGenerateType(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+}
--- a/src/main/java/com/ai/da/model/enums/SketchStyle.java
+++ b/src/main/java/com/ai/da/model/enums/SketchStyle.java
@@ -0,0 +1,20 @@
+package com.ai.da.model.enums;
+
+public enum SketchStyle implements IEnumDisplay{
+
+    THICK("1"),
+
+    MEDIUM("2"),
+
+    THIN("3");
+
+    private String value;
+
+    SketchStyle(String value) {
+        this.value = value;
+    }
+    @Override
+    public String getValue() {
+        return value;
+    }
+}
--- a/src/main/java/com/ai/da/model/vo/AccountFollowVO.java
+++ b/src/main/java/com/ai/da/model/vo/AccountFollowVO.java
@@ -0,0 +1,33 @@
+package com.ai.da.model.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AccountFollowVO {
+    /**
+     * userId
+     */
+    private Long senderId;
+
+    private String userName;
+
+    private String avatar;
+
+    /**
+     * followTime
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private LocalDateTime createTime;
+
+    /**
+     * mutualFollowing 互粉
+     */
+    private Integer isFollow;
+}
--- a/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
+++ b/src/main/java/com/ai/da/model/vo/AccountLoginVO.java
@@ -34,4 +34,10 @@ public class AccountLoginVO {

    private Integer systemUser;

+    private String avatar;
+
+    private Long followeeCount;
+
+    private Long followerCount;
+
 }
--- a/src/main/java/com/ai/da/model/vo/GenerateResultVO.java
+++ b/src/main/java/com/ai/da/model/vo/GenerateResultVO.java
@@ -28,9 +28,10 @@ public class GenerateResultVO {
        this.status = status;
    }

-    public GenerateResultVO(Long id, String url, String status) {
+    public GenerateResultVO(Long id, String url, String status, String category) {
        this.id = id;
        this.url = url;
        this.status = status;
+        this.category = category;
    }
 }
--- a/src/main/java/com/ai/da/model/vo/NotificationVO.java
+++ b/src/main/java/com/ai/da/model/vo/NotificationVO.java
@@ -0,0 +1,29 @@
+package com.ai.da.model.vo;
+
+import com.ai.da.mapper.primary.entity.Notification;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class NotificationVO extends Notification {
+
+    /**
+     * senderUserName
+     */
+    private String userName;
+
+//    private String senderUserAvatar;
+
+    private String portfolioName;
+
+    /**
+     * sender头像
+     */
+    private String avatar;
+
+    private Integer isFollow;
+
+    private String canvas;
+
+}
--- a/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java
+++ b/src/main/java/com/ai/da/model/vo/PersonalHomepageVO.java
@@ -0,0 +1,31 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("个人主页返回信息")
+public class PersonalHomepageVO {
+
+    @ApiModelProperty("用户名")
+    private String userName;
+
+    @ApiModelProperty("用户头像")
+    private String avatar;
+
+    @ApiModelProperty("用户作品总数")
+    private Long portfolioCount;
+
+    @ApiModelProperty("粉丝总数")
+    private Long followerCount;
+
+    @ApiModelProperty("关注者总数")
+    private Long followeeCount;
+
+    @ApiModelProperty("个人主页总浏览量")
+    private Long homepageViewCount;
+
+    @ApiModelProperty("是否关注了主页用户")
+    private Integer isFollow;
+}
--- a/src/main/java/com/ai/da/model/vo/PortfolioVO.java
+++ b/src/main/java/com/ai/da/model/vo/PortfolioVO.java
@@ -28,4 +28,8 @@ public class PortfolioVO extends Portfolio {
    private Integer selected;

    private Integer jumpable;
+
+    private Integer isFollow;
+
+    private String avatar;
 }
--- a/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java
+++ b/src/main/java/com/ai/da/model/vo/QueryUserConditionsVO.java
@@ -0,0 +1,38 @@
+package com.ai.da.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("按条件筛选试用用户")
+public class QueryUserConditionsVO extends PageQueryBaseVo {
+
+
+    private List<Long> ids;
+
+    private String userName;
+
+    private String email;
+
+    private String country;
+
+    private String occupation;
+
+    private String startTime;
+
+    private String endTime;
+
+    @ApiModelProperty("Ascending（升序） || Descending（降序）")
+    private String order;
+
+    // by id | time | credits
+    private String orderBy;
+
+    private Integer systemUser;
+
+}
--- a/src/main/java/com/ai/da/model/vo/QuestionnaireFeedbackVO.java
+++ b/src/main/java/com/ai/da/model/vo/QuestionnaireFeedbackVO.java
@@ -0,0 +1,45 @@
+package com.ai.da.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QuestionnaireFeedbackVO {
+    private Info age;
+    private Info question1;
+    private Info question2;
+    private Info question3;
+    private List<String> otherDesignTools;
+
+    public QuestionnaireFeedbackVO() {
+    }
+
+    public QuestionnaireFeedbackVO(Info age, Info question1, Info question2, Info question3, List<String> otherDesignTools) {
+        this.age = age;
+        this.question1 = question1;
+        this.question2 = question2;
+        this.question3 = question3;
+        this.otherDesignTools = otherDesignTools;
+    }
+
+    public static class Info{
+        public List<String> name;
+        public List<Integer> values;
+        public List<String> otherReason;
+
+        public Info() {
+        }
+
+        public Info(List<String> name, List<Integer> values) {
+            this.name = name;
+            this.values = values;
+        }
+
+        public Info(List<String> name, List<Integer> values, List<String> otherReason) {
+            this.name = name;
+            this.values = values;
+            this.otherReason = otherReason;
+        }
+    }
+}
--- a/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeChooseVO.java
@@ -1,12 +1,11 @@
 package com.ai.da.model.vo;

+import com.ai.da.model.dto.PortfolioDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

-import java.util.List;
-
@AllArgsConstructor
@Data
@ApiModel("用户choose详细-响应")
@@ -24,4 +23,7 @@ public class UserLikeChooseVO {
    private String sex;

    private Integer beenPublished;
+
+//    private Portfolio portfolio;
+    private PortfolioDTO portfolioDTO;
 }
--- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
+++ b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
@@ -35,4 +35,6 @@ public class UserLikeCollectionVO {

    @ApiModelProperty("市场手稿板图片  数组")
    private List<CollectionElementVO> marketingSketchs;
+
+    private String moodboardPosition;
 }
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/src/main/java/com/ai/da/python/PythonService.java
@@ -63,8 +63,6 @@ public class PythonService {
    private String accessPythonIp;
    @Value("${access.python.port:''}")
    private String accessPythonPort;
-    @Value("${access.python.address}")
-    private String fastApiPythonAddress;
    @Value("${minio.bucketName.gradient}")
    private String gradientBucketName;
    @Value("${access.python.generate_sr_port}")
@@ -76,6 +74,9 @@ public class PythonService {
    @Resource
    private MinioUtil minioUtil;

+    @Resource
+    private RedisUtil redisUtil;
+
    /**
     * 生成打印的图片 二合一 (废弃于2024/01/02)
     *
@@ -262,6 +263,7 @@ public class PythonService {

            DesignPythonObject pythonObject = createDesignPythonObject(elementVO, designPictureType, systemScale, singleOverall, switchCategory);
            objects.add(pythonObject);
+            redisUtil.addProcessId(processId, i + 1);
        }
        return designPythonObjects;
    }
@@ -653,6 +655,10 @@ public class PythonService {
            attributeRetrievalAttrDict.setSilhouette(null);
            attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum, style);
        }
+        if (CollectionUtil.isEmpty(attributeRetrievalList) || attributeRetrievalList.size() < poolNum) {
+            style = null;
+            attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPool(attributeRetrievalAttrDict, tableName, poolNum, style);
+        }
        return toColoectionElementList(attributeRetrievalList, styleCategory, modelSex);
    }

@@ -721,11 +727,12 @@ public class PythonService {
                attributeRetrievalAttrDict.setOpeningType(null);
                attributeRetrievalAttrDict.setSubtype(null);
                attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style);
-            }else {
-                attributeRetrievalAttrDict.setType(null);
-                attributeRetrievalAttrDict.setOpeningType(null);
-                attributeRetrievalAttrDict.setSubtype(null);
+            }
+
+            if (CollectionUtil.isEmpty(attributeRetrievalList)) {
+                style = null;
                attributeRetrievalList = attributeRetrievalMapper.getSystemSketchPoolBySameCategory(attributeRetrievalAttrDict, tableName, style);
+
            }
        }
        return toColoectionElementList(attributeRetrievalList, styleCategory, modelSex);
@@ -986,6 +993,7 @@ public class PythonService {
        Integer randomNum = RandomsUtil.randomSysFile(dressings.size());
        String category = dressings.get(randomNum).getStyleCategory();
        String tableName = getTableName(validateElementVO.getModelSex(), category);
+
        AttributeRetrieval attributeRetrieval = attributeRetrievalMapper.getSystemRandom(tableName, validateElementVO.getStyle());
        CollectionElement collectionElement = toCollectionElement(attributeRetrieval, category, validateElementVO.getModelSex());
        return coverSketchToDesignPythonItem(null, collectionElement, validateElementVO);
@@ -2577,7 +2585,8 @@ public class PythonService {
     * @return
     */
    public DesignPythonObjects covertDesignSingleParam(DesignSingleIncludeLayersDTO designSingleDTO, String singleOverall,
-                                                       String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint) {
+                                                       String switchCategory, DesignLibraryModelPointVO designLibraryModelPoint,
+                                                       String previewOrSubmit) {
        DesignPythonObjects designPythonObjects = new DesignPythonObjects();
        List<DesignPythonObject> objects = Lists.newArrayList();
        designPythonObjects.setObjects(objects);
@@ -2585,7 +2594,7 @@ public class PythonService {
        DesignPythonObject pythonObject = new DesignPythonObject();
        designPythonObjects.setProcess_id(designSingleDTO.getProcessId());
        pythonObject.setItems(coverToDesignSinglePythonItem(designSingleDTO, designLibraryModelPoint));
-        pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint));
+        pythonObject.setBasic(coverToSingleBasic(singleOverall, switchCategory, designLibraryModelPoint, previewOrSubmit));
        objects.add(pythonObject);
        return designPythonObjects;
    }
@@ -2643,8 +2652,6 @@ public class PythonService {
                minioPath = minioUtil.base64UploadToPath(colorImg, gradientBucketName, null);
                designSingleItem.getGradient().setColorImg(null);
                gradientString = JSONObject.toJSONString(designSingleItem.getGradient());
-
-                // todo 当渐变色不为空时，是否需要将颜色置为 0 0 0
            }

            PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints());
@@ -2662,7 +2669,11 @@ public class PythonService {
                    designSingleItem.getScale(),
                    designSingleItem.getPriority(),
                    minioPath,
-                    gradientString));
+                    gradientString,
+                    /*designSingleItem.getMaskUrl()*/
+                    null
+            ));
+
        });


@@ -2684,7 +2695,7 @@ public class PythonService {
        DesignPythonItemPrint printOverall = new DesignPythonItemPrint();
        printToPython.setSingle(printSingle);
        printToPython.setOverall(printOverall);
-        if (printObject.isEmpty()){
+        if (Objects.isNull(printObject) || printObject.isEmpty()){
            return printToPython;
        }

@@ -2813,7 +2824,8 @@ public class PythonService {
     * @return
     */
    private DesignPythonBasic coverToSingleBasic(String singleOverall, String switchCategory,
-                                                 DesignLibraryModelPointVO designLibraryModelPoint) {
+                                                 DesignLibraryModelPointVO designLibraryModelPoint,
+                                                 String previewOrSubmit) {
        DesignPythonBasic basic = new DesignPythonBasic();
        basic.setSingle_overall(singleOverall);
        basic.setSwitch_category(switchCategory);
@@ -2825,6 +2837,7 @@ public class PythonService {
        basic.setScale_earrings(0.16);
        basic.setBody_point_test(getMap(designLibraryModelPoint));
        basic.setLayer_order(Boolean.TRUE);
+        basic.setPreview_submit(previewOrSubmit);
        return basic;
    }

@@ -2858,6 +2871,7 @@ public class PythonService {
            designPythonItemPrint.setPrint_path_list(new ArrayList<>());
            dress.setPrint(new PrintToPython(designPythonItemPrint));
            dress.setPath("aida-sys-image/images/female/blouse/0628001551.jpg");
+            dress.setColor("255 255 255");
            response.add(dress);

            DesignPythonItem skirt = new DesignPythonItem();
@@ -2869,6 +2883,7 @@ public class PythonService {
            designPythonItemPrint1.setPrint_path_list(new ArrayList<>());
            skirt.setPrint(new PrintToPython(designPythonItemPrint1));
            skirt.setPath("aida-sys-image/images/female/skirt/0628000022.jpg");
+            skirt.setColor("255 255 255");
 //            skirt.setPath("aida-sys-image/images/female/dress/0628000000.jpg");
            response.add(skirt);
        } else {
@@ -2881,6 +2896,7 @@ public class PythonService {
            designPythonItemPrint.setPrint_path_list(new ArrayList<>());
            top.setPrint(new PrintToPython(designPythonItemPrint));
            top.setPath("aida-sys-image/images/male/tops/mens_test_10.png");
+            top.setColor("255 255 255");
            response.add(top);

            DesignPythonItem bottom = new DesignPythonItem();
@@ -2892,6 +2908,7 @@ public class PythonService {
            designPythonItemPrint1.setPrint_path_list(new ArrayList<>());
            bottom.setPrint(new PrintToPython(designPythonItemPrint1));
            bottom.setPath("aida-sys-image/images/male/bottoms/mens_test_6252.png");
+            bottom.setColor("255 255 255");
            response.add(bottom);
        }

@@ -3349,6 +3366,7 @@ public class PythonService {
            }
        } catch (IOException e) {
            log.error("promptTranslation 用户输入翻译失败; error message => " + e.getMessage());
+            response.close();
            throw new RuntimeException(e);

        } finally {
@@ -3448,4 +3466,104 @@ public class PythonService {
        //生成失败
        throw new BusinessException("relightImage.interface.exception");
    }
+
+    public String imageToSketch(String imagePath, String bucket, String objectName, String styleCode, String styleImageUrl){
+        OkHttpClient client = new OkHttpClient().newBuilder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒)
+                .readTimeout(60, TimeUnit.SECONDS)//读取超时(单位:秒)
+                .writeTimeout(60, TimeUnit.SECONDS)//写入超时(单位:秒)
+                .build();
+        MediaType paramMap = MediaType.parse("application/json");
+        //关闭FastJson的引用检测 防止出现$ref 现象
+        Map<String, Object> map = new HashMap<>();
+        map.put("image_url", imagePath);
+        map.put("style_image_url", styleImageUrl);
+        map.put("default_style", styleCode);
+        map.put("sketch_bucket", bucket);
+        map.put("sketch_name", objectName);
+
+        String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty);
+        log.info("ImageToSketch请求python 参数:####{}", param);
+        RequestBody body = RequestBody.create(paramMap, param);
+        Request request = new Request.Builder()
+                .url(accessPythonIp + ":" + accessPythonPort + "/api/image2sketch")
+                .method("POST", body)
+                .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==")
+                .addHeader("Content-Type", "application/json")
+                .build();
+        Response response;
+
+        try {
+            response = client.newCall(request).execute();
+        } catch (IOException ioException) {
+            log.error("PythonService##ImageToSketch异常###{}", ExceptionUtil.getThrowableList(ioException));
+            throw new BusinessException("generate.interface.error");
+        }
+        int responseCode = response.code();
+        String bodyString;
+        try {
+            bodyString = response.body().string();
+            if (responseCode != HttpURLConnection.HTTP_OK) {
+                // 基本不会有除200以外的code
+                log.info("ImageToSketch 失败。 Response code {}", responseCode);
+                throw new BusinessException("ImageToSketch 失败。 Response code " + responseCode);
+            }
+            JSONObject jsonObject = JSON.parseObject(bodyString);
+            if (response.isSuccessful() && jsonObject.get("msg").equals("OK!")) {
+                String sketchResult = jsonObject.get("data").toString();
+                log.info("ImageToSketch 结果 ： {}", sketchResult);
+                return sketchResult;
+            }else {
+                log.info("ImageToSketch 失败。 Response code {}", responseCode);
+                throw new BusinessException("ImageToSketch 失败。 Response code " + responseCode);
+            }
+        } catch (IOException e) {
+            log.error("ImageToSketch 失败; error message => {}", e.getMessage());
+            response.close();
+            throw new BusinessException("generate.interface.error");
+        } finally {
+            response.close();
+        }
+    }
+
+    public void bright(String url, Double brightenValue) {
+        OkHttpClient client = new OkHttpClient().newBuilder()
+                .connectTimeout(30, TimeUnit.SECONDS)
+                .pingInterval(5, TimeUnit.SECONDS)//websocket轮训间隔(单位:秒)
+                .readTimeout(60, TimeUnit.SECONDS)//读取超时(单位:秒)
+                .writeTimeout(60, TimeUnit.SECONDS)//写入超时(单位:秒)
+                .build();
+        MediaType mediaType = MediaType.parse("application/json");
+        //关闭FastJson的引用检测 防止出现$ref 现象
+        Map<String, Object> map = new HashMap<>();
+        map.put("image_url", url);
+        map.put("brighten_value", brightenValue);
+        log.info("bright请求python 参数:####{}", map);
+        String param = JSON.toJSONString(map, SerializerFeature.WriteNullStringAsEmpty);
+        log.info(param);
+        RequestBody body = RequestBody.create(mediaType, param);
+        Request request = new Request.Builder()
+//                .url(accessPythonIp + ":" + accessPythonPort + "/api/generate_product_image")
+//                .url(accessPythonIp + ":9996/api/generate_product_image")
+                .url(accessPythonIp + ":" + accessPythonPort + "/api/brighten")
+                .method("POST", body)
+                .addHeader("Authorization", "Basic YWlkbGFiOjEyMw==")
+                .addHeader("Content-Type", "application/json")
+                .build();
+        Response response;
+        String responseBody;
+        try {
+            response = client.newCall(request).execute();
+        } catch (IOException ioException) {
+            log.error("PythonService##bright异常###{}", ExceptionUtil.getThrowableList(ioException));
+            throw new BusinessException("bright.interface.exception");
+        }
+        if (response.isSuccessful()) {
+            return;
+        }
+        log.error("PythonService##bright异常response###{}", response);
+        //生成失败
+        throw new BusinessException("bright.interface.exception");
+    }
 }
--- a/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java
+++ b/src/main/java/com/ai/da/python/vo/DesignPythonBasic.java
@@ -16,6 +16,8 @@ public class DesignPythonBasic {

    private String single_overall;

+    private String preview_submit;
+
    private String switch_category;
    /**
     * 排序
--- a/src/main/java/com/ai/da/python/vo/DesignPythonItem.java
+++ b/src/main/java/com/ai/da/python/vo/DesignPythonItem.java
@@ -82,6 +82,10 @@ public class DesignPythonItem {
     * 图层优先级
     */
    private Integer priority;
+    /**
+     * 标注过的mask
+     */
+    private String seg_mask_url;

    public static List<String> OUTWEAR_DRESS_BLOUSE = Arrays.asList(CollectionLevel2TypeEnum.OUTWEAR.getRealName(),
            CollectionLevel2TypeEnum.DRESS.getRealName(), CollectionLevel2TypeEnum.BLOUSE.getRealName());
@@ -134,6 +138,24 @@ public class DesignPythonItem {
        this.gradientString = gradientString;
    }

+    public DesignPythonItem(String type, String path, String color, PrintToPython print, Long businessId,
+                            Long image_id, List<Long> offset, Float[] resize_scale, Integer priority, String gradient,
+                            String gradientString, String seg_mask_url) {
+        this.type = type;
+        this.path = path;
+        this.color = color;
+        this.print = print;
+//        this.icon = icon;
+        this.businessId = businessId;
+        this.image_id = image_id;
+        this.offset = offset;
+        this.resize_scale = resize_scale;
+        this.priority = priority;
+        this.gradient = gradient;
+        this.gradientString = gradientString;
+        this.seg_mask_url = seg_mask_url;
+    }
+
    public DesignPythonItem(String type, String path, String color, PrintToPython print, String icon, Long businessId, Long image_id) {
        this.type = type;
        this.path = path;
--- a/src/main/java/com/ai/da/service/AccountLoginLogService.java
+++ b/src/main/java/com/ai/da/service/AccountLoginLogService.java
@@ -30,4 +30,12 @@ public interface AccountLoginLogService extends IService<AccountLoginLog> {
     */
    List<AccountLoginLog> getByUserId(Long AccountId);

+    /**
+     * 查询指定时间区间内的登录用户
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return 登录用户id
+     */
+    List<Long> getByDate(String startTime, String endTime);
+
 }
--- a/src/main/java/com/ai/da/service/AccountService.java
+++ b/src/main/java/com/ai/da/service/AccountService.java
@@ -5,11 +5,14 @@ import com.ai.da.mapper.primary.entity.TrialOrder;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.AccountLoginVO;
 import com.ai.da.model.vo.AccountPreLoginVO;
+import com.ai.da.model.vo.PersonalHomepageVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.web.multipart.MultipartFile;

 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
+import java.util.Map;

 /**
 * 服务类
@@ -129,7 +132,7 @@ public interface AccountService extends IService<Account> {

    void moveLibraryDate();

-    void updateCredits(Long accountId, String value);
+    void updateCreditsAndEndTime(Long accountId, String value);
    void updateCreditsAndEndTime(Long accountId, String value, Long endTime);

    Boolean designWorksRegister(AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO);
@@ -141,4 +144,43 @@ public interface AccountService extends IService<Account> {
    Boolean collectQuestionnaires(String questionnaireInfo);

    void refreshCreditsWeekly();
+
+    List<Account> getExpiredUserBySystemUser(Integer systemUserNum);
+
+    String getActivityBenefits();
+
+    void toVisitor(Account account);
+
+    List<Long> setUserValidToDayEnd();
+
+    IPage<Account> getPageByDateAndUserType(String startTime, String endTime, Integer type, int pageNum, int size);
+
+    Map<String, Long> getByDateAndUserType(String startTime, String endTime, Integer type);
+
+    IPage<Account> getPageByIds(List<Long> ids, int pageNum, int size);
+    List<Account> getByIds(List<Long> ids);
+
+    String uploadAvatar(MultipartFile file);
+
+    PersonalHomepageVO getPersonalHomepage(Long accountId);
+
+    Boolean viewsIncrease(Long id);
+
+    void registerUserToVisitor();
+
+    Map<String, Long> getNicknameModifyTimes();
+
+    void editUserName(String newUserName);
+
+    void verifyUserEmail(String verifyCode);
+
+    void changeUserEmail(String newMailbox);
+
+    void activateNewEmail(String token);
+
+    String updateNoLoginRequiredNew(NoLoginRequiredDTO noLoginRequiredDTO, HttpServletRequest request);
+
+    void halfPricePromotion();
+
+    List<String> getPaidCustomerEmail();
 }
--- a/src/main/java/com/ai/da/service/ChatRobotService.java
+++ b/src/main/java/com/ai/da/service/ChatRobotService.java
@@ -1,12 +1,15 @@
 package com.ai.da.service;

+import com.ai.da.mapper.primary.entity.ChatRobot;
 import com.ai.da.mapper.primary.entity.Library;
 import com.ai.da.model.dto.ChatFlushDTO;
 import com.ai.da.model.dto.ChatRobotLibraryDTO;
 import com.ai.da.model.dto.ChatSendDTO;
 import com.ai.da.model.vo.ChatRobotVO;
+import com.baomidou.mybatisplus.extension.service.IService;

 import java.math.BigDecimal;
+import java.util.List;

 /**
 * @author aida
@@ -15,7 +18,7 @@ import java.math.BigDecimal;
 * @description 对话机器人服务接口
 * @date 2023/7/25 16:42:18
 */
-public interface ChatRobotService {
+public interface ChatRobotService extends IService<ChatRobot> {
    ChatRobotVO sendMessageToChatRobot(ChatSendDTO chatSendDTO);

    String chatBufferFlush(ChatFlushDTO chatFlushDTO);
@@ -23,4 +26,6 @@ public interface ChatRobotService {
    Library pictureLikeOrUnLike(ChatRobotLibraryDTO chatRobotLibraryDTO);

    BigDecimal getBloodBars(Long userId);
+
+    Long getCountByUserAndTime(String startTime, String endTime, List<Long> accountIds);
 }
--- a/src/main/java/com/ai/da/service/CollectionService.java
+++ b/src/main/java/com/ai/da/service/CollectionService.java
@@ -14,7 +14,7 @@ public interface CollectionService extends IService<Collection> {
    /**
     * 保存collection
     */
-    Long saveCollection(Long accountId, String timeZone, String moodTemplateId);
+    Long saveCollection(Long accountId, String timeZone, String moodTemplateId, String moodboardPostion);

    /**
     * 根据主键查询
--- a/src/main/java/com/ai/da/service/ConvenientInquiryService.java
+++ b/src/main/java/com/ai/da/service/ConvenientInquiryService.java
@@ -0,0 +1,46 @@
+package com.ai.da.service;
+
+import com.ai.da.mapper.primary.entity.Account;
+import com.ai.da.mapper.primary.entity.Questionnaire;
+import com.ai.da.mapper.primary.entity.TrialOrder;
+import com.ai.da.model.dto.AccountAddDTO;
+import com.ai.da.model.vo.QuestionnaireFeedbackVO;
+import com.ai.da.model.vo.QuestionnaireVO;
+import com.ai.da.model.vo.QueryUserConditionsVO;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ConvenientInquiryService extends IService<Questionnaire> {
+
+    IPage<TrialOrder> getTrial(QueryUserConditionsVO queryUserConditionsVO);
+
+    QuestionnaireFeedbackVO getQuestionnaireInfo();
+
+    List<QuestionnaireVO> getAllQuestionnaire();
+
+    IPage<Account> recentNewUser(QueryUserConditionsVO queryUserConditionsVO);
+
+    Map<String, Object> recentNewUserChart(String startTime, String endTime, Integer userType);
+
+    IPage<Account> recentActiveUser(QueryUserConditionsVO queryUserConditionsVO);
+
+
+    int recentActiveUserChart(String startTime, String endTime);
+
+    Map<String, List<Object>> getActiveUserFunc(String startTime, String endTime, List<Long> ids);
+
+    Map<String, Object> conversionRate(String startTime, String endTime);
+
+    Map<String, List<Object>> trialUserCountry(String startTime, String endTime);
+
+    Boolean addUser(AccountAddDTO accountAddDTO);
+
+    Boolean modifyUser(Long accountId, Long validEndTime, Integer systemUser, Long credits);
+
+    IPage<Account> getUserInfo(QueryUserConditionsVO queryUserConditionsVO);
+
+    List<Map<String, Object>> getAllUserIdList();
+}
--- a/src/main/java/com/ai/da/service/CreditsService.java
+++ b/src/main/java/com/ai/da/service/CreditsService.java
@@ -33,7 +33,7 @@ public interface CreditsService extends IService<CreditsDetail> {

    CreditsDetail getByAccountIdAndChangeEvent(Long accountId, String changeEvent, String changedCredits);

-    void preInsert(Long accountId, String changeEventName, String taskId);
+    void preInsert(Long accountId, String changeEventName, String taskId, Boolean isPreInsert, String changedCredits);

    void updateChangedCredits(String accountId, String taskId);
 }
--- a/src/main/java/com/ai/da/service/DesignItemService.java
+++ b/src/main/java/com/ai/da/service/DesignItemService.java
@@ -58,4 +58,10 @@ public interface DesignItemService extends IService<DesignItem> {
    ComposeLayersVO editLayersPositionAndScale(EditLayersPositionAndScaleVO positionAndScaleVO) throws IOException;

    List<DesignItem> selectDesignIdById(List<Long> designItemIdList);
+
+    Long getCountByUserAndTime(String startTime, String endTime, List<Long> accountIds);
+
+    void convertHistoryMaskWithoutGradient();
+
+    void updateMaskUrl();
 }
--- a/src/main/java/com/ai/da/service/DesignService.java
+++ b/src/main/java/com/ai/da/service/DesignService.java
@@ -43,6 +43,8 @@ public interface DesignService extends IService<Design> {
     */
    DesignCollectionVO designItemList(Long designId);

+    List<Long> relationImageIds(DesignPythonObjects pythonObjects);
+
    /**
     * @return
     */
@@ -92,7 +94,9 @@ public interface DesignService extends IService<Design> {

    void relationImageId(DesignPythonObjects objects);

-    List<CollectionSketchVO> sketchesBoundingBox(SketchesBoundingBoxDTO sketchesBoundingBoxDTO);
+    List<CollectionSketchVO> sketchesBoundingBox(ReDesignCollectionDTO reDesignCollectionDTO);

    List<String> getModel(List<Long> designItemIdList);
+
+    Long getCountByUserAndTime(String startTime, String endTime, List<Long> accountIds);
 }
--- a/src/main/java/com/ai/da/service/GenerateService.java
+++ b/src/main/java/com/ai/da/service/GenerateService.java
@@ -3,11 +3,14 @@ package com.ai.da.service;
 import com.ai.da.mapper.primary.entity.Generate;
 import com.ai.da.mapper.primary.entity.GenerateDetail;
 import com.ai.da.model.dto.GenerateLikeDTO;
+import com.ai.da.model.dto.GenerateModifyDTO;
 import com.ai.da.model.dto.GenerateThroughImageTextDTO;
+import com.ai.da.model.dto.ImageToSketchDTO;
 import com.ai.da.model.vo.*;
 import com.baomidou.mybatisplus.extension.service.IService;

 import java.util.List;
+import java.util.Map;

 public interface GenerateService extends IService<Generate> {

@@ -38,4 +41,10 @@ public interface GenerateService extends IService<Generate> {
    void cancelGenerate(Long userId, List<String> uniqueId, String timeZone, String type);

    void processRelightResult(String taskId, String url, String category);
+
+    List<Map<String, Object>> getCountByUserAndTime(String startTime, String endTime, List<Long> accountIdList);
+
+    GenerateResultVO imageToSketch(ImageToSketchDTO imageToSketchDTO);
+
+    GenerateResultVO modifySketch(GenerateModifyDTO generateModifyDTO);
 }
--- a/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java
+++ b/src/main/java/com/ai/da/service/ITDesignPythonOutfitDetailService.java
@@ -36,7 +36,9 @@ public interface ITDesignPythonOutfitDetailService extends IService<TDesignPytho

    DesignPythonOutfitVO convertToDesignPythonOutfitVO(TDesignPythonOutfitDetail detail, List<Long> offset);

-    void deleteByDesignPythonOutfitId(Long designPythonOutfitId);
+    void deleteByDesignPythonOutfitIdLogical(Long designPythonOutfitId);
+
+    void deleteByDesignPythonOutfitIdPhysical(Long designPythonOutfitId);

    void setDesignPythonOutfitDetailPriority(List<TDesignPythonOutfitDetail> details);

--- a/src/main/java/com/ai/da/service/MessageCenterService.java
+++ b/src/main/java/com/ai/da/service/MessageCenterService.java
@@ -0,0 +1,30 @@
+package com.ai.da.service;
+
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.mapper.primary.entity.Notification;
+import com.ai.da.model.dto.GetNotificationDTO;
+import com.ai.da.model.vo.NotificationVO;
+import com.ai.da.model.dto.PublishSysNotificationDTO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+public interface MessageCenterService extends IService<Notification> {
+
+    Map<String, Long> getAllTypeMessageUnreadCount();
+
+    PageBaseResponse<NotificationVO> getHistoryNotification(GetNotificationDTO getNotificationDTO);
+
+    void prePushMessage(Notification notification);
+
+    void pushMessage(String type, Long receiverId);
+
+    void cancelPushMessage(String type, Long senderId, Long receiverId, Long portfolioId, Long commentId);
+
+    Boolean setReadStatus(List<Long> notificationIdList, String type);
+
+    void setReadAll(String type);
+
+    void publishSystemNotification(PublishSysNotificationDTO message);
+}
--- a/src/main/java/com/ai/da/service/PortfolioService.java
+++ b/src/main/java/com/ai/da/service/PortfolioService.java
@@ -1,16 +1,17 @@
 package com.ai.da.service;

 import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.mapper.primary.entity.Account;
 import com.ai.da.mapper.primary.entity.Portfolio;
 import com.ai.da.model.dto.*;
-import com.ai.da.model.vo.CommentVO;
-import com.ai.da.model.vo.PortfolioVO;
-import com.ai.da.model.vo.UserLikeChooseVO;
+import com.ai.da.model.vo.*;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;

+import java.util.List;
+
 public interface PortfolioService extends IService<Portfolio> {
-    Boolean publish(MultipartFile canvas, String data);
+    Long publish(MultipartFile canvas, String data);

    PortfolioVO update(PortfolioDTO portfolioDTO);

@@ -41,4 +42,24 @@ public interface PortfolioService extends IService<Portfolio> {
    Boolean delete(Long id);

    Portfolio getByIdAll(Long originalPortfolioId);
+
+    void follow(Long followeeId);
+
+    void cancelFollow(Long followeeId);
+
+    Long getFolloweeCount(Long accountId);
+
+    List<AccountFollowVO> getFolloweeList(GetFollowListDTO getFollowListDTO);
+
+    Long getFollowerCount(Long accountId);
+
+    List<AccountFollowVO> getFollowerList(GetFollowListDTO getFollowListDTO);
+
+    Integer getIfFollowed(Long followeeId, Long followerId);
+
+    Long getPortfolioCount(Long accountId);
+
+    List<Long> getFolloweeList(Long accountId);
+
+//    List<PortfolioVO> queryPortfolioByTag(String tagName, Long tagId);
 }
--- a/src/main/java/com/ai/da/service/TagsService.java
+++ b/src/main/java/com/ai/da/service/TagsService.java
@@ -0,0 +1,14 @@
+package com.ai.da.service;
+
+import com.ai.da.mapper.primary.entity.Tags;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface TagsService extends IService<Tags> {
+
+    List<Tags> getTags(String tagPrefix);
+
+    Tags addTag(String tagName);
+
+}
--- a/src/main/java/com/ai/da/service/UserLikeGroupService.java
+++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java
@@ -60,4 +60,6 @@ public interface UserLikeGroupService extends IService<UserLikeGroup> {
    List<ToProductImageResult> relight(ToProductImageDTO toProductImageDTO);

    List<MagicToolResultVO> getRelightResult(List<String> taskIdList);
+
+    String likeHistoryRelSketch();
 }
--- a/src/main/java/com/ai/da/service/UserLikeService.java
+++ b/src/main/java/com/ai/da/service/UserLikeService.java
@@ -5,6 +5,7 @@ import com.ai.da.model.vo.UserLikeVO;
 import com.baomidou.mybatisplus.extension.service.IService;

 import java.util.List;
+import java.util.Map;

 /**
 * 服务类
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xupei	49f08d1191	管理员系统优化-1	2024-11-06 17:51:51 +08:00
xupei	903bafb245	管理员系统优化	2024-11-06 17:27:16 +08:00
xupei	59b02b3f28	to prod	2024-11-04 10:49:29 +08:00
xupei	4a23e33080	BUGFIX：作品删除后，获取点赞详细报错	2024-11-04 10:42:35 +08:00
xupei	1e1b06fc48	chat-robot返回sketch图片地址变更	2024-10-29 16:53:17 +08:00
xupei	7c56d2bf4e	to dev	2024-10-29 10:33:48 +08:00
xupei	4add0a806c	游客转试用用户，添加积分	2024-10-29 10:25:36 +08:00
xupei	c9bb7fe502	to prod	2024-10-29 10:03:21 +08:00
xupei	a8a7a129c9	Merge branch 'dev/dev' into release/3.0	2024-10-29 09:59:39 +08:00
xupei	c3c5532cb5	Merge branch 'dev/dev_xp' into dev/dev	2024-10-29 09:58:43 +08:00
xupei	78bfc16287	BUGFIX:imageToSketch 积分扣除校验	2024-10-29 09:57:34 +08:00
shahaibo	6c6162df74	BUGFIX:定时任务开启;	2024-10-23 08:54:00 +08:00
shahaibo	a837aff0fb	BUGFIX:定时任务开启;	2024-10-22 10:06:12 +08:00
shahaibo	f673afc7fc	TASK:配置	2024-10-21 10:59:50 +08:00
shahaibo	0ea96c728c	BUGFIX:模特预览默认颜色添加;	2024-10-20 13:39:01 +08:00
shahaibo	77e71e3296	TASK:aida作品集查询;	2024-10-20 13:27:45 +08:00
shahaibo	ce870b9acf	TASK:aida;	2024-10-20 11:50:52 +08:00
shahaibo	7f889b54e0	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-20 10:52:24 +08:00
shahaibo	ebd596d0d2	TASK:aida;	2024-10-20 10:52:14 +08:00
xupei	04ce95caa4	添加preview_submit字段to python	2024-10-15 10:44:26 +08:00
xupei	29bf172187	取消用户自定义mask的功能	2024-10-15 10:30:02 +08:00
shahaibo	41619febb9	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-14 11:18:30 +08:00
shahaibo	0f4b769d49	BUGFIX:moodboard合成图裁剪;	2024-10-14 11:18:18 +08:00
xupei	66cd8217b9	更新undividedLayer临时访问地址缓存	2024-10-14 11:16:57 +08:00
xupei	e684c4e547	Merge branch 'release/3.0' into dev/dev # Conflicts: # src/main/java/com/ai/da/common/constant/CommonConstant.java # src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java # src/main/java/com/ai/da/controller/PortfolioController.java # src/main/java/com/ai/da/model/dto/QueryPortfolioPageDTO.java # src/main/java/com/ai/da/service/PortfolioService.java # src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java # src/main/resources/messages_en.properties # src/main/resources/messages_zh.properties	2024-10-10 23:26:20 +08:00
xupei	c439f41d69	bugfix:参与活动作品为0时查询出错	2024-10-09 16:42:45 +08:00
xupei	823e96b014	发布准备	2024-10-09 15:47:29 +08:00
xupei	0cca24ee30	修改环境及打开监听	2024-10-09 15:44:47 +08:00
xupei	66cccd0867	添加校验，二创作品不能参与活动	2024-10-09 15:40:29 +08:00
xupei	463ddf3cb2	1、为发布的作品添加标签 2、修改标签 3、不允许用户重复参与活动 4、查询所有参与活动的作品	2024-10-09 13:51:16 +08:00
shahaibo	f0e0987f31	BUGFIX:发布作品返回作品ID;	2024-10-09 13:10:48 +08:00
shahaibo	16bea58ab5	BUGFIX:更新作品集作品名重复判断;	2024-10-09 11:43:05 +08:00
shahaibo	f2bbbaaeb6	BUGFIX:history retrieval返回新增portfolio信息;	2024-10-09 11:34:04 +08:00
shahaibo	5098f6f4a1	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-08 17:07:43 +08:00
shahaibo	bc1815ae1b	TASK:pantone提示词;	2024-10-08 17:07:30 +08:00
xupei	6256c90958	bugfix:修改提取的sketch，图片后缀问题	2024-10-08 16:36:48 +08:00
xupei	f0bfe249e0	bugfix:修改提取的sketch，图片后缀问题	2024-10-08 16:17:45 +08:00
xupei	7bbfd7c506	Merge branch 'dev/dev_xp' into dev/dev	2024-10-08 15:49:39 +08:00
xupei	3c7cbe28a1	design single preview_submit	2024-10-08 15:48:53 +08:00
xupei	c834aacf3a	Merge branch 'dev/dev_xp' into dev/dev	2024-10-08 15:44:36 +08:00
xupei	90b0ef41e3	bugfix:修改提取出的sketch	2024-10-08 15:44:01 +08:00
shahaibo	2aeeec4468	TASK:裁剪;	2024-10-08 14:05:13 +08:00
xupei	a7c5723e10	保存修改	2024-10-08 13:34:10 +08:00
shahaibo	ba595b9d2c	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-08 13:18:12 +08:00
shahaibo	d9118aaf93	TASK:AiDA workshop活动;	2024-10-08 13:17:55 +08:00
xupei	1bdc71998b	按标签查询作品	2024-10-08 13:13:13 +08:00
xupei	a597f7a67a	为作品添加标签	2024-10-07 21:27:37 +08:00
xupei	195964ef5a	重新获取修改后的sketch的临时访问地址	2024-10-07 11:28:48 +08:00
shahaibo	c27ca77717	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-06 14:33:44 +08:00
shahaibo	7d0d460e5c	bugfix:redesign bug;	2024-10-06 14:33:31 +08:00
xupei	5ac9df3056	Merge branch 'dev/dev_xp' into dev/dev	2024-10-06 14:28:18 +08:00
xupei	b8d64f1f28	获取指定用户的个人主页作品	2024-10-06 14:27:55 +08:00
xupei	c8dd9664be	Merge branch 'dev/dev_xp' into dev/dev	2024-10-04 16:10:05 +08:00
xupei	8899a3a6bb	SketchStyle 去除自定义风格	2024-10-04 11:45:00 +08:00
shahaibo	67f56f9b84	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-04 10:41:23 +08:00
shahaibo	fd12b9e571	TASK:male sketch style逻辑添加;	2024-10-04 10:40:32 +08:00
xupei	fb329c94aa	Merge branch 'dev/dev_xp' into dev/dev	2024-10-03 16:49:03 +08:00
xupei	16d06582ee	重置designSingle返回的sketch在minio的临时访问凭证	2024-10-03 16:41:48 +08:00
shahaibo	6f98f111dd	TASK:十月优惠邮件发送接口;	2024-10-03 12:15:55 +08:00
shahaibo	51a1c1d8e1	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-10-03 12:14:43 +08:00
shahaibo	8445c23984	TASK:十月优惠邮件发送接口;	2024-10-03 12:14:30 +08:00
xupei	961f8f874e	获取消息按时间逆序	2024-10-01 16:08:40 +08:00
xupei	283b6244b1	消息推送连接关闭时避免报错	2024-10-01 10:29:06 +08:00
xupei	f19a15dbe8	Merge branch 'dev/dev_xp' into dev/dev	2024-09-30 17:16:11 +08:00
xupei	791d44df02	消息推送 bug修改	2024-09-30 17:15:11 +08:00
shahaibo	28e67db78d	TASK:aida redesign不修改位置信息√接口修改;	2024-09-30 15:41:29 +08:00
shahaibo	63a120c652	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-09-30 14:49:05 +08:00
shahaibo	f60cabbbc0	TASK:aida design统计;	2024-09-30 14:48:44 +08:00
xupei	06db759749	my work bug修复	2024-09-30 11:28:53 +08:00
shahaibo	373608d989	TASK:aida design统计;	2024-09-29 18:32:06 +08:00
shahaibo	45e3dde03f	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-09-29 17:59:00 +08:00
shahaibo	3625180a6e	Merge branch 'release/3.0' into dev/dev # Conflicts: # src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java # src/main/java/com/ai/da/controller/ThirdPartyController.java # src/main/java/com/ai/da/service/AccountService.java # src/main/java/com/ai/da/service/impl/AccountServiceImpl.java	2024-09-29 17:56:49 +08:00
xupei	aae1442a6f	websocket获取关注数与粉丝数	2024-09-29 15:55:12 +08:00
xupei	08dcd03468	修改默认头像	2024-09-28 20:14:19 +08:00
shahaibo	deda511e32	TASK:aida;	2024-09-27 16:43:02 +08:00
shahaibo	9bcf615b4b	TASK:aida;	2024-09-27 16:30:58 +08:00
shahaibo	70912c4c43	Merge remote-tracking branch 'origin/dev/dev' into dev/dev	2024-09-27 16:24:56 +08:00
shahaibo	fa013c1974	TASK:aida;	2024-09-27 16:24:45 +08:00
xupei	11fbeb1ed0	Merge branch 'dev/dev_xp' into dev/dev # Conflicts: # src/main/java/com/ai/da/common/utils/RedisUtil.java # src/main/java/com/ai/da/service/AccountService.java	2024-09-27 15:43:48 +08:00
xupei	f432b8cce6	修改提取的sketch	2024-09-27 15:40:30 +08:00
shahaibo	05ddd33bcd	TASK:aida;	2024-09-27 15:33:20 +08:00
shahaibo	9f5c901502	TASK:aida;	2024-09-27 14:42:30 +08:00
xupei	33d5d3a2ea	上传图片超时，邮件提醒开发相关人员	2024-09-26 11:46:23 +08:00
xupei	2668dd3c47	redis 添加key	2024-09-25 16:17:55 +08:00
xupei	2bc5fef175	1、修改用户名 2、更改账号绑定邮箱地址	2024-09-25 16:15:18 +08:00
xupei	ea92e1f20d	to dev	2024-09-25 11:38:11 +08:00
xupei	9f1cf1d90e	Merge branch 'dev/dev_xp' into dev/dev	2024-09-25 11:31:40 +08:00
xupei	b43f9baead	修改 imageToSketch	2024-09-25 11:30:51 +08:00
shahaibo	41ffe335fc	TASK:mq配置	2024-09-24 15:43:37 +08:00
shahaibo	56d0dcd25f	TASK:数据迁移	2024-09-24 15:20:24 +08:00
shahaibo	4304acbe6f	BUGFIX:作品广场	2024-09-24 14:37:22 +08:00
xupei	2f1b22d423	Merge branch 'refs/heads/release/3.0' into dev/dev_xp # Conflicts: # src/main/java/com/ai/da/common/utils/RedisUtil.java # src/main/java/com/ai/da/service/impl/AccountServiceImpl.java # src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java	2024-09-24 10:27:18 +08:00
xupei	3eb8626831	修改 imageToSketch	2024-09-24 10:20:08 +08:00
xupei	5a86f2e649	修改 imageToSketch	2024-09-23 11:13:44 +08:00
xupei	93e9c61943	1、新增 imageToSketch 2、删除无用代码	2024-09-20 11:32:09 +08:00
shahaibo	c5e9941adb	BUGFIX:design colorboard元素混入sketchboard;	2024-09-20 11:31:48 +08:00
xupei	56679808e9	mask更新从sketch分割	2024-09-19 09:50:56 +08:00
shahaibo	40f5705e7a	TASK:凭证更新;	2024-09-13 11:24:14 +08:00
shahaibo	32975d9900	TASK:链接注册试用;	2024-09-13 11:16:17 +08:00
shahaibo	72db49e7f5	Merge remote-tracking branch 'origin/release/3.0' into release/3.0	2024-09-13 11:13:42 +08:00
shahaibo	472f5e65b4	TASK:凭证更新;	2024-09-13 11:13:23 +08:00
xupei	e2f8fb082c	广场用户注册修改添加账户开始时间并设置积分为0	2024-09-13 10:43:28 +08:00
xupei	a47e53b19e	mask 数据替换,代码暂存	2024-09-13 10:09:33 +08:00
xupei	c01acec9e6	Merge branch 'dev/dev_xp' into dev/dev	2024-09-09 10:50:14 +08:00
xupei	969d7586fc	mask替换相关接口--未完善版，暂存	2024-09-06 12:34:36 +08:00
xupei	31a40ff7ca	关闭dev定时任务	2024-09-06 10:01:28 +08:00
xupei	afb9c99228	Merge branch 'dev/dev_xp' into dev/dev	2024-09-06 09:32:40 +08:00
xupei	8ee6a529a0	作品广场优化，将点赞前三和浏览量前三的作品放在第一页的最前面	2024-09-02 12:02:54 +08:00
xupei	cebc05d132	BUGFIX：管理员系统添加新用户邮箱校验，相同的邮箱只能创建一个账号	2024-08-27 11:32:47 +08:00
xupei	d23ac82b1b	TASK:code-create 注册用户添加为AiDA的游客 BUGFIX：0关注状态下获取动态	2024-08-27 11:27:05 +08:00
xupei	e86b576050	TASK:动态	2024-08-23 17:34:38 +08:00
xupei	8a774aa328	管理员系统优化按用户名或用户邮箱查询用户design频率	2024-08-21 15:07:14 +08:00
xupei	c5da68dc47	1、获取关注、粉丝列表、消息详细返回参数统一 2、管理员系统按用户名或用户邮箱查询用户design频率	2024-08-21 14:31:10 +08:00
xupei	28df672a7d	优化获取关注、粉丝列表	2024-08-21 10:23:55 +08:00
xupei	203c88dd70	添加头像	2024-08-19 15:10:41 +08:00
xupei	fa86a2af45	添加关注、取消关注、获取关注列表、粉丝列表相关接口	2024-08-19 11:52:53 +08:00
xupei	ac28ba233c	消息通知系统-一键已读；反复点赞、关注及取消数据存储处理，	2024-08-16 10:32:15 +08:00
shahaibo	47dc2bfc6e	BUGFIX:二创变原创	2024-08-15 16:37:24 +08:00
xupei	085dac0630	消息通知系统	2024-08-15 16:25:44 +08:00
xupei	7b27b1362d	Merge branch 'dev/dev_xp' into release/3.0 # Conflicts: # src/main/java/com/ai/da/service/impl/AccountServiceImpl.java	2024-08-12 09:54:28 +08:00
xupei	704e3c25bf	BUG修复：用户更改套餐，积分/用户角色不变更问题	2024-08-12 09:51:39 +08:00
xupei	7e5b10aab3	通过邮箱查询账户，忽略邮箱大小写	2024-08-08 10:54:22 +08:00
xupei	3ccbd8f905	账号置为游客日志添加	2024-08-08 10:13:47 +08:00
xupei	89a234e77d	to prod	2024-08-06 11:43:20 +08:00
xupei	388dd54bfa	to prod	2024-08-06 11:41:48 +08:00
xupei	035c4412f1	Merge branch 'dev/dev' into release/3.0	2024-08-06 11:35:55 +08:00
xupei	d4eb7c846b	to dev	2024-08-06 11:35:11 +08:00
xupei	fef50d7a37	Merge branch 'dev/dev_xp' into dev/dev	2024-08-06 11:30:02 +08:00
xupei	e5a95972a5	modify : 管理员系统	2024-08-06 11:29:33 +08:00
shahaibo	36a796b38b	BUGFIX:多个印花	2024-08-05 17:44:53 +08:00
xupei	94927ae0a4	modify	2024-08-05 15:48:50 +08:00
xupei	4d7153661c	Merge branch 'release/3.0' into dev/dev	2024-08-05 15:39:01 +08:00
xupei	76062136d6	Merge branch 'dev/dev_xp' into dev/dev	2024-08-05 15:38:05 +08:00
xupei	ea4ba74989	管理员系统功能添加	2024-08-05 15:19:02 +08:00
shahaibo	5a09d7a195	BUGFIX:过滤已废弃	2024-08-02 12:28:58 +08:00
shahaibo	e0332b9ddf	BUGFIX:过滤已废弃	2024-08-02 12:21:30 +08:00
shahaibo	685ba09f7d	BUGFIX:过滤已废弃	2024-08-02 12:13:32 +08:00
shahaibo	7aa1fc0342	BUGFIX:过滤已废弃	2024-08-02 11:56:17 +08:00
shahaibo	653264151a	BUGFIX:过滤已废弃	2024-08-02 11:53:50 +08:00
shahaibo	fada00c738	BUGFIX:过滤已废弃	2024-08-02 11:36:58 +08:00
xupei	a10d30337a	支付切换为live	2024-08-01 10:30:44 +08:00
xupei	85ffed114b	语言适配	2024-08-01 10:07:24 +08:00
xupei	1093ac68b6	查询指定用户各功能使用情况	2024-08-01 10:00:26 +08:00
xupei	71e6abd816	to prod	2024-07-29 17:52:06 +08:00
xupei	00c948116e	to prod	2024-07-29 17:50:40 +08:00
xupei	b6efd598bd	to prod	2024-07-29 17:50:09 +08:00
xupei	bfe7ad4aa6	to prod	2024-07-29 17:49:16 +08:00
xupei	018ccef46a	to prod	2024-07-29 17:47:09 +08:00
xupei	feb836f849	调查问卷	2024-07-29 17:36:32 +08:00
xupei	0106f21b86	Merge branch 'dev/dev_xp' into dev/dev	2024-07-29 17:31:21 +08:00
xupei	1b5f64785d	调查问卷查看	2024-07-29 17:24:14 +08:00
xupei	77a4aee88e	取消英文字母的正则匹配	2024-07-24 09:44:32 +08:00
shahaibo	ce1e2f3eab	TASK:取消定时任务	2024-07-22 11:18:43 +08:00
shahaibo	75fbd2844b	TASK:mq配置	2024-07-22 11:15:25 +08:00
shahaibo	832f331603	TASK:配置文件dev分支改为dev	2024-07-22 11:14:19 +08:00
xupei	9a2d58d922	正则匹配输入的英文文本	2024-07-22 09:46:11 +08:00
徐佩	34c4cd47ef	Merge remote-tracking branch 'origin/release/3.0' into dev/dev # Conflicts: # src/main/java/com/ai/da/common/task/AccountTask.java	2024-07-21 09:54:42 +08:00
xupei	c46f65600f	添加开展活动接口	2024-07-19 15:40:54 +08:00
xupei	aa1eb7411e	stripe 设置支付链接语言	2024-07-17 17:12:25 +08:00