feat(distribution): 公告中心支持分站自定义
公告中心(前台公告列表/详情)此前完全没有站点概念,分站访客只能看到主站公告。 本次按「默认继承主站、站长可切仅本站」的口径支持分站自定义。 数据与口径: - 新增 announcements.distribution_site_id(0=主站),前台按站点隔离 - 新增 distribution_sites.announcement_mode:inherit(默认,主站+本站)/ own_only(仅本站) 后端: - 公告模块新增 ResolvePublicSiteScope:主站 [0]、inherit [0, siteID]、own_only [siteID], 站点编码无效/已停用回落主站;列表与详情都按该范围过滤,详情不再允许跨站按 ID 读取 - 管理端公告列表支持按站点筛选(site_id:不传=全部,0=主站,>0=分站)并带出站点名 - 分销模块新增本站公告 CRUD(distribution/announcement.go):强制 distribution_site_id=本站, 先过 ensureSiteAccess,跨站更新/删除/上下架一律 ErrAnnouncementNotFound - UpdateSiteBranding 支持 announcement_mode 切换(非法值报错,读侧非法历史值回落 inherit) - 新增权限 distribution:announcement_view|manage 并授予 super_admin/ops/finance, 站长开通时继承 ops 角色即自动获得 - 路由:站长侧 /api/distribution/announcements*,平台侧 /api/admin/distribution/announcements* 前端: - 分销后台新增「公告中心」页:来源开关(继承主站+本站 / 仅本站)、本站公告列表与 新建/编辑/发布/下架/归档/恢复/删除,空态按来源模式给出引导 - 平台后台公告页新增「站点」列与筛选,新建公告可选择归属站点(主站或指定分站代发) - 前台 PC/移动无需改动:请求已带 X-Distribution-Site-Code,后端按站点隔离,页面已有空态 测试: - 公告模块:主站/继承/仅本站三种可见范围、跨站详情拦截、无效站点回落、管理端站点筛选 - 分销模块:本站公告 CRUD 与跨站防护、公告来源开关校验与非法值容错
This commit is contained in:
@@ -642,6 +642,131 @@ func (h *Handler) resolveSiteID(c *gin.Context) (uint64, error) {
|
||||
return h.service.ScopeSiteID(c.Request.Context(), adminID, requested)
|
||||
}
|
||||
|
||||
// 分站公告中心(站长自助维护本站公告)。站点由 ?site_id= 解析并校验访问权。
|
||||
func (h *Handler) ListSiteAnnouncements(c *gin.Context) {
|
||||
siteID, adminID, ok := h.resolveAnnouncementSite(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
|
||||
pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
|
||||
resp, err := h.service.ListSiteAnnouncements(c.Request.Context(), adminID, siteID, c.Query("status"), page, pageSize)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.OK(c, resp)
|
||||
}
|
||||
|
||||
func (h *Handler) CreateSiteAnnouncement(c *gin.Context) {
|
||||
siteID, adminID, ok := h.resolveAnnouncementSite(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
var req CreateSiteAnnouncementRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
response.BadRequest(c, "公告参数格式不正确")
|
||||
return
|
||||
}
|
||||
dto, err := h.service.CreateSiteAnnouncement(c.Request.Context(), adminID, siteID, req)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.Created(c, dto)
|
||||
}
|
||||
|
||||
func (h *Handler) UpdateSiteAnnouncement(c *gin.Context) {
|
||||
siteID, adminID, ok := h.resolveAnnouncementSite(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
id, ok := parseSiteAnnouncementID(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
var req UpdateSiteAnnouncementRequest
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
response.BadRequest(c, "公告参数格式不正确")
|
||||
return
|
||||
}
|
||||
dto, err := h.service.UpdateSiteAnnouncement(c.Request.Context(), adminID, siteID, id, req)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.OK(c, dto)
|
||||
}
|
||||
|
||||
func (h *Handler) PublishSiteAnnouncement(c *gin.Context) {
|
||||
h.updateSiteAnnouncementStatus(c, "publish")
|
||||
}
|
||||
func (h *Handler) ArchiveSiteAnnouncement(c *gin.Context) {
|
||||
h.updateSiteAnnouncementStatus(c, "archive")
|
||||
}
|
||||
func (h *Handler) UnarchiveSiteAnnouncement(c *gin.Context) {
|
||||
h.updateSiteAnnouncementStatus(c, "unarchive")
|
||||
}
|
||||
|
||||
func (h *Handler) updateSiteAnnouncementStatus(c *gin.Context, action string) {
|
||||
siteID, adminID, ok := h.resolveAnnouncementSite(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
id, ok := parseSiteAnnouncementID(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
dto, err := h.service.UpdateSiteAnnouncementStatus(c.Request.Context(), adminID, siteID, id, action)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.OK(c, dto)
|
||||
}
|
||||
|
||||
func (h *Handler) DeleteSiteAnnouncement(c *gin.Context) {
|
||||
siteID, adminID, ok := h.resolveAnnouncementSite(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
id, ok := parseSiteAnnouncementID(c)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
if err := h.service.DeleteSiteAnnouncement(c.Request.Context(), adminID, siteID, id); err != nil {
|
||||
writeError(c, err)
|
||||
return
|
||||
}
|
||||
response.OK(c, gin.H{"deleted": true})
|
||||
}
|
||||
|
||||
// resolveAnnouncementSite 解析公告所属站点:公告路由的 :id 是公告 ID,
|
||||
// 因此站点只能来自 ?site_id=(不能复用会优先读 :id 的 resolveSiteID)。
|
||||
func (h *Handler) resolveAnnouncementSite(c *gin.Context) (uint64, uint64, bool) {
|
||||
adminID, _ := currentAdminID(c)
|
||||
requested := uint64(parseQueryUint(c, "site_id"))
|
||||
siteID, err := h.service.ScopeSiteID(c.Request.Context(), adminID, requested)
|
||||
if err != nil {
|
||||
writeError(c, err)
|
||||
return 0, 0, false
|
||||
}
|
||||
if siteID == 0 {
|
||||
response.BadRequest(c, "未指定分销站点")
|
||||
return 0, 0, false
|
||||
}
|
||||
return siteID, adminID, true
|
||||
}
|
||||
|
||||
func parseSiteAnnouncementID(c *gin.Context) (uint64, bool) {
|
||||
id, err := strconv.ParseUint(c.Param("id"), 10, 64)
|
||||
if err != nil || id == 0 {
|
||||
response.BadRequest(c, "公告ID不正确")
|
||||
return 0, false
|
||||
}
|
||||
return id, true
|
||||
}
|
||||
|
||||
func (h *Handler) UpdateSiteBranding(c *gin.Context) {
|
||||
siteID, err := h.resolveSiteID(c)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user