perf: 移动features模块配置序列号结构体到be.ems/lib/config

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)
 }