diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties index 9a14d25..b4bd84c 100644 --- a/timeline-file-service/src/main/resources/application.properties +++ b/timeline-file-service/src/main/resources/application.properties @@ -7,11 +7,11 @@ spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MinIO configuration for file storage -minio.endpoint=http://59.80.22.43:9000 -minio.accessKey=9ttSGjvQxek2uKKlhpqI -minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex -minio.bucketName=timeline-test +# MinIO configuration for file storage - will be loaded from Nacos +# minio.endpoint=http://59.80.22.43:9000 +# minio.accessKey=9ttSGjvQxek2uKKlhpqI +# minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex +# minio.bucketName=timeline-test # MyBatis configuration 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.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 logging.charset.console=UTF-8 logging.charset.file=UTF-8 diff --git a/timeline-file-service/src/main/resources/bootstrap.properties b/timeline-file-service/src/main/resources/bootstrap.properties index 38eb0ee..3f711f4 100644 --- a/timeline-file-service/src/main/resources/bootstrap.properties +++ b/timeline-file-service/src/main/resources/bootstrap.properties @@ -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.config.enabled=false spring.cloud.nacos.discovery.namespace=public spring.cloud.nacos.discovery.group=DEFAULT_GROUP