功能:优化账号分层与管理员初始化
This commit is contained in:
@@ -6,6 +6,9 @@ FRONTEND_PORT=15173
|
|||||||
# HTTPS_PORT=443
|
# HTTPS_PORT=443
|
||||||
JWT_SECRET=your_very_secure_jwt_secret_here_change_me_in_production
|
JWT_SECRET=your_very_secure_jwt_secret_here_change_me_in_production
|
||||||
DATA_ENCRYPTION_KEY=your_32_plus_char_data_encryption_key_change_me
|
DATA_ENCRYPTION_KEY=your_32_plus_char_data_encryption_key_change_me
|
||||||
|
# 仅用于空数据库的首次启动;已有管理员账号时不会被覆盖。
|
||||||
|
INITIAL_ADMIN_USERNAME=skin_nh_admin
|
||||||
|
INITIAL_ADMIN_PASSWORD=change_me_to_a_secure_password
|
||||||
POSTGRES_USER=affiliate
|
POSTGRES_USER=affiliate
|
||||||
POSTGRES_PASSWORD=affiliate_dev_password
|
POSTGRES_PASSWORD=affiliate_dev_password
|
||||||
POSTGRES_DB=affiliate_dash
|
POSTGRES_DB=affiliate_dash
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ make dev
|
|||||||
启动后:
|
启动后:
|
||||||
- 前端:`http://localhost:15173`
|
- 前端:`http://localhost:15173`
|
||||||
- 后端:`http://localhost:18080`
|
- 后端:`http://localhost:18080`
|
||||||
- 默认管理员:`admin` / `admin123`
|
- 空数据库首次启动时由 `INITIAL_ADMIN_USERNAME` / `INITIAL_ADMIN_PASSWORD` 创建平台管理员
|
||||||
|
|
||||||
按 `Ctrl+C` 停止所有服务。
|
按 `Ctrl+C` 停止所有服务。
|
||||||
|
|
||||||
@@ -61,6 +61,7 @@ make frontend # 前端 :15173
|
|||||||
cp .env.example .env
|
cp .env.example .env
|
||||||
# 编辑 .env,确保以下变量已配置:
|
# 编辑 .env,确保以下变量已配置:
|
||||||
# JWT_SECRET — 生产环境务必修改
|
# JWT_SECRET — 生产环境务必修改
|
||||||
|
# INITIAL_ADMIN_USERNAME / INITIAL_ADMIN_PASSWORD — 空数据库首次创建的平台管理员,不会覆盖已有账号
|
||||||
# OPEN_API_KEY — 皮肤源头对接 API Key
|
# OPEN_API_KEY — 皮肤源头对接 API Key
|
||||||
# OPEN_API_SECRET — 签名密钥
|
# OPEN_API_SECRET — 签名密钥
|
||||||
# POSTGRES_USER / POSTGRES_PASSWORD / POSTGRES_DB — PostgreSQL 初始化配置
|
# POSTGRES_USER / POSTGRES_PASSWORD / POSTGRES_DB — PostgreSQL 初始化配置
|
||||||
@@ -103,6 +104,8 @@ make docker-down # 停止并移除
|
|||||||
| `FRONTEND_PORT` | 前端开发端口 | `15173` |
|
| `FRONTEND_PORT` | 前端开发端口 | `15173` |
|
||||||
| `HTTP_PORT` / `HTTPS_PORT` | Caddy 对外 HTTP/HTTPS 端口 | `80` / `443` |
|
| `HTTP_PORT` / `HTTPS_PORT` | Caddy 对外 HTTP/HTTPS 端口 | `80` / `443` |
|
||||||
| `JWT_SECRET` | JWT 签名密钥 | 开发默认值 |
|
| `JWT_SECRET` | JWT 签名密钥 | 开发默认值 |
|
||||||
|
| `INITIAL_ADMIN_USERNAME` | 空数据库首次创建的平台管理员用户名 | 必填(仅首次) |
|
||||||
|
| `INITIAL_ADMIN_PASSWORD` | 空数据库首次创建的平台管理员密码 | 必填,至少 8 位(仅首次) |
|
||||||
| `DATABASE_URL` | PostgreSQL 连接串 | 本地开发默认值 |
|
| `DATABASE_URL` | PostgreSQL 连接串 | 本地开发默认值 |
|
||||||
| `DOCKER_DATABASE_URL` | Docker 后端容器内 PostgreSQL 连接串,通常无需设置 | Compose 内置默认值 |
|
| `DOCKER_DATABASE_URL` | Docker 后端容器内 PostgreSQL 连接串,通常无需设置 | Compose 内置默认值 |
|
||||||
| `POSTGRES_PORT` | PostgreSQL 映射到宿主机的端口 | `15432` |
|
| `POSTGRES_PORT` | PostgreSQL 映射到宿主机的端口 | `15432` |
|
||||||
|
|||||||
@@ -84,7 +84,7 @@ func main() {
|
|||||||
cfg.DeliveryLinkTTLMinutes,
|
cfg.DeliveryLinkTTLMinutes,
|
||||||
)
|
)
|
||||||
|
|
||||||
if err := authSvc.EnsureAdmin(); err != nil {
|
if err := authSvc.EnsureAdmin(cfg.InitialAdminUsername, cfg.InitialAdminPassword); err != nil {
|
||||||
log.Fatalf("ensure admin: %v", err)
|
log.Fatalf("ensure admin: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ type Config struct {
|
|||||||
JWTSecret string
|
JWTSecret string
|
||||||
DatabaseURL string
|
DatabaseURL string
|
||||||
Mode string // debug / release
|
Mode string // debug / release
|
||||||
|
// InitialAdminUsername 和 InitialAdminPassword 仅用于空数据库首次创建平台管理员。
|
||||||
|
InitialAdminUsername string
|
||||||
|
InitialAdminPassword string
|
||||||
// DataEncryptionKey 用于加密保存 API/回调密钥;为空时由 JWT_SECRET 派生。
|
// DataEncryptionKey 用于加密保存 API/回调密钥;为空时由 JWT_SECRET 派生。
|
||||||
DataEncryptionKey string
|
DataEncryptionKey string
|
||||||
// OpenAPIKey 皮肤源头开放接口标识(Header: X-Api-Key,可公开给对接方)
|
// OpenAPIKey 皮肤源头开放接口标识(Header: X-Api-Key,可公开给对接方)
|
||||||
@@ -67,6 +70,8 @@ func Load() *Config {
|
|||||||
JWTSecret: getEnv("JWT_SECRET", "affiliate-dash-dev-secret-change-me"),
|
JWTSecret: getEnv("JWT_SECRET", "affiliate-dash-dev-secret-change-me"),
|
||||||
DatabaseURL: getEnv("DATABASE_URL", "postgres://affiliate:affiliate_dev_password@127.0.0.1:15432/affiliate_dash?sslmode=disable&TimeZone=Asia/Shanghai"),
|
DatabaseURL: getEnv("DATABASE_URL", "postgres://affiliate:affiliate_dev_password@127.0.0.1:15432/affiliate_dash?sslmode=disable&TimeZone=Asia/Shanghai"),
|
||||||
Mode: mode,
|
Mode: mode,
|
||||||
|
InitialAdminUsername: getEnv("INITIAL_ADMIN_USERNAME", ""),
|
||||||
|
InitialAdminPassword: getEnv("INITIAL_ADMIN_PASSWORD", ""),
|
||||||
DataEncryptionKey: getEnv("DATA_ENCRYPTION_KEY", getEnv("JWT_SECRET", "affiliate-dash-dev-secret-change-me")),
|
DataEncryptionKey: getEnv("DATA_ENCRYPTION_KEY", getEnv("JWT_SECRET", "affiliate-dash-dev-secret-change-me")),
|
||||||
OpenAPIKey: getEnv("OPEN_API_KEY", "sk_source_dev_key_change_me"),
|
OpenAPIKey: getEnv("OPEN_API_KEY", "sk_source_dev_key_change_me"),
|
||||||
OpenAPISecret: getEnv("OPEN_API_SECRET", "sk_source_dev_secret_change_me"),
|
OpenAPISecret: getEnv("OPEN_API_SECRET", "sk_source_dev_secret_change_me"),
|
||||||
|
|||||||
@@ -43,6 +43,17 @@ func (h *UserHandler) List(c *gin.Context) {
|
|||||||
response.Page(c, list, total, page, size)
|
response.Page(c, list, total, page, size)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (h *UserHandler) ListMerchantMembers(c *gin.Context) {
|
||||||
|
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
||||||
|
size, _ := strconv.Atoi(c.DefaultQuery("size", "20"))
|
||||||
|
list, total, err := h.svc.ListMerchantMembers(page, size)
|
||||||
|
if err != nil {
|
||||||
|
response.ServerError(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response.Page(c, list, total, page, size)
|
||||||
|
}
|
||||||
|
|
||||||
type createUserReq struct {
|
type createUserReq struct {
|
||||||
Username string `json:"username" binding:"required"`
|
Username string `json:"username" binding:"required"`
|
||||||
Password string `json:"password" binding:"required,min=6"`
|
Password string `json:"password" binding:"required,min=6"`
|
||||||
@@ -82,6 +93,24 @@ func (h *UserHandler) UpdateStatus(c *gin.Context) {
|
|||||||
response.OK(c, nil)
|
response.OK(c, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type userRoleReq struct {
|
||||||
|
Role string `json:"role" binding:"required"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *UserHandler) UpdateRole(c *gin.Context) {
|
||||||
|
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
|
||||||
|
var req userRoleReq
|
||||||
|
if err := c.ShouldBindJSON(&req); err != nil {
|
||||||
|
response.BadRequest(c, "参数错误:角色必填")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if err := h.svc.UpdateRole(uint(id), req.Role, middleware.GetUserID(c)); err != nil {
|
||||||
|
response.BadRequest(c, err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
response.OK(c, nil)
|
||||||
|
}
|
||||||
|
|
||||||
func (h *UserHandler) Delete(c *gin.Context) {
|
func (h *UserHandler) Delete(c *gin.Context) {
|
||||||
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
|
id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
|
||||||
if err := h.svc.Delete(uint(id), middleware.GetUserID(c)); err != nil {
|
if err := h.svc.Delete(uint(id), middleware.GetUserID(c)); err != nil {
|
||||||
|
|||||||
@@ -193,8 +193,10 @@ func Setup(h *Handlers) *gin.Engine {
|
|||||||
admin.Use(middleware.RequireRole(model.RoleAdmin))
|
admin.Use(middleware.RequireRole(model.RoleAdmin))
|
||||||
{
|
{
|
||||||
admin.GET("/users", h.User.List)
|
admin.GET("/users", h.User.List)
|
||||||
|
admin.GET("/platform/members", h.User.ListMerchantMembers)
|
||||||
admin.POST("/users", h.User.Create)
|
admin.POST("/users", h.User.Create)
|
||||||
admin.PATCH("/users/:id/status", h.User.UpdateStatus)
|
admin.PATCH("/users/:id/status", h.User.UpdateStatus)
|
||||||
|
admin.PATCH("/users/:id/role", h.User.UpdateRole)
|
||||||
admin.DELETE("/users/:id", h.User.Delete)
|
admin.DELETE("/users/:id", h.User.Delete)
|
||||||
admin.GET("/platform/merchants", h.Merchant.ListPlatformMerchants)
|
admin.GET("/platform/merchants", h.Merchant.ListPlatformMerchants)
|
||||||
admin.POST("/platform/merchants", h.Merchant.CreateMerchant)
|
admin.POST("/platform/merchants", h.Merchant.CreateMerchant)
|
||||||
|
|||||||
@@ -86,7 +86,9 @@ func (s *AuthService) ChangePassword(userID uint, currentPassword, newPassword s
|
|||||||
return s.db.Model(&user).Update("password_hash", string(hash)).Error
|
return s.db.Model(&user).Update("password_hash", string(hash)).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *AuthService) EnsureAdmin() error {
|
// EnsureAdmin creates the first platform administrator for an empty database.
|
||||||
|
// Existing administrator accounts are never changed by environment variables.
|
||||||
|
func (s *AuthService) EnsureAdmin(username, password string) error {
|
||||||
var count int64
|
var count int64
|
||||||
s.db.Model(&model.User{}).Where("role = ?", model.RoleAdmin).Count(&count)
|
s.db.Model(&model.User{}).Where("role = ?", model.RoleAdmin).Count(&count)
|
||||||
if count > 0 {
|
if count > 0 {
|
||||||
@@ -103,14 +105,21 @@ func (s *AuthService) EnsureAdmin() error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
hash, err := bcrypt.GenerateFromPassword([]byte("admin123"), bcrypt.DefaultCost)
|
username = strings.TrimSpace(username)
|
||||||
|
if len(username) < 3 {
|
||||||
|
return errors.New("空数据库首次启动必须设置 INITIAL_ADMIN_USERNAME(至少 3 位)")
|
||||||
|
}
|
||||||
|
if len(password) < 8 {
|
||||||
|
return errors.New("空数据库首次启动必须设置 INITIAL_ADMIN_PASSWORD(至少 8 位)")
|
||||||
|
}
|
||||||
|
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
admin := &model.User{
|
admin := &model.User{
|
||||||
Username: "admin",
|
Username: username,
|
||||||
PasswordHash: string(hash),
|
PasswordHash: string(hash),
|
||||||
Nickname: "管理员",
|
Nickname: username,
|
||||||
Role: model.RoleAdmin,
|
Role: model.RoleAdmin,
|
||||||
Status: 1,
|
Status: 1,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -224,3 +224,57 @@ func TestUserServiceCannotDeleteOrDisableLastAdmin(t *testing.T) {
|
|||||||
t.Fatal("should not delete the last enabled admin")
|
t.Fatal("should not delete the last enabled admin")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestUserServicePromotesMerchantAccountToPlatformAdmin(t *testing.T) {
|
||||||
|
db := newServiceTestDB(t)
|
||||||
|
var merchant model.Merchant
|
||||||
|
if err := db.Where("code = ?", model.MerchantCodeSelfOperated).First(&merchant).Error; err != nil {
|
||||||
|
t.Fatalf("load self-operated merchant: %v", err)
|
||||||
|
}
|
||||||
|
svc := NewUserService(db, NewTenantService(db))
|
||||||
|
actor, err := svc.Create("existing-admin", "password123", "现有管理员", model.RoleAdmin, 0)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create actor: %v", err)
|
||||||
|
}
|
||||||
|
member, err := svc.Create("skin_nh_admin", "password123", "新管理员", model.RoleMerchant, 0)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create merchant user: %v", err)
|
||||||
|
}
|
||||||
|
if err := svc.UpdateRole(member.ID, model.RoleAdmin, actor.ID); err != nil {
|
||||||
|
t.Fatalf("promote account: %v", err)
|
||||||
|
}
|
||||||
|
var promoted model.User
|
||||||
|
if err := db.First(&promoted, member.ID).Error; err != nil || promoted.Role != model.RoleAdmin {
|
||||||
|
t.Fatalf("account should be admin, user=%+v err=%v", promoted, err)
|
||||||
|
}
|
||||||
|
var membership model.MerchantMember
|
||||||
|
if err := db.Where("merchant_id = ? AND user_id = ?", merchant.ID, member.ID).First(&membership).Error; err != nil {
|
||||||
|
t.Fatalf("promoted account should join self-operated merchant: %v", err)
|
||||||
|
}
|
||||||
|
if membership.Role != model.MemberRoleOwner || !membership.IsDefault {
|
||||||
|
t.Fatalf("unexpected promoted membership: %+v", membership)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestEnsureAdminUsesConfiguredCredentialsOnlyForEmptyDatabase(t *testing.T) {
|
||||||
|
db := newServiceTestDB(t)
|
||||||
|
tenant := NewTenantService(db)
|
||||||
|
auth := NewAuthService(db, nil, tenant)
|
||||||
|
if err := auth.EnsureAdmin("skin_nh_admin", "secure-password"); err != nil {
|
||||||
|
t.Fatalf("create configured admin: %v", err)
|
||||||
|
}
|
||||||
|
var created model.User
|
||||||
|
if err := db.Where("username = ?", "skin_nh_admin").First(&created).Error; err != nil {
|
||||||
|
t.Fatalf("configured admin should exist: %v", err)
|
||||||
|
}
|
||||||
|
if err := bcrypt.CompareHashAndPassword([]byte(created.PasswordHash), []byte("secure-password")); err != nil {
|
||||||
|
t.Fatalf("configured password should match: %v", err)
|
||||||
|
}
|
||||||
|
if err := auth.EnsureAdmin("replacement-admin", "another-password"); err != nil {
|
||||||
|
t.Fatalf("existing admin should not be replaced: %v", err)
|
||||||
|
}
|
||||||
|
var count int64
|
||||||
|
if err := db.Model(&model.User{}).Where("role = ?", model.RoleAdmin).Count(&count).Error; err != nil || count != 1 {
|
||||||
|
t.Fatalf("existing admin should remain unchanged, count=%d err=%v", count, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
|
|
||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
"gorm.io/gorm"
|
"gorm.io/gorm"
|
||||||
|
"gorm.io/gorm/clause"
|
||||||
)
|
)
|
||||||
|
|
||||||
type UserService struct {
|
type UserService struct {
|
||||||
@@ -58,6 +59,23 @@ func (s *UserService) List(q UserListQuery) ([]model.User, int64, error) {
|
|||||||
return list, total, err
|
return list, total, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ListMerchantMembers returns employee assignments across merchants for platform operations.
|
||||||
|
func (s *UserService) ListMerchantMembers(page, size int) ([]model.MerchantMember, int64, error) {
|
||||||
|
page, size = normalizePage(page, size)
|
||||||
|
tx := s.db.Model(&model.MerchantMember{}).
|
||||||
|
Joins("JOIN users ON users.id = merchant_members.user_id AND users.deleted_at IS NULL").
|
||||||
|
Where("users.role = ?", model.RoleMerchant)
|
||||||
|
var total int64
|
||||||
|
if err := tx.Count(&total).Error; err != nil {
|
||||||
|
return nil, 0, err
|
||||||
|
}
|
||||||
|
var members []model.MerchantMember
|
||||||
|
err := tx.Preload("Merchant").Preload("User").
|
||||||
|
Order("merchant_members.merchant_id ASC, merchant_members.id ASC").
|
||||||
|
Offset((page - 1) * size).Limit(size).Find(&members).Error
|
||||||
|
return members, total, err
|
||||||
|
}
|
||||||
|
|
||||||
func (s *UserService) Create(username, password, nickname, role string, merchantID uint) (*model.User, error) {
|
func (s *UserService) Create(username, password, nickname, role string, merchantID uint) (*model.User, error) {
|
||||||
var count int64
|
var count int64
|
||||||
s.db.Model(&model.User{}).Where("username = ?", username).Count(&count)
|
s.db.Model(&model.User{}).Where("username = ?", username).Count(&count)
|
||||||
@@ -137,6 +155,58 @@ func (s *UserService) UpdateStatus(id uint, status int) error {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpdateRole changes the platform-level account role. Promoted administrators are
|
||||||
|
// also made owners of the self-operated merchant for a consistent merchant context.
|
||||||
|
func (s *UserService) UpdateRole(id uint, role string, actorUserID uint) error {
|
||||||
|
if id == 0 {
|
||||||
|
return errors.New("用户不存在")
|
||||||
|
}
|
||||||
|
if id == actorUserID {
|
||||||
|
return errors.New("不能修改当前登录账号的系统角色")
|
||||||
|
}
|
||||||
|
if role != model.RoleAdmin && role != model.RoleMerchant {
|
||||||
|
return errors.New("无效的账号角色")
|
||||||
|
}
|
||||||
|
return s.db.Transaction(func(tx *gorm.DB) error {
|
||||||
|
var user model.User
|
||||||
|
if err := tx.First(&user, id).Error; err != nil {
|
||||||
|
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||||
|
return errors.New("用户不存在")
|
||||||
|
}
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if user.Role == role {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
if user.Role == model.RoleAdmin && user.Status == 1 && role != model.RoleAdmin {
|
||||||
|
var admins int64
|
||||||
|
if err := tx.Model(&model.User{}).Where("role = ? AND status = ?", model.RoleAdmin, 1).Count(&admins).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if admins <= 1 {
|
||||||
|
return errors.New("至少保留一个启用的平台管理员")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := tx.Model(&user).Update("role", role).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if role != model.RoleAdmin {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
var merchant model.Merchant
|
||||||
|
if err := tx.Where("code = ?", model.MerchantCodeSelfOperated).First(&merchant).Error; err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
member := model.MerchantMember{MerchantID: merchant.ID, UserID: user.ID, Role: model.MemberRoleOwner, Status: user.Status, IsDefault: true}
|
||||||
|
return tx.Clauses(clause.OnConflict{
|
||||||
|
Columns: []clause.Column{{Name: "merchant_id"}, {Name: "user_id"}},
|
||||||
|
DoUpdates: clause.Assignments(map[string]interface{}{
|
||||||
|
"role": model.MemberRoleOwner, "status": user.Status, "is_default": true,
|
||||||
|
}),
|
||||||
|
}).Create(&member).Error
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// Delete removes a platform account and its merchant memberships. It protects the current
|
// Delete removes a platform account and its merchant memberships. It protects the current
|
||||||
// account and the final enabled platform administrator so the platform cannot be locked out.
|
// account and the final enabled platform administrator so the platform cannot be locked out.
|
||||||
func (s *UserService) Delete(id, actorUserID uint) error {
|
func (s *UserService) Delete(id, actorUserID uint) error {
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ services:
|
|||||||
- PORT=8080
|
- PORT=8080
|
||||||
- TZ=${TZ:-Asia/Shanghai}
|
- TZ=${TZ:-Asia/Shanghai}
|
||||||
- JWT_SECRET=${JWT_SECRET}
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- INITIAL_ADMIN_USERNAME=${INITIAL_ADMIN_USERNAME:-}
|
||||||
|
- INITIAL_ADMIN_PASSWORD=${INITIAL_ADMIN_PASSWORD:-}
|
||||||
- "DATABASE_URL=${DOCKER_DATABASE_URL:-postgres://${POSTGRES_USER:-affiliate}:${POSTGRES_PASSWORD:-affiliate_dev_password}@postgres:5432/${POSTGRES_DB:-affiliate_dash}?sslmode=disable&TimeZone=${TZ:-Asia/Shanghai}}"
|
- "DATABASE_URL=${DOCKER_DATABASE_URL:-postgres://${POSTGRES_USER:-affiliate}:${POSTGRES_PASSWORD:-affiliate_dev_password}@postgres:5432/${POSTGRES_DB:-affiliate_dash}?sslmode=disable&TimeZone=${TZ:-Asia/Shanghai}}"
|
||||||
- GIN_MODE=${GIN_MODE:-release}
|
- GIN_MODE=${GIN_MODE:-release}
|
||||||
- CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-}
|
- CORS_ALLOWED_ORIGINS=${CORS_ALLOWED_ORIGINS:-}
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ export const userApi = {
|
|||||||
request.post('/users', data).then((r) => r.data.data as User),
|
request.post('/users', data).then((r) => r.data.data as User),
|
||||||
updateStatus: (id: number, status: number) =>
|
updateStatus: (id: number, status: number) =>
|
||||||
request.patch(`/users/${id}/status`, { status }).then((r) => r.data.data),
|
request.patch(`/users/${id}/status`, { status }).then((r) => r.data.data),
|
||||||
|
updateRole: (id: number, role: User['role']) =>
|
||||||
|
request.patch(`/users/${id}/role`, { role }).then((r) => r.data.data),
|
||||||
remove: (id: number) =>
|
remove: (id: number) =>
|
||||||
request.delete(`/users/${id}`).then((r) => r.data.data),
|
request.delete(`/users/${id}`).then((r) => r.data.data),
|
||||||
}
|
}
|
||||||
@@ -176,6 +178,8 @@ export const deliveryApi = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export const platformApi = {
|
export const platformApi = {
|
||||||
|
members: (params?: Record<string, unknown>) =>
|
||||||
|
request.get('/platform/members', { params }).then((r) => r.data.data as PageResult<MerchantMember>),
|
||||||
merchants: (params?: Record<string, unknown>) =>
|
merchants: (params?: Record<string, unknown>) =>
|
||||||
request.get('/platform/merchants', { params }).then((r) => r.data.data as PageResult<Merchant>),
|
request.get('/platform/merchants', { params }).then((r) => r.data.data as PageResult<Merchant>),
|
||||||
createMerchant: (data: {
|
createMerchant: (data: {
|
||||||
|
|||||||
@@ -1,64 +1,128 @@
|
|||||||
import { useCallback, useEffect, useState } from 'react'
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
||||||
import { Button, Popconfirm, Table, Tag, Typography, message } from 'antd'
|
import { Button, Popconfirm, Space, Table, Tabs, Tag, Typography, message } from 'antd'
|
||||||
import { DeleteOutlined, ReloadOutlined } from '@ant-design/icons'
|
import { DeleteOutlined, ReloadOutlined, SafetyCertificateOutlined } from '@ant-design/icons'
|
||||||
import type { ColumnsType } from 'antd/es/table'
|
import type { ColumnsType } from 'antd/es/table'
|
||||||
import { userApi } from '../api'
|
import { platformApi, userApi } from '../api'
|
||||||
import { PageHeader } from '../components/PageHeader'
|
import { PageHeader } from '../components/PageHeader'
|
||||||
import type { PageResult, User } from '../types'
|
import type { MerchantMember, PageResult, User } from '../types'
|
||||||
import { formatDateTime } from '../utils/time'
|
import { formatDateTime } from '../utils/time'
|
||||||
import { useAuth } from '../store/auth'
|
import { useAuth } from '../store/auth'
|
||||||
|
import { roleText } from './merchantCenterUtils'
|
||||||
|
import { useNavigate } from 'react-router-dom'
|
||||||
|
|
||||||
export default function PlatformUsers() {
|
export default function PlatformUsers() {
|
||||||
const { user: currentUser } = useAuth()
|
const { user: currentUser } = useAuth()
|
||||||
const [data, setData] = useState<PageResult<User>>({ list: [], total: 0, page: 1, size: 20 })
|
const navigate = useNavigate()
|
||||||
|
const [tab, setTab] = useState('admins')
|
||||||
|
const [admins, setAdmins] = useState<PageResult<User>>({ list: [], total: 0, page: 1, size: 20 })
|
||||||
|
const [members, setMembers] = useState<PageResult<MerchantMember>>({ list: [], total: 0, page: 1, size: 20 })
|
||||||
const [loading, setLoading] = useState(false)
|
const [loading, setLoading] = useState(false)
|
||||||
|
|
||||||
const load = useCallback(async (page = data.page, size = data.size) => {
|
const loadAdmins = useCallback(async (page = admins.page, size = admins.size) => {
|
||||||
setLoading(true)
|
setLoading(true)
|
||||||
try {
|
try {
|
||||||
setData(await userApi.list({ page, size }))
|
setAdmins(await userApi.list({ page, size, role: 'admin' }))
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
message.error(e instanceof Error ? e.message : '加载失败')
|
message.error(e instanceof Error ? e.message : '加载失败')
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false)
|
setLoading(false)
|
||||||
}
|
}
|
||||||
}, [data.page, data.size])
|
}, [admins.page, admins.size])
|
||||||
|
|
||||||
|
const loadMembers = useCallback(async (page = members.page, size = members.size) => {
|
||||||
|
setLoading(true)
|
||||||
|
try {
|
||||||
|
setMembers(await platformApi.members({ page, size }))
|
||||||
|
} catch (e) {
|
||||||
|
message.error(e instanceof Error ? e.message : '加载失败')
|
||||||
|
} finally {
|
||||||
|
setLoading(false)
|
||||||
|
}
|
||||||
|
}, [members.page, members.size])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
void load()
|
if (tab === 'admins') void loadAdmins()
|
||||||
}, [load])
|
else void loadMembers()
|
||||||
|
}, [loadAdmins, loadMembers, tab])
|
||||||
|
|
||||||
const remove = async (record: User) => {
|
const remove = async (record: User) => {
|
||||||
try {
|
try {
|
||||||
await userApi.remove(record.id)
|
await userApi.remove(record.id)
|
||||||
message.success('账号已删除')
|
message.success('账号已删除')
|
||||||
load()
|
loadAdmins()
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
message.error(e instanceof Error ? e.message : '删除失败')
|
message.error(e instanceof Error ? e.message : '删除失败')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const columns: ColumnsType<User> = [
|
const promote = async (record: MerchantMember) => {
|
||||||
{ title: '用户名', dataIndex: 'username', width: 220, render: (value) => <Typography.Text strong>{value}</Typography.Text> },
|
try {
|
||||||
|
await userApi.updateRole(record.user_id, 'admin')
|
||||||
|
message.success('已设为平台超级管理员;请使用该账号重新登录')
|
||||||
|
loadMembers()
|
||||||
|
} catch (e) {
|
||||||
|
message.error(e instanceof Error ? e.message : '设置失败')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const adminColumns: ColumnsType<User> = [
|
||||||
|
{ title: '用户名', dataIndex: 'username', width: 240, render: (value) => <Typography.Text strong>{value}</Typography.Text> },
|
||||||
{ title: '昵称', dataIndex: 'nickname', width: 180, render: (value) => value || '-' },
|
{ title: '昵称', dataIndex: 'nickname', width: 180, render: (value) => value || '-' },
|
||||||
{ title: '账号类型', dataIndex: 'role', width: 140, render: (value) => <Tag color={value === 'admin' ? 'blue' : 'default'}>{value === 'admin' ? '平台管理员' : '商户账号'}</Tag> },
|
|
||||||
{ title: '状态', dataIndex: 'status', width: 100, render: (value) => value === 1 ? <Tag color="green">启用</Tag> : <Tag>停用</Tag> },
|
{ title: '状态', dataIndex: 'status', width: 100, render: (value) => value === 1 ? <Tag color="green">启用</Tag> : <Tag>停用</Tag> },
|
||||||
{ title: '创建时间', dataIndex: 'created_at', width: 180, render: formatDateTime },
|
{ title: '创建时间', dataIndex: 'created_at', width: 180, render: formatDateTime },
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
width: 120,
|
width: 130,
|
||||||
render: (_, record) => record.id === currentUser?.id ? <Typography.Text type="secondary">当前账号</Typography.Text> : (
|
render: (_, record) => record.id === currentUser?.id ? <Typography.Text type="secondary">当前账号</Typography.Text> : (
|
||||||
<Popconfirm title={`确认删除账号「${record.username}」?`} description="账号及其全部商户成员关系会被删除。" onConfirm={() => remove(record)} okButtonProps={{ danger: true }}>
|
<Popconfirm title={`确认删除平台管理员「${record.username}」?`} description="删除后该账号及其全部商户成员关系都会被移除。" onConfirm={() => remove(record)} okButtonProps={{ danger: true }}>
|
||||||
<Button type="link" danger size="small" icon={<DeleteOutlined />}>删除</Button>
|
<Button type="link" danger size="small" icon={<DeleteOutlined />}>删除</Button>
|
||||||
</Popconfirm>
|
</Popconfirm>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
|
const memberColumns: ColumnsType<MerchantMember> = [
|
||||||
|
{ title: '商户', width: 240, render: (_, record) => <Space direction="vertical" size={0}><Typography.Text strong>{record.merchant?.name || `商户#${record.merchant_id}`}</Typography.Text><Typography.Text type="secondary" style={{ fontSize: 12 }}>{record.merchant?.code}</Typography.Text></Space> },
|
||||||
|
{ title: '员工账号', dataIndex: ['user', 'username'], width: 200, render: (_, record) => record.user?.username || `#${record.user_id}` },
|
||||||
|
{ title: '昵称', dataIndex: ['user', 'nickname'], width: 160, render: (_, record) => record.user?.nickname || '-' },
|
||||||
|
{ title: '商户角色', dataIndex: 'role', width: 130, render: (role) => <Tag color="blue">{roleText(role)}</Tag> },
|
||||||
|
{ title: '成员状态', dataIndex: 'status', width: 110, render: (status) => status === 1 ? <Tag color="green">启用</Tag> : <Tag>停用</Tag> },
|
||||||
|
{
|
||||||
|
title: '操作',
|
||||||
|
width: 230,
|
||||||
|
render: (_, record) => (
|
||||||
|
<Space size={0}>
|
||||||
|
{record.user?.role !== 'admin' && record.user_id !== currentUser?.id && (
|
||||||
|
<Popconfirm title={`设「${record.user?.username}」为平台超级管理员?`} description="该账号将获得商户创建、平台商户管理等全局权限。" onConfirm={() => promote(record)}>
|
||||||
|
<Button type="link" size="small" icon={<SafetyCertificateOutlined />}>设为平台管理员</Button>
|
||||||
|
</Popconfirm>
|
||||||
|
)}
|
||||||
|
<Button type="link" size="small" onClick={() => {
|
||||||
|
localStorage.setItem('merchant_id', String(record.merchant_id))
|
||||||
|
navigate('/merchant-members')
|
||||||
|
}}>管理商户成员</Button>
|
||||||
|
</Space>
|
||||||
|
),
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
const items = useMemo(() => [
|
||||||
|
{
|
||||||
|
key: 'admins',
|
||||||
|
label: `平台管理员 (${admins.total})`,
|
||||||
|
children: <Table rowKey="id" loading={loading} columns={adminColumns} dataSource={admins.list} pagination={{ current: admins.page, pageSize: admins.size, total: admins.total, showSizeChanger: true, onChange: (page, size) => loadAdmins(page, size) }} />,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'members',
|
||||||
|
label: `商户员工 (${members.total})`,
|
||||||
|
children: <Table rowKey="id" loading={loading} columns={memberColumns} dataSource={members.list} pagination={{ current: members.page, pageSize: members.size, total: members.total, showSizeChanger: true, onChange: (page, size) => loadMembers(page, size) }} />,
|
||||||
|
},
|
||||||
|
], [adminColumns, admins, loadAdmins, loadMembers, loading, memberColumns, members])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<PageHeader title="账号管理" subtitle="管理平台管理员与商户登录账号;删除会同时解除该账号的商户成员关系。" breadcrumbs={[{ title: '账号管理' }]} extra={<Button icon={<ReloadOutlined />} loading={loading} onClick={() => load()}>刷新</Button>} />
|
<PageHeader title="账号管理" subtitle="平台管理员管理全局业务;商户员工的角色与权限归属各自商户。" breadcrumbs={[{ title: '账号管理' }]} extra={<Button icon={<ReloadOutlined />} loading={loading} onClick={() => tab === 'admins' ? loadAdmins() : loadMembers()}>刷新</Button>} />
|
||||||
<Table rowKey="id" loading={loading} columns={columns} dataSource={data.list} pagination={{ current: data.page, pageSize: data.size, total: data.total, showSizeChanger: true, onChange: (page, size) => load(page, size) }} />
|
<Tabs activeKey={tab} onChange={setTab} items={items} />
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user