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

Merge branch 'dev/dev' into test/stable

Browse Source 
# Conflicts:
#	src/main/resources/paypal-sandbox.properties
This commit is contained in:
xupei
2024-05-27 18:26:36 +08:00
parent f9ce559915 5ff2bf11d7
commit db04267591
90 changed files with 1924 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/resources/alipay-hk.properties
View File

@@ -1,11 +0,0 @@
alipay.hk.merchant-id=3015240422190522
alipay.hk.segment-id=2971373831
alipay.hk.AESKey=UzRC2CncDUP6VlEd
alipay.hk.rsaPrivateKey=files/CODE-CREATE LIMITED-3015240422190522-merchant.private.key.txt
alipay.hk.rsaPublicKey=files/CODE-CREATE LIMITED.merchant.aqs.public.key.pem
alipay.hk.api.url=https://aqs-api.sandbox-codpayment.com/

11
src/main/resources/alipay-sandbox.properties
View File

@@ -34,6 +34,17 @@ alipay.notify-url=http://18.167.251.121:10090/api/ali-pay/trade/notify
#alipay.notify-url=https://3b38-18-167-251-121.ngrok-free.app/api/ali-pay/trade/notify
#alipayHK.merchantId=3015240422190522
#alipayHK.segmentId=2971373831
#alipayHK.AESKey=UzRC2CncDUP6VlEd
alipayHK.merchantId=2088841167357411
alipayHK.segmentId=1771653121
alipayHK.AESKey=uTEbeOZBgXKbSqGz
alipayHK.rsaPrivateKey=files/Code-Create Limited-2088841167357411-merchant.private.key.txt
alipayHK.rsaPublicKey=files/Code-Create Limited.merchant.aqs.public.key.pem
alipayHK.api.url=https://aqs-api.sandbox-codpayment.com/

4
src/main/resources/application-dev.properties
View File

@@ -1,6 +1,5 @@
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
@@ -20,7 +19,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/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR
/api/product/**,/api/ali-pay/**,/api/order-info/**,/api/paypal/**,/api/credits/**,/api/inquiry/**,/api/tasks/**,/api/python/prepareForSR,/api/alipay-hk/**,/api/portfolio/**
spring.security.authApi=/auth/login
@@ -56,6 +55,7 @@ minio.bucketName.results=aida-results
minio.bucketName.sysImage=aida-sys-image
minio.bucketName.users=aida-users
minio.bucketName.collectionElement=aida-collection-element
minio.bucketName.gradient=aida-gradient
redirect_url=http://18.167.251.121:7788
spring.rabbitmq.host=18.167.251.121

2
src/main/resources/application-prod.properties
View File

@@ -47,7 +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:9994
access.python.sr=http://18.167.251.121:9995
minio.endpoint=https://www.minio.aida.com.hk:9000
minio.accessKey=admin

3
src/main/resources/paypal-sandbox.properties
View File

@@ -20,4 +20,5 @@ paypal.webhook_id=1WH327112B602422N
#paypal.client-secret=EHQg_K5PSqmp4FJlzEcOEH_kFkmq4aBzaI7jridw53L6cOQRULBAnfv2KakRfrsqaU1PDSkO4Co9Vyxc
#paypal.receiver.email=kimwong@code-create.com.hk
#paypal.mode=live
#paypal.webhook_id=41L14847MC833625B
#paypal.webhook_id=41L14847MC833625B
#paypal.webhook_id=1D107312EX592781K