feat: 数据库引用变更

src/modules/common/controller/captcha.go

@@ -6,8 +6,8 @@ import (
 	"be.ems/src/framework/config"
 	"be.ems/src/framework/constants/cachekey"
 	"be.ems/src/framework/constants/captcha"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/redis"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/vo/result"
 	systemService "be.ems/src/modules/system/service"

src/modules/common/service/account.go

@@ -8,7 +8,7 @@ import (
 	adminConstants "be.ems/src/framework/constants/admin"
 	"be.ems/src/framework/constants/cachekey"
 	"be.ems/src/framework/constants/common"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/utils/crypto"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/framework/vo"
@@ -131,9 +131,9 @@ func (s *Account) UpdateLoginDateAndIP(loginUser *vo.LoginUser) bool {
 func (s *Account) ClearLoginRecordCache(username string) bool {
 	cacheKey := cachekey.PWD_ERR_CNT_KEY + username
 	hasKey, _ := redis.Has("", cacheKey)
-	if hasKey {
-		delOk, _ := redis.Del("", cacheKey)
-		return delOk
+	if hasKey > 0 {
+		err := redis.Del("", cacheKey)
+		return err == nil
 	}
 	return false
 }

src/modules/common/service/register.impl.go

@@ -5,7 +5,7 @@ import (
 
 	"be.ems/src/framework/constants/cachekey"
 	"be.ems/src/framework/constants/common"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/utils/parse"
 	systemModel "be.ems/src/modules/system/model"
 	systemService "be.ems/src/modules/system/service"

src/modules/monitor/controller/sys_cache.go

@@ -2,8 +2,8 @@ package controller
 
 import (
 	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/redis"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/vo/result"
 	"be.ems/src/modules/monitor/model"
@@ -116,8 +116,8 @@ func (s *SysCacheController) ClearCacheName(c *gin.Context) {
 		c.JSON(200, result.ErrMsg(err.Error()))
 		return
 	}
-	ok, _ := redis.DelKeys("", cacheKeys)
-	if ok {
+	err = redis.DelKeys("", cacheKeys)
+	if err == nil {
 		c.JSON(200, result.Ok(nil))
 		return
 	}
@@ -136,8 +136,8 @@ func (s *SysCacheController) ClearCacheKey(c *gin.Context) {
 		return
 	}
 
-	ok, _ := redis.Del("", cacheName+":"+cacheKey)
-	if ok {
+	err := redis.Del("", cacheName+":"+cacheKey)
+	if err == nil {
 		c.JSON(200, result.Ok(nil))
 		return
 	}

src/modules/monitor/controller/sys_user_online.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/redis"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/vo"
 	"be.ems/src/framework/vo/result"
@@ -130,8 +130,8 @@ func (s *SysUserOnlineController) ForceLogout(c *gin.Context) {
 	}
 
 	// 删除token
-	ok, _ := redis.Del("", cachekey.LOGIN_TOKEN_KEY+tokenId)
-	if ok {
+	err := redis.Del("", cachekey.LOGIN_TOKEN_KEY+tokenId)
+	if err == nil {
 		c.JSON(200, result.Ok(nil))
 		return
 	}

src/modules/network_data/service/all_perf_kpi.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"be.ems/src/framework/constants/cachekey"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/utils/parse"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"

src/modules/network_data/service/udm_auth.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
 	neService "be.ems/src/modules/network_element/service"

src/modules/network_data/service/udm_sub.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/network_data/model"
 	"be.ems/src/modules/network_data/repository"
 	neService "be.ems/src/modules/network_element/service"

src/modules/network_element/controller/ne_host.go

@@ -3,8 +3,8 @@ package controller
 import (
 	"strings"
 
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/i18n"
-	"be.ems/src/framework/redis"
 	"be.ems/src/framework/telnet"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/utils/parse"

src/modules/network_element/fetch_link/ne_trace.go

@@ -10,31 +10,10 @@ import (
 	"be.ems/src/modules/network_element/model"
 )
 
-// NeTraceInfo 网元跟踪任务信息
-func NeTraceInfo(neInfo model.NeInfo, traceId string) (map[string]any, error) {
-	// 跟踪任务信息
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v1/subscriptions?id=%s", neInfo.IP, neInfo.Port, traceId)
-	resBytes, err := fetch.Get(neUrl, nil, 30_000)
-	if err != nil {
-		logger.Warnf("NeTraceInfo Get \"%s\"", neUrl)
-		logger.Errorf("NeTraceInfo %s", err.Error())
-		return nil, fmt.Errorf("NeService Trace Info API Error")
-	}
-
-	// 序列化结果
-	var resData map[string]any
-	err = json.Unmarshal(resBytes, &resData)
-	if err != nil {
-		logger.Errorf("NeTraceInfo Unmarshal %s", err.Error())
-		return nil, err
-	}
-	return resData, nil
-}
-
 // NeTraceAdd 网元跟踪任务新增
-func NeTraceAdd(neInfo model.NeInfo, data map[string]any) (map[string]any, error) {
+func NeTraceAdd(neInfo model.NeInfo, data any) (map[string]any, error) {
 	// 跟踪任务创建
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v1/subscriptions", neInfo.IP, neInfo.Port)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions", neInfo.IP, neInfo.Port, neInfo.NeType)
 	resBytes, err := fetch.PostJSON(neUrl, data, nil)
 	var resData map[string]any
 	if err != nil {
@@ -60,48 +39,17 @@ func NeTraceAdd(neInfo model.NeInfo, data map[string]any) (map[string]any, error
 	return resData, nil
 }
 
-// NeTraceEdit 网元跟踪任务编辑
-func NeTraceEdit(neInfo model.NeInfo, data map[string]any) (map[string]any, error) {
-	// 网元参数配置新增（array）
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v1/subscriptions", neInfo.IP, neInfo.Port)
-	resBytes, err := fetch.PutJSON(neUrl, data, nil)
-	var resData map[string]any
-	if err != nil {
-		errStr := err.Error()
-		logger.Warnf("NeTraceEdit PUT \"%s\"", neUrl)
-		if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
-			return resData, nil
-		}
-		logger.Errorf("NeTraceEdit %s", errStr)
-		return nil, fmt.Errorf("NeService Trace Edit API Error")
-	}
-
-	// 200 成功无数据时
-	if len(resBytes) == 0 {
-		return resData, nil
-	}
-
-	// 序列化结果
-	err = json.Unmarshal(resBytes, &resData)
-	if err != nil {
-		logger.Errorf("NeTraceEdit Unmarshal %s", err.Error())
-		return nil, err
-	}
-	return resData, nil
-}
-
 // NeTraceDelete 网元跟踪任务删除
 func NeTraceDelete(neInfo model.NeInfo, traceId string) (map[string]any, error) {
-	// 网元参数配置删除（array）
-	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v1/subscriptions?id=%s", neInfo.IP, neInfo.Port, traceId)
+	neUrl := fmt.Sprintf("http://%s:%d/api/rest/traceManagement/v2/%s/subscriptions?id=%s", neInfo.IP, neInfo.Port, neInfo.NeType, traceId)
 	resBytes, err := fetch.Delete(neUrl, nil)
 	var resData map[string]any
 	if err != nil {
 		errStr := err.Error()
-		logger.Warnf("NeTraceDelete Delete \"%s\"", neUrl)
 		if strings.HasPrefix(errStr, "201") || strings.HasPrefix(errStr, "204") {
 			return resData, nil
 		}
+		logger.Warnf("NeTraceDelete Delete \"%s\"", neUrl)
 		logger.Errorf("NeTraceDelete %s", errStr)
 		return nil, fmt.Errorf("NeService Trace Delete API Error")
 	}

src/modules/network_element/service/ne_config.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"be.ems/src/framework/constants/cachekey"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/network_element/model"
 	"be.ems/src/modules/network_element/repository"
 )
@@ -81,8 +81,8 @@ func (r *NeConfig) ClearNeCacheByNeType(neType string) bool {
 	if err != nil {
 		return false
 	}
-	delOk, _ := redis.DelKeys("", keys)
-	return delOk
+	err = redis.DelKeys("", keys)
+	return err == nil
 }
 
 // SelectNeConfigByNeType 查询网元类型参数配置

src/modules/network_element/service/ne_info.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 
 	"be.ems/src/framework/constants/cachekey"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/framework/logger"
-	"be.ems/src/framework/redis"
 	"be.ems/src/framework/telnet"
 	"be.ems/src/framework/utils/generate"
 	"be.ems/src/framework/utils/parse"
@@ -76,8 +76,8 @@ func (r *NeInfo) ClearNeCacheByNeType(neType string) bool {
 	if err != nil {
 		return false
 	}
-	delOk, _ := redis.DelKeys("", keys)
-	return delOk
+	err = redis.DelKeys("", keys)
+	return err == nil
 }
 
 // SelectNeInfoByNeType 通过ne_type查询网元信息

src/modules/system/service/sys_config.impl.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"be.ems/src/framework/constants/cachekey"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/system/model"
 	"be.ems/src/modules/system/repository"
 )
@@ -154,8 +154,8 @@ func (r *SysConfigImpl) clearConfigCache(configKey string) bool {
 	if err != nil {
 		return false
 	}
-	delOk, _ := redis.DelKeys("", keys)
-	return delOk
+	err = redis.DelKeys("", keys)
+	return err == nil
 }
 
 // SelectConfigByKey 查询配置信息BY键

src/modules/system/service/sys_dict_type.go

@@ -6,7 +6,7 @@ import (
 
 	"be.ems/src/framework/constants/cachekey"
 	"be.ems/src/framework/constants/common"
-	"be.ems/src/framework/redis"
+	"be.ems/src/framework/database/redis"
 	"be.ems/src/modules/system/model"
 	"be.ems/src/modules/system/repository"
 )
@@ -183,8 +183,8 @@ func (r *SysDictType) ClearDictCache(dictType string) bool {
 	if err != nil {
 		return false
 	}
-	delOk, _ := redis.DelKeys("", keys)
-	return delOk
+	err = redis.DelKeys("", keys)
+	return err == nil
 }
 
 // DictDataCache 获取字典数据缓存数据