Merge remote-tracking branch 'origin/dev/dev' into dev/dev_shb

src/main/resources/application-dev.properties

@@ -21,7 +21,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/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR
 spring.security.authApi=/auth/login
 
 
@@ -46,6 +46,7 @@ spring.servlet.multipart.max-request-size= 10MB
 #访问python服务的ip(对应环境)
 access.python.ip=http://18.167.251.121
 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
@@ -74,7 +75,11 @@ 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
+redis.key.orderForGenerate=OrderForGenerate
+redis.key.generateCancelSet=GenerateCancelSet
+redis.key.generateExceptionMap=GenerateExceptionMap
+redis.key.resultMap=ResultMap
+redis.key.orderForSR=OrderForSR
+redis.key.SRCancelSet=SRCancelSet
+redis.key.SRExceptionMap=SRExceptionMap
+redis.key.taskList=TaskList