feat: 新增linux文件上传成功后websocket通知

server/devops/api/machine.go

@@ -5,26 +5,18 @@ 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"
 	"mayfly-go/server/devops/infrastructure/machine"
-	"net/http"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"
 )
 
-var WsUpgrader = websocket.Upgrader{
-	ReadBufferSize:  1024,
-	WriteBufferSize: 1024 * 1024 * 10,
-	CheckOrigin: func(r *http.Request) bool {
-		return true
-	},
-}
-
 type Machine struct {
 	MachineApp application.Machine
 }
@@ -62,7 +54,7 @@ func (m *Machine) CloseCli(rc *ctx.ReqCtx) {
 }
 
 func (m *Machine) WsSSH(g *gin.Context) {
-	wsConn, err := WsUpgrader.Upgrade(g.Writer, g.Request, nil)
+	wsConn, err := ws.Upgrader.Upgrade(g.Writer, g.Request, nil)
 	defer func() {
 		if err := recover(); err != nil {
 			wsConn.WriteMessage(websocket.TextMessage, []byte(err.(error).Error()))
@@ -79,9 +71,9 @@ func (m *Machine) WsSSH(g *gin.Context) {
 		panic(biz.NewBizErr("没有权限"))
 	}
 	// 演示环境禁止非admin用户执行
-	if rc.LoginAccount.Username != "admin" {
-		panic(biz.NewBizErrCode(401, "非admin用户无权该操作"))
-	}
+	// if rc.LoginAccount.Username != "admin" {
+	// 	panic(biz.NewBizErrCode(401, "非admin用户无权该操作"))
+	// }
 
 	cols := ginx.QueryInt(g, "cols", 80)
 	rows := ginx.QueryInt(g, "rows", 40)

server/devops/api/machine_file.go

@@ -8,6 +8,7 @@ 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"
@@ -121,10 +122,12 @@ func (m *MachineFile) UploadFile(rc *ctx.ReqCtx) {
 	path := g.PostForm("path")
 	fileheader, err := g.FormFile("file")
 	biz.ErrIsNilAppendErr(err, "读取文件失败: %s")
+	// 通知正在上传
+	ws.SendMsg(rc.LoginAccount.Id, ws.NewMsg("文件上传", "文件上传中..."))
 
 	file, _ := fileheader.Open()
-	bytes, err := ioutil.ReadAll(file)
-	go m.MachineFileApp.UploadFile(fid, path, fileheader.Filename, bytes)
+	bytes, _ := ioutil.ReadAll(file)
+	go m.MachineFileApp.UploadFile(rc.LoginAccount, fid, path, fileheader.Filename, bytes)
 
 	rc.ReqParam = fmt.Sprintf("path: %s", path)
 }

server/devops/application/machine_file_app.go

@@ -1,14 +1,17 @@
 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"
 
@@ -41,7 +44,7 @@ type MachineFile interface {
 	WriteFileContent(fileId uint64, path string, content []byte)
 
 	// 文件上传
-	UploadFile(fileId uint64, path, filename string, content []byte)
+	UploadFile(la *model.LoginAccount, fileId uint64, path, filename string, content []byte)
 
 	// 移除文件
 	RemoveFile(fileId uint64, path string)
@@ -50,12 +53,14 @@ 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,
 }
 
 // 分页获取机器脚本信息列表
@@ -133,7 +138,7 @@ func (m *machineFileAppImpl) WriteFileContent(fileId uint64, path string, conten
 }
 
 // 上传文件
-func (m *machineFileAppImpl) UploadFile(fileId uint64, path, filename string, content []byte) {
+func (m *machineFileAppImpl) UploadFile(la *model.LoginAccount, fileId uint64, path, filename string, content []byte) {
 	path, machineId := m.checkAndReturnPathMid(fileId, path)
 	if !strings.HasSuffix(path, "/") {
 		path = path + "/"
@@ -145,6 +150,9 @@ func (m *machineFileAppImpl) UploadFile(fileId uint64, path, filename string, co
 	defer createfile.Close()
 
 	createfile.Write(content)
+	// 保存消息并发送文件上传成功通知
+	m.msgApp.CreateAndSend(la, ws.SuccessMsg("文件上传", fmt.Sprintf("[%s]文件已成功上传至[%s]", filename, path)))
+
 }
 
 // 删除文件

server/devops/router/db.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/devops/router/machine.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"
@@ -10,31 +10,31 @@ import (
 
 func InitMachineRouter(router *gin.RouterGroup) {
 	m := &api.Machine{MachineApp: application.MachineApp}
-	db := router.Group("machines")
+	machines := router.Group("machines")
 	{
-		db.GET("", func(c *gin.Context) {
+		machines.GET("", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).Handle(m.Machines)
 		})
 
 		saveMachine := ctx.NewLogInfo("保存机器信息")
-		db.POST("", func(c *gin.Context) {
+		machines.POST("", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).
 				WithLog(saveMachine).
 				Handle(m.SaveMachine)
 		})
 
 		delMachine := ctx.NewLogInfo("删除机器")
-		db.DELETE(":machineId", func(c *gin.Context) {
+		machines.DELETE(":machineId", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).
 				WithLog(delMachine).
 				Handle(m.DeleteMachine)
 		})
 
 		closeCli := ctx.NewLogInfo("关闭机器客户端")
-		db.DELETE(":machineId/close-cli", func(c *gin.Context) {
+		machines.DELETE(":machineId/close-cli", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).WithLog(closeCli).Handle(m.CloseCli)
 		})
 
-		db.GET(":machineId/terminal", m.WsSSH)
+		machines.GET(":machineId/terminal", m.WsSSH)
 	}
 }

server/devops/router/machine_file.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/devops/router/machine_script.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/devops/router/project.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"
@@ -49,7 +49,7 @@ func InitProjectRouter(router *gin.RouterGroup) {
 		})
 
 		saveProjectEnvLog := ctx.NewLogInfo("新增项目环境信息")
-		savePeP := ctx.NewPermission("project:env:save")
+		savePeP := ctx.NewPermission("project:env:add")
 		// 保存项目下的环境信息
 		project.POST("/:projectId/envs", func(c *gin.Context) {
 			ctx.NewReqCtxWithGin(c).WithLog(saveProjectEnvLog).

server/devops/router/redis.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/initialize/router.go

@@ -53,6 +53,7 @@ func InitRouter() *gin.Engine {
 		sys_router.InitAccountRouter(api) // 注册account路由
 		sys_router.InitResourceRouter(api)
 		sys_router.InitRoleRouter(api)
+		sys_router.InitSystemRouter(api)
 
 		devops_router.InitProjectRouter(api)
 		devops_router.InitDbRouter(api)

server/sys/api/account.go

@@ -6,8 +6,6 @@ import (
 	"mayfly-go/base/captcha"
 	"mayfly-go/base/ctx"
 	"mayfly-go/base/ginx"
-	"mayfly-go/base/global"
-	"mayfly-go/base/httpclient"
 	"mayfly-go/base/utils"
 	"mayfly-go/server/sys/api/form"
 	"mayfly-go/server/sys/api/vo"
@@ -89,16 +87,16 @@ func (a *Account) saveLogin(account *entity.Account, ip string) {
 	loginMsg.CreatorId = account.Id
 	a.MsgApp.Create(loginMsg)
 
-	bodyMap, err := httpclient.NewRequest(fmt.Sprintf("http://ip-api.com/json/%s?lang=zh-CN", ip)).Get().BodyToMap()
-	if err != nil {
-		global.Log.Errorf("获取客户端ip地址信息失败：%s", err.Error())
-		return
-	}
-	if bodyMap["status"].(string) == "fail" {
-		return
-	}
-	msg := fmt.Sprintf("%s于%s-%s登录", account.Username, bodyMap["regionName"], bodyMap["city"])
-	global.Log.Info(msg)
+	// bodyMap, err := httpclient.NewRequest(fmt.Sprintf("http://ip-api.com/json/%s?lang=zh-CN", ip)).Get().BodyToMap()
+	// if err != nil {
+	// 	global.Log.Errorf("获取客户端ip地址信息失败：%s", err.Error())
+	// 	return
+	// }
+	// if bodyMap["status"].(string) == "fail" {
+	// 	return
+	// }
+	// msg := fmt.Sprintf("%s于%s-%s登录", account.Username, bodyMap["regionName"], bodyMap["city"])
+	// global.Log.Info(msg)
 }
 
 // 获取个人账号信息

server/sys/api/system.go

@@ -0,0 +1,36 @@
+package api
+
+import (
+	"mayfly-go/base/biz"
+	"mayfly-go/base/ctx"
+	"mayfly-go/base/ws"
+
+	"github.com/gin-gonic/gin"
+	"github.com/gorilla/websocket"
+)
+
+type System struct {
+}
+
+// 连接websocket
+func (s *System) ConnectWs(g *gin.Context) {
+	wsConn, err := ws.Upgrader.Upgrade(g.Writer, g.Request, nil)
+	defer func() {
+		if err := recover(); err != nil {
+			wsConn.WriteMessage(websocket.TextMessage, []byte(err.(error).Error()))
+			wsConn.Close()
+		}
+	}()
+
+	if err != nil {
+		panic(biz.NewBizErr("升级websocket失败"))
+	}
+	// 权限校验
+	rc := ctx.NewReqCtxWithGin(g)
+	if err = ctx.PermissionHandler(rc); err != nil {
+		panic(biz.NewBizErr("没有权限"))
+	}
+	// 登录账号信息
+	la := rc.LoginAccount
+	ws.Put(la.Id, wsConn)
+}

server/sys/application/msg_app.go

@@ -2,15 +2,20 @@ package application
 
 import (
 	"mayfly-go/base/model"
+	"mayfly-go/base/ws"
 	"mayfly-go/server/sys/domain/entity"
 	"mayfly-go/server/sys/domain/repository"
 	"mayfly-go/server/sys/infrastructure/persistence"
+	"time"
 )
 
 type Msg interface {
 	GetPageList(condition *entity.Msg, pageParam *model.PageParam, toEntity interface{}, orderBy ...string) *model.PageResult
 
 	Create(msg *entity.Msg)
+
+	// 创建消息，并通过ws发送
+	CreateAndSend(la *model.LoginAccount, msg *ws.Msg)
 }
 
 type msgAppImpl struct {
@@ -28,3 +33,10 @@ func (a *msgAppImpl) GetPageList(condition *entity.Msg, pageParam *model.PagePar
 func (a *msgAppImpl) Create(msg *entity.Msg) {
 	a.msgRepo.Insert(msg)
 }
+
+func (a *msgAppImpl) CreateAndSend(la *model.LoginAccount, wmsg *ws.Msg) {
+	now := time.Now()
+	msg := &entity.Msg{Type: 2, Msg: wmsg.Msg, RecipientId: int64(la.Id), CreateTime: &now, CreatorId: la.Id, Creator: la.Username}
+	a.msgRepo.Insert(msg)
+	ws.SendMsg(la.Id, wmsg)
+}

server/sys/router/account.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/sys/router/captcha.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/sys/router/resource.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/sys/router/role.go

@@ -1,4 +1,4 @@
-package routers
+package router
 
 import (
 	"mayfly-go/base/ctx"

server/sys/router/system.go

@@ -0,0 +1,16 @@
+package router
+
+import (
+	"mayfly-go/server/sys/api"
+
+	"github.com/gin-gonic/gin"
+)
+
+func InitSystemRouter(router *gin.RouterGroup) {
+	s := &api.System{}
+	sys := router.Group("sysmsg")
+
+	{
+		sys.GET("", s.ConnectWs)
+	}
+}