feat(v1.11.5-L): lite 精简版——移除大屏/客户自查/多用户/小键盘,套餐仅保留按日
需求与确认(用户逐项确认): - 老数据「按次 / 通行证 / 深渊」统一迁移成按日,代码里彻底删除三种模式 - 打手归属一并移除(只剩一个人,颜色与指派没有区分意义) - 盲水印做成完全不可见:只存在于 DOM / 源码,肉眼与截图都看不到 - 拼写采用更正后的 Powered by Baka春秋 - 版本号与品牌全站统一带 -L - screen_public / portal_public 保留解析但不起作用,保证旧 ini 能直接启动 - README 同步更新 品牌与版本(全站统一): - const version = "1.11.5-L":<title>、启动横幅、日志前缀 [代打台-L]、 设置页版本号、页脚版本号全部带 -L - 左上角导航品牌 代打台 → 代打台-L(登录页、初始化页同步) - 页脚新增可见署名 Powered by Baka春秋 盲水印: - _layout.html 在 <body> 起始处注入 .wm-blind 容器(含注释与 data-wm 双标记), 覆盖包括登录/初始化在内的所有页面 - app.css 用零尺寸 + 透明 + opacity:0 + clip-path:inset(50%) 四重隐藏, 同时留同名注释;不占位、不上色、不进无障碍树、不影响打印 功能移除: - 大屏:删除 handlers_screen.go、pages/screen.html、_screen_layout.html、 static/screen.css、static/screen.js、store.Stats/ScreenStats; 导航「大屏 ↗」、页脚「大屏」、设置页「大屏刷新/大屏」行、启动横幅大屏行一并删除 - 客户自查:删除 handlers_portal.go、pages/portal.html 与 .portal-*/.pcal-* 样式, 设置页「客户自助」行删除 - 多管理员:删除 handleUserCreate/Toggle/Color/UserEditPage/UserEditSave、 pages/user_form.html、store 侧 ActiveUsers/SetUserColor/SetUserActive/ UpdateUserByAdmin/NormalizeColor/AssigneePalette;设置页「管理员」整块移除, 只保留首次启动创建的那一个账户与「修改我的密码」 - 打手归属:删除 customers.assignee_id 相关读写与 UI(客户详情指派下拉、 客户表单「归属打手」、日历格左侧打手色竖条、任务卡打手标签、套餐详情客户列) - 登录页与初始化页的说明文案同步改为单账户口径(「只有一个管理员账户」 「创建后不能再添加其他管理员」),字数与 main 对齐,卡片不换行、高度不变 - 触摸小键盘:删除 3×4 键盘、⌨/触控开关、localStorage 记忆、.keypad* 样式 - 套餐计费方式:只保留按日。删除按次/通行证/深渊的 Package 与 Subscription 字段、 domain 里的 UnitCount/StateUsedUp/CycleIndex、package_form 计费方式单选与 通行证/深渊/有效期字段、日历整段色块(has-block/cell-block/season-band)、 追加次数分支、SeasonComplete/AddCount、CountActiveSubs 的次数条件 数据库迁移(幂等,Migrate 内自动执行): - normalizeLegacyData:套餐一律 unit='day' 并清 season/abyss/cycle_days/ default_validity_days/season_*;订阅清 season/abyss/cycle_days/season_done - 通行证、深渊当年就是 unit='day' 且起止日完整,仅清标记,服务区间原样保留 - 按次按「1 次 = 1 天」折算:结束日 = 开始日 + 总次数 − 1;仍缺结束日退回开始日 - 只动数据,不删表不删列:老库的 season/abyss/cycle_days/total_count/used_count 保留但不再使用,升级可逆、不会因为 DDL 失败卡住 - 新库 schema 干净:不再创建上述列,users.color / customers.assignee_id 也不创建 - 老库 ensureColumn 保留 calendar_separate / tag / archived 三项(真增量列) 兼容: - config 仍解析 screen_public / portal_public(结构体字段注明已废弃), 默认 ini 模板里改为「已废弃,写了不报错、不生效」 测试: - go vet ./... 通过;go test ./... 全部通过 (新增 TestNormalizeLegacyTypeData 验证三模式折算成按日; TestSingleUserAccount / TestSessionLifecycle 覆盖单用户与会话; 删除按次、深渊、打手颜色、多用户等已不存在的能力的用例) - 新增 scripts/smoke-lite.ps1:起隔离实例,19 个页面级请求全部 200, 已移除的 /screen、/customer、/api/screen/day 均 404, 水印/品牌/v1.11.5-L/无残留词 12 项断言通过, 真实数据下日历出现待打任务、「剩 30 天」、今天到期徽标 4 项断言通过, 本次 0 失败 README:改为 lite 版说明,删除大屏/客户自查/通行证/深渊/按次/小键盘/多用户章节, 新增「盲水印」与「与 main 分支的差异」两节(含老数据折算规则与列保留说明)。
This commit is contained in:
@@ -2,7 +2,6 @@ package web
|
||||
|
||||
import (
|
||||
"encoding/csv"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"net/http"
|
||||
@@ -47,16 +46,12 @@ func (s *Server) handleLogs(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
type settingsData struct {
|
||||
WarnDays int
|
||||
ScreenRefresh int
|
||||
Users []store.User
|
||||
Backups []string
|
||||
DBPath string
|
||||
BackupDir string
|
||||
BackupKeep int
|
||||
BackupEnabled bool
|
||||
ConfigPath string
|
||||
ScreenPublic bool
|
||||
PortalPublic bool
|
||||
Addrs []string
|
||||
Port string
|
||||
Uptime string
|
||||
@@ -121,7 +116,6 @@ func LocalAddrs() []string {
|
||||
}
|
||||
|
||||
func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request) {
|
||||
users, _ := s.db.ListUsers()
|
||||
backups, _ := s.db.ListBackups()
|
||||
custN, _ := s.db.CustomerCount()
|
||||
pkgs, _ := s.db.ListPackages(true)
|
||||
@@ -132,16 +126,12 @@ func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
data := &settingsData{
|
||||
WarnDays: s.warnDays(),
|
||||
ScreenRefresh: s.screenRefresh(),
|
||||
Users: users,
|
||||
Backups: backups,
|
||||
DBPath: s.db.Path,
|
||||
BackupDir: s.cfg.BackupDir,
|
||||
BackupKeep: s.cfg.BackupKeep,
|
||||
BackupEnabled: s.cfg.BackupEnabled,
|
||||
ConfigPath: s.cfg.ConfigPath,
|
||||
ScreenPublic: s.cfg.ScreenPublic,
|
||||
PortalPublic: s.cfg.PortalPublic,
|
||||
Addrs: LocalAddrs(),
|
||||
Port: port,
|
||||
Uptime: humanDuration(time.Since(s.started)),
|
||||
@@ -155,118 +145,6 @@ func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request) {
|
||||
s.render(w, r, "settings", p)
|
||||
}
|
||||
|
||||
type userFormData struct {
|
||||
Target *store.User
|
||||
}
|
||||
|
||||
// isSuperAdmin 只有一个超级管理员(id=1)可以修改他人资料。
|
||||
func isSuperAdmin(u *store.User) bool { return u != nil && u.ID == 1 }
|
||||
|
||||
// handleUserEditPage 超管编辑其他管理员。
|
||||
func (s *Server) handleUserEditPage(w http.ResponseWriter, r *http.Request) {
|
||||
me := s.currentUser(r)
|
||||
if !isSuperAdmin(me) {
|
||||
s.redirect(w, r, "/settings", "只有初始管理员可以修改其他人的资料")
|
||||
return
|
||||
}
|
||||
id := pathID(r)
|
||||
if id == me.ID {
|
||||
s.redirect(w, r, "/settings", "自己的资料请用「修改我的密码」")
|
||||
return
|
||||
}
|
||||
u, err := s.db.UserByID(id)
|
||||
if err != nil {
|
||||
s.redirect(w, r, "/settings", "账户不存在")
|
||||
return
|
||||
}
|
||||
p := s.newPage(r, "编辑管理员", "settings")
|
||||
p.D = &userFormData{Target: u}
|
||||
s.render(w, r, "user_form", p)
|
||||
}
|
||||
|
||||
// handleUserEditSave 保存超管对其他管理员的修改。
|
||||
func (s *Server) handleUserEditSave(w http.ResponseWriter, r *http.Request) {
|
||||
me := s.currentUser(r)
|
||||
if !isSuperAdmin(me) {
|
||||
s.redirect(w, r, "/settings", "只有初始管理员可以修改其他人的资料")
|
||||
return
|
||||
}
|
||||
id := pathID(r)
|
||||
if id == me.ID {
|
||||
s.redirect(w, r, "/settings", "自己的资料请用「修改我的密码」")
|
||||
return
|
||||
}
|
||||
u, err := s.db.UserByID(id)
|
||||
if err != nil {
|
||||
s.redirect(w, r, "/settings", "账户不存在")
|
||||
return
|
||||
}
|
||||
username := strings.TrimSpace(r.PostFormValue("username"))
|
||||
displayName := strings.TrimSpace(r.PostFormValue("display_name"))
|
||||
password := r.PostFormValue("password")
|
||||
password2 := r.PostFormValue("password2")
|
||||
|
||||
back := "/settings/users/" + itoa(id) + "/edit"
|
||||
if l := len([]rune(username)); l < 3 || l > 32 {
|
||||
s.redirect(w, r, back, "用户名长度需在 3-32 个字符之间")
|
||||
return
|
||||
}
|
||||
if len([]rune(displayName)) > 32 {
|
||||
s.redirect(w, r, back, "显示名称不能超过 32 个字符")
|
||||
return
|
||||
}
|
||||
if password != "" {
|
||||
if len([]rune(password)) < 6 {
|
||||
s.redirect(w, r, back, "新密码至少 6 位")
|
||||
return
|
||||
}
|
||||
if password != password2 {
|
||||
s.redirect(w, r, back, "两次输入的新密码不一致")
|
||||
return
|
||||
}
|
||||
}
|
||||
if err := s.db.UpdateUserByAdmin(id, username, displayName, password); err != nil {
|
||||
msg := "保存失败:" + err.Error()
|
||||
if errors.Is(err, store.ErrDuplicate) {
|
||||
msg = "用户名已被占用"
|
||||
}
|
||||
s.redirect(w, r, back, msg)
|
||||
return
|
||||
}
|
||||
detail := u.Username + " → " + username
|
||||
if displayName != u.DisplayName {
|
||||
detail += ";昵称 " + u.DisplayName + " → " + displayName
|
||||
}
|
||||
if password != "" {
|
||||
detail += ";已重置密码并强制下线"
|
||||
}
|
||||
s.logOp(r, "修改管理员资料", "user", id, detail)
|
||||
s.redirect(w, r, "/settings", "已更新「"+username+"」的资料")
|
||||
}
|
||||
|
||||
// handleUserColor 设置管理员(打手)颜色。
|
||||
func (s *Server) handleUserColor(w http.ResponseWriter, r *http.Request) {
|
||||
id := pathID(r)
|
||||
color, err := store.NormalizeColor(r.PostFormValue("color"))
|
||||
if err != nil {
|
||||
s.redirect(w, r, "/settings", "颜色格式不正确")
|
||||
return
|
||||
}
|
||||
if err := s.db.SetUserColor(id, color); err != nil {
|
||||
s.redirect(w, r, "/settings", "保存颜色失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
name := ""
|
||||
if u, err := s.db.UserByID(id); err == nil {
|
||||
name = u.DisplayName
|
||||
if name == "" {
|
||||
name = u.Username
|
||||
}
|
||||
}
|
||||
s.logOp(r, "设置打手颜色", "user", id, name+" → "+color)
|
||||
s.redirect(w, r, "/settings", "已更新 "+name+" 的颜色")
|
||||
}
|
||||
|
||||
func (s *Server) handleSettingsSave(w http.ResponseWriter, r *http.Request) {
|
||||
warn := s.formInt(r, "warn_days", 3)
|
||||
if warn < 0 {
|
||||
@@ -275,18 +153,8 @@ func (s *Server) handleSettingsSave(w http.ResponseWriter, r *http.Request) {
|
||||
if warn > 60 {
|
||||
warn = 60
|
||||
}
|
||||
|
||||
refresh := s.formInt(r, "screen_refresh", 30)
|
||||
if refresh < 5 {
|
||||
refresh = 5
|
||||
}
|
||||
if refresh > 600 {
|
||||
refresh = 600
|
||||
}
|
||||
_ = s.db.SetSetting("warn_days", strconv.Itoa(warn))
|
||||
_ = s.db.SetSetting("screen_refresh", strconv.Itoa(refresh))
|
||||
s.logOp(r, "修改设置", "settings", 0,
|
||||
fmt.Sprintf("预警 %d 天、大屏刷新 %d 秒", warn, refresh))
|
||||
s.logOp(r, "修改设置", "settings", 0, fmt.Sprintf("预警 %d 天", warn))
|
||||
s.redirect(w, r, "/settings", "设置已保存")
|
||||
}
|
||||
|
||||
@@ -319,58 +187,6 @@ func (s *Server) handlePasswordChange(w http.ResponseWriter, r *http.Request) {
|
||||
s.redirect(w, r, "/settings", "密码已更新")
|
||||
}
|
||||
|
||||
func (s *Server) handleUserCreate(w http.ResponseWriter, r *http.Request) {
|
||||
username := strings.TrimSpace(r.PostFormValue("username"))
|
||||
display := strings.TrimSpace(r.PostFormValue("display_name"))
|
||||
pw := r.PostFormValue("password")
|
||||
switch {
|
||||
case len(username) < 3:
|
||||
s.redirect(w, r, "/settings", "用户名至少 3 个字符")
|
||||
return
|
||||
case len(pw) < 6:
|
||||
s.redirect(w, r, "/settings", "密码至少 6 位")
|
||||
return
|
||||
}
|
||||
if display == "" {
|
||||
display = username
|
||||
}
|
||||
u, err := s.db.CreateUser(username, display, pw)
|
||||
if err != nil {
|
||||
if err == store.ErrDuplicate {
|
||||
s.redirect(w, r, "/settings", "用户名已存在")
|
||||
return
|
||||
}
|
||||
s.redirect(w, r, "/settings", "创建失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
s.logOp(r, "新增管理员", "user", u.ID, "新增管理员 "+username)
|
||||
s.redirect(w, r, "/settings", "管理员 "+username+" 已创建")
|
||||
}
|
||||
|
||||
func (s *Server) handleUserToggle(w http.ResponseWriter, r *http.Request) {
|
||||
id := pathID(r)
|
||||
me := s.currentUser(r)
|
||||
if me != nil && me.ID == id {
|
||||
s.redirect(w, r, "/settings", "不能停用自己的账户")
|
||||
return
|
||||
}
|
||||
target, err := s.db.UserByID(id)
|
||||
if err != nil {
|
||||
http.NotFound(w, r)
|
||||
return
|
||||
}
|
||||
if err := s.db.SetUserActive(id, !target.IsActive); err != nil {
|
||||
s.redirect(w, r, "/settings", "操作失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
action := "停用账户"
|
||||
if !target.IsActive {
|
||||
action = "启用账户"
|
||||
}
|
||||
s.logOp(r, action, "user", id, action+" "+target.Username)
|
||||
s.redirect(w, r, "/settings", action+"成功")
|
||||
}
|
||||
|
||||
func (s *Server) handleBackupNow(w http.ResponseWriter, r *http.Request) {
|
||||
path, err := s.db.BackupNow(s.cfg.BackupKeep)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user