OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

Merge remote-tracking branch 'origin/main' into practical-training

Browse Source
This commit is contained in:
TsMask
2024-07-08 10:57:07 +08:00
parent a009c6db73 737c3dd368
commit 7255cc1d92
16 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/framework/config/config/config.default.yaml
View File

@@ -1,7 +1,7 @@
# 项目信息
framework:
name: "CN EMS"
version: "2.2406.4"
version: "2.2407.1"
# 应用服务配置
server:

4
src/framework/utils/ctx/ctx.go
View File

@@ -84,8 +84,8 @@ func Authorization(c *gin.Context) string {
return ""
}
// 拆分 Authorization 请求头，提取 JWT 令牌部分
arr := strings.Split(authHeader, token.HEADER_PREFIX)
if len(arr) == 2 && arr[1] == "" {
arr := strings.SplitN(authHeader, token.HEADER_PREFIX, 2)
if len(arr) < 2 {
return ""
}
return arr[1]

4
src/framework/utils/parse/parse.go
View File

@@ -172,10 +172,10 @@ func Color(colorStr string) *color.RGBA {
}
}
// ConvertIPMask 转换IP网络地址掩码 24 -> 255.255.255.0
// ConvertIPMask 转换IP网络地址掩码 24->"255.255.255.0" 20->"255.255.240.0"
func ConvertIPMask(bits int64) string {
if bits < 0 || bits > 32 {
return "Invalid Mask Bits"
return "255.255.255.255"
}
// 构建一个32位的uint32类型掩码，指定前bits位为1，其余为0

24
src/modules/network_element/service/ne_info.impl.go
View File

@@ -705,20 +705,30 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]
}
n3IPAmdMask := external["upfn3_ip"].(string)
n3Arr := strings.Split(n3IPAmdMask, "/")
n3Arr := strings.SplitN(n3IPAmdMask, "/", 2)
n3IP := n3Arr[0]
n3Mask := parse.ConvertIPMask(parse.Number(n3Arr[1]))
n3Mask := "255.255.255.0"
if len(n3Arr) > 1 {
n3Mask = parse.ConvertIPMask(parse.Number(n3Arr[1]))
}
n6IPAmdMask := external["upfn6_ip"].(string)
n6Arr := strings.Split(n6IPAmdMask, "/")
n6Arr := strings.SplitN(n6IPAmdMask, "/", 2)
n6IP := n6Arr[0]
n6Mask := parse.ConvertIPMask(parse.Number(n6Arr[1]))
n6Mask := "255.255.255.0"
if len(n6Arr) > 1 {
n6Mask = parse.ConvertIPMask(parse.Number(n6Arr[1]))
}
ueIPAmdMask := external["ue_pool"].(string)
ueArr := strings.Split(ueIPAmdMask, "/")
ueArr := strings.SplitN(ueIPAmdMask, "/", 2)
ueIP := ueArr[0]
ueCicr := ueArr[1]
ueMask := parse.ConvertIPMask(parse.Number(ueArr[1]))
ueCicr := "24"
ueMask := "255.255.255.0"
if len(ueArr) > 1 {
ueCicr = ueArr[1]
ueMask = parse.ConvertIPMask(parse.Number(ueArr[1]))
}
return map[string]string{
// basic

19
src/modules/network_element/service/ne_version.impl.go
View File

@@ -248,10 +248,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
smsHost := fmt.Sprintf("%s smsc.%s smsc", para5GData["SIP_IP"], imsOrgHost)
cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", smsHost, smsHost))
// adb
cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
if strings.Contains(pkgCmdStr, "adb") {
cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
}
cmdStrArr = append(cmdStrArr, "ims-stop || true && ims-start \n")
// 30s后停止服务
// cmdStrArr = append(cmdStrArr, "nohup sh -c \"sleep 30s && sudo ims-stop\" > /dev/null 2>&1 & \n")
@@ -326,9 +327,11 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/192.168.8.110/%s/g\" /usr/local/etc/udm/as.yaml \n", para5GData["SIP_IP"]))
cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s udm' /etc/hosts || echo '%s udm' | sudo tee -a /etc/hosts \n", para5GData["UDM_IP"], para5GData["UDM_IP"]))
// adb
cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
if strings.Contains(pkgCmdStr, "adb") {
cmdStrArr = append(cmdStrArr, "sudo cp /usr/local/etc/adb/default/adb.conf /usr/local/etc/adb/adb.conf \n")
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i \"s/bind 127.0.0.1/bind %s/g\" /usr/local/etc/adb/adb.conf \n", para5GData["ADB_IP"]))
cmdStrArr = append(cmdStrArr, "sudo service adb restart \n")
}
}
// SMF配置修改
if neTypeLower == "smf" {
@@ -448,7 +451,7 @@ func (r *NeVersionImpl) operateCommand(action, neType string, neFilePaths []stri
cmdStrArr = append(cmdStrArr, fmt.Sprintf("sudo sed -i 's/TAC = 1;/TAC = %s;/g' /usr/local/etc/mme/mme.conf \n", para5GData["TAC"]))
// SMF开启
cmdStrArr = append(cmdStrArr, "sudo sed -i \"/^ *gxcfg:/,/^ *[^ ]/{s/enable: false/enable: true/;b};\" /usr/local/etc/smf/smf_conf.yaml \n")
cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["S11_MMEIP"], para5GData["S11_MMEIP"]))
cmdStrArr = append(cmdStrArr, fmt.Sprintf("grep -qxF '%s mme' /etc/hosts || echo '%s mme' | sudo tee -a /etc/hosts \n", para5GData["MME_IP"], para5GData["MME_IP"]))
}
// N3IWF配置修改
if neTypeLower == "n3iwf" {

2
src/modules/system/repository/sys_user.impl.go
View File

@@ -254,7 +254,7 @@ func (r *SysUserImpl) SelectAllocatedPage(query map[string]any, dataScopeSQL str
}
// 构建查询条件语句
whereSql := " where u.del_flag = '0' "
whereSql := " where u.del_flag = '0' and u.user_id != '1' "
if len(conditions) > 0 {
whereSql += " and " + strings.Join(conditions, " and ")
}