diff --git a/lib/core/conf/conf.go b/lib/core/conf/conf.go index 7e22479a..e43d3454 100644 --- a/lib/core/conf/conf.go +++ b/lib/core/conf/conf.go @@ -18,7 +18,7 @@ func InitConfig(configFile string) { // 读取配置文件 err := v.ReadInConfig() if err != nil { - fmt.Printf("读取配置文件失败: %v \n", err) + fmt.Printf("failure to read configuration file: %v \n", err) return } } diff --git a/src/framework/config/config/config.default.yaml b/src/framework/config/config/config.default.yaml index 13b1fffc..afda8e35 100644 --- a/src/framework/config/config/config.default.yaml +++ b/src/framework/config/config/config.default.yaml @@ -149,9 +149,9 @@ gorm: type: "mysql" host: "127.0.0.1" port: 3306 - username: "<用户名>" - password: "<密码>" - database: "<数据库>" + username: "" + password: "" + database: "" logging: false # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default" @@ -162,7 +162,7 @@ redis: default: port: 6379 # Redis port host: "127.0.0.1" # Redis host - password: "<密码>" + password: "" db: 0 # Redis db_num # 多个数据源时可以用这个指定默认的数据源 defaultDataSourceName: "default" diff --git a/src/framework/config/config/config.prod.yaml b/src/framework/config/config/config.prod.yaml index 3125e341..7915c59f 100644 --- a/src/framework/config/config/config.prod.yaml +++ b/src/framework/config/config/config.prod.yaml @@ -6,27 +6,27 @@ server: # security 安全 security: csrf: - # 允许调用的域名地址的,例如:http:/// + # 允许调用的域名地址的,例如:http:/// refererWhiteList: - "127.0.0.1" - - "" + - "" # GORM 数据源 gorm: dataSource: default: type: "mysql" - host: "" + host: "" port: 3306 - username: "<用户名>" - password: "<密码>" - database: "<数据库>" + username: "" + password: "" + database: "" # Redis 缓存数据 redis: dataSource: default: port: 6379 # Redis port - host: "" - password: "<密码>" + host: "" + password: "" db: 0 # Redis db_num diff --git a/src/modules/network_data/repository/udm_user_info.go b/src/modules/network_data/repository/udm_user_info.go index 1c274373..259dd0ba 100644 --- a/src/modules/network_data/repository/udm_user_info.go +++ b/src/modules/network_data/repository/udm_user_info.go @@ -72,11 +72,15 @@ func (r *UDMUserInfo) SelectList(u model.UDMUserInfo) []model.UDMUserInfo { return rows } -// SelectByIMSIAndNeID 通过imsi和ne_id查询 +// SelectByIMSIAndNeID 通过imsi和ne_id查询 neId为%时模糊imsi查询 func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo { tx := datasource.DB("").Model(&model.UDMUserInfo{}) // 构建查询条件 - tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + if neId == "%" { + tx = tx.Where("imsi like concat(?, '%')", imsi) + } else { + tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + } // 查询数据 rows := []model.UDMUserInfo{} if err := tx.Limit(1).Find(&rows).Error; err != nil { @@ -97,20 +101,17 @@ func (r *UDMUserInfo) Inserts(uArr []model.UDMUserInfo) int64 { return tx.RowsAffected } -// Delete 删除实体 +// Delete 删除实体 neId为%时模糊imsi前缀 func (r *UDMUserInfo) Delete(imsi, neId string) int64 { - tx := datasource.DefaultDB().Where("imsi = ? and ne_id = ?", imsi, neId).Delete(&model.UDMUserInfo{}) + tx := datasource.DefaultDB() + if neId == "%" { + tx = tx.Where("imsi like concat(?, '%')", imsi) + } else { + tx = tx.Where(" imsi = ? and ne_id = ?", imsi, neId) + } + tx = tx.Delete(&model.UDMUserInfo{}) if err := tx.Error; err != nil { logger.Errorf("Delete err => %v", err) } return tx.RowsAffected } - -// DeletePrefixByIMSI 删除前缀匹配的实体 -func (r *UDMUserInfo) DeletePrefixByIMSI(imsiPrefix, neId string) int64 { - tx := datasource.DefaultDB().Where("imsi like concat(?, '%') and ne_id = ?", imsiPrefix, neId).Delete(&model.UDMUserInfo{}) - if err := tx.Error; err != nil { - logger.Errorf("DeletePrefixByIMSI err => %v", err) - } - return tx.RowsAffected -} diff --git a/src/modules/network_data/service/udm_sub.go b/src/modules/network_data/service/udm_sub.go index 233b20cd..cb0184f8 100644 --- a/src/modules/network_data/service/udm_sub.go +++ b/src/modules/network_data/service/udm_sub.go @@ -187,7 +187,7 @@ func (r *UDMSubUser) Insert(neId string, u model.UDMSubUser) int64 { r.udmSubRepository.Delete(u.IMSI, neId) // 新增到拓展信息 if u.Remark != "" { - r.udmUserInfoRepository.Delete(u.IMSI, neId) + r.udmUserInfoRepository.Delete(u.IMSI, "%") r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{{ IMSI: u.IMSI, MSISDN: u.MSISDN, @@ -257,9 +257,9 @@ func (r *UDMSubUser) LoadData(neId, imsi, num, remark string) { // 删除原数据 r.udmSubRepository.Delete(keyIMSI, neId) if remark == "-(Deleted)-" { - r.udmUserInfoRepository.Delete(keyIMSI, neId) + r.udmUserInfoRepository.Delete(keyIMSI, "%") } - // 加载数据 + // 加载数据,删除标记为-(Deleted)-加载为空不插入 arr := r.dataByRedis(keyIMSI, neId) if len(arr) < 1 { continue diff --git a/src/modules/network_data/service/udm_user_info.go b/src/modules/network_data/service/udm_user_info.go index da610724..0c53a7df 100644 --- a/src/modules/network_data/service/udm_user_info.go +++ b/src/modules/network_data/service/udm_user_info.go @@ -16,7 +16,7 @@ type UDMUserInfo struct { udmUserInfoRepository *repository.UDMUserInfo } -// SelectByIMSIAndNeID 通过IMSI和网元标识查询信息 +// SelectByIMSIAndNeID 通过IMSI和网元标识查询信息 neId为%时模糊imsi查询 func (r *UDMUserInfo) SelectByIMSIAndNeID(imsi, neId string) model.UDMUserInfo { return r.udmUserInfoRepository.SelectByIMSIAndNeID(imsi, neId) } @@ -27,7 +27,7 @@ func (r *UDMUserInfo) Save(u model.UDMUserInfo) bool { return r.udmUserInfoRepository.Inserts([]model.UDMUserInfo{u}) > 0 } -// Delete 删除信息 +// Delete 删除信息 neId为%时模糊imsi查询 func (r *UDMUserInfo) Delete(imsi, neId string) int64 { return r.udmUserInfoRepository.Delete(imsi, neId) }