diff --git a/src/modules/common/service/commont.impl.go b/src/modules/common/service/commont.impl.go index 3756a168..56a5da05 100644 --- a/src/modules/common/service/commont.impl.go +++ b/src/modules/common/service/commont.impl.go @@ -41,5 +41,11 @@ func (s *CommontImpl) SystemConfigInfo() map[string]string { // 获取登录界面背景 loginBackground := s.sysConfigService.SelectConfigValueByKey("sys.loginBackground") infoMap["loginBackground"] = loginBackground + // 系统设置-官网网址 + officialUrl := s.sysConfigService.SelectConfigValueByKey("sys.officialUrl") + infoMap["officialUrl"] = officialUrl + // 系统设置-系统使用文档 + helpDoc := s.sysConfigService.SelectConfigValueByKey("sys.helpDoc") + infoMap["helpDoc"] = helpDoc return infoMap } diff --git a/src/modules/network_element/service/udm_auth.impl.go b/src/modules/network_element/service/udm_auth.impl.go index 378200ae..7d6cd519 100644 --- a/src/modules/network_element/service/udm_auth.impl.go +++ b/src/modules/network_element/service/udm_auth.impl.go @@ -23,7 +23,8 @@ type UDMAuthImpl struct { // authDataByRedis UDM鉴权用户 func (r *UDMAuthImpl) authDataByRedis(imsi, neID string) []model.UDMAuth { arr := []model.UDMAuth{} - ausfArr, err := redis.GetKeys("udmuser", fmt.Sprintf("ausf:%s", imsi)) + key := fmt.Sprintf("ausf:%s", imsi) + ausfArr, err := redis.GetKeys("udmuser", key) if err != nil { return arr } @@ -166,11 +167,12 @@ func (r *UDMAuthImpl) Delete(neID, imsi string) int64 { // Insert UDM鉴权用户-删除范围 func (r *UDMAuthImpl) Deletes(neID, imsi, num string) int64 { - prefix := imsi[:len(imsi)-len(num)] - // keys udm-sd:4600001000004* + prefix := imsi[:len(imsi)-len(num)-1] + // 直接删除前缀的记录 + r.udmAuthRepository.DeletePrefixImsi(neID, prefix) + // keys ausf:4600001000004* authArr := r.authDataByRedis(prefix+"*", neID) if len(authArr) > 0 { - r.udmAuthRepository.DeletePrefixImsi(neID, prefix) return r.udmAuthRepository.Inserts(authArr) } return 0 diff --git a/src/modules/network_element/service/udm_sub.impl.go b/src/modules/network_element/service/udm_sub.impl.go index e730e01d..617a0a39 100644 --- a/src/modules/network_element/service/udm_sub.impl.go +++ b/src/modules/network_element/service/udm_sub.impl.go @@ -23,7 +23,8 @@ type UDMSubImpl struct { // subDataByRedis UDM签约用户 func (r *UDMSubImpl) subDataByRedis(imsi, neID string) []model.UDMSub { arr := []model.UDMSub{} - udmsdArr, err := redis.GetKeys("udmuser", fmt.Sprintf("udm-sd:%s", imsi)) + key := fmt.Sprintf("udm-sd:%s", imsi) + udmsdArr, err := redis.GetKeys("udmuser", key) if err != nil { return arr } @@ -180,11 +181,12 @@ func (r *UDMSubImpl) Delete(neID, imsi string) int64 { // Insert UDM签约用户-删除范围 func (r *UDMSubImpl) Deletes(neID, imsi, num string) int64 { - prefix := imsi[:len(imsi)-len(num)] + prefix := imsi[:len(imsi)-len(num)-1] + // 直接删除前缀的记录 + r.udmSubRepository.DeletePrefixImsi(neID, prefix) // keys udm-sd:4600001000004* authArr := r.subDataByRedis(prefix+"*", neID) if len(authArr) > 0 { - r.udmSubRepository.DeletePrefixImsi(neID, prefix) return r.udmSubRepository.Inserts(authArr) } return 0