From 39e9f15def7e086a5fa89a43b810f1c63c0c8346 Mon Sep 17 00:00:00 2001
From: "meilin.huang" <954537473@qq.com>
Date: Wed, 24 Mar 2021 17:18:39 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9B=AE=E5=BD=95=E5=8F=8A=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/launch.json | 2 +-
base/{model => biz}/assert.go | 9 +-
base/biz/bizerror.go | 41 +++
base/controller.go | 92 ++---
base/ctx/login_account.go | 3 +
base/ctx/req_ctx.go | 62 ++++
base/ctx/req_log_handler.go | 86 +++++
base/ctx/req_permission_handler.go | 29 ++
base/{token => ctx}/token.go | 12 +-
base/mlog/mlog.go | 37 ++
base/model/bizerror.go | 27 --
base/model/model.go | 9 +-
base/model/model_test.go | 72 ----
base/rediscli/rediscli.go | 64 ++++
base/utils/yml/yml.go | 22 ++
{conf => devops/conf}/app.conf | 4 +-
.../controllers}/account.go | 14 +-
{controllers => devops/controllers}/db.go | 43 ++-
.../controllers}/form/form.go | 0
.../controllers}/machine.go | 37 +-
{controllers => devops/controllers}/vo/db.go | 0
{controllers => devops/controllers}/vo/vo.go | 0
{db => devops/db}/db.go | 10 +-
{db => devops/db}/metadata.go | 0
devops/lastupdate.tmp | 1 +
{machine => devops/machine}/machine.go | 8 +-
{machine => devops/machine}/machine_test.go | 0
{machine => devops/machine}/shell.go | 6 +-
.../machine}/shell/get_process_by_name.sh | 0
{machine => devops/machine}/shell/monitor.sh | 0
{machine => devops/machine}/shell/sys_info.sh | 0
.../machine}/shell/system_info.sh | 0
{machine => devops/machine}/status.go | 4 +-
devops/machine/ws_shell_session.go | 212 +++++++++++
main.go => devops/main.go | 8 +-
{models => devops/models}/account.go | 2 +-
{models => devops/models}/db.go | 0
{models => devops/models}/db_sql.go | 0
{models => devops/models}/machine.go | 2 +-
{models => devops/models}/machine_monitor.go | 0
{models => devops/models}/role.go | 0
.../routers}/commentsRouter_controllers.go | 20 +-
{routers => devops/routers}/router.go | 2 +-
{scheudler => devops/scheudler}/mytask.go | 11 +-
{scheudler => devops/scheudler}/scheduler.go | 4 +-
{static => devops/static}/favicon.ico | Bin
{static => devops/static}/index.html | 0
.../static}/static/css/app.e8323368.css | 0
.../static/css/chunk-6c422708.2d81c5bb.css | 0
.../static/css/chunk-vendors.08810481.css | 0
.../static/fonts/element-icons.535877f5.woff | Bin
.../static/fonts/element-icons.732389de.ttf | Bin
.../static}/static/img/logo.e92f231a.png | Bin
.../static}/static/js/app.aa8651f8.js | 0
.../static/js/chunk-4a3c1aef.94cc2a02.js | 0
.../static/js/chunk-6c422708.a09466dd.js | 0
.../static/js/chunk-945da412.570aca5d.js | 0
.../static/js/chunk-vendors.a6a99ea9.js | 0
go.mod | 5 +-
go.sum | 35 +-
mayfly-go-front/.env.production | 2 +-
mayfly-go-front/package.json | 1 +
mayfly-go-front/src/common/Utils.ts | 72 ++++
mayfly-go-front/src/common/request.ts | 4 +-
.../components/dynamic-form/DynamicForm.vue | 5 +-
mayfly-go-front/src/layout/Layout.vue | 18 +-
mayfly-go-front/src/router/index.ts | 23 +-
mayfly-go-front/src/views/db/SelectData.vue | 3 +-
.../src/views/machine/MachineList.vue | 26 +-
mayfly-go-front/src/views/machine/Monitor.vue | 5 +-
.../src/views/machine/ServiceManage.vue | 345 ++++++++++++++++++
.../src/views/machine/SshTerminal.vue | 32 +-
.../src/views/mock-server/MockDataEdit.vue | 236 ++++++++++++
.../src/views/mock-server/MockDataList.vue | 244 +++++++++++++
mayfly-go-front/src/views/mock-server/api.ts | 9 +
.../src/views/mock-server/index.ts | 1 +
mock-server/conf/app.conf | 21 ++
mock-server/config.yml | 3 +
mock-server/controllers/form/form.go | 23 ++
mock-server/controllers/machine.go | 127 +++++++
mock-server/controllers/mock.go | 78 ++++
mock-server/lastupdate.tmp | 1 +
mock-server/machine/machine.go | 192 ++++++++++
mock-server/machine/machine_test.go | 142 +++++++
mock-server/machine/shell.go | 34 ++
.../machine/shell/get_process_by_name.sh | 23 ++
mock-server/machine/shell/monitor.sh | 13 +
mock-server/machine/shell/sys_info.sh | 192 ++++++++++
mock-server/machine/shell/system_info.sh | 41 +++
mock-server/machine/status.go | 105 ++++++
.../machine}/ws_shell_session.go | 1 -
mock-server/main.go | 95 +++++
mock-server/mock-server | Bin 0 -> 21648578 bytes
mock-server/models/machine.go | 37 ++
.../routers/commentsRouter_controllers.go | 55 +++
mock-server/routers/router.go | 17 +
mock-server/static/favicon.ico | Bin 0 -> 4286 bytes
mock-server/static/index.html | 1 +
.../static/static/css/app.b4088619.css | 1 +
.../static/css/chunk-09c3f704.f03c28a3.css | 1 +
.../static/css/chunk-589cf4a2.676f6792.css | 1 +
.../static/css/chunk-76193938.2d81c5bb.css | 1 +
.../static/css/chunk-7f8e443f.53f73f21.css | 1 +
.../static/css/chunk-e3082940.1463bb24.css | 1 +
.../static/css/chunk-vendors.16da611a.css | 1 +
.../static/fonts/element-icons.535877f5.woff | Bin 0 -> 28200 bytes
.../static/fonts/element-icons.732389de.ttf | Bin 0 -> 55956 bytes
.../static/static/img/logo.e92f231a.png | Bin 0 -> 38583 bytes
mock-server/static/static/js/app.3ffb27d0.js | 1 +
.../static/js/chunk-09c3f704.a1d504c3.js | 1 +
.../static/js/chunk-589cf4a2.b6d10755.js | 1 +
.../static/js/chunk-6e9f0a70.cf14b007.js | 1 +
.../static/js/chunk-76193938.f9c11d74.js | 1 +
.../static/js/chunk-7f8e443f.2c011f90.js | 1 +
.../static/js/chunk-e3082940.ee363d97.js | 1 +
.../static/js/chunk-vendors.bf6005f5.js | 38 ++
116 files changed, 2964 insertions(+), 310 deletions(-)
rename base/{model => biz}/assert.go (89%)
create mode 100644 base/biz/bizerror.go
create mode 100644 base/ctx/req_ctx.go
create mode 100644 base/ctx/req_log_handler.go
create mode 100644 base/ctx/req_permission_handler.go
rename base/{token => ctx}/token.go (78%)
create mode 100644 base/mlog/mlog.go
delete mode 100644 base/model/bizerror.go
delete mode 100644 base/model/model_test.go
create mode 100644 base/rediscli/rediscli.go
create mode 100644 base/utils/yml/yml.go
rename {conf => devops/conf}/app.conf (91%)
rename {controllers => devops/controllers}/account.go (68%)
rename {controllers => devops/controllers}/db.go (68%)
rename {controllers => devops/controllers}/form/form.go (100%)
rename {controllers => devops/controllers}/machine.go (62%)
rename {controllers => devops/controllers}/vo/db.go (100%)
rename {controllers => devops/controllers}/vo/vo.go (100%)
rename {db => devops/db}/db.go (91%)
rename {db => devops/db}/metadata.go (100%)
create mode 100755 devops/lastupdate.tmp
rename {machine => devops/machine}/machine.go (95%)
rename {machine => devops/machine}/machine_test.go (100%)
rename {machine => devops/machine}/shell.go (92%)
rename {machine => devops/machine}/shell/get_process_by_name.sh (100%)
rename {machine => devops/machine}/shell/monitor.sh (100%)
rename {machine => devops/machine}/shell/sys_info.sh (100%)
rename {machine => devops/machine}/shell/system_info.sh (100%)
rename {machine => devops/machine}/status.go (98%)
create mode 100644 devops/machine/ws_shell_session.go
rename main.go => devops/main.go (86%)
rename {models => devops/models}/account.go (95%)
rename {models => devops/models}/db.go (100%)
rename {models => devops/models}/db_sql.go (100%)
rename {models => devops/models}/machine.go (96%)
rename {models => devops/models}/machine_monitor.go (100%)
rename {models => devops/models}/role.go (100%)
rename {routers => devops/routers}/commentsRouter_controllers.go (61%)
rename {routers => devops/routers}/router.go (97%)
rename {scheudler => devops/scheudler}/mytask.go (70%)
rename {scheudler => devops/scheudler}/scheduler.go (77%)
rename {static => devops/static}/favicon.ico (100%)
rename {static => devops/static}/index.html (100%)
rename {static => devops/static}/static/css/app.e8323368.css (100%)
rename {static => devops/static}/static/css/chunk-6c422708.2d81c5bb.css (100%)
rename {static => devops/static}/static/css/chunk-vendors.08810481.css (100%)
rename {static => devops/static}/static/fonts/element-icons.535877f5.woff (100%)
rename {static => devops/static}/static/fonts/element-icons.732389de.ttf (100%)
rename {static => devops/static}/static/img/logo.e92f231a.png (100%)
rename {static => devops/static}/static/js/app.aa8651f8.js (100%)
rename {static => devops/static}/static/js/chunk-4a3c1aef.94cc2a02.js (100%)
rename {static => devops/static}/static/js/chunk-6c422708.a09466dd.js (100%)
rename {static => devops/static}/static/js/chunk-945da412.570aca5d.js (100%)
rename {static => devops/static}/static/js/chunk-vendors.a6a99ea9.js (100%)
create mode 100644 mayfly-go-front/src/common/Utils.ts
create mode 100644 mayfly-go-front/src/views/machine/ServiceManage.vue
create mode 100644 mayfly-go-front/src/views/mock-server/MockDataEdit.vue
create mode 100644 mayfly-go-front/src/views/mock-server/MockDataList.vue
create mode 100644 mayfly-go-front/src/views/mock-server/api.ts
create mode 100644 mayfly-go-front/src/views/mock-server/index.ts
create mode 100644 mock-server/conf/app.conf
create mode 100644 mock-server/config.yml
create mode 100644 mock-server/controllers/form/form.go
create mode 100644 mock-server/controllers/machine.go
create mode 100644 mock-server/controllers/mock.go
create mode 100755 mock-server/lastupdate.tmp
create mode 100644 mock-server/machine/machine.go
create mode 100644 mock-server/machine/machine_test.go
create mode 100644 mock-server/machine/shell.go
create mode 100644 mock-server/machine/shell/get_process_by_name.sh
create mode 100644 mock-server/machine/shell/monitor.sh
create mode 100644 mock-server/machine/shell/sys_info.sh
create mode 100644 mock-server/machine/shell/system_info.sh
create mode 100644 mock-server/machine/status.go
rename {machine => mock-server/machine}/ws_shell_session.go (99%)
create mode 100644 mock-server/main.go
create mode 100755 mock-server/mock-server
create mode 100644 mock-server/models/machine.go
create mode 100644 mock-server/routers/commentsRouter_controllers.go
create mode 100644 mock-server/routers/router.go
create mode 100644 mock-server/static/favicon.ico
create mode 100644 mock-server/static/index.html
create mode 100644 mock-server/static/static/css/app.b4088619.css
create mode 100644 mock-server/static/static/css/chunk-09c3f704.f03c28a3.css
create mode 100644 mock-server/static/static/css/chunk-589cf4a2.676f6792.css
create mode 100644 mock-server/static/static/css/chunk-76193938.2d81c5bb.css
create mode 100644 mock-server/static/static/css/chunk-7f8e443f.53f73f21.css
create mode 100644 mock-server/static/static/css/chunk-e3082940.1463bb24.css
create mode 100644 mock-server/static/static/css/chunk-vendors.16da611a.css
create mode 100644 mock-server/static/static/fonts/element-icons.535877f5.woff
create mode 100644 mock-server/static/static/fonts/element-icons.732389de.ttf
create mode 100644 mock-server/static/static/img/logo.e92f231a.png
create mode 100644 mock-server/static/static/js/app.3ffb27d0.js
create mode 100644 mock-server/static/static/js/chunk-09c3f704.a1d504c3.js
create mode 100644 mock-server/static/static/js/chunk-589cf4a2.b6d10755.js
create mode 100644 mock-server/static/static/js/chunk-6e9f0a70.cf14b007.js
create mode 100644 mock-server/static/static/js/chunk-76193938.f9c11d74.js
create mode 100644 mock-server/static/static/js/chunk-7f8e443f.2c011f90.js
create mode 100644 mock-server/static/static/js/chunk-e3082940.ee363d97.js
create mode 100644 mock-server/static/static/js/chunk-vendors.bf6005f5.js
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 5e105969..841f537c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,7 @@
"type": "go",
"request": "launch",
"mode": "auto",
- "program": "${fileDirname}/../main.go",
+ "program": "${fileDirname}/main.go",
"env": {},
"args": []
}
diff --git a/base/model/assert.go b/base/biz/assert.go
similarity index 89%
rename from base/model/assert.go
rename to base/biz/assert.go
index fe0ed19d..5129d107 100644
--- a/base/model/assert.go
+++ b/base/biz/assert.go
@@ -1,7 +1,8 @@
-package model
+package biz
import (
"fmt"
+
"reflect"
)
@@ -23,6 +24,12 @@ func IsTrue(exp bool, msg string, params ...interface{}) {
}
}
+func IsTrueBy(exp bool, err BizError) {
+ if !exp {
+ panic(err)
+ }
+}
+
func NotEmpty(str string, msg string, params ...interface{}) {
if str == "" {
panic(NewBizErr(fmt.Sprintf(msg, params...)))
diff --git a/base/biz/bizerror.go b/base/biz/bizerror.go
new file mode 100644
index 00000000..07ab5f7e
--- /dev/null
+++ b/base/biz/bizerror.go
@@ -0,0 +1,41 @@
+package biz
+
+// 业务错误
+type BizError struct {
+ code int16
+ err string
+}
+
+const (
+ SuccessCode = 200
+ SuccessMsg = "success"
+
+ BizErrorCode = 400
+ BizErrorMsg = "error"
+
+ ServerErrorCode = 500
+ ServerErrorMsg = "server error"
+
+ TokenErrorCode = 501
+ TokenErrorMsg = "token error"
+)
+
+// 错误消息
+func (e *BizError) Error() string {
+ return e.err
+}
+
+// 错误码
+func (e *BizError) Code() int16 {
+ return e.code
+}
+
+// 创建业务逻辑错误结构体，默认为业务逻辑错误
+func NewBizErr(msg string) *BizError {
+ return &BizError{code: BizErrorCode, err: msg}
+}
+
+// 创建业务逻辑错误结构体，可设置指定错误code
+func NewBizErrCode(code int16, msg string) *BizError {
+ return &BizError{code: code, err: msg}
+}
diff --git a/base/controller.go b/base/controller.go
index 73fd3f1b..83aba572 100644
--- a/base/controller.go
+++ b/base/controller.go
@@ -2,12 +2,11 @@ package base
import (
"encoding/json"
- "fmt"
+ "mayfly-go/base/biz"
"mayfly-go/base/ctx"
+ "mayfly-go/base/mlog"
"mayfly-go/base/model"
- "mayfly-go/base/token"
- "github.com/beego/beego/v2/core/logs"
"github.com/beego/beego/v2/core/validation"
"github.com/beego/beego/v2/server/web"
)
@@ -25,7 +24,7 @@ type operationFunc func(loginAccount *ctx.LoginAccount)
// 将请求体的json赋值给指定的结构体
func (c *Controller) UnmarshalBody(data interface{}) {
err := json.Unmarshal(c.Ctx.Input.RequestBody, data)
- model.BizErrIsNil(err, "request body解析错误")
+ biz.BizErrIsNil(err, "request body解析错误")
}
// 校验表单数据
@@ -37,7 +36,7 @@ func (c *Controller) validForm(form interface{}) {
}
if !b {
e := valid.Errors[0]
- panic(model.NewBizErr(e.Field + " " + e.Message))
+ panic(biz.NewBizErr(e.Field + " " + e.Message))
}
}
@@ -48,72 +47,61 @@ func (c *Controller) UnmarshalBodyAndValid(data interface{}) {
}
// 返回数据
-// @param checkToken 是否校验token
+// @param reqCtx 请求上下文
// @param getData 获取数据的回调函数
-func (c *Controller) ReturnData(checkToken bool, getData getDataFunc) {
+func (c *Controller) ReturnData(reqCtx *ctx.ReqCtx, getData getDataFunc) {
defer func() {
if err := recover(); err != nil {
+ ctx.ApplyAfterHandler(reqCtx, err.(error))
c.parseErr(err)
+ } else {
+ // 应用所有请求后置处理器
+ ctx.ApplyAfterHandler(reqCtx, nil)
}
}()
- var loginAccount *ctx.LoginAccount
- if checkToken {
- loginAccount = c.CheckToken()
+ reqCtx.Req = c.Ctx.Request
+ // 调用请求前所有处理器
+ err := ctx.ApplyBeforeHandler(reqCtx)
+ if err != nil {
+ panic(err)
}
- c.Success(getData(loginAccount))
-}
-// 返回数据
-// @param checkToken 是否校验token
-// @param getData 获取数据的回调函数
-func (c *Controller) ReturnDataWithPermisison(permission ctx.Permission, getData getDataFunc) {
- defer func() {
- if err := recover(); err != nil {
- c.parseErr(err)
- }
- }()
- var logMsg string
- var loginAccount *ctx.LoginAccount
- if permission.CheckToken {
- loginAccount = c.CheckToken()
- logMsg = fmt.Sprintf("[uid=%d, uname=%s]\n", loginAccount.Id, loginAccount.Username)
- }
- c.Success(getData(loginAccount))
- logs.Info(logMsg)
+ resp := getData(reqCtx.LoginAccount)
+ c.Success(resp)
+ reqCtx.RespObj = resp
}
// 无返回数据的操作，如新增修改等无需返回数据的操作
-// @param checkToken 是否校验token
-func (c *Controller) Operation(checkToken bool, operation operationFunc) {
+// @param reqCtx 请求上下文
+func (c *Controller) Operation(reqCtx *ctx.ReqCtx, operation operationFunc) {
defer func() {
if err := recover(); err != nil {
+ ctx.ApplyAfterHandler(reqCtx, err.(error))
c.parseErr(err)
+ } else {
+ ctx.ApplyAfterHandler(reqCtx, nil)
}
}()
- var loginAccount *ctx.LoginAccount
- if checkToken {
- loginAccount = c.CheckToken()
+ reqCtx.Req = c.Ctx.Request
+ // 调用请求前所有处理器
+ err := ctx.ApplyBeforeHandler(reqCtx)
+ if err != nil {
+ panic(err)
}
- operation(loginAccount)
- c.SuccessNoData()
-}
-// 校验token，并返回登录者账号信息
-func (c *Controller) CheckToken() *ctx.LoginAccount {
- tokenStr := c.Ctx.Input.Header("Authorization")
- loginAccount, err := token.ParseToken(tokenStr)
- if err != nil || loginAccount == nil {
- panic(model.NewBizErrCode(model.TokenErrorCode, model.TokenErrorMsg))
- }
- return loginAccount
+ operation(reqCtx.LoginAccount)
+ c.SuccessNoData()
+
+ // 不记录返回结果
+ reqCtx.RespObj = 0
}
// 获取分页参数
func (c *Controller) GetPageParam() *model.PageParam {
pn, err := c.GetInt("pageNum", 1)
- model.BizErrIsNil(err, "pageNum参数错误")
+ biz.BizErrIsNil(err, "pageNum参数错误")
ps, serr := c.GetInt("pageSize", 10)
- model.BizErrIsNil(serr, "pageSize参数错误")
+ biz.BizErrIsNil(serr, "pageSize参数错误")
return &model.PageParam{PageNum: pn, PageSize: ps}
}
@@ -134,7 +122,7 @@ func (c *Controller) SuccessNoData() {
}
// 返回业务错误
-func (c *Controller) BizError(bizError model.BizError) {
+func (c *Controller) BizError(bizError *biz.BizError) {
c.Result(model.Error(bizError.Code(), bizError.Error()))
}
@@ -146,20 +134,20 @@ func (c *Controller) ServerError() {
// 解析error，并对不同error返回不同result
func (c *Controller) parseErr(err interface{}) {
switch t := err.(type) {
- case model.BizError:
+ case *biz.BizError:
c.BizError(t)
break
case error:
c.ServerError()
- logs.Error(t)
+ mlog.Log.Error(t)
panic(err)
//break
case string:
c.ServerError()
- logs.Error(t)
+ mlog.Log.Error(t)
panic(err)
//break
default:
- logs.Error(t)
+ mlog.Log.Error(t)
}
}
diff --git a/base/ctx/login_account.go b/base/ctx/login_account.go
index fc843799..5185f06b 100644
--- a/base/ctx/login_account.go
+++ b/base/ctx/login_account.go
@@ -1,5 +1,8 @@
package ctx
+type AppContext struct {
+}
+
type LoginAccount struct {
Id uint64
Username string
diff --git a/base/ctx/req_ctx.go b/base/ctx/req_ctx.go
new file mode 100644
index 00000000..9d461178
--- /dev/null
+++ b/base/ctx/req_ctx.go
@@ -0,0 +1,62 @@
+package ctx
+
+import (
+ "net/http"
+)
+
+type ReqCtx struct {
+ Req *http.Request
+ NeedToken bool // 是否需要token
+ LoginAccount *LoginAccount // 登录账号信息
+
+ // 日志相关信息
+ NeedLog bool // 是否需要记录日志
+ LogResp bool // 是否记录返回结果
+ Description string // 请求描述
+ ReqParam interface{} // 请求参数
+ RespObj interface{} // 响应结果
+}
+
+// 请求前置处理器
+type BeforeHandler interface {
+ Handler(rc *ReqCtx) error
+}
+
+// 请求后置处理器
+type AfterHandler interface {
+ Handler(rc *ReqCtx, err error)
+}
+
+var (
+ BeforeHandlers []BeforeHandler
+ AfterHandlers []AfterHandler
+)
+
+// 应用所有请求前置处理器
+func ApplyBeforeHandler(rc *ReqCtx) error {
+ for _, e := range BeforeHandlers {
+ err := e.Handler(rc)
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+}
+
+// 应用所有后置处理器
+func ApplyAfterHandler(rc *ReqCtx, err error) {
+ for _, e := range AfterHandlers {
+ e.Handler(rc, err)
+ }
+}
+
+// 新建请求上下文，默认为需要记录日志
+// @param needToken 是否需要token才可访问
+// @param description 请求描述
+func NewReqCtx(needToken bool, description string) *ReqCtx {
+ return &ReqCtx{NeedToken: needToken, Description: description, NeedLog: true}
+}
+
+func NewNoLogReqCtx(needToken bool) *ReqCtx {
+ return &ReqCtx{NeedToken: needToken, NeedLog: false}
+}
diff --git a/base/ctx/req_log_handler.go b/base/ctx/req_log_handler.go
new file mode 100644
index 00000000..51ef0049
--- /dev/null
+++ b/base/ctx/req_log_handler.go
@@ -0,0 +1,86 @@
+package ctx
+
+import (
+ "encoding/json"
+ "fmt"
+ "mayfly-go/base/biz"
+ "mayfly-go/base/mlog"
+ "mayfly-go/base/utils"
+ "reflect"
+
+ log "github.com/sirupsen/logrus"
+)
+
+func init() {
+ // customFormatter := new(log.TextFormatter)
+ // customFormatter.TimestampFormat = "2006-01-02 15:04:05.000"
+ // customFormatter.FullTimestamp = true
+ log.SetFormatter(new(mlog.LogFormatter))
+ log.SetReportCaller(true)
+
+ AfterHandlers = append(AfterHandlers, new(LogHandler))
+}
+
+type LogHandler struct{}
+
+func (l *LogHandler) Handler(rc *ReqCtx, err error) {
+ if !rc.NeedLog {
+ return
+ }
+
+ lfs := log.Fields{}
+ if la := rc.LoginAccount; la != nil {
+ lfs["uid"] = la.Id
+ lfs["uname"] = la.Username
+ }
+
+ if err != nil {
+ // lfs["errMsg"] = err.Error()
+
+ // switch t := err.(type) {
+ // case *biz.BizError:
+ // lfs["errCode"] = t.Code()
+ // break
+ // default:
+ // }
+ log.WithFields(lfs).Error(getErrMsg(rc, err))
+ return
+ }
+
+ // rb, _ := json.Marshal(rc.ReqParam)
+ // lfs["req"] = string(rb)
+ // // 返回结果不为空，则记录返回结果
+ // if rc.LogResp && !utils.IsBlank(reflect.ValueOf(rc.RespObj)) {
+ // respB, _ := json.Marshal(rc.RespObj)
+ // lfs["resp"] = string(respB)
+ // }
+ log.WithFields(lfs).Info(getLogMsg(rc))
+}
+
+func getLogMsg(rc *ReqCtx) string {
+ msg := rc.Description
+ rb, _ := json.Marshal(rc.ReqParam)
+ msg = msg + fmt.Sprintf("\n--> %s", string(rb))
+ // 返回结果不为空，则记录返回结果
+ if rc.LogResp && !utils.IsBlank(reflect.ValueOf(rc.RespObj)) {
+ respB, _ := json.Marshal(rc.RespObj)
+ msg = msg + fmt.Sprintf("\n<-- %s", string(respB))
+ }
+ return msg
+}
+
+func getErrMsg(rc *ReqCtx, err error) string {
+ msg := rc.Description
+ rb, _ := json.Marshal(rc.ReqParam)
+ msg = msg + fmt.Sprintf("\n--> %s", string(rb))
+
+ var errMsg string
+ switch t := err.(type) {
+ case *biz.BizError:
+ errMsg = fmt.Sprintf("\n<-e errCode: %d, errMsg: %s", t.Code(), t.Error())
+ break
+ default:
+ errMsg = fmt.Sprintf("\n<-e errMsg: %s", t.Error())
+ }
+ return (msg + errMsg)
+}
diff --git a/base/ctx/req_permission_handler.go b/base/ctx/req_permission_handler.go
new file mode 100644
index 00000000..56231344
--- /dev/null
+++ b/base/ctx/req_permission_handler.go
@@ -0,0 +1,29 @@
+package ctx
+
+import (
+ "mayfly-go/base/biz"
+)
+
+func init() {
+ BeforeHandlers = append(BeforeHandlers, new(PermissionHandler))
+}
+
+var permissionError = biz.NewBizErrCode(501, "token error")
+
+type PermissionHandler struct{}
+
+func (p *PermissionHandler) Handler(rc *ReqCtx) error {
+ if !rc.NeedToken {
+ return nil
+ }
+ tokenStr := rc.Req.Header.Get("Authorization")
+ if tokenStr == "" {
+ return permissionError
+ }
+ loginAccount, err := ParseToken(tokenStr)
+ if err != nil || loginAccount == nil {
+ return permissionError
+ }
+ rc.LoginAccount = loginAccount
+ return nil
+}
diff --git a/base/token/token.go b/base/ctx/token.go
similarity index 78%
rename from base/token/token.go
rename to base/ctx/token.go
index 3e8b1f6b..8eaca2c7 100644
--- a/base/token/token.go
+++ b/base/ctx/token.go
@@ -1,9 +1,9 @@
-package token
+package ctx
import (
"errors"
- "mayfly-go/base/ctx"
- "mayfly-go/base/model"
+
+ "mayfly-go/base/biz"
"time"
"github.com/dgrijalva/jwt-go"
@@ -26,12 +26,12 @@ func CreateToken(userId uint64, username string) string {
// 使用自定义字符串加密 and get the complete encoded token as a string
tokenString, err := token.SignedString([]byte(JwtKey))
- model.BizErrIsNil(err, "token创建失败")
+ biz.BizErrIsNil(err, "token创建失败")
return tokenString
}
// 解析token，并返回登录者账号信息
-func ParseToken(tokenStr string) (*ctx.LoginAccount, error) {
+func ParseToken(tokenStr string) (*LoginAccount, error) {
if tokenStr == "" {
return nil, errors.New("token error")
}
@@ -43,5 +43,5 @@ func ParseToken(tokenStr string) (*ctx.LoginAccount, error) {
return nil, err
}
i := token.Claims.(jwt.MapClaims)
- return &ctx.LoginAccount{Id: uint64(i["id"].(float64)), Username: i["username"].(string)}, nil
+ return &LoginAccount{Id: uint64(i["id"].(float64)), Username: i["username"].(string)}, nil
}
diff --git a/base/mlog/mlog.go b/base/mlog/mlog.go
new file mode 100644
index 00000000..118764f7
--- /dev/null
+++ b/base/mlog/mlog.go
@@ -0,0 +1,37 @@
+package mlog
+
+import (
+ "fmt"
+ "strings"
+ "time"
+
+ "github.com/sirupsen/logrus"
+)
+
+var Log = logrus.New()
+
+func init() {
+ // customFormatter := new(logrus.TextFormatter)
+ // customFormatter.TimestampFormat = "2006-01-02 15:04:05.000"
+ // customFormatter.FullTimestamp = true
+ Log.SetFormatter(new(LogFormatter))
+ Log.SetReportCaller(true)
+}
+
+type LogFormatter struct{}
+
+func (l *LogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
+ timestamp := time.Now().Local().Format("2006-01-02 15:04:05.000")
+
+ level := entry.Level
+ logMsg := fmt.Sprintf("%s [%s]", timestamp, strings.ToUpper(level.String()))
+ // 如果存在调用信息，且为error级别以上记录文件及行号
+ if caller := entry.Caller; caller != nil && level <= logrus.ErrorLevel {
+ logMsg = logMsg + fmt.Sprintf(" [%s:%d]", caller.File, caller.Line)
+ }
+ for k, v := range entry.Data {
+ logMsg = logMsg + fmt.Sprintf(" [%s=%v]", k, v)
+ }
+ logMsg = logMsg + fmt.Sprintf(" : %s\n", entry.Message)
+ return []byte(logMsg), nil
+}
diff --git a/base/model/bizerror.go b/base/model/bizerror.go
deleted file mode 100644
index 702efa33..00000000
--- a/base/model/bizerror.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package model
-
-// 业务错误
-type BizError struct {
- code int16
- err string
-}
-
-// 错误消息
-func (e *BizError) Error() string {
- return e.err
-}
-
-// 错误码
-func (e *BizError) Code() int16 {
- return e.code
-}
-
-// 创建业务逻辑错误结构体，默认为业务逻辑错误
-func NewBizErr(msg string) BizError {
- return BizError{code: BizErrorCode, err: msg}
-}
-
-// 创建业务逻辑错误结构体，可设置指定错误code
-func NewBizErrCode(code int16, msg string) BizError {
- return BizError{code: code, err: msg}
-}
diff --git a/base/model/model.go b/base/model/model.go
index 4242b951..398349fd 100644
--- a/base/model/model.go
+++ b/base/model/model.go
@@ -2,6 +2,7 @@ package model
import (
"errors"
+ "mayfly-go/base/biz"
"mayfly-go/base/ctx"
"mayfly-go/base/utils"
"reflect"
@@ -125,9 +126,9 @@ func GetPage(seter orm.QuerySeter, pageParam *PageParam, models interface{}, toM
return PageResult{Total: 0, List: nil}
}
_, qerr := seter.Limit(pageParam.PageSize, pageParam.PageNum-1).All(models, getFieldNames(toModels)...)
- BizErrIsNil(qerr, "查询错误")
+ biz.BizErrIsNil(qerr, "查询错误")
err := utils.Copy(toModels, models)
- BizErrIsNil(err, "实体转换错误")
+ biz.BizErrIsNil(err, "实体转换错误")
return PageResult{Total: count, List: toModels}
}
@@ -176,7 +177,7 @@ func GetListBySql(sql string, params ...interface{}) *[]orm.Params {
func GetList(seter orm.QuerySeter, model interface{}, toModel interface{}) {
_, _ = seter.All(model, getFieldNames(toModel)...)
err := utils.Copy(toModel, model)
- BizErrIsNil(err, "实体转换错误")
+ biz.BizErrIsNil(err, "实体转换错误")
}
// 根据toModel结构体字段查询单条记录，并将值赋值给toModel
@@ -186,7 +187,7 @@ func GetOne(seter orm.QuerySeter, model interface{}, toModel interface{}) error
return err
}
cerr := utils.Copy(toModel, model)
- BizErrIsNil(cerr, "实体转换错误")
+ biz.BizErrIsNil(cerr, "实体转换错误")
return nil
}
diff --git a/base/model/model_test.go b/base/model/model_test.go
deleted file mode 100644
index bedb1475..00000000
--- a/base/model/model_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package model
-
-import (
- "fmt"
- "mayfly-go/base/utils"
- "mayfly-go/controllers/vo"
- "mayfly-go/models"
- "strings"
- "testing"
-
- "github.com/beego/beego/v2/client/orm"
- _ "github.com/go-sql-driver/mysql"
-)
-
-type AccountDetailVO struct {
- Id int64
- Username string
-}
-
-func init() {
- orm.RegisterDriver("mysql", orm.DRMySQL)
-
- orm.RegisterDataBase("default", "mysql", "root:111049@tcp(localhost:3306)/mayfly-go?charset=utf8")
- orm.Debug = true
-}
-
-func TestGetList(t *testing.T) {
- query := QuerySetter(new(models.Account)).OrderBy("-Id")
- list := new([]AccountDetailVO)
- GetList(query, new([]models.Account), list)
- fmt.Println(list)
-}
-
-func TestGetOne(t *testing.T) {
- model := new(models.Account)
- query := QuerySetter(model).Filter("Id", 2)
- adv := new(AccountDetailVO)
- GetOne(query, model, adv)
- fmt.Println(adv)
-}
-
-func TestMap(t *testing.T) {
- //o := getOrm()
- //
- ////v := new([]Account)
- //var maps []orm.Params
- //_, err := o.Raw("SELECT a.Id, a.Username, r.Id AS 'Role.Id', r.Name AS 'Role.Name' FROM " +
- // "t_account a JOIN t_role r ON a.id = r.account_id").Values(&maps)
- //fmt.Println(err)
- //////res := new([]Account)
- ////model := &Account{}
- ////o.QueryTable("t_account").Filter("id", 1).RelatedSel().One(model)
- ////o.LoadRelated(model, "Role")
- res := new([]vo.AccountVO)
- sql := "SELECT a.Id, a.Username, r.Id AS 'Role.Id', r.Name AS 'Role.Name' FROM t_account a JOIN t_role r ON a.id = r.account_id"
- //limitSql := sql + " LIMIT 1, 3"
- //selectIndex := strings.Index(sql, "SELECT ") + 7
- //fromIndex := strings.Index(sql, " FROM")
- //selectCol := sql[selectIndex:fromIndex]
- //countSql := strings.Replace(sql, selectCol, "COUNT(*)", 1)
- //fmt.Println(limitSql)
- //fmt.Println(selectCol)
- //fmt.Println(countSql)
- page := GetPageBySql(sql, res, &PageParam{PageNum: 1, PageSize: 1})
- fmt.Println(page)
- //return res
-}
-
-func TestCase2Camel(t *testing.T) {
- fmt.Println(utils.Case2Camel("create_time"))
- fmt.Println(strings.Title("username"))
-}
diff --git a/base/rediscli/rediscli.go b/base/rediscli/rediscli.go
new file mode 100644
index 00000000..2b950a6b
--- /dev/null
+++ b/base/rediscli/rediscli.go
@@ -0,0 +1,64 @@
+package rediscli
+
+import (
+ "fmt"
+ "time"
+
+ "github.com/go-redis/redis"
+)
+
+var cli *redis.Client
+
+func SetCli(client *redis.Client) {
+ cli = client
+}
+
+func GetCli() *redis.Client {
+ return cli
+}
+
+// get key value
+func Get(key string) string {
+ val, err := cli.Get(key).Result()
+ switch {
+ case err == redis.Nil:
+ fmt.Println("key does not exist")
+ case err != nil:
+ fmt.Println("Get failed", err)
+ case val == "":
+ fmt.Println("value is empty")
+ }
+ return val
+}
+
+// set key value
+func Set(key string, val string, expiration time.Duration) {
+ cli.Set(key, val, expiration)
+}
+
+func HSet(key string, field string, val interface{}) {
+ cli.HSet(key, field, val)
+}
+
+// hget
+func HGet(key string, field string) string {
+ val, _ := cli.HGet(key, field).Result()
+ return val
+}
+
+// hget
+func HExist(key string, field string) bool {
+ val, _ := cli.HExists(key, field).Result()
+ return val
+}
+
+// hgetall
+func HGetAll(key string) map[string]string {
+ vals, _ := cli.HGetAll(key).Result()
+ return vals
+}
+
+// hdel
+func HDel(key string, fields ...string) int {
+ return int(cli.HDel(key, fields...).Val())
+}
diff --git a/base/utils/yml/yml.go b/base/utils/yml/yml.go
new file mode 100644
index 00000000..4993ae0b
--- /dev/null
+++ b/base/utils/yml/yml.go
@@ -0,0 +1,22 @@
+package yml
+
+import (
+ "errors"
+ "io/ioutil"
+
+ "gopkg.in/yaml.v3"
+)
+
+// 从指定路径加载yaml文件
+func LoadYml(path string, out interface{}) error {
+ yamlFileBytes, readErr := ioutil.ReadFile(path)
+ if readErr != nil {
+ return readErr
+ }
+ // yaml解析
+ err := yaml.Unmarshal(yamlFileBytes, out)
+ if err != nil {
+ return errors.New("无法解析 [" + path + "]")
+ }
+ return nil
+}
diff --git a/conf/app.conf b/devops/conf/app.conf
similarity index 91%
rename from conf/app.conf
rename to devops/conf/app.conf
index 01e635fb..3b22f6ce 100644
--- a/conf/app.conf
+++ b/devops/conf/app.conf
@@ -3,7 +3,7 @@ httpport = 8888
copyrequestbody = true
autorender = false
EnableErrorsRender = false
-runmode = "dev"
+runmode = "prod"
; mysqluser = "root"
; mysqlpass = "111049"
; mysqlurls = "127.0.0.1"
@@ -16,6 +16,6 @@ AdminHttpPort = 8088
[dev]
httpport = 8888
[prod]
-httpport = 8080
+httpport = 8888
[test]
httpport = 8888
\ No newline at end of file
diff --git a/controllers/account.go b/devops/controllers/account.go
similarity index 68%
rename from controllers/account.go
rename to devops/controllers/account.go
index d53b4ee1..05fe6179 100644
--- a/controllers/account.go
+++ b/devops/controllers/account.go
@@ -2,11 +2,11 @@ package controllers
import (
"mayfly-go/base"
+ "mayfly-go/base/biz"
"mayfly-go/base/ctx"
"mayfly-go/base/model"
- "mayfly-go/base/token"
- "mayfly-go/controllers/form"
- "mayfly-go/models"
+ "mayfly-go/devops/controllers/form"
+ "mayfly-go/devops/models"
)
type AccountController struct {
@@ -20,14 +20,14 @@ type AccountController struct {
// @router /accounts/login [post]
func (c *AccountController) Login() {
- c.ReturnData(false, func(la *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewReqCtx(false, "用户登录"), func(la *ctx.LoginAccount) interface{} {
loginForm := &form.LoginForm{}
c.UnmarshalBodyAndValid(loginForm)
a := &models.Account{Username: loginForm.Username, Password: loginForm.Password}
- model.BizErrIsNil(model.GetBy(a, "Username", "Password"), "用户名或密码错误")
+ biz.BizErrIsNil(model.GetBy(a, "Username", "Password"), "用户名或密码错误")
return map[string]interface{}{
- "token": token.CreateToken(a.Id, a.Username),
+ "token": ctx.CreateToken(a.Id, a.Username),
"username": a.Username,
}
})
@@ -35,7 +35,7 @@ func (c *AccountController) Login() {
// @router /accounts [get]
func (c *AccountController) Accounts() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewReqCtx(true, "获取账号列表"), func(account *ctx.LoginAccount) interface{} {
//s := c.GetString("username")
//query := models.QuerySetter(new(models.Account)).OrderBy("-Id").RelatedSel()
//return models.GetPage(query, c.GetPageParam(), new([]models.Account), new([]vo.AccountVO))
diff --git a/controllers/db.go b/devops/controllers/db.go
similarity index 68%
rename from controllers/db.go
rename to devops/controllers/db.go
index 5e8c9554..5d3b84d3 100644
--- a/controllers/db.go
+++ b/devops/controllers/db.go
@@ -3,12 +3,13 @@ package controllers
import (
"fmt"
"mayfly-go/base"
+ "mayfly-go/base/biz"
"mayfly-go/base/ctx"
"mayfly-go/base/model"
- "mayfly-go/controllers/form"
- "mayfly-go/controllers/vo"
- "mayfly-go/db"
- "mayfly-go/models"
+ "mayfly-go/devops/controllers/form"
+ "mayfly-go/devops/controllers/vo"
+ "mayfly-go/devops/db"
+ "mayfly-go/devops/models"
"strconv"
)
@@ -18,7 +19,7 @@ type DbController struct {
// @router /api/dbs [get]
func (c *DbController) Dbs() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
m := new([]models.Db)
querySetter := model.QuerySetter(new(models.Db))
return model.GetPage(querySetter, c.GetPageParam(), m, new([]vo.SelectDataDbVO))
@@ -27,12 +28,14 @@ func (c *DbController) Dbs() {
// @router /api/db/:dbId/select [get]
func (c *DbController) SelectData() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ rc := ctx.NewReqCtx(true, "执行数据库查询语句")
+ c.ReturnData(rc, func(account *ctx.LoginAccount) interface{} {
selectSql := c.GetString("selectSql")
- model.NotEmpty(selectSql, "selectSql不能为空")
+ rc.ReqParam = selectSql
+ biz.NotEmpty(selectSql, "selectSql不能为空")
res, err := db.GetDbInstance(c.GetDbId()).SelectData(selectSql)
if err != nil {
- panic(model.NewBizErr(fmt.Sprintf("查询失败: %s", err.Error())))
+ panic(biz.NewBizErr(fmt.Sprintf("查询失败: %s", err.Error())))
}
return res
})
@@ -40,12 +43,12 @@ func (c *DbController) SelectData() {
// @router /api/db/:dbId/exec-sql [post]
func (c *DbController) ExecSql() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewReqCtx(true, "sql执行"), func(account *ctx.LoginAccount) interface{} {
selectSql := c.GetString("sql")
- model.NotEmpty(selectSql, "sql不能为空")
+ biz.NotEmpty(selectSql, "sql不能为空")
num, err := db.GetDbInstance(c.GetDbId()).Exec(selectSql)
if err != nil {
- panic(model.NewBizErr(fmt.Sprintf("执行失败: %s", err.Error())))
+ panic(biz.NewBizErr(fmt.Sprintf("执行失败: %s", err.Error())))
}
return num
})
@@ -53,16 +56,16 @@ func (c *DbController) ExecSql() {
// @router /api/db/:dbId/t-metadata [get]
func (c *DbController) TableMA() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
return db.GetDbInstance(c.GetDbId()).GetTableMetedatas()
})
}
// @router /api/db/:dbId/c-metadata [get]
func (c *DbController) ColumnMA() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
tn := c.GetString("tableName")
- model.NotEmpty(tn, "tableName不能为空")
+ biz.NotEmpty(tn, "tableName不能为空")
return db.GetDbInstance(c.GetDbId()).GetColumnMetadatas(tn)
})
}
@@ -70,7 +73,7 @@ func (c *DbController) ColumnMA() {
// @router /api/db/:dbId/hint-tables [get]
// 数据表及字段前端提示接口
func (c *DbController) HintTables() {
- c.ReturnData(false, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
dbi := db.GetDbInstance(c.GetDbId())
tables := dbi.GetTableMetedatas()
res := make(map[string][]string)
@@ -94,14 +97,16 @@ func (c *DbController) HintTables() {
// @router /api/db/:dbId/sql [post]
func (c *DbController) SaveSql() {
- c.Operation(true, func(account *ctx.LoginAccount) {
+ rc := ctx.NewReqCtx(true, "保存sql内容")
+ c.Operation(rc, func(account *ctx.LoginAccount) {
dbSqlForm := &form.DbSqlSaveForm{}
c.UnmarshalBodyAndValid(dbSqlForm)
+ rc.ReqParam = dbSqlForm
dbId := c.GetDbId()
// 判断dbId是否存在
err := model.GetById(new(models.Db), dbId)
- model.BizErrIsNil(err, "该数据库信息不存在")
+ biz.BizErrIsNil(err, "该数据库信息不存在")
// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
dbSql := &models.DbSql{Type: dbSqlForm.Type, DbId: dbId}
@@ -121,7 +126,7 @@ func (c *DbController) SaveSql() {
// @router /api/db/:dbId/sql [get]
func (c *DbController) GetSql() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
dbSql := &models.DbSql{Type: 1, DbId: c.GetDbId()}
dbSql.CreatorId = account.Id
@@ -135,6 +140,6 @@ func (c *DbController) GetSql() {
func (c *DbController) GetDbId() uint64 {
dbId, _ := strconv.Atoi(c.Ctx.Input.Param(":dbId"))
- model.IsTrue(dbId > 0, "dbId错误")
+ biz.IsTrue(dbId > 0, "dbId错误")
return uint64(dbId)
}
diff --git a/controllers/form/form.go b/devops/controllers/form/form.go
similarity index 100%
rename from controllers/form/form.go
rename to devops/controllers/form/form.go
diff --git a/controllers/machine.go b/devops/controllers/machine.go
similarity index 62%
rename from controllers/machine.go
rename to devops/controllers/machine.go
index 4e62b2f4..d2838b83 100644
--- a/controllers/machine.go
+++ b/devops/controllers/machine.go
@@ -2,10 +2,10 @@ package controllers
import (
"mayfly-go/base"
+ "mayfly-go/base/biz"
"mayfly-go/base/ctx"
- "mayfly-go/base/model"
- "mayfly-go/machine"
- "mayfly-go/models"
+ "mayfly-go/devops/machine"
+ "mayfly-go/devops/models"
"net/http"
"strconv"
@@ -25,44 +25,47 @@ var upgrader = websocket.Upgrader{
}
func (c *MachineController) Machines() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
return models.GetMachineList(c.GetPageParam())
})
}
func (c *MachineController) Run() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ rc := ctx.NewReqCtx(true, "执行机器命令")
+ c.ReturnData(rc, func(account *ctx.LoginAccount) interface{} {
cmd := c.GetString("cmd")
- model.NotEmpty(cmd, "cmd不能为空")
+ biz.NotEmpty(cmd, "cmd不能为空")
+
+ rc.ReqParam = cmd
res, err := c.getCli().Run(cmd)
- model.BizErrIsNil(err, "执行命令失败")
+ biz.BizErrIsNil(err, "执行命令失败")
return res
})
}
// 系统基本信息
func (c *MachineController) SysInfo() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
res, err := c.getCli().GetSystemInfo()
- model.BizErrIsNil(err, "获取系统基本信息失败")
+ biz.BizErrIsNil(err, "获取系统基本信息失败")
return res
})
}
// top命令信息
func (c *MachineController) Top() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
return c.getCli().GetTop()
})
}
func (c *MachineController) GetProcessByName() {
- c.ReturnData(true, func(account *ctx.LoginAccount) interface{} {
+ c.ReturnData(ctx.NewNoLogReqCtx(true), func(account *ctx.LoginAccount) interface{} {
name := c.GetString("name")
- model.NotEmpty(name, "name不能为空")
+ biz.NotEmpty(name, "name不能为空")
res, err := c.getCli().GetProcessByName(name)
- model.BizErrIsNil(err, "获取失败")
+ biz.BizErrIsNil(err, "获取失败")
return res
})
}
@@ -70,7 +73,7 @@ func (c *MachineController) GetProcessByName() {
func (c *MachineController) WsSSH() {
wsConn, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
if err != nil {
- panic(model.NewBizErr("获取requst responsewirte错误"))
+ panic(biz.NewBizErr("获取requst responsewirte错误"))
}
cols, _ := c.GetInt("cols", 80)
@@ -78,7 +81,7 @@ func (c *MachineController) WsSSH() {
sws, err := machine.NewLogicSshWsSession(cols, rows, c.getCli(), wsConn)
if sws == nil {
- panic(model.NewBizErr("连接失败"))
+ panic(biz.NewBizErr("连接失败"))
}
//if wshandleError(wsConn, err) {
// return
@@ -94,12 +97,12 @@ func (c *MachineController) WsSSH() {
func (c *MachineController) GetMachineId() uint64 {
machineId, _ := strconv.Atoi(c.Ctx.Input.Param(":machineId"))
- model.IsTrue(machineId > 0, "machineId错误")
+ biz.IsTrue(machineId > 0, "machineId错误")
return uint64(machineId)
}
func (c *MachineController) getCli() *machine.Cli {
cli, err := machine.GetCli(c.GetMachineId())
- model.BizErrIsNil(err, "获取客户端错误")
+ biz.BizErrIsNil(err, "获取客户端错误")
return cli
}
diff --git a/controllers/vo/db.go b/devops/controllers/vo/db.go
similarity index 100%
rename from controllers/vo/db.go
rename to devops/controllers/vo/db.go
diff --git a/controllers/vo/vo.go b/devops/controllers/vo/vo.go
similarity index 100%
rename from controllers/vo/vo.go
rename to devops/controllers/vo/vo.go
diff --git a/db/db.go b/devops/db/db.go
similarity index 91%
rename from db/db.go
rename to devops/db/db.go
index b4b00205..3089b9f5 100644
--- a/db/db.go
+++ b/devops/db/db.go
@@ -4,8 +4,8 @@ import (
"database/sql"
"errors"
"fmt"
- "mayfly-go/base/model"
- "mayfly-go/models"
+ "mayfly-go/base/biz"
+ "mayfly-go/devops/models"
"strings"
"sync"
"time"
@@ -104,12 +104,12 @@ func GetDbInstance(id uint64) *DbInstance {
}
}
d := models.GetDbById(uint64(id))
- model.NotNil(d, "数据库信息不存在")
+ biz.NotNil(d, "数据库信息不存在")
DB, err := sql.Open(d.Type, getDsn(d))
- model.ErrIsNil(err, fmt.Sprintf("Open %s failed, err:%v\n", d.Type, err))
+ biz.ErrIsNil(err, fmt.Sprintf("Open %s failed, err:%v\n", d.Type, err))
perr := DB.Ping()
if perr != nil {
- panic(model.NewBizErr(fmt.Sprintf("数据库连接失败: %s", perr.Error())))
+ panic(biz.NewBizErr(fmt.Sprintf("数据库连接失败: %s", perr.Error())))
}
// 最大连接周期，超过时间的连接就close
diff --git a/db/metadata.go b/devops/db/metadata.go
similarity index 100%
rename from db/metadata.go
rename to devops/db/metadata.go
diff --git a/devops/lastupdate.tmp b/devops/lastupdate.tmp
new file mode 100755
index 00000000..55235d7c
--- /dev/null
+++ b/devops/lastupdate.tmp
@@ -0,0 +1 @@
+{"/Users/hml/Desktop/project/go/mayfly-go/devops/controllers":1616491109228810023}
\ No newline at end of file
diff --git a/machine/machine.go b/devops/machine/machine.go
similarity index 95%
rename from machine/machine.go
rename to devops/machine/machine.go
index 78b07eff..03ef9e67 100644
--- a/machine/machine.go
+++ b/devops/machine/machine.go
@@ -4,8 +4,8 @@ import (
"errors"
"fmt"
"io"
- "mayfly-go/base/model"
- "mayfly-go/models"
+ "mayfly-go/base/biz"
+ "mayfly-go/devops/models"
"net"
"os"
"sync"
@@ -115,12 +115,12 @@ func (c *Cli) Close() {
func (c *Cli) GetSftpCli() *sftp.Client {
if c.client == nil {
if err := c.connect(); err != nil {
- panic(model.NewBizErr("连接ssh失败：" + err.Error()))
+ panic(biz.NewBizErr("连接ssh失败：" + err.Error()))
}
}
client, serr := sftp.NewClient(c.client, sftp.MaxPacket(1<<15))
if serr != nil {
- panic(model.NewBizErr("获取sftp client失败：" + serr.Error()))
+ panic(biz.NewBizErr("获取sftp client失败：" + serr.Error()))
}
return client
}
diff --git a/machine/machine_test.go b/devops/machine/machine_test.go
similarity index 100%
rename from machine/machine_test.go
rename to devops/machine/machine_test.go
diff --git a/machine/shell.go b/devops/machine/shell.go
similarity index 92%
rename from machine/shell.go
rename to devops/machine/shell.go
index 320a313d..b1a40207 100644
--- a/machine/shell.go
+++ b/devops/machine/shell.go
@@ -2,9 +2,9 @@ package machine
import (
"io/ioutil"
- "mayfly-go/base/model"
+ "mayfly-go/base/biz"
"mayfly-go/base/utils"
- "mayfly-go/models"
+ "mayfly-go/devops/models"
"time"
"github.com/siddontang/go/log"
@@ -51,7 +51,7 @@ func getShellContent(name string) string {
return cacheShell
}
bytes, err := ioutil.ReadFile(BasePath + name + ".sh")
- model.ErrIsNil(err, "获取shell文件失败")
+ biz.ErrIsNil(err, "获取shell文件失败")
shellStr := string(bytes)
shellCache[name] = shellStr
return shellStr
diff --git a/machine/shell/get_process_by_name.sh b/devops/machine/shell/get_process_by_name.sh
similarity index 100%
rename from machine/shell/get_process_by_name.sh
rename to devops/machine/shell/get_process_by_name.sh
diff --git a/machine/shell/monitor.sh b/devops/machine/shell/monitor.sh
similarity index 100%
rename from machine/shell/monitor.sh
rename to devops/machine/shell/monitor.sh
diff --git a/machine/shell/sys_info.sh b/devops/machine/shell/sys_info.sh
similarity index 100%
rename from machine/shell/sys_info.sh
rename to devops/machine/shell/sys_info.sh
diff --git a/machine/shell/system_info.sh b/devops/machine/shell/system_info.sh
similarity index 100%
rename from machine/shell/system_info.sh
rename to devops/machine/shell/system_info.sh
diff --git a/machine/status.go b/devops/machine/status.go
similarity index 98%
rename from machine/status.go
rename to devops/machine/status.go
index 5d1af817..7007df67 100644
--- a/machine/status.go
+++ b/devops/machine/status.go
@@ -1,7 +1,7 @@
package machine
import (
- "mayfly-go/base/model"
+ "mayfly-go/base/biz"
"mayfly-go/base/utils"
"strconv"
"strings"
@@ -93,7 +93,7 @@ func (c *Cli) GetTop() *Top {
top := &Top{Time: time, Up: up, NowUsers: users, OneMinLoadavg: float32(oneMinLa), FiveMinLoadavg: float32(fiveMinLa), FifteenMinLoadavg: float32(fifMinLa)}
err := utils.Map2Struct(resMap, top)
- model.BizErrIsNil(err, "解析top出错")
+ biz.BizErrIsNil(err, "解析top出错")
return top
}
diff --git a/devops/machine/ws_shell_session.go b/devops/machine/ws_shell_session.go
new file mode 100644
index 00000000..cba66ba5
--- /dev/null
+++ b/devops/machine/ws_shell_session.go
@@ -0,0 +1,212 @@
+package machine
+
+import (
+ "bytes"
+ "encoding/json"
+ "io"
+ "mayfly-go/base/mlog"
+ "sync"
+ "time"
+
+ "github.com/gorilla/websocket"
+ "golang.org/x/crypto/ssh"
+)
+
+type safeBuffer struct {
+ buffer bytes.Buffer
+ mu sync.Mutex
+}
+
+func (w *safeBuffer) Write(p []byte) (int, error) {
+ w.mu.Lock()
+ defer w.mu.Unlock()
+ return w.buffer.Write(p)
+}
+func (w *safeBuffer) Bytes() []byte {
+ w.mu.Lock()
+ defer w.mu.Unlock()
+ return w.buffer.Bytes()
+}
+func (w *safeBuffer) Reset() {
+ w.mu.Lock()
+ defer w.mu.Unlock()
+ w.buffer.Reset()
+}
+
+const (
+ wsMsgCmd = "cmd"
+ wsMsgResize = "resize"
+)
+
+type WsMsg struct {
+ Type string `json:"type"`
+ Msg string `json:"msg"`
+ Cols int `json:"cols"`
+ Rows int `json:"rows"`
+}
+
+type LogicSshWsSession struct {
+ stdinPipe io.WriteCloser
+ comboOutput *safeBuffer //ssh 终端混合输出
+ logBuff *safeBuffer //保存session的日志
+ inputFilterBuff *safeBuffer //用来过滤输入的命令和ssh_filter配置对比的
+ session *ssh.Session
+ wsConn *websocket.Conn
+}
+
+func NewLogicSshWsSession(cols, rows int, cli *Cli, wsConn *websocket.Conn) (*LogicSshWsSession, error) {
+ sshSession, err := cli.GetSession()
+ if err != nil {
+ return nil, err
+ }
+
+ stdinP, err := sshSession.StdinPipe()
+ if err != nil {
+ return nil, err
+ }
+
+ comboWriter := new(safeBuffer)
+ logBuf := new(safeBuffer)
+ inputBuf := new(safeBuffer)
+ //ssh.stdout and stderr will write output into comboWriter
+ sshSession.Stdout = comboWriter
+ sshSession.Stderr = comboWriter
+
+ modes := ssh.TerminalModes{
+ ssh.ECHO: 1, // disable echo
+ ssh.TTY_OP_ISPEED: 14400, // input speed = 14.4kbaud
+ ssh.TTY_OP_OSPEED: 14400, // output speed = 14.4kbaud
+ }
+ // Request pseudo terminal
+ if err := sshSession.RequestPty("xterm", rows, cols, modes); err != nil {
+ return nil, err
+ }
+ // Start remote shell
+ if err := sshSession.Shell(); err != nil {
+ return nil, err
+ }
+ //sshSession.Run("top")
+ return &LogicSshWsSession{
+ stdinPipe: stdinP,
+ comboOutput: comboWriter,
+ logBuff: logBuf,
+ inputFilterBuff: inputBuf,
+ session: sshSession,
+ wsConn: wsConn,
+ }, nil
+}
+
+//Close 关闭
+func (sws *LogicSshWsSession) Close() {
+ if sws.session != nil {
+ sws.session.Close()
+ }
+ if sws.logBuff != nil {
+ sws.logBuff = nil
+ }
+ if sws.comboOutput != nil {
+ sws.comboOutput = nil
+ }
+}
+func (sws *LogicSshWsSession) Start(quitChan chan bool) {
+ go sws.receiveWsMsg(quitChan)
+ go sws.sendComboOutput(quitChan)
+}
+
+//receiveWsMsg receive websocket msg do some handling then write into ssh.session.stdin
+func (sws *LogicSshWsSession) receiveWsMsg(exitCh chan bool) {
+ wsConn := sws.wsConn
+ //tells other go routine quit
+ defer setQuit(exitCh)
+ for {
+ select {
+ case <-exitCh:
+ return
+ default:
+ //read websocket msg
+ _, wsData, err := wsConn.ReadMessage()
+ if err != nil {
+ mlog.Log.Error("reading webSocket message failed: ", err)
+ return
+ }
+ //unmashal bytes into struct
+ msgObj := WsMsg{}
+ if err := json.Unmarshal(wsData, &msgObj); err != nil {
+ mlog.Log.Error("unmarshal websocket message failed：", err)
+ }
+ switch msgObj.Type {
+ case wsMsgResize:
+ //handle xterm.js size change
+ if msgObj.Cols > 0 && msgObj.Rows > 0 {
+ if err := sws.session.WindowChange(msgObj.Rows, msgObj.Cols); err != nil {
+ mlog.Log.Error("ssh pty change windows size failed")
+ }
+ }
+ case wsMsgCmd:
+ //handle xterm.js stdin
+ //decodeBytes, err := base64.StdEncoding.DecodeString(msgObj.Cmd)
+ //if err != nil {
+ // logs.Error("websock cmd string base64 decoding failed")
+ // //panic(base.NewBizErr("websock cmd string base64 decoding failed"))
+ //}
+ sws.sendWebsocketInputCommandToSshSessionStdinPipe([]byte(msgObj.Msg))
+ }
+ }
+ }
+}
+
+//sendWebsocketInputCommandToSshSessionStdinPipe
+func (sws *LogicSshWsSession) sendWebsocketInputCommandToSshSessionStdinPipe(cmdBytes []byte) {
+ if _, err := sws.stdinPipe.Write(cmdBytes); err != nil {
+ mlog.Log.Error("ws cmd bytes write to ssh.stdin pipe failed")
+ }
+}
+
+func (sws *LogicSshWsSession) sendComboOutput(exitCh chan bool) {
+ wsConn := sws.wsConn
+ //todo 优化成一个方法
+ //tells other go routine quit
+ defer setQuit(exitCh)
+
+ //every 120ms write combine output bytes into websocket response
+ tick := time.NewTicker(time.Millisecond * time.Duration(60))
+ //for range time.Tick(120 * time.Millisecond){}
+ defer tick.Stop()
+ for {
+ select {
+ case <-tick.C:
+ if sws.comboOutput == nil {
+ return
+ }
+ bs := sws.comboOutput.Bytes()
+ if len(bs) > 0 {
+ err := wsConn.WriteMessage(websocket.TextMessage, bs)
+ if err != nil {
+ mlog.Log.Error("ssh sending combo output to webSocket failed")
+ }
+ _, err = sws.logBuff.Write(bs)
+ if err != nil {
+ mlog.Log.Error("combo output to log buffer failed")
+ }
+ sws.comboOutput.buffer.Reset()
+ }
+
+ case <-exitCh:
+ return
+ }
+ }
+}
+
+func (sws *LogicSshWsSession) Wait(quitChan chan bool) {
+ if err := sws.session.Wait(); err != nil {
+ setQuit(quitChan)
+ }
+}
+
+func (sws *LogicSshWsSession) LogString() string {
+ return sws.logBuff.buffer.String()
+}
+
+func setQuit(ch chan bool) {
+ ch <- true
+}
diff --git a/main.go b/devops/main.go
similarity index 86%
rename from main.go
rename to devops/main.go
index cf27d68d..e892c5a2 100644
--- a/main.go
+++ b/devops/main.go
@@ -1,8 +1,8 @@
package main
import (
- _ "mayfly-go/routers"
- scheduler "mayfly-go/scheudler"
+ _ "mayfly-go/devops/routers"
+ scheduler "mayfly-go/devops/scheudler"
"net/http"
"strings"
@@ -20,7 +20,7 @@ func init() {
}
func main() {
- orm.Debug = true
+ // orm.Debug = true
// 跨域配置
web.InsertFilter("/**", web.BeforeRouter, cors.Allow(&cors.Options{
AllowAllOrigins: true,
@@ -39,5 +39,5 @@ func TransparentStatic(ctx *context.Context) {
if strings.Index(ctx.Request.URL.Path, "api/") >= 0 {
return
}
- http.ServeFile(ctx.ResponseWriter, ctx.Request, "static/"+ctx.Request.URL.Path)
+ http.ServeFile(ctx.ResponseWriter, ctx.Request, "mock-server/static/"+ctx.Request.URL.Path)
}
diff --git a/models/account.go b/devops/models/account.go
similarity index 95%
rename from models/account.go
rename to devops/models/account.go
index 18f59626..40c9bcee 100644
--- a/models/account.go
+++ b/devops/models/account.go
@@ -2,7 +2,7 @@ package models
import (
"mayfly-go/base/model"
- "mayfly-go/controllers/vo"
+ "mayfly-go/devops/controllers/vo"
"github.com/beego/beego/v2/client/orm"
)
diff --git a/models/db.go b/devops/models/db.go
similarity index 100%
rename from models/db.go
rename to devops/models/db.go
diff --git a/models/db_sql.go b/devops/models/db_sql.go
similarity index 100%
rename from models/db_sql.go
rename to devops/models/db_sql.go
diff --git a/models/machine.go b/devops/models/machine.go
similarity index 96%
rename from models/machine.go
rename to devops/models/machine.go
index 9adc426f..df7c539b 100644
--- a/models/machine.go
+++ b/devops/models/machine.go
@@ -2,7 +2,7 @@ package models
import (
"mayfly-go/base/model"
- "mayfly-go/controllers/vo"
+ "mayfly-go/devops/controllers/vo"
"github.com/beego/beego/v2/client/orm"
)
diff --git a/models/machine_monitor.go b/devops/models/machine_monitor.go
similarity index 100%
rename from models/machine_monitor.go
rename to devops/models/machine_monitor.go
diff --git a/models/role.go b/devops/models/role.go
similarity index 100%
rename from models/role.go
rename to devops/models/role.go
diff --git a/routers/commentsRouter_controllers.go b/devops/routers/commentsRouter_controllers.go
similarity index 61%
rename from routers/commentsRouter_controllers.go
rename to devops/routers/commentsRouter_controllers.go
index fb58b9b5..0ae92778 100644
--- a/routers/commentsRouter_controllers.go
+++ b/devops/routers/commentsRouter_controllers.go
@@ -7,7 +7,7 @@ import (
func init() {
- beego.GlobalControllerRouter["mayfly-go/controllers:AccountController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:AccountController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:AccountController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:AccountController"],
beego.ControllerComments{
Method: "Accounts",
Router: "/accounts",
@@ -16,7 +16,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:AccountController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:AccountController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:AccountController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:AccountController"],
beego.ControllerComments{
Method: "Login",
Router: "/accounts/login",
@@ -25,7 +25,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "ColumnMA",
Router: "/api/db/:dbId/c-metadata",
@@ -34,7 +34,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "ExecSql",
Router: "/api/db/:dbId/exec-sql",
@@ -43,7 +43,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "HintTables",
Router: "/api/db/:dbId/hint-tables",
@@ -52,7 +52,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "SelectData",
Router: "/api/db/:dbId/select",
@@ -61,7 +61,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "SaveSql",
Router: "/api/db/:dbId/sql",
@@ -70,7 +70,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "GetSql",
Router: "/api/db/:dbId/sql",
@@ -79,7 +79,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "TableMA",
Router: "/api/db/:dbId/t-metadata",
@@ -88,7 +88,7 @@ func init() {
Filters: nil,
Params: nil})
- beego.GlobalControllerRouter["mayfly-go/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/controllers:DbController"],
+ beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"] = append(beego.GlobalControllerRouter["mayfly-go/devops/controllers:DbController"],
beego.ControllerComments{
Method: "Dbs",
Router: "/api/dbs",
diff --git a/routers/router.go b/devops/routers/router.go
similarity index 97%
rename from routers/router.go
rename to devops/routers/router.go
index afaad311..b84143d9 100644
--- a/routers/router.go
+++ b/devops/routers/router.go
@@ -1,7 +1,7 @@
package routers
import (
- "mayfly-go/controllers"
+ "mayfly-go/devops/controllers"
"github.com/beego/beego/v2/server/web"
)
diff --git a/scheudler/mytask.go b/devops/scheudler/mytask.go
similarity index 70%
rename from scheudler/mytask.go
rename to devops/scheudler/mytask.go
index 906441ab..e54f80ec 100644
--- a/scheudler/mytask.go
+++ b/devops/scheudler/mytask.go
@@ -1,12 +1,11 @@
package scheduler
import (
+ "mayfly-go/base/mlog"
"mayfly-go/base/model"
"mayfly-go/base/utils"
- "mayfly-go/machine"
- "mayfly-go/models"
-
- "github.com/siddontang/go/log"
+ "mayfly-go/devops/machine"
+ "mayfly-go/devops/models"
)
func init() {
@@ -20,14 +19,14 @@ func SaveMachineMonitor() {
go func() {
cli, err := machine.GetCli(uint64(utils.GetInt4Map(m, "id")))
if err != nil {
- log.Error("获取客户端失败：", err.Error())
+ mlog.Log.Error("获取客户端失败：", err.Error())
return
}
mm := cli.GetMonitorInfo()
if mm != nil {
_, err := model.Insert(mm)
if err != nil {
- log.Error("保存机器监控信息失败: ", err.Error())
+ mlog.Log.Error("保存机器监控信息失败: ", err.Error())
}
}
}()
diff --git a/scheudler/scheduler.go b/devops/scheudler/scheduler.go
similarity index 77%
rename from scheudler/scheduler.go
rename to devops/scheudler/scheduler.go
index 2549256a..3e7c6f8d 100644
--- a/scheudler/scheduler.go
+++ b/devops/scheudler/scheduler.go
@@ -1,7 +1,7 @@
package scheduler
import (
- "mayfly-go/base/model"
+ "mayfly-go/base/biz"
"github.com/robfig/cron/v3"
)
@@ -23,7 +23,7 @@ func GetCron() *cron.Cron {
func AddFun(spec string, cmd func()) cron.EntryID {
id, err := c.AddFunc(spec, cmd)
if err != nil {
- panic(model.NewBizErr("添加任务失败：" + err.Error()))
+ panic(biz.NewBizErr("添加任务失败：" + err.Error()))
}
return id
}
diff --git a/static/favicon.ico b/devops/static/favicon.ico
similarity index 100%
rename from static/favicon.ico
rename to devops/static/favicon.ico
diff --git a/static/index.html b/devops/static/index.html
similarity index 100%
rename from static/index.html
rename to devops/static/index.html
diff --git a/static/static/css/app.e8323368.css b/devops/static/static/css/app.e8323368.css
similarity index 100%
rename from static/static/css/app.e8323368.css
rename to devops/static/static/css/app.e8323368.css
diff --git a/static/static/css/chunk-6c422708.2d81c5bb.css b/devops/static/static/css/chunk-6c422708.2d81c5bb.css
similarity index 100%
rename from static/static/css/chunk-6c422708.2d81c5bb.css
rename to devops/static/static/css/chunk-6c422708.2d81c5bb.css
diff --git a/static/static/css/chunk-vendors.08810481.css b/devops/static/static/css/chunk-vendors.08810481.css
similarity index 100%
rename from static/static/css/chunk-vendors.08810481.css
rename to devops/static/static/css/chunk-vendors.08810481.css
diff --git a/static/static/fonts/element-icons.535877f5.woff b/devops/static/static/fonts/element-icons.535877f5.woff
similarity index 100%
rename from static/static/fonts/element-icons.535877f5.woff
rename to devops/static/static/fonts/element-icons.535877f5.woff
diff --git a/static/static/fonts/element-icons.732389de.ttf b/devops/static/static/fonts/element-icons.732389de.ttf
similarity index 100%
rename from static/static/fonts/element-icons.732389de.ttf
rename to devops/static/static/fonts/element-icons.732389de.ttf
diff --git a/static/static/img/logo.e92f231a.png b/devops/static/static/img/logo.e92f231a.png
similarity index 100%
rename from static/static/img/logo.e92f231a.png
rename to devops/static/static/img/logo.e92f231a.png
diff --git a/static/static/js/app.aa8651f8.js b/devops/static/static/js/app.aa8651f8.js
similarity index 100%
rename from static/static/js/app.aa8651f8.js
rename to devops/static/static/js/app.aa8651f8.js
diff --git a/static/static/js/chunk-4a3c1aef.94cc2a02.js b/devops/static/static/js/chunk-4a3c1aef.94cc2a02.js
similarity index 100%
rename from static/static/js/chunk-4a3c1aef.94cc2a02.js
rename to devops/static/static/js/chunk-4a3c1aef.94cc2a02.js
diff --git a/static/static/js/chunk-6c422708.a09466dd.js b/devops/static/static/js/chunk-6c422708.a09466dd.js
similarity index 100%
rename from static/static/js/chunk-6c422708.a09466dd.js
rename to devops/static/static/js/chunk-6c422708.a09466dd.js
diff --git a/static/static/js/chunk-945da412.570aca5d.js b/devops/static/static/js/chunk-945da412.570aca5d.js
similarity index 100%
rename from static/static/js/chunk-945da412.570aca5d.js
rename to devops/static/static/js/chunk-945da412.570aca5d.js
diff --git a/static/static/js/chunk-vendors.a6a99ea9.js b/devops/static/static/js/chunk-vendors.a6a99ea9.js
similarity index 100%
rename from static/static/js/chunk-vendors.a6a99ea9.js
rename to devops/static/static/js/chunk-vendors.a6a99ea9.js
diff --git a/go.mod b/go.mod
index b72f3dde..07b8cc2f 100644
--- a/go.mod
+++ b/go.mod
@@ -6,13 +6,16 @@ require (
github.com/beego/beego/v2 v2.0.1
// jwt
github.com/dgrijalva/jwt-go v3.2.0+incompatible
+ github.com/go-redis/redis v6.14.2+incompatible
github.com/go-sql-driver/mysql v1.5.0
github.com/gorilla/websocket v1.4.2
github.com/pkg/sftp v1.12.0
// 定时任务
github.com/robfig/cron/v3 v3.0.1
github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0
- github.com/smartystreets/goconvey v1.6.4
// ssh
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
+ github.com/sirupsen/logrus v1.6.0
+// github.com/go-redis/redis/v8 v8.6.0
)
diff --git a/go.sum b/go.sum
index 59e2e04a..5a5e5324 100644
--- a/go.sum
+++ b/go.sum
@@ -7,8 +7,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
-github.com/astaxie/beego v1.12.3 h1:SAQkdD2ePye+v8Gn1r4X6IKZM1wd28EyUOVQ3PDSOOQ=
-github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
github.com/beego/beego/v2 v2.0.1 h1:07a7Z0Ok5vbqyqh+q53sDPl9LdhKh0ZDy3gbyGrhFnE=
github.com/beego/beego/v2 v2.0.1/go.mod h1:8zyHi1FnWO1mZLwTn62aKRIZF/aIKvkCBB2JYs+eqQI=
github.com/beego/goyaml2 v0.0.0-20130207012346-5545475820dd/go.mod h1:1b+Y/CofkYwXMUU0OhQqGvsY2Bvgr4j6jfT699wyZKQ=
@@ -43,19 +41,19 @@ github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3C
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-redis/redis v6.14.2+incompatible h1:UE9pLhzmWf+xHNmZsoccjXosPicuiNaInPgym8nzfg0=
github.com/go-redis/redis v6.14.2+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg=
github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godror/godror v0.9.0 h1:IQ+HRUl00B1V03jR4AduWKkKlP9RsTq9E4iEG3gcCZY=
-github.com/godror/godror v0.9.0/go.mod h1:06LLZykQEXjuUYiVKBa7Ls+AvbUZ8sbtolIALCeL/jw=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -82,22 +80,20 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -114,8 +110,6 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8=
github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/mapstructure v1.4.0 h1:7ks8ZkOP5/ujthUsT07rNv+nkLXCQWKNHuwzOAesEks=
-github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -125,12 +119,13 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWb
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU=
github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
github.com/peterh/liner v1.0.1-0.20171122030339-3681c2a91233/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -163,20 +158,15 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644 h1:X+yvsM2yrEktyI+b2qND5gpH8YhURn0k8OCaeRnkINo=
github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
-github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
-github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0 h1:QIF48X1cihydXibm+4wfAc0r/qyPyuFiPFRNphdMpEE=
github.com/siddontang/go v0.0.0-20170517070808-cb568a3e5cc0/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726 h1:xT+JlYxNGqyT+XcU8iUrN18JYed2TvG9yN5ULG2jATM=
-github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
github.com/siddontang/goredis v0.0.0-20150324035039-760763f78400/go.mod h1:DDcKzU3qCuvj/tPnimWSsZZzvk9qvkvrIL5naVBPh5s=
github.com/siddontang/rdb v0.0.0-20150307021120-fc89ed2e418d/go.mod h1:AMEsy7v5z92TR1JKMkLLoaOQk++LVnOKL3ScbJ8GNGA=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/ssdb/gossdb v0.0.0-20180723034631-88f6b59b84ec/go.mod h1:QBvMkMya+gXctz3kmljlUCu/yB3GZ6oee+dUozsezQE=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -204,8 +194,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM=
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201217014255-9d1352758620 h1:3wPMTskHO3+O6jqTEXyFcsnuxMQOqYSaHsDxcbUXpqA=
-golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
@@ -252,8 +240,6 @@ golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 h1:ogLJMz+qpzav7lGMh10LMvAkM
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 h1:/ZHdbVpdR/jk3g30/d4yUL0JU9kksj8+F/bnQUVLGDM=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -265,7 +251,6 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -302,8 +287,10 @@ gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/mayfly-go-front/.env.production b/mayfly-go-front/.env.production
index be94d8a4..a300ec56 100644
--- a/mayfly-go-front/.env.production
+++ b/mayfly-go-front/.env.production
@@ -2,4 +2,4 @@
ENV = 'production'
# base api
-VUE_APP_BASE_API = 'http://localhost:8888/api'
\ No newline at end of file
+VUE_APP_BASE_API = 'http://128.64.98.54:8888/api'
\ No newline at end of file
diff --git a/mayfly-go-front/package.json b/mayfly-go-front/package.json
index 6b6eecdd..91732f7e 100644
--- a/mayfly-go-front/package.json
+++ b/mayfly-go-front/package.json
@@ -13,6 +13,7 @@
"core-js": "^3.6.5",
"echarts": "^4.8.0",
"element-ui": "^2.13.2",
+ "jsonlint": "^1.6.3",
"sql-formatter": "^2.3.3",
"vue": "^2.6.11",
"vue-class-component": "^7.2.3",
diff --git a/mayfly-go-front/src/common/Utils.ts b/mayfly-go-front/src/common/Utils.ts
new file mode 100644
index 00000000..7955e9c9
--- /dev/null
+++ b/mayfly-go-front/src/common/Utils.ts
@@ -0,0 +1,72 @@
+
+/**
+ * 工具类
+ */
+class Utils {
+ /**
+ * 属性拷贝，将一个对象的属性拷贝给另一个对象
+ * @param {Object} source 源对象
+ * @param {Object} target 目标对象
+ */
+ static copyProperties(source: any, target: any) {
+ for (const k in target) {
+ const value = source[k];
+ if (value) {
+ target[k] = value;
+ }
+ }
+ }
+
+ /**
+ * 重置对象属性为null
+ * @param {Object} target 对象
+ */
+ static resetProperties(target: any) {
+ for (const k in target) {
+ const value = target[k];
+ if (value != null) {
+ target[k] = null;
+ }
+ }
+ }
+}
+
+export default Utils
+
+/**
+ * @description 绑定事件 on(element, event, handler)
+ */
+export const on = (function () {
+ if (document.addEventListener != null) {
+ return function (element: any, event: any, handler: any) {
+ if (element && event && handler) {
+ element.addEventListener(event, handler, false);
+ }
+ };
+ } else {
+ return function (element: any, event: any, handler: any) {
+ if (element && event && handler) {
+ element.attachEvent('on' + event, handler);
+ }
+ };
+ }
+})();
+
+/**
+ * @description 解绑事件 off(element, event, handler)
+ */
+export const off = (function () {
+ if (document.removeEventListener != null) {
+ return function (element: any, event: any, handler: any) {
+ if (element && event) {
+ element.removeEventListener(event, handler, false);
+ }
+ };
+ } else {
+ return function (element: any, event: any, handler: any) {
+ if (element && event) {
+ element.detachEvent('on' + event, handler);
+ }
+ };
+ }
+})();
\ No newline at end of file
diff --git a/mayfly-go-front/src/common/request.ts b/mayfly-go-front/src/common/request.ts
index 9692131d..0af96c29 100755
--- a/mayfly-go-front/src/common/request.ts
+++ b/mayfly-go-front/src/common/request.ts
@@ -4,7 +4,7 @@ import { ResultEnum } from './enums'
import Api from './Api';
import { AuthUtils } from './AuthUtils'
import config from './config';
-import ElementUI from 'element-ui';
+import { Message } from 'element-ui';
export interface Result {
/**
@@ -29,7 +29,7 @@ const baseUrl = config.baseApiUrl
*/
function notifyErrorMsg(msg: string) {
// 危险通知
- ElementUI.Message.error(msg);
+ Message.error(msg);
}
// create an axios instance
diff --git a/mayfly-go-front/src/components/dynamic-form/DynamicForm.vue b/mayfly-go-front/src/components/dynamic-form/DynamicForm.vue
index 0e39cf55..d22cfe70 100755
--- a/mayfly-go-front/src/components/dynamic-form/DynamicForm.vue
+++ b/mayfly-go-front/src/components/dynamic-form/DynamicForm.vue
@@ -67,6 +67,7 @@
+
diff --git a/mayfly-go-front/src/views/machine/SshTerminal.vue b/mayfly-go-front/src/views/machine/SshTerminal.vue
index eaf235d6..918a6924 100644
--- a/mayfly-go-front/src/views/machine/SshTerminal.vue
+++ b/mayfly-go-front/src/views/machine/SshTerminal.vue
@@ -14,6 +14,7 @@ export default {
type: String,
default: '',
},
+ cmd: String
},
watch: {
socketURI(val) {
@@ -38,11 +39,11 @@ export default {
// cursorStyle: 'underline', //光标样式
disableStdin: false,
theme: {
- foreground: "#7e9192", //字体
- background: "#002833", //背景色
- cursor: "help", //设置光标
- lineHeight: 16
- }
+ foreground: '#7e9192', //字体
+ background: '#002833', //背景色
+ cursor: 'help', //设置光标
+ lineHeight: 16,
+ },
})
const fitAddon = new FitAddon()
term.loadAddon(fitAddon)
@@ -66,11 +67,7 @@ export default {
// * /
// 支持输入与粘贴方法
term.onData((key) => {
- const cmd = {
- type: 'cmd',
- msg: key,
- }
- this.send(cmd)
+ this.sendCmd(key)
})
// 为解决窗体resize方法才会向后端发送列数和行数，所以页面加载时也要触发此方法
this.send({
@@ -78,6 +75,10 @@ export default {
Cols: parseInt(term.cols),
Rows: parseInt(term.rows),
})
+ // 如果有初始要执行的命令，则发送执行命令
+ if (this.cmd) {
+ this.sendCmd(this.cmd + " \r")
+ }
},
initSocket() {
this.socket = new WebSocket(this.socketURI)
@@ -108,7 +109,7 @@ export default {
// this.reconnect()
},
getMessage: function (msg) {
- // console.log(msg)
+ // console.log(msg)
this.term.write(msg['data'])
//msg是返回的数据
// msg = JSON.parse(msg.data);
@@ -125,9 +126,16 @@ export default {
// this.reset();
},
send: function (msg) {
- // console.log(msg)
+ // console.log(msg)
this.socket.send(JSON.stringify(msg))
},
+
+ sendCmd(key) {
+ this.send({
+ type: 'cmd',
+ msg: key,
+ })
+ },
closeAll() {
this.close()
this.term.dispose()
diff --git a/mayfly-go-front/src/views/mock-server/MockDataEdit.vue b/mayfly-go-front/src/views/mock-server/MockDataEdit.vue
new file mode 100644
index 00000000..8b566ead
--- /dev/null
+++ b/mayfly-go-front/src/views/mock-server/MockDataEdit.vue
@@ -0,0 +1,236 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/mayfly-go-front/src/views/mock-server/MockDataList.vue b/mayfly-go-front/src/views/mock-server/MockDataList.vue
new file mode 100644
index 00000000..79b1b026
--- /dev/null
+++ b/mayfly-go-front/src/views/mock-server/MockDataList.vue
@@ -0,0 +1,244 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ showEffectiveUser(scope.row.effectiveUser) }}
+
+
+
+
+
+
+
qb6=K0nV`55(w*oOsifOkBzoopkP856r|{X;`^I0
zF+yb@n9whD)YPw#4Kd807&~x2)`9g0^11gYQ$EiPPnXZWFVf{R{OC^QbN6DqeCl5@
z*?h
z4rPPR%{5t%IjBxtkeCdOl|0a5&}pSy4T-URE10^HBFmdwUOueh}VF
zT!+`*`^wyK;ri;M**x?qUk{zEhj#DQah#ELLQjl1sqiiFhM1dVc#Pfe$|O?sbKC6F
z@eru7^+RMxUlKx;AL3oaHR;c`l|2`WEi#Mc=qxt&?^0~mXSQODVpM%$5{nI1#kzlQ
zD<;eTmz&Ta4;1T%J44%wpLGh$*N?VMb@4n4>pROcDnU!kwCGE^a%poQ@`6RTeE5~ai2=I9@mC4I
zwevn?P~%vpT;CXHfNohPU|Y+XJ5xfAz8}nVg65gS;fZ2Q%Gd
zC{8DCqFS&;d^i&zu{lU$iNbBOp2qO4)P&v%?9WnR=VJdg*WUp(*ACSJNZ@z_(K&0;
z5)NS+GvMP!>Y;vKP9^gR8SjR3YB&1cOmSOpl`dr_jB*H0mbePpwq}#WMO;sBwJ8Bs
zXdK3~Xeeq_x}XG?(Fl_4NBmH8G~^FspNx!FASdIoSJ&jI~HZ9ni5jY)HtQmPduRSEw5Ec|{V6c=3B4w!
zFvEiycHr3maCzS9AhVp7)}s`lb4W348ae06U=!HG4EqrB=fWyA#*TccSfeMbRZ~v5W%J{L8?inVqz5gfEsp^#0xoN83ud6Vjm82qlEDN
zOvK#i`-fxFWFt=ES$u{fAaH2n{kXa|%IsFxQW0IMywDzJn?uSUp%qgyjn#tkBtjFE
zc@(cmTF+ZumymQpxK9*^-{KJ0#it~Z%i$}3cUFqi!tglkzzpa;GG0oE&@N?T84gT|
zFH9ppAwftiIsYp2TOR7JiqDebP{zDR9mh6O6r
zz<#2}@6%eS4K*t9!5;N0PU?J2#Px-Jg^%Zm7|ULw?g!dk4mrfwh8vSW$mXn-6k%ys
zB=kd$V??JE?my-_iaUEOFNJHS{vI(*Cb*AXuf-WzG+BvRFsYDm)e+aH_t9;U)9A?Z
z)HInb`?9y}**&OWiQ2}P!!hj+{5tKB9+Mr_R)>^El9
zOBn-H28(7+`G>=;H9&F>W8OU(IAStB1nbB?J#yIZkcDl&XX=rnbq9a#2#wszFd*1^
z=By9l+8)}9Np~&)U?({azU1~-t?^oTciZ}8kplszHoFO0i{lmB^@fdFgP%8HS2?R&
z&o+{I0O51g^wL{g1<2!{9xTdZvN}6{f;wT)HIUW9*@y5FZ1d>@n`9AJ-|~q*466qH
zoye%(0;TupyC6IS*IS>)lE_PlwZy@MTo2)U4omoY1N@7h;>DD>Yx5SsW9gE=u^^O|
zt_Z@z(BtD=T_Uw6VssGp4I?kx>1PFg>B{xPIY>svg1V+#Fehjkp3Hx(k^ZlJk<9?5
z|Gu1?dBd&?fr~VIf$9kBA5Sk>h=Rt;3e30`Tdo8|3tm9(p(?lTT3aq-X4v=sP14Nw
z@0rcS)k^wd9h%vUf<~zV^ru=IAaNHX*~|-Suf?GBW{i7PBX?Sj%u$UzcC#%)I12a}
z*RvpZFjFaH{5n&S9mj#GWP|jM5+963QQ&Xx@95P5qeq^X{J{#RIoH@Qmf=E%!fF4z
zCgI=WqjC`QkJs67@)D=**eIfQEoV85T?+F{I-v6xlrl!B#%{gM)|jxTKac_N?R{;)
z8I*(n&q>Z%vg6&PPyE^^$UywIU>_XYMP2SsN!o9u*t=8hFBriwOx>=9fY1E}_wgDr
zuUMLV3itK!JdwFNKgfi5j!VglSc;!&ZpRm!KgP|Eba`d`QTxa7i06l#iS0fdEan(a
z4{E>;JT&o!a*3elncMQQRUm$fI_C97A6mh1^F=pa70{1+ac7u~s=M%ut#XG^`u$A#
z5gCT>XN81+=2r=KVR+54Pu2g&-n+m@Rb74m2}xk0&=V_a1k|LBHMCZfN^4Syoq?cd
za0Ua~Hj1@rwKQ#Mn?eF8J~cQA=5!pJw$|F(_SM#2d|GSO7Q9sxKtNFB;sv2qE{bOy
zRKONcEP21bea=iKLqPld`#kUe{rvxaK9V`-?919~ueJ7CYp=bw9WSsJ%|;lnu*a^o
zJNKfB?Pts6lXmS2YvIQ!RlQdkVr%!cPVx62iNCQrCzj^GhOdD4DKi9+r5L
zC$F8}@(E8(jZ)-+<~YSt#T6g6Gk%Z8(#0zip|V0@9nI-GF(MAvX`|0#Typ8fb9Vl!
z@cqEp*N6OzL}$Hy6!@lPIJ&?$8Rn(6GV@^Qo=)Je&%);MW6%;1G$-X5J^hR
z=*UfmHaN&YT|WU)Vqv8rJD=7A!^=G@Frd~FMH9{7(e2#ZPf{~JeRb5BHNj6+7Qe5>
zfDmM*zOR{|t&`XQ)(<=W1AVd+Q_}enS6SDs(emTO{qIeD&n!T8?HcR4r?C{1x0^yz
zjCywz_J7yZ-7C=IBi61J>8G8PGGTp~zq?N#ASd@OHe>{IX+M2He;29gcm{R>V8cPyp6foH@@Q}}DZ1NMpd`8rD+(F%e
zTkzp~awV+&NV;DMs$f{cpXO5u{c_gohM~OVt;RdTN|Y?nkepp^F+l)s2mc@~sv5Eu
zQ~~1t?$>5LedDRD55|f6eSL5?0&+0VeVH9{s;~Y_)mdeBR5_CRsAW>waCFuu?KmCUD)??KD>
zBQ{5tX<>f$>lbGKZHlDufRxI9k6zbJViHaSc?sg677>Zjj6EVD*6$&YNC?gG^t;im
z11QB%6w5jWJqHkitS`tHwP5JqPF#u(z0vBBG|@1+__l+w5PEZW$+mCOE6X
z@&OH|9v9`Kp~zy*sS6A(0BqK|dFDsDUGfh<$mMy-AIeub*nc_rFB?KDIr}5HFgk|F
zS`ONE3u)bod9ja?C6xlHOd6g$uH75GFU(Kji!-I%XRpm}-I!bH_^;YfjkWMGI*$eU
zqYnY>D-`PoY`OqDUVyFh+P(Ea786%%B=_GwB<}&uy!-kHMe;Sj4n-|xfrX&@=_gTN
z;d=JLH%K;*eQ*mkWFHt_N_c-`bq61NEpLd`afZqe40@XiNyqDAQz}+BZw_M-xT!P2iohlkX9b?T;%Rz&7fC@0L&?UnhY<27-{@~0
zf1!jO|9Ojq7d-BmUq1a~U)<2?wJ_3e;nJ$^zL@8>zqG1jNbI3qw8oK)d{96~Ua<^)
zU({fAtf7GwF%=WQ8N9_GTC2y-KC7d|fN*Wl_=$LlisxBk#z1)mt(nE38?fV+Md_SYl@M?VGfG9|jhvA0XC*h9RtW!|s^ad(E6;y(~}
z60`ao6LcASJD)9$2Qph4A#Y0qJLP_=N!#ew-}EfU&&R67TNcqxjMl@OLJtS|9JT8I
z8jc+ZT8U>Mf=Iln>cYh7V{HaXI=@7L
zXzdQG<1&6IcDRGrLO$!qL5PR@{&WPCmOopXRX>JT>J18VZa2Wr?V=^I2BC%8
ztrBwB|K18;J{hZfsFxPnxT<)>hw_P9s~vF~f2<$$r0#-(`nSfq`xbai7OWEfP+O!#
zWPA>3;RDV~+~Z(9p)XyVQ(WF&Dhh$~V;_fBr#3(Qy)|Z?HPv1bG{k5w-}VQiUeXD;
z<=jZ?rBY$t-=9jBiSMc=BL^-|uQ3Em$uwCoVtr?cl%aadqI@AbIxE>C7^@^V~Ly}J_^O;K_MB{
zh|OBfc0M5yYh_uV9NIP~`s3IF`)-
zP}G&Tv`kt8Lem&((u7dP?X-9zeW
zRXvyGHii0@%&2!7nqcl`&hb7IDQFe^&0HQCGkx*G7s{0QU^NBOqAlbnxcAF>|Y
zh99^^O1@mkTMioeo%}p65OVwBYU}!~&}=v{VHn3}3t-}U@KLt_tXQ$Je2*lKd+m~!
z^3EeOEUpue{}F5xt=QjTRjj?cr@xeUzO{JFMG+31+(x~QVcns1+a_6yo}W~_DP%2L
zlGdQK+%Ur{DmBAMszynw?V-N}sf46@IU_;Bv3C$z6M!ocZ$@Obp30ATQm(xIqqPUE
zm`;man3#ELUNrIb{P4cVJc+fQwz{LWZ&)2G`K4pcJ*{)99|z+%8E>2!-y|+j9Q?A^AdjmK7sV?;W
zuaidz_6sK>6+V5u6yA`EmT!+ZjnGH4=%W$(SPFeKLLZHyj~5~ZjnK!&WFPDUeeCB?
zIC0&zkO^}<4F5viTOh}ZDPDpZ9MR#;Z)x&_lr#be-P+=0e>=rcH)c*NLTu|4MWUZs
z=P50+;;c@?5OhUCBbitL|X#*T^?NG3ae!YhoD}qh(+ZcM_R_J)J
zS%UF4^ZngWY(hMey74sR{XD^><*EDlBiQ}u2c0j$mZ@)$YoC#+{VUuy|ea#i2&$6!@~o@q?^(&4c^_#FIsx^rYwEd
zD7wu*GMZ^=_LZr|i+!Q@;oj`fBb~ByKjD1{zn!I;evA*;m!tXA?LGralP%Czu8o6C
z&)$F90J^bn5UevnKl}5@B^fq}uDmk7D8tN6Dx!EJms5G<-QL&RcM5N;NvwEg%M+jF
zmJymr3EF@=>f3S$7M*p5x7nli3|EuaL7fsz7|i!84eR#7WnGOn-DQ+4tKiur3+f%KdJ`9sb8E9S%S;%x3FN|RsC9C2Zm`wX?M0?m!q5bbv;+s>@R|{=h?Pzy-)(b_thd3
z2S+M|e0HKJyfm)?nZ-1AeX?{U*Jn?i$cV4t?FHc{`*Jf~EH7
zw?-xM=z*uNg8jf82KJeUE1oF2
zr}{c(46;oW4Sn?IhP(p!AGsgB+x_7d@K=R+9WXc^a>keN#>dQRj}aU~V50YU`&xZr
zg|QJ_K_RXLa+|Xjl@h{q+w}DcS#00{GJyn*X!O({qvr(Nsv;4t+Kds=$=>AL2PD0E
z+WrX0_r8`z6nO6Q-0~j?^35*-`QhVFnGB|JCVc`dAfb+A)=uO9(fQT9Vb+Zm@Sx0z
zVT?F!s7eMSN%e7YFPD~&cWU{N~&LU9#oOU$g>qQ
z+E>uGgtcRjZGCu2_YB+mHlhO-d-Y5^w(S%`v3S-iIQ*vC-1*ZHeum0&heLYMgb1THf
zmX$8GN|q3EOQ2@}#W1N&4OH_=KsU4ImBE4fKsj&R?f)#&T^%{}BQ|GBAP|KRG9}!>
z0achb(t5t2BAtwPQyMdWmCosU1XV9fRg4MsH0YOMVVFj6vc3YC$ckUkn3tb?`d_I{
zar3E3gMk~D1(&+N_*)U{M{@cgM4!b3+3=TI3r|K31b+IS2`Io1xy!VW73dnBPM3iw
z$nuMN(oHIz>#WW{>0!ZJd1X>EZ{#6Eg9|!RyRg-Q8uO$Hk5l~gW#&&p}zdX}B^%oq}
z1y0t&^VO<$#(4ti6@SzE58B)Zf35BeMzvDHzm?)&g4Wv5pOPI08ce~WxBjdugtH*v
zwCE&GdWAO%0zQ^I-O)2Qsu`FYuYmYanc|!f5&>a=t$_yF2*}6U&bIUfI0qidI0w%2odc5GiQ|rY5SVJ$v6KOKGcO{4H7~f#
ziNUpq9Mb+*EuZ*b-BmSat@)q|I-Yzo1Qu{xY9*g&IJKl36x}1~LR4|6r
zO?K=Y%%i*E4|qB`1_Cn~NEW2aS3d2PZxm3_vL-fh(pUMM{FJHW_1f&=|C7HOfd7GD
zoBIrsi)Dc&iYnCs@zC!#-Mv5E-H)F!Uw=I;OL;=0@#7yhC(LkL*2l?tQ@jgts
zJ?q1V_2EwM!>RXY3FJ}w(9MT#ch#c^C!g(f&btJId9=VDBY~l(2rt!6C@2vJL*l)F}lwx
zEM2lFaF5ORRNG+{IO$6UCK4MYMshT9+Cim5EZ<~v#|(sFZsSnXG0tFmtOG%_jO>!?
zobmkAaf7C)#C`5J-V{LqvXVVr%*-vG5H05JGd>eB+wyK3vWF#!|LK+hYy>cHlR&cXWX6(J0q
zQ1yOiU+?QB_0`Lr`^*Y8d3XC;WhbsTHw$mrUcMo5QD0)rxt*KZjm2aO|U&
zX8p{Pg@gUfnIB^1G(RxROpwF;G-v=#;Kk%M@T6jVYDq={8HpBAEqJHdT0DDN7^g#G
zJSQfv-H%L*eF|0z@Vz@$_uW6?_pv%(7yqx2JD5s#Wk-IjuFd;ml0&WtmFSZkAVI^P
z4~VCLqM6b`J9ZU8Vx0-v=+;~`@uHG0&QYWBsm%E&d2&tLVTkJ(Y0J7$k+6qZU5C!8CH5?Z6woUJEaRQ?LJX*x56UOtY`|8gcwasQI^hg%~dW5~7_DFsl2T%!KGw
z;;KsbZT6>9JIvsdOZ9~_Zq<*w+W}Aev*UQhD$@AoUY
zYgMLDPnp@)T7XQ)}tuR}f2S_+4e9gpyJ7hRzFlgh
zjlE&Jy)MNPKb>T6_t~{eXKn79T-@=v)?$-dB(0k1u~Bmf5f@f;fkw$l!`1Fi!FFNN9-Z<*9k{+M@lur&FrblfMQ?D|4o2W9|
z+_SF#552-OHJ88caT}Oo-SU!4fCK2yS{U@?D*&h0KeL0H4nS>JvckWL2AFB&!0ceG
z_Z^c&%HHsbo&TI2|3sLq9oF4AKRy4UB3{~&sxiD6sHlCOAM_J?NStr{plJ`N`XC}E
zRsT}n1n!azAj0cKZ2R$l8lOpG#NFp9T6cKJu6>GaGiFNqDf?rWsX3AlI_s*}+xzzV
zOR8Z)i8&FVwul9<9X}WF_S>;<2l86y*^Zc(gct6`U(k1v1QS=L3Gnv!rQBgyGg@o$
z^l5hADr#@Ai7QKtXJMD*<;C;eCD`u{Oy$cE@77Ge*x&nj
z$qhyq1Z_tuqEzBxyF7AY{>_1G21a;ZvI4PcC$3LB7d`wK|KjYKVD6r8`j`{WW;gKW
z+DR|5BL~8gt3(Wm@8*>;%G#&qphUctT*Ny7|E_UA5i+@jz^PxToV?|lUS}o!OU-nj
z{SrI0#t|1mntG17FY1?hSEFAGK(IT7U)}C+*FtQ+^rT%5ebssNMcZ=Puzn-Pgml?A
z%QcI!8kR@xJz0xvRt5<7;9o4hGwadyL`L=)x-nUbdFRL34cgEi4rn<*@
zuojIus%B&B$+G`DHn(kuZ-2N{y1Xno#BLR8M<45(a;{xuIytWhN0X#*6t`xySwG7X{O9bTv4B|m=
z0Ao7E=5?}K1ra2}k1@Rk>1|8??Dxw?%7t!aYNxgM@@anJ%>8!!Xk&MtDIx@rN`*I(
z->AquKcCzo%2}66dUsjTecYz;t%b9co8o5njJ}sVAv2a%7fW
zP%h&7-U6xr7p#G}ew|rLbLcC21p0bHb7$yF+w$4;^_IT;yXi}`B^t}6uR3*hIQlBp
z#~k{4Bb&Ymt4q_@2eatw<7`OW0oWcn+r>NyM&4o_;`sTEZG?J>EucIvgzn(*sx<|t3{
z<_x{P%lcX1(I2v0$_Da{MN%{_`Li*xAsjY*N--$l?
zRaLJ~?i0B|ej9!AQzphEp}_ss-OFD*>a^x3k8Z@$Vp6I7V^wXkE`z|3`
zB=iG5OK_Q0u~}u=rf=8R^up-hS1Uh4&f3VhL8NyDE;JR0y;<0GNdWUyd+on2R2x4v
zZ6z1eU>Fax;Aj7tRqbRxcMN4?dd%@t5*5eS*AT+Ur9|jo+zFaLx7e%Wyg2gQSEP8bBfHJuCc9F$XFVo4cpWD?Tksa8?1#&G9B%F
z$?CY6G3kEM#)xxeMML}oErCP@5JR2kJ><{2%8pM&zb>qhksZ*$a8nuKUE*hkFe87@QAaqIrKn5U!#z>r
z?jR|T%9n;Z3M;zP;8}|%HbfI3HJTW{EQ&Veqtfdvc_mGHq-QqY`6>H<5^tf;uQf!S
zXBF_l@A*^taggw>H^R=oXrl0Aq)DaC$j6C)2nQn0!Kkw*;%qhikvt0iR$LXiFU_>e
z8^x~%+L_)!JDb9ZacAKs57ft}UrdmQr`&x);|Ll`FdAN(2qXsC@XS*3Y6c7Wb
zElJiSZ(>k*vmjHbgcgIo>Uo1ttN4lBZ4DkaGJ}#d3_xtT=WM$4WtmkT$2oC4a+#&4spLcDPOcl
zz`eIYZrvn%g2;>jbtaa0Z6nBap=0JlVt$GH^b3&L7IcB1WFKTZjS#eC
zdHTZ)iLosE=n;Kknwm1pKr4Jd$QnSI=6=~fxMqQwAcmm+>YXe?m`BrQzM5A_sUOQ&*)oW+s^1}T5aBTmubjbRp(<06q
ztV~@^0LzSKx2?6P{hYkE8G_kPoog+=8m`(%f9Ir&)V|r4d_dmmP>1{Z~B{SsJl
znvBV3HE#Pbepn8@gq@WgLy4c&{psEMzMM=N7$f*6YTs-v!Zk#ma)X|}qmrMOY}Bn!
z&PEO(rtX+XO8x*R&}6?7Ah*W2A*wgKud&-{4iwt)2`ErR{I;H|O&4c8f=jN8;YKQe
zTZ1b}qo8LZW*7R+4w&uv>dmz8-l`UFrF%PmDTeWUyyqP^m`7}2=HGVwh049>LQN7)
zCua&;XQlWn`8uM?Ea{2ymK-v6+%nooLLv+T3Rd?eXPDpepz#9QF)~`BR{k?ymAGwW
zAkzCv^+^e+CYfi1AZ61whRFlu6RdAi82XbY7+^wZLDuW@$bgHdWo=#=DY9V}a>7~Z
zT@d~uf(r2Hcn>G?K$Y^`DxQ3~m3rj=)~455gx0&rkMD~O2l|lBsPJ(NmF)0x8I_PCn#lfywlkIp5DHp%xmC92oXI7aVpB^;R
z)ph|yI8S>VKNZKs8`>Id8Lv{`8oQiBr?Y~3+pcr^d+iM=
zyZlW%wtZOFrN|n5;*JDIV<5J@p#4BW>u~m_0}mjq^L7Owypa|7cMll4N&Dh)`qsEz
z+MU}Y9!OkWF(w5ZVK0U
z(TFpBk9ED@08?;_sWnzA{p
zon9Jh|7ZT3XZg3Vb!{m2(lE+M8Qg*H_Hxu&LC}7og7%rO-SOG17d!H17e?b1#G4XW
zY}EXSvyDnuNNfB%#b3WLQAm{_nj*pjvxnmo@4z*bX~M_2EPz9k#|U5tX>N!W>*UeU
zRj`B8x;vmuYth`veQSd42MJStDeOGy>_$B`;mX?(&Ermq?Z^+;?rD8r#CbjH>_;C>
z9)niSr{Slxzs2zvZ8sYE(f(F})$viDOxPypD>~N+nU0Jrq?SZriF@`N9yOIp`jw$<
zw0%^>1$GT)rKfQMRhD%eP&-z*MtjHqKa4anXy?QIQBo-I!m#!;PvmG&LcYq0M2&f
z3dQF=%lDgOb?a{y1fOE}6NSNeHO~mgInMB)dC#7gsbi9d_Fs2G{mpEC>8_J)$m7&n
zcc;4hi)X71nLWZ_Ew(#9xx}!66pvu34d;4mhpe6@ed~k|7{FkR6Ba(&`Z3m&#u#3Q
z2xs{S97!WGk?#J)`zls{^1HL%+%K()nxW
z2HTEmzc!3oCQnp^N$}4vQPJv9a1JQ8i|cDHoNRUe!W6l%l(_h*#rzZYJ^R$8@>GeaK5|;kE0GpowZ@d^N*iq+(^6Gfff&MNq-ecV=7a*hG@O`XYFLllA?r;1!DdrA
z^)!3@yLe+KK1&zM6ya_)kMk7_@GL)*U)M|}=9TiiT+fx}xyZ3|Rk^@djLFw>$cHzY
zh5S4JOl943pv5i+|3i@U;NKShgTg<5(a%WH=)C8X^o%+=Mzf5hs>c&}r6?T6ej;iIrXIduPFB4bSW&E9TJ
z`TJ~g6l;>vJ9Q}-aU7EWPr(aGEoS)Ji$3}xU%$C>y*FfraKEW-fZ4iva9uS8fiZC_3ZpU=YF7{nnRUxDd>pSO3KKf
z?p8XN9z7I%D(Cjv9C3tx9v1)Uc|YhqMaJ7
z8(%Q}qpx-Rp7vq4(~QoR+>0{F887P1mYWZEVg5g&`R^zc#Y(K;BQM7d_2L&o?FaMc
z4#o5?Og+KxBI~+Ev{fIUFQ>*U>@me|q(U?EuPukH!w5Kz^Dw!@b*!1YgaR_{C#d(*9}Vb?=yu%+TxRP{$Ci
z_?i;0AJYS~EU)
zvv3G-pd-y%{pd(zf*Ao8DQ1nHe)Y0cGT_6FbCDg2hlWSez8pI~WJY)2TD6bZ_1IIy
z$d!#&hvFR4PV9mNEQPlX@XOKq&;z=^~;qZ>-#+#%BiVeiE*m3oq|Yt5sw6#f+ckFsU)_?fIvBK
zAZgf>lO@`H^x~mDhsUV%M)Dh|oknP|-}NC0hW+9AxC(i*PmySC>IRf6h_U%bfC4*=
z@G(L^mokEkXC;qSJAe^S?)2EJTT^Y+E&yaq=r4VI~eQ;~24RO<1Mnt~50a-P?9r$}pJt
zu%>kk$Z=_>K^HmT$*U7l~gZExb>J=-5uu3Xs$Uh
zjytKko_1@;0V=jEAoYTUT>1IX3|{p0!awNYes{(180`n3ltc8p4g~EW>$maWn+#xP
z|Njh1sZ03Z=-1v+R~K?jFNjJYRUUblUf)$_@l-;1MwSqSzF(onL!?j_cT2KxP>zc#i{8dfJy^~3
zUIN!+qb))EMr;j;wL&jBVr&Av9~x^_ZY`R|CT5`ZLzyU;LPc4Ptcfi-*#35b(&Md6
zep+nl^meEA5L84&WTI%=AaEv%UV9@;!zvd+e)V%A$cq2;{ZG@8zqv%2^_)YWKRLqu
zh0Qm`r|B?n_WVue*_%Hv5i#?3dG`FB^DoRF`>|dgVKa%uCzzQ&;w;_@cEmP0|k?;MHbN}*eYJHU9o|(~8k2IrUZ$?vZYC@j{wZEND5?NkgFom7X
z9Q>uu6H#l@O3uo+-A`nyf+zl91i`s%sacDr6l+`U+gF8*FDSfWOL(1oA^B_ZGj@|=
zZ%&i#_zomD;Rhl!EI{_8sOQcNdc3;EdA>h1;`4+?EcH8-bkc4U0_8=!;Bu^D0wM74
z7Mb_o&IyAskc2jD>7Eg)-ES?NuertUBj<1?HnM}HevgM^TZc{PDm|q7E
z(LEZRbL_sM2m&L&tVN$;zt59lCb~g~))n2rYtY{)YQ}sqF_V%*?An+W)97cLpVa!z
z3ZbQhnKGJTYlV#?#^`qn7z#U^$UJ9yucv53eeLMhW1`Lm@J?W8)agy03r&&c0f>{z
zd>!Vjq`&3X?QhEkXfSyO#iGt?uac)fMR+CAi1hU*K~E(v$0qW!K{AKtfGhbURRC6|
zh~pxM>|h_g*!xTfM&AN0U&m`qw%i?FbI!WtLg_>1tsEUE_OK{zhihIuJBw?y>16D`
zM&qnln)}V2;C(poj|GT-^rb{mOU&Q6cF!YQX15uiyZH`S?q;;1ETNh8Gl&2FDW1qV
zACQiJ;~+5KBtP5vl`TK-GMr=xHp7f4apMMCa~k^jaPZZqe5JpCZO-u+&Ru+o$a<+=
z01n9pDB=w(N5_gne}D8=-qgpfdM?XsY6VRN|2BfgO@K|xGcF*$sZk
za68nY1=HK_Jte*0o8A)sk}6iE>Nx6aE&dETB1(xlT(;kizdusDq-}@U6(-!qh#YT?
z8d;0DY159d;_{tUm~390vbF?5%L_}8LhIYkiqtOkc7%T=8f&oG#5d|m(C8-}n*cAi
z^#IO4v0@FZ7(_}>hVD0FQKfD`5g(P$-bGul^mdy8Boz^*km1bu?^_8S9Wbkv0LSS=wL$2+aI{T`3+I=TR}u>KT{AJJJ)aHx9dyz{C(9YpDb%iBU!RzTuVx%8
z-Fny#N6lrb*}IMC3+-~mTSu}#c#z`X^9XcgBm5bUjBK)5H|x7jhu`W)HizOzJN#1I
zUSwoThNV2u$n^A$ZgyXNA@%ADn+s*n{+1ST7fiMDBZV!7!F&gX^c;U?(vuQ$9@lOj
z4imF!b0w=((p#lQ;)jw1OM5KbnalmjWl7zc<2f9HI2_WOkqVy>s3ny0?R@L|OAPQ(N4hbIheL*t1Hade$Izn=tTu;Y%DI_I%md;Nk2NvWcrrQ?%FXGB%js^0%IM}937
zw;U?JjD7n_^G)l!^tbHwUB|sV`>0b0lzn@tXCDQOeS5Z+Hgag5*p^INxLdRwFqa&TE2TInA|LseREK`=C*5!
zrf|ZoCjR38kbV34?D-r2FU{XT3-`SkxIbYIFS_wC)}rX-a1;4IY2O-0V)k_2j#u1J
z-9VFE_U+j(X6YMdPXELi^=|hYKV~uh|Lxnu+qZZ5JDEX=2U}}UnIEq7KVsj0;mG#w
zYGdCjkhH3Fa9?MHsA@u1ts>Q0&cp6uJ&dwl!0uQH2k()R8Au(5Bq
z=YDg)=zSRdO2)no&Q9C6GdSn$+qVaP2+O@^`}WgE@Gp(Y_Al*~q6dwFnT$ybQ5}mOI#IjsDDXEX$JV0wBa|vzZ9`1J(cTUio}Ov2Ft$`)+zd{
zGU|7D-K*>%5TrBm7tz|a+5V-EzUa*!!#XVg^}DGOjad$+Nq~e_GhrIm@Q
z-sSV-H?uRCiyz(BCmCk^%po71@jl$RJ;RJkznNyn=f`X5oBe(G@Ww-w(H#Br|1$ql
zAj`iLiCdBX=l&(z50O8_zx0DLQNaIq{Yw`uf_?_^FU?nSP3RvT(U(}*j{npCrAZ&i
zS-IS06SDkECm>@o{-vYzz$KZ7RQVoNIRE}##`%Adf9cj6f%jkYFI_Cx`Mdji<%p4k=?nON6fJZ*t)-)d
zYLfC@`O!i+n3e?y7V;cSQ9j_O7>9!?6C;F!Nijk-66cFN+Ljf#mL4`$FPX=B5I<(5CY#d?vzM;dR5qS
zTkGg=d)>mXun>6rSC+XgNX45&3f3J*xX+jMxou9A%gG0EN)b5YE-wWNn69edDTM>;
z$WE#BbSjiVGigFY{3xEFqIm4&pIOVo4(sNN5ofns&SoH!8gcrPtt_DiMga(1$t!pP
z0CHaq&vswkb)Uc5y^H%wo(8$EkQ=_+%md!|p57f&rj>a!`%l-K^*0?_Qvon0E+xy;
zb+L(PS=;aFT9-!EpuI`MH=#`)QoOE`Z?Z%ipV5GL6=DSkxVmQG>iUL_tLtj{jE)$n
zGSJoKBhd>~seB>J)phtl6-)aY?g6ePN{=TOab_r~_#n|LS61NfGCcNs6Sv~A*&Uw4
z>o&9m0#r=<$y2kvUVpgL$j(Xk=6bz8T_@RTeFs_e9l~1<>)*Oaq9?YqS@D-mioa|U
z4a_tCtvvHh{w)OnX8X7Lc=r5T!;Q|aE3u5~@1H!49VoLBIs=YZDx|oJV&gsOA%4~P
zze$D{Gy
z+VQG%G(OkSv~nk*wsMTgagE}twJZ7B8wdMHuTYxTHc|s)DKv1(5&jjAWynUpD2U0T
zD1Ynjl`0j)bj5saHxM2I3S;^fV|rAZBZ|@?5zg`wGprMV&#t{3>GLDLb>u^;g-7Wu
z=qBxFb22wk^dHv@HaZ;#t+abzDdb=>hx&9dnc(I>RkYKLZ5UdIB{U%7f72r(Ef=t6
zpw|iKcZa?kOd7BV_s_Q$HX1oHR3b=y0e_T~-5tt!H7Q;)srDGFb2LRbUw$G-!QY7{
z3QIZY^UkDr@uXUg_4J9?H8g;G&cCuDq7)9k378&1zZIAre=%?H{YW=sv+D4adBVg>rvzdheYmI20>{EKkfM-;#kChY)6rGBOt
zY!GO+q0ic@18pw~MMsBfdfK>@k4?x(d`KEa;D=~$$d3g|Cvn;8)a;eGvDea+Hd;Y|
z#B3_o8U@vsbq1w!L^-u^z?4;`r>yaa1ZQ?X6C=rBG;Kcteu_Ki$Q!LgiBkjBo0H>2
z$%&%!s|Tm8b;*Bdp4O#|e16i%=QQD1cdw;ya(o_!*lBjvRf9I0DEi{+EG4hpkWY~K
zY0|xN{<{;&(>*})crqx*zWKosVo9RUYyPr%IU|W0
z1|bX|C}P{vKrzb0NTlOEar7%tktL4)W_Y%oxqW@^kp}zT#gg0ksz18cI|qy;BbDCU
zNCpTeIhb+Tq&d&i&y0LhezdfF8bPVU$*0`|#r2OE+2~KY98FTo#NYi?1!4K-%;MOJ
znl-q8l*IxnJ;Xoynvr!nsV`kM+}G>H+Rfv&?+ayptFKw>c5^<8)(7}Sb$jT*b(%{p`b^Xk<)$3oQM$@n
zC?!repnV%-&34|hW3LPgbrqgNBny|k7veY$C&nKwFR9|-+ZmR^Y{2`4oRjLFF0-yK
zLcSlx=1o>?-b!oHd8mHF(bXI&1WMqs5`cB$jt^XXYm`DnZzFnX(^7XhyOLS%QcvqV
z``5-i({)Wo696q{{g?muA|UqgoIKh4X=3n+q{P#W|MMcqJ<72Wz$aSL&y^8K3qj%^
zF9@_A?RmtL`;DJ+v`!Svi_~s!8&kcxV{_)~CcaWow>haNZQHXbNz;TWZQB`x`f{a0
z3v~!;*-HmG(Z#k)>`hc{Uw^U9j2h6j$x|uhp$yTEESZMX_nDu`#Ba&@3zjn}JxGAV
zX9W;mVqn;iyiSnvl5J<7hCEDtU2D8r^?OnYX-Y`}uMZ$@5I3&-%#Ge>ytt2FqG>cy
zgDvT(!76fkCfCYR0@xOFJaYSwd@t^uRuxtb8)##T{{J+KYSa
zX_6CnU4xu(v*bjMe)IJs$cMMZ&n7-_7r(Ogo0HzFuox&O2G^%E`E3Z-0@r?4aAn8-@nqSK)rDK!0f~tTA4VNU?#HQjH|K}iwuA16p7Vw
z00uP4R>pZ=1nIBtt>*Zp$pOVlaK#m3dl6D7PmV~Zxj&>ZlR{=dNMS=xNFkY^q*o6T
zQg{uJGRDJ&6e^}U6H<8Qz>vZgKcvuXevYPKe>kBhII_YCyEEa0kC_1|oKR9Cd+6?!
zgsmCJzj%`#5=GmN&Sm2-
zPzC$=DmZe^A^R$64@eGwCIsD~@jd?s&!0}82mJq<|9HHF=)cu}{15`@NdDtDB(VN#
z{^JG9#NoLv-f?%1itQ4XnDSJ9#UT4L?%u
zk;XInk2D_MQ;h!Y9$101c;maDYTRJfc+bn8JC~lHIPqTm#A$Z&T*c^*i#%s>vM$?C
zypTky$jp;|n(HV2sL^6xnT^c(h0$UVhD`oUlthe~N)csHI=-Eze_iRlR1Me&T?Wfx3j?gmtu&&|K8Qr6#H>dxHiKoT_dfQFftvH&!V#wJkNQupb%
z4;uZyGC4`}2pu#VI>>;K!N|ZLx$}2-RP*;~ZxFgosPpkQKm)||Oo-y#BCLb#X)+oO
zG)cb!)302OeKaVVvFi7wCWxL(4V1k}%xpS$wF4=bX$t$ydie2l@ux&#K&S{lF6ndD
z=o#ui7zFQ$$w4Chd+gfPbAM+$jeuonFwL5rd-<4MdteS0+Z6v!+MWpQhc_gn<-HMy
zo)RNJhQ7`%qDwvncx^>??FR0{aTpGkZBS_QB@2&bqAVZoSAiQc<9xGOcMRYrc!XlI
z-w%a_;@RzSW8%mxjngDId81q!=bhg`dLAbK%?Guz4>%v@e)5w;^4yQ}4+44Rnk<2Q
z3+7fZ4kcQyNH2syHuE0_IKtx_|O&hPtzAj!=`gQd6D5^7Q{vg>58?#>cXXkvcNZZS{+RcZv=5
zij^NyEJ`tBby$mfRFeE=gd)0o&*7hY1Oh#IxBacA)zn8AzX#YAXJsLqE!8}C2u%^6
zHlOdw4?%tIZgv`gEqX&%$&*!bqo6Sj3%0L@OtEMF{$1$X=R|0o{{3Q2dhJg1ik5*vIq7SdiN?>)a
zn*ZG?qMo&X6{z6HU337?SR8YExoUD^DLKe2Fb(yWx6Fnm+ntI
zho9e>dIes=)^E4JJ*2fUR(DZEGQV6xt^rU$PlUN02~n0_I>
zHRK}MgGi;a)IIOsT>O$!yLO{>U7KV`ZK%as_%(iUa{uxf-7~ljvzDypUs5hW`@}wb
z>_)qs+h+=4^3^1t-SDbiP9{9VA7;fMKWY}&Q#wAC%zJBRVIE`};df{TJDwyLq)vEOqU*?YA&3K->@VvuM8Y-H0fONjeQA8ls&cPH}eaJ5>uk}9ilq!0vc6w
zmm*P5PfX0$1((6R*(A&zzC>GrEZJxrOj=Nr24d>%!~*X!Va*PchyzF2PbpHPBEH=g
zd{3VqP-pI!og&>ms{eA~L%#yBN;`j(L_SnPiqPkv!6A132E4Ha#%0KfW85QiW`+~o
z|2!7dZsKOv<8VBjo+vyy5o9atq$}^=Y5W^HRei2MMkaRnQjPJWSvMx9Z%RfwBjQB~
z5n-UAe>m0axpIh{orUZ^fEJa4P)}D$`8u;odZTl?GNU^rzlApP2g+}?)yOdxEo%@z
zgBer7$Q$Hy;qS%#CBY%u0x?kb*tOhkJw%Lwg4SzW=daYKCjC?D-s7)CWqhurwbO+`
z5a|Lhg+Dl5U>;K~Yg2nIS7s^ThRls)q`)lc%1Woax8H;x2aa0%k
z$(wpCaM};YhxZuSMGi6cCN@Ge+?`FPJc{M(7<;(aEg-E^|Ml5&_Hsd1=LwQ~dsAc+
zSst)!_gM?y5$bSY1rY_uPO^TvWcIiziIMM%#D8L+pmbF4k2=SOS4=dzUL^i~y$ll}
z5OK`UNbUCi2@^8gRlUNk$>q-3*Ery$W`<8MrH+8efpq{A<@V__zZng10qX*S9
zfo1#;9Wv7*oECZA;6QI4b-!wVFI%VivNQ2O+lu?fO(9V+%xTpPS=qQ@{o%qru72*|lVZJSv)~
z_*f+VpB`RDEAwmA`5YOszQiVk!4`+{K#chrsr`vT%s2Ycaz{2=el!SLMqy`)(g#P2
zf1gJVX0+#k30hCKo{)#1@xsqI;ip;nX~^Jb{xX9fj%fM&>)=|22&d^55%?_&MdQ*a
zGR-GzXqkf|)jdooJ5ZaGzc-6o8gbmbdi{Z<3_z=6qiKnyFsSIJ0tErpF8Pnik$B;{
zXuPYPuaVl-v)pj)Et=OkFNWjow?LA@hNv(gWwj(Smc$B1O@=(&4;p_!R%fHU&RV}L
z`*`qZfle*^^w?K*m{O>(30fy>8W~5L^EKLdT7~I;^1i=RHQybcX?q|Jq^mMB#~^
zaN_~Yc=9bajaD-9N67;Ykw1e7A8mPwxq4x)r>uoLX-_MT_Bec@6HSb)?iV^?CC^i~
zxr^Yf!wH?s4Q~yT$oZAxlb%14(80dhcUbmf6E*JWwQ3ZN;ded!yaND^SCt=G&I@y
zd-Rtfp&v*~2{L!&l3?zrRJ+Dnr~r+Q%~t17{zej$^V_e^=Y9a9sV=bhKF7M<9!
zq4j*>uv9Z$)^%~k32cVulLof!tC4uOq$uZG!p^AhiV0?QvE#Rxmk3eY@qX6cVuWb%
zx^3hNyc$HNC*bZ!^QkRcj2U1vnZ|Qq);yM_mPZmJYa@Qcab))U!_H_?)nPkp`$4*o
z3*K8FCP*pltaCOchx$`p#gx|gZimbq!M|XACU}K^L9SF6NleE`oe12kz(L*Lz=r1u
zdwYXc=TSVg*9{#n9`3d}b~8uJ>u~?N@^Fs+x>0gm=K(a}4&
zm{rdFjMO@sptc`NY?p~o$i|D}n?_-Pgrwd`nGM*3PyG;zzRJWXW4!fiD%cCHbCa`t
zEH;3}MjWBSmigsijP7-~$D2AV6cDCnA7a6N*ZHim#+<#-%3&UN+gYB~8?8niHvAJ9n4Z+YXO?i(Kutvro3wYEm{yCtfHYylBF<9j`Gd7feL}{Q?CP{lZ8k
z_akp=J@6IAGUluj=E2n9NRW3M82UFLg>hrIv4MX>MLP}a?xOi3P#SBd(R#Jjgt7v0
zT_d*kirLO^V}S+S$0X7LwuuguatfNIrf9#xG@tyKPwp)cIoETM-fnaj#mUF--u^x_
zGoSxN)`wC0(8UMN|4;ufoc|xgEFh8^G=H|{5B5}imPY$6UD%8g4aipla+3i$g)oQZ
ztVQ{;ExWjoj1e;I05|}tq!^YNU0Nup_V}09;?e9WR6}JnQb}Vza<$CbwJYY{E#BrB
z+p>nG7)*R`RA-a-kAN+8zwCojV<(hLk3-@H6zpqtfdFO5nudAg&#hfK_r`vR+?|(TM6T%f
zMD$BulfNs##V&{E;OpKep03BL436FJZu%
zJskd8GWY|@q`=nx+BpLFz3h)0_ofQq+3=Unb(Evg$;MX(}?-G{wtTleoxZIsA^y^QWYuEJf3C9lB;{I($lO+twl
zfl}4qbmnV$sb8o9=o1Vv_P*S2H4b9G_v1fNU-3u#oKT6iuuGdm3wC;o;O|Y|UpwLd
zMZ|1jj2Q`}g9uhfx7ma_$@+~PQr)tBjK%UOC5_UHbL4C(y=iT?)NDVES&Dwyx!LMC
zSJj<;cJJ%h+dDja`voP`>V2a?P91x}QqRNGD}k|#Hly*WWk&wee~Hy`BdQMhXNH8F
zW#PZT`F(xYQYJqY?oEw~*8bJ%xRe6e4b^*?COf>t)t*r^%jF1N-&35s9O_
zFkoaD?T(5#Z;?|wTy9e3H$;k`N8XZk$B2NR8canH(1J!8dYe=aQt+(lXzd%beiwH3
zfSZCy;`C2=o&O47ut~hk1$wEEnpD