diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 4a44c77d..9738fc75 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -26,9 +26,9 @@ rest: port: 33443 schema: https clientAuthType: 0 - caFile: ./etc/certs/omc-ca.crt - certFile: ./etc/certs/omc-server.crt - keyFile: ./etc/certs/omc-server.key + caFile: ./restagent/etc/certs/omc-ca.crt + certFile: ./restagent/etc/certs/omc-server.crt + keyFile: ./restagent/etc/certs/omc-server.key webServer: enabled: false diff --git a/src/modules/network_data/repository/cdr_event_ims.go b/src/modules/network_data/repository/cdr_event_ims.go index 94c872dc..034803b2 100644 --- a/src/modules/network_data/repository/cdr_event_ims.go +++ b/src/modules/network_data/repository/cdr_event_ims.go @@ -86,11 +86,11 @@ func (r *CDREventIMS) SelectPage(querys model.CDREventIMSQuery) map[string]any { params = append(params, endTime) } if querys.CallerParty != "" { - conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?") + conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') like concat(concat('%', ?), '%')") params = append(params, querys.CallerParty) } if querys.CalledParty != "" { - conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?") + conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') like concat(concat('%', ?), '%')") params = append(params, querys.CalledParty) } // MySQL8支持的 diff --git a/src/modules/network_data/repository/cdr_event_sgwc.go b/src/modules/network_data/repository/cdr_event_sgwc.go index 783a2cbb..9536688c 100644 --- a/src/modules/network_data/repository/cdr_event_sgwc.go +++ b/src/modules/network_data/repository/cdr_event_sgwc.go @@ -39,10 +39,10 @@ func (r CDREventSGWC) SelectByPage(querys model.CDREventSGWCQuery) ([]model.CDRE tx = tx.Where("timestamp <= ?", endTime) } if querys.IMSI != "" { - tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') = ?", querys.IMSI) + tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedIMSI') like concat(concat('%', ?), '%')", querys.IMSI) } if querys.MSISDN != "" { - tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedMSISDN') = ?", querys.MSISDN) + tx = tx.Where("JSON_EXTRACT(cdr_json, '$.servedMSISDN') like concat(concat('%', ?), '%')", querys.MSISDN) } // 查询结果 diff --git a/src/modules/network_data/repository/cdr_event_smf.go b/src/modules/network_data/repository/cdr_event_smf.go index abcaec8a..dc0c05ae 100644 --- a/src/modules/network_data/repository/cdr_event_smf.go +++ b/src/modules/network_data/repository/cdr_event_smf.go @@ -91,7 +91,7 @@ func (r *CDREventSMF) SelectPage(querys model.CDREventSMFQuery) map[string]any { params = append(params, querys.RecordType) } if querys.SubscriberID != "" { - conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') = ?") + conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.subscriberIdentifier.subscriptionIDData') like concat(concat('%', ?), '%')") params = append(params, querys.SubscriberID) } if querys.DNN != "" { diff --git a/src/modules/network_data/repository/cdr_event_smsc.go b/src/modules/network_data/repository/cdr_event_smsc.go index c37495e9..42717376 100644 --- a/src/modules/network_data/repository/cdr_event_smsc.go +++ b/src/modules/network_data/repository/cdr_event_smsc.go @@ -86,11 +86,11 @@ func (r *CDREventSMSC) SelectPage(querys model.CDREventSMSCQuery) map[string]any params = append(params, endTime) } if querys.CallerParty != "" { - conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') = ?") + conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.callerParty') like concat(concat('%', ?), '%')") params = append(params, querys.CallerParty) } if querys.CalledParty != "" { - conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') = ?") + conditions = append(conditions, "JSON_EXTRACT(cdr_json, '$.calledParty') like concat(concat('%', ?), '%')") params = append(params, querys.CalledParty) } // MySQL8支持的 diff --git a/src/modules/network_data/repository/ue_event_amf.go b/src/modules/network_data/repository/ue_event_amf.go index 22cb3495..50ee9c23 100644 --- a/src/modules/network_data/repository/ue_event_amf.go +++ b/src/modules/network_data/repository/ue_event_amf.go @@ -95,7 +95,7 @@ func (r *UEEventAMF) SelectPage(querys model.UEEventAMFQuery) map[string]any { } } if querys.IMSI != "" { - conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?") + conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') like concat(concat('%', ?), '%')") params = append(params, querys.IMSI) } diff --git a/src/modules/network_data/repository/ue_event_mme.go b/src/modules/network_data/repository/ue_event_mme.go index a4b51348..219228e7 100644 --- a/src/modules/network_data/repository/ue_event_mme.go +++ b/src/modules/network_data/repository/ue_event_mme.go @@ -95,7 +95,7 @@ func (r *UEEventMME) SelectPage(querys model.UEEventMMEQuery) map[string]any { } } if querys.IMSI != "" { - conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') = ?") + conditions = append(conditions, "JSON_EXTRACT(event_json, '$.imsi') like concat(concat('%', ?), '%')") params = append(params, querys.IMSI) }