This commit is contained in:
@@ -7,11 +7,11 @@ spring.datasource.username=root
|
|||||||
spring.datasource.password=WoCloud@9ol7uj
|
spring.datasource.password=WoCloud@9ol7uj
|
||||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||||
|
|
||||||
# MinIO configuration for file storage
|
# MinIO configuration for file storage - will be loaded from Nacos
|
||||||
minio.endpoint=http://59.80.22.43:9000
|
# minio.endpoint=http://59.80.22.43:9000
|
||||||
minio.accessKey=9ttSGjvQxek2uKKlhpqI
|
# minio.accessKey=9ttSGjvQxek2uKKlhpqI
|
||||||
minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex
|
# minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex
|
||||||
minio.bucketName=timeline-test
|
# minio.bucketName=timeline-test
|
||||||
|
|
||||||
# MyBatis configuration
|
# MyBatis configuration
|
||||||
mybatis.mapper-locations=classpath:mapper/*.xml
|
mybatis.mapper-locations=classpath:mapper/*.xml
|
||||||
@@ -30,10 +30,6 @@ spring.servlet.multipart.max-request-size=1000MB
|
|||||||
spring.jackson.time-zone=GMT+8
|
spring.jackson.time-zone=GMT+8
|
||||||
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
|
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
|
||||||
|
|
||||||
# Nacos configuration - commented out to avoid Nacos config loading issues
|
|
||||||
#spring.cloud.nacos.discovery.server-addr=${NACOS_SERVER_ADDR:127.0.0.1:8848}
|
|
||||||
#spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr}
|
|
||||||
|
|
||||||
# UTF-8 encoding configuration to ensure proper Chinese character handling
|
# UTF-8 encoding configuration to ensure proper Chinese character handling
|
||||||
logging.charset.console=UTF-8
|
logging.charset.console=UTF-8
|
||||||
logging.charset.file=UTF-8
|
logging.charset.file=UTF-8
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
spring.config.import=optional:nacos:
|
spring.config.import=nacos:
|
||||||
spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
|
spring.cloud.nacos.discovery.server-addr=host.docker.internal:8848
|
||||||
spring.cloud.nacos.config.enabled=false
|
|
||||||
spring.cloud.nacos.discovery.namespace=public
|
spring.cloud.nacos.discovery.namespace=public
|
||||||
spring.cloud.nacos.discovery.group=DEFAULT_GROUP
|
spring.cloud.nacos.discovery.group=DEFAULT_GROUP
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user