From 1a1fa521c00c2197ee33f6fda612d2e8ed0ea152 Mon Sep 17 00:00:00 2001 From: yanweidong Date: Mon, 10 Aug 2026 11:42:45 +0800 Subject: [PATCH] audit and harden workspace --- README.md | 172 ++++++------------ all/cmd/main/main.go | 18 +- all/cmd/main/main_test.go | 26 +++ all/go.mod | 2 - all/internal/server/server.go | 22 ++- go.work.sum | 3 + module/base/ads/etc/ads_dev.yaml | 6 +- module/base/ads/etc/ads_prod.yaml | 6 +- module/base/ads/etc/ads_test.yaml | 6 +- module/base/ads/go.mod | 2 - module/base/cloud/etc/cloud_dev.yaml | 6 +- module/base/cloud/etc/cloud_prod.yaml | 6 +- module/base/cloud/etc/cloud_test.yaml | 6 +- module/base/cloud/go.mod | 2 - module/base/cms/etc/cms_dev.yaml | 6 +- module/base/cms/etc/cms_prod.yaml | 6 +- module/base/cms/etc/cms_test.yaml | 6 +- module/base/cms/go.mod | 2 - module/base/cms/internal/utils/string.go | 1 + module/base/feedback/etc/feedback_dev.yaml | 4 +- module/base/feedback/go.mod | 2 - module/base/fts/etc/fts_dev.yaml | 6 +- module/base/fts/etc/fts_prod.yaml | 6 +- module/base/fts/etc/fts_test.yaml | 6 +- module/base/fts/go.mod | 2 - module/base/initial/etc/initial_dev.yaml | 6 +- module/base/initial/etc/initial_prod.yaml | 6 +- module/base/initial/etc/initial_test.yaml | 6 +- module/base/initial/go.mod | 2 - module/base/logs/etc/logs_dev.yaml | 4 +- module/base/logs/etc/logs_prod.yaml | 4 +- module/base/logs/etc/logs_test.yaml | 6 +- module/base/logs/go.mod | 2 - module/base/mgt/etc/mgt_dev.yaml | 6 +- module/base/mgt/etc/mgt_prod.yaml | 6 +- module/base/mgt/etc/mgt_test.yaml | 6 +- module/base/mgt/go.mod | 2 - module/base/passport/etc/passport_dev.yaml | 12 +- module/base/passport/etc/passport_prod.yaml | 16 +- module/base/passport/etc/passport_test.yaml | 12 +- module/base/passport/go.mod | 2 - module/base/sender/etc/sender_dev.yaml | 6 +- module/base/sender/etc/sender_prod.yaml | 6 +- module/base/sender/etc/sender_test.yaml | 6 +- module/base/sender/go.mod | 2 - module/ec/address/etc/address_dev.yaml | 6 +- module/ec/address/etc/address_prod.yaml | 6 +- module/ec/address/etc/address_test.yaml | 6 +- module/ec/address/go.mod | 2 - module/ec/mall/etc/mall_dev.yaml | 6 +- module/ec/mall/etc/mall_prod.yaml | 6 +- module/ec/mall/etc/mall_test.yaml | 6 +- module/ec/mall/go.mod | 2 - .../logic/freight/deny_region_delete.go | 2 +- module/ec/market/etc/market_dev.yaml | 6 +- module/ec/market/etc/market_prod.yaml | 6 +- module/ec/market/etc/market_test.yaml | 6 +- module/ec/market/go.mod | 2 - module/ec/order/etc/order_dev.yaml | 6 +- module/ec/order/etc/order_prod.yaml | 6 +- module/ec/order/etc/order_test.yaml | 6 +- module/ec/order/go.mod | 2 - module/finance/wallet/etc/wallet_dev.yaml | 6 +- module/finance/wallet/etc/wallet_prod.yaml | 4 +- module/finance/wallet/etc/wallet_test.yaml | 4 +- module/finance/wallet/go.mod | 2 - module/social/feed/etc/passport_dev.yaml | 12 +- module/social/feed/etc/passport_prod.yaml | 16 +- module/social/feed/etc/passport_test.yaml | 12 +- module/social/feed/go.mod | 2 - .../social/feed/internal/logic/post/action.go | 4 +- .../feed/internal/logic/post/add_comment.go | 4 +- .../social/feed/internal/logic/post/change.go | 4 +- .../feed/internal/logic/post/comment_list.go | 2 +- .../social/feed/internal/logic/post/create.go | 4 +- .../internal/logic/post/delete_comment.go | 4 +- .../social/feed/internal/logic/post/fetch.go | 4 +- .../social/feed/internal/logic/post/remove.go | 4 +- .../feed/internal/logic/setting/info.go | 2 +- .../feed/internal/logic/setting/rights.go | 2 +- .../social/feed/internal/logic/tag/create.go | 4 +- module/social/feed/internal/logic/tag/list.go | 4 +- .../feed/internal/logic/tag/post_list.go | 2 +- .../feed/internal/logic/timeline/follow.go | 2 +- .../feed/internal/logic/timeline/friend.go | 2 +- .../feed/internal/logic/timeline/hot.go | 2 +- .../feed/internal/logic/timeline/recommend.go | 2 +- module/social/group/etc/group_dev.yaml | 6 +- module/social/group/etc/group_prod.yaml | 6 +- module/social/group/etc/group_test.yaml | 6 +- module/social/group/go.mod | 2 - .../group/internal/logic/basic/create.go | 6 +- .../group/internal/logic/basic/disband.go | 2 +- .../group/internal/logic/basic/fetch.go | 4 +- .../social/group/internal/logic/basic/get.go | 4 +- .../group/internal/logic/basic/modify.go | 6 +- .../group/internal/logic/basic/search.go | 2 +- .../group/internal/logic/member/do_join.go | 6 +- .../group/internal/logic/member/do_kick.go | 6 +- .../group/internal/logic/member/do_quit.go | 6 +- .../internal/logic/member/do_set_manager.go | 6 +- .../group/internal/logic/member/fetch.go | 4 +- .../internal/logic/member/join_do_handle.go | 6 +- .../group/internal/logic/member/join_fetch.go | 6 +- module/social/relation/etc/relation_dev.yaml | 12 +- module/social/relation/etc/relation_prod.yaml | 16 +- module/social/relation/etc/relation_test.yaml | 12 +- module/social/relation/go.mod | 2 - .../relation/internal/logic/follow/do.go | 2 +- .../relation/internal/logic/follow/doing.go | 6 +- .../relation/internal/logic/follow/fetch.go | 6 +- .../relation/internal/logic/follow/state.go | 6 +- .../relation/internal/logic/follow/undo.go | 6 +- .../internal/logic/friend/apply_do.go | 6 +- .../internal/logic/friend/apply_do_message.go | 6 +- .../internal/logic/friend/apply_do_pass.go | 8 +- .../internal/logic/friend/apply_do_reject.go | 6 +- .../internal/logic/friend/apply_fetch.go | 4 +- .../internal/logic/friend/apply_get.go | 6 +- .../relation/internal/logic/friend/delete.go | 6 +- .../internal/logic/friend/do_popular.go | 6 +- .../relation/internal/logic/friend/fetch.go | 4 +- .../relation/internal/logic/friend/get.go | 4 +- .../internal/logic/friend/modify_nickname.go | 6 +- .../relation/internal/logic/friend/search.go | 2 +- .../internal/logic/friend/tag_do_create.go | 6 +- .../internal/logic/friend/tag_do_update.go | 6 +- .../internal/logic/friend/tag_fetch.go | 6 +- .../internal/logic/friend/tag_member_fetch.go | 6 +- .../internal/logic/friend/undo_popular.go | 6 +- .../internal/logic/match/do_ignore.go | 6 +- .../relation/internal/logic/match/do_join.go | 6 +- .../relation/internal/logic/match/fetch.go | 6 +- .../relation/internal/logic/match/get.go | 4 +- scripts/verify-workspace.ps1 | 34 ++++ scripts/verify-workspace.sh | 28 +++ wiki/README.md | 9 + wiki/architecture.md | 38 ++++ wiki/audit-2026-08-10.md | 53 ++++++ wiki/operations.md | 45 +++++ 140 files changed, 640 insertions(+), 475 deletions(-) create mode 100644 all/cmd/main/main_test.go create mode 100644 scripts/verify-workspace.ps1 create mode 100755 scripts/verify-workspace.sh create mode 100644 wiki/README.md create mode 100644 wiki/architecture.md create mode 100644 wiki/audit-2026-08-10.md create mode 100644 wiki/operations.md diff --git a/README.md b/README.md index db8895a..7b9a0b2 100644 --- a/README.md +++ b/README.md @@ -1,134 +1,70 @@ # BSM Infra Full -BSM 后端服务的 Go workspace，包含基础能力、电商、财务、社交服务，以及可选择组件运行的单体入口。所有模块统一使用 **Go 1.26.5**。 +BSM 后端服务 Go workspace，包含 19 个独立业务模块和一个统一端口运行的 all 聚合模块。Go 版本为 1.26.5。 -## 目录结构 +## 快速开始 -| 目录 | 服务 | -| --- | --- | -| `module/base` | ads、cloud、cms、feedback、fts、initial、logs、mgt、passport、sender | -| `module/ec` | address、delivery、mall、market、order | -| `module/finance` | wallet | -| `module/social` | feed、group、relation | -| `cmd` | 聚合上述服务的单体启动器 | -| `go.work` | 19 个 Go 模块的 workspace 定义 | +Windows： -各服务的接口、配置和部署细节见对应 `module/**/README.md`。 - -## 环境要求 - -- Go 1.26.5 -- Git -- 按所运行服务准备 PostgreSQL、Redis、etcd、MQ 或对象存储等外部依赖 -- 重新生成 protobuf 时，需要在系统 `PATH` 中安装 `protoc`、`protoc-gen-go`、`protoc-gen-go-grpc`、`protoc-gen-grpc-gateway` 和 `protoc-gen-slc` - -确认工具链： - -```bash -go version -go work sync -``` - -统一重新生成 protobuf： - -```bash -bash scripts/generate-protobuf.sh -``` - -脚本读取每个服务的 `proto/` 目录，将模块本地的 `const.proto` 与业务 proto 一起生成 protobuf、gRPC 和 grpc-gateway 代码；默认还会运行 `protoc-gen-slc`。如仅需刷新 protobuf 代码，可设置 `GENERATE_SLC=0`。 - -更新所有 workspace 模块的依赖： - -```bash -bash scripts/update-all.sh -``` - -脚本会为每个模块执行 `go get -u ./...` 和 `go mod tidy`，最后运行 `go work sync`；它不会自动提交或推送 Git 变更。 - -编译全部 19 个独立服务： - -```bash -bash scripts/build-all-linux.sh -``` - -脚本固定交叉编译 Linux x86-64（`GOOS=linux`、`GOARCH=amd64`、`CGO_ENABLED=0`），产物写入 `.builds/<领域>-<模块>`。全部模块编译成功后，各模块的 `etc/*_prod.yaml` 会复制到 `.builds/etc/`。`.builds/` 已加入 `.gitignore`，聚合入口 `cmd` 不包含在批量构建中。 - -## 配置 - -每个服务的 `etc/` 目录包含 `*_dev.yaml`、`*_test.yaml` 和 `*_prod.yaml` 示例。提交到仓库的配置只能包含占位值；请在本地副本或部署系统的密钥管理中注入真实凭据，不要提交数据库密码、访问密钥、令牌或私钥。 - -本仓库审计时已移除过明文凭据。如果这些凭据曾在真实环境使用，应立即在数据库、SMTP、对象存储及相关服务侧轮换。 - -## 运行 - -运行单个服务时，进入其模块目录。例如： - -```bash -cd module/base/passport -go run ./cmd/main -``` - -运行聚合入口： - -```bash -cd all -go run ./cmd/main -``` - -`all/etc/all_dev.yaml` 统一配置监听端口、数据库、Redis 以及 `Services.` 服务专属配置。聚合入口在同一端口通过 h2c 同时承载 gRPC、HTTP Gateway 和 Gin 路由。可以使用 `BSM_SERVICES` 临时覆盖启用的服务： - -```bash -# Linux/macOS -BSM_SERVICES=passport,order,wallet go run ./main - -# PowerShell -$env:BSM_SERVICES = "passport,order,wallet" -go run ./main -``` - -可选组件为：`ads`、`cloud`、`cms`、`feedback`、`fts`、`initial`、`logs`、`mgt`、`passport`、`sender`、`address`、`mall`、`market`、`order`、`wallet`。社交服务目前作为独立模块运行，尚未接入聚合入口。 - -## 测试 - -根目录不是 Go module，因此不要在根目录执行 `go test ./...`。应逐 workspace 模块测试。 - -PowerShell： - -```powershell -go list -m -f '{{.Dir}}' | ForEach-Object { - Push-Location $_ - try { go test ./... } finally { Pop-Location } -} -``` + go work sync + ./scripts/verify-workspace.ps1 Linux/macOS： -```bash -go list -m -f '{{.Dir}}' | while IFS= read -r module; do - (cd "$module" && go test ./...) -done -``` + go work sync + ./scripts/verify-workspace.sh -依赖运行中服务或真实基础设施的测试带有 `integration` build tag，默认测试不会访问外部系统。准备好测试环境和对应的 `BSM_*_TOKEN` 等变量后，在目标模块显式运行： +运行独立服务： -```bash -go test -tags=integration ./... -``` + cd module/base/passport + go run ./cmd/main -建议提交前执行： +运行聚合服务： -```bash -gofmt -w . -go vet ./... -go test ./... -``` + cd all + go run ./cmd/main --workspace=default -最后两条命令需在每个模块目录执行，可使用上面的 workspace 循环。 +all 默认读取 all/etc/default_.yaml。指定 --workspace=tenant01 时，开发模式读取 all/etc/tenant01_dev.yaml。workspace 仅允许字母、数字、下划线和连字符，最长 64 个字符。 + +## 模块 + +| 领域 | 模块 | +| --- | --- | +| module/base | ads、cloud、cms、feedback、fts、initial、logs、mgt、passport、sender | +| module/ec | address、mall、market、order | +| module/finance | wallet | +| module/social | feed、group、relation | +| all | 聚合 15 个 base/ec/finance 服务，统一提供 gRPC、grpc-gateway 和 Gin HTTP | + +Services 配置决定 all 启用哪些服务；BSM_SERVICES 环境变量可临时覆盖，例如 passport,order,wallet。 + +## 配置安全 + +仓库内 YAML 仅为结构示例，凭据使用 CHANGE_ME。部署时必须通过密钥管理或发布系统注入真实值，禁止提交密码、令牌、私钥和云密钥。 + +生产环境至少应替换全部 CHANGE_ME，关闭公网数据库/Redis/etcd，评估关闭 gRPC reflection，保持 mgt.InitRootUser=false，并在入口层启用 TLS 和访问控制。 + +## 常用脚本 + +| 脚本 | 用途 | +| --- | --- | +| scripts/verify-workspace.ps1 | Windows：gofmt、go vet、go test | +| scripts/verify-workspace.sh | Linux/macOS：gofmt、go vet、go test | +| scripts/build-all-linux.sh | 构建 Linux amd64 独立服务 | +| scripts/generate-protobuf.sh | 重新生成 protobuf | +| scripts/update-all.sh | 更新全部依赖，执行后必须审阅差异 | + +## 文档 + +- [Wiki 索引](wiki/README.md) +- [系统架构](wiki/architecture.md) +- [开发与运维](wiki/operations.md) +- [审计报告](wiki/audit-2026-08-10.md) ## 开发约定 -- Go 版本声明、Docker 构建镜像和 CI 构建镜像统一为 `1.26.5`。 -- 新模块必须加入 `go.work`，并确保本地 `replace` 使用当前 `module/...` 目录结构。 -- protobuf 描述符必须包含服务命名空间，避免多个服务聚合到同一进程时发生全局文件名冲突。 -- 外部依赖测试使用 `//go:build integration`，不得让默认测试依赖网络或已启动服务。 -- 配置和测试数据中不得包含真实凭据或个人信息。 +- 新模块必须加入 go.work，不得提交本机绝对路径 replace。 +- 模块保留独立 cmd/main，通过 service.Expose 接入 all。 +- 默认测试不得访问网络或真实基础设施；集成测试使用 integration build tag。 +- protobuf 全限定名称必须跨模块唯一。 +- 提交前运行 workspace 验证脚本和 git diff --check。 diff --git a/all/cmd/main/main.go b/all/cmd/main/main.go index 30f9102..f325149 100644 --- a/all/cmd/main/main.go +++ b/all/cmd/main/main.go @@ -3,9 +3,11 @@ package main import ( "context" "flag" + "fmt" "net/http" "os" "os/signal" + "regexp" "strings" "syscall" "time" @@ -18,12 +20,24 @@ import ( var ServiceKey = "default" +var workspacePattern = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$`) + +func normalizeWorkspace(value string) (string, error) { + value = strings.ToLower(strings.TrimSpace(value)) + if !workspacePattern.MatchString(value) { + return "", fmt.Errorf("workspace must match %s", workspacePattern.String()) + } + return value, nil +} + func main() { workspace := flag.String("workspace", ServiceKey, "workspace used to select etc/{workspace}_{runtime}.yaml") flag.Parse() - if value := strings.TrimSpace(*workspace); value != "" { - ServiceKey = value + value, err := normalizeWorkspace(*workspace) + if err != nil { + panic(err) } + ServiceKey = value config.New(ServiceKey) impl.NewImpl() diff --git a/all/cmd/main/main_test.go b/all/cmd/main/main_test.go new file mode 100644 index 0000000..e3cbc68 --- /dev/null +++ b/all/cmd/main/main_test.go @@ -0,0 +1,26 @@ +package main + +import "testing" + +func TestNormalizeWorkspace(t *testing.T) { + tests := []struct { + input string + want string + ok bool + }{ + {input: "default", want: "default", ok: true}, + {input: " Tenant_01 ", want: "tenant_01", ok: true}, + {input: "../prod", ok: false}, + {input: "", ok: false}, + {input: "tenant.name", ok: false}, + } + for _, test := range tests { + got, err := normalizeWorkspace(test.input) + if (err == nil) != test.ok { + t.Fatalf("normalizeWorkspace(%q) error = %v", test.input, err) + } + if got != test.want { + t.Fatalf("normalizeWorkspace(%q) = %q, want %q", test.input, got, test.want) + } + } +} diff --git a/all/go.mod b/all/go.mod index 2586404..138dc60 100644 --- a/all/go.mod +++ b/all/go.mod @@ -156,5 +156,3 @@ replace ( bsm/full/module/ec/order => ../module/ec/order bsm/full/module/finance/wallet => ../module/finance/wallet ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/all/internal/server/server.go b/all/internal/server/server.go index 9e49cf3..9de9432 100644 --- a/all/internal/server/server.go +++ b/all/internal/server/server.go @@ -7,6 +7,7 @@ import ( "net" "net/http" "strings" + "time" "github.com/gin-gonic/gin" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" @@ -49,7 +50,13 @@ func (s *Server) Start(addr string) error { } s.HTTP.ServeHTTP(w, r) }), &http2.Server{}) - s.server = &http.Server{Addr: addr, Handler: handler} + s.server = &http.Server{ + Addr: addr, + Handler: handler, + ReadHeaderTimeout: 10 * time.Second, + IdleTimeout: 120 * time.Second, + MaxHeaderBytes: 1 << 20, + } listener, err := net.Listen("tcp", addr) if err != nil { return err @@ -59,9 +66,18 @@ func (s *Server) Start(addr string) error { } func (s *Server) Stop(ctx context.Context) error { - s.GRPC.GracefulStop() + stopped := make(chan struct{}) + go func() { + s.GRPC.GracefulStop() + close(stopped) + }() + select { + case <-stopped: + case <-ctx.Done(): + s.GRPC.Stop() + } if s.server == nil { - return nil + return ctx.Err() } return s.server.Shutdown(ctx) } diff --git a/go.work.sum b/go.work.sum index 20b28fb..319611e 100644 --- a/go.work.sum +++ b/go.work.sum @@ -59,6 +59,9 @@ codeberg.org/polyfloyd/go-errorlint v1.9.0/go.mod h1:GPRRu2LzVijNn4YkrZYJfatQIdS dev.gaijin.team/go/exhaustruct/v4 v4.0.0/go.mod h1:aZ/k2o4Y05aMJtiux15x8iXaumE88YdiB0Ai4fXOzPI= dev.gaijin.team/go/golib v0.6.0/go.mod h1:uY1mShx8Z/aNHWDyAkZTkX+uCi5PdX7KsG1eDQa2AVE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= +git.apinb.com/bsm-sdk/core v0.2.1 h1:1kpbdij3qOlf1DmKTq3coIXSgLth5iJHJ3LvVZnjaXM= +git.apinb.com/bsm-sdk/core v0.2.1/go.mod h1:BL/aGHujCWdxrKZrWaiebmLx69J0OrTVv5XfugbbyhE= git.sr.ht/~sbinet/gg v0.6.0/go.mod h1:uucygbfC9wVPQIfrmwM2et0imr8L7KQWywX0xpFMm94= github.com/4meepo/tagalign v1.4.3/go.mod h1:00WwRjiuSbrRJnSVeGWPLp2epS5Q/l4UEy0apLLS37c= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= diff --git a/module/base/ads/etc/ads_dev.yaml b/module/base/ads/etc/ads_dev.yaml index d51d8b5..8e7bec0 100644 --- a/module/base/ads/etc/ads_dev.yaml +++ b/module/base/ads/etc/ads_dev.yaml @@ -4,10 +4,10 @@ Port: 12216 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/ads/etc/ads_prod.yaml b/module/base/ads/etc/ads_prod.yaml index d51d8b5..8e7bec0 100644 --- a/module/base/ads/etc/ads_prod.yaml +++ b/module/base/ads/etc/ads_prod.yaml @@ -4,10 +4,10 @@ Port: 12216 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/ads/etc/ads_test.yaml b/module/base/ads/etc/ads_test.yaml index d51d8b5..8e7bec0 100644 --- a/module/base/ads/etc/ads_test.yaml +++ b/module/base/ads/etc/ads_test.yaml @@ -4,10 +4,10 @@ Port: 12216 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/ads/go.mod b/module/base/ads/go.mod index 33e0661..b5282ec 100644 --- a/module/base/ads/go.mod +++ b/module/base/ads/go.mod @@ -64,5 +64,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/cloud/etc/cloud_dev.yaml b/module/base/cloud/etc/cloud_dev.yaml index 8a133fa..8eb41c5 100644 --- a/module/base/cloud/etc/cloud_dev.yaml +++ b/module/base/cloud/etc/cloud_dev.yaml @@ -4,10 +4,10 @@ Port: 12206 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cloud/etc/cloud_prod.yaml b/module/base/cloud/etc/cloud_prod.yaml index 8a133fa..8eb41c5 100644 --- a/module/base/cloud/etc/cloud_prod.yaml +++ b/module/base/cloud/etc/cloud_prod.yaml @@ -4,10 +4,10 @@ Port: 12206 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cloud/etc/cloud_test.yaml b/module/base/cloud/etc/cloud_test.yaml index 8a133fa..8eb41c5 100644 --- a/module/base/cloud/etc/cloud_test.yaml +++ b/module/base/cloud/etc/cloud_test.yaml @@ -4,10 +4,10 @@ Port: 12206 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cloud/go.mod b/module/base/cloud/go.mod index 66d4ff5..63a94bf 100644 --- a/module/base/cloud/go.mod +++ b/module/base/cloud/go.mod @@ -64,5 +64,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/cms/etc/cms_dev.yaml b/module/base/cms/etc/cms_dev.yaml index 9697b87..12fa3bd 100644 --- a/module/base/cms/etc/cms_dev.yaml +++ b/module/base/cms/etc/cms_dev.yaml @@ -4,10 +4,10 @@ Port: 12410 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12409 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cms/etc/cms_prod.yaml b/module/base/cms/etc/cms_prod.yaml index 0b50d9e..9eb51ab 100644 --- a/module/base/cms/etc/cms_prod.yaml +++ b/module/base/cms/etc/cms_prod.yaml @@ -4,10 +4,10 @@ Port: 12410 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12409 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cms/etc/cms_test.yaml b/module/base/cms/etc/cms_test.yaml index 0b50d9e..9eb51ab 100644 --- a/module/base/cms/etc/cms_test.yaml +++ b/module/base/cms/etc/cms_test.yaml @@ -4,10 +4,10 @@ Port: 12410 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12409 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/cms/go.mod b/module/base/cms/go.mod index 6128cd7..31c37bc 100644 --- a/module/base/cms/go.mod +++ b/module/base/cms/go.mod @@ -62,5 +62,3 @@ require ( gorm.io/driver/postgres v1.6.2 // indirect gorm.io/gorm v1.31.2 ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/cms/internal/utils/string.go b/module/base/cms/internal/utils/string.go index 2066c19..c4c2352 100644 --- a/module/base/cms/internal/utils/string.go +++ b/module/base/cms/internal/utils/string.go @@ -8,6 +8,7 @@ import "strings" // 移除空格，转换为小写，确保键值的唯一性和一致性 // 参数: // - key: 原始键值 +// // 返回: // - 格式化后的键值 func FormatKey(key string) string { diff --git a/module/base/feedback/etc/feedback_dev.yaml b/module/base/feedback/etc/feedback_dev.yaml index 36bf947..829a8d4 100644 --- a/module/base/feedback/etc/feedback_dev.yaml +++ b/module/base/feedback/etc/feedback_dev.yaml @@ -1,11 +1,11 @@ Name: {ServiceKey} ListenOn: 0.0.0.0:12210 -Dsn: postgres://postgres:CHANGE_ME@47.109.77.183:5432/milu?sslmode=disable&TimeZone=Asia/Shanghai +Dsn: postgres://postgres:CHANGE_ME@127.0.0.1:5432/milu?sslmode=disable&TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 # DB库设置例：redis://null:Weidong1214@139.159.232.50:6379/12，代表DB12 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # #Etcd: # Hosts: diff --git a/module/base/feedback/go.mod b/module/base/feedback/go.mod index e9d11e3..a6fe05b 100644 --- a/module/base/feedback/go.mod +++ b/module/base/feedback/go.mod @@ -64,5 +64,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/fts/etc/fts_dev.yaml b/module/base/fts/etc/fts_dev.yaml index 12a5c7d..de17ff7 100644 --- a/module/base/fts/etc/fts_dev.yaml +++ b/module/base/fts/etc/fts_dev.yaml @@ -5,16 +5,16 @@ Port: 16290 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME MinioOss: diff --git a/module/base/fts/etc/fts_prod.yaml b/module/base/fts/etc/fts_prod.yaml index 12a5c7d..de17ff7 100644 --- a/module/base/fts/etc/fts_prod.yaml +++ b/module/base/fts/etc/fts_prod.yaml @@ -5,16 +5,16 @@ Port: 16290 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME MinioOss: diff --git a/module/base/fts/etc/fts_test.yaml b/module/base/fts/etc/fts_test.yaml index 62181ab..0e6ec47 100644 --- a/module/base/fts/etc/fts_test.yaml +++ b/module/base/fts/etc/fts_test.yaml @@ -5,16 +5,16 @@ Port: 16290 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME MinioOss: diff --git a/module/base/fts/go.mod b/module/base/fts/go.mod index 70f684f..f9c6e30 100644 --- a/module/base/fts/go.mod +++ b/module/base/fts/go.mod @@ -106,5 +106,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/initial/etc/initial_dev.yaml b/module/base/initial/etc/initial_dev.yaml index 9c5254c..6dc1ef8 100644 --- a/module/base/initial/etc/initial_dev.yaml +++ b/module/base/initial/etc/initial_dev.yaml @@ -4,10 +4,10 @@ Port: 12101 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -26,7 +26,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/initial/etc/initial_prod.yaml b/module/base/initial/etc/initial_prod.yaml index 75f3431..533e63d 100644 --- a/module/base/initial/etc/initial_prod.yaml +++ b/module/base/initial/etc/initial_prod.yaml @@ -4,10 +4,10 @@ Port: 12101 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -26,7 +26,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/initial/etc/initial_test.yaml b/module/base/initial/etc/initial_test.yaml index 75f3431..533e63d 100644 --- a/module/base/initial/etc/initial_test.yaml +++ b/module/base/initial/etc/initial_test.yaml @@ -4,10 +4,10 @@ Port: 12101 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -26,7 +26,7 @@ Gateway: Port: 12102 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/initial/go.mod b/module/base/initial/go.mod index 1103689..eefd62d 100644 --- a/module/base/initial/go.mod +++ b/module/base/initial/go.mod @@ -67,5 +67,3 @@ require ( gorm.io/driver/postgres v1.6.2 // indirect gorm.io/gorm v1.31.2 ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/logs/etc/logs_dev.yaml b/module/base/logs/etc/logs_dev.yaml index abb0c58..490d605 100644 --- a/module/base/logs/etc/logs_dev.yaml +++ b/module/base/logs/etc/logs_dev.yaml @@ -7,12 +7,12 @@ Databases: - dm://SYSDBA:Yd@2aMwVAcJj4dA@172.21.138.165:5236?database=DAMENG&charset=utf8&parseTime=True&loc=Asia%2FShanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME diff --git a/module/base/logs/etc/logs_prod.yaml b/module/base/logs/etc/logs_prod.yaml index 39af805..be8b743 100644 --- a/module/base/logs/etc/logs_prod.yaml +++ b/module/base/logs/etc/logs_prod.yaml @@ -7,13 +7,13 @@ Databases: - dm://SYSDBA:Yd@2aMwVAcJj4dA@172.21.138.165:5236?database=DAMENG&charset=utf8&parseTime=True&loc=Asia%2FShanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/logs/etc/logs_test.yaml b/module/base/logs/etc/logs_test.yaml index f29ba67..5d8af85 100644 --- a/module/base/logs/etc/logs_test.yaml +++ b/module/base/logs/etc/logs_test.yaml @@ -4,16 +4,16 @@ Port: 16289 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=rst_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/logs/go.mod b/module/base/logs/go.mod index 8e924da..64de76f 100644 --- a/module/base/logs/go.mod +++ b/module/base/logs/go.mod @@ -70,5 +70,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/mgt/etc/mgt_dev.yaml b/module/base/mgt/etc/mgt_dev.yaml index 45c7363..869cafb 100644 --- a/module/base/mgt/etc/mgt_dev.yaml +++ b/module/base/mgt/etc/mgt_dev.yaml @@ -4,10 +4,10 @@ Port: 18001 Databases: Driver: postgres Source: - - host=8.137.107.29 user=postgres password=CHANGE_ME dbname=ec_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@8.137.107.29:19379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:19379/0 # 是否启用微服务模式 OnMicroService: false @@ -16,6 +16,6 @@ OnMicroService: false InitRootUser: true # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME diff --git a/module/base/mgt/etc/mgt_prod.yaml b/module/base/mgt/etc/mgt_prod.yaml index 60e2888..2c2e1e7 100644 --- a/module/base/mgt/etc/mgt_prod.yaml +++ b/module/base/mgt/etc/mgt_prod.yaml @@ -4,16 +4,16 @@ Port: 18001 Databases: Driver: postgres Source: - - host=pgm-wz9bhqbrvu52d180.pg.rds.aliyuncs.com user=ec_dev password=CHANGE_ME dbname=factor_prod port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=ec_dev password=CHANGE_ME dbname=factor_prod port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/mgt/etc/mgt_test.yaml b/module/base/mgt/etc/mgt_test.yaml index 445591b..ad114f7 100644 --- a/module/base/mgt/etc/mgt_test.yaml +++ b/module/base/mgt/etc/mgt_test.yaml @@ -4,16 +4,16 @@ Port: 18001 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 是否启用微服务模式 OnMicroService: false # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/mgt/go.mod b/module/base/mgt/go.mod index 68e5f7c..4ebb120 100644 --- a/module/base/mgt/go.mod +++ b/module/base/mgt/go.mod @@ -79,5 +79,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/passport/etc/passport_dev.yaml b/module/base/passport/etc/passport_dev.yaml index f3cef13..ab72a92 100644 --- a/module/base/passport/etc/passport_dev.yaml +++ b/module/base/passport/etc/passport_dev.yaml @@ -9,10 +9,10 @@ Gateway: Databases: Driver: postgres Source: - - host=8.137.107.29 user=postgres password=CHANGE_ME dbname=ec_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_dev port=19432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@8.137.107.29:19379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:19379/ # 微服务设置 MicroService: @@ -23,19 +23,19 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/base/passport/etc/passport_prod.yaml b/module/base/passport/etc/passport_prod.yaml index 35ad5bc..321517a 100644 --- a/module/base/passport/etc/passport_prod.yaml +++ b/module/base/passport/etc/passport_prod.yaml @@ -9,10 +9,10 @@ Gateway: Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -23,24 +23,24 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # KYC认证配置 KycConf: BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/base/passport/etc/passport_test.yaml b/module/base/passport/etc/passport_test.yaml index e89927a..d96792c 100644 --- a/module/base/passport/etc/passport_test.yaml +++ b/module/base/passport/etc/passport_test.yaml @@ -9,10 +9,10 @@ Gateway: Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -23,18 +23,18 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/base/passport/go.mod b/module/base/passport/go.mod index cbeee84..b18ab3c 100644 --- a/module/base/passport/go.mod +++ b/module/base/passport/go.mod @@ -68,5 +68,3 @@ require ( gorm.io/driver/postgres v1.6.2 // indirect gorm.io/gorm v1.31.2 ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/base/sender/etc/sender_dev.yaml b/module/base/sender/etc/sender_dev.yaml index 6b42091..395f129 100644 --- a/module/base/sender/etc/sender_dev.yaml +++ b/module/base/sender/etc/sender_dev.yaml @@ -4,10 +4,10 @@ Port: 12208 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -51,7 +51,7 @@ Code: # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: diff --git a/module/base/sender/etc/sender_prod.yaml b/module/base/sender/etc/sender_prod.yaml index 295f281..8ceffe3 100644 --- a/module/base/sender/etc/sender_prod.yaml +++ b/module/base/sender/etc/sender_prod.yaml @@ -4,10 +4,10 @@ Port: 12208 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -51,7 +51,7 @@ Code: # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/base/sender/etc/sender_test.yaml b/module/base/sender/etc/sender_test.yaml index 5d53df0..859e563 100644 --- a/module/base/sender/etc/sender_test.yaml +++ b/module/base/sender/etc/sender_test.yaml @@ -4,10 +4,10 @@ Port: 12208 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -50,7 +50,7 @@ Code: # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: diff --git a/module/base/sender/go.mod b/module/base/sender/go.mod index 477a6ed..ba952e5 100644 --- a/module/base/sender/go.mod +++ b/module/base/sender/go.mod @@ -84,5 +84,3 @@ require ( github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.1.0 go.etcd.io/etcd/client/v3 v3.7.1 ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/ec/address/etc/address_dev.yaml b/module/ec/address/etc/address_dev.yaml index e306d66..becc96c 100644 --- a/module/ec/address/etc/address_dev.yaml +++ b/module/ec/address/etc/address_dev.yaml @@ -4,10 +4,10 @@ Port: 12460 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12459 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/address/etc/address_prod.yaml b/module/ec/address/etc/address_prod.yaml index e306d66..becc96c 100644 --- a/module/ec/address/etc/address_prod.yaml +++ b/module/ec/address/etc/address_prod.yaml @@ -4,10 +4,10 @@ Port: 12460 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12459 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/address/etc/address_test.yaml b/module/ec/address/etc/address_test.yaml index e306d66..becc96c 100644 --- a/module/ec/address/etc/address_test.yaml +++ b/module/ec/address/etc/address_test.yaml @@ -4,10 +4,10 @@ Port: 12460 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12459 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/address/go.mod b/module/ec/address/go.mod index 5e5304f..00c1c38 100644 --- a/module/ec/address/go.mod +++ b/module/ec/address/go.mod @@ -58,5 +58,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/ec/mall/etc/mall_dev.yaml b/module/ec/mall/etc/mall_dev.yaml index aef2af6..8525c60 100644 --- a/module/ec/mall/etc/mall_dev.yaml +++ b/module/ec/mall/etc/mall_dev.yaml @@ -4,11 +4,11 @@ Port: 12420 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai Debug: true # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -25,7 +25,7 @@ Gateway: Port: 12419 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/mall/etc/mall_prod.yaml b/module/ec/mall/etc/mall_prod.yaml index f69f199..4fc35e3 100644 --- a/module/ec/mall/etc/mall_prod.yaml +++ b/module/ec/mall/etc/mall_prod.yaml @@ -4,10 +4,10 @@ Port: 12420 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12419 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/mall/etc/mall_test.yaml b/module/ec/mall/etc/mall_test.yaml index f69f199..4fc35e3 100644 --- a/module/ec/mall/etc/mall_test.yaml +++ b/module/ec/mall/etc/mall_test.yaml @@ -4,10 +4,10 @@ Port: 12420 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12419 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/mall/go.mod b/module/ec/mall/go.mod index b949251..c691a05 100644 --- a/module/ec/mall/go.mod +++ b/module/ec/mall/go.mod @@ -59,5 +59,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/ec/mall/internal/logic/freight/deny_region_delete.go b/module/ec/mall/internal/logic/freight/deny_region_delete.go index 823f65a..672d4c1 100644 --- a/module/ec/mall/internal/logic/freight/deny_region_delete.go +++ b/module/ec/mall/internal/logic/freight/deny_region_delete.go @@ -1,8 +1,8 @@ package freight import ( - "context" pb "bsm/full/module/ec/mall/pb" + "context" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "time" diff --git a/module/ec/market/etc/market_dev.yaml b/module/ec/market/etc/market_dev.yaml index aca9f39..12495e1 100644 --- a/module/ec/market/etc/market_dev.yaml +++ b/module/ec/market/etc/market_dev.yaml @@ -4,11 +4,11 @@ Port: 12424 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai Debug: true # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -25,7 +25,7 @@ Gateway: Port: 12423 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/market/etc/market_prod.yaml b/module/ec/market/etc/market_prod.yaml index 8b75f4d..0301a62 100644 --- a/module/ec/market/etc/market_prod.yaml +++ b/module/ec/market/etc/market_prod.yaml @@ -4,10 +4,10 @@ Port: 12424 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12423 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/market/etc/market_test.yaml b/module/ec/market/etc/market_test.yaml index 8b75f4d..0301a62 100644 --- a/module/ec/market/etc/market_test.yaml +++ b/module/ec/market/etc/market_test.yaml @@ -4,10 +4,10 @@ Port: 12424 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/0 +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/0 # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12423 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/market/go.mod b/module/ec/market/go.mod index 83186f5..8e0b4d6 100644 --- a/module/ec/market/go.mod +++ b/module/ec/market/go.mod @@ -58,5 +58,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/ec/order/etc/order_dev.yaml b/module/ec/order/etc/order_dev.yaml index 575d32e..c666aaf 100644 --- a/module/ec/order/etc/order_dev.yaml +++ b/module/ec/order/etc/order_dev.yaml @@ -4,10 +4,10 @@ Port: 12442 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12441 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/order/etc/order_prod.yaml b/module/ec/order/etc/order_prod.yaml index 575d32e..c666aaf 100644 --- a/module/ec/order/etc/order_prod.yaml +++ b/module/ec/order/etc/order_prod.yaml @@ -4,10 +4,10 @@ Port: 12442 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12441 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/order/etc/order_test.yaml b/module/ec/order/etc/order_test.yaml index 575d32e..c666aaf 100644 --- a/module/ec/order/etc/order_test.yaml +++ b/module/ec/order/etc/order_test.yaml @@ -4,10 +4,10 @@ Port: 12442 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=ec_mall port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 业务操作日志收集提交URL OpLog: http://api-v2.traingo.cn/oplog/v2 @@ -24,7 +24,7 @@ Gateway: Port: 12441 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME # Rpc: # fts: diff --git a/module/ec/order/go.mod b/module/ec/order/go.mod index b070f9a..8487324 100644 --- a/module/ec/order/go.mod +++ b/module/ec/order/go.mod @@ -59,5 +59,3 @@ require ( gorm.io/driver/postgres v1.6.2 // indirect gorm.io/gorm v1.31.2 ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/finance/wallet/etc/wallet_dev.yaml b/module/finance/wallet/etc/wallet_dev.yaml index efcdcde..f57257c 100644 --- a/module/finance/wallet/etc/wallet_dev.yaml +++ b/module/finance/wallet/etc/wallet_dev.yaml @@ -5,11 +5,11 @@ Port: 12238 Databases: Driver: postgres Source: - - postgres://postgres:CHANGE_ME@47.109.77.183:5432/bsm_dev?sslmode=disable&TimeZone=Asia/Shanghai + - postgres://postgres:CHANGE_ME@127.0.0.1:5432/bsm_dev?sslmode=disable&TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 # DB库设置例：redis://null:Weidong1214@139.159.232.50:6379/12，代表DB12 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ Etcd: Hosts: @@ -71,7 +71,7 @@ WeChat: AppSecret: SerialNo: 209F629E63E56D2366361969B51FBA0ADCF69F55 APIV3Key: MakeSupplyChainFinance1123581321 - PrivateKey: E:/working/ServerData/wechat_cert/apiclient_key.pem + PrivateKey: CHANGE_ME NotifyURL: Currency: CNY MchID: 1670561983 diff --git a/module/finance/wallet/etc/wallet_prod.yaml b/module/finance/wallet/etc/wallet_prod.yaml index d61037a..7009de8 100644 --- a/module/finance/wallet/etc/wallet_prod.yaml +++ b/module/finance/wallet/etc/wallet_prod.yaml @@ -1,10 +1,10 @@ Name: {ServiceKey} ListenOn: 0.0.0.0:12238 -Dsn: postgres://postgres:CHANGE_ME@47.109.77.183:5432/{Workspace}_prod?sslmode=disable&TimeZone=Asia/Shanghai +Dsn: postgres://postgres:CHANGE_ME@127.0.0.1:5432/{Workspace}_prod?sslmode=disable&TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ Etcd: Hosts: diff --git a/module/finance/wallet/etc/wallet_test.yaml b/module/finance/wallet/etc/wallet_test.yaml index 2050bab..4b7e385 100644 --- a/module/finance/wallet/etc/wallet_test.yaml +++ b/module/finance/wallet/etc/wallet_test.yaml @@ -1,11 +1,11 @@ Name: {ServiceKey} ListenOn: 0.0.0.0:12238 -Dsn: postgres://postgres:CHANGE_ME@47.109.77.183:5432/{Workspace}_test?sslmode=disable&TimeZone=Asia/Shanghai +Dsn: postgres://postgres:CHANGE_ME@127.0.0.1:5432/{Workspace}_test?sslmode=disable&TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 # DB库设置例：redis://null:Weidong1214@127.0.0.1:6379/12，代表DB12 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ Etcd: Hosts: diff --git a/module/finance/wallet/go.mod b/module/finance/wallet/go.mod index 7d37116..477ab87 100644 --- a/module/finance/wallet/go.mod +++ b/module/finance/wallet/go.mod @@ -74,5 +74,3 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/social/feed/etc/passport_dev.yaml b/module/social/feed/etc/passport_dev.yaml index 2134789..44d4389 100644 --- a/module/social/feed/etc/passport_dev.yaml +++ b/module/social/feed/etc/passport_dev.yaml @@ -4,10 +4,10 @@ Port: 12426 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,14 +18,14 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # Gateway 设置 @@ -34,7 +34,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/feed/etc/passport_prod.yaml b/module/social/feed/etc/passport_prod.yaml index 2e81f7f..10177e0 100644 --- a/module/social/feed/etc/passport_prod.yaml +++ b/module/social/feed/etc/passport_prod.yaml @@ -4,10 +4,10 @@ Port: 12426 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,21 +18,21 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # KYC认证配置 KycConf: BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME # Gateway 设置 Gateway: @@ -40,7 +40,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/feed/etc/passport_test.yaml b/module/social/feed/etc/passport_test.yaml index df8f3ca..2e2c58e 100644 --- a/module/social/feed/etc/passport_test.yaml +++ b/module/social/feed/etc/passport_test.yaml @@ -4,10 +4,10 @@ Port: 12426 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,14 +18,14 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # Gateway 设置 @@ -34,7 +34,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/feed/go.mod b/module/social/feed/go.mod index 7329d77..6a8f62d 100644 --- a/module/social/feed/go.mod +++ b/module/social/feed/go.mod @@ -45,5 +45,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/social/feed/internal/logic/post/action.go b/module/social/feed/internal/logic/post/action.go index ee7c20c..653baef 100644 --- a/module/social/feed/internal/logic/post/action.go +++ b/module/social/feed/internal/logic/post/action.go @@ -5,12 +5,12 @@ import ( "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 计数操作 diff --git a/module/social/feed/internal/logic/post/add_comment.go b/module/social/feed/internal/logic/post/add_comment.go index 54ce031..1207cb5 100644 --- a/module/social/feed/internal/logic/post/add_comment.go +++ b/module/social/feed/internal/logic/post/add_comment.go @@ -5,13 +5,13 @@ import ( "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 新建评论 diff --git a/module/social/feed/internal/logic/post/change.go b/module/social/feed/internal/logic/post/change.go index 4062c24..dec3ec4 100644 --- a/module/social/feed/internal/logic/post/change.go +++ b/module/social/feed/internal/logic/post/change.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 修改推文 diff --git a/module/social/feed/internal/logic/post/comment_list.go b/module/social/feed/internal/logic/post/comment_list.go index 43a128e..87287b6 100644 --- a/module/social/feed/internal/logic/post/comment_list.go +++ b/module/social/feed/internal/logic/post/comment_list.go @@ -3,8 +3,8 @@ package post import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 评论列表 diff --git a/module/social/feed/internal/logic/post/create.go b/module/social/feed/internal/logic/post/create.go index 3f27847..cbe46dc 100644 --- a/module/social/feed/internal/logic/post/create.go +++ b/module/social/feed/internal/logic/post/create.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 新建推文 diff --git a/module/social/feed/internal/logic/post/delete_comment.go b/module/social/feed/internal/logic/post/delete_comment.go index 07b8095..7ee6b06 100644 --- a/module/social/feed/internal/logic/post/delete_comment.go +++ b/module/social/feed/internal/logic/post/delete_comment.go @@ -4,12 +4,12 @@ import ( "context" "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 删除评论 diff --git a/module/social/feed/internal/logic/post/fetch.go b/module/social/feed/internal/logic/post/fetch.go index c821c96..7fe27c1 100644 --- a/module/social/feed/internal/logic/post/fetch.go +++ b/module/social/feed/internal/logic/post/fetch.go @@ -3,11 +3,11 @@ package post import ( "context" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 推文列表 diff --git a/module/social/feed/internal/logic/post/remove.go b/module/social/feed/internal/logic/post/remove.go index da014d7..9dfe1e1 100644 --- a/module/social/feed/internal/logic/post/remove.go +++ b/module/social/feed/internal/logic/post/remove.go @@ -4,12 +4,12 @@ import ( "context" "time" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 删除推文 diff --git a/module/social/feed/internal/logic/setting/info.go b/module/social/feed/internal/logic/setting/info.go index 22a1611..0240a42 100644 --- a/module/social/feed/internal/logic/setting/info.go +++ b/module/social/feed/internal/logic/setting/info.go @@ -3,8 +3,8 @@ package setting import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 修改个人信息 diff --git a/module/social/feed/internal/logic/setting/rights.go b/module/social/feed/internal/logic/setting/rights.go index 49b08a7..2f20f68 100644 --- a/module/social/feed/internal/logic/setting/rights.go +++ b/module/social/feed/internal/logic/setting/rights.go @@ -3,8 +3,8 @@ package setting import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 修改权限信息 diff --git a/module/social/feed/internal/logic/tag/create.go b/module/social/feed/internal/logic/tag/create.go index 27b970d..ef59b6e 100644 --- a/module/social/feed/internal/logic/tag/create.go +++ b/module/social/feed/internal/logic/tag/create.go @@ -3,12 +3,12 @@ package tag import ( "context" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/feed/internal/models" - pb "bsm/full/module/social/feed/pb" ) // 新建标签 diff --git a/module/social/feed/internal/logic/tag/list.go b/module/social/feed/internal/logic/tag/list.go index a686901..d2580cc 100644 --- a/module/social/feed/internal/logic/tag/list.go +++ b/module/social/feed/internal/logic/tag/list.go @@ -3,10 +3,10 @@ package tag import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/feed/internal/models" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/service" ) // 标签列表 diff --git a/module/social/feed/internal/logic/tag/post_list.go b/module/social/feed/internal/logic/tag/post_list.go index 5e6a38d..a16c3ae 100644 --- a/module/social/feed/internal/logic/tag/post_list.go +++ b/module/social/feed/internal/logic/tag/post_list.go @@ -3,8 +3,8 @@ package tag import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 话题相关的文章 diff --git a/module/social/feed/internal/logic/timeline/follow.go b/module/social/feed/internal/logic/timeline/follow.go index a32f766..68fabb6 100644 --- a/module/social/feed/internal/logic/timeline/follow.go +++ b/module/social/feed/internal/logic/timeline/follow.go @@ -3,8 +3,8 @@ package timeline import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 关注的动态 diff --git a/module/social/feed/internal/logic/timeline/friend.go b/module/social/feed/internal/logic/timeline/friend.go index f7f68ef..9ca7fe7 100644 --- a/module/social/feed/internal/logic/timeline/friend.go +++ b/module/social/feed/internal/logic/timeline/friend.go @@ -3,8 +3,8 @@ package timeline import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 好友动态 diff --git a/module/social/feed/internal/logic/timeline/hot.go b/module/social/feed/internal/logic/timeline/hot.go index 3809f55..2916cf3 100644 --- a/module/social/feed/internal/logic/timeline/hot.go +++ b/module/social/feed/internal/logic/timeline/hot.go @@ -3,8 +3,8 @@ package timeline import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 热门 diff --git a/module/social/feed/internal/logic/timeline/recommend.go b/module/social/feed/internal/logic/timeline/recommend.go index dd50605..88359ab 100644 --- a/module/social/feed/internal/logic/timeline/recommend.go +++ b/module/social/feed/internal/logic/timeline/recommend.go @@ -3,8 +3,8 @@ package timeline import ( "context" - "git.apinb.com/bsm-sdk/core/service" pb "bsm/full/module/social/feed/pb" + "git.apinb.com/bsm-sdk/core/service" ) // 推荐 diff --git a/module/social/group/etc/group_dev.yaml b/module/social/group/etc/group_dev.yaml index f1f6aee..e24f4e3 100644 --- a/module/social/group/etc/group_dev.yaml +++ b/module/social/group/etc/group_dev.yaml @@ -4,10 +4,10 @@ Port: 12247 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/group/etc/group_prod.yaml b/module/social/group/etc/group_prod.yaml index f1f6aee..e24f4e3 100644 --- a/module/social/group/etc/group_prod.yaml +++ b/module/social/group/etc/group_prod.yaml @@ -4,10 +4,10 @@ Port: 12247 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/group/etc/group_test.yaml b/module/social/group/etc/group_test.yaml index f1f6aee..e24f4e3 100644 --- a/module/social/group/etc/group_test.yaml +++ b/module/social/group/etc/group_test.yaml @@ -4,10 +4,10 @@ Port: 12247 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -21,7 +21,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/group/go.mod b/module/social/group/go.mod index 2444a61..032db81 100644 --- a/module/social/group/go.mod +++ b/module/social/group/go.mod @@ -45,5 +45,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/social/group/internal/logic/basic/create.go b/module/social/group/internal/logic/basic/create.go index 5a8d026..b7318f3 100644 --- a/module/social/group/internal/logic/basic/create.go +++ b/module/social/group/internal/logic/basic/create.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 创建群组 diff --git a/module/social/group/internal/logic/basic/disband.go b/module/social/group/internal/logic/basic/disband.go index 14d9e3f..8d0237f 100644 --- a/module/social/group/internal/logic/basic/disband.go +++ b/module/social/group/internal/logic/basic/disband.go @@ -3,10 +3,10 @@ package basic import ( "context" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - pb "bsm/full/module/social/group/pb" "time" ) diff --git a/module/social/group/internal/logic/basic/fetch.go b/module/social/group/internal/logic/basic/fetch.go index 2be736a..1c201eb 100644 --- a/module/social/group/internal/logic/basic/fetch.go +++ b/module/social/group/internal/logic/basic/fetch.go @@ -3,11 +3,11 @@ package basic import ( "context" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 获取群组列表 diff --git a/module/social/group/internal/logic/basic/get.go b/module/social/group/internal/logic/basic/get.go index 091d128..29d6682 100644 --- a/module/social/group/internal/logic/basic/get.go +++ b/module/social/group/internal/logic/basic/get.go @@ -3,11 +3,11 @@ package basic import ( "context" + "bsm/full/module/social/group/internal/impl" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/group/internal/impl" - pb "bsm/full/module/social/group/pb" ) // 获取群组信息 diff --git a/module/social/group/internal/logic/basic/modify.go b/module/social/group/internal/logic/basic/modify.go index 0071089..d857591 100644 --- a/module/social/group/internal/logic/basic/modify.go +++ b/module/social/group/internal/logic/basic/modify.go @@ -4,14 +4,14 @@ import ( "context" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 修改群组信息 diff --git a/module/social/group/internal/logic/basic/search.go b/module/social/group/internal/logic/basic/search.go index 2fb5a66..d7a4255 100644 --- a/module/social/group/internal/logic/basic/search.go +++ b/module/social/group/internal/logic/basic/search.go @@ -3,9 +3,9 @@ package basic import ( "context" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - pb "bsm/full/module/social/group/pb" ) // 搜索 diff --git a/module/social/group/internal/logic/member/do_join.go b/module/social/group/internal/logic/member/do_join.go index 0c98181..f785687 100644 --- a/module/social/group/internal/logic/member/do_join.go +++ b/module/social/group/internal/logic/member/do_join.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 申请加群 diff --git a/module/social/group/internal/logic/member/do_kick.go b/module/social/group/internal/logic/member/do_kick.go index 6a90384..c3cd555 100644 --- a/module/social/group/internal/logic/member/do_kick.go +++ b/module/social/group/internal/logic/member/do_kick.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 踢人 diff --git a/module/social/group/internal/logic/member/do_quit.go b/module/social/group/internal/logic/member/do_quit.go index 3945463..cb35c8c 100644 --- a/module/social/group/internal/logic/member/do_quit.go +++ b/module/social/group/internal/logic/member/do_quit.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 退群 diff --git a/module/social/group/internal/logic/member/do_set_manager.go b/module/social/group/internal/logic/member/do_set_manager.go index e8bb630..2cf5344 100644 --- a/module/social/group/internal/logic/member/do_set_manager.go +++ b/module/social/group/internal/logic/member/do_set_manager.go @@ -5,13 +5,13 @@ import ( "strings" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 设置或取消管理员 diff --git a/module/social/group/internal/logic/member/fetch.go b/module/social/group/internal/logic/member/fetch.go index cc24cc0..eefd3d0 100644 --- a/module/social/group/internal/logic/member/fetch.go +++ b/module/social/group/internal/logic/member/fetch.go @@ -3,11 +3,11 @@ package member import ( "context" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 获取群组成员列表 diff --git a/module/social/group/internal/logic/member/join_do_handle.go b/module/social/group/internal/logic/member/join_do_handle.go index 25e46d1..209b654 100644 --- a/module/social/group/internal/logic/member/join_do_handle.go +++ b/module/social/group/internal/logic/member/join_do_handle.go @@ -5,13 +5,13 @@ import ( "strings" "time" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "bsm/full/module/social/group/internal/impl" - "bsm/full/module/social/group/internal/models" - pb "bsm/full/module/social/group/pb" ) // 申请加群处理 diff --git a/module/social/group/internal/logic/member/join_fetch.go b/module/social/group/internal/logic/member/join_fetch.go index 1cf060f..d870400 100644 --- a/module/social/group/internal/logic/member/join_fetch.go +++ b/module/social/group/internal/logic/member/join_fetch.go @@ -3,12 +3,12 @@ package member import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/group/internal/impl" "bsm/full/module/social/group/internal/models" pb "bsm/full/module/social/group/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 申请加群列表 diff --git a/module/social/relation/etc/relation_dev.yaml b/module/social/relation/etc/relation_dev.yaml index 0059330..acfa248 100644 --- a/module/social/relation/etc/relation_dev.yaml +++ b/module/social/relation/etc/relation_dev.yaml @@ -4,10 +4,10 @@ Port: 12248 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,14 +18,14 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # Gateway 设置 @@ -34,7 +34,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/relation/etc/relation_prod.yaml b/module/social/relation/etc/relation_prod.yaml index cdb40c0..103e2a5 100644 --- a/module/social/relation/etc/relation_prod.yaml +++ b/module/social/relation/etc/relation_prod.yaml @@ -4,10 +4,10 @@ Port: 12426 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,21 +18,21 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # KYC认证配置 KycConf: BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME # Gateway 设置 Gateway: @@ -40,7 +40,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/relation/etc/relation_test.yaml b/module/social/relation/etc/relation_test.yaml index 47c6b00..58092ed 100644 --- a/module/social/relation/etc/relation_test.yaml +++ b/module/social/relation/etc/relation_test.yaml @@ -4,10 +4,10 @@ Port: 12426 Databases: Driver: postgres Source: - - host=47.109.77.183 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai # cache DB的选择请在后面直接带参数，不带会自动HASH计算选择DB库。 -Cache: redis://null:CHANGE_ME@47.109.77.183:6379/ +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ # 微服务设置 MicroService: @@ -18,14 +18,14 @@ MicroService: # 微信设置 WeChatConf: AppID: 123 - AppSecret: 123 + AppSecret: CHANGE_ME # KYC认证配置 Kyc: Provider: jumio BaseUrl: 123 - ApiSecret: 123 - ApiToken: 123 + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME ApiArgs: 123 # Gateway 设置 @@ -34,7 +34,7 @@ Gateway: Port: 12425 # 微服务调用密钥 -SecretKey: 6ad9529688041483f458f8de11ed16ff +SecretKey: CHANGE_ME Token: Prefix: "/token/" diff --git a/module/social/relation/go.mod b/module/social/relation/go.mod index 677b42d..8c220d2 100644 --- a/module/social/relation/go.mod +++ b/module/social/relation/go.mod @@ -64,5 +64,3 @@ require ( gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect ) - -replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/module/social/relation/internal/logic/follow/do.go b/module/social/relation/internal/logic/follow/do.go index 0aefa70..73c976c 100644 --- a/module/social/relation/internal/logic/follow/do.go +++ b/module/social/relation/internal/logic/follow/do.go @@ -3,10 +3,10 @@ package follow import ( "context" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - pb "bsm/full/module/social/relation/pb" "time" ) diff --git a/module/social/relation/internal/logic/follow/doing.go b/module/social/relation/internal/logic/follow/doing.go index 8f41f1a..dc79429 100644 --- a/module/social/relation/internal/logic/follow/doing.go +++ b/module/social/relation/internal/logic/follow/doing.go @@ -4,14 +4,14 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 执行关注 diff --git a/module/social/relation/internal/logic/follow/fetch.go b/module/social/relation/internal/logic/follow/fetch.go index a24974a..c0eb6df 100644 --- a/module/social/relation/internal/logic/follow/fetch.go +++ b/module/social/relation/internal/logic/follow/fetch.go @@ -4,13 +4,13 @@ import ( "context" "strings" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/relation/internal/impl" common "bsm/full/module/social/relation/internal/logic/common" "bsm/full/module/social/relation/internal/models" pb "bsm/full/module/social/relation/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 获取关注列表 diff --git a/module/social/relation/internal/logic/follow/state.go b/module/social/relation/internal/logic/follow/state.go index 1d658ce..5503e30 100644 --- a/module/social/relation/internal/logic/follow/state.go +++ b/module/social/relation/internal/logic/follow/state.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" "gorm.io/gorm" ) diff --git a/module/social/relation/internal/logic/follow/undo.go b/module/social/relation/internal/logic/follow/undo.go index ec73d35..c01d57f 100644 --- a/module/social/relation/internal/logic/follow/undo.go +++ b/module/social/relation/internal/logic/follow/undo.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 撤销关注 diff --git a/module/social/relation/internal/logic/friend/apply_do.go b/module/social/relation/internal/logic/friend/apply_do.go index 4364ca5..6e03e8c 100644 --- a/module/social/relation/internal/logic/friend/apply_do.go +++ b/module/social/relation/internal/logic/friend/apply_do.go @@ -4,14 +4,14 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 好友申请 diff --git a/module/social/relation/internal/logic/friend/apply_do_message.go b/module/social/relation/internal/logic/friend/apply_do_message.go index 807fef8..0a05d67 100644 --- a/module/social/relation/internal/logic/friend/apply_do_message.go +++ b/module/social/relation/internal/logic/friend/apply_do_message.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:留言 diff --git a/module/social/relation/internal/logic/friend/apply_do_pass.go b/module/social/relation/internal/logic/friend/apply_do_pass.go index 09581a4..32397aa 100644 --- a/module/social/relation/internal/logic/friend/apply_do_pass.go +++ b/module/social/relation/internal/logic/friend/apply_do_pass.go @@ -4,15 +4,15 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/logic/common" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:确认 diff --git a/module/social/relation/internal/logic/friend/apply_do_reject.go b/module/social/relation/internal/logic/friend/apply_do_reject.go index 8df0c4e..b568635 100644 --- a/module/social/relation/internal/logic/friend/apply_do_reject.go +++ b/module/social/relation/internal/logic/friend/apply_do_reject.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:拒绝 diff --git a/module/social/relation/internal/logic/friend/apply_fetch.go b/module/social/relation/internal/logic/friend/apply_fetch.go index a7129ff..1d65fea 100644 --- a/module/social/relation/internal/logic/friend/apply_fetch.go +++ b/module/social/relation/internal/logic/friend/apply_fetch.go @@ -3,11 +3,11 @@ package friend import ( "context" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/relation/internal/logic/common" - pb "bsm/full/module/social/relation/pb" ) // 好友申请列表 diff --git a/module/social/relation/internal/logic/friend/apply_get.go b/module/social/relation/internal/logic/friend/apply_get.go index b446c3d..c547811 100644 --- a/module/social/relation/internal/logic/friend/apply_get.go +++ b/module/social/relation/internal/logic/friend/apply_get.go @@ -3,13 +3,13 @@ package friend import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/relation/internal/impl" "bsm/full/module/social/relation/internal/logic/common" "bsm/full/module/social/relation/internal/models" pb "bsm/full/module/social/relation/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 好友申请详情 diff --git a/module/social/relation/internal/logic/friend/delete.go b/module/social/relation/internal/logic/friend/delete.go index 3d5c8b5..228c5d7 100644 --- a/module/social/relation/internal/logic/friend/delete.go +++ b/module/social/relation/internal/logic/friend/delete.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 删除好友 diff --git a/module/social/relation/internal/logic/friend/do_popular.go b/module/social/relation/internal/logic/friend/do_popular.go index 8fb329c..1adb4c1 100644 --- a/module/social/relation/internal/logic/friend/do_popular.go +++ b/module/social/relation/internal/logic/friend/do_popular.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 受你欢迎的,置顶 diff --git a/module/social/relation/internal/logic/friend/fetch.go b/module/social/relation/internal/logic/friend/fetch.go index 3348170..90173aa 100644 --- a/module/social/relation/internal/logic/friend/fetch.go +++ b/module/social/relation/internal/logic/friend/fetch.go @@ -3,11 +3,11 @@ package friend import ( "context" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/relation/internal/logic/common" - pb "bsm/full/module/social/relation/pb" ) // 获取好友列表 diff --git a/module/social/relation/internal/logic/friend/get.go b/module/social/relation/internal/logic/friend/get.go index 1305adf..43222e2 100644 --- a/module/social/relation/internal/logic/friend/get.go +++ b/module/social/relation/internal/logic/friend/get.go @@ -3,11 +3,11 @@ package friend import ( "context" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/relation/internal/logic/common" - pb "bsm/full/module/social/relation/pb" ) // 获取用户信息卡片 diff --git a/module/social/relation/internal/logic/friend/modify_nickname.go b/module/social/relation/internal/logic/friend/modify_nickname.go index 68998bd..97fa468 100644 --- a/module/social/relation/internal/logic/friend/modify_nickname.go +++ b/module/social/relation/internal/logic/friend/modify_nickname.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 修改好友备注名称,如果要清除备注,直接nickname传空值 diff --git a/module/social/relation/internal/logic/friend/search.go b/module/social/relation/internal/logic/friend/search.go index 465c4c5..3bdcf5a 100644 --- a/module/social/relation/internal/logic/friend/search.go +++ b/module/social/relation/internal/logic/friend/search.go @@ -3,9 +3,9 @@ package friend import ( "context" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - pb "bsm/full/module/social/relation/pb" ) // 搜索 diff --git a/module/social/relation/internal/logic/friend/tag_do_create.go b/module/social/relation/internal/logic/friend/tag_do_create.go index 535909f..4e07232 100644 --- a/module/social/relation/internal/logic/friend/tag_do_create.go +++ b/module/social/relation/internal/logic/friend/tag_do_create.go @@ -4,14 +4,14 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 创建标签 diff --git a/module/social/relation/internal/logic/friend/tag_do_update.go b/module/social/relation/internal/logic/friend/tag_do_update.go index d2b8b3c..8a5b370 100644 --- a/module/social/relation/internal/logic/friend/tag_do_update.go +++ b/module/social/relation/internal/logic/friend/tag_do_update.go @@ -5,13 +5,13 @@ import ( "strings" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 更新标签成员 diff --git a/module/social/relation/internal/logic/friend/tag_fetch.go b/module/social/relation/internal/logic/friend/tag_fetch.go index 0486dba..c8f9dc8 100644 --- a/module/social/relation/internal/logic/friend/tag_fetch.go +++ b/module/social/relation/internal/logic/friend/tag_fetch.go @@ -3,12 +3,12 @@ package friend import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/relation/internal/impl" "bsm/full/module/social/relation/internal/models" pb "bsm/full/module/social/relation/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 获取标签列表 diff --git a/module/social/relation/internal/logic/friend/tag_member_fetch.go b/module/social/relation/internal/logic/friend/tag_member_fetch.go index a8d2c4e..8114910 100644 --- a/module/social/relation/internal/logic/friend/tag_member_fetch.go +++ b/module/social/relation/internal/logic/friend/tag_member_fetch.go @@ -3,13 +3,13 @@ package friend import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/relation/internal/impl" "bsm/full/module/social/relation/internal/logic/common" "bsm/full/module/social/relation/internal/models" pb "bsm/full/module/social/relation/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 获取标签成员 diff --git a/module/social/relation/internal/logic/friend/undo_popular.go b/module/social/relation/internal/logic/friend/undo_popular.go index eaa7b9d..aa12cd7 100644 --- a/module/social/relation/internal/logic/friend/undo_popular.go +++ b/module/social/relation/internal/logic/friend/undo_popular.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 取消受欢迎的，取消置顶 diff --git a/module/social/relation/internal/logic/match/do_ignore.go b/module/social/relation/internal/logic/match/do_ignore.go index 2ca63db..79834e4 100644 --- a/module/social/relation/internal/logic/match/do_ignore.go +++ b/module/social/relation/internal/logic/match/do_ignore.go @@ -4,13 +4,13 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 执行忽略 diff --git a/module/social/relation/internal/logic/match/do_join.go b/module/social/relation/internal/logic/match/do_join.go index 0a1b6b5..38d7e9a 100644 --- a/module/social/relation/internal/logic/match/do_join.go +++ b/module/social/relation/internal/logic/match/do_join.go @@ -4,14 +4,14 @@ import ( "context" "time" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "bsm/full/module/social/relation/internal/impl" - "bsm/full/module/social/relation/internal/models" - pb "bsm/full/module/social/relation/pb" ) // 执行通过，加为好友 diff --git a/module/social/relation/internal/logic/match/fetch.go b/module/social/relation/internal/logic/match/fetch.go index ca7af44..0a60c2f 100644 --- a/module/social/relation/internal/logic/match/fetch.go +++ b/module/social/relation/internal/logic/match/fetch.go @@ -3,13 +3,13 @@ package match import ( "context" - "git.apinb.com/bsm-sdk/core/errcode" - "git.apinb.com/bsm-sdk/core/printer" - "git.apinb.com/bsm-sdk/core/service" "bsm/full/module/social/relation/internal/impl" "bsm/full/module/social/relation/internal/logic/common" "bsm/full/module/social/relation/internal/models" pb "bsm/full/module/social/relation/pb" + "git.apinb.com/bsm-sdk/core/errcode" + "git.apinb.com/bsm-sdk/core/printer" + "git.apinb.com/bsm-sdk/core/service" ) // 获取匹配列表 diff --git a/module/social/relation/internal/logic/match/get.go b/module/social/relation/internal/logic/match/get.go index 85f0466..7efbdbe 100644 --- a/module/social/relation/internal/logic/match/get.go +++ b/module/social/relation/internal/logic/match/get.go @@ -3,11 +3,11 @@ package match import ( "context" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "bsm/full/module/social/relation/internal/logic/common" - pb "bsm/full/module/social/relation/pb" ) // 获取匹配详情 diff --git a/scripts/verify-workspace.ps1 b/scripts/verify-workspace.ps1 new file mode 100644 index 0000000..8beaa28 --- /dev/null +++ b/scripts/verify-workspace.ps1 @@ -0,0 +1,34 @@ +[CmdletBinding()] +param( + [switch]$SkipVet +) + +$ErrorActionPreference = "Stop" +$workspaceRoot = Split-Path -Parent $PSScriptRoot +Push-Location $workspaceRoot +try { + $unformatted = @(gofmt -l all module) + if ($unformatted.Count -gt 0) { + throw ("gofmt required:" + [Environment]::NewLine + ($unformatted -join [Environment]::NewLine)) + } + + $modules = @(go list -m -f '{{.Dir}}') + foreach ($module in $modules) { + Write-Host "==> $module" + Push-Location $module + try { + if (-not $SkipVet) { + go vet ./... + if ($LASTEXITCODE -ne 0) { throw "go vet failed: $module" } + } + go test ./... + if ($LASTEXITCODE -ne 0) { throw "go test failed: $module" } + } + finally { + Pop-Location + } + } +} +finally { + Pop-Location +} diff --git a/scripts/verify-workspace.sh b/scripts/verify-workspace.sh new file mode 100755 index 0000000..d39f7ce --- /dev/null +++ b/scripts/verify-workspace.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" +readonly WORKSPACE_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd)" + +cd -- "${WORKSPACE_ROOT}" + +unformatted="$(gofmt -l all module)" +if [[ -n "${unformatted}" ]]; then + printf 'error: gofmt required:\n%s\n' "${unformatted}" >&2 + exit 1 +fi + +mapfile -t modules < <(go list -m -f '{{.Dir}}') +for module_dir in "${modules[@]}"; do + echo "==> ${module_dir}" + ( + cd -- "${module_dir}" + if [[ "${SKIP_VET:-0}" != "1" ]]; then + go vet ./... + fi + go test ./... + ) +done + +echo "Workspace verification completed successfully." diff --git a/wiki/README.md b/wiki/README.md new file mode 100644 index 0000000..46da368 --- /dev/null +++ b/wiki/README.md @@ -0,0 +1,9 @@ +# BSM Infra Full Wiki + +| 文档 | 内容 | +| --- | --- | +| [系统架构](architecture.md) | 模块边界、聚合入口、请求分流和依赖注入 | +| [开发与运维](operations.md) | 配置、启动、验证、构建、发布和排障 | +| [审计报告](audit-2026-08-10.md) | 已修复问题、剩余风险和后续优先级 | + +修改模块入口、配置结构、聚合协议或发布方式时，应同步更新本目录和根 README。 diff --git a/wiki/architecture.md b/wiki/architecture.md new file mode 100644 index 0000000..b966e82 --- /dev/null +++ b/wiki/architecture.md @@ -0,0 +1,38 @@ +# 系统架构 + +## 模块边界 + +仓库包含 20 个 Go module：module 下 19 个业务模块可独立运行，all 聚合其中 15 个 base、ec、finance 服务；social 三个模块暂未聚合。 + +典型模块目录职责： + +| 目录 | 职责 | +| --- | --- | +| cmd/main | 进程入口、配置和生命周期 | +| internal/config | 模块配置 | +| internal/impl | DB、Redis、etcd、内存缓存 | +| internal/logic | 业务逻辑 | +| internal/server | 服务构造与注册 | +| service | 对 all 公开的 Expose API | +| pb | protobuf 生成代码 | +| etc | 配置样例 | + +独立入口初始化自己的基础设施。聚合调用 Expose 时不重复初始化，而是注入 all 创建的共享对象。 + +## all 启动流程 + +1. 校验 --workspace 并读取 etc/_.yaml。 +2. 初始化共享 DB、Redis、etcd 和内存缓存。 +3. 创建统一 gRPC、grpc-gateway 和 Gin server。 +4. 按 Services 或 BSM_SERVICES 调用模块 Expose。 +5. 在一个 h2c 端口启动，并响应退出信号。 + +请求先按 gRPC Content-Type 分流；普通请求先进入 grpc-gateway，gateway 返回 404 时回退到 Gin。 + +## 依赖注入 + +ExposeOptions.Dependencies 可接收 RedisClient、etcd Client、gorm DB 和 Cache。参数非 nil 时覆盖模块 internal/impl 对象。address、market、order、mgt 的业务数据库访问已统一使用 internal/impl.DBService。 + +## 生命周期 + +统一 HTTP server 设置请求头读取超时、空闲超时和最大请求头。关闭时先执行 gRPC GracefulStop；超过 context 截止时间后强制 Stop，再关闭 HTTP server。 diff --git a/wiki/audit-2026-08-10.md b/wiki/audit-2026-08-10.md new file mode 100644 index 0000000..012ae9a --- /dev/null +++ b/wiki/audit-2026-08-10.md @@ -0,0 +1,53 @@ +# 代码审计报告（2026-08-10） + +## 范围 + +覆盖根 workspace、all、19 个业务模块、配置样例和维护脚本。执行结构盘点、敏感信息扫描、TODO/异常退出扫描和全部 module 测试。 + +## 已修复 + +| 优先级 | 问题 | 处理 | +| --- | --- | --- | +| P0 | 19 个 go.mod 绑定 D:/work/bsm-sdk/core | 移除绝对路径 replace；20 个 module 测试仍通过 | +| P0 | 样例含公网地址、固定 secret 和开发机私钥路径 | 改为 localhost 或 CHANGE_ME | +| P1 | workspace 直接参与路径构造 | 限制字符和长度、转小写、增加测试 | +| P1 | 聚合入口缺少连接防护 | 增加 ReadHeaderTimeout、IdleTimeout、MaxHeaderBytes | +| P1 | gRPC GracefulStop 可能无限等待 | 受 context 约束，超时强制 Stop | +| P2 | 缺少统一验证入口 | 新增 PowerShell 和 Bash 验证脚本 | +| P2 | README 乱码且过时 | 重写 README 并建立 wiki | + +## 尚存风险 + +### P0：默认管理员密码 + +module/base/mgt/internal/models/init_db.go 仍包含 root 默认密码 123456。建议改为必填环境变量或一次性随机密码；未提供安全凭据时拒绝初始化。 + +### P1：弱密码哈希 + +market、mall 等部分逻辑仍使用 MD5 加盐。应迁移至 bcrypt、scrypt 或 Argon2id，并采用登录时升级旧哈希的兼容策略。 + +### P1：reflection 与明文 h2c + +all 默认启用 gRPC reflection，自身不终止 TLS。生产环境应在可信网络运行，由网关终止 TLS，并将 reflection 改为配置控制。 + +### P1：未实现接口 + +social、wallet、mall、cms 等仍有模板 TODO。编译成功不代表功能完整；未实现 RPC 应明确返回 Unimplemented。 + +### P2：测试覆盖不足 + +多数 package 没有测试。应优先覆盖认证、权限、支付、订单状态机、迁移和 all 请求分流。 + +### P2：迁移与启动耦合 + +多个 models.New 会自动迁移或 seed。建议拆分连接、迁移、seed，支持蓝绿发布、只读实例和回滚。 + +## 建议路线 + +1. 消除默认管理员密码并迁移弱密码哈希。 +2. 配置化 reflection、初始化行为和 TLS 信任边界。 +3. 为 auth、mgt、order、wallet 建立核心路径测试。 +4. 将数据库迁移和 seed 从进程启动拆出。 +5. CI 增加 workspace 验证、凭据扫描、proto 一致性和依赖漏洞扫描。 + +审计基线：全部 20 个 workspace module 的 go test ./... 通过；不包含真实基础设施集成测试。 diff --git a/wiki/operations.md b/wiki/operations.md new file mode 100644 index 0000000..adbbe97 --- /dev/null +++ b/wiki/operations.md @@ -0,0 +1,45 @@ +# 开发与运维 + +## 配置 + +配置路径规则为： + + /etc/_.yaml + +all 的 serviceKey 来自 --workspace，默认 default。BSM_RuntimeMode 默认 dev，BSM_SERVICES 可覆盖聚合服务列表。 + +## 验证 + +Windows： + + ./scripts/verify-workspace.ps1 + +Linux/macOS： + + ./scripts/verify-workspace.sh + +脚本对每个 module 执行 go vet 和 go test，并检查 gofmt。依赖真实服务的测试应使用 integration tag。 + +## 构建 + +scripts/build-all-linux.sh 构建 module 下独立服务到 .builds。all 可单独构建： + + cd all + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -o ../.builds/all ./cmd/main + +## 发布检查 + +1. workspace 验证通过。 +2. git diff --check 通过。 +3. 配置不存在 CHANGE_ME。 +4. 数据库迁移已在预发布验证。 +5. Services 仅包含计划发布服务。 +6. TLS、访问控制、日志脱敏和监控已配置。 +7. 已准备二进制及数据库回滚方案。 + +## 排障 + +- 配置不存在：检查工作目录、BSM_Prefix、BSM_RuntimeMode 和 workspace 文件名。 +- 服务未注册：检查 Services 与 BSM_SERVICES。 +- 启动失败：检查端口、DSN、Redis、etcd 和迁移权限。 +- gateway 404：确认 proto gateway 注册；Gin 只在 gateway 404 后接管。