From df0ac930428cd04302ce4e2c5ff2efd44ad594ac Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 30 Mar 2022 16:22:11 +0800
Subject: [PATCH 1/4] bug 28688

---
 project/xiushan/apps/AppMassMessage/mmDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/AppMassMessage/mmDetail.vue b/project/xiushan/apps/AppMassMessage/mmDetail.vue
index e12320f1..15bc1c88 100644
--- a/project/xiushan/apps/AppMassMessage/mmDetail.vue
+++ b/project/xiushan/apps/AppMassMessage/mmDetail.vue
@@ -36,7 +36,7 @@
                   <div class="rightText" v-text="`留言时间：${op.createTime}`"/>
                 </div>
               </div>
-              <ai-empty v-if="!detail.appLeaveMessageReplyList"/>
+              <ai-empty v-if="detail.appLeaveMessageReplyList.length==0"/>
             </template>
           </ai-card>
         </el-form>

From 395bc26bb1579aadd11d25c078231e6990d1cc68 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 30 Mar 2022 17:17:01 +0800
Subject: [PATCH 2/4] BUG 28495

---
 project/xiushan/apps/AppVideoPublic/vpAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/AppVideoPublic/vpAdd.vue b/project/xiushan/apps/AppVideoPublic/vpAdd.vue
index e125c4d6..b7b624dd 100644
--- a/project/xiushan/apps/AppVideoPublic/vpAdd.vue
+++ b/project/xiushan/apps/AppVideoPublic/vpAdd.vue
@@ -73,7 +73,7 @@ export default {
   data() {
     return {
       dialog: false,
-      form: {videoUrl: "", thumbUrl: ""},
+      form: {videoUrl: "", thumbUrl: "", title: ""},
       accept: ".mp4"
     }
   },

From 5478611712a8c9cabb76ce242fba5a993e2aacc7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 30 Mar 2022 19:20:44 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                 |   6 +-
 project/oms/apps/AppDeploy/AppDeploy.vue | 129 +++++++++++++++++++++++
 vue.config.js                            |   8 ++
 3 files changed, 141 insertions(+), 2 deletions(-)
 create mode 100644 project/oms/apps/AppDeploy/AppDeploy.vue

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 09c44703..76e20ca9 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -9,10 +9,12 @@ let baseURLs = {
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.eject(0);
 instance.interceptors.request.use(config => {
-  if (/\/xiushan/.test(location.pathname)) {
+  if (config.url.startsWith("/node")) {
+    config.baseURL = "/ns"
+  } else if (/\/xiushan/.test(location.pathname)) {
     config.baseURL = "/xsjr"
     config.url = config.url.replace(/(app|auth|admin)\//, "")
-  }else if (/project\/oms/.test(location.pathname)) {
+  } else if (/project\/oms/.test(location.pathname)) {
     config.baseURL = "/omsapi"
     config.url = config.url.replace(/(app|auth|admin)\//, "")
   }
diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
new file mode 100644
index 00000000..cd41b706
--- /dev/null
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -0,0 +1,129 @@
+<template>
+  <section class="AppDeploy">
+    <ai-list>
+      <ai-title slot="title" title="部署发布" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">增加</el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              <el-button type="text" @click="handleDownload(row)">下载部署包</el-button>
+              <el-button v-if="row.target" type="text" @click="handleDownload(row)">部署</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" title="部署任务设置" width="600px" @close="form={}" @onConfirm="submit">
+      <el-form ref="DialogForm" :model="form" size="small" label-width="100px" :rules="rules">
+        <!-- 首页封面 -->
+        <el-form-item label="项目/系统" prop="name">
+          <el-input v-model="form.name" clearable placeholder="请输入"/>
+        </el-form-item>
+        <el-form-item label="git" prop="git">
+          <el-input v-model="form.git" clearable placeholder="请输入"/>
+        </el-form-item>
+        <el-form-item label="生产环境" prop="target">
+          <el-input v-model="form.target" clearable placeholder="请输入"/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "AppDeploy",
+  label: "部署发布",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  data() {
+    return {
+      search: {name: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "项目/系统名称", prop: "name"},
+        {label: "git", prop: "git"},
+        {label: "生产服务器", prop: "target", width: 100},
+        {slot: "options"}
+      ],
+      dialog: false,
+      form: {},
+      rules: {
+        name: {required: true, message: "请输入项目/系统名称"},
+        git: {required: true, message: "请输入git"},
+      }
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/node/autodeploy/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    handleDownload(row) {
+
+    },
+    handleEdit(row) {
+      this.form = JSON.parse(JSON.stringify(row))
+      this.dialog = true
+    },
+    submit() {
+      this.$refs.DialogForm.validate(v => {
+        if (v) {
+          this.instance.post("/node/autodeploy/addOrUpdate", this.form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功")
+              this.getTableData()
+              this.dialog = false
+            }
+          })
+        }
+      })
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该项目/系统?").then(() => {
+        this.instance.post("/node/autodeploy/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    }
+  },
+  created() {
+    this.getTableData()
+    this.search.areaId = this.user.info.areaId
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppDeploy {
+  height: 100%;
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 3081d842..f365a93e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -79,6 +79,14 @@ module.exports = {
           '^/omsapi': '/'
         }
       },
+      '/ns': {
+        target: 'http://localhost:12525',
+        changeOrigin: true,
+        pathRewrite: {
+          //地址重写
+          '^/ns': '/'
+        }
+      },
       '/xsjr': {
         target: 'http://192.168.1.87:39898',
         changeOrigin: true,

From 4675ebf883b661f4ec2c0eac0fa624ee5dc2c318 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 31 Mar 2022 09:08:03 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8A=A0=E5=85=A5git=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index cd41b706..1f639e46 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -23,13 +23,15 @@
     </ai-list>
     <ai-dialog :visible.sync="dialog" title="部署任务设置" width="600px" @close="form={}" @onConfirm="submit">
       <el-form ref="DialogForm" :model="form" size="small" label-width="100px" :rules="rules">
-        <!-- 首页封面 -->
         <el-form-item label="项目/系统" prop="name">
           <el-input v-model="form.name" clearable placeholder="请输入"/>
         </el-form-item>
         <el-form-item label="git" prop="git">
           <el-input v-model="form.git" clearable placeholder="请输入"/>
         </el-form-item>
+        <el-form-item label="git分支" prop="branch">
+          <el-input v-model="form.branch" clearable placeholder="请输入"/>
+        </el-form-item>
         <el-form-item label="生产环境" prop="target">
           <el-input v-model="form.target" clearable placeholder="请输入"/>
         </el-form-item>
@@ -60,6 +62,7 @@ export default {
       colConfigs: [
         {label: "项目/系统名称", prop: "name"},
         {label: "git", prop: "git"},
+        {label: "git分支", prop: "branch"},
         {label: "生产服务器", prop: "target", width: 100},
         {slot: "options"}
       ],
@@ -68,6 +71,7 @@ export default {
       rules: {
         name: {required: true, message: "请输入项目/系统名称"},
         git: {required: true, message: "请输入git"},
+        branch: {required: true, message: "请输入 git分支"},
       }
     }
   },