Compare commits
12 Commits
0ef2a5d426
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 2acd7cd8d1 | |||
| 6cc9b84324 | |||
| e00b0be83d | |||
| cbf98bf556 | |||
| b648ee3d92 | |||
| 907980c85c | |||
| 75b8c315db | |||
| 8b5cdd1f93 | |||
| bcc53fab01 | |||
| ec3182db40 | |||
| 6f9f40c6f5 | |||
| e611074cac |
30
Dockerfile
30
Dockerfile
@@ -1,24 +1,24 @@
|
||||
# 最小化Docker镜像
|
||||
FROM busybox:uclibc
|
||||
# 阶段1: 构建
|
||||
FROM golang:alpine AS builder
|
||||
|
||||
WORKDIR /app
|
||||
RUN apk add --no-cache git ca-certificates tzdata
|
||||
|
||||
# 复制时区数据
|
||||
COPY timezone/localtime /etc/localtime
|
||||
COPY timezone/timezone /etc/timezone
|
||||
COPY timezone/Shanghai /usr/share/zoneinfo/Asia/Shanghai
|
||||
ENV TZ=Asia/Shanghai
|
||||
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
|
||||
|
||||
# 复制预构建的二进制文件和配置文件
|
||||
COPY gateway_binary ./main
|
||||
COPY config.yml ./
|
||||
ENV GO111MODULE=on
|
||||
ENV GOPROXY=https://goproxy.cn,direct
|
||||
ENV CGO_ENABLED=0
|
||||
ENV GOTOOLCHAIN=auto
|
||||
WORKDIR /build
|
||||
|
||||
# 添加执行权限
|
||||
RUN chmod +x /app/main
|
||||
COPY . .
|
||||
|
||||
RUN go mod download && go mod tidy
|
||||
|
||||
RUN go build -ldflags="-s -w" -o main ./main.go
|
||||
|
||||
# 创建日志目录
|
||||
RUN mkdir -p /logs /app/resource/log/run /app/resource/log/server
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
# 前台运行（确保容器不会立即退出）
|
||||
CMD ["./main"]
|
||||
|
||||
166
config-dev.yml
166
config-dev.yml
@@ -1,166 +0,0 @@
|
||||
server:
|
||||
address : ":8000"
|
||||
name: "gateway"
|
||||
rate:
|
||||
limit: 800
|
||||
burst: 2000
|
||||
# IP限流配置
|
||||
ip:
|
||||
limit: 100 # IP限流: 100 req/s
|
||||
burst: 200 # IP突发: 200
|
||||
# 用户限流配置
|
||||
user:
|
||||
limit: 50 # 已登录用户: 50 req/s
|
||||
burst: 100 # 已登录用户突发: 100
|
||||
# 服务维度限流配置
|
||||
services:
|
||||
# 高频业务服务 - 需要更高配置
|
||||
customerService:
|
||||
limit: 500 # 客服服务: 500 req/s (高频对话)
|
||||
burst: 700 # 突发: 700
|
||||
order:
|
||||
limit: 450 # 订单服务: 450 req/s (高频交易)
|
||||
burst: 600 # 突发: 600
|
||||
assets:
|
||||
limit: 400 # 资产服务: 400 req/s (高频访问)
|
||||
burst: 600 # 突发: 600 (有Stream削峰)
|
||||
cid:
|
||||
limit: 350 # 证书服务: 350 req/s (高频证书请求)
|
||||
burst: 500 # 突发: 500
|
||||
|
||||
# 中频基础服务
|
||||
oss:
|
||||
limit: 300 # 文件服务: 300 req/s (通用文件上传，可能被多个服务调用)
|
||||
burst: 450 # 突发: 450
|
||||
|
||||
# 低频业务服务
|
||||
wallet:
|
||||
limit: 120 # 钱包服务: 120 req/s (低频转账)
|
||||
burst: 200 # 突发: 200
|
||||
market:
|
||||
limit: 100 # 市场服务: 100 req/s (低频交易)
|
||||
burst: 180 # 突发: 180
|
||||
knapsack:
|
||||
limit: 80 # 背包服务: 80 req/s (低频功能)
|
||||
burst: 150 # 突发: 150
|
||||
|
||||
# 熔断器配置 - 每个服务独立配置
|
||||
circuitBreaker:
|
||||
# 高频业务服务 - 更严格的熔断策略
|
||||
customerService:
|
||||
enabled: true # 是否启用熔断器
|
||||
maxFailures: 5 # 连续失败5次触发熔断
|
||||
timeout: 30s # 30秒后尝试恢复
|
||||
successStatusCodes: 200,201,204 # 视为成功的HTTP状态码
|
||||
slowRequestThreshold: 3s # 慢请求阈值（超过此时间视为失败）
|
||||
enableSlidingWindow: true # 是否启用滑动窗口
|
||||
failureRateThreshold: 0.5 # 失败率阈值（0.0-1.0）
|
||||
enableFallback: false # 是否启用降级
|
||||
fallbackMessage: "" # 降级提示消息
|
||||
requestTimeout: 30000 # 请求超时时间（毫秒），0表示不设置
|
||||
distributedTTL: 300 # 分布式熔断状态TTL（秒），0表示不启用分布式熔断
|
||||
statIntervalMs: 1000 # 统计窗口时长（毫秒），默认1000ms
|
||||
minRequestAmount: 5 # 最小请求数量，默认与maxFailures相同
|
||||
order:
|
||||
enabled: true
|
||||
maxFailures: 3 # 订单服务更敏感
|
||||
timeout: 60s # 60秒后尝试恢复
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 2s # 订单服务要求更快的响应
|
||||
enableSlidingWindow: true
|
||||
failureRateThreshold: 0.6 # 订单服务对失败率更敏感
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 300
|
||||
assets:
|
||||
enabled: true
|
||||
maxFailures: 10 # 资产服务更宽松
|
||||
timeout: 60s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 5s # 资产服务可能较慢，给更多时间
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
cid:
|
||||
enabled: true
|
||||
maxFailures: 8
|
||||
timeout: 45s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
|
||||
# 中频基础服务
|
||||
oss:
|
||||
enabled: true
|
||||
maxFailures: 15
|
||||
timeout: 120s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 10s # 文件上传可能较慢
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 60000 # 文件服务可能需要更长时间
|
||||
distributedTTL: 0
|
||||
|
||||
# 低频业务服务 - 最宽松的熔断策略
|
||||
wallet:
|
||||
enabled: true
|
||||
maxFailures: 5
|
||||
timeout: 120s # 2分钟
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 5s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: true # 启用降级
|
||||
fallbackMessage: "钱包服务暂时繁忙，请稍后再试" # 降级提示消息
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 300 # 钱包服务启用分布式熔断
|
||||
adminIPs: "127.0.0.1,116.204.74.41" # 允许重置熔断器的管理员IP列表（逗号分隔）
|
||||
market:
|
||||
enabled: true
|
||||
maxFailures: 5
|
||||
timeout: 90s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
knapsack:
|
||||
enabled: false # 背包服务暂时不启用熔断
|
||||
maxFailures: 5
|
||||
timeout: 90s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
|
||||
redis:
|
||||
# 集群模式配置方法
|
||||
default:
|
||||
address: 116.204.74.41:6379
|
||||
db: 0
|
||||
idleTimeout: "60s" #连接最大空闲时间，使用时间字符串例如30s/1m/1d
|
||||
maxConnLifetime: "90s" #连接最长存活时间，使用时间字符串例如30s/1m/1d
|
||||
waitTimeout: "60s" #等待连接池连接的超时时间，使用时间字符串例如30s/1m/1d
|
||||
dialTimeout: "30s" #TCP连接的超时时间，使用时间字符串例如30s/1m/1d
|
||||
readTimeout: "30s" #TCP的Read操作超时时间，使用时间字符串例如30s/1m/1d
|
||||
writeTimeout: "30s" #TCP的Write操作超时时间，使用时间字符串例如30s/1m/1d
|
||||
maxActive: 100
|
||||
consul:
|
||||
address: 116.204.74.41:8500
|
||||
services:
|
||||
- name: customerService
|
||||
- name: test111
|
||||
jaeger: #链路追踪
|
||||
addr: 116.204.74.41:4318
|
||||
@@ -1,166 +0,0 @@
|
||||
server:
|
||||
address : ":8000"
|
||||
name: "gateway"
|
||||
rate:
|
||||
limit: 800
|
||||
burst: 2000
|
||||
# IP限流配置
|
||||
ip:
|
||||
limit: 100 # IP限流: 100 req/s
|
||||
burst: 200 # IP突发: 200
|
||||
# 用户限流配置
|
||||
user:
|
||||
limit: 50 # 已登录用户: 50 req/s
|
||||
burst: 100 # 已登录用户突发: 100
|
||||
# 服务维度限流配置
|
||||
services:
|
||||
# 高频业务服务 - 需要更高配置
|
||||
customerService:
|
||||
limit: 500 # 客服服务: 500 req/s (高频对话)
|
||||
burst: 700 # 突发: 700
|
||||
order:
|
||||
limit: 450 # 订单服务: 450 req/s (高频交易)
|
||||
burst: 600 # 突发: 600
|
||||
assets:
|
||||
limit: 400 # 资产服务: 400 req/s (高频访问)
|
||||
burst: 600 # 突发: 600 (有Stream削峰)
|
||||
cid:
|
||||
limit: 350 # 证书服务: 350 req/s (高频证书请求)
|
||||
burst: 500 # 突发: 500
|
||||
|
||||
# 中频基础服务
|
||||
oss:
|
||||
limit: 300 # 文件服务: 300 req/s (通用文件上传，可能被多个服务调用)
|
||||
burst: 450 # 突发: 450
|
||||
|
||||
# 低频业务服务
|
||||
wallet:
|
||||
limit: 120 # 钱包服务: 120 req/s (低频转账)
|
||||
burst: 200 # 突发: 200
|
||||
market:
|
||||
limit: 100 # 市场服务: 100 req/s (低频交易)
|
||||
burst: 180 # 突发: 180
|
||||
knapsack:
|
||||
limit: 80 # 背包服务: 80 req/s (低频功能)
|
||||
burst: 150 # 突发: 150
|
||||
|
||||
# 熔断器配置 - 每个服务独立配置
|
||||
circuitBreaker:
|
||||
# 高频业务服务 - 更严格的熔断策略
|
||||
customerService:
|
||||
enabled: true # 是否启用熔断器
|
||||
maxFailures: 5 # 连续失败5次触发熔断
|
||||
timeout: 30s # 30秒后尝试恢复
|
||||
successStatusCodes: 200,201,204 # 视为成功的HTTP状态码
|
||||
slowRequestThreshold: 3s # 慢请求阈值（超过此时间视为失败）
|
||||
enableSlidingWindow: true # 是否启用滑动窗口
|
||||
failureRateThreshold: 0.5 # 失败率阈值（0.0-1.0）
|
||||
enableFallback: false # 是否启用降级
|
||||
fallbackMessage: "" # 降级提示消息
|
||||
requestTimeout: 30000 # 请求超时时间（毫秒），0表示不设置
|
||||
distributedTTL: 300 # 分布式熔断状态TTL（秒），0表示不启用分布式熔断
|
||||
statIntervalMs: 1000 # 统计窗口时长（毫秒），默认1000ms
|
||||
minRequestAmount: 5 # 最小请求数量，默认与maxFailures相同
|
||||
order:
|
||||
enabled: true
|
||||
maxFailures: 3 # 订单服务更敏感
|
||||
timeout: 60s # 60秒后尝试恢复
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 2s # 订单服务要求更快的响应
|
||||
enableSlidingWindow: true
|
||||
failureRateThreshold: 0.6 # 订单服务对失败率更敏感
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 300
|
||||
assets:
|
||||
enabled: true
|
||||
maxFailures: 10 # 资产服务更宽松
|
||||
timeout: 60s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 5s # 资产服务可能较慢，给更多时间
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
cid:
|
||||
enabled: true
|
||||
maxFailures: 8
|
||||
timeout: 45s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
|
||||
# 中频基础服务
|
||||
oss:
|
||||
enabled: true
|
||||
maxFailures: 15
|
||||
timeout: 120s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 10s # 文件上传可能较慢
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 60000 # 文件服务可能需要更长时间
|
||||
distributedTTL: 0
|
||||
|
||||
# 低频业务服务 - 最宽松的熔断策略
|
||||
wallet:
|
||||
enabled: true
|
||||
maxFailures: 5
|
||||
timeout: 120s # 2分钟
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 5s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: true # 启用降级
|
||||
fallbackMessage: "钱包服务暂时繁忙，请稍后再试" # 降级提示消息
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 300 # 钱包服务启用分布式熔断
|
||||
adminIPs: "127.0.0.1,192.168.0.169" # 允许重置熔断器的管理员IP列表（逗号分隔）
|
||||
market:
|
||||
enabled: true
|
||||
maxFailures: 5
|
||||
timeout: 90s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
knapsack:
|
||||
enabled: false # 背包服务暂时不启用熔断
|
||||
maxFailures: 5
|
||||
timeout: 90s
|
||||
successStatusCodes: 200,201,204
|
||||
slowRequestThreshold: 3s
|
||||
enableSlidingWindow: false
|
||||
enableFallback: false
|
||||
fallbackMessage: ""
|
||||
requestTimeout: 30000
|
||||
distributedTTL: 0
|
||||
|
||||
redis:
|
||||
# 集群模式配置方法
|
||||
default:
|
||||
address: 192.168.0.169:6379
|
||||
db: 0
|
||||
idleTimeout: "60s" #连接最大空闲时间，使用时间字符串例如30s/1m/1d
|
||||
maxConnLifetime: "90s" #连接最长存活时间，使用时间字符串例如30s/1m/1d
|
||||
waitTimeout: "60s" #等待连接池连接的超时时间，使用时间字符串例如30s/1m/1d
|
||||
dialTimeout: "30s" #TCP连接的超时时间，使用时间字符串例如30s/1m/1d
|
||||
readTimeout: "30s" #TCP的Read操作超时时间，使用时间字符串例如30s/1m/1d
|
||||
writeTimeout: "30s" #TCP的Write操作超时时间，使用时间字符串例如30s/1m/1d
|
||||
maxActive: 100
|
||||
consul:
|
||||
address: 192.168.0.169:8500
|
||||
services:
|
||||
- name: customerService
|
||||
- name: test111
|
||||
jaeger: #链路追踪
|
||||
addr: 192.168.0.169:4318
|
||||
BIN
gateway_binary
BIN
gateway_binary
Binary file not shown.
16
go.mod
16
go.mod
@@ -1,14 +1,12 @@
|
||||
module gateway
|
||||
|
||||
go 1.26.0
|
||||
go 1.26.1
|
||||
|
||||
require (
|
||||
gitea.com/red-future/common v0.0.12
|
||||
github.com/gogf/gf/v2 v2.10.0
|
||||
gitea.redpowerfuture.com/red-future/common v0.0.23
|
||||
github.com/gogf/gf/v2 v2.10.2
|
||||
)
|
||||
|
||||
replace gitea.com/red-future/common v0.0.12 => ../common
|
||||
|
||||
require (
|
||||
github.com/BurntSushi/toml v1.5.0 // indirect
|
||||
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
|
||||
@@ -40,7 +38,7 @@ require (
|
||||
github.com/golang/snappy v1.0.0 // indirect
|
||||
github.com/google/flatbuffers v1.12.1 // 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.27.2 // indirect
|
||||
github.com/hashicorp/consul/api v1.26.1 // indirect
|
||||
@@ -87,9 +85,9 @@ require (
|
||||
go.opentelemetry.io/otel/trace v1.38.0 // indirect
|
||||
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
|
||||
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
|
||||
golang.org/x/net v0.43.0 // indirect
|
||||
golang.org/x/sys v0.35.0 // indirect
|
||||
golang.org/x/text v0.28.0 // indirect
|
||||
golang.org/x/net v0.47.0 // indirect
|
||||
golang.org/x/sys v0.38.0 // indirect
|
||||
golang.org/x/text v0.31.0 // indirect
|
||||
google.golang.org/appengine v1.6.7 // indirect
|
||||
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect
|
||||
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
|
||||
|
||||
34
go.sum
34
go.sum
@@ -1,5 +1,7 @@
|
||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
||||
gitea.redpowerfuture.com/red-future/common v0.0.23 h1:xieoA00iKOCDm5SO9iXn+cSyMKBAlZwI0fuEVPWrHLg=
|
||||
gitea.redpowerfuture.com/red-future/common v0.0.23/go.mod h1:50U1Xi+Ie56z09S5LQbZvaken0Mxv3OeS9LgR7U/ZRY=
|
||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
||||
github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
|
||||
github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
|
||||
@@ -123,8 +125,8 @@ github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5 h1:eUqwJ/qNH8lJ6yssiqskazgp
|
||||
github.com/gogf/gf/contrib/registry/consul/v2 v2.9.5/go.mod h1:sjQyMry9+0POYZCA6lHXBxO77WoNKkruJpRB4xKqk5k=
|
||||
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.9.5 h1:tHUEZYB5GTqEYYVDYnlGobf1xISARKDE4KHVlgjwTec=
|
||||
github.com/gogf/gf/contrib/trace/otlphttp/v2 v2.9.5/go.mod h1:cfzTn2HS9RDX8f5pUVkbGxUWcSosouqfNQ1G6cY0V88=
|
||||
github.com/gogf/gf/v2 v2.10.0 h1:rzDROlyqGMe/eM6dCalSR8dZOuMIdLhmxKSH1DGhbFs=
|
||||
github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
|
||||
github.com/gogf/gf/v2 v2.10.2 h1:46IO0Uc8e85/FqdftJFskfDejJLBL0JBnGS5qOftUu8=
|
||||
github.com/gogf/gf/v2 v2.10.2/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
|
||||
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
|
||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
||||
@@ -184,8 +186,8 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51
|
||||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
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 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
|
||||
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/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
|
||||
@@ -524,8 +526,8 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
|
||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
|
||||
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
|
||||
golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
|
||||
golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
|
||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
@@ -549,8 +551,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
|
||||
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
||||
golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
|
||||
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
|
||||
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
|
||||
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
|
||||
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
|
||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
@@ -561,8 +563,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
|
||||
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
|
||||
golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
@@ -601,15 +603,15 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
|
||||
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
|
||||
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng=
|
||||
golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU=
|
||||
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
|
||||
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
|
||||
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
||||
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
@@ -629,8 +631,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
|
||||
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
||||
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||
golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
|
||||
golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
|
||||
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
|
||||
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
||||
52
main.go
52
main.go
@@ -8,11 +8,11 @@ import (
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
"gitea.com/red-future/common/consul"
|
||||
"gitea.com/red-future/common/http"
|
||||
"gitea.com/red-future/common/middleware"
|
||||
_ "gitea.com/red-future/common/swagger"
|
||||
"gitea.com/red-future/common/utils"
|
||||
"gitea.redpowerfuture.com/red-future/common/consul"
|
||||
"gitea.redpowerfuture.com/red-future/common/http"
|
||||
"gitea.redpowerfuture.com/red-future/common/middleware"
|
||||
_ "gitea.redpowerfuture.com/red-future/common/swagger"
|
||||
"gitea.redpowerfuture.com/red-future/common/utils"
|
||||
"github.com/gogf/gf/v2/frame/g"
|
||||
"github.com/gogf/gf/v2/net/ghttp"
|
||||
"github.com/gogf/gf/v2/util/gconv"
|
||||
@@ -61,25 +61,25 @@ func StartServerProxy() {
|
||||
}
|
||||
|
||||
// 1. 解析 consul 配置地址
|
||||
consulAddr := g.Cfg().MustGet(r.GetCtx(), "consul.address").String()
|
||||
consulAddrList := strings.Split(consulAddr, ":")
|
||||
if len(consulAddrList) < 1 {
|
||||
g.Log().Error(r.GetCtx(), "consul.address 配置格式错误")
|
||||
r.Response.WriteJsonExit(map[string]interface{}{
|
||||
"success": false,
|
||||
"code": 500,
|
||||
"message": fmt.Sprintf("consul.address 配置格式错误：%s", consulAddr),
|
||||
})
|
||||
return
|
||||
}
|
||||
ipStr := instanceAddr
|
||||
if strings.Contains(instanceAddr, ":") {
|
||||
ipStr = strings.Split(instanceAddr, ":")[0]
|
||||
}
|
||||
// 2. 如果不是本地IP，则替换为consul配置的IP
|
||||
if !utils.IsLocalIP(ipStr) {
|
||||
instanceAddr = strings.Replace(instanceAddr, ipStr, consulAddrList[0], 1)
|
||||
}
|
||||
//consulAddr := g.Cfg().MustGet(r.GetCtx(), "consul.address").String()
|
||||
//consulAddrList := strings.Split(consulAddr, ":")
|
||||
//if len(consulAddrList) < 1 {
|
||||
// g.Log().Error(r.GetCtx(), "consul.address 配置格式错误")
|
||||
// r.Response.WriteJsonExit(map[string]interface{}{
|
||||
// "success": false,
|
||||
// "code": 500,
|
||||
// "message": fmt.Sprintf("consul.address 配置格式错误：%s", consulAddr),
|
||||
// })
|
||||
// return
|
||||
//}
|
||||
//ipStr := instanceAddr
|
||||
//if strings.Contains(instanceAddr, ":") {
|
||||
// ipStr = strings.Split(instanceAddr, ":")[0]
|
||||
//}
|
||||
//// 2. 如果不是本地IP，则替换为consul配置的IP
|
||||
//if !utils.IsLocalIP(ipStr) {
|
||||
// instanceAddr = strings.Replace(instanceAddr, ipStr, consulAddrList[0], 1)
|
||||
//}
|
||||
|
||||
r.Request.URL.Path = strings.Replace(r.Request.URL.Path, fmt.Sprintf("%s/", serverName), "", 1)
|
||||
r.MakeBodyRepeatableRead(false)
|
||||
@@ -92,10 +92,10 @@ func StartServerProxy() {
|
||||
user, err := utils.GetUserInfo(r.GetCtx())
|
||||
if err != nil {
|
||||
g.Log().Errorf(r.GetCtx(), "获取用户信息失败: %v", err)
|
||||
r.Response.Status = 500
|
||||
r.Response.Status = 401
|
||||
r.Response.WriteJsonExit(map[string]interface{}{
|
||||
"success": false,
|
||||
"code": 500,
|
||||
"code": 401,
|
||||
"message": "获取用户信息失败",
|
||||
})
|
||||
return
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -1 +0,0 @@
|
||||
Asia/Shanghai
|
||||
Reference in New Issue
Block a user