Skip to content

GitLab

  • Menu
Projects Groups Snippets
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • H holdingk-saas-mqtt
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 0
    • Issues 0
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 0
    • Merge requests 0
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Packages & Registries
    • Packages & Registries
    • Package Registry
    • Infrastructure Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • tny-saas
  • holdingk-saas-mqtt
  • Merge requests
  • !29

Merged
Created Sep 04, 2026 by wangzp@wangzpOwner0 of 2 tasks completed0/2 tasks

merge: 同步 test 到 dev_saas_mes(已解冲突,含设备告警)

  • Overview 0
  • Commits 31
  • Changes 29

Summary

  • 在独立分支 merge/test-into-dev_saas_mes 上把 test 合入 dev_saas_mes 并解决冲突
  • 保留 MES:SNAPSHOT 依赖、心跳 mode 补推、仓内 env_configs / Jenkinsfile.test、employee-work topic、DataSource 排除
  • 并入 test:mtype=alarm、心跳离线边沿、algbox-alarm-topic

原 !28 (closed) 源分支是长期 test,不能把 MES 解冲突结果推回 test,故另开本 MR。

Test plan

  • 合入后 subscribe 能发 algbox-alarm-topic
  • MES 心跳 mode 补推仍在
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: merge/test-into-dev_saas_mes