Merge branch 'main' of https://gitea.xinxijishubu.asia/iVMiku/guidance-backend

gateway-8133/src/main/resources/application-dep.properties

@@ -22,3 +22,7 @@ spring.cloud.gateway.routes[2].id=navigate
 spring.cloud.gateway.routes[2].uri=lb://navigate
 spring.cloud.gateway.routes[2].predicates[0]=Path=/navigate/**
 spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[3].id=websocket
+spring.cloud.gateway.routes[3].uri=lb:ws://user
+spring.cloud.gateway.routes[3].predicates[0]=Path=/chat/**

gateway-8133/src/main/resources/application-dev.properties

@@ -17,5 +17,11 @@ spring.cloud.gateway.routes[1].uri=lb://community
 spring.cloud.gateway.routes[1].predicates[0]=Path=/community/**
 spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
 
-#management.zipkin.tracing.endpoint=http://localhost:9411/api/v2/spans
-#management.tracing.sampling.probability=1.0
+spring.cloud.gateway.routes[2].id=navigate
+spring.cloud.gateway.routes[2].uri=lb://navigate
+spring.cloud.gateway.routes[2].predicates[0]=Path=/navigate/**
+spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[3].id=websocket
+spring.cloud.gateway.routes[3].uri=lb:ws://user
+spring.cloud.gateway.routes[3].predicates[0]=Path=/chat/**

pom.xml

@@ -13,7 +13,7 @@
         <module>user-8072</module>
         <module>commons</module>
         <module>community-8073</module>
-
+        <module>navigate-8432</module>
     </modules>
 
     <properties>

user-8072/src/main/java/com/ivmiku/tutorial/controller/MessageController.java

@@ -12,7 +12,7 @@ import java.text.ParseException;
 
 @SaCheckLogin
 @RestController
-@RequestMapping("/api/message")
+@RequestMapping("/message")
 public class MessageController {
     @Autowired
     private MessageService messageService;

user-8072/src/main/java/com/ivmiku/tutorial/controller/RelationController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 
 @SaCheckLogin
 @RestController
-@RequestMapping("/api/relation")
+@RequestMapping("/relation")
 public class RelationController {
     @Autowired
     private RelationService relationService;

user-8072/src/main/resources/application-dep.properties

@@ -4,6 +4,7 @@ wx.miniapp.configs[0].secret=989f155fcc3aee616568473faf1b1d3b
 spring.data.redis.host=redis
 spring.data.redis.port=6379
 spring.data.redis.database=0
+spring.data.redis.password=Shuodedaoli114514
 
 spring.application.name=user
 
@@ -17,4 +18,4 @@ spring.datasource.url=jdbc:mysql://mysql:3306/tutorial?useUnicode=true&character
 spring.cloud.nacos.discovery.server-addr=nacos:8848
 spring.cloud.nacos.discovery.enabled=true
 
-
+spring.rabbitmq.host=rabbitmq