Merge branch 'dev/dev_xp' into dev/dev

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

src/main/resources/application-prod.properties

@@ -15,7 +15,7 @@ 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/inquiry/**
 spring.security.authApi=/auth/login
 
 

src/main/resources/mapper/primary/DesignMapper.xml

@@ -26,4 +26,18 @@
         #{createDate});
     </insert>
 
+    <select id="getDesignStatistic" resultType="com.ai.da.model.dto.UserDesignStatisticDTO" parameterType="String">
+        select a.account_id,count(a.account_id) use_design_times,b.user_email,b.user_name,b.is_trial
+        from `t_account` b
+        left join t_design a
+        on a.account_id = b.id
+        <where>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                a.create_date between #{startTime} and #{endTime}
+            </if>
+        </where>
+        GROUP BY a.account_id
+        ORDER BY a.account_id ASC;
+    </select>
+
 </mapper>

src/main/resources/messages_en.properties

@@ -169,6 +169,8 @@ generate.interface.error=We encountered an error with the generate interface. (P
 chat-bot.interface.exception=We encountered an error with the chat robot interface.(Please try again later. If this issue persists, please contact us at help@aida.com.hk.)
 compose-layer.interface.exception=We encountered issues while flattening the layers.(Please try again later. If this issue persists, please contact us at help@aida.com.hk.)
 cloth-classification.interface.exception=We encountered some issues while obtaining clothing categories.(Please try again later. If this issue persists, please contact us at help@aida.com.hk.)
+sr.interface.error=We encountered an error with the super resolution. (Please try again later. If this issue persists, please contact us at help@aida.com.hk.)
+
 
 # 多语言返回
 OVERALL=Overall

src/main/resources/paypal-sandbox.properties

@@ -0,0 +1,20 @@
+#  developer-sandbox
+#paypal.client-id=ATbaebYi7-GXWRWJqwRLYMzKEbwjh4BFRqD4Y13i4lZq0rplWIM_IpPrtPKpdkAt_KrPXd6IJTwsDqa5
+#paypal.client-secret=EHWWJqGmmbfjLXqCUpGrvxRYBPPtWvA3hR5ZaAyHlGSVJiHoQPS8skbNaJ9h39VObnchUbgiY2pPu__s
+#paypal.receiver.email=sb-ukxfk29608925@business.example.com
+#paypal.mode=sandbox
+#paypal.webhook_id=31797347YC028794L
+
+#  aida-sandbox
+#paypal.client-id=AbDDH8jnTrKqjnWLFgEu6LogYzVz2ZLuirE4W54t1M4lrofrP5OzXfhbxqktLLFB-rAO9KeYQVYFJ_tO
+#paypal.client-secret=EOOoiIAe_dyR2YhY7qCIqWipZvYXCDrmBlFYchphuvkPFms1spsBGTlStlrx580y4hN-EukWwF9m_LAs
+#paypal.receiver.email=sb-4xe8i29784722@business.example.com
+#paypal.mode=sandbox
+#paypal.webhook_id=1WH327112B602422N
+
+#  aida-live
+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