feat&refactor: 完成多模块功能迭代与配置优化
本次提交覆盖多个业务模块的功能完善与体验优化:
1. **鉴权与配置调整**:
- 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
- 工位配置放开1~12限制,改为仅校验大于0
2. **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3. **功能新增**:
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**:
- 调整BOM物料删除校验逻辑,优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**:
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
This commit is contained in:
@@ -78,23 +78,50 @@ func LoginHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.Fail(w, 1001, err.Error())
|
||||
return
|
||||
}
|
||||
// 操作日志:登录成功(写失败不阻断登录)
|
||||
svcCtx.EventLog.Write(r.Context(), "auth.login", "", req.Username, "auth", req.Username,
|
||||
"登录成功", map[string]any{"ip": clientIP(r)})
|
||||
httpx.Ok(w, data)
|
||||
}
|
||||
}
|
||||
|
||||
func RefreshHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
// clientIP 取客户端 IP(优先代理头,兜底 RemoteAddr)
|
||||
func clientIP(r *http.Request) string {
|
||||
if v := r.Header.Get("X-Real-IP"); v != "" {
|
||||
return v
|
||||
}
|
||||
if v := r.Header.Get("X-Forwarded-For"); v != "" {
|
||||
for i := 0; i < len(v); i++ {
|
||||
if v[i] == ',' {
|
||||
return strings.TrimSpace(v[:i])
|
||||
}
|
||||
}
|
||||
return strings.TrimSpace(v)
|
||||
}
|
||||
if host := r.RemoteAddr; host != "" {
|
||||
if i := strings.LastIndex(host, ":"); i > 0 {
|
||||
return host[:i]
|
||||
}
|
||||
return host
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// LogoutHandler POST /api/v1/logout 退出登录(需登录 JWT)
|
||||
// 记录退出日志;登录态清除由前端完成(无状态 JWT 无服务端会话)。
|
||||
func LogoutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req logic.RefreshReq
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
username, _ := r.Context().Value("username").(string)
|
||||
if username == "" {
|
||||
if u, err := svcCtx.EntClient.User.Get(r.Context(), uidFromRequest(r, svcCtx)); err == nil {
|
||||
username = u.Username
|
||||
}
|
||||
}
|
||||
data, err := logic.New(svcCtx).Refresh(r.Context(), req)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 1002, err.Error())
|
||||
return
|
||||
if username != "" {
|
||||
svcCtx.EventLog.Write(r.Context(), "auth.logout", "", username, "auth", username,
|
||||
"退出登录", map[string]any{"ip": clientIP(r)})
|
||||
}
|
||||
httpx.Ok(w, data)
|
||||
httpx.OkMessage(w, "已退出", nil)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user