From fb0fc274b46d26084638ef911f65b628fcfbd155 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Thu, 2 Dec 2021 10:35:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8F=98=E6=9B=B4=E4=B8=BA=E5=8F=B3=E5=87=BB?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=90=8E=E7=AB=AF=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8D=8F=E7=A8=8Bpanic=E5=AF=BC=E8=87=B4=E8=BF=9B=E7=A8=8B?=
 =?UTF-8?q?=E9=80=80=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mayfly_go_web/src/views/ops/db/SqlExec.vue    |  27 +++-
 .../src/views/ops/machine/FileManage.vue      | 151 +++++++++--------
 .../src/views/ops/machine/MachineList.vue     |  13 +-
 mayfly_go_web/src/views/ops/machine/api.ts    |   1 +
 .../src/views/system/account/AccountList.vue  |   2 +-
 .../views/system/resource/ResourceList.vue    | 153 ++++++++++--------
 server/devops/api/db.go                       |   9 ++
 server/devops/api/machine_file.go             |  22 ++-
 server/devops/application/machine_file_app.go |  13 +-
 server/devops/router/machine_file.go          |   5 +-
 10 files changed, 230 insertions(+), 166 deletions(-)

diff --git a/mayfly_go_web/src/views/ops/db/SqlExec.vue b/mayfly_go_web/src/views/ops/db/SqlExec.vue
index 7278ed0f..899b2df1 100644
--- a/mayfly_go_web/src/views/ops/db/SqlExec.vue
+++ b/mayfly_go_web/src/views/ops/db/SqlExec.vue
@@ -96,7 +96,6 @@
 import { toRefs, reactive, computed, defineComponent, ref } from 'vue';
 import { dbApi } from './api';
 
-import 'codemirror/theme/ambiance.css';
 import 'codemirror/addon/hint/show-hint.css';
 // import base style
 import 'codemirror/lib/codemirror.css';
@@ -210,7 +209,13 @@ export default defineComponent({
             // 没有选中的文本，则为全部文本
             let sql = getSql();
             notNull(sql, '内容不能为空');
+            runSqlStr(sql);
+        };
 
+        /**
+         * 执行sql str
+         */
+        const runSqlStr = async (sql: string) => {
             state.execRes.tableColumn = [];
             state.execRes.data = [];
             state.execRes.emptyResText = '查询中...';
@@ -336,7 +341,7 @@ export default defineComponent({
                 // 赋值第一个表信息
                 if (state.tableMetadata.length > 0) {
                     state.tableName = state.tableMetadata[0]['tableName'];
-                    changeTable(state.tableName);
+                    changeTable(state.tableName, false);
                 }
             });
 
@@ -367,14 +372,22 @@ export default defineComponent({
         };
 
         // 选择表事件
-        const changeTable = async (tableName: string) => {
+        const changeTable = (tableName: string, execSelectSql: boolean = true) => {
             if (tableName == '') {
                 return;
             }
-            state.columnMetadata = await dbApi.columnMetadata.request({
-                id: state.dbId,
-                tableName: tableName,
-            });
+            dbApi.columnMetadata
+                .request({
+                    id: state.dbId,
+                    tableName: tableName,
+                })
+                .then((res) => {
+                    state.columnMetadata = res;
+                });
+
+            if (execSelectSql) {
+                runSqlStr(`SELECT * FROM ${tableName} ORDER BY create_time DESC LIMIT 25`);
+            }
         };
 
         /**
diff --git a/mayfly_go_web/src/views/ops/machine/FileManage.vue b/mayfly_go_web/src/views/ops/machine/FileManage.vue
index 80170f4c..f00f3c89 100755
--- a/mayfly_go_web/src/views/ops/machine/FileManage.vue
+++ b/mayfly_go_web/src/views/ops/machine/FileManage.vue
@@ -51,78 +51,89 @@
 
         <el-dialog :title="tree.title" v-model="tree.visible" :close-on-click-modal="false" width="680px">
             <div style="height: 45vh; overflow: auto">
-                <el-tree v-if="tree.visible" ref="fileTree" :load="loadNode" :props="props" lazy node-key="id" :expand-on-click-node="false">
+                <el-tree v-if="tree.visible" ref="fileTree" :load="loadNode" :props="props" lazy node-key="id" :expand-on-click-node="true">
                     <template #default="{ node, data }">
                         <span class="custom-tree-node">
-                            <span v-if="data.type == 'd' && !node.expanded">
-                                <i class="el-icon-folder"></i>
-                            </span>
-                            <span v-if="data.type == 'd' && node.expanded">
-                                <i class="el-icon-folder-opened"></i>
-                            </span>
-                            <span v-if="data.type == '-'">
-                                <i class="el-icon-document"></i>
-                            </span>
+                            <el-dropdown size="small" trigger="contextmenu">
+                                <span class="el-dropdown-link">
+                                    <span v-if="data.type == 'd' && !node.expanded">
+                                        <i class="el-icon-folder"></i>
+                                    </span>
+                                    <span v-if="data.type == 'd' && node.expanded">
+                                        <i class="el-icon-folder-opened"></i>
+                                    </span>
+                                    <span v-if="data.type == '-'">
+                                        <i class="el-icon-document"></i>
+                                    </span>
 
-                            <span style="display: inline-block; width: 430px">
-                                {{ node.label }}
-                                <span style="color: #67c23a" v-if="data.type == '-'">&nbsp;&nbsp;[{{ formatFileSize(data.size) }}]</span>
-                            </span>
+                                    <span style="display: inline-block">
+                                        {{ node.label }}
+                                        <span style="color: #67c23a" v-if="data.type == '-'">&nbsp;&nbsp;[{{ formatFileSize(data.size) }}]</span>
+                                    </span>
+                                </span>
 
-                            <span>
-                                <el-link
-                                    @click.prevent="getFileContent(tree.folder.id, data.path)"
-                                    v-if="data.type == '-' && data.size < 1 * 1024 * 1024"
-                                    type="info"
-                                    icon="el-icon-view"
-                                    :underline="false"
-                                />
-
-                                <el-upload
-                                :before-upload="beforeUpload"
-                                    :on-success="uploadSuccess"
-                                    :headers="{ token }"
-                                    :data="{
-                                        fileId: tree.folder.id,
-                                        path: data.path,
-                                        machineId: machineId,
-                                    }"
-                                    :action="getUploadFile({ path: data.path })"
-                                    :show-file-list="false"
-                                    name="file"
-                                    multiple
-                                    :limit="100"
-                                    style="display: inline-block; margin-left: 2px"
-                                >
-                                    <el-link
-                                        v-auth="'machine:file:upload'"
-                                        v-if="data.type == 'd'"
-                                        @click.prevent
-                                        icon="el-icon-upload"
-                                        :underline="false"
-                                    />
-                                </el-upload>
-
-                                <el-link
-                                    v-auth="'machine:file:write'"
-                                    v-if="data.type == '-'"
-                                    @click.prevent="downloadFile(node, data)"
-                                    type="danger"
-                                    icon="el-icon-download"
-                                    :underline="false"
-                                    style="margin-left: 2px"
-                                />
-
-                                <el-link
-                                    v-auth="'machine:file:rm'"
-                                    v-if="!dontOperate(data)"
-                                    @click.prevent="deleteFile(node, data)"
-                                    type="danger"
-                                    icon="el-icon-delete"
-                                    :underline="false"
-                                    style="margin-left: 2px"
-                                />
-                            </span>
+                                <template #dropdown>
+                                    <el-dropdown-menu>
+                                        <el-dropdown-item>
+                                            <el-link
+                                                @click.prevent="getFileContent(tree.folder.id, data.path)"
+                                                v-if="data.type == '-' && data.size < 1 * 1024 * 1024"
+                                                type="info"
+                                                icon="el-icon-view"
+                                                :underline="false"
+                                            >
+                                                查看
+                                            </el-link>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item v-if="data.type == 'd'">
+                                            <el-upload
+                                                :before-upload="beforeUpload"
+                                                :on-success="uploadSuccess"
+                                                :headers="{ token }"
+                                                :data="{
+                                                    fileId: tree.folder.id,
+                                                    path: data.path,
+                                                    machineId: machineId,
+                                                }"
+                                                :action="getUploadFile({ path: data.path })"
+                                                :show-file-list="false"
+                                                name="file"
+                                                multiple
+                                                :limit="100"
+                                                style="display: inline-block; margin-left: 2px"
+                                            >
+                                                <el-link v-auth="'machine:file:upload'" @click.prevent icon="el-icon-upload" :underline="false">
+                                                    上传
+                                                </el-link>
+                                            </el-upload>
+                                        </el-dropdown-item>
+                                        <el-dropdown-item>
+                                            <el-link
+                                                v-auth="'machine:file:write'"
+                                                v-if="data.type == '-'"
+                                                @click.prevent="downloadFile(node, data)"
+                                                type="primary"
+                                                icon="el-icon-download"
+                                                :underline="false"
+                                                style="margin-left: 2px"
+                                                >下载</el-link
+                                            >
+                                        </el-dropdown-item>
+                                        <el-dropdown-item>
+                                            <el-link
+                                                v-auth="'machine:file:rm'"
+                                                v-if="!dontOperate(data)"
+                                                @click.prevent="deleteFile(node, data)"
+                                                type="danger"
+                                                icon="el-icon-delete"
+                                                :underline="false"
+                                                style="margin-left: 2px"
+                                                >删除
+                                            </el-link>
+                                        </el-dropdown-item>
+                                    </el-dropdown-menu>
+                                </template>
+                            </el-dropdown>
                         </span>
                     </template>
                 </el-tree>
@@ -458,8 +469,8 @@ export default defineComponent({
         };
 
         const beforeUpload = (file: File) => {
-            ElMessage.success(`'${file.name}' 上传中,请关注结果通知`)
-        }
+            ElMessage.success(`'${file.name}' 上传中,请关注结果通知`);
+        };
 
         const dontOperate = (data: any) => {
             const path = data.path;
diff --git a/mayfly_go_web/src/views/ops/machine/MachineList.vue b/mayfly_go_web/src/views/ops/machine/MachineList.vue
index b3d43190..a06ddc16 100644
--- a/mayfly_go_web/src/views/ops/machine/MachineList.vue
+++ b/mayfly_go_web/src/views/ops/machine/MachineList.vue
@@ -48,19 +48,19 @@
                     </el-radio>
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="名称" width></el-table-column>
-            <el-table-column prop="ip" label="ip:port" min-width="160">
+            <el-table-column prop="name" label="名称" min-width="130"></el-table-column>
+            <el-table-column prop="ip" label="ip:port" min-width="130">
                 <template #default="scope">
                     {{ `${scope.row.ip}:${scope.row.port}` }}
                 </template>
             </el-table-column>
-            <el-table-column prop="ip" label="hasCli" min-width="60">
+            <el-table-column prop="ip" label="hasCli" width="70">
                 <template #default="scope">
                     {{ `${scope.row.hasCli ? '是' : '否'}` }}
                 </template>
             </el-table-column>
-            <el-table-column prop="username" label="用户名" :min-width="55"></el-table-column>
-            <el-table-column prop="createTime" label="创建时间" min-width="160">
+            <el-table-column prop="username" label="用户名" min-width="75"></el-table-column>
+            <el-table-column prop="createTime" label="创建时间" width="160">
                 <template #default="scope">
                     {{ $filters.dateFormat(scope.row.createTime) }}
                 </template>
@@ -72,9 +72,8 @@
                 </template>
             </el-table-column>
             <el-table-column prop="modifier" label="修改者" :min-width="55"></el-table-column> -->
-            <el-table-column label="操作" min-width="260">
+            <el-table-column label="操作" min-width="260" fixed="right">
                 <template #default="scope">
-                    <!-- <el-button type="primary" @click="monitor(scope.row.id)" icom="el-icon-tickets" size="mini" plain>监控</el-button> -->
                     <el-button type="success" @click="serviceManager(scope.row)" size="mini" plain>脚本</el-button>
                     <el-button v-auth="'machine:terminal'" type="primary" @click="showTerminal(scope.row)" size="mini" plain>终端</el-button>
                     <el-button :disabled="!scope.row.hasCli" type="danger" @click="closeCli(scope.row)" size="mini" plain>关闭连接</el-button>
diff --git a/mayfly_go_web/src/views/ops/machine/api.ts b/mayfly_go_web/src/views/ops/machine/api.ts
index 2167762c..c1d78441 100644
--- a/mayfly_go_web/src/views/ops/machine/api.ts
+++ b/mayfly_go_web/src/views/ops/machine/api.ts
@@ -4,6 +4,7 @@ export const machineApi = {
     // 获取权限列表
     list: Api.create("/machines", 'get'),
     info: Api.create("/machines/{id}/sysinfo", 'get'),
+    stats: Api.create("/machines/{id}/stats", 'get'),
     closeCli: Api.create("/machines/{id}/close-cli", 'delete'),
     // 保存按钮
     saveMachine: Api.create("/machines", 'post'),
diff --git a/mayfly_go_web/src/views/system/account/AccountList.vue b/mayfly_go_web/src/views/system/account/AccountList.vue
index 77d5bd43..f3ce9bae 100755
--- a/mayfly_go_web/src/views/system/account/AccountList.vue
+++ b/mayfly_go_web/src/views/system/account/AccountList.vue
@@ -126,7 +126,7 @@
                 :data="showResourceDialog.resources"
                 node-key="id"
                 :props="showResourceDialog.defaultProps"
-                :expand-on-click-node="false"
+                :expand-on-click-node="true"
             >
                 <template #default="{ node, data }">
                     <span class="custom-tree-node">
diff --git a/mayfly_go_web/src/views/system/resource/ResourceList.vue b/mayfly_go_web/src/views/system/resource/ResourceList.vue
index 7fdea034..a90af50d 100644
--- a/mayfly_go_web/src/views/system/resource/ResourceList.vue
+++ b/mayfly_go_web/src/views/system/resource/ResourceList.vue
@@ -2,7 +2,7 @@
     <div class="menu">
         <div class="toolbar">
             <div>
-                <span style="font-size: 14px"> <i class="el-icon-info"></i>红色字体表示禁用状态 </span>
+                <span style="font-size: 14px"> <i class="el-icon-info"></i>红色字体表示禁用状态,右击鼠标显示操作 </span>
             </div>
             <el-button v-auth="'resource:add'" type="primary" icon="el-icon-plus" size="mini" @click="addResource(false)">添加</el-button>
         </div>
@@ -15,74 +15,93 @@
             @node-expand="handleNodeExpand"
             @node-collapse="handleNodeCollapse"
             :default-expanded-keys="defaultExpandedKeys"
-            :expand-on-click-node="false"
+            :expand-on-click-node="true"
         >
             <template #default="{ data }">
                 <span class="custom-tree-node">
-                    <span style="font-size: 13px" v-if="data.type === enums.ResourceTypeEnum.MENU.value">
-                        <span style="color: #3c8dbc">【</span>
-                        {{ data.name }}
-                        <span style="color: #3c8dbc">】</span>
-                        <el-tag v-if="data.children !== null" size="mini">{{ data.children.length }}</el-tag>
-                    </span>
-                    <span style="font-size: 13px" v-if="data.type === enums.ResourceTypeEnum.PERMISSION.value">
-                        <span style="color: #3c8dbc">【</span>
-                        <span :style="data.status == 1 ? 'color: #67c23a;' : 'color: #f67c6c;'">{{ data.name }}</span>
-                        <span style="color: #3c8dbc">】</span>
-                    </span>
-
-                    <el-link @click.prevent="info(data)" style="margin-left: 25px" icon="el-icon-view" type="info" :underline="false" />
-
-                    <el-link
-                        v-auth="'resource:update'"
-                        @click.prevent="editResource(data)"
-                        class="ml5"
-                        type="primary"
-                        icon="el-icon-edit"
-                        :underline="false"
-                    />
-
-                    <el-link
-                        v-auth="'resource:add'"
-                        @click.prevent="addResource(data)"
-                        v-if="data.type === enums.ResourceTypeEnum.MENU.value"
-                        icon="el-icon-circle-plus-outline"
-                        :underline="false"
-                        type="success"
-                        class="ml5"
-                    />
-
-                    <el-link
-                        v-auth="'resource:changeStatus'"
-                        @click.prevent="changeStatus(data, -1)"
-                        v-if="data.status === 1 && data.type === enums.ResourceTypeEnum.PERMISSION.value"
-                        icon="el-icon-circle-close"
-                        :underline="false"
-                        type="warning"
-                        class="ml5"
-                    />
-
-                    <el-link
-                        v-auth="'resource:changeStatus'"
-                        @click.prevent="changeStatus(data, 1)"
-                        v-if="data.status === -1 && data.type === enums.ResourceTypeEnum.PERMISSION.value"
-                        type="success"
-                        icon="el-icon-circle-check"
-                        :underline="false"
-                        plain
-                        class="ml5"
-                    />
-
-                    <el-link
-                        v-auth="'resource:del'"
-                        v-if="data.children == null && data.name !== '首页'"
-                        @click.prevent="deleteMenu(data)"
-                        type="danger"
-                        icon="el-icon-remove-outline"
-                        :underline="false"
-                        plain
-                        class="ml5"
-                    />
+                    <el-dropdown size="mini" trigger="contextmenu">
+                        <span class="el-dropdown-link">
+                            <span style="font-size: 13px" v-if="data.type === enums.ResourceTypeEnum.MENU.value">
+                                <span style="color: #3c8dbc">【</span>
+                                {{ data.name }}
+                                <span style="color: #3c8dbc">】</span>
+                                <el-tag v-if="data.children !== null" size="mini">{{ data.children.length }}</el-tag>
+                            </span>
+                            <span style="font-size: 13px" v-if="data.type === enums.ResourceTypeEnum.PERMISSION.value">
+                                <span style="color: #3c8dbc">【</span>
+                                <span :style="data.status == 1 ? 'color: #67c23a;' : 'color: #f67c6c;'">{{ data.name }}</span>
+                                <span style="color: #3c8dbc">】</span>
+                            </span>
+                        </span>
+                        <template #dropdown>
+                            <el-dropdown-menu>
+                                <el-dropdown-item>
+                                    <el-link @click.prevent="info(data)" icon="el-icon-view" type="info" :underline="false">查看</el-link>
+                                </el-dropdown-item>
+                                <el-dropdown-item>
+                                    <el-link
+                                        v-auth="'resource:update'"
+                                        @click.prevent="editResource(data)"
+                                        type="primary"
+                                        icon="el-icon-edit"
+                                        :underline="false"
+                                    >
+                                        修改
+                                    </el-link>
+                                </el-dropdown-item>
+                                <el-dropdown-item>
+                                    <el-link
+                                        v-auth="'resource:add'"
+                                        @click.prevent="addResource(data)"
+                                        v-if="data.type === enums.ResourceTypeEnum.MENU.value"
+                                        icon="el-icon-circle-plus-outline"
+                                        :underline="false"
+                                        type="success"
+                                    >
+                                        新增
+                                    </el-link></el-dropdown-item
+                                >
+                                <el-dropdown-item>
+                                    <el-link
+                                        v-auth="'resource:changeStatus'"
+                                        @click.prevent="changeStatus(data, -1)"
+                                        v-if="data.status === 1 && data.type === enums.ResourceTypeEnum.PERMISSION.value"
+                                        icon="el-icon-circle-close"
+                                        :underline="false"
+                                        type="warning"
+                                    >
+                                        禁用
+                                    </el-link>
+                                </el-dropdown-item>
+                                <el-dropdown-item>
+                                    <el-link
+                                        v-auth="'resource:changeStatus'"
+                                        @click.prevent="changeStatus(data, 1)"
+                                        v-if="data.status === -1 && data.type === enums.ResourceTypeEnum.PERMISSION.value"
+                                        type="success"
+                                        icon="el-icon-circle-check"
+                                        :underline="false"
+                                        plain
+                                    >
+                                        启用
+                                    </el-link>
+                                </el-dropdown-item>
+                                <el-dropdown-item>
+                                    <el-link
+                                        v-auth="'resource:del'"
+                                        v-if="data.children == null && data.name !== '首页'"
+                                        @click.prevent="deleteMenu(data)"
+                                        type="danger"
+                                        icon="el-icon-remove-outline"
+                                        :underline="false"
+                                        plain
+                                    >
+                                        删除
+                                    </el-link>
+                                </el-dropdown-item>
+                            </el-dropdown-menu>
+                        </template>
+                    </el-dropdown>
                 </span>
             </template>
         </el-tree>
@@ -201,7 +220,7 @@ export default defineComponent({
                         id: data.id,
                     })
                     .then((res) => {
-                        console.log(res)
+                        console.log(res);
                         ElMessage.success('删除成功！');
                         search();
                     });
diff --git a/server/devops/api/db.go b/server/devops/api/db.go
index f122eeb4..32f4f00e 100644
--- a/server/devops/api/db.go
+++ b/server/devops/api/db.go
@@ -117,6 +117,15 @@ func (d *Db) ExecSqlFile(rc *ctx.ReqCtx) {
 	dbId := GetDbId(g)
 
 	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				switch t := err.(type) {
+				case *biz.BizError:
+					d.MsgApp.CreateAndSend(rc.LoginAccount, ws.ErrMsg("sql脚本执行失败", fmt.Sprintf("[%s]执行失败: [%s]", filename, t.Error())))
+				}
+			}
+		}()
+
 		db := d.DbApp.GetDbInstance(dbId)
 		for _, sql := range sqls {
 			sql = strings.Trim(sql, " ")
diff --git a/server/devops/api/machine_file.go b/server/devops/api/machine_file.go
index a4824cd3..f3164e8b 100644
--- a/server/devops/api/machine_file.go
+++ b/server/devops/api/machine_file.go
@@ -8,10 +8,12 @@ import (
 	"mayfly-go/base/ctx"
 	"mayfly-go/base/ginx"
 	"mayfly-go/base/utils"
+	"mayfly-go/base/ws"
 	"mayfly-go/server/devops/api/form"
 	"mayfly-go/server/devops/api/vo"
 	"mayfly-go/server/devops/application"
 	"mayfly-go/server/devops/domain/entity"
+	sysApplication "mayfly-go/server/sys/application"
 	"strconv"
 	"strings"
 
@@ -21,6 +23,7 @@ import (
 type MachineFile struct {
 	MachineFileApp application.MachineFile
 	MachineApp     application.Machine
+	MsgApp         sysApplication.Msg
 }
 
 const (
@@ -125,9 +128,24 @@ func (m *MachineFile) UploadFile(rc *ctx.ReqCtx) {
 
 	file, _ := fileheader.Open()
 	bytes, _ := ioutil.ReadAll(file)
-	go m.MachineFileApp.UploadFile(rc.LoginAccount, fid, path, fileheader.Filename, bytes)
-
 	rc.ReqParam = fmt.Sprintf("path: %s", path)
+
+	la := rc.LoginAccount
+	go func() {
+		defer func() {
+			if err := recover(); err != nil {
+				switch t := err.(type) {
+				case *biz.BizError:
+					m.MsgApp.CreateAndSend(la, ws.ErrMsg("文件上传失败", fmt.Sprintf("执行文件上传失败：\n<-e errCode: %d, errMsg: %s", t.Code(), t.Error())))
+				}
+			}
+		}()
+
+		m.MachineFileApp.UploadFile(fid, path, fileheader.Filename, bytes)
+		// 保存消息并发送文件上传成功通知
+		machine := m.MachineApp.GetById(m.MachineFileApp.GetById(fid).MachineId)
+		m.MsgApp.CreateAndSend(la, ws.SuccessMsg("文件上传成功", fmt.Sprintf("[%s]文件已成功上传至 %s[%s:%s]", fileheader.Filename, machine.Name, machine.Ip, path)))
+	}()
 }
 
 func (m *MachineFile) RemoveFile(rc *ctx.ReqCtx) {
diff --git a/server/devops/application/machine_file_app.go b/server/devops/application/machine_file_app.go
index ccdfdcb8..8afb84d5 100644
--- a/server/devops/application/machine_file_app.go
+++ b/server/devops/application/machine_file_app.go
@@ -1,17 +1,14 @@
 package application
 
 import (
-	"fmt"
 	"io"
 	"io/fs"
 	"io/ioutil"
 	"mayfly-go/base/biz"
 	"mayfly-go/base/model"
-	"mayfly-go/base/ws"
 	"mayfly-go/server/devops/domain/entity"
 	"mayfly-go/server/devops/domain/repository"
 	"mayfly-go/server/devops/infrastructure/persistence"
-	sysApplication "mayfly-go/server/sys/application"
 	"os"
 	"strings"
 
@@ -44,7 +41,7 @@ type MachineFile interface {
 	WriteFileContent(fileId uint64, path string, content []byte)
 
 	// 文件上传
-	UploadFile(la *model.LoginAccount, fileId uint64, path, filename string, content []byte)
+	UploadFile(fileId uint64, path, filename string, content []byte)
 
 	// 移除文件
 	RemoveFile(fileId uint64, path string)
@@ -53,14 +50,12 @@ type MachineFile interface {
 type machineFileAppImpl struct {
 	machineFileRepo repository.MachineFile
 	machineRepo     repository.Machine
-	msgApp          sysApplication.Msg
 }
 
 // 实现类单例
 var MachineFileApp MachineFile = &machineFileAppImpl{
 	machineRepo:     persistence.MachineDao,
 	machineFileRepo: persistence.MachineFileDao,
-	msgApp:          sysApplication.MsgApp,
 }
 
 // 分页获取机器脚本信息列表
@@ -138,7 +133,7 @@ func (m *machineFileAppImpl) WriteFileContent(fileId uint64, path string, conten
 }
 
 // 上传文件
-func (m *machineFileAppImpl) UploadFile(la *model.LoginAccount, fileId uint64, path, filename string, content []byte) {
+func (m *machineFileAppImpl) UploadFile(fileId uint64, path, filename string, content []byte) {
 	path, machineId := m.checkAndReturnPathMid(fileId, path)
 	if !strings.HasSuffix(path, "/") {
 		path = path + "/"
@@ -150,10 +145,6 @@ func (m *machineFileAppImpl) UploadFile(la *model.LoginAccount, fileId uint64, p
 	defer createfile.Close()
 
 	createfile.Write(content)
-	// 保存消息并发送文件上传成功通知
-	machine := m.machineRepo.GetById(machineId)
-	m.msgApp.CreateAndSend(la, ws.SuccessMsg("文件上传成功", fmt.Sprintf("[%s]文件已成功上传至 %s[%s:%s]", filename, machine.Name, machine.Ip, path)))
-
 }
 
 // 删除文件
diff --git a/server/devops/router/machine_file.go b/server/devops/router/machine_file.go
index 0d4c3c6a..cdf4e161 100644
--- a/server/devops/router/machine_file.go
+++ b/server/devops/router/machine_file.go
@@ -4,6 +4,7 @@ import (
 	"mayfly-go/base/ctx"
 	"mayfly-go/server/devops/api"
 	"mayfly-go/server/devops/application"
+	sysApplication "mayfly-go/server/sys/application"
 
 	"github.com/gin-gonic/gin"
 )
@@ -13,7 +14,9 @@ func InitMachineFileRouter(router *gin.RouterGroup) {
 	{
 		mf := &api.MachineFile{
 			MachineFileApp: application.MachineFileApp,
-			MachineApp:     application.MachineApp}
+			MachineApp:     application.MachineApp,
+			MsgApp:         sysApplication.MsgApp,
+		}
 
 		// 获取指定机器文件列表
 		machineFile.GET(":machineId/files", func(c *gin.Context) {