jack/digital-psychology
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ECR-025): OpsCMS FeedSlot 只读并 Closed

Browse Source 
栏目位目录（ops_feed_slots + /cms），复用 admin.cms.read。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jackyu66git
2026-08-08 03:08:40 +08:00
co-authored by Cursor
parent f51b2524c5
commit e32466357d
26 changed files with 661 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin-h5/src/api/client.ts
+24
View File
@@ -413,6 +413,30 @@ export const adminApi = {
system: boolean
updated_at: string
}>('GET', `/cms/banners/${id}`),
feedSlots: () =>
request<{
items: Array<{
id: string
code: string
title: string
slot_key: string
placement: string
active: boolean
system: boolean
updated_at: string
}>
}>('GET', '/cms/feed-slots'),
feedSlot: (id: string) =>
request<{
id: string
code: string
title: string
slot_key: string
placement: string
active: boolean
system: boolean
updated_at: string
}>('GET', `/cms/feed-slots/${id}`),
orders: () =>
request<{
items: Array<{
apps/admin-h5/src/pages/CMSPage.vue
+65 -3
View File
@@ -3,12 +3,18 @@ import { onMounted, ref } from 'vue'
import { adminApi } from '@/api/client'
type Banner = Awaited<ReturnType<typeof adminApi.banners>>['items'][number]
type FeedSlot = Awaited<ReturnType<typeof adminApi.feedSlots>>['items'][number]
const loading = ref(false)
const error = ref('')
const items = ref<Banner[]>([])
const selected = ref<Banner | null>(null)
const slotsLoading = ref(false)
const slotsError = ref('')
const slots = ref<FeedSlot[]>([])
const selectedSlot = ref<FeedSlot | null>(null)
async function load() {
loading.value = true
error.value = ''
@@ -22,6 +28,19 @@ async function load() {
}
}
async function loadSlots() {
slotsLoading.value = true
slotsError.value = ''
try {
const res = await adminApi.feedSlots()
slots.value = res.items || []
} catch (e) {
slotsError.value = e instanceof Error ? e.message : '加载失败'
} finally {
slotsLoading.value = false
}
}
async function openBanner(id: string) {
try {
selected.value = await adminApi.banner(id)
@@ -30,13 +49,24 @@ async function openBanner(id: string) {
}
}
onMounted(load)
async function openSlot(id: string) {
try {
selectedSlot.value = await adminApi.feedSlot(id)
} catch {
selectedSlot.value = null
}
}
onMounted(() => {
void load()
void loadSlots()
})
</script>
<template>
<section>
<h1>运营位 CMS</h1>
<p class="muted">Banner 只读目录 · 非 UGC · 本切片不可发布</p>
<p class="muted">Banner / FeedSlot 只读 · 非 UGC · 本切片不可发布</p>
<p v-if="loading" class="muted">加载中…</p>
<p v-else-if="error" class="err">{{ error }}</p>
<div v-else class="layout">
@@ -59,7 +89,7 @@ onMounted(load)
</table>
</div>
<div class="card">
<h2>详情</h2>
<h2>横幅详情</h2>
<template v-if="selected">
<p>{{ selected.title }} · {{ selected.placement }}</p>
<p class="muted">链接 {{ selected.link_path || '—' }} · 排序 {{ selected.sort_order }}</p>
@@ -67,6 +97,37 @@ onMounted(load)
<p v-else class="muted">选择左侧横幅</p>
</div>
</div>
<p v-if="slotsLoading" class="muted gap">栏目位加载中…</p>
<p v-else-if="slotsError" class="err gap">{{ slotsError }}</p>
<div v-else class="layout gap">
<div class="card">
<h2>栏目位 FeedSlot</h2>
<p v-if="!slots.length" class="muted">暂无</p>
<table v-else>
<thead>
<tr><th>代码</th><th>标题</th><th>slot_key</th><th>位置</th><th></th></tr>
</thead>
<tbody>
<tr v-for="s in slots" :key="s.id">
<td><code>{{ s.code }}</code></td>
<td>{{ s.title }}</td>
<td><code>{{ s.slot_key }}</code></td>
<td>{{ s.placement }}</td>
<td><button class="btn" type="button" @click="openSlot(s.id)">查看</button></td>
</tr>
</tbody>
</table>
</div>
<div class="card">
<h2>栏目位详情</h2>
<template v-if="selectedSlot">
<p>{{ selectedSlot.title }} · {{ selectedSlot.placement }}</p>
<p class="muted">slot_key {{ selectedSlot.slot_key }}</p>
</template>
<p v-else class="muted">选择左侧栏目位</p>
</div>
</div>
</section>
</template>
@@ -74,6 +135,7 @@ onMounted(load)
h1 { margin: 0 0 0.35rem; font-size: 1.35rem; }
h2 { margin: 0 0 0.6rem; font-size: 1.05rem; }
.layout { display: grid; grid-template-columns: 1.2fr 1fr; gap: 1rem; margin-top: 1rem; }
.gap { margin-top: 1.5rem; }
code { font-size: 0.8rem; }
@media (max-width: 900px) { .layout { grid-template-columns: 1fr; } }
</style>
apps/api/internal/handler/admin_cms.go
+29
View File
@@ -16,6 +16,8 @@ func (h *AdminHandler) registerCMS(authed *gin.RouterGroup) {
g := authed.Group("/cms")
g.GET("/banners", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.ListBanners)
g.GET("/banners/:id", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.GetBanner)
g.GET("/feed-slots", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.ListFeedSlots)
g.GET("/feed-slots/:id", middleware.RequireAdminPermission(h.Svc, admin.PermCMSRead), h.GetFeedSlot)
}
func (h *AdminHandler) ListBanners(c *gin.Context) {
@@ -44,3 +46,30 @@ func (h *AdminHandler) GetBanner(c *gin.Context) {
}
response.OK(c, row)
}
func (h *AdminHandler) ListFeedSlots(c *gin.Context) {
items, err := h.Svc.ListFeedSlots(c.Request.Context())
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50042, "list feed slots failed")
return
}
response.OK(c, gin.H{"items": items})
}
func (h *AdminHandler) GetFeedSlot(c *gin.Context) {
id, err := uuid.Parse(c.Param("id"))
if err != nil {
response.Fail(c, http.StatusBadRequest, 40002, "invalid id")
return
}
row, err := h.Svc.GetFeedSlot(c.Request.Context(), id)
if errors.Is(err, admin.ErrFeedSlotNotFound) {
response.Fail(c, http.StatusNotFound, 40411, "feed slot not found")
return
}
if err != nil {
response.Fail(c, http.StatusInternalServerError, 50043, "get feed slot failed")
return
}
response.OK(c, row)
}
apps/api/internal/integration/cms_feed_slot_test.go
+95
View File
@@ -0,0 +1,95 @@
package integration_test
import (
"context"
"encoding/json"
"fmt"
"net/http"
"testing"
"time"
"github.com/google/uuid"
"golang.org/x/crypto/bcrypt"
)
func TestOpsCMSFeedSlots(t *testing.T) {
r, pool := setupAPIPool(t)
ctx := context.Background()
tok := adminLogin(t, r, "admin", "change-me")
_, code := doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, "")
if code != http.StatusUnauthorized {
t.Fatalf("expected 401, got %d", code)
}
limitedRoleID := uuid.New()
_, err := pool.Exec(ctx, `INSERT INTO admin_roles(id, name, system) VALUES ($1,$2,false)`,
limitedRoleID, "fs_lim_"+limitedRoleID.String()[:8])
if err != nil {
t.Fatal(err)
}
_, err = pool.Exec(ctx, `INSERT INTO admin_role_permissions(role_id, code) VALUES ($1,'admin.users.read')`, limitedRoleID)
if err != nil {
t.Fatal(err)
}
hash, err := bcrypt.GenerateFromPassword([]byte("limited-pass"), bcrypt.DefaultCost)
if err != nil {
t.Fatal(err)
}
limUser := fmt.Sprintf("fslim_%d", time.Now().UnixNano())
_, err = pool.Exec(ctx, `INSERT INTO admin_accounts(username, password_hash, role_id) VALUES ($1,$2,$3)`,
limUser, string(hash), limitedRoleID)
if err != nil {
t.Fatal(err)
}
t.Cleanup(func() {
_, _ = pool.Exec(ctx, `DELETE FROM admin_accounts WHERE username=$1`, limUser)
_, _ = pool.Exec(ctx, `DELETE FROM admin_roles WHERE id=$1`, limitedRoleID)
})
limTok := adminLogin(t, r, limUser, "limited-pass")
_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, limTok)
if code != http.StatusForbidden {
t.Fatalf("expected 403, got %d", code)
}
start := time.Now()
env, code := doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots", nil, tok)
if code != 200 || env.Code != 0 {
t.Fatalf("list http=%d msg=%s", code, env.Message)
}
if time.Since(start) > 500*time.Millisecond {
t.Fatalf("list too slow %v", time.Since(start))
}
var list struct {
Items []struct {
ID string `json:"id"`
Code string `json:"code"`
} `json:"items"`
}
_ = json.Unmarshal(env.Data, &list)
var id string
for _, it := range list.Items {
if it.Code == "home_feed_main" {
id = it.ID
break
}
}
if id == "" {
t.Fatalf("missing home_feed_main: %#v", list.Items)
}
env, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots/"+id, nil, tok)
if code != 200 {
t.Fatalf("get %d", code)
}
var detail struct {
Code string `json:"code"`
}
_ = json.Unmarshal(env.Data, &detail)
if detail.Code != "home_feed_main" {
t.Fatalf("bad detail %#v", detail)
}
_, code = doAdminJSON(t, r, http.MethodGet, "/api/v1/admin/cms/feed-slots/"+fakeUUID(), nil, tok)
if code != http.StatusNotFound {
t.Fatalf("expected 404, got %d", code)
}
}
apps/api/internal/repository/cms_repo.go
+51
View File
@@ -65,3 +65,54 @@ func (r *AdminRepo) GetBanner(ctx context.Context, id uuid.UUID) (*BannerRow, er
}
return &b, nil
}
// FeedSlotRow is OpsCMS FeedSlot catalog row.
type FeedSlotRow struct {
ID uuid.UUID `json:"id"`
Code string `json:"code"`
Title string `json:"title"`
SlotKey string `json:"slot_key"`
Placement string `json:"placement"`
Active bool `json:"active"`
System bool `json:"system"`
UpdatedAt time.Time `json:"updated_at"`
}
// ListFeedSlots returns feed slot catalog.
func (r *AdminRepo) ListFeedSlots(ctx context.Context) ([]FeedSlotRow, error) {
rows, err := r.Pool.Query(ctx, `
SELECT id, code, title, slot_key, placement, active, system, updated_at
FROM ops_feed_slots
ORDER BY active DESC, code ASC`)
if err != nil {
return nil, err
}
defer rows.Close()
var out []FeedSlotRow
for rows.Next() {
var s FeedSlotRow
if err := rows.Scan(
&s.ID, &s.Code, &s.Title, &s.SlotKey, &s.Placement, &s.Active, &s.System, &s.UpdatedAt,
); err != nil {
return nil, err
}
out = append(out, s)
}
return out, rows.Err()
}
// GetFeedSlot loads one feed slot by id.
func (r *AdminRepo) GetFeedSlot(ctx context.Context, id uuid.UUID) (*FeedSlotRow, error) {
var s FeedSlotRow
err := r.Pool.QueryRow(ctx, `
SELECT id, code, title, slot_key, placement, active, system, updated_at
FROM ops_feed_slots WHERE id=$1`, id,
).Scan(&s.ID, &s.Code, &s.Title, &s.SlotKey, &s.Placement, &s.Active, &s.System, &s.UpdatedAt)
if errors.Is(err, pgx.ErrNoRows) {
return nil, err
}
if err != nil {
return nil, err
}
return &s, nil
}
apps/api/internal/service/admin/cms.go
+22
View File
@@ -11,6 +11,7 @@ import (
)
var ErrBannerNotFound = errString("banner not found")
var ErrFeedSlotNotFound = errString("feed slot not found")
// ListBanners returns OpsCMS Banner catalog.
func (s *Service) ListBanners(ctx context.Context) ([]repository.BannerRow, error) {
@@ -32,3 +33,24 @@ func (s *Service) GetBanner(ctx context.Context, id uuid.UUID) (*repository.Bann
}
return row, err
}
// ListFeedSlots returns OpsCMS FeedSlot catalog.
func (s *Service) ListFeedSlots(ctx context.Context) ([]repository.FeedSlotRow, error) {
items, err := s.Repo.ListFeedSlots(ctx)
if err != nil {
return nil, err
}
if items == nil {
items = []repository.FeedSlotRow{}
}
return items, nil
}
// GetFeedSlot loads one feed slot.
func (s *Service) GetFeedSlot(ctx context.Context, id uuid.UUID) (*repository.FeedSlotRow, error) {
row, err := s.Repo.GetFeedSlot(ctx, id)
if errors.Is(err, pgx.ErrNoRows) {
return nil, ErrFeedSlotNotFound
}
return row, err
}
apps/api/migrations/000026_ops_feed_slots.down.sql
+1
View File
@@ -0,0 +1 @@
DROP TABLE IF EXISTS ops_feed_slots;
apps/api/migrations/000026_ops_feed_slots.up.sql
+17
View File
@@ -0,0 +1,17 @@
-- ECR-025 OpsCMS FeedSlot (read catalog)
CREATE TABLE IF NOT EXISTS ops_feed_slots (
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
code varchar(64) NOT NULL UNIQUE,
title varchar(128) NOT NULL,
slot_key varchar(64) NOT NULL,
placement varchar(32) NOT NULL
CHECK (placement IN ('home','explore','ask')),
active boolean NOT NULL DEFAULT true,
system boolean NOT NULL DEFAULT false,
created_at timestamptz NOT NULL DEFAULT now(),
updated_at timestamptz NOT NULL DEFAULT now()
);
CREATE INDEX IF NOT EXISTS idx_ops_feed_slots_active ON ops_feed_slots(active);
INSERT INTO ops_feed_slots(code, title, slot_key, placement, active, system)
VALUES ('home_feed_main', '首页主信息流位', 'home.main', 'home', true, true)
ON CONFLICT (code) DO NOTHING;