aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/release/3.0' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
This commit is contained in:
xupei
2024-09-24 10:27:18 +08:00
parent 3eb8626831 8ee6a529a0
commit 2f1b22d423
12 changed files with 190 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/mapper/secondary/AttributeRetrievalMapper.xml
View File

@@ -32,7 +32,9 @@
<if test="style != null">
AND style = #{style}
</if>
<if test="isFemaleTable">
AND deprecated = 0
</if>
</trim>
ORDER BY
RAND()
@@ -48,7 +50,9 @@
<if test="style != null">
AND style = #{style}
</if>
<if test="isFemaleTable">
AND deprecated = 0
</if>
</trim>
ORDER BY
RAND()
@@ -73,7 +77,9 @@
<if test="style != null">
AND style = #{style}
</if>
<if test="isFemaleTable">
AND deprecated = 0
</if>
</trim>
ORDER BY
RAND()

4
src/main/resources/messages_zh.properties
View File

@@ -182,8 +182,8 @@ OVERALL=整体
TOPS=上装
BOTTOMS=下装
OUTWEAR=外套
BLOUSE=衬衫
DRESS=长裙
BLOUSE=上衣
DRESS=连衣裙
TROUSERS=裤子
SKIRT=短裙
FEMALE=女装

21
src/main/resources/payment.properties
View File

@@ -1,12 +1,12 @@
##### PayPal
# 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
#paypal.webhook_id=31797347YC028794L
# dev
#paypal.webhook_id=51V87014T6406322F
@@ -18,12 +18,11 @@ paypal.webhook_id=31797347YC028794L
#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
#paypal.webhook_id=1D107312EX592781K
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=1D107312EX592781K
##### Stripe