Merge branch 'release/3.0' into dev/dev_xp

# Conflicts:
#	pom.xml
#	src/main/java/com/ai/da/common/utils/SendEmailUtil.java

pom.xml

@@ -202,6 +202,13 @@
             <version>20230618</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.1</version>
+        </dependency>
+
+
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java

@@ -12,16 +12,16 @@ public class MQConfig {
 //    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-dev";
+    public static final String GENERATE_RESULT_QUEUE = "GenerateImage-prod";
 
     public MQConfig() {
     }

src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java

@@ -89,7 +89,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
 
     private void extracted(HttpServletRequest request) throws AuthenticationException {
         String jwtToken = request.getHeader(properties.getJwtTokenHeader());
-        log.debug("后台检查令牌:{}", jwtToken);
+//        log.debug("后台检查令牌:{}", jwtToken);
 
         if (StrUtil.isBlank(jwtToken)) {
             String ipAddress = RequestInfoUtil.getIpAddress(request);

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

@@ -135,6 +135,7 @@ public class SendEmailUtil {
     private final static Long NOTIFICATION_CHINESE_TEMPLATE_ID = 122229L;
     private final static Long TRIAL_ORDER_LIST_ID = 122273L;
     private final static Long NO_TRIAL_ORDER_LIST_ID = 122591L;
+
     public static void sendCustomEmail(String receiverAddress, String senderAddress, TrialOrder trialOrder, int emailType, String country) {
         try {
             // 实例化一个认证对象
@@ -229,6 +230,7 @@ public class SendEmailUtil {
         }
     }
 
+
     public static void sendNoExcelEmail(String receiverAddress, String senderAddress) {
         try {
             // 实例化一个认证对象

src/main/java/com/ai/da/controller/WorkspaceController.java

@@ -44,8 +44,8 @@ public class WorkspaceController {
     @GetMapping("/detail")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "详情", notes = "传入workspace")
-    public Response<Workspace> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+    public Response<WorkspaceVO> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
-        Workspace detail = workspaceService.getByIdNew(id);
+        WorkspaceVO detail = workspaceService.getByIdNew(id);
         return Response.success(detail);
     }
 

src/main/java/com/ai/da/model/vo/CollectionColorVO.java

@@ -3,10 +3,12 @@ package com.ai.da.model.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
 
 @Data
+@EqualsAndHashCode
 @ApiModel("设计Collection颜色板 响应")
 public class CollectionColorVO {
 

src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java

@@ -3,10 +3,12 @@ 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;
 
 @Data
+@EqualsAndHashCode
 @ApiModel("用户关联的collection-响应")
 public class UserLikeCollectionVO {
 

src/main/java/com/ai/da/python/PythonService.java

@@ -679,7 +679,7 @@ public class PythonService {
         }
         if (attributeRetrievalAttrDict.getOpeningType() != null) {
             nonNullFields.add("openingType");
-            if (tableName.equals("male_outwear")) {
+            if (tableName.equals("male_outwear") || tableName.equals("male_top") || tableName.equals("male_bottom")) {
                 nonNullFields.remove("openingType");
                 attributeRetrievalAttrDict.setOpeningType(null);
             }
@@ -965,7 +965,7 @@ public class PythonService {
         QueryWrapper<Dressing> qw = new QueryWrapper<>();
         qw.lambda().eq(Dressing::getApparel, validateElementVO.getModelSex());
         if (validateElementVO.getSingleOverall().equals(SingleOverallEnum.SINGLE.getRealName())) {
-            qw.lambda().eq(Dressing::getApparel, validateElementVO.getSwitchCategory());
+            qw.lambda().eq(Dressing::getStyleCategory, validateElementVO.getSwitchCategory());
         }
         List<Dressing> dressings = dressingMapper.selectList(qw);
         if (CollectionUtil.isEmpty(dressings)) {

src/main/java/com/ai/da/service/WorkspaceService.java

@@ -35,7 +35,7 @@ public interface WorkspaceService extends IService<Workspace> {
 
     List<BizJson> getEnumValues(String enumName);
 
-    Workspace getByIdNew(Long id);
+    WorkspaceVO getByIdNew(Long id);
 
     List<ModelsVO> getMannequins(String sex);
 

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

@@ -482,7 +482,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
         }
         // 先检测用户名和邮箱
         QueryWrapper<Account> qw = new QueryWrapper<>();
-        qw.eq("BINARY email", accountTrialDTO.getEmail());
+        qw.eq("BINARY user_email", accountTrialDTO.getEmail());
         List<Account> accountList = accountMapper.selectList(qw);
         if (CollectionUtil.isNotEmpty(accountList)) {
             if (accountList.get(0).getIsTrial() == 1) {
@@ -533,7 +533,11 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
 //            SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2);
 //            SendEmailUtil.sendCustomEmail("calvinwong@aidlab.hk", null, trialOrder,2);
 //            SendEmailUtil.sendCustomEmail("kaicpang.pang@connect.polyu.hk", null, trialOrder,2);
-            SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            if (trialOrder.getCountry().equals("China")) {
+                SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            }else {
+                SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            }
         }
         return Boolean.TRUE;
     }
@@ -554,7 +558,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
             trialOrderMapper.updateById(trialOrder);
 
             QueryWrapper<Account> qw = new QueryWrapper<>();
-            qw.eq("BINARY email", trialOrder.getEmail());
+            qw.eq("BINARY user_email", trialOrder.getEmail());
             List<Account> accountList = accountMapper.selectList(qw);
 
             Account account = new Account();
@@ -578,10 +582,14 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
                 accountMapper.insert(account);
             }
             // 发送邮件提醒用户试用用户已创建
-//            SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2);
+//            SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2, trialOrder.getCountry());
-//            SendEmailUtil.sendCustomEmail("calvinwong@aidlab.hk", null, trialOrder,2);
+//            SendEmailUtil.sendCustomEmail("calvinwong@aidlab.hk", null, trialOrder,2, trialOrder.getCountry());
-//            SendEmailUtil.sendCustomEmail("kaicpang.pang@connect.polyu.hk", null, trialOrder,2);
+//            SendEmailUtil.sendCustomEmail("kaicpang.pang@connect.polyu.hk", null, trialOrder,2, trialOrder.getCountry());
-            SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            if (trialOrder.getCountry().equals("China")) {
+                SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            }else {
+                SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3, trialOrder.getCountry());
+            }
         }
         return Boolean.TRUE;
     }

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

@@ -190,11 +190,11 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
         if (CollectionUtils.isEmpty(ids)) {
             return;
         }
-        QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>();
+//        QueryWrapper<CollectionElement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id", ids);
+//        queryWrapper.in("id", ids);
-        CollectionElement collectionElement = new CollectionElement();
+//        CollectionElement collectionElement = new CollectionElement();
-        collectionElement.setCollectionId(0L);
+//        collectionElement.setCollectionId(0L);
-        collectionElementMapper.update(collectionElement, queryWrapper);
+        collectionElementMapper.deleteBatchIds(ids);
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.ai.da.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.ai.da.common.config.exception.BusinessException;
 import com.ai.da.common.enums.CollectionLevel1TypeEnum;
 import com.ai.da.common.enums.DesignTypeEnum;
@@ -129,6 +130,12 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
                 default:
             }
         });
+        if (CollectionUtil.isNotEmpty(response.getColorBoards())) {
+            List<CollectionColorVO> collect = response.getColorBoards().stream()
+                    .distinct()
+                    .collect(Collectors.toList());
+            response.setColorBoards(collect);
+        }
         return response;
     }
 

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

@@ -300,7 +300,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         //generate转化为collection(生成)
         saveCollectionElemntsByGenerates(elementVO, collectionId);
         //保存颜色版
-        List<CollectionElementVO> colorElementList = collectionElementService.saveColorBoard(designDTO.getColorBoards(), collectionId, designDTO.getTimeZone());
+        collectionElementService.saveColorBoard(designDTO.getColorBoards(), collectionId, designDTO.getTimeZone());
         //保存design
         Long designId = saveOne(designDTO, collectionId, userInfo.getId());
         //计算library
@@ -725,8 +725,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         DesignCollectionDTO designCollectionDTO = CopyUtil.copyObject(reDesignDTO, DesignCollectionDTO.class);
         ValidateElementVO elementVO = collectionElementService.validateElement(designCollectionDTO);
         //计算并删除对应的未关联的element
-        collectionElementService.batchDelete(
+        List<Long> longs = calculateNoRelationElement(reDesignDTO.getCollectionId(), elementVO.getUsedElementIds());
-                calculateNoRelationElement(reDesignDTO.getCollectionId(), elementVO.getUsedElementIds()));
+        if (!CollectionUtils.isEmpty(longs)) {
+            collectionElementService.batchDelete(longs);
+        }
         Design oldDesign = selectByCollectionId(reDesignDTO.getCollectionId());
         //删除老的关联的design
         deleteByCollectionId(reDesignDTO.getCollectionId());
@@ -740,7 +742,8 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
     private List<Long> calculateNoRelationElement(Long collectionId, List<Long> usedElementIds) {
         List<CollectionElement> collectionElements = collectionElementService.getByCollectionId(collectionId);
         if (CollectionUtils.isEmpty(collectionElements)) {
-            throw new BusinessException("get collection elements cannot be empty");
+//            throw new BusinessException("get collection elements cannot be empty");
+            return new ArrayList<>();
         }
         if (CollectionUtils.isEmpty(usedElementIds)) {
             return collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toList());

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

@@ -249,7 +249,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
     }
 
     @Override
-    public Workspace getByIdNew(Long id) {
+    public WorkspaceVO getByIdNew(Long id) {
         Long accountId = UserContext.getUserHolder().getId();
         QueryWrapper<Workspace> qwOld = new QueryWrapper<>();
         qwOld.lambda().eq(Workspace::getAccountId, accountId);
@@ -260,7 +260,26 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         Workspace newIsLastIndex = workspaceMapper.selectById(id);
         newIsLastIndex.setIsLastIndex(1);
         workspaceMapper.updateById(newIsLastIndex);
-        return newIsLastIndex;
+        WorkspaceVO vo = CopyUtil.copyObject(newIsLastIndex, WorkspaceVO.class);
+        if (vo.getMannequinFemaleId() != null) {
+            if (vo.getMannequinFemaleType().equals(ModelType.SYSTEM.getValue())) {
+                vo.setFemalePresignedUrl(minioUtil.getPresignedUrl(sysFileMapper.selectById(vo.getMannequinFemaleId()).getUrl(), 24 * 60));
+            } else if (vo.getMannequinFemaleType().equals(ModelType.LIBRARY.getValue())) {
+                vo.setFemalePresignedUrl(minioUtil.getPresignedUrl(libraryMapper.selectById(vo.getMannequinFemaleId()).getUrl(), 24 * 60));
+            }
+        }
+        if (vo.getMannequinMaleId() != null) {
+            if (vo.getMannequinMaleType().equals(ModelType.SYSTEM.getValue())) {
+                vo.setMalePresignedUrl(minioUtil.getPresignedUrl(sysFileMapper.selectById(vo.getMannequinMaleId()).getUrl(), 24 * 60));
+            } else if (vo.getMannequinMaleType().equals(ModelType.LIBRARY.getValue())) {
+                vo.setMalePresignedUrl(minioUtil.getPresignedUrl(libraryMapper.selectById(vo.getMannequinMaleId()).getUrl(), 24 * 60));
+            }
+        }
+        Sex sex = Sex.getSex(vo.getSex());
+        Position position = Position.getPosition(vo.getPosition());
+        vo.setSexEnum(new BizJson(sex.getValue(), sex.name(), BusinessException.getMessageFromResource(sex.name())));
+        vo.setPositionEnum(new BizJson(position.getValue(), position.name(), BusinessException.getMessageFromResource(position.name())));
+        return vo;
     }
 
     @Override

src/main/resources/application-dev.properties

@@ -1,5 +1,6 @@
 server.port=5567
 
+#datasource
 spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 spring.datasource.primary.username=aida_con
@@ -10,8 +11,6 @@ spring.datasource.secondary.jdbcUrl=jdbc:mysql://18.167.251.121:33008/attribute_
 spring.datasource.secondary.username=aida_con
 spring.datasource.secondary.password=123456
 
-
-
 #security
 spring.security.jwtSecret=JWTSECRET
 spring.security.jwtTokenHeader=Authorization

src/main/resources/application-prod.properties

@@ -1,11 +1,15 @@
 server.port=5567
 
 #datasource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.username=root
+spring.datasource.primary.username=root
-spring.datasource.password=QWa998345
+spring.datasource.primary.password=QWa998345
-#spring.datasource.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.username=aida_con
+spring.datasource.secondary.password=123456
 
 #security
 spring.security.jwtSecret=JWTSECRET
@@ -15,7 +19,8 @@ spring.security.jwtTokenPrefix=Bearer-
 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/inquiry/**
+  /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
 spring.security.authApi=/auth/login
 
 
@@ -23,8 +28,7 @@ rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8
 
 #mybatis
 mybatis-plus.global-config.banner=false
-mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
+mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
-#mybatis-plus.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
 mybatis-plus.global-config.db-config.logic-delete-value=1
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
@@ -43,6 +47,7 @@ spring.servlet.multipart.max-request-size= 10MB
 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
 
 minio.endpoint=https://www.minio.aida.com.hk:9000
 minio.accessKey=admin
@@ -71,7 +76,13 @@ spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.lettuce.pool.max-wait=5
 
-redis.key.consumptionOrder=ConsumptionOrder
+redis.key.orderForGenerate=OrderForGenerate
-redis.key.cancelSet=CancelSet
+redis.key.generateCancelSet=GenerateCancelSet
-redis.key.exceptionMap=ExceptionMap
+redis.key.generateExceptionMap=Generate:Exception
-redis.key.resultMap=ResultMap
+redis.key.resultMap=ResultMap
+redis.key.orderForSR=OrderForSR
+redis.key.SRCancelSet=SRCancelSet
+redis.key.SRExceptionMap=SRExceptionMap
+redis.key.taskList=TaskList
+redis.key.credits.pre-deduction=Credits:PreDeduction
+redis.key.generateResult=Generate:Result

src/main/resources/application-test.properties

@@ -1,11 +1,15 @@
 server.port=5567
 
 #datasource
-spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+spring.datasource.primary.jdbcUrl=jdbc:mysql://18.167.251.121:3306/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.username=aida_con
+spring.datasource.primary.username=root
-spring.datasource.password=123456
+spring.datasource.primary.password=QWa998345
-#spring.datasource.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.username=aida_con
+spring.datasource.secondary.password=123456
 
 #security
 spring.security.jwtSecret=JWTSECRET
@@ -15,7 +19,8 @@ spring.security.jwtTokenPrefix=Bearer-
 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/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
 spring.security.authApi=/auth/login
 
 
@@ -23,8 +28,7 @@ rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8
 
 #mybatis
 mybatis-plus.global-config.banner=false
-mybatis-plus.mapper-locations=classpath:mapper/*Mapper.xml
+mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
-#mybatis-plus.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl
 mybatis-plus.global-config.db-config.logic-delete-field=isDeleted
 mybatis-plus.global-config.db-config.logic-delete-value=1
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
@@ -43,6 +47,7 @@ spring.servlet.multipart.max-request-size= 10MB
 access.python.ip=http://18.167.251.121
 #access.python.ip=http://18.167.251.121:9991/
 access.python.port=9992
+access.python.sr=http://18.167.251.121:9994
 
 minio.endpoint=https://www.minio.aida.com.hk:9000
 minio.accessKey=admin
@@ -71,7 +76,13 @@ spring.redis.lettuce.pool.max-idle=8
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.lettuce.pool.max-wait=5
 
-redis.key.consumptionOrder=ConsumptionOrder
+redis.key.orderForGenerate=OrderForGenerate
-redis.key.cancelSet=CancelSet
+redis.key.generateCancelSet=GenerateCancelSet
-redis.key.exceptionMap=ExceptionMap
+redis.key.generateExceptionMap=Generate:Exception
-redis.key.resultMap=ResultMap
+redis.key.resultMap=ResultMap
+redis.key.orderForSR=OrderForSR
+redis.key.SRCancelSet=SRCancelSet
+redis.key.SRExceptionMap=SRExceptionMap
+redis.key.taskList=TaskList
+redis.key.credits.pre-deduction=Credits:PreDeduction
+redis.key.generateResult=Generate:Result

src/main/resources/application.properties

@@ -5,4 +5,4 @@
 #spring.profiles.active=prod
 
 #<23><><EFBFBD><EFBFBD>application-dev<65>ļ<EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
-spring.profiles.active=dev
+spring.profiles.active=prod

src/main/resources/paypal-sandbox.properties

@@ -1,12 +1,12 @@
 #  developer-sandbox-xp
-paypal.client-id=ATbaebYi7-GXWRWJqwRLYMzKEbwjh4BFRqD4Y13i4lZq0rplWIM_IpPrtPKpdkAt_KrPXd6IJTwsDqa5
+#paypal.client-id=ATbaebYi7-GXWRWJqwRLYMzKEbwjh4BFRqD4Y13i4lZq0rplWIM_IpPrtPKpdkAt_KrPXd6IJTwsDqa5
-paypal.client-secret=EHWWJqGmmbfjLXqCUpGrvxRYBPPtWvA3hR5ZaAyHlGSVJiHoQPS8skbNaJ9h39VObnchUbgiY2pPu__s
+#paypal.client-secret=EHWWJqGmmbfjLXqCUpGrvxRYBPPtWvA3hR5ZaAyHlGSVJiHoQPS8skbNaJ9h39VObnchUbgiY2pPu__s
-paypal.receiver.email=sb-ukxfk29608925@business.example.com
+#paypal.receiver.email=sb-ukxfk29608925@business.example.com
-paypal.mode=sandbox
+#paypal.mode=sandbox
 # local
 #paypal.webhook_id=31797347YC028794L
 # dev
-paypal.webhook_id=51V87014T6406322F
+#paypal.webhook_id=51V87014T6406322F
 
 #  aida-sandbox-kim
 #paypal.client-id=AbDDH8jnTrKqjnWLFgEu6LogYzVz2ZLuirE4W54t1M4lrofrP5OzXfhbxqktLLFB-rAO9KeYQVYFJ_tO
@@ -16,8 +16,9 @@ paypal.webhook_id=51V87014T6406322F
 #paypal.webhook_id=1WH327112B602422N
 
 #  aida-live-kim
-#paypal.client-id=ASWSIZ3MXJU5w5VOeOHeigWcSw6iinl30ZCipruziKpHclxP0ryf8-7VKG1Ba2VwZwa2DMvGEzTfCTgz
+paypal.client-id=ASWSIZ3MXJU5w5VOeOHeigWcSw6iinl30ZCipruziKpHclxP0ryf8-7VKG1Ba2VwZwa2DMvGEzTfCTgz
-#paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
+paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
-#paypal.receiver.email=kimwong@code-create.com.hk
+paypal.receiver.email=kimwong@code-create.com.hk
-#paypal.mode=live
+paypal.mode=live
-#paypal.webhook_id=41L14847MC833625B
+#paypal.webhook_id=41L14847MC833625B
+paypal.webhook_id=1D107312EX592781K