feat&refactor: 完成多模块功能迭代与配置优化
本次提交覆盖多个业务模块的功能完善与体验优化:
1. **鉴权与配置调整**:
- 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
- 工位配置放开1~12限制,改为仅校验大于0
2. **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3. **功能新增**:
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**:
- 调整BOM物料删除校验逻辑,优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**:
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
This commit is contained in:
@@ -24,12 +24,30 @@ type LoginReq struct {
|
||||
|
||||
type LoginResp struct {
|
||||
AccessToken string `json:"accessToken"`
|
||||
RefreshToken string `json:"refreshToken"`
|
||||
AccessExpire int64 `json:"accessExpire"`
|
||||
}
|
||||
|
||||
type RefreshReq struct {
|
||||
RefreshToken string `json:"refreshToken"`
|
||||
// sessionExpire 会话闲置窗口(秒),默认 1 小时
|
||||
func (s *Service) sessionExpire() int64 {
|
||||
if s.ctx.Config.Auth.AccessExpire > 0 {
|
||||
return s.ctx.Config.Auth.AccessExpire
|
||||
}
|
||||
return 3600
|
||||
}
|
||||
|
||||
// currentToken 签发 access token(滑动续签模式,无 refresh)
|
||||
func (s *Service) issueTokens(usr *ent.User, roleEntity *ent.Role) (LoginResp, error) {
|
||||
claims := tokenx.Claims{UserId: usr.ID, Username: usr.Username, Name: usr.Name, RoleId: usr.RoleId}
|
||||
if roleEntity != nil {
|
||||
claims.RoleCode = roleEntity.Code
|
||||
claims.RoleName = roleEntity.Name
|
||||
}
|
||||
expire := s.sessionExpire()
|
||||
access, err := tokenx.Issue(s.ctx.Config.Auth.AccessSecret, time.Duration(expire)*time.Second, claims)
|
||||
if err != nil {
|
||||
return LoginResp{}, err
|
||||
}
|
||||
return LoginResp{AccessToken: access, AccessExpire: expire}, nil
|
||||
}
|
||||
|
||||
type UserInfoResp struct {
|
||||
@@ -55,27 +73,6 @@ type permissionItem struct {
|
||||
Icon string `json:"icon"`
|
||||
}
|
||||
|
||||
// currentToken 生成 access + refresh 双 token
|
||||
func (s *Service) issueTokens(usr *ent.User, roleEntity *ent.Role) (LoginResp, error) {
|
||||
claims := tokenx.Claims{UserId: usr.ID, Username: usr.Username, Name: usr.Name, RoleId: usr.RoleId}
|
||||
if roleEntity != nil {
|
||||
claims.RoleCode = roleEntity.Code
|
||||
claims.RoleName = roleEntity.Name
|
||||
} else {
|
||||
claims.RoleCode = ""
|
||||
claims.RoleName = ""
|
||||
}
|
||||
access, err := tokenx.Issue(s.ctx.Config.Auth.AccessSecret, time.Duration(s.ctx.Config.Auth.AccessExpire)*time.Second, claims)
|
||||
if err != nil {
|
||||
return LoginResp{}, err
|
||||
}
|
||||
refresh, err := tokenx.Issue(s.ctx.Config.Auth.AccessSecret, time.Duration(s.ctx.Config.Auth.RefreshExpire)*time.Second, claims)
|
||||
if err != nil {
|
||||
return LoginResp{}, err
|
||||
}
|
||||
return LoginResp{AccessToken: access, RefreshToken: refresh, AccessExpire: s.ctx.Config.Auth.AccessExpire}, nil
|
||||
}
|
||||
|
||||
// Login 登录
|
||||
func (s *Service) Login(ctx context.Context, req LoginReq) (LoginResp, error) {
|
||||
var resp LoginResp
|
||||
@@ -99,24 +96,6 @@ func (s *Service) Login(ctx context.Context, req LoginReq) (LoginResp, error) {
|
||||
return s.issueTokens(usr, roleEntity)
|
||||
}
|
||||
|
||||
// Refresh 刷新访问令牌(滑动续签)
|
||||
func (s *Service) Refresh(ctx context.Context, req RefreshReq) (LoginResp, error) {
|
||||
var resp LoginResp
|
||||
claims, err := tokenx.Parse(s.ctx.Config.Auth.AccessSecret, req.RefreshToken)
|
||||
if err != nil {
|
||||
return resp, errors.New("刷新令牌无效或已过期")
|
||||
}
|
||||
usr, err := s.ctx.EntClient.User.Get(ctx, claims.UserId)
|
||||
if err != nil {
|
||||
return resp, errors.New("用户不存在")
|
||||
}
|
||||
if usr.Status != "ENABLED" {
|
||||
return resp, errors.New("账号已禁用")
|
||||
}
|
||||
roleEntity, _ := s.ctx.EntClient.Role.Get(ctx, usr.RoleId)
|
||||
return s.issueTokens(usr, roleEntity)
|
||||
}
|
||||
|
||||
// UserInfo 当前用户信息 + 菜单权限
|
||||
func (s *Service) UserInfo(ctx context.Context, userId int) (UserInfoResp, error) {
|
||||
var out UserInfoResp
|
||||
|
||||
Reference in New Issue
Block a user