diff --git a/features/aaaa/aaaa.go b/features/aaaa/aaaa.go index 26c03700..c6dde188 100644 --- a/features/aaaa/aaaa.go +++ b/features/aaaa/aaaa.go @@ -9,11 +9,11 @@ import ( "github.com/go-resty/resty/v2" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/log" "be.ems/lib/oauth" "be.ems/lib/services" - "be.ems/restagent/config" ) var ( diff --git a/features/cdr/cdrevent.go b/features/cdr/cdrevent.go index f7f0e697..63642072 100644 --- a/features/cdr/cdrevent.go +++ b/features/cdr/cdrevent.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/dborm" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" neService "be.ems/src/modules/network_element/service" wsService "be.ems/src/modules/ws/service" ) diff --git a/features/cm/ne.go b/features/cm/ne.go index f5f10071..a00dbe92 100644 --- a/features/cm/ne.go +++ b/features/cm/ne.go @@ -10,11 +10,11 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" tokenConst "be.ems/src/framework/constants/token" neService "be.ems/src/modules/network_element/service" diff --git a/features/cm/omc/implement.go b/features/cm/omc/implement.go index 6ef2e65b..9d7a4300 100644 --- a/features/cm/omc/implement.go +++ b/features/cm/omc/implement.go @@ -3,7 +3,7 @@ package cm_omc import ( "fmt" - "be.ems/restagent/config" + "be.ems/lib/config" ) const ( diff --git a/features/cm/param.go b/features/cm/param.go index c44c9743..afaaea50 100644 --- a/features/cm/param.go +++ b/features/cm/param.go @@ -3,11 +3,11 @@ package cm import ( "strings" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "encoding/json" "fmt" diff --git a/features/cm/software.go b/features/cm/software.go index 2085b5c5..fd873702 100644 --- a/features/cm/software.go +++ b/features/cm/software.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "github.com/gorilla/mux" ) diff --git a/features/dbrest/backup.go b/features/dbrest/backup.go deleted file mode 100644 index 3bf7bb7f..00000000 --- a/features/dbrest/backup.go +++ /dev/null @@ -1,134 +0,0 @@ -package dbrest - -import ( - "archive/tar" - "compress/gzip" - "io" - "net/http" - "os" - "os/exec" - "path/filepath" - "time" - - "be.ems/lib/core/conf" - "be.ems/lib/dborm" - "be.ems/lib/log" - "be.ems/lib/services" - "be.ems/restagent/config" - _ "github.com/go-sql-driver/mysql" -) - -var ( - // 系统备份-数据库备份 - UriDbBackup = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/dbBackup" - CustomUriDbBackup = config.UriPrefix + "/dataManagement/{apiVersion}/dbBackup" // for external - - // 系统备份-文件备份 - UriConfBackup = config.DefaultUriPrefix + "/dataManagement/{apiVersion}/confBackup" - CustomUriConfBackup = config.UriPrefix + "/dataManagement/{apiVersion}/confBackup" // for external - -) - -// DbBackup 系统备份-数据库备份1 -func DbBackup(w http.ResponseWriter, r *http.Request) { - dbConfigHost := conf.Get("database.host").(string) - dbConfigUser := conf.Get("database.user").(string) - dbConfigPassword := conf.Get("database.password").(string) - dbConfigBackup := conf.Get("database.backup").(string) - - // 备份SQL文件路径 - fileName := "database_backup_" + time.Now().Format("20060102150405") + ".sql" - backupFile := dbConfigBackup + "/" + fileName - - // 执行mysqldump命令进行备份 - cmd := exec.Command("mysqldump", "-u", dbConfigUser, "-p"+dbConfigPassword, "-h", dbConfigHost, "--all-databases", ">", backupFile) - err := cmd.Start() - if err != nil { - services.ResponseErrorWithJson(w, 400, err.Error()) - return - } - - // 备份结果 - res, err := dborm.DbClient.XEngine.Exec("INSERT INTO `sys_backup`(`id`, `created_at`, `updated_at`, `backup_type`, `backup_way`, `name`, `path`) VALUES (null, ?, ?, '1', '0', ?, ?);", time.Now(), time.Now(), fileName, backupFile) - if err != nil { - services.ResponseErrorWithJson(w, 500, err.Error()) - return - } - services.ResponseWithJson(w, 200, res) - log.Info("Backup completed successfully.") -} - -// 系统备份-文件备份0 -func ConfBackup(w http.ResponseWriter, r *http.Request) { - dbConfigBackup := conf.Get("database.backup").(string) - etcDir := conf.Get("ne.omcdir").(string) - - // 文件名 - fileName := "conf_backup_" + time.Now().Format("20060102150405") + ".tar.gz" - backupFile := dbConfigBackup + "/" + fileName - - err := createTarGz(etcDir, backupFile) - if err != nil { - services.ResponseErrorWithJson(w, 500, err.Error()) - return - } - - // 备份结果 - res, err := dborm.DbClient.XEngine.Exec("INSERT INTO `sys_backup`(`id`, `created_at`, `updated_at`, `backup_type`, `backup_way`, `name`, `path`) VALUES (null, ?, ?, '1', '0', ?, ?);", time.Now(), time.Now(), fileName, backupFile) - if err != nil { - services.ResponseErrorWithJson(w, 500, err.Error()) - return - } - services.ResponseWithJson(w, 200, res) - log.Info("Backup completed successfully.") -} - -// 打压缩 -func createTarGz(source, target string) error { - tarFile, err := os.Create(target) - if err != nil { - return err - } - defer tarFile.Close() - - gw := gzip.NewWriter(tarFile) - defer gw.Close() - - tw := tar.NewWriter(gw) - defer tw.Close() - - return filepath.Walk(source, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - - header, err := tar.FileInfoHeader(info, "") - if err != nil { - return err - } - - relPath, err := filepath.Rel(source, path) - if err != nil { - return err - } - - header.Name = relPath - - if err := tw.WriteHeader(header); err != nil { - return err - } - - if !info.Mode().IsRegular() { - return nil - } - - file, err := os.Open(path) - if err != nil { - return err - } - defer file.Close() - - _, err = io.Copy(tw, file) - return err - }) -} diff --git a/features/dbrest/dbrest.go b/features/dbrest/dbrest.go index 4d3888ac..4524d516 100644 --- a/features/dbrest/dbrest.go +++ b/features/dbrest/dbrest.go @@ -9,12 +9,12 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "github.com/gorilla/mux" "xorm.io/xorm" diff --git a/features/event/event.go b/features/event/event.go index 8ec403a4..0376bd8e 100644 --- a/features/event/event.go +++ b/features/event/event.go @@ -6,11 +6,11 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/dborm" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "be.ems/src/framework/utils/parse" neService "be.ems/src/modules/network_element/service" wsService "be.ems/src/modules/ws/service" diff --git a/features/file/file.go b/features/file/file.go index 1906acf6..bdd971f8 100644 --- a/features/file/file.go +++ b/features/file/file.go @@ -4,9 +4,9 @@ import ( "net/http" "path/filepath" + "be.ems/lib/config" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "github.com/gorilla/mux" ) diff --git a/features/fm/alarm.go b/features/fm/alarm.go index e22eca17..7883ee1d 100644 --- a/features/fm/alarm.go +++ b/features/fm/alarm.go @@ -10,11 +10,11 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "xorm.io/xorm" "github.com/go-resty/resty/v2" diff --git a/features/fm/email.go b/features/fm/email.go index aa25d929..bd4d0c3a 100644 --- a/features/fm/email.go +++ b/features/fm/email.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/log" - "be.ems/restagent/config" "gopkg.in/gomail.v2" ) diff --git a/features/fm/smsforward.go b/features/fm/smsforward.go index 0cb4ac7f..6ba40eb8 100644 --- a/features/fm/smsforward.go +++ b/features/fm/smsforward.go @@ -8,9 +8,9 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/log" - "be.ems/restagent/config" "github.com/linxGnu/gosmpp" "github.com/linxGnu/gosmpp/data" "github.com/linxGnu/gosmpp/pdu" diff --git a/features/handle/handle.go b/features/handle/handle.go index 654fd166..daeaf726 100644 --- a/features/handle/handle.go +++ b/features/handle/handle.go @@ -8,17 +8,15 @@ import ( "strconv" "strings" - "be.ems/lib/dborm" - "github.com/gorilla/mux" g "github.com/gosnmp/gosnmp" + "be.ems/lib/config" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/oauth" "be.ems/lib/services" "be.ems/lib/session" - "be.ems/restagent/config" ) var TodoList []stTodo @@ -88,11 +86,7 @@ func IsWrongOAuthInfo(oAuthBody OAuthBody) bool { func IsValidOAuthUri(r *http.Request) bool { vars := mux.Vars(r) Uri := vars["apiCategory"] + "/" + vars["apiVersion"] // 获取Uri - if Uri != "securityManagement/v1" { - return false - } - - return true + return Uri == "securityManagement/v1" } func IsVallidContentType(r *http.Request) bool { @@ -164,26 +158,13 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) { services.ResponseBadRequest400IncorrectLogin(w) } */ - validUser, changePassword, _ := dborm.XormCheckLoginUser(oAuthBody.UserName, - oAuthBody.Value, config.GetYamlConfig().Auth.Crypt) - if validUser { - // plist := config.GetPermissionFromConfig(oAuthBody.UserName, oAuthBody.GrantType) - plist := []bool{true, true, true, true} - log.Debug("Permission list:", plist) + // response 400-4 + log.Error("Authentication failed, mismatch user or password") - token := globalSession.NewSession(w, r, plist) - services.ResponseStatusOK200Login(w, token, changePassword) - } else { - // response 400-4 - log.Error("Authentication failed, mismatch user or password") - - services.ResponseBadRequest400IncorrectLogin(w) - } - return + services.ResponseBadRequest400IncorrectLogin(w) } func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { - log.Debug("LogoutFromOMC processing... ") // check media type(content type) only support "application/json" if !IsVallidContentType(r) { @@ -202,14 +183,14 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { // error processing ... // 401-1 response token, ret := globalSession.IsCarriedToken(r) - if ret == false { + if ret { log.Debug("AccessToken is not carried") services.ResponseUnauthorized401AccessTokenNotCarried(w) return } // 401-2 response - if globalSession.IsValidToken(token) == false { + if globalSession.IsValidToken(token) { log.Debug("AccessToken fails or does not exist") services.ResponseUnauthorized401AccessTokenNotExist(w) return @@ -217,7 +198,6 @@ func LogoutFromOMC(w http.ResponseWriter, r *http.Request) { globalSession.EndSession(w, r) services.ResponseStatusOK200Null(w) - return } func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) { @@ -240,7 +220,7 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) { // error processing ... // 401-1 response token, ret := globalSession.IsCarriedToken(r) - if ret == false { + if !ret { log.Debug("AccessToken is not carried") services.ResponseUnauthorized401AccessTokenNotCarried(w) return @@ -255,7 +235,6 @@ func HandshakeFromOMC(w http.ResponseWriter, r *http.Request) { // 200 response services.ResponseStatusOK200Null(w) - return } var ( @@ -363,14 +342,14 @@ func GetNRMByUri(w http.ResponseWriter, r *http.Request) { // error processing ... // 401-1 response token, ret := globalSession.IsCarriedToken(r) - if ret == false { + if !ret { log.Debug("AccessToken is not carried") services.ResponseUnauthorized401AccessTokenNotCarried(w) return } // 401-2 response - if globalSession.IsValidToken(token) == false { + if globalSession.IsValidToken(token) { log.Debug("AccessToken fails or does not exist") services.ResponseUnauthorized401AccessTokenNotExist(w) return @@ -379,7 +358,7 @@ func GetNRMByUri(w http.ResponseWriter, r *http.Request) { // todo... plist := globalSession.GetPermissionFromSession(token) log.Debug("permission list:", plist) - if len(plist) == 0 || plist[0] == false { + if len(plist) == 0 || !plist[0] { log.Debug("User permission deny") services.ResponseForbidden403NotPermission(w) return @@ -506,7 +485,7 @@ func GetNRMByUri(w http.ResponseWriter, r *http.Request) { } } - getResponse := services.DataResponse{nameValues} + getResponse := services.DataResponse{Data: nameValues} services.ResponseWithJson(w, http.StatusOK, getResponse) } diff --git a/features/lm/logbak.go b/features/lm/logbak.go index b744e826..0efd87fd 100644 --- a/features/lm/logbak.go +++ b/features/lm/logbak.go @@ -6,10 +6,10 @@ import ( "os/exec" "time" + "be.ems/lib/config" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" "github.com/gorilla/mux" "xorm.io/xorm" diff --git a/features/mml/mml.go b/features/mml/mml.go index feaa6910..6878ca71 100644 --- a/features/mml/mml.go +++ b/features/mml/mml.go @@ -10,12 +10,12 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/mmlp" "be.ems/lib/services" - "be.ems/restagent/config" tokenConst "be.ems/src/framework/constants/token" neModel "be.ems/src/modules/network_element/model" neService "be.ems/src/modules/network_element/service" diff --git a/features/nbi/nbi.go b/features/nbi/nbi.go index 3686fe51..44ce90dd 100644 --- a/features/nbi/nbi.go +++ b/features/nbi/nbi.go @@ -11,11 +11,11 @@ import ( "github.com/gorilla/mux" + "be.ems/lib/config" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/oauth" "be.ems/lib/services" - "be.ems/restagent/config" ) type ErrorOAuthResponse struct { diff --git a/features/nbi/snmp.go b/features/nbi/snmp.go index 1ab4c004..9e5e727b 100644 --- a/features/nbi/snmp.go +++ b/features/nbi/snmp.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/mux" g "github.com/gosnmp/gosnmp" + "be.ems/lib/config" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" ) func init() { diff --git a/features/pm/performance.go b/features/pm/performance.go index cd54c741..9dc4b9dd 100644 --- a/features/pm/performance.go +++ b/features/pm/performance.go @@ -12,12 +12,12 @@ import ( "be.ems/features/pm/kpi_c_report" "be.ems/features/pm/kpi_c_title" + "be.ems/lib/config" "be.ems/lib/dborm" evaluate "be.ems/lib/eval" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" neService "be.ems/src/modules/network_element/service" wsService "be.ems/src/modules/ws/service" diff --git a/features/security/account.go b/features/security/account.go index 9440aba9..919b2bc7 100644 --- a/features/security/account.go +++ b/features/security/account.go @@ -6,12 +6,12 @@ import ( "net/http" "strings" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/oauth" "be.ems/lib/services" - "be.ems/restagent/config" ) var ( @@ -79,14 +79,6 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) { services.ResponseBadRequest400IncorrectLogin(w) } */ - validUser, user, err := dborm.XormCheckLoginUser(oAuthBody.UserName, - oAuthBody.Value, config.GetYamlConfig().Auth.Crypt) - if !validUser || err != nil { - // response 400-4 - log.Error("Authentication failed, mismatch user or password") - services.ResponseErrorWithJson(w, 400, err.Error()) - return - } token := oauth.GenRandToken("omc") // Generate new token to session ID sourceAddr := r.RemoteAddr[:strings.Index(r.RemoteAddr, ":")] @@ -103,11 +95,6 @@ func LoginFromOMC(w http.ResponseWriter, r *http.Request) { return } - if user != nil { - empty := []string{} - services.ResponseStatusOK200LoginWhitRP(w, token, user, empty, empty) - return - } services.ResponseBadRequest400IncorrectLogin(w) } diff --git a/features/sm/backup.go b/features/sm/backup.go index a946de8a..84028f40 100644 --- a/features/sm/backup.go +++ b/features/sm/backup.go @@ -8,9 +8,9 @@ import ( "os/exec" "time" + "be.ems/lib/config" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" _ "github.com/go-sql-driver/mysql" ) diff --git a/features/state/getstate.go b/features/state/getstate.go index 8ac2d6f6..ebde9f5a 100644 --- a/features/state/getstate.go +++ b/features/state/getstate.go @@ -14,11 +14,11 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/mux" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" tokenConst "be.ems/src/framework/constants/token" ) diff --git a/features/trace/trace.go b/features/trace/trace.go index 73a8c829..252f47e3 100644 --- a/features/trace/trace.go +++ b/features/trace/trace.go @@ -12,12 +12,12 @@ import ( "github.com/go-resty/resty/v2" "github.com/gorilla/mux" + "be.ems/lib/config" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/run" "be.ems/lib/services" - "be.ems/restagent/config" ) var ( diff --git a/features/ue/ue.go b/features/ue/ue.go index cd2bb024..a47a98f1 100644 --- a/features/ue/ue.go +++ b/features/ue/ue.go @@ -8,12 +8,12 @@ import ( "strings" "time" + "be.ems/lib/config" "be.ems/lib/core/ctx" "be.ems/lib/dborm" "be.ems/lib/global" "be.ems/lib/log" "be.ems/lib/services" - "be.ems/restagent/config" tokenConst "be.ems/src/framework/constants/token" neService "be.ems/src/modules/network_element/service" "github.com/go-resty/resty/v2" diff --git a/restagent/config/config.go b/lib/config/config.go similarity index 99% rename from restagent/config/config.go rename to lib/config/config.go index 10f10c95..9b81433d 100644 --- a/restagent/config/config.go +++ b/lib/config/config.go @@ -11,8 +11,6 @@ import ( "be.ems/lib/log" "gopkg.in/yaml.v3" - //"github.com/go-yaml-comment/yaml" - //"github.com/goccy/go-yaml" ) // Yaml struct of config diff --git a/restagent/config/map.go b/lib/config/map.go similarity index 100% rename from restagent/config/map.go rename to lib/config/map.go diff --git a/lib/session/session.go b/lib/session/session.go index a953cfc1..0e3156e0 100644 --- a/lib/session/session.go +++ b/lib/session/session.go @@ -11,9 +11,9 @@ import ( "sync" "time" + "be.ems/lib/config" "be.ems/lib/log" "be.ems/lib/oauth" - "be.ems/restagent/config" ) // SessionMgr session manager