feat: 会话令牌与守卫、看板组件及工位终端功能完善
- 用户表扩展:MES/WMS user 实体新增字段,新增 active_token 迁移 SQL(2026-11-11) - 会话机制:MES 新增 session_guard,重构 token/auth/jwt/perm 与路由;WMS/工作站同步令牌续签与鉴权 - 看板(board):调整 MES 看板产线/生产/侧栏/仓库组件及样式;WMS 看板展示页同步调整 - 工位终端后端:完善报警流、绑定、PLC 对账、拧紧、proxy、上报、站点告警/操作等 handler,补充 mes client/store - 工位终端前端:登录/主界面/各操作面板调整,新增滚动分页与多语言 yaml 文案,刷新构建产物 - MES 业务:新增流程链 logic,调整待审核/产能支撑/产品工艺/设置页、PLC 监控与帮助文档,刷新构建产物 - 更新问题记录文档
This commit is contained in:
@@ -119,16 +119,16 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||||
return
|
||||
}
|
||||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||||
// 操作人取当前请求 Bearer 对应登录会话的可信身份(防冒名 · 多会话版),仅用于本地操作日志落痕
|
||||
opName := req.Operator
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
if ss, sErr := ctx.Store.GetStationSessionByToken(bearerOf(r)); sErr == nil && ss != nil && ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
q := url.Values{}
|
||||
if req.Operator != "" {
|
||||
q.Set("operator", req.Operator)
|
||||
}
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload))
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload), bearerOf(r))
|
||||
if err != nil {
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||||
var bizErr *mes.BizError
|
||||
@@ -181,16 +181,16 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||||
return
|
||||
}
|
||||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||||
// 操作人取当前请求 Bearer 对应登录会话的可信身份(防冒名 · 多会话版),仅用于本地操作日志落痕
|
||||
opName := req.Operator
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
if ss, sErr := ctx.Store.GetStationSessionByToken(bearerOf(r)); sErr == nil && ss != nil && ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
q := url.Values{}
|
||||
if req.Operator != "" {
|
||||
q.Set("operator", req.Operator)
|
||||
}
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload))
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload), bearerOf(r))
|
||||
if err != nil {
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||||
var bizErr *mes.BizError
|
||||
|
||||
Reference in New Issue
Block a user