common版本更新

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # config.yml
2026-04-22 18:00:32 +08:00 · 2026-04-13 13:27:16 +08:00 · 2026-04-13 13:25:39 +08:00
3 changed files with 18 additions and 4 deletions
--- a/config.yml
+++ b/config.yml
@@ -114,4 +114,17 @@ nats:
    url: "nats://116.204.74.41:4222"

 # 文件上传服务地址，与oss模块minio中的endpoint一致
-filePrefix: "http://116.204.74.41:9000"
+filePrefix: "http://172.17.0.3:9000"
+
+gmq:
+  redis:
+    primary:
+      addr: "116.204.74.41"
+      port: "6379"
+      db: 0
+      username: ""
+      password: ""
+      poolSize: 10
+      minIdleConn: 5
+      maxActiveConn: 10
+      maxRetries: 30
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module assets
 go 1.26.0

 require (
-	gitea.com/red-future/common v0.0.12
+	gitea.com/red-future/common v0.0.18
 	github.com/bjang03/gmq v0.0.0-20251219093200-000000000000
 	github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.10.0
 	github.com/gogf/gf/v2 v2.10.0
@@ -12,7 +12,7 @@ require (
 	go.mongodb.org/mongo-driver/v2 v2.5.0
 )

-replace gitea.com/red-future/common v0.0.12 => ../common
+replace gitea.com/red-future/common v0.0.18 => ../common

 replace github.com/bjang03/gmq => ../gmq

@@ -49,7 +49,7 @@ require (
 	github.com/golang/snappy v1.0.0 // indirect
 	github.com/google/flatbuffers v25.12.19+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
 	github.com/hashicorp/consul/api v1.33.5 // indirect
--- a/go.sum
+++ b/go.sum
@@ -147,6 +147,7 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=
 github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 h1:HWRh5R2+9EifMyIHV7ZV+MIZqgz+PMpZ14Jynv3O2Zs=
Author	SHA1	Message	Date
张斌	26fcf12f5d	common版本更新	2026-04-22 18:00:32 +08:00
张斌	e6a57b4718	Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # config.yml	2026-04-13 13:27:16 +08:00
张斌	9470ea7e45	网络环境调整	2026-04-13 13:25:39 +08:00