引入nacos支持

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);
     }
-}
+}

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<List<String>> getStoryItemImages(@PathVariable String storyItemId);
-}
+}

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<List<String>> getFriendIds();
     @GetMapping("/{userId}")
     ResponseEntity<Map> getUserByUserId(@PathVariable String userId);
-}
-
+}

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

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