From 640eb23bdee24406de83ebfc83e5d5cb5420644d Mon Sep 17 00:00:00 2001 From: jianghao <332515344@qq.com> Date: Mon, 5 Jan 2026 15:21:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5nacos=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 76 ++++--------------- pom.xml | 17 ++++- timeline-file-service/pom.xml | 13 +++- .../file/TimelineFileServiceApplication.java | 4 +- .../src/main/resources/application.properties | 10 ++- .../src/main/resources/bootstrap.properties | 15 ++++ timeline-gateway-service/pom.xml | 12 ++- .../src/main/resources/application.properties | 23 +++--- .../src/main/resources/bootstrap.properties | 15 ++++ timeline-story-service/pom.xml | 11 +++ .../TimelineStoryServiceApplication.java | 4 +- .../story/feign/FileServiceClient.java | 4 +- .../story/feign/UserServiceClient.java | 5 +- .../src/main/resources/application.properties | 15 ++-- .../src/main/resources/bootstrap.properties | 15 ++++ timeline-user-service/pom.xml | 12 ++- .../user/TimelineUserServiceApplication.java | 4 +- .../src/main/resources/application.properties | 6 +- .../src/main/resources/bootstrap.properties | 15 ++++ 19 files changed, 176 insertions(+), 100 deletions(-) create mode 100644 timeline-file-service/src/main/resources/bootstrap.properties create mode 100644 timeline-gateway-service/src/main/resources/bootstrap.properties create mode 100644 timeline-story-service/src/main/resources/bootstrap.properties create mode 100644 timeline-user-service/src/main/resources/bootstrap.properties diff --git a/docker-compose.yml b/docker-compose.yml index ad6c5e3..933ff36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,38 +1,6 @@ version: '3.8' services: -# mysql: -# image: mysql:8.0 -# container_name: timeline-mysql -# ports: -# - "33306:33306" -# environment: -# MYSQL_ROOT_PASSWORD: WoCloud@9ol7uj -# MYSQL_DATABASE: timeline -# volumes: -# - ./mysql-init:/docker-entrypoint-initdb.d -# - mysql_data:/var/lib/mysql - - redis: - image: redis:7-alpine - container_name: timeline-redis - ports: - - "36379:6379" - command: redis-server --requirepass 123456 - -# minio: -# image: minio/minio:latest -# container_name: timeline-minio -# ports: -# - "9000:9000" -# - "9001:9001" -# environment: -# MINIO_ROOT_USER: 9ttSGjvQxek2uKKlhpqI -# MINIO_ROOT_PASSWORD: 12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex -# command: server /data --console-address ":9001" -# volumes: -# - minio_data:/data - timeline-story-service: build: context: ./timeline-story-service @@ -42,16 +10,14 @@ services: - "30001:30001" environment: - server.port=30001 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://timeline-mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - spring.data.redis.host=redis - spring.data.redis.port=6379 - spring.data.redis.password=123456 - - file.service.url=http://timeline-file-service:30002/file/ - - user.service.url=http://timeline-user-service:30003/user/ - depends_on: - - redis + - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 + - spring.cloud.nacos.config.server-addr=nacos-server:8848 restart: unless-stopped timeline-file-service: @@ -63,13 +29,15 @@ services: - "30002:30002" environment: - server.port=30002 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://timeline-mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - - minio.endpoint=http://minio:9000 + - minio.endpoint=http://timeline-minio:9000 - minio.accessKey=9ttSGjvQxek2uKKlhpqI - minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex - minio.bucketName=timeline-test + - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 + - spring.cloud.nacos.config.server-addr=nacos-server:8848 restart: unless-stopped timeline-user-service: @@ -81,12 +49,14 @@ services: - "30003:30003" environment: - server.port=30003 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.datasource.url=jdbc:mysql://timeline-mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj - spring.data.redis.host=redis - spring.data.redis.port=6379 - spring.data.redis.password=123456 + - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 + - spring.cloud.nacos.config.server-addr=nacos-server:8848 restart: unless-stopped timeline-gateway-service: @@ -98,31 +68,13 @@ services: - "30000:30000" environment: - server.port=30000 - - spring.cloud.gateway.routes[0].id=story-service - - spring.cloud.gateway.routes[0].uri=http://timeline-story-service:30001 - - spring.cloud.gateway.routes[0].predicates[0]=Path=/story/** - - spring.cloud.gateway.routes[0].filters[0]=StripPrefix=0 - - spring.cloud.gateway.routes[1].id=file-service - - spring.cloud.gateway.routes[1].uri=http://timeline-file-service:30002 - - spring.cloud.gateway.routes[1].predicates[0]=Path=/file/** - - spring.cloud.gateway.routes[1].filters[0]=StripPrefix=0 - - spring.cloud.gateway.routes[2].id=user-service - - spring.cloud.gateway.routes[2].uri=http://timeline-user-service:30003 - - spring.cloud.gateway.routes[2].predicates[0]=Path=/user/** - - spring.cloud.gateway.routes[2].filters[0]=StripPrefix=0 - - spring.cloud.gateway.routes[3].id=user-service-ws - - spring.cloud.gateway.routes[3].uri=http://timeline-user-service:30003 - - spring.cloud.gateway.routes[3].predicates[0]=Path=/user/ws/** - - spring.cloud.gateway.routes[3].filters[0]=StripPrefix=0 - - spring.datasource.url=jdbc:mysql://mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true + - spring.cloud.nacos.discovery.server-addr=nacos-server:8848 + - spring.cloud.nacos.config.server-addr=nacos-server:8848 + - spring.datasource.url=jdbc:mysql://timeline-mysql:3306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true - spring.datasource.username=root - spring.datasource.password=WoCloud@9ol7uj depends_on: - timeline-story-service - timeline-file-service - timeline-user-service - restart: unless-stopped - -volumes: - mysql_data: - minio_data: + restart: unless-stopped \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6fd1f5f..a56ea3b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,10 @@ 21 2023.0.5 - 2023.0.5.0 + 2023.0.1.0 + 21 + 21 + UTF-8 @@ -41,6 +44,14 @@ pom import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + com.github.pagehelper pagehelper-spring-boot-starter @@ -55,6 +66,8 @@ org.apache.maven.plugins maven-compiler-plugin + 21 + 21 org.projectlombok @@ -77,4 +90,4 @@ - + \ No newline at end of file diff --git a/timeline-file-service/pom.xml b/timeline-file-service/pom.xml index e8a0ba5..7ef3967 100644 --- a/timeline-file-service/pom.xml +++ b/timeline-file-service/pom.xml @@ -29,6 +29,17 @@ org.springframework.cloud spring-cloud-starter-bootstrap + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + io.minio minio @@ -103,4 +114,4 @@ - + \ No newline at end of file diff --git a/timeline-file-service/src/main/java/com/timeline/file/TimelineFileServiceApplication.java b/timeline-file-service/src/main/java/com/timeline/file/TimelineFileServiceApplication.java index f240532..782a7f2 100644 --- a/timeline-file-service/src/main/java/com/timeline/file/TimelineFileServiceApplication.java +++ b/timeline-file-service/src/main/java/com/timeline/file/TimelineFileServiceApplication.java @@ -3,16 +3,18 @@ package com.timeline.file; import com.timeline.file.config.MinioConfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication @ComponentScan({"com.timeline", "com.timeline.file"}) @EnableConfigurationProperties(MinioConfig.class) +@EnableDiscoveryClient public class TimelineFileServiceApplication { public static void main(String[] args) { SpringApplication.run(TimelineFileServiceApplication.class, args); } -} +} \ No newline at end of file diff --git a/timeline-file-service/src/main/resources/application.properties b/timeline-file-service/src/main/resources/application.properties index caf4287..ebe0c28 100644 --- a/timeline-file-service/src/main/resources/application.properties +++ b/timeline-file-service/src/main/resources/application.properties @@ -1,15 +1,15 @@ -spring.application.name=timeline.file +spring.application.name=timeline-file spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MinIO ?? +# MinIO 配置 minio.endpoint=http://59.80.22.43:9000 minio.accessKey=9ttSGjvQxek2uKKlhpqI minio.secretKey=12CaKew53tu94tgyDLoqAwAq32iDuz3SWW0O1hex minio.bucketName=timeline-test -# MyBatis ?? +# MyBatis 配置 mybatis.mapper-locations=classpath:mapper/*.xml mybatis.type-aliases-package=com.timeline.file.entity @@ -21,6 +21,10 @@ spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB spring.servlet.multipart.max-request-size=1000MB +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} + # Ensure UTF-8 encoding for logs and web layer to avoid garbled Chinese output 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 new file mode 100644 index 0000000..9343e8d --- /dev/null +++ b/timeline-file-service/src/main/resources/bootstrap.properties @@ -0,0 +1,15 @@ +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.namespace=public +spring.cloud.nacos.discovery.group=DEFAULT_GROUP + +# Nacos配置中心 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} +spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace} +spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group} +spring.cloud.nacos.config.file-extension=properties + +# 如果需要从Nacos配置中心加载配置文件，取消下面的注释 +# spring.cloud.nacos.config.shared-configs[0].data-id=common.properties +# spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP +# spring.cloud.nacos.config.shared-configs[0].refresh=true \ No newline at end of file diff --git a/timeline-gateway-service/pom.xml b/timeline-gateway-service/pom.xml index 0527bd6..8d317f3 100644 --- a/timeline-gateway-service/pom.xml +++ b/timeline-gateway-service/pom.xml @@ -30,6 +30,16 @@ spring-cloud-starter-loadbalancer + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + io.jsonwebtoken @@ -76,4 +86,4 @@ - + \ No newline at end of file diff --git a/timeline-gateway-service/src/main/resources/application.properties b/timeline-gateway-service/src/main/resources/application.properties index 022289e..f906015 100644 --- a/timeline-gateway-service/src/main/resources/application.properties +++ b/timeline-gateway-service/src/main/resources/application.properties @@ -2,36 +2,31 @@ spring.application.name=timeline-gateway server.port=30000 -spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=WoCloud@9ol7uj -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} -# +# 使用Nacos服务发现进行路由 spring.cloud.gateway.routes[0].id=story-service -spring.cloud.gateway.routes[0].uri=http://localhost:30001 +spring.cloud.gateway.routes[0].uri=lb://timeline-story spring.cloud.gateway.routes[0].predicates[0]=Path=/story/** spring.cloud.gateway.routes[0].filters[0]=StripPrefix=0 spring.cloud.gateway.routes[1].id=file-service -spring.cloud.gateway.routes[1].uri=http://localhost:30002 +spring.cloud.gateway.routes[1].uri=lb://timeline-file spring.cloud.gateway.routes[1].predicates[0]=Path=/file/** spring.cloud.gateway.routes[1].filters[0]=StripPrefix=0 spring.cloud.gateway.routes[2].id=user-service-ws -spring.cloud.gateway.routes[2].uri=http://localhost:30003 +spring.cloud.gateway.routes[2].uri=lb://timeline-user spring.cloud.gateway.routes[2].predicates[0]=Path=/user/ws/** spring.cloud.gateway.routes[2].filters[0]=StripPrefix=0 - spring.cloud.gateway.routes[3].id=user-service -spring.cloud.gateway.routes[3].uri=http://localhost:30003 +spring.cloud.gateway.routes[3].uri=lb://timeline-user spring.cloud.gateway.routes[3].predicates[0]=Path=/user/** spring.cloud.gateway.routes[3].filters[0]=StripPrefix=0 - - - # JWT配置 jwt.secret=6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a6f3f9c2b9d9a4e3f8c0d6a7b5c4e3f1a jwt.expiration=86400 @@ -48,4 +43,4 @@ management.endpoint.health.show-details=always # 日志配置 logging.level.org.springframework.cloud.gateway=DEBUG -logging.level.com.timeline.gateway=DEBUG +logging.level.com.timeline.gateway=DEBUG \ No newline at end of file diff --git a/timeline-gateway-service/src/main/resources/bootstrap.properties b/timeline-gateway-service/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..9343e8d --- /dev/null +++ b/timeline-gateway-service/src/main/resources/bootstrap.properties @@ -0,0 +1,15 @@ +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.namespace=public +spring.cloud.nacos.discovery.group=DEFAULT_GROUP + +# Nacos配置中心 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} +spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace} +spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group} +spring.cloud.nacos.config.file-extension=properties + +# 如果需要从Nacos配置中心加载配置文件，取消下面的注释 +# spring.cloud.nacos.config.shared-configs[0].data-id=common.properties +# spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP +# spring.cloud.nacos.config.shared-configs[0].refresh=true \ No newline at end of file diff --git a/timeline-story-service/pom.xml b/timeline-story-service/pom.xml index 38a9361..e1d4e95 100644 --- a/timeline-story-service/pom.xml +++ b/timeline-story-service/pom.xml @@ -62,6 +62,17 @@ org.springframework.boot spring-boot-starter-actuator + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + org.springframework.boot diff --git a/timeline-story-service/src/main/java/com/timeline/story/TimelineStoryServiceApplication.java b/timeline-story-service/src/main/java/com/timeline/story/TimelineStoryServiceApplication.java index cd6c70b..4919988 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/TimelineStoryServiceApplication.java +++ b/timeline-story-service/src/main/java/com/timeline/story/TimelineStoryServiceApplication.java @@ -1,14 +1,16 @@ package com.timeline.story; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication @ComponentScan(basePackages = {"com.timeline"}) @EnableFeignClients(basePackages = {"com.timeline"}) +@EnableDiscoveryClient public class TimelineStoryServiceApplication { public static void main(String[] args) { org.springframework.boot.SpringApplication.run(TimelineStoryServiceApplication.class, args); } -} +} \ No newline at end of file diff --git a/timeline-story-service/src/main/java/com/timeline/story/feign/FileServiceClient.java b/timeline-story-service/src/main/java/com/timeline/story/feign/FileServiceClient.java index e78341d..9658781 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/feign/FileServiceClient.java +++ b/timeline-story-service/src/main/java/com/timeline/story/feign/FileServiceClient.java @@ -9,7 +9,7 @@ import org.springframework.web.multipart.MultipartFile; import java.util.List; -@FeignClient(name = "timeline.file", url = "${file.service.url}") +@FeignClient(name = "timeline.file") public interface FileServiceClient { @PostMapping(value = "/upload-image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @@ -26,4 +26,4 @@ public interface FileServiceClient { @GetMapping("/story-item/images/{storyItemId}") ResponseEntity> getStoryItemImages(@PathVariable String storyItemId); -} +} \ No newline at end of file diff --git a/timeline-story-service/src/main/java/com/timeline/story/feign/UserServiceClient.java b/timeline-story-service/src/main/java/com/timeline/story/feign/UserServiceClient.java index c6e58f2..163257e 100644 --- a/timeline-story-service/src/main/java/com/timeline/story/feign/UserServiceClient.java +++ b/timeline-story-service/src/main/java/com/timeline/story/feign/UserServiceClient.java @@ -8,12 +8,11 @@ import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; -@FeignClient(name = "timeline.user", url = "${user.service.url}") +@FeignClient(name = "timeline.user") public interface UserServiceClient { @GetMapping("/user/friend/ids") ResponseEntity> getFriendIds(); @GetMapping("/{userId}") ResponseEntity getUserByUserId(@PathVariable String userId); -} - +} \ No newline at end of file diff --git a/timeline-story-service/src/main/resources/application.properties b/timeline-story-service/src/main/resources/application.properties index 024207d..1aade54 100644 --- a/timeline-story-service/src/main/resources/application.properties +++ b/timeline-story-service/src/main/resources/application.properties @@ -1,9 +1,9 @@ -spring.application.name=timeline.story +spring.application.name=timeline-story spring.datasource.url=jdbc:mysql://59.80.22.43:33306/timeline?serverTimezone=UTC&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=WoCloud@9ol7uj spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -# MyBatis ?? +# MyBatis 配置 mybatis.configuration.log4j=true server.port=30001 spring.web.mvc.use-trailing-slash=true @@ -14,13 +14,10 @@ mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl logging.level.com.timeline.user.dao=DEBUG logging.level.org.mybatis=DEBUG -# LocalDateTime ??????? +# LocalDateTime 序列化配置 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=UTC -file.service.url=http://localhost:30002/file/ -user.service.url=http://localhost:30003/user/ - spring.servlet.multipart.enabled=true spring.servlet.multipart.max-file-size=1000MB spring.servlet.multipart.max-request-size=1000MB @@ -30,6 +27,10 @@ spring.data.redis.port=36379 spring.data.redis.password=123456 spring.data.redis.timeout=5000 +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} + # HikariCP tuning to avoid stale/closed MySQL connections spring.datasource.hikari.max-lifetime=600000 # 10 minutes, below MySQL wait_timeout @@ -49,4 +50,4 @@ logging.charset.file=UTF-8 server.tomcat.uri-encoding=UTF-8 server.servlet.encoding.charset=UTF-8 server.servlet.encoding.enabled=true -server.servlet.encoding.force=true +server.servlet.encoding.force=true \ No newline at end of file diff --git a/timeline-story-service/src/main/resources/bootstrap.properties b/timeline-story-service/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..9343e8d --- /dev/null +++ b/timeline-story-service/src/main/resources/bootstrap.properties @@ -0,0 +1,15 @@ +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.namespace=public +spring.cloud.nacos.discovery.group=DEFAULT_GROUP + +# Nacos配置中心 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} +spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace} +spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group} +spring.cloud.nacos.config.file-extension=properties + +# 如果需要从Nacos配置中心加载配置文件，取消下面的注释 +# spring.cloud.nacos.config.shared-configs[0].data-id=common.properties +# spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP +# spring.cloud.nacos.config.shared-configs[0].refresh=true \ No newline at end of file diff --git a/timeline-user-service/pom.xml b/timeline-user-service/pom.xml index 9f2d9fd..8f8e89f 100644 --- a/timeline-user-service/pom.xml +++ b/timeline-user-service/pom.xml @@ -44,6 +44,16 @@ spring-cloud-starter-bootstrap + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + io.jsonwebtoken @@ -116,4 +126,4 @@ - + \ No newline at end of file diff --git a/timeline-user-service/src/main/java/com/timeline/user/TimelineUserServiceApplication.java b/timeline-user-service/src/main/java/com/timeline/user/TimelineUserServiceApplication.java index 5d3d154..bb16635 100644 --- a/timeline-user-service/src/main/java/com/timeline/user/TimelineUserServiceApplication.java +++ b/timeline-user-service/src/main/java/com/timeline/user/TimelineUserServiceApplication.java @@ -2,13 +2,15 @@ package com.timeline.user; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication +@EnableDiscoveryClient @ComponentScan({"com.timeline", "com.timeline.user"}) public class TimelineUserServiceApplication { public static void main(String[] args) { SpringApplication.run(TimelineUserServiceApplication.class, args); } -} +} \ No newline at end of file diff --git a/timeline-user-service/src/main/resources/application.properties b/timeline-user-service/src/main/resources/application.properties index 721d818..a36be89 100644 --- a/timeline-user-service/src/main/resources/application.properties +++ b/timeline-user-service/src/main/resources/application.properties @@ -1,4 +1,4 @@ -spring.application.name=timeline.user +spring.application.name=timeline-user server.port=30003 # 数据库配置 @@ -31,6 +31,10 @@ spring.data.redis.port=36379 spring.data.redis.password=123456 spring.data.redis.timeout=5000 +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} + # 连接池 spring.datasource.hikari.maximum-pool-size=10 spring.datasource.hikari.minimum-idle=2 diff --git a/timeline-user-service/src/main/resources/bootstrap.properties b/timeline-user-service/src/main/resources/bootstrap.properties new file mode 100644 index 0000000..9343e8d --- /dev/null +++ b/timeline-user-service/src/main/resources/bootstrap.properties @@ -0,0 +1,15 @@ +# Nacos配置 +spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 +spring.cloud.nacos.discovery.namespace=public +spring.cloud.nacos.discovery.group=DEFAULT_GROUP + +# Nacos配置中心 +spring.cloud.nacos.config.server-addr=${spring.cloud.nacos.discovery.server-addr} +spring.cloud.nacos.config.namespace=${spring.cloud.nacos.discovery.namespace} +spring.cloud.nacos.config.group=${spring.cloud.nacos.discovery.group} +spring.cloud.nacos.config.file-extension=properties + +# 如果需要从Nacos配置中心加载配置文件，取消下面的注释 +# spring.cloud.nacos.config.shared-configs[0].data-id=common.properties +# spring.cloud.nacos.config.shared-configs[0].group=DEFAULT_GROUP +# spring.cloud.nacos.config.shared-configs[0].refresh=true \ No newline at end of file