diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index e69de29b..00000000
diff --git a/pom.xml b/pom.xml
index 966478f8..e2a8d0f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,6 +202,13 @@
20230618
+
+ org.apache.logging.log4j
+ log4j-api
+ 2.17.1
+
+
+
org.apache.poi
poi
diff --git a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java b/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
index 7079f02a..637fc94e 100644
--- a/src/main/java/com/ai/da/common/RabbitMQ/MQConfig.java
+++ b/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() {
}
diff --git a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java b/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
index 9e404107..9c2d4d27 100644
--- a/src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java
+++ b/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);
diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
index ca778537..d72e41c6 100644
--- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java
+++ b/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 {
// 实例化一个认证对象
diff --git a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java b/src/main/java/com/ai/da/model/vo/CollectionColorVO.java
index 057cca64..475e159a 100644
--- a/src/main/java/com/ai/da/model/vo/CollectionColorVO.java
+++ b/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 {
diff --git a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java b/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
index 4e5f5721..ac87037f 100644
--- a/src/main/java/com/ai/da/model/vo/UserLikeCollectionVO.java
+++ b/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 {
diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java
index 7b831e23..9e9d82b0 100644
--- a/src/main/java/com/ai/da/python/PythonService.java
+++ b/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 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 dressings = dressingMapper.selectList(qw);
if (CollectionUtil.isEmpty(dressings)) {
diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
index 0573a0be..5fcefcc5 100644
--- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
@@ -483,7 +483,7 @@ public class AccountServiceImpl extends ServiceImpl impl
}
// 先检测用户名和邮箱
QueryWrapper qw = new QueryWrapper<>();
- qw.eq("BINARY email", accountTrialDTO.getEmail());
+ qw.eq("BINARY user_email", accountTrialDTO.getEmail());
List accountList = accountMapper.selectList(qw);
if (CollectionUtil.isNotEmpty(accountList)) {
if (accountList.get(0).getIsTrial() == 1) {
@@ -542,7 +542,11 @@ public class AccountServiceImpl extends ServiceImpl 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;
}
@@ -563,7 +567,7 @@ public class AccountServiceImpl extends ServiceImpl impl
trialOrderMapper.updateById(trialOrder);
QueryWrapper qw = new QueryWrapper<>();
- qw.eq("BINARY email", trialOrder.getEmail());
+ qw.eq("BINARY user_email", trialOrder.getEmail());
List accountList = accountMapper.selectList(qw);
Account account = new Account();
@@ -587,10 +591,14 @@ public class AccountServiceImpl extends ServiceImpl impl
accountMapper.insert(account);
}
// 发送邮件提醒用户试用用户已创建
-// 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());
+// SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2, trialOrder.getCountry());
+// SendEmailUtil.sendCustomEmail("calvinwong@aidlab.hk", null, trialOrder,2, trialOrder.getCountry());
+// SendEmailUtil.sendCustomEmail("kaicpang.pang@connect.polyu.hk", null, trialOrder,2, 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;
}
diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
index 72b46e5b..3f873a9b 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -190,11 +190,11 @@ public class CollectionElementServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>();
- queryWrapper.in("id", ids);
- CollectionElement collectionElement = new CollectionElement();
- collectionElement.setCollectionId(0L);
- collectionElementMapper.update(collectionElement, queryWrapper);
+// QueryWrapper queryWrapper = new QueryWrapper<>();
+// queryWrapper.in("id", ids);
+// CollectionElement collectionElement = new CollectionElement();
+// collectionElement.setCollectionId(0L);
+ collectionElementMapper.deleteBatchIds(ids);
}
@Override
diff --git a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
index 6b911d49..6cd25d76 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
+++ b/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 collect = response.getColorBoards().stream()
+ .distinct()
+ .collect(Collectors.toList());
+ response.setColorBoards(collect);
+ }
return response;
}
diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index 20142a05..97a0553f 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -300,7 +300,7 @@ public class DesignServiceImpl extends ServiceImpl impleme
//generate转化为collection(生成)
saveCollectionElemntsByGenerates(elementVO, collectionId);
//保存颜色版
- List 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 impleme
DesignCollectionDTO designCollectionDTO = CopyUtil.copyObject(reDesignDTO, DesignCollectionDTO.class);
ValidateElementVO elementVO = collectionElementService.validateElement(designCollectionDTO);
//计算并删除对应的未关联的element
- collectionElementService.batchDelete(
- calculateNoRelationElement(reDesignDTO.getCollectionId(), elementVO.getUsedElementIds()));
+ List longs = 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 impleme
private List calculateNoRelationElement(Long collectionId, List usedElementIds) {
List 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());
diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
index 8f13ed3f..2d9fea7f 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -276,7 +276,6 @@ public class WorkspaceServiceImpl extends ServiceImpl qwOld = new QueryWrapper<>();
qwOld.lambda().eq(Workspace::getAccountId, accountId);
@@ -287,21 +286,26 @@ public class WorkspaceServiceImpl extends ServiceImpl qw = new QueryWrapper<>();
- qw.lambda().eq(WorkspaceRelStyle::getWorkspaceId, workspaceVO.getId());
- List workspaceRelStyles = workspaceRelStyleMapper.selectList(qw);
- if (!CollectionUtils.isEmpty(workspaceRelStyles)) {
- Long styleId = workspaceRelStyles.get(0).getStyleId();
- Style style = styleMapper.selectById(styleId);
- StyleEnum styleEnum = StyleEnum.fromName(style.getName());
- if (authPrincipalVo.getLanguage().equals(Language.ENGLISH.name())) {
- workspaceVO.setStyleName(styleEnum.getEnglish());
- }else {
- workspaceVO.setStyleName(styleEnum.getChinese());
+ 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));
}
}
- return workspaceVO;
+ 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
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index a1a25366..e0b09cfb 100644
--- a/src/main/resources/application-dev.properties
+++ b/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
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
index af7d6688..20d02502 100644
--- a/src/main/resources/application-prod.properties
+++ b/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.url=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.password=QWa998345
-#spring.datasource.password=QWa998345
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
+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.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.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.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
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.cancelSet=CancelSet
-redis.key.exceptionMap=ExceptionMap
-redis.key.resultMap=ResultMap
\ No newline at end of file
+redis.key.orderForGenerate=OrderForGenerate
+redis.key.generateCancelSet=GenerateCancelSet
+redis.key.generateExceptionMap=Generate:Exception
+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
\ No newline at end of file
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index 28eaf8ac..31595f52 100644
--- a/src/main/resources/application-test.properties
+++ b/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.url=jdbc:mysql://18.167.251.121:33008/aida?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-spring.datasource.username=aida_con
-spring.datasource.password=123456
-#spring.datasource.password=QWa998345
+spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
+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.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.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.configuration.log-impl= org.apache.ibatis.logging.stdout.StdOutImpl
+mybatis-plus.mapper-locations=classpath:mapper/*/*.xml
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.cancelSet=CancelSet
-redis.key.exceptionMap=ExceptionMap
-redis.key.resultMap=ResultMap
\ No newline at end of file
+redis.key.orderForGenerate=OrderForGenerate
+redis.key.generateCancelSet=GenerateCancelSet
+redis.key.generateExceptionMap=Generate:Exception
+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
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 974fee23..605b072c 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -5,4 +5,4 @@
#spring.profiles.active=prod
#����application-dev�ļ�(��������)
-spring.profiles.active=dev
+spring.profiles.active=prod
diff --git a/src/main/resources/paypal-sandbox.properties b/src/main/resources/paypal-sandbox.properties
index 1b48960c..e6c46b5e 100644
--- a/src/main/resources/paypal-sandbox.properties
+++ b/src/main/resources/paypal-sandbox.properties
@@ -1,12 +1,12 @@
# developer-sandbox-xp
-paypal.client-id=ATbaebYi7-GXWRWJqwRLYMzKEbwjh4BFRqD4Y13i4lZq0rplWIM_IpPrtPKpdkAt_KrPXd6IJTwsDqa5
-paypal.client-secret=EHWWJqGmmbfjLXqCUpGrvxRYBPPtWvA3hR5ZaAyHlGSVJiHoQPS8skbNaJ9h39VObnchUbgiY2pPu__s
-paypal.receiver.email=sb-ukxfk29608925@business.example.com
-paypal.mode=sandbox
+#paypal.client-id=ATbaebYi7-GXWRWJqwRLYMzKEbwjh4BFRqD4Y13i4lZq0rplWIM_IpPrtPKpdkAt_KrPXd6IJTwsDqa5
+#paypal.client-secret=EHWWJqGmmbfjLXqCUpGrvxRYBPPtWvA3hR5ZaAyHlGSVJiHoQPS8skbNaJ9h39VObnchUbgiY2pPu__s
+#paypal.receiver.email=sb-ukxfk29608925@business.example.com
+#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-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
-#paypal.receiver.email=kimwong@code-create.com.hk
-#paypal.mode=live
-#paypal.webhook_id=41L14847MC833625B
\ No newline at end of file
+paypal.client-id=ASWSIZ3MXJU5w5VOeOHeigWcSw6iinl30ZCipruziKpHclxP0ryf8-7VKG1Ba2VwZwa2DMvGEzTfCTgz
+paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
+paypal.receiver.email=kimwong@code-create.com.hk
+paypal.mode=live
+#paypal.webhook_id=41L14847MC833625B
+paypal.webhook_id=1D107312EX592781K
\ No newline at end of file