simonzhangsz/omc_api
1
0
Fork 0
Code Activity

feat: 合并代码

Browse Source
This commit is contained in:
TsMask
2024-01-12 15:54:24 +08:00
parent 3cec6077d3
commit 94392e13fd
52 changed files with 1962 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/core/mml_client/mml_client.go
View File

@@ -36,12 +36,11 @@ func NewMMLClient(ip string) (*MMLClient, error) {
fmt.Fprintln(conn, passwordMML)
// 发送后等待
sleepTime := conf.Get("mml.sleep").(int)
awaitTime := time.Duration(sleepTime) * time.Millisecond
awaitTime := time.Duration(300) * time.Millisecond
time.Sleep(awaitTime)
// 读取内容
buf := make([]byte, 1024*8)
buf := make([]byte, 1024*1024*1)
n, err := conn.Read(buf)
if err != nil {
return nil, err
@@ -70,7 +69,7 @@ func (c *MMLClient) Send(msg string) error {
// 封装Receive函数，用于从TCP连接中接收数据
func (c *MMLClient) Receive() (string, error) {
buf := make([]byte, 1024*8)
buf := make([]byte, 1024*1024*1)
n, err := c.reader.Read(buf)
if err != nil {
if err == io.EOF {
@@ -78,7 +77,7 @@ func (c *MMLClient) Receive() (string, error) {
}
return "", err
}
c.size += n
return string(buf[0:n]), nil
}

30
lib/dborm/dborm.go
View File

@@ -196,6 +196,34 @@ type NeInfo struct {
UpdateTime string `json:"-" xorm:"-"`
}
func XormGetMySQLVersion() (string, error) {
var versionInfo string = ""
var ver, verComment, verCompileOS, verCompile string
_, err := xEngine.SQL("SHOW VARIABLES LIKE 'version'").Get(&ver, &ver)
if err != nil {
return versionInfo, err
}
_, err = xEngine.SQL("SHOW VARIABLES LIKE 'version_comment'").Get(&verComment, &verComment)
if err != nil {
return versionInfo, err
}
_, err = xEngine.SQL("SHOW VARIABLES LIKE 'version_compile_os'").Get(&verCompileOS, &verCompileOS)
if err != nil {
return versionInfo, err
}
_, err = xEngine.SQL("SHOW VARIABLES LIKE 'version_compile_machine'").Get(&verCompile, &verCompile)
if err != nil {
return versionInfo, err
}
versionInfo = fmt.Sprintf("%s %s, for %s (%s)", ver, verComment, verCompileOS, verCompile)
return versionInfo, nil
}
func XormGetNeInfo(neType string, neId string) (*NeInfo, error) {
log.Debug("XormGetNeInfo processing... ")
@@ -222,7 +250,7 @@ func XormGetNeInfoByRmUID(neType string, rmUID string) (*NeInfo, error) {
log.Error("Failed to get table ne_info from database:", err)
return nil, err
} else if !has {
log.Infof("Not found ne_info from database, status='0', neType=%s, neId=%s", neType, rmUID)
log.Infof("Not found ne_info from database, status in ('0','3'), neType=%s, neId=%s", neType, rmUID)
return nil, nil
}

16
lib/routes/routes.go
View File

@@ -164,6 +164,10 @@ func init() {
Register("POST", cm.CustomUriNeInfo, cm.PostNeInfo, nil)
Register("PUT", cm.CustomUriNeInfo, cm.PutNeInfo, nil)
Register("DELETE", cm.CustomUriNeInfo, cm.DeleteNeInfo, nil)
Register("PUT", cm.UriOmcNeConfig, cm.PutOMCNeConfig, nil)
Register("PUT", cm.CustomUriOmcNeConfig, cm.PutOMCNeConfig, nil)
//ne service action handle
Register("POST", cm.UriNeService, cm.PostNeServiceAction, nil)
//ne service action handle
@@ -330,6 +334,18 @@ func init() {
Register("POST", security.UriLogin, security.LoginOMC, nil)
Register("POST", security.CustomUriLogin, security.LoginOMC, nil)
// 获取验证码
Register("GET", security.UriCaptchaImage, security.CaptchaImage, nil)
Register("GET", security.CustomUriCaptchaImage, security.CaptchaImage, nil)
// 登录用户信息
Register("GET", security.UriUserInfo, security.UserInfo, midware.Authorize(nil))
Register("GET", security.CustomUriUserInfo, security.UserInfo, midware.Authorize(nil))
// 登录用户路由信息
Register("GET", security.UriRouters, security.Routers, midware.Authorize(nil))
Register("GET", security.CustomUriRouters, security.Routers, midware.Authorize(nil))
// 参数配置信息接口添加到路由
for _, v := range sysconfig.Routers() {
Register(v.Method, v.Pattern, v.Handler, v.Middleware)