BUGFIX:aida;

src/main/java/com/ai/da/common/utils/SendEmailUtil.java

@@ -385,20 +385,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";
+                subject = "Upcoming System Upgrade for AiDA 3.0";
-                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID);
+                template.setTemplateID(UPGRADE_NOTIFICATION_ID);
             }else {
-                subject = "系统升级成功和AiDA 3.0新功能";
+                subject = "即将到来的AiDA 3.0系统升级";
-                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE);
+                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);
+//            }else {
+//                subject = "系统升级成功和AiDA 3.0新功能";
+//                template.setTemplateID(UPGRADE_SUCCESS_NOTIFICATION_ID_CHINESE);
+//            }
             template.setTemplateData(buildAccountData(account));
 
             req.setSubject(subject);

src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

@@ -929,7 +929,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         QueryWrapper<Account> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("id", 88L);
         queryWrapper.and(wrapper ->
-                        wrapper.gt("valid_end_time", 1715817600000L)
+                        wrapper.gt("valid_end_time", 1720540799000L)
                                 .or().isNull("valid_end_time"))
                 .isNotNull("user_email");
 

src/main/resources/application-prod.properties

@@ -7,7 +7,7 @@ spring.datasource.primary.username=root
 spring.datasource.primary.password=QWa998345
 
 spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_new?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_retrieval_new_style?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 spring.datasource.secondary.username=aida_con
 spring.datasource.secondary.password=123456
 
@@ -20,7 +20,7 @@ spring.security.jwtExpiration=8640000000
 #spring security权限设置 认证了token还要认证权限 不然报错Full authentication is required to access this resource
 spring.security.ignorePaths=/,/favicon.ico,/doc.html,/webjars/**,/swagger-resources,/v2/api-docs,\
   /api/account/**,/api/element/**,/api/python/**,/api/design/**,/api/history/**,/api/library/**,/api/third/party/**,/api/generate/**,/api/workspace/**,/api/classification/**,\
-  /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR
+  /api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**
 spring.security.authApi=/auth/login
 
 
@@ -43,11 +43,10 @@ file.windows.path=D:\\upload\\
 spring.servlet.multipart.max-file-size = 10MB
 spring.servlet.multipart.max-request-size= 10MB
 #访问python服务的ip(对应环境)
-#access.python.ip=http://43.198.80.117
 access.python.ip=http://18.167.251.121
-#access.python.ip=http://18.167.251.121:9991/
 access.python.port=9990
-access.python.sr=http://18.167.251.121:9995
+access.python.generate_sr_port=9995
+access.python.address=http://18.167.251.121:9995
 
 minio.endpoint=https://www.minio.aida.com.hk:9000
 minio.accessKey=admin
@@ -59,6 +58,8 @@ minio.bucketName.sysImage=aida-sys-image
 minio.bucketName.users=aida-users
 minio.bucketName.collectionElement=aida-collection-element
 minio.bucketName.gradient=aida-gradient
+minio.bucketName.modifiedSketch=aida-modified-sketch
+minio.bucketName.slogan=aida-slogan
 redirect_url=http://18.167.251.121:7788
 
 spring.rabbitmq.host=18.167.251.121
@@ -86,4 +87,10 @@ redis.key.SRCancelSet=SRCancelSet
 redis.key.SRExceptionMap=SRExceptionMap
 redis.key.taskList=TaskList
 redis.key.credits.pre-deduction=Credits:PreDeduction
-redis.key.generateResult=Generate:Result
+redis.key.generateResult=Generate:Result
+redis.key.toProductImageResultKey=ToProductImage:Result
+redis.key.relightResultKey=Relight:Result
+
+aws.s3.accessKeyId=AKIAVD3OJIMF6UJFLSHZ
+aws.s3.secretKey=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
+aws.s3.regionName=ap-east-1