From 34c8bbf81d7a889d4ac0431a8a9237c5c20dc2f6 Mon Sep 17 00:00:00 2001
From: qiuyu <1163105536@qq.com>
Date: Fri, 27 Dec 2024 17:15:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=201.31.0=20=E7=89=88=E6=9C=AC=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=EF=BC=9A=20=20=20=20=20=20=20=E3=80=90=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=91=E5=BA=94=E7=94=A8=E9=85=8D=E7=BD=AE->MeterSp?=
 =?UTF-8?q?here=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=89=8B=E5=8A=A8=E5=90=8C=E6=AD=A5=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=8C=89=E9=92=AE=E3=80=82=E4=BB=A5=E5=8F=8A=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=90=8E=EF=BC=8C=E6=8F=90=E7=A4=BA=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E5=90=8C=E6=AD=A5=E3=80=82=20=20=20=20=20=20?=
 =?UTF-8?q?=20=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91MeterSphere=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E5=B1=82=E7=BA=A7=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E6=B7=B1=E5=BA=A6=E4=BC=98=E5=8C=96=E4=B8=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?:=20torna.metersphere.module.maxLevel,=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=B1=82=E7=BA=A7=E4=B8=BA2=E3=80=82=20=20?=
 =?UTF-8?q?=20=20=20=20=20=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5MeterSphere=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E4=BE=BF=E4=BA=8E=E5=90=8E=E7=BB=AD=E4=BB=A5=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E7=9A=84=E8=87=AA=E5=8A=A8=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E3=80=82=EF=BC=88=E6=94=AF=E6=8C=81MeterSphere=20V2?=
 =?UTF-8?q?=E3=80=81V3=EF=BC=89=20=20=20=20=20=20=20=E3=80=90=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E7=9B=B8=E5=85=B3=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=85=B3=E8=81=94=E6=96=87=E6=A1=A3=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/utils/i18n/languages/en-us.js       |   4 +-
 front/src/utils/i18n/languages/zh-cn.js       |   6 +-
 .../MeterSphereSetting/index.vue              |  31 ++-
 .../views/project/ProjectRelease/index.vue    | 185 +++++++++++++++++-
 .../main/resources/META-INF/torna.properties  |   4 +
 .../common/bean/DingdingWebHookBody.java      |   8 +-
 .../cn/torna/common/bean/EnvironmentKeys.java |   2 +
 .../cn/torna/dao/entity/MsModuleConfig.java   |  11 +-
 .../java/cn/torna/service/ConvertService.java |  86 ++++++--
 .../java/cn/torna/service/DocInfoService.java |   5 +-
 .../service/ProjectReleaseDocService.java     |  24 +++
 .../torna/service/ProjectReleaseService.java  |  10 +-
 .../java/cn/torna/service/UpgradeService.java |  14 +-
 .../torna/service/UserSubscribeService.java   |   3 +-
 .../torna/service/builder/MessageBuilder.java |  17 +-
 .../service/dto/ProjectReleaseBindDocDTO.java |   8 +
 .../metersphere/MeterSpherePushService.java   | 111 ++++++++++-
 .../metersphere/MeterSphereService.java       |  87 +++++++-
 .../metersphere/MsModuleConfigService.java    |   4 +
 .../dto/MeterSphereModuleConfigSaveDTO.java   |   3 +
 .../metersphere/dto/MeterSphereModuleDTO.java |   7 +
 .../third/MeterSphereController.java          |  23 +++
 .../param/MeterSphereModuleSaveParam.java     |   3 +
 23 files changed, 588 insertions(+), 68 deletions(-)
 create mode 100644 server/server-service/src/main/java/cn/torna/service/ProjectReleaseDocService.java

diff --git a/front/src/utils/i18n/languages/en-us.js b/front/src/utils/i18n/languages/en-us.js
index 309c1674..4d9ff570 100644
--- a/front/src/utils/i18n/languages/en-us.js
+++ b/front/src/utils/i18n/languages/en-us.js
@@ -491,7 +491,9 @@ export default {
   },
   SwaggerSetting: {
     'syncConfirm': 'Save success, synchronize documents now?',
-    'synchronizing': 'Synchronizing'
+    'synchronizing': 'Synchronizing',
+    'synchronization': 'synchronization',
+    'checkSynchronized': 'Please check whether it is synchronized'
   },
   EditDocCustom: {
     'inputDocContent': 'Input document content'
diff --git a/front/src/utils/i18n/languages/zh-cn.js b/front/src/utils/i18n/languages/zh-cn.js
index cd15ef29..2ad0514a 100644
--- a/front/src/utils/i18n/languages/zh-cn.js
+++ b/front/src/utils/i18n/languages/zh-cn.js
@@ -399,7 +399,7 @@ export default {
   'nickEmail': '昵称/邮箱',
   'releaseNo': '版本号',
   'releaseDesc': '版本描述',
-  'viewAssociatedDocuments': '查看关联版本',
+  'viewAssociatedDocuments': '查看关联文档',
   'associatedDocument': '关联文档',
   'visitStyle': '访问方式',
   'updateName': '修改名称',
@@ -492,7 +492,9 @@ export default {
   },
   SwaggerSetting: {
     'syncConfirm': '保存成功，是否立即同步文档？',
-    'synchronizing': '同步中...'
+    'synchronizing': '同步中...',
+    'synchronization': '同步',
+    'checkSynchronized': '请确认是否同步？'
   },
   EditDocCustom: {
     'inputDocContent': '输入文档内容'
diff --git a/front/src/views/project/ModuleSetting/MeterSphereSetting/index.vue b/front/src/views/project/ModuleSetting/MeterSphereSetting/index.vue
index 56630d8a..240670e5 100644
--- a/front/src/views/project/ModuleSetting/MeterSphereSetting/index.vue
+++ b/front/src/views/project/ModuleSetting/MeterSphereSetting/index.vue
@@ -9,10 +9,11 @@
           {{ currentName }}
         </el-form-item>
         <el-form-item prop="msModuleId" label="绑定模块">
-          <el-cascader ref="sel" v-model="formData.msModuleId" :props="props" :options="options" style="width: 350px"></el-cascader>
+          <el-cascader ref="sel" v-model="formData.msModuleId" :props="props" :options="options" style="width: 350px" clearable></el-cascader>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="saveConfig">{{ $t('save') }}</el-button>
+          <el-button type="primary" @click="syncMeterSphere">{{ $t('SwaggerSetting.synchronization') }}</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -46,6 +47,7 @@ export default {
       props: {
         value: 'id',
         label: 'name',
+        checkStrictly: true,
         lazy: true,
         lazyLoad(node, resolve) {
           const { level } = node
@@ -56,9 +58,9 @@ export default {
           const msProjectId = node.value
           that.get('third/metersphere/module/list', { projectId: that.projectId, msProjectId: msProjectId }, resp => {
             const data = resp.data
-            for (const el of data) {
-              el.leaf = true
-            }
+            // for (const el of data) {
+            //   el.leaf = true
+            // }
             resolve(data)
           })
         }
@@ -93,19 +95,34 @@ export default {
           const leaf = checkedNodes[0]
           const pathNodes = leaf.pathNodes
           const msProject = pathNodes[0]
-          const msModule = pathNodes[1]
+          const msModule = pathNodes[pathNodes.length - 1]
+          const label = pathNodes.slice(1).map(node => node.label).join('/')
           const data = {
             msProjectId: msProject.value,
             msProjectName: msProject.label,
             msModuleId: msModule.value,
-            msModuleName: msModule.label,
+            msModuleName: label,
             moduleId: this.moduleId
           }
           this.post('third/metersphere/module/save', data, resp => {
-            this.tipSuccess($t('saveSuccess'))
+            if (resp.code === '0') {
+              this.confirm(this.$t('SwaggerSetting.syncConfirm'), () => {
+                this.syncMeterSphere()
+              })
+            }
           })
         }
       })
+    },
+    syncMeterSphere() {
+      const data = {
+        moduleId: this.moduleId
+      }
+      this.confirm(this.$t('SwaggerSetting.checkSynchronized'), () => {
+        this.post('third/metersphere/module/sync', data, resp => {
+          this.tipSuccess($t('syncSuccess'))
+        })
+      })
     }
   }
 }
diff --git a/front/src/views/project/ProjectRelease/index.vue b/front/src/views/project/ProjectRelease/index.vue
index a78611de..4ba6a042 100644
--- a/front/src/views/project/ProjectRelease/index.vue
+++ b/front/src/views/project/ProjectRelease/index.vue
@@ -81,12 +81,26 @@
           </el-link>
           <el-link type="primary" @click="bindDocs(scope.row)">{{ $t('viewAssociatedDocuments') }}</el-link>
           <el-link v-if="hasRole(`project:${projectId}`, [Role.admin, Role.dev])" type="primary" @click="onReleaseUpdate(scope.row)">{{ $t('update') }}</el-link>
-          <el-popconfirm
-            :title="$t('removeConfirm', scope.row.releaseNo)"
-            @confirm="onReleaseRemove(scope.row)"
-          >
-            <el-link v-if="hasRole(`project:${projectId}`, [Role.admin, Role.dev])" slot="reference" type="danger">{{ $t('remove') }}</el-link>
-          </el-popconfirm>
+          <el-dropdown>
+            <span class="el-dropdown-link">
+              <i class="el-icon-more el-icon--right" />
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item>
+                <el-popconfirm
+                  :title="$t('removeConfirm', scope.row.releaseNo)"
+                  @confirm="onReleaseRemove(scope.row)"
+                >
+                  <el-link v-if="hasRole(`project:${projectId}`, [Role.admin, Role.dev])" slot="reference" :underline="false" type="danger">
+                    {{ $t('remove') }}
+                  </el-link>
+                </el-popconfirm>
+              </el-dropdown-item>
+              <el-dropdown-item>
+                <el-link type="primary" @click="syncMeterSphereEvent(scope.row)" :underline="false">同步MeterSphere</el-link>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </template>
       </el-table-column>
     </el-table>
@@ -143,23 +157,76 @@
     >
       <el-tree
         :data="releaseDocData"
+        :props="bindDocProps"
         :default-expand-all="true"
       >
         <span slot-scope="{ node, data }" class="custom-tree-node">
-          <span>{{ node.label }}</span>
+          <span>{{ node.label }}
+            <span v-show="!data.isFolder && data.httpMethod" class="el-tree-label-tip">
+              <http-method v-if="data.httpMethod" :method="data.httpMethod" />
+              {{ data.url }}
+              <span v-show="data.version !== ''" class="el-tree-label-tip">
+                <el-tag effect="plain" size="mini" type="info">{{ data.version }}</el-tag>
+              </span>
+            </span>
+          </span>
           <el-link v-if="!isFolder(data)" type="success" icon="el-icon-view" :title="$t('preview')" :underline="false" @click="openLink(getViewUrl(data))" />
         </span>
       </el-tree>
     </el-dialog>
+    <!-- sync MeterSphere dialog   -->
+    <el-dialog
+      :title="$t('ModuleSetting.meterSphereSetting')"
+      :close-on-click-modal="false"
+      :visible.sync="syncMeterSphereDlgShow"
+    >
+      <div>
+        <div v-show="spaceConfig">
+          <el-alert type="info" :closable="false" style="margin-bottom: 10px">
+            当前版本绑定MeterSphere模块
+          </el-alert>
+          <el-form ref="msModuleFrm" :model="msModuleFormData" :rules="msModuleFormRules">
+            <el-form-item v-show="currentMsModuleName && currentMsModuleName.length > 0" label="当前绑定模块">
+              {{ currentMsModuleName }}
+            </el-form-item>
+            <el-form-item prop="msModuleId" label="绑定模块">
+              <el-cascader ref="sel" v-model="msModuleFormData.msModuleId" :props="props" :options="options" style="width: 350px" clearable />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" @click="saveReleaseMeterSphereConfig">{{ $t('save') }}</el-button>
+              <el-button type="primary" @click="syncReleaseMeterSphere">{{ $t('SwaggerSetting.synchronization') }}</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div v-show="!spaceConfig">
+          <el-alert type="info" :closable="false">
+            空间未配置MeterSphere参数 <span v-show="spaceId && spaceId.length > 0"> <el-link type="primary" @click="goRoute(`/space/setting/${spaceId}`)">前往配置</el-link> </span>
+          </el-alert>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
+<style lang="scss">
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409EFF;
+  font-size: 13px;
+  font-weight: 500;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+</style>
 <script>
 
 import ModuleDocTree from '@/components/ModuleDocTree'
+import HttpMethod from '@/components/HttpMethod'
 
+let that
 export default {
   name: 'ProjectRelease',
-  components: { ModuleDocTree },
+  components: { HttpMethod, ModuleDocTree },
   props: {
     projectId: {
       type: String,
@@ -168,6 +235,7 @@ export default {
   },
   data() {
     return {
+      releaseId: '',
       dialogTitle: '',
       operator: '',
       searchFormData: {
@@ -178,6 +246,7 @@ export default {
       releaseData: [],
       releaseDlgShow: false,
       bindDocDlgShow: false,
+      syncMeterSphereDlgShow: false,
       releaseAddFormData: {
         id: '',
         releaseNo: '',
@@ -192,8 +261,45 @@ export default {
           { required: true, message: this.$t('pleaseSelect'), trigger: ['blur', 'change'] }
         ]
       },
+      bindDocProps: {
+        label: 'name',
+        children: 'children'
+      },
       moduleData: [],
-      releaseDocData: []
+      releaseDocData: [],
+      spaceConfig: false,
+      options: [],
+      spaceId: '',
+      currentMsModuleName: '',
+      msModuleFormData: {
+        msModuleId: ''
+      },
+      msModuleFormRules: {
+        msModuleId: [
+          { required: true, message: this.$t('notEmpty'), trigger: 'blur' }
+        ]
+      },
+      props: {
+        value: 'id',
+        label: 'name',
+        checkStrictly: true,
+        lazy: true,
+        lazyLoad(node, resolve) {
+          const { level } = node
+          if (!that || level >= 2) {
+            resolve([])
+            return
+          }
+          const msProjectId = node.value
+          that.get('third/metersphere/module/list', { projectId: that.projectId, msProjectId: msProjectId }, resp => {
+            const data = resp.data
+            // for (const el of data) {
+            //   el.leaf = true
+            // }
+            resolve(data)
+          })
+        }
+      }
     }
   },
   computed: {
@@ -349,6 +455,67 @@ export default {
         callback && callback.call(this)
       })
     },
+    // 点击同步MeterSphere事件
+    syncMeterSphereEvent(row, callback) {
+      that = this
+      this.releaseId = row.id
+      this.get('third/metersphere/project/load', { projectId: row.projectId }, resp => {
+        const data = resp.data
+        this.spaceConfig = data.spaceConfig
+        this.spaceId = data.spaceId
+        this.options = data.projects || []
+        this.syncMeterSphereDlgShow = true
+        callback && callback.call(this)
+      })
+      this.loadReleaseMeterSphereConfig(this.releaseId)
+    },
+    // 加载当前版本绑定MS模块
+    loadReleaseMeterSphereConfig(releaseId) {
+      this.get('third/metersphere/release/load', { releaseId: releaseId }, resp => {
+        const data = resp.data
+        if (data) {
+          this.currentMsModuleName = data.name
+        }
+      })
+    },
+    // 保存版本绑定MS模块
+    saveReleaseMeterSphereConfig() {
+      this.$refs.msModuleFrm.validate(valid => {
+        if (valid) {
+          const checkedNodes = this.$refs.sel.getCheckedNodes()
+          const leaf = checkedNodes[0]
+          const pathNodes = leaf.pathNodes
+          const msProject = pathNodes[0]
+          const msModule = pathNodes[pathNodes.length - 1]
+          const label = pathNodes.slice(1).map(node => node.label).join('/')
+          const data = {
+            msProjectId: msProject.value,
+            msProjectName: msProject.label,
+            msModuleId: msModule.value,
+            msModuleName: label,
+            releaseId: this.releaseId
+          }
+          this.post('third/metersphere/release/save', data, resp => {
+            if (resp.code === '0') {
+              this.confirm(this.$t('SwaggerSetting.syncConfirm'), () => {
+                this.syncReleaseMeterSphere()
+              })
+            }
+          })
+        }
+      })
+    },
+    // 保同步版本至MS模块
+    syncReleaseMeterSphere() {
+      const data = {
+        releaseId: this.releaseId
+      }
+      this.confirm(this.$t('SwaggerSetting.checkSynchronized'), () => {
+        this.post('third/metersphere/release/sync', data, resp => {
+          this.tipSuccess($t('syncSuccess'))
+        })
+      })
+    },
     isFolder(row) {
       return row.isFolder === 1
     },
diff --git a/server/boot/src/main/resources/META-INF/torna.properties b/server/boot/src/main/resources/META-INF/torna.properties
index e81be87e..fe61aeed 100644
--- a/server/boot/src/main/resources/META-INF/torna.properties
+++ b/server/boot/src/main/resources/META-INF/torna.properties
@@ -181,3 +181,7 @@ spring.ldap.urls=${torna.ldap.url}
 spring.ldap.base=${torna.ldap.base}
 spring.ldap.username=cn=${torna.ldap.username},${spring.ldap.base}
 spring.ldap.password=${torna.ldap.password}
+
+
+# MeterSphere
+torna.metersphere.module.maxLevel = 2
\ No newline at end of file
diff --git a/server/server-common/src/main/java/cn/torna/common/bean/DingdingWebHookBody.java b/server/server-common/src/main/java/cn/torna/common/bean/DingdingWebHookBody.java
index f1ab2a88..e022f69c 100644
--- a/server/server-common/src/main/java/cn/torna/common/bean/DingdingWebHookBody.java
+++ b/server/server-common/src/main/java/cn/torna/common/bean/DingdingWebHookBody.java
@@ -5,7 +5,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
-import java.util.List;
 
 /**
  * Copyright © 2021 DHF Info. Tech Ltd. All rights reserved.
@@ -50,7 +49,7 @@ public class DingdingWebHookBody {
     @NoArgsConstructor
     public static class At {
 
-        public At(List<String> atUserIds) {
+        public At(Collection<String> atUserIds) {
             this.atUserIds = atUserIds;
         }
 
@@ -59,7 +58,7 @@ public class DingdingWebHookBody {
          * <b>注意</b><br>
          * 在content里添加@人的userid。
          */
-        private List<String> atUserIds;
+        private Collection<String> atUserIds;
 
         /**
          * 被@的群成员手机号。<br/>
@@ -67,5 +66,8 @@ public class DingdingWebHookBody {
          *
          */
         private Collection<String> atMobiles;
+
+
+
     }
 }
diff --git a/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java b/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
index 2ae30a5c..c1ebaabd 100644
--- a/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
+++ b/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
@@ -92,6 +92,8 @@ public enum EnvironmentKeys {
     TORNA_PUSH_EXECUTE_SIZE("torna.push-execute-size", "50"),
     /** 快照数量 */
     TORNA_SNAPSHOT_SIZE("torna.snapshot-size", "5"),
+
+    TORNA_METERSPHERE_MODULE_MAXLEVEL("torna.metersphere.module.maxLevel", "2"),
     ;
 
     private final String key;
diff --git a/server/server-dao/src/main/java/cn/torna/dao/entity/MsModuleConfig.java b/server/server-dao/src/main/java/cn/torna/dao/entity/MsModuleConfig.java
index 380d9512..6573a00d 100644
--- a/server/server-dao/src/main/java/cn/torna/dao/entity/MsModuleConfig.java
+++ b/server/server-dao/src/main/java/cn/torna/dao/entity/MsModuleConfig.java
@@ -1,14 +1,12 @@
 package cn.torna.dao.entity;
 
-import java.time.LocalDateTime;
-import java.util.Date;
-
 import com.gitee.fastmybatis.annotation.Pk;
 import com.gitee.fastmybatis.annotation.PkStrategy;
 import com.gitee.fastmybatis.annotation.Table;
-
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 
 /**
  * 表名：ms_module_config
@@ -31,6 +29,11 @@ public class MsModuleConfig {
      */
     private Long moduleId;
 
+    /**
+     * project_release.id
+     */
+    private Long releaseId;
+
     /**
      * 默认覆盖
      */
diff --git a/server/server-service/src/main/java/cn/torna/service/ConvertService.java b/server/server-service/src/main/java/cn/torna/service/ConvertService.java
index ec25e717..c5471fb3 100644
--- a/server/server-service/src/main/java/cn/torna/service/ConvertService.java
+++ b/server/server-service/src/main/java/cn/torna/service/ConvertService.java
@@ -3,26 +3,19 @@ package cn.torna.service;
 import cn.torna.common.bean.Booleans;
 import cn.torna.common.enums.ParamStyleEnum;
 import cn.torna.common.util.TreeUtil;
+import cn.torna.dao.entity.DocInfo;
 import cn.torna.dao.entity.Module;
-import cn.torna.manager.doc.postman.Body;
-import cn.torna.manager.doc.postman.Header;
-import cn.torna.manager.doc.postman.Info;
-import cn.torna.manager.doc.postman.Item;
-import cn.torna.manager.doc.postman.Param;
-import cn.torna.manager.doc.postman.Postman;
-import cn.torna.manager.doc.postman.Request;
-import cn.torna.manager.doc.postman.Url;
+import cn.torna.dao.entity.ProjectRelease;
+import cn.torna.dao.entity.ProjectReleaseDoc;
+import cn.torna.manager.doc.postman.*;
 import cn.torna.service.dto.DocInfoDTO;
 import cn.torna.service.dto.DocParamDTO;
 import cn.torna.service.metersphere.v3.constants.ParameterIn;
-import cn.torna.service.metersphere.v3.model.ApiDefinition;
-import cn.torna.service.metersphere.v3.model.DataTypes;
-import cn.torna.service.metersphere.v3.model.HttpMethod;
-import cn.torna.service.metersphere.v3.model.Property;
-import cn.torna.service.metersphere.v3.model.RequestBodyType;
+import cn.torna.service.metersphere.v3.model.*;
 import cn.torna.service.metersphere.v3.openapi.OpenApiDataConvert;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.gitee.fastmybatis.core.query.LambdaQuery;
 import io.swagger.v3.oas.models.OpenAPI;
 import lombok.Data;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -32,14 +25,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -57,6 +43,9 @@ public class ConvertService {
     @Autowired
     private ModuleService moduleService;
 
+    @Autowired
+    private ProjectReleaseDocService projectReleaseDocService;
+
     public OpenAPI convertToOpenAPI(Long moduleId) {
         List<DocInfoDTO> docInfos = docInfoService.listDocDetail(moduleId);
 //        List<DocInfoDTO> docInfos = docInfoService.listTreeDoc(moduleId);
@@ -245,6 +234,55 @@ public class ConvertService {
         return postman;
     }
 
+    private List<DocInfo> getReleaseDocInfos(ProjectRelease projectRelease) {
+        List<ProjectReleaseDoc> releaseDocs = projectReleaseDocService.getReleaseDocs(
+                projectRelease.getProjectId(),
+                projectRelease.getId()
+        );
+        // 查询关联文档
+        Set<Long> docIds = releaseDocs.stream().map(ProjectReleaseDoc::getSourceId).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(docIds)) {
+            return new ArrayList<>();
+        }
+        // 由于版本关联文档时，当分类下文档没有完全选中时，分类id不会记录在project_release_doc中，这里需要补全分类数据
+        List<DocInfo> parentDocInfos = docInfoService.list(
+                LambdaQuery.create(DocInfo.class)
+                        .in(DocInfo::getId, docIds)
+                        .select(DocInfo::getParentId)
+        );
+        docIds.addAll(parentDocInfos.stream().map(DocInfo::getParentId).collect(Collectors.toSet()));
+        // 查询文档
+        return docInfoService.list(
+                LambdaQuery.create(DocInfo.class)
+                        .in(DocInfo::getId, docIds)
+        );
+    }
+
+
+    public Postman convertToPostmanByRelease(ProjectRelease projectRelease, Config config) {
+        Context context = new Context();
+        context.setModuleId(projectRelease.getId());
+        context.setAppName(projectRelease.getReleaseNo());
+        context.setConfig(config);
+        Postman postman = new Postman();
+        Info info = buildInfo(projectRelease);
+        List<DocInfo> releaseDocInfoList = getReleaseDocInfos(projectRelease);
+        DocInfoService.sortDocInfo(releaseDocInfoList);
+        List<DocInfoDTO> docInfos = docInfoService.convertTree(releaseDocInfoList);
+        List<Item> items = buildItems(docInfos, context);
+        postman.setInfo(info);
+        postman.setItem(items);
+        return postman;
+    }
+
+    public OpenAPI convertToOpenAPIByRelease(ProjectRelease projectRelease) {
+        List<DocInfoDTO> docInfos = getReleaseDocInfos(projectRelease)
+                .stream()
+                .map(docInfoService::getDocDetail)
+                .collect(Collectors.toList());
+        List<ApiDefinition> apis = buildApiDefinition(docInfos);
+        return new OpenApiDataConvert().convert(apis);
+    }
 
     private Info buildInfo(Module module) {
         Info info = new Info();
@@ -252,6 +290,12 @@ public class ConvertService {
         return info;
     }
 
+    private Info buildInfo(ProjectRelease projectRelease) {
+        Info info = new Info();
+        info.setName(projectRelease.getReleaseNo());
+        return info;
+    }
+
     private List<Item> buildItems(List<DocInfoDTO> docInfos, Context context) {
         return docInfos.stream()
                 .map(docInfoDTO -> this.buildItem(docInfoDTO, context))
diff --git a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
index 68d858bc..670d8bcb 100755
--- a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
+++ b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
@@ -975,7 +975,10 @@ public class DocInfoService extends BaseLambdaService<DocInfo, DocInfoMapper> {
         return convertTree(docInfos);
     }
 
-    private List<DocInfoDTO> convertTree(List<DocInfo> docInfos) {
+    public List<DocInfoDTO> convertTree(List<DocInfo> docInfos) {
+        if (CollectionUtils.isEmpty(docInfos)) {
+            return Collections.emptyList();
+        }
         List<DocInfoDTO> docInfoDTOList = docInfos.stream()
                 .map(this::getDocDetail)
                 .collect(Collectors.toList());
diff --git a/server/server-service/src/main/java/cn/torna/service/ProjectReleaseDocService.java b/server/server-service/src/main/java/cn/torna/service/ProjectReleaseDocService.java
new file mode 100644
index 00000000..2be35303
--- /dev/null
+++ b/server/server-service/src/main/java/cn/torna/service/ProjectReleaseDocService.java
@@ -0,0 +1,24 @@
+package cn.torna.service;
+
+import cn.torna.dao.entity.ProjectReleaseDoc;
+import cn.torna.dao.mapper.ProjectReleaseDocMapper;
+import com.gitee.fastmybatis.core.query.LambdaQuery;
+import com.gitee.fastmybatis.core.query.Query;
+import com.gitee.fastmybatis.core.support.BaseLambdaService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author qiuyu
+ */
+@Service
+public class ProjectReleaseDocService extends BaseLambdaService<ProjectReleaseDoc, ProjectReleaseDocMapper> {
+
+    public List<ProjectReleaseDoc> getReleaseDocs(Long projectId, Long releaseId) {
+        Query query = LambdaQuery.create(ProjectReleaseDoc.class)
+                .eq(ProjectReleaseDoc::getProjectId, projectId)
+                .eq(ProjectReleaseDoc::getReleaseId, releaseId);
+        return list(query);
+    }
+}
diff --git a/server/server-service/src/main/java/cn/torna/service/ProjectReleaseService.java b/server/server-service/src/main/java/cn/torna/service/ProjectReleaseService.java
index 82221547..70a716a4 100644
--- a/server/server-service/src/main/java/cn/torna/service/ProjectReleaseService.java
+++ b/server/server-service/src/main/java/cn/torna/service/ProjectReleaseService.java
@@ -105,7 +105,7 @@ public class ProjectReleaseService extends BaseLambdaService<ProjectRelease, Pro
      * 将Map中的Id转换为HashId
      *
      * @param map key和value均为Long类型的id
-     * @return Map<List < String>>
+     * @return Map<String, List<String>>
      * @author qiuyu
      **/
     private Map<String, List<String>> toEncode(Map<Long, List<Long>> map) {
@@ -251,6 +251,7 @@ public class ProjectReleaseService extends BaseLambdaService<ProjectRelease, Pro
             // 获取接口名称
             List<Long> docIds = list.stream().map(ProjectReleaseDoc::getSourceId).distinct().collect(Collectors.toList());
             List<DocInfo> docInfos = docInfoService.list(LambdaQuery.create(DocInfo.class).in(DocInfo::getId, docIds));
+            DocInfoService.sortDocInfo(docInfos);
             Map<Long, DocInfo> docInfoMap = docInfos.stream().collect(Collectors.toMap(DocInfo::getId, Function.identity(), (v1, v2) -> v2));
 
             // 封装关联文档
@@ -259,7 +260,7 @@ public class ProjectReleaseService extends BaseLambdaService<ProjectRelease, Pro
                     ProjectReleaseBindDocDTO module = new ProjectReleaseBindDocDTO(releaseId);
                     module.setIsFolder(1);
                     module.setId(k);
-                    module.setLabel(v);
+                    module.setName(v);
                     muduleId2ListMap.get(k).forEach(releaseDoc ->{
                         ProjectReleaseBindDocDTO doc = new ProjectReleaseBindDocDTO(releaseId);
                         DocInfo docInfo = docInfoMap.get(releaseDoc.getSourceId());
@@ -267,7 +268,10 @@ public class ProjectReleaseService extends BaseLambdaService<ProjectRelease, Pro
                         if (docInfo.getIsFolder() == 0) {
                             doc.setIsFolder(0);
                             doc.setId(docInfo.getId());
-                            doc.setLabel(String.format("%s 【%s】 %s",docInfo.getName(), docInfo.getHttpMethod(), docInfo.getUrl()));
+                            doc.setName(docInfo.getName());
+                            doc.setHttpMethod(docInfo.getHttpMethod());
+                            doc.setUrl(docInfo.getUrl());
+                            doc.setVersion(docInfo.getVersion());
                             module.getChildren().add(doc);
                         }
                     });
diff --git a/server/server-service/src/main/java/cn/torna/service/UpgradeService.java b/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
index f6780c34..10c887be 100644
--- a/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
+++ b/server/server-service/src/main/java/cn/torna/service/UpgradeService.java
@@ -46,7 +46,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UpgradeService {
 
-    private static final int VERSION = 13001;
+    private static final int VERSION = 13100;
 
     private static final String TORNA_VERSION_KEY = "torna.version";
 
@@ -190,6 +190,18 @@ public class UpgradeService {
         v1_29_0(oldVersion);
         v1_29_2(oldVersion);
         v1_30_1(oldVersion);
+        v1_31_0(oldVersion);
+    }
+
+    private void v1_31_0(int oldVersion) {
+        int version = 13100;
+        if (oldVersion < version) {
+            log.info("Upgrade version to {}", version);
+            addColumn("ms_module_config", "release_id",
+                    "ALTER TABLE `ms_module_config` ADD COLUMN `release_id` bigint NULL DEFAULT 0 COMMENT 'project_release.id' AFTER `module_id`;");
+            runSql("ALTER TABLE `ms_module_config` DROP INDEX `uk_moduleid`");
+            runSql("ALTER TABLE `ms_module_config` ADD UNIQUE INDEX `uk_moduleid`(`module_id`, `release_id`) USING BTREE");
+        }
     }
 
     private void v1_30_1(int oldVersion) {
diff --git a/server/server-service/src/main/java/cn/torna/service/UserSubscribeService.java b/server/server-service/src/main/java/cn/torna/service/UserSubscribeService.java
index eee999a6..efd2387b 100644
--- a/server/server-service/src/main/java/cn/torna/service/UserSubscribeService.java
+++ b/server/server-service/src/main/java/cn/torna/service/UserSubscribeService.java
@@ -103,7 +103,6 @@ public class UserSubscribeService extends BaseLambdaService<UserSubscribe, UserS
         }
     }
 
-
     public List<Long> listUserIds(UserSubscribeTypeEnum userSubscribeTypeEnum, long sourceId) {
         Query query = this.query()
                 .eq(UserSubscribe::getType, userSubscribeTypeEnum.getType())
@@ -114,7 +113,6 @@ public class UserSubscribeService extends BaseLambdaService<UserSubscribe, UserS
                 .collect(Collectors.toList());
     }
 
-
     public Map<Long, List<Long>> listUserIdsGroupBySourceId(UserSubscribeTypeEnum userSubscribeTypeEnum, List<Long> sourceIds) {
         Query query = this.query()
                 .eq(UserSubscribe::getType, userSubscribeTypeEnum.getType())
@@ -125,4 +123,5 @@ public class UserSubscribeService extends BaseLambdaService<UserSubscribe, UserS
                 Collectors.mapping(UserSubscribe::getUserId, Collectors.toList())
         ));
     }
+
 }
diff --git a/server/server-service/src/main/java/cn/torna/service/builder/MessageBuilder.java b/server/server-service/src/main/java/cn/torna/service/builder/MessageBuilder.java
index 065df354..3391fc29 100644
--- a/server/server-service/src/main/java/cn/torna/service/builder/MessageBuilder.java
+++ b/server/server-service/src/main/java/cn/torna/service/builder/MessageBuilder.java
@@ -4,12 +4,6 @@ import cn.torna.common.bean.EnvironmentKeys;
 import cn.torna.common.enums.MessageNotifyTypeEnum;
 import cn.torna.common.enums.ModifyType;
 import cn.torna.common.util.IdUtil;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -17,6 +11,13 @@ import lombok.NoArgsConstructor;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
  * 统一消息构建器
  * @author Jason Kung
@@ -42,7 +43,7 @@ public class MessageBuilder {
         String content = null;
         // 钉钉
         MessageNotifyTypeEnum notificationType = universalMessage.getNotificationType();
-        List<String> userIdList = universalMessage.getUserIdList();
+        Collection<String> userIdList = universalMessage.getUserIdList();
         if (notificationType.equals(MessageNotifyTypeEnum.DING_TALK_WEB_HOOK)) {
             String atUser = "";
             if (!CollectionUtils.isEmpty(userIdList)) {
@@ -116,6 +117,6 @@ public class MessageBuilder {
         /**
          * 用户ID列表
          */
-        private List<String> userIdList;
+        private Collection<String> userIdList;
     }
 }
diff --git a/server/server-service/src/main/java/cn/torna/service/dto/ProjectReleaseBindDocDTO.java b/server/server-service/src/main/java/cn/torna/service/dto/ProjectReleaseBindDocDTO.java
index addb9471..c675bbe4 100644
--- a/server/server-service/src/main/java/cn/torna/service/dto/ProjectReleaseBindDocDTO.java
+++ b/server/server-service/src/main/java/cn/torna/service/dto/ProjectReleaseBindDocDTO.java
@@ -28,6 +28,14 @@ public class ProjectReleaseBindDocDTO {
 
     private String label;
 
+    private String name;
+
+    private String httpMethod;
+
+    private String url;
+
+    private String version;
+
     private Integer isFolder;
 
     private List<ProjectReleaseBindDocDTO> children = new ArrayList<>();
diff --git a/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSpherePushService.java b/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSpherePushService.java
index ea05efe6..4c6b92ab 100644
--- a/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSpherePushService.java
+++ b/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSpherePushService.java
@@ -4,13 +4,11 @@ import cn.torna.common.bean.Booleans;
 import cn.torna.common.bean.Configs;
 import cn.torna.common.bean.EnvironmentKeys;
 import cn.torna.common.bean.HttpHelper;
-import cn.torna.dao.entity.Module;
-import cn.torna.dao.entity.MsModuleConfig;
-import cn.torna.dao.entity.MsSpaceConfig;
-import cn.torna.dao.entity.Project;
+import cn.torna.dao.entity.*;
 import cn.torna.manager.doc.postman.Postman;
 import cn.torna.service.ConvertService;
 import cn.torna.service.ModuleService;
+import cn.torna.service.ProjectReleaseService;
 import cn.torna.service.ProjectService;
 import cn.torna.service.metersphere.v3.constants.URLConstants;
 import cn.torna.service.metersphere.v3.model.state.AppSettingState;
@@ -33,6 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -69,6 +68,9 @@ public class MeterSpherePushService {
     @Autowired
     private MsModuleConfigService moduleConfigService;
 
+    @Autowired
+    private ProjectReleaseService projectReleaseService;
+
 
     /**
      * 推送模块文档到metersphere服务器
@@ -251,4 +253,105 @@ public class MeterSpherePushService {
         return param;
     }
 
+    /**
+     * 推送版本对应文档到metersphere服务器
+     * @param releaseId 版本id
+     */
+    @Async
+    public void pushRelease(Long releaseId) throws Exception {
+        if (!EnvironmentKeys.ENABLE_METER_SPHERE.getBoolean()) {
+            return;
+        }
+        ProjectRelease projectRelease = projectReleaseService.getById(releaseId);
+        Project project = projectService.getById(projectRelease.getProjectId());
+        MsModuleConfig msModuleConfig = moduleConfigService.getByReleaseId(releaseId);
+        if (msModuleConfig == null) {
+            return;
+        }
+        MsSpaceConfig msSpaceConfig = msSpaceConfigService.getBySpaceId(project.getSpaceId());
+        if (msSpaceConfig == null) {
+            log.warn("metersphere空间未配置，spaceId={}, project={}", project.getSpaceId(), project.getName());
+            return;
+        }
+
+        Integer version = msSpaceConfig.getVersion();
+        if (Objects.equals(MeterSphereVersion.V2, version)) {
+            pushRelease2MsV2(projectRelease, msSpaceConfig, msModuleConfig);
+
+        }else if (Objects.equals(MeterSphereVersion.V3, version)) {
+            pushRelease2MsV3(projectRelease, msSpaceConfig, msModuleConfig);
+        }
+
+    }
+
+    private void pushRelease2MsV2(ProjectRelease projectRelease,
+                                  MsSpaceConfig msSpaceConfig,
+                                  MsModuleConfig msModuleConfig) throws IOException {
+        ConvertService.Config config = new ConvertService.Config();
+        config.setNeedHost(false);
+        Postman postman = convertService.convertToPostmanByRelease(projectRelease, config);
+        String url = msSpaceConfig.getMsAddress() + Configs.getValue("metersphere.import-url", "/api/definition/import");
+
+        if (CollectionUtils.isEmpty(postman.getItem())) {
+            log.warn("metersphere推送版本接口为空，releaseId={}", projectRelease.getId());
+            return;
+        }
+        File file = createTempFile(JSON.toJSONString(postman));
+        JSONObject param = buildParam(msModuleConfig);
+        HttpEntity formEntity = MultipartEntityBuilder.create()
+                .addBinaryBody("file", file, ContentType.APPLICATION_JSON, null)
+                .addBinaryBody("request", param.toJSONString().getBytes(StandardCharsets.UTF_8), ContentType.APPLICATION_JSON, null).build();
+
+        try {
+            log.debug("推送metersphere，param={}", param);
+            HttpHelper.ResponseResult responseResult = HttpHelper.create()
+                    .url(url)
+                    .method(HttpMethod.POST.name())
+                    .header("Accept", "application/json, text/plain, */*")
+                    .header("accesskey", msSpaceConfig.getMsAccessKey())
+                    .header("signature", MSApiUtil.getSinature(msSpaceConfig.getMsAccessKey(), msSpaceConfig.getMsSecretKey()))
+                    .entity(formEntity)
+                    .execute();
+            String result = responseResult.asString();
+            if (responseResult.getStatus() == 200) {
+                log.info("推送版本至metersphere成功");
+            } else {
+                log.error("推送版本至metersphere失败，param={}, result={}", param, result);
+            }
+        } catch (IOException e) {
+            log.error("推送版本至metersphere失败，param={},", param, e);
+        } finally {
+            try {
+                Files.deleteIfExists(file.toPath());
+            } catch (IOException e) {
+                log.error("Failed to delete temp file", e);
+            }
+        }
+    }
+
+
+    public void pushRelease2MsV3(
+            ProjectRelease projectRelease,
+            MsSpaceConfig msSpaceConfig,
+            MsModuleConfig msModuleConfig
+    ) throws Exception {
+        Long releaseId = projectRelease.getId();
+        OpenAPI openApi = convertService.convertToOpenAPIByRelease(projectRelease);
+        openApi.getInfo().setTitle(projectRelease.getReleaseNo());
+        JsonObject apiJsonObject = new OpenApiGenerator().generate(openApi);
+        String fileContent = apiJsonObject.toString();
+        File temp = createTempFile(fileContent);
+        try {
+            uploadToServer(msSpaceConfig, msModuleConfig, temp);
+        } catch (Exception e) {
+            log.error("推送openAPI文档失败, releaseId={}", releaseId, e);
+        } finally {
+            try {
+                Files.deleteIfExists(temp.toPath());
+            } catch (IOException e) {
+                log.error("Failed to delete temp file", e);
+            }
+        }
+    }
+
 }
diff --git a/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSphereService.java b/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSphereService.java
index b422e8d0..00962db5 100644
--- a/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSphereService.java
+++ b/server/server-service/src/main/java/cn/torna/service/metersphere/MeterSphereService.java
@@ -1,12 +1,14 @@
 package cn.torna.service.metersphere;
 
 import cn.torna.common.bean.Booleans;
+import cn.torna.common.bean.EnvironmentKeys;
 import cn.torna.common.exception.BizException;
 import cn.torna.common.util.CopyUtil;
 import cn.torna.dao.entity.MsModuleConfig;
 import cn.torna.dao.entity.MsSpaceConfig;
 import cn.torna.dao.entity.Project;
 import cn.torna.service.ProjectService;
+import cn.torna.service.metersphere.dto.*;
 import cn.torna.service.metersphere.dto.MeterSphereModuleConfigSaveDTO;
 import cn.torna.service.metersphere.dto.MeterSphereModuleDTO;
 import cn.torna.service.metersphere.dto.MeterSphereProjectDTO;
@@ -28,6 +30,11 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
 import java.util.Collections;
 import java.util.List;
 
@@ -48,6 +55,9 @@ public class MeterSphereService {
     @Autowired
     private MsModuleConfigService moduleConfigService;
 
+    @Autowired
+    private MeterSpherePushService meterSpherePushService;
+
     public static MeterSphereTestDTO test(MeterSphereSetting meterSphereSetting) {
         try {
             boolean test = MSApiUtil.test(meterSphereSetting);
@@ -179,13 +189,16 @@ public class MeterSphereService {
                     JSONObject moduleObj = MSApiUtil.getModuleList(meterSphereSetting, msProjectId, "http");
                     JSONArray data = moduleObj.getJSONArray("data");
                     if (data != null) {
-                        return data.toJavaList(MeterSphereModuleDTO.class);
+                        List<MeterSphereModuleDTO> meterSphereModuleDTOS = data.toJavaList(MeterSphereModuleDTO.class);
+                        // 获取到第几层级
+                        return filterByLevel(meterSphereModuleDTOS, EnvironmentKeys.TORNA_METERSPHERE_MODULE_MAXLEVEL.getInt());
                     }
                     break;
                 case MeterSphereVersion.V3:
                     AppSettingState appSettingState = meterSphereSetting.toAppSettingState();
                     List<MSModule> moduleList = MSClientUtils.getModuleList(appSettingState, msProjectId);
-                    return CopyUtil.copyList(moduleList, MeterSphereModuleDTO::new);
+                    List<MeterSphereModuleDTO> meterSphereModuleDTOS = CopyUtil.copyList(moduleList, MeterSphereModuleDTO::new);
+                    return filterByLevel(meterSphereModuleDTOS, EnvironmentKeys.TORNA_METERSPHERE_MODULE_MAXLEVEL.getInt());
                 default: {
                     return Collections.emptyList();
                 }
@@ -197,6 +210,29 @@ public class MeterSphereService {
         return Collections.emptyList();
     }
 
+    private List<MeterSphereModuleDTO> filterByLevel(List<MeterSphereModuleDTO> modules, int maxLevel) {
+        List<MeterSphereModuleDTO> result = new ArrayList<>();
+
+        for (MeterSphereModuleDTO module : modules) {
+            if (module.getLevel() <= maxLevel) {
+                MeterSphereModuleDTO filteredModule = new MeterSphereModuleDTO();
+                filteredModule.setId(module.getId());
+                filteredModule.setName(module.getName());
+                filteredModule.setLevel(module.getLevel());
+                // 递归获取子节点，确保只获取到指定层级
+                if (module.getChildren() != null && module.getLevel() < maxLevel) {
+                    filteredModule.setLeaf(false);
+                    filteredModule.setChildren(filterByLevel(module.getChildren(), maxLevel));
+                }else {
+                    filteredModule.setLeaf(true);
+                }
+                result.add(filteredModule);
+            }
+        }
+
+        return result;
+    }
+
     public void saveModule(MeterSphereModuleConfigSaveDTO dto) {
         Long moduleId = dto.getModuleId();
         MsModuleConfig msModuleConfig = moduleConfigService.getByModuleId(moduleId);
@@ -218,6 +254,53 @@ public class MeterSphereService {
 
     }
 
+    public void syncModule(MeterSphereModuleConfigSaveDTO dto) {
+        Long moduleId = dto.getModuleId();
+        try {
+            meterSpherePushService.push(moduleId);
+        } catch (Exception e) {
+            log.error("同步MeterSphere失败！", e);
+            throw new BizException("同步MeterSphere失败！");
+        }
+    }
+
+    public MeterSphereModuleConfigSaveDTO getReleaseConfig(Long releaseId) {
+        MsModuleConfig msModuleConfig = moduleConfigService.getByReleaseId(releaseId);
+        return CopyUtil.copyBeanNullable(msModuleConfig, MeterSphereModuleConfigSaveDTO::new);
+    }
+
+
+    public void saveRelease(MeterSphereModuleConfigSaveDTO dto) {
+        Long releaseId = dto.getReleaseId();
+        MsModuleConfig msModuleConfig = moduleConfigService.getByReleaseId(releaseId);
+        boolean save = false;
+        if (msModuleConfig == null) {
+            save = true;
+            msModuleConfig = new MsModuleConfig();
+        }
+        msModuleConfig.setModuleId(0L);
+        msModuleConfig.setReleaseId(releaseId);
+        msModuleConfig.setMsCoverModule(Booleans.TRUE);
+        msModuleConfig.setMsModuleId(dto.getMsModuleId());
+        msModuleConfig.setMsProjectId(dto.getMsProjectId());
+        msModuleConfig.setName(dto.getMsProjectName() + "/" + dto.getMsModuleName());
+        if (save) {
+            moduleConfigService.save(msModuleConfig);
+        } else {
+            moduleConfigService.update(msModuleConfig);
+        }
+    }
+
+    public void syncRelease(MeterSphereModuleConfigSaveDTO dto) {
+        Long releaseId = dto.getReleaseId();
+        try {
+            meterSpherePushService.pushRelease(releaseId);
+        } catch (Exception e) {
+            log.error("同步MeterSphere失败！", e);
+            throw new BizException("同步MeterSphere失败！");
+        }
+    }
+
     @Getter
     @AllArgsConstructor
     public static class SpaceNotConfigException extends Exception {
diff --git a/server/server-service/src/main/java/cn/torna/service/metersphere/MsModuleConfigService.java b/server/server-service/src/main/java/cn/torna/service/metersphere/MsModuleConfigService.java
index 20316aae..1a413485 100644
--- a/server/server-service/src/main/java/cn/torna/service/metersphere/MsModuleConfigService.java
+++ b/server/server-service/src/main/java/cn/torna/service/metersphere/MsModuleConfigService.java
@@ -15,4 +15,8 @@ public class MsModuleConfigService extends BaseLambdaService<MsModuleConfig, MsM
         return get(MsModuleConfig::getModuleId, moduleId);
     }
 
+    public MsModuleConfig getByReleaseId(Long releaseId) {
+        return get(MsModuleConfig::getReleaseId, releaseId);
+    }
+
 }
diff --git a/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleConfigSaveDTO.java b/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleConfigSaveDTO.java
index 9e959f86..f12d9596 100644
--- a/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleConfigSaveDTO.java
+++ b/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleConfigSaveDTO.java
@@ -13,6 +13,9 @@ public class MeterSphereModuleConfigSaveDTO {
     @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
     private Long moduleId;
 
+    @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
+    private Long releaseId;
+
     private String msModuleId;
 
     private String msModuleName;
diff --git a/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleDTO.java b/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleDTO.java
index decbfdf9..aaa4750e 100644
--- a/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleDTO.java
+++ b/server/server-service/src/main/java/cn/torna/service/metersphere/dto/MeterSphereModuleDTO.java
@@ -2,6 +2,8 @@ package cn.torna.service.metersphere.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author thc
  */
@@ -12,4 +14,9 @@ public class MeterSphereModuleDTO {
 
     private String name;
 
+    private List<MeterSphereModuleDTO> children;
+
+    private Integer level;
+
+    private Boolean leaf;
 }
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/third/MeterSphereController.java b/server/server-web/src/main/java/cn/torna/web/controller/third/MeterSphereController.java
index f2dd9e21..3857fb1f 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/third/MeterSphereController.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/third/MeterSphereController.java
@@ -96,4 +96,27 @@ public class MeterSphereController {
         return Result.ok();
     }
 
+    @PostMapping("/module/sync")
+    public Result<?> syncModule(@Valid @RequestBody MeterSphereModuleSaveParam param) {
+        meterSphereService.syncModule(CopyUtil.copyBean(param, MeterSphereModuleConfigSaveDTO::new));
+        return Result.ok();
+    }
+
+    @GetMapping("/release/load")
+    public Result<MeterSphereModuleConfigSaveDTO> loadRelease(@HashId Long releaseId) {
+        MeterSphereModuleConfigSaveDTO moduleConfig = meterSphereService.getReleaseConfig(releaseId);
+        return Result.ok(moduleConfig);
+    }
+
+    @PostMapping("/release/save")
+    public Result<?> saveRelease(@Valid @RequestBody MeterSphereModuleSaveParam param) {
+        meterSphereService.saveRelease(CopyUtil.copyBean(param, MeterSphereModuleConfigSaveDTO::new));
+        return Result.ok();
+    }
+
+    @PostMapping("/release/sync")
+    public Result<?> syncRelease(@Valid @RequestBody MeterSphereModuleSaveParam param) {
+        meterSphereService.syncRelease(CopyUtil.copyBean(param, MeterSphereModuleConfigSaveDTO::new));
+        return Result.ok();
+    }
 }
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/third/param/MeterSphereModuleSaveParam.java b/server/server-web/src/main/java/cn/torna/web/controller/third/param/MeterSphereModuleSaveParam.java
index 0ec751dd..141b8f00 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/third/param/MeterSphereModuleSaveParam.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/third/param/MeterSphereModuleSaveParam.java
@@ -13,6 +13,9 @@ public class MeterSphereModuleSaveParam {
     @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
     private Long moduleId;
 
+    @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
+    private Long releaseId;
+
     private String msModuleId;
 
     private String msModuleName;
-- 
Gitee