From d5fa59170ab456c37ae5ed47aa53d5907c5cfa2e Mon Sep 17 00:00:00 2001
From: ivmiku <124345843+ivmiku@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:34:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=A8=A1=E5=9D=97=E9=87=8D=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 18e7bd4..9ccf09a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
user-8072
commons
community-8073
-
+ navigate-8432
From e4a343242f51125935e10845024a70b00a740056 Mon Sep 17 00:00:00 2001
From: ivmiku <124345843+ivmiku@users.noreply.github.com>
Date: Tue, 3 Sep 2024 16:36:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/ivmiku/tutorial/controller/MessageController.java | 2 +-
.../java/com/ivmiku/tutorial/controller/RelationController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/user-8072/src/main/java/com/ivmiku/tutorial/controller/MessageController.java b/user-8072/src/main/java/com/ivmiku/tutorial/controller/MessageController.java
index 326b872..e673b7d 100644
--- a/user-8072/src/main/java/com/ivmiku/tutorial/controller/MessageController.java
+++ b/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;
diff --git a/user-8072/src/main/java/com/ivmiku/tutorial/controller/RelationController.java b/user-8072/src/main/java/com/ivmiku/tutorial/controller/RelationController.java
index d7dcc88..0ab633e 100644
--- a/user-8072/src/main/java/com/ivmiku/tutorial/controller/RelationController.java
+++ b/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;
From 22b3cdf6ae83a0eb0b9e5a99101e4ae12ab12954 Mon Sep 17 00:00:00 2001
From: ivmiku <124345843+ivmiku@users.noreply.github.com>
Date: Tue, 3 Sep 2024 17:19:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20websocket=E7=BD=91=E5=85=B3=E8=BD=AC?=
=?UTF-8?q?=E5=8F=91=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/application-dep.properties | 4 ++++
.../src/main/resources/application-dev.properties | 10 ++++++++--
.../src/main/resources/application-dep.properties | 3 ++-
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gateway-8133/src/main/resources/application-dep.properties b/gateway-8133/src/main/resources/application-dep.properties
index e09f40c..ef52c69 100644
--- a/gateway-8133/src/main/resources/application-dep.properties
+++ b/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/**
diff --git a/gateway-8133/src/main/resources/application-dev.properties b/gateway-8133/src/main/resources/application-dev.properties
index b28784a..c4ffc74 100644
--- a/gateway-8133/src/main/resources/application-dev.properties
+++ b/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/**
\ No newline at end of file
diff --git a/user-8072/src/main/resources/application-dep.properties b/user-8072/src/main/resources/application-dep.properties
index 6810816..1e528a4 100644
--- a/user-8072/src/main/resources/application-dep.properties
+++ b/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