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

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

Browse Source 
# Conflicts:
#	src/main/resources/application-prod.properties
This commit is contained in:
xupei
2024-01-02 13:05:06 +08:00
parent 858a195e13 dd5997fea6
commit 28d92c468c
6 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ spring.servlet.multipart.max-request-size= 5MB
#access.python.ip=http://43.198.80.117
access.python.ip=http://18.167.251.121
#access.python.ip=http://18.167.251.121:9991/
access.python.port=9992
minio.endpoint=https://www.minio.aida.com.hk:9000
minio.accessKey=admin
@@ -50,4 +51,5 @@ minio.bucketName.clothing=aida-clothing
minio.bucketName.mannequins=aida-mannequins
minio.bucketName.results=aida-results
minio.bucketName.sysImage=aida-sys-image
minio.bucketName.users=aida-users
minio.bucketName.users=aida-users
minio.bucketName.collectionElement=aida-collection-element