merge: 合并代码20241018

features/cdr/cdrevent.go

@@ -1,211 +1,28 @@
 package cdr
 
 import (
-	"encoding/json"
+	"fmt"
-	"io"
 	"net/http"
-	"time"
+	"strings"
 
+	"be.ems/lib/core/ctx"
 	"be.ems/lib/dborm"
-	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
 	"be.ems/restagent/config"
+	neService "be.ems/src/modules/network_element/service"
 	wsService "be.ems/src/modules/ws/service"
 )
 
 var (
-	UriIMSCDREvent = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrEvent"
+	UriCDREvent = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/{elementTypeValue}/objectType/cdrEvent"
-	UriIMSCDRFile  = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrFile"
+	UriCDRFile  = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/{elementTypeValue}/objectType/cdrFile"
-	UriSMFCDREvent = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/smf/objectType/cdrEvent"
-	UriSMFCDRFile  = config.DefaultUriPrefix + "/cdrManagement/v1/elementType/smf/objectType/cdrFile"
 
-	CustomUriIMSCDREvent = config.UriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrEvent"
+	CustomUriCDREvent = config.UriPrefix + "/cdrManagement/v1/elementType/{elementTypeValue}/objectType/cdrEvent"
-	CustomUriIMSCDRFile  = config.UriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrFile"
+	CustomUriCDRFile  = config.UriPrefix + "/cdrManagement/v1/elementType/{elementTypeValue}/objectType/cdrFile"
-	CustomUriSMFCDREvent = config.UriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrEvent"
-	CustomUriSMFCDRFile  = config.UriPrefix + "/cdrManagement/v1/elementType/ims/objectType/cdrFile"
 )
 
-// SMF CDR
+// CDREvent CDR数据表格结构体
-type CdrSubscriptionID struct {
-	SubscriptionIDType string `json:"subscriptionIDType"`
-	SubscriptionIDData string `json:"subscriptionIDData"`
-}
-
-type CdrNetWorkFuctionInfomation struct {
-	NetworkFunctionality       string `json:"networkFunctionality"`
-	NetworkFunctionName        string `json:"networkFunctionName,omitempty"`
-	NetworkFunctionIPv4Address string `json:"networkFunctionIPv4Address,omitempty"`
-	NetworkFunctionIPv6Address string `json:"networkFunctionIPv6Address,omitempty"`
-}
-
-type SMFTrigger string
-
-const (
-	TimeThresholdReached      SMFTrigger = "timeThresholdReached"
-	VolumeThresholdReached    SMFTrigger = "volumeThresholdReached"
-	UnitThresholdReached      SMFTrigger = "unitThresholdReached"
-	TimeQuotaExhausted        SMFTrigger = "timeQuotaExhausted"
-	VolumeQuotaExhausted      SMFTrigger = "volumeQuotaExhausted"
-	UnitQuotaExhausted        SMFTrigger = "unitQuotaExhausted"
-	ExpiryOfQuotaValidityTime SMFTrigger = "expiryOfQuotaValidityTime"
-	ExpiryOfQuotaHoldingTime  SMFTrigger = "expiryOfQuotaHoldingTime"
-	EndOfPDUSession           SMFTrigger = "endOfPDUSession"
-)
-
-type CdrSMFTrigger struct {
-	SMFTrigger SMFTrigger `json:"sMFTrigger"`
-}
-
-type CdrQuotaManagementIndicator string
-
-// List of QuotaManagementIndicator
-const (
-	Cdr_QMI_ONLINE_CHARGING            CdrQuotaManagementIndicator = "ONLINE_CHARGING"
-	Cdr_QMI_OFFLINE_CHARGING           CdrQuotaManagementIndicator = "OFFLINE_CHARGING"
-	Cdr_QMI_QUOTA_MANAGEMENT_SUSPENDED CdrQuotaManagementIndicator = "QUOTA_MANAGEMENT_SUSPENDED"
-)
-
-type CdrUsedUnitContainer struct {
-	ServiceIdentifier           *int32                      `json:"serviceIdentifier,omitempty"`
-	QuotaManagementIndicatorExt CdrQuotaManagementIndicator `json:"quotaManagementIndicatorExt,omitempty"`
-	Triggers                    []SMFTrigger                `json:"triggers,omitempty"`
-	TriggerTimestamp            *time.Time                  `json:"triggerTimestamp,omitempty"`
-	Time                        *uint32                     `json:"time,omitempty"`
-	DataTotalVolume             *uint64                     `json:"dataTotalVolume,omitempty"`
-	DataVolumeUplink            *uint64                     `json:"dataVolumeUplink,omitempty"`
-	DataVolumeDownlink          *uint64                     `json:"dataVolumeDownlink,omitempty"`
-	ServiceSpecificUnits        *uint64                     `json:"serviceSpecificUnits,omitempty"`
-	EventTimeStamp              *time.Time                  `json:"eventTimeStamp,omitempty"`
-	LocalSequenceNumber         int32                       `json:"localSequenceNumber"`
-	//PDUContainerInformation     *PduContainerInformation    `json:"pDUContainerInformation,omitempty"`
-	//NSPAContainerInformation    *NspaContainerInformation   `json:"nSPAContainerInformation,omitempty"`
-}
-
-type CdrMultipleUnitUsage struct {
-	RatingGroup       uint32                 `json:"ratingGroup" yaml:"ratingGroup" bson:"ratingGroup" mapstructure:"RatingGroup"`
-	UsedUnitContainer []CdrUsedUnitContainer `json:"usedUnitContainer,omitempty" yaml:"usedUnitContainer" bson:"usedUnitContainer" mapstructure:"UsedUnitContainer"`
-	//UPFID             string                 `json:"uPFID,omitempty" yaml:"uPFID" bson:"uPFID" mapstructure:"UPFID"`
-}
-
-type CdrSubscriberEquipmentNumber struct {
-	SubscriberEquipmentNumberType string `json:"subscriberEquipmentNumberType"`
-	SubscriberEquipmentNumberData string `json:"subscriberEquipmentNumberData"`
-}
-
-type CdrNetworkSliceInstanceID struct {
-	SST int32 `json:"sST"`
-
-	SD string `json:"sD,omitempty"`
-}
-
-type CdrPduAddress struct {
-	PDUIPv4Address           string `json:"pDUIPv4Address,omitempty"`
-	PDUIPv6AddresswithPrefix string `json:"pDUIPv6AddresswithPrefix,omitempty"`
-	IPV4dynamicAddressFlag   bool   `json:"iPV4dynamicAddressFlag,omitempty"`
-	IPV6dynamicPrefixFlag    bool   `json:"iPv6dynamicPrefixFlag,omitempty"`
-}
-
-type CdrArp struct {
-	PriorityLevel           int32  `json:"priorityLevel"`
-	PreemptionCapability    string `json:"preemptionCapability"`
-	PreemptionVulnerability string `json:"preemptionVulnerability"`
-}
-
-type CdrAuthorizedQosInformation struct {
-	FiveQi          int     `json:"fiveQi"`
-	ARP             *CdrArp `json:"aRP,omitempty"`
-	PriorityLevel   *int32  `json:"priorityLevel,omitempty"`
-	AverWindow      *int32  `json:"averWindow,omitempty"`
-	MaxDataBurstVol *int32  `json:"maxDataBurstVol,omitempty"`
-}
-
-type CdrSubscribedDefaultQos struct {
-	FiveQi        int32  `json:"fiveQi,omitempty"`
-	ARP           CdrArp `json:"aRP,omitempty"`
-	PriorityLevel *int32 `json:"priorityLevel,omitempty"`
-}
-
-type CdrSessionAmbr struct {
-	Uplink string `json:"uplink"`
-
-	Downlink string `json:"downlink"`
-}
-
-type CdrPDUSessionChargingInformation struct {
-	PDUSessionChargingID int32                         `json:"pDUSessionChargingID"`
-	UserIdentifier       string                        `json:"userIdentifier,omitempty"`    // isdn
-	UserEquipmentInfo    *CdrSubscriberEquipmentNumber `json:"userEquipmentInfo,omitempty"` // imei/imeisv
-	//UserLocationInfomation    *UserLocation                 `json:"userLocationinfo,omitempty"`
-	UserRoamerInOut        string                     `json:"userRoamerInOut,omitempty"`
-	PDUSessionId           int32                      `json:"pDUSessionId"`
-	NetworkSliceInstanceID *CdrNetworkSliceInstanceID `json:"networkSliceInstanceID,omitempty"`
-	//PDUType                   PduSessionType                `json:"pDUType,omitempty"`
-	SSCMode            string `json:"sSCMode,omitempty"`
-	DNNID              string `json:"dNNID"`
-	SUPIPLMNIdentifier string `json:"sUPIPLMNIdentifier,omitempty"`
-	//ServingNetworkFunctionID  *ServingNetworkFunctionId     `json:"servingNetworkFunctionID,omitempty"`
-	//RATType                   RatType                       `json:"rATType,omitempty"`
-	DataNetworkNameIdentifier string                       `json:"dataNetworkNameIdentifier,omitempty"`
-	PDUAddress                CdrPduAddress                `json:"pDUAddress,omitempty"`
-	AuthorizedQoSInformation  *CdrAuthorizedQosInformation `json:"authorizedQoSInformation,omitempty"`
-	UETimeZone                string                       `json:"uETimeZone,omitempty"`
-	PDUSessionstartTime       *time.Time                   `json:"pDUSessionstartTime,omitempty"`
-	PDUSessionstopTime        *time.Time                   `json:"pDUSessionstopTime,omitempty"`
-	Diagnostics               *int                         `json:"diagnostics,omitempty"`
-	ChargingCharacteristics   string                       `json:"chargingCharacteristics,omitempty"`
-	ChChSelectionMode         string                       `json:"chChSelectionMode,omitempty"`
-	ThreeGPPPSDataOffStatus   string                       `json:"threeGPPPSDataOffStatus,omitempty"`
-	//RANSecondaryRATUsageReport       *RanSecondaryRatUsageReport `json:"rANSecondaryRATUsageReport,omitempty"`
-	SubscribedQoSInformation *CdrSubscribedDefaultQos `json:"subscribedQoSInformation,omitempty"`
-	AuthorizedSessionAMBR    *CdrSessionAmbr          `json:"authorizedSessionAMBR,omitempty"`
-	SubscribedSessionAMBR    *CdrSessionAmbr          `json:"subscribedSessionAMBR,omitempty"`
-	ServingCNPLMNID          string                   `json:"servingCNPLMNID,omitempty"`
-	DnnSelectionMode         string                   `json:"dnnSelectionMode,omitempty"`
-	HomeProvidedChargingID   int32                    `json:"homeProvidedChargingID,omitempty"`
-
-	//MAPDUNon3GPPUserLocationInfo     *UserLocation           `json:"mAPDUNon3GPPUserLocationInfo,omitempty" yaml:"mAPDUNon3GPPUserLocationInfo" bson:"mAPDUNon3GPPUserLocationInfo" mapstructure:"MAPDUNon3GPPUserLocationInfo"`
-	//PresenceReportingAreaInformation map[string]PresenceInfo `json:"presenceReportingAreaInformation,omitempty" yaml:"presenceReportingAreaInformation" bson:"presenceReportingAreaInformation" mapstructure:"PresenceReportingAreaInformation"`
-}
-
-type CauseForRecordClosing string
-
-const (
-	NormalRelease              CauseForRecordClosing = "normalRelease"
-	PartialRecord              CauseForRecordClosing = "partialRecord"
-	AbnormalRelease            CauseForRecordClosing = "abnormalRelease"
-	CAMELInitCallRelease       CauseForRecordClosing = "cAMELInitCallRelease"
-	VolumeLimit                CauseForRecordClosing = "volumeLimit"
-	TimeLimit                  CauseForRecordClosing = "timeLimit"
-	ServingNodeChange          CauseForRecordClosing = "servingNodeChange"
-	MaxChangeCond              CauseForRecordClosing = "maxChangeCond"
-	ManagementIntervention     CauseForRecordClosing = "managementIntervention"
-	IntraSGSNIntersystemChange CauseForRecordClosing = "intraSGSNIntersystemChange"
-	RATChange                  CauseForRecordClosing = "rATChange"
-	MSTimeZoneChange           CauseForRecordClosing = "mSTimeZoneChange"
-	SGSNPLMNIDChange           CauseForRecordClosing = "sGSNPLMNIDChange "
-	SGWChange                  CauseForRecordClosing = "sGWChange"
-	APNAMBRChange              CauseForRecordClosing = "aPNAMBRChange"
-)
-
-type ChargingRecord struct {
-	RecordType                    string                           `json:"recordType"`
-	ChargingID                    int                              `json:"chargingID"`
-	RecordingNetworkFunctionID    string                           `json:"recordingNetworkFunctionID"` // UUID
-	SubscriberIdentifier          CdrSubscriptionID                `json:"subscriberIdentifier,omitempty"`
-	NFunctionConsumerInformation  CdrNetWorkFuctionInfomation      `json:"nFunctionConsumerInformation"`
-	Triggers                      []CdrSMFTrigger                  `json:"triggers,omitempty"`
-	ListOfMultipleUnitUsage       []CdrMultipleUnitUsage           `json:"listOfMultipleUnitUsage,omitempty"`
-	RecordOpeningTime             string                           `json:"recordOpeningTime"`
-	Duration                      int                              `json:"duration"`
-	RecordSequenceNumber          int                              `json:"recordSequenceNumber,omitempty"`
-	CauseForRecClosing            CauseForRecordClosing            `json:"causeForRecClosing"`
-	Diagnostics                   *int                             `json:"diagnostics,omitempty"`
-	LocalRecordSequenceNumber     int                              `json:"localRecordSequenceNumber,omitempty"`
-	PDUSessionChargingInformation CdrPDUSessionChargingInformation `json:"pDUSessionChargingInformation,omitempty"`
-	InvocationTimestamp           string                           `json:"invocationTimestamp,omitempty"`
-}
-
 type CDREvent struct {
 	NeType    string         `json:"neType" xorm:"ne_type"`
 	NeName    string         `json:"neName" xorm:"ne_name"`
@@ -214,72 +31,45 @@ type CDREvent struct {
 	CDR       map[string]any `json:"CDR" xorm:"cdr_json"`
 }
 
-func PostCDREventFromIMS(w http.ResponseWriter, r *http.Request) {
+// PostCDREventFrom 接收CDR数据请求
-	log.Info("PostCDREventFromIMS processing... ")
+func PostCDREventFrom(w http.ResponseWriter, r *http.Request) {
-
+	log.Info("PostCDREventFrom processing... ")
-	//	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
+	neType := ctx.GetParam(r, "elementTypeValue")
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
+	var cdrEvent CDREvent
-	if err != nil {
+	if err := ctx.ShouldBindJSON(r, &cdrEvent); err != nil {
-		log.Error("Faile to io.ReadAll: ", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	cdrEvent := new(CDREvent)
-	err = json.Unmarshal(body, &cdrEvent)
-	if cdrEvent.NeType == "" || err != nil {
-		log.Error("Failed to Unmarshal cdrEvent:", err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
-	log.Trace("cdrEvent:", cdrEvent)
 
-	affected, err := dborm.XormInsertTableOne("cdr_event_ims", cdrEvent)
+	neTypeLower := strings.ToLower(cdrEvent.NeType)
+	if neType == "" || neType != neTypeLower {
+		services.ResponseInternalServerError500ProcessError(w, fmt.Errorf("inconsistent network element types"))
+		return
+	}
+
+	tableName := fmt.Sprintf("cdr_event_%s", neTypeLower)
+	affected, err := dborm.XormInsertTableOne(tableName, cdrEvent)
 	if err != nil && affected <= 0 {
-		log.Error("Failed to insert cdr_event_ims:", err)
+		log.Error("Failed to insert "+tableName, err)
 		services.ResponseInternalServerError500ProcessError(w, err)
 		return
 	}
 
-	// 推送到ws订阅组
+	// 发送到匹配的网元
-	if v, ok := cdrEvent.CDR["recordType"]; ok {
+	neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(cdrEvent.RmUID)
-		if v == "MOC" || v == "MTSM" {
+	if neInfo.RmUID == cdrEvent.RmUID {
-			wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_IMS_CDR, cdrEvent)
+		// 推送到ws订阅组
+		switch neInfo.NeType {
+		case "IMS":
+			if v, ok := cdrEvent.CDR["recordType"]; ok && (v == "MOC" || v == "MTSM") {
+				wsService.NewWSSend.ByGroupID(wsService.GROUP_IMS_CDR+neInfo.NeId, cdrEvent)
+			}
+		case "SMF":
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_SMF_CDR+neInfo.NeId, cdrEvent)
+		case "SMSC":
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_SMSC_CDR+neInfo.NeId, cdrEvent)
 		}
 	}
 
 	services.ResponseStatusOK204NoContent(w)
 }
-
-func PostCDREventFromSMF(w http.ResponseWriter, r *http.Request) {
-	log.Info("PostCDREventFromSMF processing... ")
-
-	//	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Faile to io.ReadAll: ", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	cdrEvent := new(CDREvent)
-	err = json.Unmarshal(body, &cdrEvent)
-	if cdrEvent.NeType == "" || err != nil {
-		log.Error("Failed to Unmarshal cdrEvent:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	log.Trace("cdrEvent:", cdrEvent)
-
-	affected, err := dborm.XormInsertTableOne("cdr_event_smf", cdrEvent)
-	if err != nil && affected <= 0 {
-		log.Error("Failed to insert cdr_event_smf:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	// 推送到ws订阅组
-	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_SMF_CDR, cdrEvent)
-
-	services.ResponseStatusOK204NoContent(w)
-}

features/cm/license.go

@@ -1,558 +0,0 @@
-package cm
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-
-	"be.ems/lib/core/ctx"
-	"be.ems/lib/dborm"
-	"be.ems/lib/log"
-	"be.ems/lib/services"
-	"be.ems/restagent/config"
-	neModel "be.ems/src/modules/network_element/model"
-	neService "be.ems/src/modules/network_element/service"
-	"github.com/gorilla/mux"
-)
-
-var (
-	// General License URI
-	UriLicense    = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/{elementTypeValue}/license"
-	UriLicenseExt = config.DefaultUriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/license"
-
-	CustomUriLicense    = config.UriPrefix + "/systemManagement/{apiVersion}/{elementTypeValue}/license"
-	CustomUriLicenseExt = config.UriPrefix + "/systemManagement/{apiVersion}/elementType/{elementTypeValue}/objectType/license"
-)
-
-func UploadLicenseFile(w http.ResponseWriter, r *http.Request) {
-	log.Debug("UploadLicenseFile processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Http request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["neType"]
-	if neType == "" {
-		log.Error("neType is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	// neTypeUpper := strings.ToUpper(neType)
-	// neTypeLower := strings.ToLower(neType)
-
-	services.ResponseStatusOK204NoContent(w)
-}
-
-func DownloadLicenseFile(w http.ResponseWriter, r *http.Request) {
-	log.Debug("DownloadLicenseFile processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["neType"]
-	if neType == "" {
-		log.Error("neType is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	// // neTypeUpper := strings.ToUpper(neType)
-	// //neTypeLower := strings.ToLower(neType)
-
-	// version := vars["version"]
-	// if version == "" {
-	// 	log.Error("version is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-
-	// sql := fmt.Sprintf("select * from ne_software where ne_type='%s' and version='%s'", neTypeUpper, version)
-	// neSoftware, err := dborm.XormGetDataBySQL(sql)
-	// if err != nil {
-	// 	log.Error("Faile to XormGetDataBySQL:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// } else if len(*neSoftware) == 0 {
-	// 	err := global.ErrCMNotFoundTargetSoftware
-	// 	log.Error(err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// }
-
-	// fileName := (*neSoftware)[0]["file_name"]
-	// path := (*neSoftware)[0]["path"]
-	// md5Sum := (*neSoftware)[0]["md5_sum"]
-
-	// services.ResponseFileWithNameAndMD5(w, http.StatusOK, fileName, path, md5Sum)
-}
-
-func DeleteLcenseFile(w http.ResponseWriter, r *http.Request) {
-	log.Debug("DeleteLcenseFile processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["neType"]
-	if neType == "" {
-		log.Error("neType is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	// neTypeUpper := strings.ToUpper(neType)
-	// //neTypeLower := strings.ToLower(neType)
-
-	// version := vars["version"]
-	// if version == "" {
-	// 	log.Error("version is empty")
-	// 	services.ResponseNotFound404UriNotExist(w, r)
-	// 	return
-	// }
-
-	// sql := fmt.Sprintf("select * from ne_software where ne_type='%s' and version='%s'", neTypeUpper, version)
-	// neSoftware, err := dborm.XormGetDataBySQL(sql)
-	// if err != nil {
-	// 	log.Error("Faile to XormGetDataBySQL:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// } else if len(*neSoftware) == 0 {
-	// 	err := global.ErrCMNotFoundTargetSoftware
-	// 	log.Error(err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// }
-
-	// where := fmt.Sprintf("ne_type='%s' and version='%s'", neTypeUpper, version)
-	// affected, err := dborm.XormDeleteDataByWhere(where, "ne_software")
-	// if err != nil || affected == 0 {
-	// 	log.Error("Faile to XormGetDataBySQL:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// }
-
-	// fileName := (*neSoftware)[0]["file_name"]
-	// path := (*neSoftware)[0]["path"]
-	// filePath := fmt.Sprintf("%s/%s", path, fileName)
-	// err = os.Remove(filePath)
-	// if err != nil {
-	// 	log.Error("Faile to Remove:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// 	return
-	// }
-
-	services.ResponseStatusOK204NoContent(w)
-}
-
-// type MMLRequest struct {
-// 	MML []string `json:"mml"`
-// }
-
-// var TIME_DELAY_AFTER_WRITE time.Duration = 200
-// var TIME_DEAD_LINE time.Duration = 10
-
-// func init() {
-// 	if config.GetYamlConfig().MML.Sleep != 0 {
-// 		TIME_DELAY_AFTER_WRITE = time.Duration(config.GetYamlConfig().MML.Sleep)
-// 	}
-// 	if config.GetYamlConfig().MML.DeadLine != 0 {
-// 		TIME_DEAD_LINE = time.Duration(config.GetYamlConfig().MML.DeadLine)
-// 	}
-// }
-
-func UploadLicenseFileData(w http.ResponseWriter, r *http.Request) {
-	log.Info("UploadLicenseFileData processing... ")
-
-	// _, err := services.CheckFrontValidRequest(w, r)
-	// if err != nil {
-	// 	log.Error("Http request error:", err)
-	// 	return
-	// }
-
-	vars := mux.Vars(r)
-	neType := vars["elementTypeValue"]
-	if neType == "" {
-		log.Error("elementTypeValue is empty")
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	neTypeUpper := strings.ToUpper(neType)
-	neTypeLower := strings.ToLower(neType)
-
-	//md5Param := services.GetUriParamString(r, "md5Sum", ",", false, false)
-
-	neId := services.GetUriParamString(r, "neId", ",", false, false)
-
-	neInfo, err := dborm.XormGetNeInfo(neType, neId)
-	if err != nil {
-		log.Errorf("Failed to get ne_info:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	log.Debug("neInfo:", neInfo)
-
-	licensePath := fmt.Sprintf("%s/%s", config.GetYamlConfig().OMC.License, neTypeLower)
-	err = os.MkdirAll(licensePath, os.ModePerm)
-	if err != nil {
-		log.Error("Failed to Mkdir:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	//fileName, err := services.HandleUploadFile(r, softwarePath, "")
-
-	// 解析multipart/form-data请求
-	err = r.ParseMultipartForm(10 << 20) // 10MB
-	if err != nil {
-		log.Error("Faile to ParseMultipartForm:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	// 获取文件和数据
-	licFile := r.MultipartForm.File["file"]
-	data := r.MultipartForm.Value["comment"]
-
-	var licenseFileName, comment string
-
-	// 处理license文件
-	if len(licFile) > 0 {
-		file := licFile[0]
-		// 打开文件
-		f, err := file.Open()
-		if err != nil {
-			log.Error("Faile to Open:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		defer f.Close()
-
-		// 创建本地文件
-		dst, err := os.Create(licensePath + "/" + file.Filename)
-		if err != nil {
-			log.Error("Faile to Create:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		defer dst.Close()
-
-		licenseFileName = file.Filename
-		// 将文件内容拷贝到本地文件
-		_, err = io.Copy(dst, f)
-		if err != nil {
-			log.Error("Faile to Copy:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-	}
-
-	// 处理数据
-	if len(data) > 0 {
-		comment = data[0]
-	}
-
-	neLicensePath := strings.ReplaceAll(config.GetYamlConfig().NE.LicenseDir, "{neType}", neTypeLower)
-
-	srcFile := fmt.Sprintf("%s/%s", licensePath, licenseFileName)
-	scpDir := fmt.Sprintf("%s@%s:%s", config.GetYamlConfig().NE.User, neInfo.Ip, config.GetYamlConfig().NE.ScpDir)
-	cmd := exec.Command("scp", "-r", srcFile, scpDir)
-	out, err := cmd.CombinedOutput()
-	log.Debugf("Exec output: %v", string(out))
-	if err != nil {
-		log.Errorf("Faile to scp NF: neType=%s, neId=%s, ip=%s", neType, neId, neInfo.Ip)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-	// backup system.ini to system.ini.bak
-	sshHost := fmt.Sprintf("%s@%s", config.GetYamlConfig().NE.User, neInfo.Ip)
-	cpCmd := fmt.Sprintf("sudo test -f %s/system.ini && cp -f %s/system.ini %s/system.ini.bak||echo 0",
-		neLicensePath, neLicensePath, neLicensePath)
-	cmd = exec.Command("ssh", sshHost, cpCmd)
-	out, err = cmd.CombinedOutput()
-	log.Debugf("Exec output: %v", string(out))
-	if err != nil {
-		log.Errorf("Faile to execute cp command:%v, cmd:%s", err, cpCmd)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	// replace system.ini
-	neFilePath := config.GetYamlConfig().NE.ScpDir + "/" + licenseFileName
-	cpCmd = fmt.Sprintf("sudo mv -f %s %s/system.ini", neFilePath, neLicensePath)
-	cmd = exec.Command("ssh", sshHost, cpCmd)
-	out, err = cmd.CombinedOutput()
-	log.Debugf("Exec output: %v", string(out))
-	if err != nil {
-		log.Error("Faile to execute cp command:", err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	/*
-		// judge license if expired
-		isRestart := false
-		hostUri := fmt.Sprintf("http://%s:%v", neInfo.Ip, neInfo.Port)
-		requestURI2NF := fmt.Sprintf("%s/api/rest/systemManagement/v1/elementType/%s/objectType/systemState",
-			hostUri, neTypeLower)
-		log.Debug("requestURI2NF:", requestURI2NF)
-
-		resp, err := client.R().
-			EnableTrace().
-			SetHeaders(map[string]string{tokenConst.HEADER_KEY: r.Header.Get(tokenConst.HEADER_KEY)}).
-			//SetHeaders(map[string]string{"accessToken": token}).
-			SetHeaders(map[string]string{"User-Agent": config.GetDefaultUserAgent()}).
-			SetHeaders(map[string]string{"Content-Type": "application/json;charset=UTF-8"}).
-			Get(requestURI2NF)
-		if err != nil {
-			log.Error("Failed to get system state:", err)
-			isRestart = true
-		} else {
-			systemState := make(map[string]interface{})
-			_ = json.Unmarshal(resp.Body(), &systemState)
-			expiryDate := fmt.Sprintf("%v", systemState["expiryDate"])
-			t1_expiry, _ := time.ParseInLocation(time.DateOnly, expiryDate, time.Local)
-			nowDate := time.Now().Local()
-			nowDate.Format(time.DateOnly)
-			isRestart = t1_expiry.Before(nowDate)
-		}
-		// case non-expired license: send NE reload license MML
-		if !isRestart {
-			// send reload license MML
-			var buf [20 * 1024]byte
-			//buf := make([]byte, 0)
-			var n int
-			if neInfo != nil {
-				switch strings.ToLower(neType) {
-				case "ims":
-					hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port)
-					conn, err := net.Dial("tcp", hostMML)
-					if err != nil {
-						errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
-						log.Error(errMsg)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					defer conn.Close()
-
-					conn.SetDeadline(time.Now().Add(TIME_DEAD_LINE * time.Second))
-
-					_, err = conn.Write([]byte(config.GetYamlConfig().MML.User + "\r\n"))
-					if err != nil {
-						log.Error("Failed to write:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-					n, err = conn.Read(buf[0:])
-					if err != nil {
-						log.Error("Failed to read:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					log.Trace(string(buf[0:n]))
-
-					_, err = conn.Write([]byte(config.GetYamlConfig().MML.Password + "\r\n"))
-					if err != nil {
-						log.Error("Failed to write:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-					n, err = conn.Read(buf[0:])
-					if err != nil {
-						log.Error("Failed to read:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					log.Trace(string(buf[0 : n-len(neType)-2]))
-
-					mmlCommand := "check lic\r\n"
-
-					_, err = conn.Write([]byte(mmlCommand))
-					if err != nil {
-						log.Error("Failed to write:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-					n, err = conn.Read(buf[0:])
-					if err != nil {
-						log.Error("Failed to read:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					log.Trace(string(buf[0 : n-len(neType)-2]))
-
-					re1 := regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`) // 匹配包含␛的控制字符
-					//re2 := regexp.MustCompile(`\x00`) // 匹配空字符
-					re2 := regexp.MustCompile(`[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x1B]`) // 匹配空字符和包含␛的控制字符
-					//re := regexp.MustCompile(`[\x00-\x1F\x7F]`)
-					// upf telnet buffer只能读取一次，需要去掉前面的多余字符
-					result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
-					result = re2.ReplaceAllString(result, "")
-					if !strings.Contains(result, "COMMAND OK") {
-						err = fmt.Errorf("failed to check license, %s", result)
-						log.Error(err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-				default:
-					hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port)
-					conn, err := net.Dial("tcp", hostMML)
-					if err != nil {
-						errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
-						log.Error(errMsg)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					defer conn.Close()
-
-					conn.SetDeadline(time.Now().Add(TIME_DEAD_LINE * time.Second))
-					loginStr := fmt.Sprintf("%s\n%s\n", config.GetYamlConfig().MML.User, config.GetYamlConfig().MML.Password)
-					_, err = conn.Write([]byte(loginStr))
-					if err != nil {
-						log.Error("Failed to write:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-
-					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-					n, err = conn.Read(buf[0:])
-					if err != nil {
-						log.Error("Failed to read:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					log.Trace(string(buf[0:n]))
-
-					mmlCommand := "check lic\n"
-					_, err = conn.Write([]byte(mmlCommand))
-					if err != nil {
-						log.Error("Failed to write:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-					n, err = conn.Read(buf[0:])
-					if err != nil {
-						log.Error("Failed to read:", err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-					log.Trace(string(buf[0 : n-len(neType)-2]))
-					re1 := regexp.MustCompile(`\x1B\[[0-9;]*[a-zA-Z]`) // 匹配包含␛的控制字符
-					//re2 := regexp.MustCompile(`\x00`) // 匹配空字符
-					re2 := regexp.MustCompile(`[\x00-\x08\x0B\x0C\x0E-\x1F\x7F\x1B]`) // 匹配空字符和包含␛的控制字符
-					//re := regexp.MustCompile(`[\x00-\x1F\x7F]`)
-					result := re1.ReplaceAllString(string(buf[0:n-len(neType)-2]), "")
-					result = re2.ReplaceAllString(result, "")
-					if !strings.Contains(result, "COMMAND OK") {
-						err = fmt.Errorf("failed to check license, %s", result)
-						log.Error(err)
-						services.ResponseInternalServerError500ProcessError(w, err)
-						return
-					}
-				}
-			}
-		} else {
-			// case expired license: restart NE service
-			switch neTypeLower {
-			case "omc":
-				restartCmd := fmt.Sprintf("sudo %s/bin/omcsvc.sh restart", config.GetYamlConfig().NE.OmcDir)
-				cmd := exec.Command("ssh", sshHost, restartCmd)
-				out, err := cmd.CombinedOutput()
-				log.Debugf("Exec output: %v", string(out))
-				if err != nil {
-					log.Error("Faile to execute ssh restart omc:", err)
-					services.ResponseInternalServerError500ProcessError(w, err)
-					return
-				}
-			case "ims":
-				restartCmd := "sudo ims-stop && sudo ims-start"
-				cmd := exec.Command("ssh", sshHost, restartCmd)
-				out, err := cmd.CombinedOutput()
-				log.Debugf("Exec output: %v", string(out))
-				if err != nil {
-					log.Error("Faile to execute ssh sudo systemctl command:", err)
-					services.ResponseInternalServerError500ProcessError(w, err)
-					return
-				}
-			default:
-				restartCmd := fmt.Sprintf("sudo systemctl restart %s.service", neTypeLower)
-				cmd := exec.Command("ssh", sshHost, restartCmd)
-				out, err := cmd.CombinedOutput()
-				log.Debugf("Exec output: %v", string(out))
-				if err != nil {
-					log.Error("Faile to execute ssh sudo systemctl command:", err)
-					services.ResponseInternalServerError500ProcessError(w, err)
-					return
-				}
-			}
-		}
-	*/
-
-	// neLicense := dborm.NeLicense{
-	// 	NeType:   neTypeUpper,
-	// 	NeID:     neId,
-	// 	Status:   "ACTIVE",
-	// 	Path:     licensePath,
-	// 	FileName: licenseFileName,
-	// 	Comment:  comment,
-	// }
-
-	// log.Debug("neLicense:", neLicense)
-	// _, err = dborm.XormInsertTableOne("ne_license", neLicense)
-	// if err != nil {
-	// 	log.Error("Faile to XormInsertTableOne:", err)
-	// 	services.ResponseInternalServerError500ProcessError(w, err)
-	// }
-
-	neLicense := neModel.NeLicense{
-		NeType:      neTypeUpper,
-		NeId:        neId,
-		Status:      "0",
-		LicensePath: neFilePath,
-		Remark:      comment,
-	}
-
-	log.Debug("neLicense:", neLicense)
-
-	// 检查是否存在授权记录
-	neLicense2 := neService.NewNeLicenseImpl.SelectByNeTypeAndNeID(neTypeUpper, neId)
-	if neLicense2.NeId != neId {
-		// 读取授权码
-		code, _ := neService.NewNeLicenseImpl.ReadLicenseInfo(neLicense)
-		neLicense.ActivationRequestCode = code
-
-		neLicense.CreateBy = ctx.LoginUserToUserName(r)
-		insertId := neService.NewNeLicenseImpl.Insert(neLicense)
-		if insertId != "" {
-			services.ResponseStatusOK204NoContent(w)
-			return
-		}
-	} else {
-		neLicense2.UpdateBy = ctx.LoginUserToUserName(r)
-		upRows := neService.NewNeLicenseImpl.Update(neLicense2)
-		if upRows > 0 {
-			services.ResponseStatusOK204NoContent(w)
-			return
-		}
-	}
-
-	services.ResponseInternalServerError500ProcessError(w, err)
-}

features/cm/ne.go

@@ -157,7 +157,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
 
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}
@@ -208,7 +208,7 @@ func PostNeInfo(w http.ResponseWriter, r *http.Request) {
 			}
 
 			// 刷新缓存，不存在结构体网元Id空字符串
-			neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+			neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
 
 			services.ResponseStatusOK204NoContent(w)
 			return
@@ -267,7 +267,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
 
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}
@@ -319,7 +319,7 @@ func PutNeInfo(w http.ResponseWriter, r *http.Request) {
 			}
 
 			// 刷新缓存，不存在结构体网元Id空字符串
-			neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+			neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
 
 			services.ResponseStatusOK204NoContent(w)
 			return
@@ -381,7 +381,7 @@ func DeleteNeInfo(w http.ResponseWriter, r *http.Request) {
 		}
 
 		// 刷新缓存，不存在结构体网元Id空字符串
-		neService.NewNeInfoImpl.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
+		neService.NewNeInfo.RefreshByNeTypeAndNeID(neInfo.NeType, neInfo.NeId)
 
 		mapRow := make(map[string]interface{})
 		row := map[string]interface{}{"affectedRows": affected}

features/cm/omc/controller.go

@@ -0,0 +1,46 @@
+package cm_omc
+
+import (
+	"fmt"
+	"net/http"
+
+	"be.ems/lib/services"
+	"github.com/gin-gonic/gin"
+)
+
+func (o *ConfigOMC) Get(c *gin.Context) {
+	paramName := c.Param("paramName")
+	results, err := o.Query(paramName)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusOK, services.DataResp(results))
+}
+
+func (o *ConfigOMC) Post(c *gin.Context) {
+	err := fmt.Errorf("method not allowed")
+	c.JSON(http.StatusMethodNotAllowed, services.ErrResp(err.Error()))
+}
+
+func (o *ConfigOMC) Put(c *gin.Context) {
+	paramName := c.Param("paramName")
+	var paramData map[string]any
+
+	if err := c.ShouldBindJSON(&paramData); err != nil {
+		c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
+		return
+	}
+
+	result, err := o.Modify(paramName, paramData)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusOK, services.DataResp(result))
+}
+
+func (o *ConfigOMC) Delete(c *gin.Context) {
+	err := fmt.Errorf("method not allowed")
+	c.JSON(http.StatusMethodNotAllowed, services.ErrResp(err.Error()))
+}

features/cm/omc/implement.go

@@ -0,0 +1,69 @@
+package cm_omc
+
+import (
+	"fmt"
+
+	"be.ems/restagent/config"
+)
+
+const (
+	PASSWORD_MASK = "********"
+)
+
+func (o *ConfigOMC) Query(paramName string) (any, error) {
+	var results []any
+
+	switch paramName {
+	case "alarmEmailForward":
+		result := config.GetYamlConfig().Alarm.EmailForward
+		result.Password = PASSWORD_MASK
+		results = append(results, result)
+	case "alarmSMSForward":
+		result := config.GetYamlConfig().Alarm.SMSCForward
+		result.Password = PASSWORD_MASK
+		results = append(results, result)
+	default:
+		return nil, fmt.Errorf("invalid source parameter")
+	}
+
+	return results, nil
+}
+
+func (o *ConfigOMC) Add() {
+
+}
+
+func (o *ConfigOMC) Modify(paramName string, paramData map[string]any) (any, error) {
+	var results []any
+
+	switch paramName {
+	case "alarmEmailForward":
+		param := &(config.GetYamlConfig().Alarm.EmailForward)
+		config.UpdateStructFromMap(param, paramData)
+		result := *param
+		results = append(results, result)
+		err := config.WriteOrignalConfig(config.YamlConfigInfo.FilePath, paramName, paramData)
+		if err != nil {
+			fmt.Println("failed to write config yaml file:", err)
+			return results, err
+		}
+	case "alarmSMSForward":
+		param := &(config.GetYamlConfig().Alarm.SMSCForward)
+		config.UpdateStructFromMap(param, paramData)
+		result := *param
+		results = append(results, result)
+		err := config.WriteOrignalConfig(config.YamlConfigInfo.FilePath, paramName, paramData)
+		if err != nil {
+			fmt.Println("failed to write config yaml file:", err)
+			return results, err
+		}
+	default:
+		return nil, fmt.Errorf("invalid source parameter")
+	}
+
+	return results, nil
+}
+
+func (o *ConfigOMC) Remove() {
+
+}

features/cm/omc/model.go

@@ -0,0 +1,26 @@
+package cm_omc
+
+type ConfigOMC struct{}
+
+type SystemConfig struct {
+	ForwardFlag bool `json:"forwardFlag"`
+}
+
+type AlarmEmailForward struct {
+	Enable        bool   `json:"enable"`
+	EmailList     string `json:"emailList"`
+	SMTP          string `json:"smtp"`
+	Port          uint16 `json:"port"`
+	User          string `json:"user"`
+	Password      string `json:"password"`
+	TLSSkipVerify bool   `json:"tlsSkipVerify"`
+}
+
+type AlarmSMSForward struct {
+	Enable     bool   `json:"enable"`
+	MobileList string `json:"mobileList"`
+	SMSCAddr   string `json:"smscAddr"`
+	SystemID   string `json:"systemID"`
+	Password   string `json:"password"`
+	SystemType string `json:"systemType"`
+}

features/cm/omc/route.go

@@ -0,0 +1,30 @@
+package cm_omc
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for file_export
+func Register(r *gin.RouterGroup) {
+	cmOMC := r.Group("/omc")
+	{
+		var o *ConfigOMC
+		cmOMC.GET("/config/:paramName",
+			middleware.PreAuthorize(nil),
+			o.Get,
+		)
+		cmOMC.POST("/config/:paramName",
+			middleware.PreAuthorize(nil),
+			o.Post,
+		)
+		cmOMC.PUT("/config/:paramName",
+			middleware.PreAuthorize(nil),
+			o.Put,
+		)
+		cmOMC.DELETE("/config/:paramName",
+			middleware.PreAuthorize(nil),
+			o.Delete,
+		)
+	}
+}

features/cm/param.go

@@ -39,7 +39,7 @@ func GetParamConfigFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	var response services.DataResponse
 	if neInfo.NeId == neId && neInfo.NeId != "" {
@@ -76,7 +76,7 @@ func PostParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	if neInfo.NeId != neId || neInfo.NeId == "" {
 		log.Error("neId is empty")
@@ -128,7 +128,7 @@ func PutParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	}
 
 	neId := ctx.GetQuery(r, "ne_id")
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	if neInfo.NeId != neId || neInfo.NeId == "" {
 		log.Error("neId is empty")
@@ -181,7 +181,7 @@ func DeleteParamConfigToNF(w http.ResponseWriter, r *http.Request) {
 	}
 
 	neId := ctx.GetQuery(r, "ne_id")
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	if neInfo.NeId != neId || neInfo.NeId == "" {
 		log.Error("neId is empty")

features/cm/service.go

@@ -0,0 +1,17 @@
+package cm
+
+import (
+	cm_omc "be.ems/features/cm/omc"
+	"be.ems/lib/log"
+	"github.com/gin-gonic/gin"
+)
+
+func InitSubServiceRoute(r *gin.Engine) {
+	log.Info("======init PM group gin.Engine")
+
+	cmGroup := r.Group("/cm")
+	// register sub modules routes
+	cm_omc.Register(cmGroup)
+
+	// return featuresGroup
+}

features/event/event.go

@@ -14,6 +14,7 @@ import (
 	"be.ems/lib/log"
 	"be.ems/lib/services"
 	"be.ems/restagent/config"
+	neService "be.ems/src/modules/network_element/service"
 	wsService "be.ems/src/modules/ws/service"
 	"github.com/gin-gonic/gin"
 )
@@ -71,8 +72,9 @@ func PostUEEventFromAMF(c *gin.Context) {
 		return
 	}
 
+	// AMF没有RmUID，直接推送
 	// 推送到ws订阅组
-	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_AMF_UE, ueEvent)
+	wsService.NewWSSend.ByGroupID(wsService.GROUP_AMF_UE, ueEvent)
 
 	services.ResponseStatusOK204NoContent(c.Writer)
 }
@@ -96,9 +98,13 @@ func PostUEEvent(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// 推送到ws订阅组
+	// 发送到匹配的网元
-	if ueEvent.NeType == "MME" {
+	neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(ueEvent.RmUID)
-		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_MME_UE, ueEvent)
+	if neInfo.RmUID == ueEvent.RmUID {
+		// 推送到ws订阅组
+		if ueEvent.NeType == "MME" {
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_MME_UE+neInfo.NeId, ueEvent)
+		}
 	}
 
 	services.ResponseStatusOK204NoContent(w)

features/features.go

@@ -0,0 +1,21 @@
+package features
+
+import (
+	"be.ems/features/cm"
+	"be.ems/features/lm"
+	"be.ems/features/pm"
+	"be.ems/lib/log"
+	"github.com/gin-gonic/gin"
+)
+
+func InitServiceEngine(r *gin.Engine) {
+	log.Info("======init feature group gin.Engine")
+
+	// featuresGroup := r.Group("/")
+	// 注册 各个features 模块的路由
+	pm.InitSubServiceRoute(r)
+	lm.InitSubServiceRoute(r)
+	cm.InitSubServiceRoute(r)
+
+	// return featuresGroup
+}

features/file/file.go

@@ -1,31 +1,19 @@
 package file
 
 import (
-	"fmt"
 	"net/http"
 	"path/filepath"
 
-	"be.ems/lib/core/ctx"
-	"be.ems/lib/dborm"
-	"be.ems/lib/file"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
 	"be.ems/restagent/config"
 	"github.com/gorilla/mux"
-	"github.com/shirou/gopsutil/disk"
 )
 
 var (
 	// parameter config management
-	UriFile = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/{location}/file"
+	UriFile       = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/{location}/file"
-
 	CustomUriFile = config.UriPrefix + "/fileManagement/{apiVersion}/{location}/file"
-
-	// 获取磁盘列表
-	UriDiskList = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/files/diskList"
-
-	// 获取文件列表
-	UriListFiles = config.DefaultUriPrefix + "/fileManagement/{apiVersion}/files/listFiles"
 )
 
 // func init() {
@@ -151,46 +139,3 @@ func DeleteFile(w http.ResponseWriter, r *http.Request) {
 	services.ResponseStatusOK204NoContent(w)
 	return
 }
-
-// 磁盘列表
-func DiskList(w http.ResponseWriter, r *http.Request) {
-	disks := make([]map[string]string, 0)
-
-	partitions, err := disk.Partitions(false)
-	if err != nil {
-		services.ResponseWithJson(w, 200, disks)
-	}
-
-	for _, partition := range partitions {
-		usage, err := disk.Usage(partition.Mountpoint)
-		if err != nil {
-			continue
-		}
-		disks = append(disks, map[string]string{
-			"size":   file.FormatFileSize(float64(usage.Total)),
-			"used":   file.FormatFileSize(float64(usage.Used)),
-			"avail":  file.FormatFileSize(float64(usage.Free)),
-			"pcent":  fmt.Sprintf("%.1f%%", usage.UsedPercent),
-			"target": partition.Device,
-		})
-	}
-	services.ResponseWithJson(w, 200, disks)
-}
-
-// 获取文件列表 /files/search
-func ListFiles(w http.ResponseWriter, r *http.Request) {
-	// json 請求參數獲取
-	var bodyArgs FileOption
-	err := ctx.ShouldBindJSON(r, &bodyArgs)
-	if err != nil || dborm.DbClient.XEngine == nil {
-		services.ResponseErrorWithJson(w, 400, err.Error())
-		return
-	}
-
-	files, err := GetFileList(bodyArgs)
-	if err != nil {
-		services.ResponseErrorWithJson(w, 400, err.Error())
-		return
-	}
-	services.ResponseWithJson(w, 200, files)
-}

features/file/model.go

@@ -1,85 +0,0 @@
-package file
-
-import (
-	"bufio"
-	"fmt"
-	"io/fs"
-	"os"
-	"os/exec"
-	"time"
-
-	"github.com/spf13/afero"
-)
-
-type FileOption struct {
-	Path       string `json:"path"`
-	Search     string `json:"search"`
-	ContainSub bool   `json:"containSub"`
-	Expand     bool   `json:"expand"`
-	Dir        bool   `json:"dir"`
-	ShowHidden bool   `json:"showHidden"`
-	Page       int    `json:"page"`
-	PageSize   int    `json:"pageSize"`
-}
-
-type FileInfo struct {
-	Fs         afero.Fs    `json:"-"`
-	Path       string      `json:"path"`
-	Name       string      `json:"name"`
-	Extension  string      `json:"extension"`
-	Content    string      `json:"content"`
-	Size       int64       `json:"size"`
-	IsDir      bool        `json:"isDir"`
-	IsSymlink  bool        `json:"isSymlink"`
-	IsHidden   bool        `json:"isHidden"`
-	LinkPath   string      `json:"linkPath"`
-	Type       string      `json:"type"`
-	Mode       string      `json:"mode"`
-	MimeType   string      `json:"mimeType"`
-	UpdateTime time.Time   `json:"updateTime"`
-	ModTime    time.Time   `json:"modTime"`
-	FileMode   os.FileMode `json:"-"`
-	Items      []*FileInfo `json:"items"`
-	ItemTotal  int         `json:"itemTotal"`
-}
-
-func (f *FileInfo) search(search string, count int) (files []FileSearchInfo, total int, err error) {
-	cmd := exec.Command("find", f.Path, "-name", fmt.Sprintf("*%s*", search))
-	output, err := cmd.StdoutPipe()
-	if err != nil {
-		return
-	}
-	if err = cmd.Start(); err != nil {
-		return
-	}
-	defer func() {
-		_ = cmd.Wait()
-		_ = cmd.Process.Kill()
-	}()
-
-	scanner := bufio.NewScanner(output)
-	for scanner.Scan() {
-		line := scanner.Text()
-		info, err := os.Stat(line)
-		if err != nil {
-			continue
-		}
-		total++
-		if total > count {
-			continue
-		}
-		files = append(files, FileSearchInfo{
-			Path:     line,
-			FileInfo: info,
-		})
-	}
-	if err = scanner.Err(); err != nil {
-		return
-	}
-	return
-}
-
-type FileSearchInfo struct {
-	Path string `json:"path"`
-	fs.FileInfo
-}

features/file/service.go

@@ -1,206 +0,0 @@
-package file
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"be.ems/lib/file"
-	"github.com/spf13/afero"
-)
-
-// 获取文件列表
-func GetFileList(op FileOption) (FileInfo, error) {
-	var fileInfo FileInfo
-	if _, err := os.Stat(op.Path); err != nil && os.IsNotExist(err) {
-		return fileInfo, nil
-	}
-	info, err := NewFileInfo(op)
-	if err != nil {
-		return fileInfo, err
-	}
-	fileInfo = *info
-	return fileInfo, nil
-}
-
-func NewFileInfo(op FileOption) (*FileInfo, error) {
-	var appFs = afero.NewOsFs()
-
-	info, err := appFs.Stat(op.Path)
-	if err != nil {
-		return nil, err
-	}
-
-	fileInfo := &FileInfo{
-		Fs:        appFs,
-		Path:      op.Path,
-		Name:      info.Name(),
-		IsDir:     info.IsDir(),
-		FileMode:  info.Mode(),
-		ModTime:   info.ModTime(),
-		Size:      info.Size(),
-		IsSymlink: file.IsSymlink(info.Mode()),
-		Extension: filepath.Ext(info.Name()),
-		IsHidden:  file.IsHidden(op.Path),
-		Mode:      fmt.Sprintf("%04o", info.Mode().Perm()),
-		MimeType:  file.GetMimeType(op.Path),
-	}
-	if fileInfo.IsSymlink {
-		fileInfo.LinkPath = file.GetSymlink(op.Path)
-	}
-	if op.Expand {
-		if fileInfo.IsDir {
-			if err := listChildren(fileInfo, op.Dir, op.ShowHidden, op.ContainSub, op.Search, op.Page, op.PageSize); err != nil {
-				return nil, err
-			}
-			return fileInfo, nil
-		} else {
-			if err := getContent(fileInfo); err != nil {
-				return nil, err
-			}
-		}
-	}
-	return fileInfo, nil
-}
-
-func listChildren(f *FileInfo, dir, showHidden, containSub bool, search string, page, pageSize int) error {
-	afs := &afero.Afero{Fs: f.Fs}
-	var (
-		files []FileSearchInfo
-		err   error
-		total int
-	)
-
-	if search != "" && containSub {
-		files, total, err = f.search(search, page*pageSize)
-		if err != nil {
-			return err
-		}
-	} else {
-		dirFiles, err := afs.ReadDir(f.Path)
-		if err != nil {
-			return err
-		}
-		for _, file := range dirFiles {
-			files = append(files, FileSearchInfo{
-				Path:     f.Path,
-				FileInfo: file,
-			})
-		}
-	}
-
-	var items []*FileInfo
-	for _, df := range files {
-		if dir && !df.IsDir() {
-			continue
-		}
-		name := df.Name()
-		fPath := path.Join(df.Path, df.Name())
-		if search != "" {
-			if containSub {
-				fPath = df.Path
-				name = strings.TrimPrefix(strings.TrimPrefix(fPath, f.Path), "/")
-			} else {
-				lowerName := strings.ToLower(name)
-				lowerSearch := strings.ToLower(search)
-				if !strings.Contains(lowerName, lowerSearch) {
-					continue
-				}
-			}
-		}
-		if !showHidden && file.IsHidden(name) {
-			continue
-		}
-		f.ItemTotal++
-		isSymlink, isInvalidLink := false, false
-		if file.IsSymlink(df.Mode()) {
-			isSymlink = true
-			info, err := f.Fs.Stat(fPath)
-			if err == nil {
-				df.FileInfo = info
-			} else {
-				isInvalidLink = true
-			}
-		}
-
-		fileInfo := &FileInfo{
-			Fs:        f.Fs,
-			Name:      name,
-			Size:      df.Size(),
-			ModTime:   df.ModTime(),
-			FileMode:  df.Mode(),
-			IsDir:     df.IsDir(),
-			IsSymlink: isSymlink,
-			IsHidden:  file.IsHidden(fPath),
-			Extension: filepath.Ext(name),
-			Path:      fPath,
-			Mode:      fmt.Sprintf("%04o", df.Mode().Perm()),
-		}
-
-		if isSymlink {
-			fileInfo.LinkPath = file.GetSymlink(fPath)
-		}
-		if df.Size() > 0 {
-			fileInfo.MimeType = file.GetMimeType(fPath)
-		}
-		if isInvalidLink {
-			fileInfo.Type = "invalid_link"
-		}
-		items = append(items, fileInfo)
-	}
-	if containSub {
-		f.ItemTotal = total
-	}
-	start := (page - 1) * pageSize
-	end := pageSize + start
-	var result []*FileInfo
-	if start < 0 || start > f.ItemTotal || end < 0 || start > end {
-		result = items
-	} else {
-		if end > f.ItemTotal {
-			result = items[start:]
-		} else {
-			result = items[start:end]
-		}
-	}
-
-	f.Items = result
-	return nil
-}
-
-func getContent(f *FileInfo) error {
-	if f.Size <= 10*1024*1024 {
-		afs := &afero.Afero{Fs: f.Fs}
-		cByte, err := afs.ReadFile(f.Path)
-		if err != nil {
-			return nil
-		}
-		if len(cByte) > 0 && detectBinary(cByte) {
-			return errors.New("ErrFileCanNotRead")
-		}
-		f.Content = string(cByte)
-		return nil
-	} else {
-		return errors.New("ErrFileCanNotRead")
-	}
-}
-
-func detectBinary(buf []byte) bool {
-	whiteByte := 0
-	n := 1024
-	if len(buf) < 1024 {
-		n = len(buf)
-	}
-	for i := 0; i < n; i++ {
-		if (buf[i] >= 0x20) || buf[i] == 9 || buf[i] == 10 || buf[i] == 13 {
-			whiteByte++
-		} else if buf[i] <= 6 || (buf[i] >= 14 && buf[i] <= 31) {
-			return true
-		}
-	}
-
-	return whiteByte < 1
-}

features/fm/alarm.go

@@ -320,7 +320,7 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			alarmLog.AlarmCode = alarmData.AlarmCode
 			alarmLog.AlarmStatus = alarmData.AlarmStatus
 			alarmLog.EventTime = eventTime
-			log.Debug("alarmLog:", alarmLog)
+			log.Trace("alarmLog:", alarmLog)
 
 			affected, err := session.Insert(alarmLog)
 			if err != nil && affected <= 0 {
@@ -434,8 +434,8 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			if IsNeedToAckAlarm(valueJson, &alarmData) {
 				SetAlarmAckInfo(valueJson, &alarmData)
 			}
-			log.Debug("alarmData:", alarmData)
+			log.Trace("alarmData:", alarmData)
-			if alarmData.OrigSeverity == "Event" && config.GetYamlConfig().Alarm.SplitEventAlarm {
+			if (alarmData.OrigSeverity == "Event" || alarmData.OrigSeverity == "5") && config.GetYamlConfig().Alarm.SplitEventAlarm {
 				affected, err := xEngine.Table("alarm_event").InsertOne(alarmData)
 				if err != nil && affected <= 0 {
 					log.Error("Failed to insert alarm_event:", err)
@@ -466,10 +466,12 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 			}
 			session.Commit()
 		}
-		if config.GetYamlConfig().Alarm.ForwardAlarm {
+		if config.GetYamlConfig().Alarm.EmailForward.Enable {
 			if err = AlarmEmailForward(&alarmData); err != nil {
 				log.Error("Failed to AlarmEmailForward:", err)
 			}
+		}
+		if config.GetYamlConfig().Alarm.SMSCForward.Enable {
 			if err = AlarmSMSForward(&alarmData); err != nil {
 				log.Error("Failed to AlarmSMSForward:", err)
 			}
@@ -593,7 +595,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 				exist, err := session.Table("alarm").
 					Where("ne_type=? and ne_id=? and alarm_id=? and alarm_status=1", alarmData.NeType, alarmData.NeId, alarmData.AlarmId).
 					Exist()
-				if err == nil || !exist {
+				if err != nil || !exist {
 					log.Infof("Not found active alarm: ne_id=%s, alarm_id=%s", alarmData.NeId, alarmData.AlarmId)
 					continue
 				}
@@ -737,14 +739,28 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 					}
 				}
 
+				evenTime := global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
 				alarmData.ObjectUid = alarmData.NeId
 				alarmData.ObjectType = "VNFM"
-				alarmData.EventTime = global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
+				alarmData.EventTime = evenTime
 				if IsNeedToAckAlarm(valueJson, &alarmData) {
 					SetAlarmAckInfo(valueJson, &alarmData)
 				}
 				log.Trace("alarmData:", alarmData)
-				affected, err := session.Insert(alarmData)
+				var affected int64
+				if (alarmData.OrigSeverity == "Event" || alarmData.OrigSeverity == "5") && config.GetYamlConfig().Alarm.SplitEventAlarm {
+					affected, err = session.Table("alarm_event").InsertOne(alarmData)
+					if err != nil && affected <= 0 {
+						log.Error("Failed to insert alarm_event:", err)
+						continue
+					}
+				} else {
+					affected, err = session.Table("alarm").Insert(alarmData)
+					if err != nil && affected <= 0 {
+						log.Error("Failed to insert alarm:", err)
+						continue
+					}
+				}
 				if err == nil && affected > 0 {
 					alarmLog := new(AlarmLog)
 					alarmLog.NeType = alarmData.NeType
@@ -753,8 +769,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 					alarmLog.AlarmId = alarmData.AlarmId
 					alarmLog.AlarmCode = alarmData.AlarmCode
 					alarmLog.AlarmStatus = alarmData.AlarmStatus
-					alarmLog.EventTime = global.GetFmtTimeString(time.RFC3339, alarmData.EventTime, time.DateTime)
+					alarmLog.EventTime = evenTime
-					log.Debug("alarmLog:", alarmLog)
+					log.Trace("alarmLog:", alarmLog)
 					affected, err = session.Insert(alarmLog)
 					if err != nil && affected <= 0 {
 						log.Error("Failed to insert data:", err)
@@ -762,10 +778,12 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
 						continue
 					}
 					session.Commit()
-					if config.GetYamlConfig().Alarm.ForwardAlarm {
+					if config.GetYamlConfig().Alarm.EmailForward.Enable {
 						if err = AlarmEmailForward(&alarmData); err != nil {
 							log.Error("Failed to AlarmEmailForward:", err)
 						}
+					}
+					if config.GetYamlConfig().Alarm.SMSCForward.Enable {
 						if err = AlarmSMSForward(&alarmData); err != nil {
 							log.Error("Failed to AlarmSMSForward:", err)
 						}

features/fm/email.go

@@ -2,7 +2,6 @@ package fm
 
 import (
 	"crypto/tls"
-	"errors"
 	"fmt"
 	"strings"
 
@@ -48,25 +47,25 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	// userName := "smtpext@agrandtech.com"
 	// password := "1000smtp@omc!"
 
-	host := config.GetYamlConfig().Alarm.Email.Smtp
+	host := config.GetYamlConfig().Alarm.EmailForward.SMTP
-	port := int(config.GetYamlConfig().Alarm.Email.Port)
+	port := int(config.GetYamlConfig().Alarm.EmailForward.Port)
-	userName := config.GetYamlConfig().Alarm.Email.User
+	userName := config.GetYamlConfig().Alarm.EmailForward.User
-	password := config.GetYamlConfig().Alarm.Email.Password
+	password := config.GetYamlConfig().Alarm.EmailForward.Password
 
 	m := gomail.NewMessage()
 	m.SetHeader("From", userName) // 发件人
 	//m.SetHeader("From", "alias"+"<"+"aliastest"+">") // 增加发件人别名
 
-	emails, err := dborm.XormGetAlarmForward("Email")
+	// emails, err := dborm.XormGetAlarmForward("Email")
-	if err != nil {
+	// if err != nil {
-		log.Error("Failed to XormGetAlarmForward:", err)
+	// 	log.Error("Failed to XormGetAlarmForward:", err)
-		return err
+	// 	return err
-	} else if emails == nil || len(*emails) == 0 {
+	// } else if emails == nil || len(*emails) == 0 {
-		err := errors.New("not found forward email list")
+	// 	err := errors.New("not found forward email list")
-		log.Error(err)
+	// 	log.Error(err)
-		return err
+	// 	return err
-	}
+	// }
-
+	emails := strings.Split(config.GetYamlConfig().Alarm.EmailForward.EmailList, ",")
 	forwardLog := &dborm.AlarmForwardLog{
 		NeType:     alarmData.NeType,
 		NeID:       alarmData.NeId,
@@ -74,10 +73,10 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		AlarmTitle: alarmData.AlarmTitle,
 		AlarmSeq:   alarmData.AlarmSeq,
 		EventTime:  alarmData.EventTime,
-		ToUser:     strings.Join(*emails, ","),
+		ToUser:     config.GetYamlConfig().Alarm.EmailForward.EmailList,
 	}
 
-	m.SetHeader("To", *emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
+	m.SetHeader("To", emails...) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", strings.Join(*emails, " ")) // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("To", "zhangshuzhong@agrandtech.com", "simonzhangsz@outlook.com") // 收件人，可以多个收件人，但必须使用相同的 SMTP 连接
 	//m.SetHeader("Cc", "******@qq.com")                  // 抄送，可以多个
@@ -103,7 +102,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	)
 	// 关闭SSL协议认证
 	d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
-	if !config.GetYamlConfig().Alarm.Email.TlsSkipVerify {
+	if !config.GetYamlConfig().Alarm.EmailForward.TLSSkipVerify {
 		// 打开SSL协议认证
 		d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
 	}

features/fm/smsforward.go

@@ -90,36 +90,24 @@ func AlarmForwardBySMS(alarmData *Alarm) (string, error) {
 	case http.StatusOK, http.StatusAccepted, http.StatusNoContent, http.StatusCreated:
 		return userList, nil
 	default:
-		err := fmt.Errorf("Failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode)
+		log.Error(fmt.Errorf("failed to send SMS: %s(Code=%d)", resp.Status, resp.StatusCode))
-		log.Error(err)
 		return userList, err
 	}
 }
 
+var smsForward = &(config.GetYamlConfig().Alarm.SMSCForward)
+
 func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
 	log.Info("AlarmForwardBySMPP processing... ")
 
-	toUsers, err := dborm.XormGetAlarmForward("SMS")
+	userList := smsForward.MobileList
-	if err != nil {
-		log.Error("Failed to XormGetAlarmForward:", err)
-		return "", err
-	} else if toUsers == nil {
-		err := errors.New("not found forward phone number")
-		log.Error(err)
-		return "", err
-	}
-	userList := strings.Join(*toUsers, ",")
-
 	auth := gosmpp.Auth{
-		SMSC:       config.GetYamlConfig().Alarm.SMSC.Addr,
+		SMSC:       smsForward.SMSCAddr,
-		SystemID:   config.GetYamlConfig().Alarm.SMSC.SystemID,
+		SystemID:   smsForward.SystemID,
-		Password:   config.GetYamlConfig().Alarm.SMSC.Password,
+		Password:   smsForward.Password,
-		SystemType: config.GetYamlConfig().Alarm.SMSC.SystemType,
+		SystemType: smsForward.SystemType,
 	}
 
-	// conn, err := gosmpp.NonTLSDialer(auth.SMSC)
-	// connection := gosmpp.NewConnection(conn)
-
 	trans, err := gosmpp.NewSession(
 		gosmpp.TXConnector(gosmpp.NonTLSDialer, auth),
 		gosmpp.Settings{
@@ -149,17 +137,22 @@ func AlarmForwardBySMPP(alarmData *Alarm) (string, error) {
 		_ = trans.Close()
 	}()
 
-	// sending SMS(s)
+	message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + "_" + alarmData.NeId + " at " + alarmData.EventTime
-	// var results []string
+	for _, user := range strings.Split(userList, ",") {
-	// for _, toUser := range *toUsers {
+		sm, err := newSubmitSM(user, message)
-	message := "Alarm Notification: " + alarmData.AlarmTitle + " from " + alarmData.NeType + " " + alarmData.NeId + " at " + alarmData.EventTime
+		if err != nil {
-	if err = trans.Transceiver().Submit(newSubmitSM(userList, message)); err != nil {
+			log.Errorf("Failed to newSubmitSM %s short message: %v", user, err)
-		// result := fmt.Sprintf("Failed to submit %s hort message:%s", toUser, err.Error())
+			writeLog(alarmData, user, "SMS", err)
-		// results = append(results, result)
+			continue
-		log.Error("Failed to submit hort message:", err)
+		}
-		return userList, err
+		if err = trans.Transceiver().Submit(sm); err != nil {
+			log.Errorf("Failed to Submit %s short message: %v", user, err)
+			writeLog(alarmData, user, "SMS", err)
+			continue
+		}
+		writeLog(alarmData, user, "SMS", nil)
 	}
-	// }
+
 	return userList, nil
 }
 
@@ -190,61 +183,58 @@ func writeLog(alarmData *Alarm, toUser, forwardBy string, err error) error {
 	return nil
 }
 
-func handlePDU() func(pdu.PDU) (pdu.PDU, bool) {
+func newSubmitSM(phoneNumber string, message string) (*pdu.SubmitSM, error) {
-	return func(p pdu.PDU) (pdu.PDU, bool) {
-		switch pd := p.(type) {
-		case *pdu.Unbind:
-			log.Trace("Unbind Received")
-			return pd.GetResponse(), true
-
-		case *pdu.UnbindResp:
-			log.Trace("UnbindResp Received")
-
-		case *pdu.SubmitSMResp:
-			log.Trace("SubmitSMResp Received")
-
-		case *pdu.GenericNack:
-			log.Trace("GenericNack Received")
-
-		case *pdu.EnquireLinkResp:
-			fmt.Println("EnquireLinkResp Received")
-
-		case *pdu.EnquireLink:
-			log.Trace("EnquireLink Received")
-			return pd.GetResponse(), false
-
-		case *pdu.DataSM:
-			log.Trace("DataSM receiver")
-			return pd.GetResponse(), false
-
-		case *pdu.DeliverSM:
-			log.Trace("DeliverSM receiver")
-			return pd.GetResponse(), false
-		}
-		return nil, false
-	}
-}
-
-func newSubmitSM(phoneNumber string, message string) *pdu.SubmitSM {
 	// build up submitSM
 	srcAddr := pdu.NewAddress()
 	srcAddr.SetTon(5)
 	srcAddr.SetNpi(0)
-	_ = srcAddr.SetAddress("alarm notification:")
+	err := srcAddr.SetAddress(smsForward.ServiceNumber)
-
+	if err != nil {
+		return nil, err
+	}
 	destAddr := pdu.NewAddress()
 	destAddr.SetTon(1)
 	destAddr.SetNpi(1)
-	_ = destAddr.SetAddress(phoneNumber)
+	err = destAddr.SetAddress(phoneNumber)
-
+	if err != nil {
+		return nil, err
+	}
 	submitSM := pdu.NewSubmitSM().(*pdu.SubmitSM)
 	submitSM.SourceAddr = srcAddr
 	submitSM.DestAddr = destAddr
-	_ = submitSM.Message.SetMessageWithEncoding(message, data.UCS2)
+	dataCoding := data.FromDataCoding(smsForward.DataCoding)
+	err = submitSM.Message.SetMessageWithEncoding(message, dataCoding)
+	if err != nil {
+		return nil, err
+	}
 	submitSM.ProtocolID = 0
 	submitSM.RegisteredDelivery = 1
 	submitSM.ReplaceIfPresentFlag = 0
 	submitSM.EsmClass = 0
 
-	return submitSM
+	return submitSM, nil
 }
+
+// const (
+// 	// Short message data coding type
+// 	SMS_CODING_GSM7BIT byte = iota
+// 	SMS_CODING_ASCII
+// 	SMS_CODING_BINARY8BIT1
+// 	SMS_CODING_LATIN1
+// 	SMS_CODING_BINARY8BIT2
+// 	SMS_CODING_NODEF
+// 	SMS_CODING_CYRILLIC
+// 	SMS_CODING_HEBREW
+// 	SMS_CODING_UCS2
+// )
+
+// var codingMap = map[byte]data.Encoding{
+// 	SMS_CODING_GSM7BIT:     data.GSM7BIT,
+// 	SMS_CODING_ASCII:       data.ASCII,
+// 	SMS_CODING_BINARY8BIT1: data.BINARY8BIT1,
+// 	SMS_CODING_LATIN1:      data.LATIN1,
+// 	SMS_CODING_BINARY8BIT2: data.BINARY8BIT2,
+// 	SMS_CODING_CYRILLIC:    data.CYRILLIC,
+// 	SMS_CODING_HEBREW:      data.HEBREW,
+// 	SMS_CODING_UCS2:        data.UCS2,
+// }

features/lm/file_export/controller.go

@@ -0,0 +1,142 @@
+package file_export
+
+import (
+	"encoding/json"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"be.ems/lib/file"
+	"be.ems/lib/log"
+	"be.ems/lib/services"
+	"be.ems/src/framework/datasource"
+	"be.ems/src/framework/i18n"
+	"be.ems/src/framework/utils/ctx"
+	"github.com/gin-gonic/gin"
+)
+
+type SysJobResponse struct {
+	SysJob
+	TableName    string `json:"tableName"`
+	TableDisplay string `json:"tableDisplay"`
+	FilePath     string `json:"filePath"`
+}
+
+type TargetParams struct {
+	Duration  int    `json:"duration"`
+	TableName string `json:"tableName"`
+	Columns   string `json:"columns"`  // exported column name of time string
+	TimeCol   string `json:"timeCol"`  // time stamp of column name
+	TimeUnit  string `json:"timeUnit"` // timestamp unit: second/micro/milli
+	Extras    string `json:"extras"`   // extras condition for where
+	FilePath  string `json:"filePath"` // file path
+}
+
+func (m *SysJob) GetFileExportTable(c *gin.Context) {
+	var results []SysJob
+
+	err := datasource.DefaultDB().Table(m.TableName()).Where("invoke_target=? and status=1", INVOKE_FILE_EXPORT).
+		Find(&results).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	language := ctx.AcceptLanguage(c)
+	var response []SysJobResponse
+	for _, job := range results {
+		var params TargetParams
+		if err := json.Unmarshal([]byte(job.TargetParams), &params); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		TableDisplay := i18n.TKey(language, "table."+params.TableName)
+		if TableDisplay == "" {
+			TableDisplay = params.TableName
+		}
+		response = append(response, SysJobResponse{
+			SysJob:       job,
+			TableName:    params.TableName,
+			TableDisplay: TableDisplay,
+			FilePath:     params.FilePath,
+		})
+	}
+	c.JSON(http.StatusOK, services.DataResp(response))
+}
+
+func (m *FileExport) GetFileList(c *gin.Context) {
+	var querys FileExportQuery
+
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	files, err := file.GetFileInfo(querys.Path, querys.Suffix)
+	if err != nil {
+		log.Error("failed to GetFileInfo:", err)
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// split files list
+	lenNum := int64(len(files))
+	start := (querys.PageNum - 1) * querys.PageSize
+	end := start + querys.PageSize
+	var splitList []file.FileInfo
+	if start >= lenNum {
+		splitList = []file.FileInfo{}
+	} else if end >= lenNum {
+		splitList = files[start:]
+	} else {
+		splitList = files[start:end]
+	}
+	total := len(files)
+	c.JSON(http.StatusOK, services.TotalDataResp(splitList, total))
+}
+
+func (m *FileExport) Total(c *gin.Context) {
+	dir := c.Query("path")
+
+	fileCount, dirCount, err := file.GetFileAndDirCount(dir)
+	if err != nil {
+		log.Error("failed to GetFileAndDirCount:", err)
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	total := fileCount + dirCount
+	c.JSON(http.StatusOK, services.TotalResp(int64(total)))
+}
+
+func (m *FileExport) DownloadHandler(c *gin.Context) {
+	dir := c.Query("path")
+	fileName := c.Param("fileName")
+	filePath := filepath.Join(dir, fileName)
+
+	file, err := os.Open(filePath)
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	defer file.Close()
+
+	if _, err := os.Stat(filePath); os.IsNotExist(err) {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.Header("Content-Disposition", "attachment; filename="+fileName)
+	c.Header("Content-Type", "application/octet-stream")
+	c.File(filePath)
+}
+
+func (m *FileExport) Delete(c *gin.Context) {
+	fileName := c.Param("fileName")
+	dir := c.Query("path")
+	filePath := filepath.Join(dir, fileName)
+
+	if err := os.Remove(filePath); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusNoContent, nil) // 204 No Content
+}

features/lm/file_export/model.go

@@ -0,0 +1,30 @@
+package file_export
+
+import (
+	"be.ems/lib/file"
+)
+
+const (
+	INVOKE_FILE_EXPORT = "exportTable"
+)
+
+type SysJob struct {
+	JobID        int64  `gorm:"column:job_id;primary_key;auto_increment" json:"job_id"`        //任务ID
+	InvokeTarget string `gorm:"column:invoke_target" json:"invoke_target"`                     //调用目标字符串
+	TargetParams string `gorm:"column:target_params;type:json" json:"target_params,omitempty"` //调用目标传入参数
+}
+
+func (m *SysJob) TableName() string {
+	return "sys_job"
+}
+
+type FileExport struct {
+	file.FileInfo
+}
+
+type FileExportQuery struct {
+	Path     string `form:"path"  binding:"required"`
+	Suffix   string `form:"suffix"`
+	PageNum  int64  `form:"pageNum"  binding:"required"`
+	PageSize int64  `form:"pageSize"  binding:"required"`
+}

features/lm/file_export/route.go

@@ -0,0 +1,40 @@
+package file_export
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for file_export
+func Register(r *gin.RouterGroup) {
+
+	lmTable := r.Group("/table")
+	{
+		var m *SysJob
+		lmTable.GET("/list",
+			middleware.PreAuthorize(nil),
+			m.GetFileExportTable,
+		)
+
+	}
+	lmFile := r.Group("/file")
+	{
+		var f *FileExport
+		lmFile.GET("/list",
+			middleware.PreAuthorize(nil),
+			f.GetFileList,
+		)
+		lmFile.GET("/total",
+			middleware.PreAuthorize(nil),
+			f.Total,
+		)
+		lmFile.GET("/:fileName",
+			middleware.PreAuthorize(nil),
+			f.DownloadHandler,
+		)
+		lmFile.DELETE("/:fileName",
+			middleware.PreAuthorize(nil),
+			f.Delete,
+		)
+	}
+}

features/lm/service.go

@@ -0,0 +1,17 @@
+// log management package
+
+package lm
+
+import (
+	"be.ems/features/lm/file_export"
+	"be.ems/lib/log"
+	"github.com/gin-gonic/gin"
+)
+
+func InitSubServiceRoute(r *gin.Engine) {
+	log.Info("======init Log management group gin.Engine")
+
+	lmGroup := r.Group("/lm")
+	// register sub modules routes
+	file_export.Register(lmGroup)
+}

features/pm/kpi_c_report/controller.go

@@ -0,0 +1,326 @@
+package kpi_c_report
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/services"
+	"github.com/gin-gonic/gin"
+)
+
+func (k *KpiCReport) Get(c *gin.Context) {
+	var reports []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusBadRequest, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.NeID != "" {
+		conditions = append(conditions, "rm_uid = (select n.rm_uid from ne_info n where n.ne_type=? and n.ne_id=? and n.status=1)")
+		params = append(params, strings.ToUpper(querys.NeType), querys.NeID)
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found required parameter NE ID"))
+		return
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "created_at >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "created_at <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err := dbg.Find(&reports).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusOK, services.DataResp(reports))
+}
+
+func (k *KpiCReport) GetReport2FE(c *gin.Context) {
+	var results []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found required parameter NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.NeID != "" {
+		conditions = append(conditions, "rm_uid = (select n.rm_uid from ne_info n where n.ne_type=? and n.ne_id=? and n.status=1)")
+		params = append(params, querys.NeType, querys.NeID)
+	} else {
+		c.JSON(http.StatusBadRequest, services.ErrResp("Not found required parameter NE ID"))
+		return
+	}
+	if querys.StartTime != "" {
+		conditions = append(conditions, "created_at >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "created_at <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err := dbg.Find(&results).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	reports := []map[string]any{}
+	for _, r := range results {
+		report := map[string]any{
+			// kip_id ...
+			"neType":      *r.NeType,
+			"neId":        querys.NeID,
+			"neName":      *r.NeName,
+			"rmUID":       *r.RmUID,
+			"startIndex":  r.Index,
+			"timeGroup":   r.Date[:10] + " " + *r.EndTime,
+			"createdAt":   r.CreatedAt,
+			"granularity": r.Granularity,
+		}
+
+		for _, k := range r.KpiValues {
+			report[k.KPIID] = k.Value
+		}
+		reports = append(reports, report)
+	}
+	c.JSON(http.StatusOK, services.DataResp(reports))
+}
+
+func (k *KpiCReport) GetTotalList(c *gin.Context) {
+	var reports []KpiCReport
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.StartTime != "" {
+		conditions = append(conditions, "created_at >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "created_at <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+
+	// get total number
+	var total int64 = 0
+	err := dbg.Count(&total).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+
+	//err := dborm.DefaultDB().Table(tableName).Where(whereSql, params...).Find(&reports).Error
+	err = dbg.Find(&reports).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalDataResp(reports, total))
+}
+
+func (k *KpiCReport) Total(c *gin.Context) {
+	var conditions []string
+	var params []any
+
+	var querys KpiCReportQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// construct condition to get
+	if querys.NeType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(querys.NeType))
+	} else {
+		c.JSON(http.StatusOK, services.ErrResp("Not found NE type"))
+		return
+	}
+	tableName := TableName() + "_" + strings.ToLower(querys.NeType)
+	dbg := dborm.DefaultDB().Table(tableName)
+
+	if querys.StartTime != "" {
+		conditions = append(conditions, "created_at >= ?")
+		params = append(params, querys.StartTime)
+	}
+	if querys.EndTime != "" {
+		conditions = append(conditions, "created_at <= ?")
+		params = append(params, querys.EndTime)
+	}
+
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+	var total int64 = 0
+	err := dbg.Count(&total).Error
+	if err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalResp(total))
+}
+
+func (k *KpiCReport) Post(c *gin.Context) {
+	var report KpiCReport
+
+	if err := c.ShouldBindJSON(&report); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	if err := dborm.DefaultDB().Create(&report).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	c.JSON(http.StatusCreated, services.DataResp(report))
+}
+
+func (k *KpiCReport) Put(c *gin.Context) {
+	var report KpiCReport
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().First(&report, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
+		return
+	}
+
+	if err := c.ShouldBindJSON(&report); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	dborm.DefaultDB().Save(&report)
+	c.JSON(http.StatusOK, services.DataResp(report))
+}
+
+func (k *KpiCReport) Delete(c *gin.Context) {
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().Delete(&KpiCReport{}, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator report not found"))
+		return
+	}
+
+	c.JSON(http.StatusNoContent, nil) // 204 No Content
+}
+
+func InsertKpiCReport(neType string, report KpiCReport) {
+	tableName := TableName() + "_" + strings.ToLower(neType)
+	if err := dborm.DefaultDB().Table(tableName).Create(&report).Error; err != nil {
+		return
+	}
+}

features/pm/kpi_c_report/model.go

@@ -0,0 +1,71 @@
+package kpi_c_report
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"fmt"
+	"time"
+)
+
+type KpiCVal struct {
+	KPIID string  `json:"kpi_id" gorm:"column:kpi_id"`
+	Value float64 `json:"value" gorm:"column:value"`
+	Err   string  `json:"err" gorm:"column:err"`
+}
+
+type KpiCValues []KpiCVal
+
+type KpiCReport struct {
+	ID          int        `gorm:"column:id;primary_key;auto_increment" json:"id"`
+	NeType      *string    `gorm:"column:ne_type;default:NULL" json:"neType,omitempty"`
+	NeName      *string    `gorm:"column:ne_name;default:" json:"neName,omitempty"`
+	RmUID       *string    `gorm:"column:rm_uid;default:NULL" json:"rmUid,omitempty"`
+	Date        string     `gorm:"column:date" json:"date"` // time.Time `gorm:"column:date" json:"date"`
+	StartTime   *string    `gorm:"column:start_time;default:NULL" json:"startTime,omitempty"`
+	EndTime     *string    `gorm:"column:end_time;default:NULL" json:"endTime,omitempty"`
+	Index       int16      `gorm:"column:index" json:"index"`
+	Granularity *int8      `gorm:"column:granularity;default:60" json:"granularity,omitempty"` //Time granualarity: 5/10/.../60/300 (second)
+	KpiValues   KpiCValues `gorm:"column:kpi_values;type:json" json:"kpiValues,omitempty"`
+	CreatedAt   *time.Time `gorm:"column:created_at;default:current_timestamp()" json:"createdAt,omitempty"`
+}
+
+type KpiCReportQuery struct {
+	NeType    string `json:"neType" form:"neType" binding:"required"`
+	NeID      string `json:"neId" form:"neId" binding:"required"`
+	RmUID     string `json:"rmUID" form:"rmUID"`
+	StartTime string `json:"startTime" form:"startTime"`
+	EndTime   string `json:"endTime" form:"endTime"`
+	UserName  string `json:"userName" form:"userName"`
+	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
+	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
+	PageNum   int    `json:"pageNum" form:"pageNum"`
+	PageSize  int    `json:"pageSize" form:"pageSize"`
+}
+
+type KpiCReport2FE struct {
+	NeType      string `json:"neType" gorm:"column:ne_type"`
+	NeId        string `json:"neId"`
+	NeName      string `json:"neName" gorm:"column:ne_name"`
+	RmUID       string `json:"rmUid" gorm:"column:rm_uid"`
+	TimeGroup   string `json:"timeGroup"`
+	StartIndex  int16  `json:"startIndex" gorm:"column:index"`
+	Granularity int8   `json:"granularity" gorm:"column:granularity"`
+}
+
+func TableName() string {
+	return "kpi_c_report"
+}
+
+// 将 KpiCValues 转换为 JSON 字节
+func (k KpiCValues) Value() (driver.Value, error) {
+	return json.Marshal(k)
+}
+
+// 从字节中扫描 KpiCValues
+func (k *KpiCValues) Scan(value interface{}) error {
+	b, ok := value.([]byte)
+	if !ok {
+		return fmt.Errorf("failed to scan value: %v", value)
+	}
+	return json.Unmarshal(b, k)
+}

features/pm/kpi_c_report/route.go

@@ -0,0 +1,43 @@
+package kpi_c_report
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for kpi_c_report
+func Register(r *gin.RouterGroup) {
+
+	pmKPIC := r.Group("/kpiC")
+	{
+		var k *KpiCReport
+		pmKPIC.GET("/report",
+			middleware.PreAuthorize(nil),
+			k.GetReport2FE,
+		)
+		pmKPIC.GET("/report/list",
+			middleware.PreAuthorize(nil),
+			k.Get,
+		)
+		pmKPIC.GET("/report/totalList",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.GET("/report/total",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.POST("/report",
+			middleware.PreAuthorize(nil),
+			k.Post,
+		)
+		pmKPIC.PUT("/report/:id",
+			middleware.PreAuthorize(nil),
+			k.Put,
+		)
+		pmKPIC.DELETE("/report/:id",
+			middleware.PreAuthorize(nil),
+			k.Delete,
+		)
+	}
+}

features/pm/kpi_c_title/controller.go

@@ -0,0 +1,197 @@
+package kpi_c_title
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/services"
+	"github.com/gin-gonic/gin"
+)
+
+func (k *KpiCTitle) GetToalList(c *gin.Context) {
+	var titles []KpiCTitle
+	var conditions []string
+	var params []any
+
+	var querys KpiCTitleQuery
+	if err := c.ShouldBindQuery(&querys); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	dbg := dborm.DefaultDB().Table(k.TableName())
+	// construct condition to get
+	if neType := querys.NeType; neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := querys.Status; status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+		dbg = dbg.Where(whereSql, params...)
+	}
+
+	// Get total number
+	var total int64 = 0
+	if err := dbg.Count(&total).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	// page number and size
+	if pageSize := querys.PageSize; pageSize > 0 {
+		dbg = dbg.Limit(pageSize)
+		if pageNum := querys.PageNum; pageNum > 0 {
+			dbg = dbg.Offset((pageNum - 1) * pageSize)
+		}
+	}
+
+	// order by
+	if sortField, sortOrder := querys.SortField, querys.SortOrder; sortField != "" && sortOrder != "" {
+		orderBy := fmt.Sprintf("%s %s", sortField, sortOrder)
+		dbg = dbg.Order(orderBy)
+	}
+	if err := dbg.Find(&titles).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalDataResp(titles, total))
+	//c.JSON(http.StatusOK, titles)
+}
+
+func (k *KpiCTitle) Get(c *gin.Context) {
+	var titles []KpiCTitle
+	var conditions []string
+	var params []any
+
+	// construct condition to get
+	if neType := c.Query("neType"); neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := c.Query("status"); status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+	}
+	if err := dborm.DefaultDB().Where(whereSql, params...).Find(&titles).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.DataResp(titles))
+	//c.JSON(http.StatusOK, titles)
+}
+
+func (k *KpiCTitle) Total(c *gin.Context) {
+	var conditions []string
+	var params []any
+
+	// construct condition to get
+	if neType := c.Query("neType"); neType != "" {
+		conditions = append(conditions, "ne_type = ?")
+		params = append(params, strings.ToUpper(neType))
+	}
+	if status := c.Query("status"); status != "" {
+		conditions = append(conditions, "status = ?")
+		params = append(params, status)
+	}
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += strings.Join(conditions, " and ")
+	}
+	var total int64 = 0
+	if err := dborm.DefaultDB().Table(k.TableName()).Where(whereSql, params...).Count(&total).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+
+	c.JSON(http.StatusOK, services.TotalResp(total))
+}
+
+func (k *KpiCTitle) Post(c *gin.Context) {
+	var title KpiCTitle
+
+	if err := c.ShouldBindJSON(&title); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	result := dborm.DefaultDB().Where("ne_type=? and (kpi_id=? or title=?)", title.NeType, title.KpiID, title.Title).First(&title)
+	if result.RowsAffected > 0 {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator already exist"))
+		return
+	}
+	if err := dborm.DefaultDB().Create(&title).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	kpiCReportTable := "kpi_c_report_" + strings.ToLower(*title.NeType)
+	if !dborm.DefaultDB().Migrator().HasTable(kpiCReportTable) {
+		// clone table "kpi_c_report" to "kpi_c_report_{neType}"
+		sql := fmt.Sprintf("CREATE TABLE IF NOT EXISTS %s AS SELECT * FROM %s WHERE 1=0", kpiCReportTable, "kpi_c_report")
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		sql = fmt.Sprintf("ALTER TABLE %s MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`)", kpiCReportTable)
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+		sql = fmt.Sprintf("ALTER TABLE %s ADD INDEX IF NOT EXISTS `idx_timestamp`(`created_at`) USING BTREE, ADD INDEX IF NOT EXISTS `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE", kpiCReportTable)
+		if _, err := dborm.ExecSQL(sql, nil); err != nil {
+			c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+			return
+		}
+	}
+	c.JSON(http.StatusCreated, services.DataResp(title))
+}
+
+func (k *KpiCTitle) Put(c *gin.Context) {
+	var title KpiCTitle
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().First(&title, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
+		return
+	}
+
+	if err := c.ShouldBindJSON(&title); err != nil {
+		c.JSON(http.StatusOK, services.ErrResp(err.Error()))
+		return
+	}
+	dborm.DefaultDB().Save(&title)
+
+	c.JSON(http.StatusOK, services.DataResp(title))
+}
+
+func (k *KpiCTitle) Delete(c *gin.Context) {
+	id := c.Param("id")
+
+	if err := dborm.DefaultDB().Delete(&KpiCTitle{}, id).Error; err != nil {
+		c.JSON(http.StatusOK, services.ErrResp("custom indicator not found"))
+		return
+	}
+
+	c.JSON(http.StatusNoContent, nil) // 204 No Content
+}
+
+func GetActiveKPICList(neType string) []KpiCTitle {
+	k := new([]KpiCTitle)
+
+	err := dborm.DefaultDB().Where("`ne_type` = ? and `status` = 'Active'", neType).Find(&k).Error
+	if err != nil {
+		return nil
+	}
+	return *k
+}

features/pm/kpi_c_title/model.go

@@ -0,0 +1,30 @@
+package kpi_c_title
+
+import "time"
+
+type KpiCTitle struct {
+	ID          int        `gorm:"column:id;primary_key;auto_increment" json:"id"`
+	NeType      *string    `gorm:"column:ne_type;default:NULL," json:"neType,omitempty"`
+	KpiID       *string    `gorm:"column:kpi_id;default:NULL," json:"kpiId,omitempty"`
+	Title       *string    `gorm:"column:title;default:NULL," json:"title,omitempty"`
+	Expression  *string    `gorm:"column:expression;default:NULL," json:"expression,omitempty"`
+	Status      string     `gorm:"column:status;default:'Active'" json:"status"`
+	Unit        *string    `gorm:"column:unit" json:"unit,omitempty"`
+	Description *string    `gorm:"column:description;default:NULL," json:"description,omitempty"`
+	CreatedBy   *string    `gorm:"column:created_by;default:NULL," json:"createdBy,omitempty"`
+	UpdatedAt   *time.Time `gorm:"column:updated_at;default:current_timestamp()," json:"updatedAt,omitempty"`
+}
+
+type KpiCTitleQuery struct {
+	ID        int    `json:"id" form:"id"`
+	NeType    string `json:"neType" form:"neType"`
+	Status    string `json:"status" form:"status"`
+	SortField string `json:"sortField" form:"sortField" binding:"omitempty,oneof=created_at"` // 排序字段，填写结果字段
+	SortOrder string `json:"sortOrder" form:"sortOrder" binding:"omitempty,oneof=asc desc"`   // 排序升降序，asc desc
+	PageNum   int    `json:"pageNum" form:"pageNum"`
+	PageSize  int    `json:"pageSize" form:"pageSize"`
+}
+
+func (k *KpiCTitle) TableName() string {
+	return "kpi_c_title"
+}

features/pm/kpi_c_title/route.go

@@ -0,0 +1,39 @@
+package kpi_c_title
+
+import (
+	"be.ems/src/framework/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+// Register Routes for kpi_c_title
+func Register(r *gin.RouterGroup) {
+
+	pmKPIC := r.Group("/kpiC")
+	{
+		var k *KpiCTitle
+		pmKPIC.GET("/title",
+			middleware.PreAuthorize(nil),
+			k.Get,
+		)
+		pmKPIC.GET("/title/total",
+			middleware.PreAuthorize(nil),
+			k.Total,
+		)
+		pmKPIC.GET("/title/totalList",
+			middleware.PreAuthorize(nil),
+			k.GetToalList,
+		)
+		pmKPIC.POST("/title",
+			middleware.PreAuthorize(nil),
+			k.Post,
+		)
+		pmKPIC.PUT("/title/:id",
+			middleware.PreAuthorize(nil),
+			k.Put,
+		)
+		pmKPIC.DELETE("/title/:id",
+			middleware.PreAuthorize(nil),
+			k.Delete,
+		)
+	}
+}

features/pm/performance.go

@@ -2,7 +2,6 @@ package pm
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"math"
@@ -11,17 +10,21 @@ import (
 	"strings"
 	"time"
 
+	"be.ems/features/pm/kpi_c_report"
+	"be.ems/features/pm/kpi_c_title"
 	"be.ems/lib/dborm"
+	evaluate "be.ems/lib/eval"
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 	"be.ems/lib/services"
 	"be.ems/restagent/config"
-	"xorm.io/xorm"
 
+	neService "be.ems/src/modules/network_element/service"
 	wsService "be.ems/src/modules/ws/service"
 	"github.com/go-resty/resty/v2"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/gorilla/mux"
+	"xorm.io/xorm"
 )
 
 type Response struct {
@@ -41,7 +44,7 @@ type KpiReport struct {
 			NeType string `json:"NeType"`
 			KPIs   []struct {
 				KPIID string `json:"KPIID"`
-				Value int    `json:"Value"`
+				Value int64  `json:"Value"`
 				Err   string `json:"Err"`
 			} `json:"KPIs"`
 		} `json:"NE"`
@@ -59,7 +62,7 @@ type GoldKpi struct {
 	RmUid       string `json:"rmUid" xorm:"rm_uid"`
 	NEType      string `json:"neType" xorm:"ne_type"`
 	KpiId       string `json:"kpiId" xorm:"kpi_id"`
-	Value       int    `json:"value"`
+	Value       int64  `json:"value"`
 	Error       string `json:"error"`
 	Timestamp   string `json:"timestamp"`
 }
@@ -226,14 +229,6 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 		granularity = int8(seconds)
 	}
 
-	// 黄金指标事件对象
-	kpiEvent := map[string]any{
-		// kip_id ...
-		"neType":     kpiReport.Task.NE.NeType,
-		"neName":     kpiReport.Task.NE.NEName,
-		"startIndex": kpiIndex,
-		"timeGroup":  startTime,
-	}
 	// insert into new kpi_report_xxx table
 	kpiData := new(KpiData)
 	kpiData.Date = startTime
@@ -248,141 +243,29 @@ func PostKPIReportFromNF(w http.ResponseWriter, r *http.Request) {
 	kpiData.RmUid = kpiReport.Task.NE.RmUID
 	kpiVal := new(KPIVal)
 	kpiData.CreatedAt = time.Now().UnixMilli()
-	for _, k := range kpiReport.Task.NE.KPIs {
-		kpiEvent[k.KPIID] = k.Value // kip_id
 
-		kpiVal.KPIID = k.KPIID
-		kpiVal.Value = int64(k.Value)
-		kpiVal.Err = k.Err
-		kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
-	}
-
-	// insert kpi_report table, no session
-	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
-	affected, err := xEngine.Table(tableName).Insert(kpiData)
-	if err != nil && affected <= 0 {
-		log.Errorf("Failed to insert %s:%v", tableName, err)
-		services.ResponseInternalServerError500ProcessError(w, err)
-		return
-	}
-
-	// 推送到ws订阅组
-	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
-	if kpiReport.Task.NE.NeType == "UPF" {
-		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
-	}
-
-	services.ResponseStatusOK204NoContent(w)
-}
-
-// post kpi report from NEs, insert insto gold_kpi table, discard...
-func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
-	log.Debug("PostKPIReportFromNF processing... ")
-
-	vars := mux.Vars(r)
-	apiVer := vars["apiVersion"]
-	if apiVer != global.ApiVersionV1 {
-		log.Error("Uri api version is invalid. apiVersion:", apiVer)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-
-	//	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-	if err != nil {
-		log.Error("Faile to io.ReadAll: ", err)
-		services.ResponseNotFound404UriNotExist(w, r)
-		return
-	}
-	log.Trace("Request body:", string(body))
-	kpiReport := new(KpiReport)
-	_ = json.Unmarshal(body, &kpiReport)
-	log.Trace("kpiReport:", kpiReport)
-
-	session := xEngine.NewSession()
-	defer session.Close()
-	goldKpi := new(GoldKpi)
-	layout := time.RFC3339Nano
-	goldKpi.Date = GetDateFromTimeString(layout, kpiReport.Task.Period.StartTime)
-	goldKpi.Index, _ = strconv.Atoi(vars["index"])
-	goldKpi.StartTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.StartTime, time.DateTime)
-	goldKpi.EndTime = global.GetFmtTimeString(layout, kpiReport.Task.Period.EndTime, time.DateTime)
-	// get time granularity from startTime and endTime
-	seconds, _ := global.GetSecondDuration(goldKpi.StartTime, goldKpi.EndTime)
-	goldKpi.Granularity = 60
-	if seconds != 0 && seconds <= math.MaxInt8 && seconds >= math.MinInt8 {
-		goldKpi.Granularity = int8(seconds)
-	}
-	goldKpi.NEName = kpiReport.Task.NE.NEName
-	goldKpi.RmUid = kpiReport.Task.NE.RmUID
-	goldKpi.NEType = kpiReport.Task.NE.NeType
-	goldKpi.Timestamp = global.GetFmtTimeString(layout, kpiReport.Timestamp, time.DateTime)
 	// 黄金指标事件对象
 	kpiEvent := map[string]any{
 		// kip_id ...
-		"neType":     goldKpi.NEType,
+		"neType":     kpiReport.Task.NE.NeType,
-		"neName":     goldKpi.NEName,
+		"neName":     kpiReport.Task.NE.NEName,
-		"startIndex": goldKpi.Index,
+		"rmUID":      kpiReport.Task.NE.RmUID,
-		"timeGroup":  goldKpi.StartTime,
+		"startIndex": kpiIndex,
+		"timeGroup":  kpiData.CreatedAt,
 	}
-	// insert into new kpi_report_xxx table
+
-	kpiData := new(KpiData)
+	// for custom kpi
-	kpiData.Date = goldKpi.Date
+	kpiValMap := map[string]any{}
-	kpiData.Index = goldKpi.Index
-	//st, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.StartTime, time.Local)
-	//et, _ := time.ParseInLocation(time.RFC3339Nano, kpiReport.Task.Period.EndTime, time.Local)
-	kpiData.StartTime = goldKpi.StartTime
-	kpiData.EndTime = goldKpi.EndTime
-	kpiData.Granularity = goldKpi.Granularity
-	kpiData.NEName = goldKpi.NEName
-	kpiData.NEType = goldKpi.NEType
-	kpiData.RmUid = goldKpi.RmUid
-	kpiVal := new(KPIVal)
-	kpiData.CreatedAt = time.Now().UnixMilli()
 	for _, k := range kpiReport.Task.NE.KPIs {
 		kpiEvent[k.KPIID] = k.Value // kip_id
-		goldKpi.KpiId = k.KPIID
-		goldKpi.Value = k.Value
-		goldKpi.Error = k.Err
 
 		kpiVal.KPIID = k.KPIID
 		kpiVal.Value = int64(k.Value)
 		kpiVal.Err = k.Err
 		kpiData.KPIValues = append(kpiData.KPIValues, *kpiVal)
-
+		kpiValMap[k.KPIID] = k.Value
-		//log.Trace("goldKpi:", goldKpi)
-
-		// 启动事务
-		err := session.Begin()
-		if err != nil {
-			log.Error("Failed to Begin gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		gkpi := &GoldKpi{}
-		_, err = session.Where("id = ?", 1).ForUpdate().Get(gkpi)
-		if err != nil {
-			// 回滚事务
-			session.Rollback()
-			log.Error("Failed to ForUpdate gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		affected, err := session.Insert(goldKpi)
-		if err != nil && affected <= 0 {
-			session.Rollback()
-			log.Error("Failed to insert gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
-		// 提交事务
-		err = session.Commit()
-		if err != nil {
-			log.Error("Failed to Commit gold_kpi:", err)
-			services.ResponseInternalServerError500ProcessError(w, err)
-			return
-		}
 	}
+	kpiValMap["granularity"] = kpiData.Granularity
 
 	// insert kpi_report table, no session
 	tableName := "kpi_report_" + strings.ToLower(kpiReport.Task.NE.NeType)
@@ -393,10 +276,60 @@ func PostGoldKPIFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// 推送到ws订阅组
+	report := kpi_c_report.KpiCReport{
-	wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI, kpiEvent)
+		NeType:      &kpiData.NEType,
-	if goldKpi.NEType == "UPF" {
+		NeName:      &kpiData.NEName,
-		wsService.NewWSSendImpl.ByGroupID(wsService.GROUP_KPI_UPF, kpiEvent)
+		RmUID:       &kpiData.RmUid,
+		Date:        kpiData.Date,
+		StartTime:   &kpiData.StartTime,
+		EndTime:     &kpiData.EndTime,
+		Index:       int16(kpiData.Index),
+		Granularity: &kpiData.Granularity,
+	}
+
+	// 发送到匹配的网元
+	neInfo := neService.NewNeInfo.SelectNeInfoByRmuid(kpiData.RmUid)
+	// custom kpi report to FE
+	kpiCEvent := map[string]any{
+		// kip_id ...
+		"neType":      kpiData.NEType,
+		"neId":        neInfo.NeId,
+		"neName":      kpiData.NEName,
+		"rmUID":       kpiData.RmUid,
+		"startIndex":  kpiData.Index,
+		"timeGroup":   kpiData.Date[:10] + " " + kpiData.EndTime,
+		"createdAt":   kpiData.CreatedAt,
+		"granularity": kpiData.Granularity,
+	}
+	kpiCList := kpi_c_title.GetActiveKPICList(kpiData.NEType)
+	for _, k := range kpiCList {
+		result, err := evaluate.CalcExpr(*k.Expression, kpiValMap)
+		kpiCVal := new(kpi_c_report.KpiCVal)
+		kpiCVal.KPIID = *k.KpiID
+		if err != nil {
+			kpiCVal.Value = 0.0
+			kpiCVal.Err = err.Error()
+		} else {
+			kpiCVal.Value = result
+		}
+
+		report.KpiValues = append(report.KpiValues, *kpiCVal)
+
+		// set KPIC event kpiid and value
+		kpiCEvent[kpiCVal.KPIID] = kpiCVal.Value
+	}
+
+	// KPI自定义指标入库
+	kpi_c_report.InsertKpiCReport(kpiData.NEType, report)
+
+	if neInfo.RmUID == kpiData.RmUid {
+		// 推送到ws订阅组
+		wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI, neInfo.NeType, neInfo.NeId), kpiEvent)
+		// 推送自定义KPI到ws订阅组
+		wsService.NewWSSend.ByGroupID(fmt.Sprintf("%s%s_%s", wsService.GROUP_KPI_C, neInfo.NeType, neInfo.NeId), kpiCEvent)
+		if neInfo.NeType == "UPF" {
+			wsService.NewWSSend.ByGroupID(wsService.GROUP_KPI_UPF+neInfo.NeId, kpiEvent)
+		}
 	}
 
 	services.ResponseStatusOK204NoContent(w)
@@ -639,7 +572,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			if neInfo == nil {
-				err := errors.New(fmt.Sprintf("not found target NE neType=%s, neId=%s", neType, neId))
+				err := fmt.Errorf("not found target NE neType=%s, neId=%s", neType, neId)
 				log.Error(err)
 				services.ResponseInternalServerError500ProcessError(w, err)
 				return
@@ -692,7 +625,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 					return
 				}
 			default:
-				err = errors.New(fmt.Sprintf("measure task status must be inactive id=%d", id))
+				err = fmt.Errorf("measure task status must be inactive id=%d", id)
 				log.Error("Unable to active measure task:", err)
 				services.ResponseInternalServerError500ProcessError(w, err)
 				return
@@ -719,7 +652,7 @@ func PostMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 					services.TransportResponse(w, response.StatusCode(), response.Body())
 					return
 				} else {
-					err = errors.New(fmt.Sprintf("failed to active measure task, NF return error status=%v", response.Status()))
+					err = fmt.Errorf("failed to active measure task, NF return error status=%v", response.Status())
 					log.Error("Unable to active measure task:", err)
 					services.ResponseInternalServerError500ProcessError(w, err)
 					return
@@ -932,8 +865,6 @@ func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 				return
 			}
 			if neInfo == nil {
-				em := errors.New("Not found NE info in database")
-				log.Error(em)
 				taskInfo := new(dborm.MeasureTask)
 				taskInfo.Status = dborm.MeasureTaskStatusInactive
 				affected, err := dborm.XormUpdateTableById(id, dborm.TableNameMeasureTask, taskInfo)
@@ -986,7 +917,6 @@ func PatchMeasureTaskToNF(w http.ResponseWriter, r *http.Request) {
 	}
 
 	services.ResponseWithJson(w, response.StatusCode(), respMsg)
-	return
 }
 
 type Measurement struct {

features/pm/service.go

@@ -0,0 +1,19 @@
+package pm
+
+import (
+	"be.ems/features/pm/kpi_c_report"
+	"be.ems/features/pm/kpi_c_title"
+	"be.ems/lib/log"
+	"github.com/gin-gonic/gin"
+)
+
+func InitSubServiceRoute(r *gin.Engine) {
+	log.Info("======init PM group gin.Engine")
+
+	pmGroup := r.Group("/pm")
+	// register sub modules routes
+	kpi_c_title.Register(pmGroup)
+	kpi_c_report.Register(pmGroup)
+
+	// return featuresGroup
+}

features/state/getstate.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/net"
+	"github.com/shirou/gopsutil/v4/net"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/gorilla/mux"
@@ -506,11 +506,11 @@ func GetOneSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 			if systemState.HostName != "" {
 				hostName = systemState.HostName
 			}
-			osInfo := "Linux 5gc 4.15.0-29-generic #31-Ubuntu SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
+			osInfo := "Linux 5gc 4.15.0-29-generic SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
 			if systemState.OsInfo != "" {
 				osInfo = systemState.OsInfo
 			}
-			dbInfo := "adb v1.0.1"
+			dbInfo := "db v1.4.15"
 			if systemState.OsInfo != "" {
 				dbInfo = systemState.DbInfo
 			}
@@ -652,11 +652,11 @@ func GetAllSysinfoFromNF(w http.ResponseWriter, r *http.Request) {
 				if systemState.HostName != "" {
 					hostName = systemState.HostName
 				}
-				osInfo := "Linux 5gc 4.15.0-29-generic #31-Ubuntu SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
+				osInfo := "Linux 5gc 4.15.0-29-generic SMP Tue Jul 17 15:39:52 UTC 2018 x86_64 GNU/Linux"
 				if systemState.OsInfo != "" {
 					osInfo = systemState.OsInfo
 				}
-				dbInfo := "adb v1.0.1"
+				dbInfo := "db v1.4.15"
 				if systemState.OsInfo != "" {
 					dbInfo = systemState.DbInfo
 				}

features/state/state_linux.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"be.ems/lib/log"
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 type SysInfo struct {

features/state/state_windows.go

@@ -11,10 +11,10 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/v3/disk"
+	"github.com/shirou/gopsutil/v4/disk"
-	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/v3/process"
+	"github.com/shirou/gopsutil/v4/process"
 )
 
 type SysInfo struct {

features/state/sysinfo.go

@@ -2,55 +2,10 @@ package state
 
 import (
 	"be.ems/lib/log"
-	"github.com/shirou/gopsutil/cpu"
+	"github.com/shirou/gopsutil/v4/cpu"
-	"github.com/shirou/gopsutil/disk"
+	"github.com/shirou/gopsutil/v4/mem"
-	"github.com/shirou/gopsutil/host"
-	"github.com/shirou/gopsutil/mem"
 )
 
-func getSystemInfo() {
-	// 获取主机信息
-	hostInfo, err := host.Info()
-	if err != nil {
-		log.Errorf("Failed to get host info: %v", err)
-		return
-	}
-	log.Tracef("Host info: %+v", hostInfo)
-
-	// 获取CPU信息
-	cpuInfo, err := cpu.Info()
-	if err != nil {
-		log.Errorf("Failed to get CPU info: %v", err)
-		return
-	}
-	log.Tracef("CPU info: %+v", cpuInfo)
-
-	// 获取内存信息
-	memInfo, err := mem.VirtualMemory()
-	if err != nil {
-		log.Errorf("Failed to get memory info: %v", err)
-		return
-	}
-	log.Tracef("Memory info: %+v", memInfo)
-
-	// 获取磁盘分区信息
-	diskPartitions, err := disk.Partitions(true)
-	if err != nil {
-		log.Errorf("Failed to get disk partitions: %v", err)
-		return
-	}
-	log.Tracef("Disk partitions: %+v", diskPartitions)
-	for _, partition := range diskPartitions {
-		// 获取每个磁盘分区的使用情况
-		usage, err := disk.Usage(partition.Mountpoint)
-		if err != nil {
-			log.Errorf("Failed to get disk usage for %s: %v", partition.Mountpoint, err)
-			continue
-		}
-		log.Tracef("%s usage: %+v", partition.Mountpoint, usage)
-	}
-}
-
 func getCpuNumber() int {
 	// 获取CPU信息
 	cpuInfo, err := cpu.Info()

features/ue/ue.go

@@ -253,7 +253,7 @@ func GetUEInfoFromNF(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	neInfo := neService.NewNeInfoImpl.SelectNeInfoByNeTypeAndNeID(neType, neId)
+	neInfo := neService.NewNeInfo.SelectNeInfoByNeTypeAndNeID(neType, neId)
 
 	var response services.MapResponse
 	if neInfo.NeId == neId && neInfo.NeId != "" {

lib/dborm/dbgorm.go

@@ -0,0 +1,167 @@
+package dborm
+
+import (
+	"database/sql"
+	"fmt"
+	"log"
+	"os"
+	"regexp"
+	"time"
+
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+)
+
+// 数据库连接实例
+var dbgEngine *gorm.DB
+
+// 载入连接日志配置
+func loadLogger() logger.Interface {
+	newLogger := logger.New(
+		log.New(os.Stdout, "[GORM] ", log.LstdFlags), // 将日志输出到控制台
+		logger.Config{
+			SlowThreshold:        time.Second, // Slow SQL 阈值
+			LogLevel:             logger.Info, // 日志级别 Silent不输出任何日志
+			ParameterizedQueries: false,       // 参数化查询SQL 用实际值带入?的执行语句
+			Colorful:             false,       // 彩色日志输出
+		},
+	)
+	return newLogger
+}
+
+// 连接数据库实例
+func InitGormConnect(dbType, dbUser, dbPassword, dbHost, dbPort, dbName, dbParam, dbLogging any) error {
+	var dialector gorm.Dialector
+	switch dbType {
+	case "mysql":
+		dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?%s",
+			dbUser,
+			dbPassword,
+			dbHost,
+			dbPort,
+			dbName,
+			dbParam,
+		)
+		dialector = mysql.Open(dsn)
+	default:
+		err := fmt.Errorf("invalid type: %s", dbType)
+		return err
+	}
+	opts := &gorm.Config{}
+	// 是否需要日志输出
+	if dbLogging.(bool) {
+		opts.Logger = loadLogger()
+	}
+	// 创建连接
+	db, err := gorm.Open(dialector, opts)
+	if err != nil {
+		log.Fatalf("failed to open: %s", err)
+		return err
+	}
+	// 获取底层 SQL 数据库连接
+	sqlDB, err := db.DB()
+	if err != nil {
+		log.Fatalf("failed to connect DB pool: %v", err)
+		return err
+	}
+	// 测试数据库连接
+	err = sqlDB.Ping()
+	if err != nil {
+		log.Fatalf("failed to ping database: %v", err)
+		return err
+	}
+	dbgEngine = db
+	return nil
+}
+
+// 关闭数据库实例
+func Close() {
+	sqlDB, err := dbgEngine.DB()
+	if err != nil {
+		log.Fatalf("failed to connect pool: %s", err)
+	}
+	if err := sqlDB.Close(); err != nil {
+		log.Fatalf("failed to close: %s", err)
+	}
+}
+
+// default gorm DB
+func DefaultDB() *gorm.DB {
+	return dbgEngine
+}
+
+// get sql DB
+func GCoreDB() (*sql.DB, error) {
+	return dbgEngine.DB()
+}
+
+// RawSQL 原生查询语句
+func RawSQL(sql string, parameters []any) ([]map[string]any, error) {
+	// 数据源
+	db := DefaultDB()
+
+	// 使用正则表达式替换连续的空白字符为单个空格
+	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
+
+	// logger.Infof("sql=> %v", fmtSql)
+	// logger.Infof("parameters=> %v", parameters)
+
+	// 查询结果
+	var rows []map[string]any
+	res := db.Raw(fmtSql, parameters...).Scan(&rows)
+	if res.Error != nil {
+		return nil, res.Error
+	}
+	return rows, nil
+}
+
+// ExecSQL 原生执行语句
+func ExecSQL(sql string, parameters []any) (int64, error) {
+	// 数据源
+	db := DefaultDB()
+
+	// 使用正则表达式替换连续的空白字符为单个空格
+	fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ")
+	// 执行结果
+	res := db.Exec(fmtSql, parameters...)
+	if res.Error != nil {
+		return 0, res.Error
+	}
+	return res.RowsAffected, nil
+}
+
+func CloneTable(srcTable, dstTable string) error {
+	// 获取表 A 的结构信息
+	var columns []gorm.ColumnType
+	dbMigrator := dbgEngine.Migrator()
+	columns, err := dbMigrator.ColumnTypes(srcTable)
+	if err != nil {
+		return fmt.Errorf("failed to ColumnTypes, %v", err)
+	}
+
+	// 创建表 destination table
+	err = dbMigrator.CreateTable(dstTable)
+	if err != nil {
+		return fmt.Errorf("failed to CreateTable, %v", err)
+	}
+	// 复制表 src 的字段到表 dst
+	for _, column := range columns {
+		err = dbMigrator.AddColumn(dstTable, column.Name())
+		if err != nil {
+			return fmt.Errorf("failed to AddColumn, %v", err)
+		}
+	}
+
+	// 复制表 src 的主键和索引到表 dst
+	err = dbMigrator.CreateConstraint(dstTable, "PRIMARY")
+	if err != nil {
+		return fmt.Errorf("failed to AddColumn, %v", err)
+	}
+
+	err = dbMigrator.CreateConstraint(dstTable, "INDEX")
+	if err != nil {
+		return fmt.Errorf("failed to AddColumn, %v", err)
+	}
+	return nil
+}

lib/dborm/dborm.go

@@ -16,6 +16,7 @@ import (
 
 	_ "github.com/go-sql-driver/mysql"
 	"xorm.io/xorm"
+	"xorm.io/xorm/core"
 )
 
 const (
@@ -124,6 +125,14 @@ func XormConnectDatabase(dbType, dbUser, dbPassword, dbHost, dbPort, dbName stri
 	return xEngine, nil
 }
 
+func XCoreDB() *core.DB {
+	return xEngine.DB()
+}
+
+func XEngDB() *xorm.Engine {
+	return xEngine
+}
+
 func ConstructInsertSQL(tableName string, insertData interface{}) (string, []string) {
 	log.Debug("ConstructInsertSQL processing... ")
 	log.Debug("Request insertData:", insertData)
@@ -419,68 +428,6 @@ func XormParseResult(body []byte) ([]NeInfo, error) {
 	return neInfo, nil
 }
 
-type ParamConfig struct {
-	//	Id         int    `json:"id" xorm:"pk 'id' autoincr"`
-	NeType     string `json:"neType"`
-	NeId       string `json:"neId"`
-	TopTag     string `json:"topTag"`
-	TopDisplay string `json:"topDisplay"`
-	ParamJson  string `json:"paramJson"`
-}
-
-func XormInsertParamConfig(mapJson *map[string]interface{}) (int64, error) {
-	var affected, a int64
-	var err error
-	paramConfig := new(ParamConfig)
-	for n, d := range *mapJson {
-		if d == nil {
-			break
-		}
-		log.Debugf("n: %s", n)
-
-		for t, p := range d.(map[string]interface{}) {
-			if p == nil {
-				break
-			}
-			log.Debug("t:", t)
-			log.Debug("p:", p)
-			for k, v := range p.(map[string]interface{}) {
-				log.Debug("k, v: ", k, v)
-				if k == "display" {
-					paramConfig.TopDisplay = fmt.Sprintf("%v", v)
-
-				} else {
-					pc, _ := json.Marshal(v)
-					paramConfig.ParamJson = fmt.Sprintf("{\"%v\":%v}", k, string(pc))
-				}
-			}
-
-			paramConfig.NeType = strings.ToUpper(n)
-			paramConfig.NeId = ""
-			paramConfig.TopTag = t
-			//			paramConfig.TopDisplay = p["display"]
-			//			paramConfig.ParamJson = p.(string)
-
-			log.Debug("paramConfig:", paramConfig)
-
-			xSession := xEngine.NewSession()
-			defer xSession.Close()
-			_, err = xSession.Table("param_config").Where("ne_type = ? and top_tag = ?", paramConfig.NeType, paramConfig.TopTag).Delete()
-			if err != nil {
-				log.Error("Failed to insert param_config:", err)
-			}
-			a, err = xSession.Insert(paramConfig)
-			if err != nil {
-				log.Error("Failed to insert param_config:", err)
-			}
-			affected += a
-			xSession.Commit()
-		}
-	}
-
-	return affected, err
-}
-
 func ConstructUpdateSQLArray(tableName string, updateData interface{}, whereCondition string) (string, []string) {
 	log.Debug("ConstructUpdateSQL processing... ")
 	log.Debug("Request updateData:", updateData)

lib/eval/evaluate.go

@@ -0,0 +1,111 @@
+package evaluate
+
+import (
+	"fmt"
+	"go/ast"
+	"go/parser"
+	"go/token"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+// Parse and caculate expression
+func CalcExpr(expr string, paramValues map[string]any) (float64, error) {
+	// match parameter with ''
+	re := regexp.MustCompile(`'([^']+)'`)
+	matches := re.FindAllStringSubmatch(expr, -1)
+
+	// replace to value
+	for _, match := range matches {
+		paramName := match[1]
+		value, exists := paramValues[paramName]
+		if !exists {
+			return 0, fmt.Errorf("parameter '%s' not found", paramName)
+		}
+
+		expr = strings.Replace(expr, match[0], fmt.Sprintf("%v", value), 1)
+	}
+
+	// expression to evaluate
+	result, err := evalExpr(expr)
+	return result, err
+}
+
+// eval 解析和计算表达式
+func evalExpr(expr string) (float64, error) {
+	//fset := token.NewFileSet()
+	node, err := parser.ParseExpr(expr)
+	if err != nil {
+		return 0, err
+	}
+	return evalNode(node)
+}
+
+// EvaluateExpr 解析并计算给定的表达式
+func EvalExpr(expr string, values map[string]any) (float64, error) {
+	// 解析表达式
+	node, err := parser.ParseExpr(expr)
+	if err != nil {
+		return 0, err
+	}
+
+	// 遍历 AST 并替换变量
+	ast.Inspect(node, func(n ast.Node) bool {
+		if ident, ok := n.(*ast.Ident); ok {
+			if val, ok := values[ident.Name]; ok {
+				// 替换标识符为对应值
+				ident.Name = fmt.Sprintf("%v", val)
+			}
+		}
+		return true
+	})
+
+	// 计算表达式
+	return evalNode(node)
+}
+
+// eval 递归计算 AST 节点
+func evalNode(node ast.Node) (float64, error) {
+	var result float64
+
+	switch n := node.(type) {
+	case *ast.BinaryExpr:
+		left, err := evalNode(n.X)
+		if err != nil {
+			return 0, err
+		}
+		right, err := evalNode(n.Y)
+		if err != nil {
+			return 0, err
+		}
+		switch n.Op {
+		case token.ADD:
+			result = left + right
+		case token.SUB:
+			result = left - right
+		case token.MUL:
+			result = left * right
+		case token.QUO:
+			result = left / right
+		}
+	case *ast.BasicLit:
+		var err error
+		result, err = strconv.ParseFloat(n.Value, 64)
+		if err != nil {
+			return 0, err
+		}
+	case *ast.Ident:
+		val, err := strconv.ParseFloat(n.Name, 64)
+		if err != nil {
+			return 0, fmt.Errorf("unsupported expression: %s", n.Name)
+		}
+		result = val
+	case *ast.ParenExpr:
+		return evalNode(n.X) // 递归评估括号中的表达式
+	default:
+		return 0, fmt.Errorf("unsupported expression: %T", n)
+	}
+
+	return result, nil
+}

lib/file/file.go

@@ -1,161 +1,27 @@
 package file
 
 import (
-	"fmt"
-	"net/http"
 	"os"
+	"path/filepath"
 )
 
-// const (
+func GetFileAndDirCount(dir string) (int, int, error) {
-// 	//经过测试，linux下，延时需要大于100ms
+	var fileCount, dirCount int
-// 	TIME_DELAY_AFTER_WRITE = 200
-// )
 
-// type Response struct {
+	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-// 	Data []string `json:"data"`
+		if err != nil {
-// }
+			return err
+		}
+		if path == dir {
+			return nil // 跳过当前目录
+		}
+		if info.IsDir() {
+			dirCount++
+		} else {
+			fileCount++
+		}
+		return nil
+	})
 
-// type MMLRequest struct {
+	return fileCount, dirCount, err
-// 	MML []string `json:"mml"`
-// }
-
-// func GetFile(w http.ResponseWriter, r *http.Request) {
-// 	log.Debug("PostMMLToNF processing... ")
-
-// 	vars := mux.Vars(r)
-// 	neType := vars["elementTypeValue"]
-// 	params := r.URL.Query()
-// 	neId := params["ne_id"]
-// 	log.Debug("neType:", neType, "neId", neId)
-
-// 	neInfo := new(dborm.NeInfo)
-// 	var err error
-// 	if len(neId) == 0 {
-// 		log.Error("ne_id NOT FOUND")
-// 		services.ResponseBadRequest400WrongParamValue(w)
-// 		return
-// 	}
-// 	neInfo, err = dborm.XormGetNeInfo(neType, neId[0])
-// 	if err != nil {
-// 		log.Error("dborm.XormGetNeInfo is failed:", err)
-// 		services.ResponseInternalServerError500DatabaseOperationFailed(w)
-// 		return
-// 	}
-
-// 	var buf [8192]byte
-// 	var n int
-// 	var mmlResult []string
-
-// 	if neInfo != nil {
-// 		hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port)
-// 		conn, err := net.Dial("tcp", hostMML)
-// 		if err != nil {
-// 			errMsg := fmt.Sprintf("Failed to dial %s: %v", hostMML, err)
-// 			log.Error(errMsg)
-// 			mmlResult = append(mmlResult, errMsg)
-// 			response := Response{mmlResult}
-// 			services.ResponseWithJson(w, http.StatusOK, response)
-// 			return
-// 		}
-
-// 		loginStr := fmt.Sprintf("%s\n%s\n", config.GetYamlConfig().MML.User, config.GetYamlConfig().MML.Password)
-// 		n, err = conn.Write([]byte(loginStr))
-// 		if err != nil {
-// 			log.Errorf("Error: %s", err.Error())
-// 			return
-// 		}
-
-// 		time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-// 		n, err = conn.Read(buf[0:])
-// 		if err != nil {
-// 			log.Errorf("Error: %s", err.Error())
-// 			return
-// 		}
-// 		log.Debug(string(buf[0:n]))
-
-// 		body, err := io.ReadAll(io.LimitReader(r.Body, global.RequestBodyMaxLen))
-// 		if err != nil {
-// 			log.Error("io.ReadAll is failed:", err)
-// 			services.ResponseNotFound404UriNotExist(w, r)
-// 			return
-// 		}
-// 		log.Debug("Body:", string(body))
-
-// 		mmlRequest := new(MMLRequest)
-// 		_ = json.Unmarshal(body, mmlRequest)
-
-// 		for _, mml := range mmlRequest.MML {
-// 			mmlCommand := fmt.Sprintf("%s\n", mml)
-// 			log.Debug("mml command:", mmlCommand)
-// 			n, err = conn.Write([]byte(mmlCommand))
-// 			if err != nil {
-// 				log.Errorf("Error: %s", err.Error())
-// 				return
-// 			}
-// 			time.Sleep(time.Millisecond * TIME_DELAY_AFTER_WRITE)
-
-// 			n, err = conn.Read(buf[0:])
-// 			if err != nil {
-// 				log.Errorf("Error: %s", err.Error())
-// 				return
-// 			}
-// 			log.Debug(string(buf[0 : n-len(neType)-2]))
-// 			mmlResult = append(mmlResult, string(buf[0:n-len(neType)-2]))
-// 		}
-// 	}
-
-// 	response := Response{mmlResult}
-// 	services.ResponseWithJson(w, http.StatusOK, response)
-// }
-
-// 格式文件大小单位
-func FormatFileSize(fileSize float64) (size string) {
-	if fileSize < 1024 {
-		return fmt.Sprintf("%.2fB", fileSize/float64(1))
-	} else if fileSize < (1024 * 1024) {
-		return fmt.Sprintf("%.2fKB", fileSize/float64(1024))
-	} else if fileSize < (1024 * 1024 * 1024) {
-		return fmt.Sprintf("%.2fMB", fileSize/float64(1024*1024))
-	} else if fileSize < (1024 * 1024 * 1024 * 1024) {
-		return fmt.Sprintf("%.2fGB", fileSize/float64(1024*1024*1024))
-	} else if fileSize < (1024 * 1024 * 1024 * 1024 * 1024) {
-		return fmt.Sprintf("%.2fTB", fileSize/float64(1024*1024*1024*1024))
-	} else {
-		return fmt.Sprintf("%.2fEB", fileSize/float64(1024*1024*1024*1024*1024))
-	}
-}
-
-func IsSymlink(mode os.FileMode) bool {
-	return mode&os.ModeSymlink != 0
-}
-
-const dotCharacter = 46
-
-func IsHidden(path string) bool {
-	return path[0] == dotCharacter
-}
-
-func GetMimeType(path string) string {
-	file, err := os.Open(path)
-	if err != nil {
-		return ""
-	}
-	defer file.Close()
-
-	buffer := make([]byte, 512)
-	_, err = file.Read(buffer)
-	if err != nil {
-		return ""
-	}
-	mimeType := http.DetectContentType(buffer)
-	return mimeType
-}
-
-func GetSymlink(path string) string {
-	linkPath, err := os.Readlink(path)
-	if err != nil {
-		return ""
-	}
-	return linkPath
 }

lib/file/file_linux.go

@@ -0,0 +1,80 @@
+//go:build linux
+// +build linux
+
+package file
+
+import (
+	"fmt"
+	"os"
+	"os/user"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	"github.com/dustin/go-humanize"
+)
+
+type FileInfo struct {
+	FileType     string `json:"fileType"`     // 文件类型
+	FileMode     string `json:"fileMode"`     // 文件的权限
+	LinkCount    int64  `json:"linkCount"`    // 硬链接数目
+	Owner        string `json:"owner"`        // 所属用户
+	Group        string `json:"group"`        // 所属组
+	Size         string `json:"size"`         // 文件的大小
+	ModifiedTime int64  `json:"modifiedTime"` // 最后修改时间，单位为秒
+	FileName     string `json:"fileName"`     // 文件的名称
+}
+
+func GetFileInfo(dir, suffix string) ([]FileInfo, error) {
+	var files []FileInfo
+
+	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if path == dir {
+			return nil // 跳过当前目录
+		}
+
+		fileType := "file"
+		if info.IsDir() {
+			fileType = "directory"
+		} else if info.Mode()&os.ModeSymlink != 0 {
+			fileType = "symlink"
+		}
+
+		// check if match suffix
+		if (suffix != "" && filepath.Ext(path) == suffix) || suffix == "" {
+			stat, ok := info.Sys().(*syscall.Stat_t)
+			if !ok {
+				return fmt.Errorf("not a syscall.Stat_t")
+			}
+			userInfo, err := user.LookupId(fmt.Sprint(stat.Uid))
+			if err != nil {
+				return err
+			}
+			groupInfo, err := user.LookupGroupId(fmt.Sprint(stat.Gid))
+			if err != nil {
+				return err
+			}
+			humanReadableSize := humanize.Bytes(uint64(info.Size()))
+			fileInfo := FileInfo{
+				FileType:     fileType,
+				FileMode:     info.Mode().String(),
+				LinkCount:    int64(info.Sys().(*syscall.Stat_t).Nlink),
+				Owner:        userInfo.Username,
+				Group:        groupInfo.Name,
+				Size:         strings.ToUpper(humanReadableSize),
+				ModifiedTime: info.ModTime().Unix(),
+				FileName:     info.Name(),
+			}
+			files = append(files, fileInfo)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return files, nil
+}

lib/file/file_windows.go

@@ -0,0 +1,61 @@
+//go:build windows
+// +build windows
+
+package file
+
+import (
+	"os"
+	"path/filepath"
+)
+
+type FileInfo struct {
+	FileType     string `json:"fileType"`     // 文件类型
+	FileMode     string `json:"fileMode"`     // 文件的权限
+	LinkCount    int64  `json:"linkCount"`    // 硬链接数目
+	Owner        string `json:"owner"`        // 所属用户
+	Group        string `json:"group"`        // 所属组
+	Size         int64  `json:"size"`         // 文件的大小
+	ModifiedTime int64  `json:"modifiedTime"` // 最后修改时间，单位为秒
+	FileName     string `json:"fileName"`     // 文件的名称
+}
+
+func GetFileInfo(dir, suffix string) ([]FileInfo, error) {
+	var files []FileInfo
+
+	err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if path == dir {
+			return nil // 跳过当前目录
+		}
+
+		fileType := "file"
+		if info.IsDir() {
+			fileType = "directory"
+		} else if info.Mode()&os.ModeSymlink != 0 {
+			fileType = "symlink"
+		}
+
+		// check if match suffix
+		if (suffix != "" && filepath.Ext(path) == suffix) || suffix == "" {
+			fileInfo := FileInfo{
+				FileType:     fileType,
+				FileMode:     info.Mode().String(),
+				LinkCount:    0,
+				Owner:        "-",
+				Group:        "-",
+				Size:         info.Size(),
+				ModifiedTime: info.ModTime().Unix(),
+				FileName:     info.Name(),
+			}
+			files = append(files, fileInfo)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+	return files, nil
+}

lib/mmlp/parse.go

@@ -46,6 +46,7 @@ type MmlVar struct {
 	Authorization string `josn:"authorization"`
 	HttpUri       string `json:"httpUri"`
 	UserAgent     string `json:"userAgent"`
+	TagNE         string `json:"tagNE"`
 }
 
 // func init() {

lib/oauth/oauth.go

@@ -4,7 +4,6 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 	"encoding/hex"
-	"fmt"
 	"math/rand"
 	"net/http"
 	"strings"
@@ -12,35 +11,9 @@ import (
 
 	"be.ems/lib/log"
 
-	"github.com/dgrijalva/jwt-go"
 	"golang.org/x/crypto/bcrypt"
 )
 
-// GenToken 生成Token值
-func GenToken(mapClaims jwt.MapClaims) (string, error) {
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, mapClaims)
-	var nowDate = time.Now()
-	var secret = fmt.Sprintf("%v%v", nowDate, "xxxx")
-	return token.SignedString([]byte(secret))
-}
-
-// GenerateToken 生成Token值
-func GenerateToken(mapClaims jwt.MapClaims, key string) (string, error) {
-	token := jwt.NewWithClaims(jwt.SigningMethodHS256, mapClaims)
-	return token.SignedString([]byte(key))
-}
-
-// ParseToken: "解析token"
-func ParseToken(token string, secret string) (string, error) {
-	claim, err := jwt.Parse(token, func(token *jwt.Token) (interface{}, error) {
-		return []byte(secret), nil
-	})
-	if err != nil {
-		return "", err
-	}
-	return claim.Claims.(jwt.MapClaims)["cmd"].(string), nil
-}
-
 func RandAccessToken(n int) (ret string) {
 	allString := "52661fbd-6b84-4fc2-aa1e-17879a5c6c9b"
 	ret = ""

lib/routes/routes.go

@@ -207,13 +207,6 @@ func init() {
 	Register("PUT", cm.CustomUriSoftwareNE, cm.ActiveSoftwareToNF, nil)
 	Register("PATCH", cm.CustomUriSoftwareNE, cm.RollBackSoftwareToNF, nil)
 
-	// License management
-	Register("POST", cm.UriLicense, cm.UploadLicenseFileData, midware.LogOperate(collectlogs.OptionNew("License", collectlogs.BUSINESS_TYPE_INSERT)))
-	Register("POST", cm.UriLicenseExt, cm.UploadLicenseFileData, midware.LogOperate(collectlogs.OptionNew("License", collectlogs.BUSINESS_TYPE_INSERT)))
-
-	Register("POST", cm.CustomUriLicense, cm.UploadLicenseFileData, nil)
-	Register("POST", cm.CustomUriLicenseExt, cm.UploadLicenseFileData, nil)
-
 	// Trace management 跟踪任务
 	Register("POST", trace.UriTraceTask, trace.PostTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("Trace Task", collectlogs.BUSINESS_TYPE_INSERT)))
 	Register("PUT", trace.UriTraceTask, trace.PutTraceTaskToNF, midware.LogOperate(collectlogs.OptionNew("Trace Task", collectlogs.BUSINESS_TYPE_UPDATE)))
@@ -279,24 +272,15 @@ func init() {
 	Register("GET", ue.UriNSSFSubscriptions, ue.GetSubscriptionsFromNSSF, nil)
 	Register("GET", ue.CustomUriNSSFSubscriptions, ue.GetSubscriptionsFromNSSF, nil)
 
-	// ims cdr event
+	// cdr event
-	Register("POST", cdr.UriIMSCDREvent, cdr.PostCDREventFromIMS, nil)
+	Register("POST", cdr.UriCDREvent, cdr.PostCDREventFrom, nil)
-	Register("POST", cdr.CustomUriIMSCDREvent, cdr.PostCDREventFromIMS, nil)
+	Register("POST", cdr.CustomUriCDREvent, cdr.PostCDREventFrom, nil)
-
-	// smf cdr event
-	Register("POST", cdr.UriSMFCDREvent, cdr.PostCDREventFromSMF, nil)
-	Register("POST", cdr.CustomUriSMFCDREvent, cdr.PostCDREventFromSMF, nil)
 
 	// UE event 上报的UE事件
 	Register("POST", event.UriUEEvent, event.PostUEEvent, nil)
-
 	// UE event AMF上报的UE事件, 无前缀给到Gin处理
 	//Register("POST", event.UriUEEvent, event.PostUEEventFromAMF, nil)
 
-	// 文件资源
-	Register("GET", file.UriDiskList, file.DiskList, nil)
-	Register("POST", file.UriListFiles, file.ListFiles, nil)
-
 	// 数据库连接情况
 	Register("GET", dbrest.UriDbConnection, dbrest.DbConnection, nil)
 	Register("GET", dbrest.CustomUriDbConnection, dbrest.DbConnection, nil)

lib/services/response.go

@@ -0,0 +1,35 @@
+package services
+
+const (
+	CODE_FAIL = 0
+	CODE_SUCC = 1
+)
+
+func ErrResp(msg string) map[string]any {
+	return map[string]any{"code": CODE_FAIL, "msg": msg}
+}
+
+func DataResp(data any) map[string]any {
+	return map[string]any{"code": CODE_SUCC, "data": data}
+}
+
+func SuccMessageResp() map[string]any {
+	return map[string]any{"code": CODE_SUCC, "msg": "success"}
+}
+
+func TotalResp(total int64) map[string]any {
+	return map[string]any{"code": CODE_SUCC, "total": total}
+}
+
+func TotalDataResp(data any, total any) map[string]any {
+	return map[string]any{"code": CODE_SUCC, "data": data, "total": total}
+}
+
+func SuccResp(va map[string]any) map[string]any {
+	resp := make(map[string]any)
+	resp["code"] = CODE_SUCC
+	for k, v := range va {
+		resp[k] = v
+	}
+	return resp
+}

restagent/config/config.go

@@ -1,14 +1,18 @@
 package config
 
 import (
+	"bufio"
 	"fmt"
 	"os"
+	"reflect"
 	"strings"
 
 	"be.ems/lib/global"
 	"be.ems/lib/log"
 
 	"gopkg.in/yaml.v3"
+	//"github.com/go-yaml-comment/yaml"
+	//"github.com/goccy/go-yaml"
 )
 
 // Yaml struct of config
@@ -147,41 +151,44 @@ type DbConfig struct {
 }
 
 type AlarmConfig struct {
-	SplitEventAlarm bool   `yaml:"splitEventAlarm"`
+	SplitEventAlarm bool `yaml:"splitEventAlarm"`
-	ForwardAlarm    bool   `yaml:"forwardAlarm"`
+	//ForwardAlarm    bool `yaml:"forwardAlarm"`
-	SMProxy         string `yaml:"smProxy"`
+
-	Email           struct {
+	EmailForward struct {
-		Smtp          string `yaml:"smtp"`
+		Enable        bool   `yaml:"enable" json:"enable"`
-		Port          uint16 `yaml:"port"`
+		EmailList     string `yaml:"emailList" json:"emailList"`
-		User          string `yaml:"user"`
+		SMTP          string `yaml:"smtp" json:"smtp"`
-		Password      string `yaml:"password"`
+		Port          uint16 `yaml:"port" json:"port"`
-		TlsSkipVerify bool   `yaml:"tlsSkipVerify"`
+		User          string `yaml:"user" json:"user"`
-	} `yaml:"email"`
+		Password      string `yaml:"password" json:"password"`
+		TLSSkipVerify bool   `yaml:"tlsSkipVerify" json:"tlsSkipVerify"`
+	} `yaml:"alarmEmailForward"`
+	SMSCForward struct {
+		Enable        bool   `yaml:"enable" json:"enable"`
+		MobileList    string `yaml:"mobileList" json:"mobileList"`
+		SMSCAddr      string `yaml:"smscAddr" json:"smscAddr"`
+		SystemID      string `yaml:"systemID" json:"systemID"`
+		Password      string `yaml:"password" json:"password"`
+		SystemType    string `yaml:"systemType" json:"systemType"`
+		DataCoding    byte   `yaml:"dataCoding" json:"dataCoding"`
+		ServiceNumber string `yaml:"serviceNumber" json:"serviceNumber"`
+	} `yaml:"alarmSMSForward"`
 	SMS struct {
 		ApiURL          string `yaml:"apiURL"`
 		AccessKeyID     string `yaml:"AccessKeyID"`
 		AccessKeySecret string `yaml:"accessKeySecret"`
 		SignName        string `yaml:"signName"`
 		TemplateCode    string `yaml:"templateCode"`
-	} `yaml:"sms"`
+	} `yaml:"smsForward"`
-	SMSC struct {
+	SMProxy string `yaml:"smProxy"`
-		Addr       string `yaml:"addr"`
-		SystemID   string `yaml:"systemID"`
-		Password   string `yaml:"password"`
-		SystemType string `yaml:"systemType"`
-	} `yaml:"smsc"`
 }
 
 type MMLParam struct {
-	Port       int    `yaml:"port"`
-	Port2      int    `yaml:"port2"`
 	Sleep      int64  `yaml:"sleep"`
 	DeadLine   int64  `yaml:"deadLine"`
 	SizeRow    int16  `yaml:"sizeRow"`
 	SizeCol    int16  `yaml:"sizeCol"`
 	BufferSize int    `yaml:"bufferSize"`
-	User       string `yaml:"user"`
-	Password   string `ymal:"password"`
 	MmlHome    string `yaml:"mmlHome"`
 }
 
@@ -218,6 +225,16 @@ type TestDataMap struct {
 
 var yamlConfig YamlConfig = NewYamlConfig()
 
+type YamlConfigFile struct {
+	FilePath     string     `json:"filePath"`
+	ConfigLines  YamlConfig `json:"configLines"`
+	OrignalLines []string   `json:"orignalLines"`
+}
+
+var YamlConfigInfo YamlConfigFile = YamlConfigFile{
+	ConfigLines: NewYamlConfig(),
+}
+
 // set default value for yaml config
 func NewYamlConfig() YamlConfig {
 	return YamlConfig{
@@ -237,6 +254,8 @@ func NewYamlConfig() YamlConfig {
 }
 
 func ReadConfig(configFile string) {
+	YamlConfigInfo.FilePath = configFile
+
 	yamlFile, err := os.ReadFile(configFile)
 	if err != nil {
 		fmt.Println("Read yaml config file error:", err)
@@ -244,25 +263,97 @@ func ReadConfig(configFile string) {
 	}
 	//	fmt.Println("yamlfile:", string(yamlFile))
 
-	err = yaml.Unmarshal(yamlFile, &yamlConfig)
+	err = yaml.Unmarshal(yamlFile, &YamlConfigInfo.ConfigLines)
 	if err != nil {
 		fmt.Println("Unmarshal error:", err)
 		os.Exit(3)
 	}
+	yamlConfig = YamlConfigInfo.ConfigLines
+
+	ReadOriginalConfig(configFile)
 }
 
-func WriteYamlConfig(newConfigData YamlConfig, configFile string) {
+func ReadOriginalConfig(configFile string) {
+	// 读取原始YAML文件
+	inputFile, err := os.Open(configFile)
+	if err != nil {
+		fmt.Println("failed to open:", err)
+		os.Exit(3)
+	}
+	defer inputFile.Close()
+
+	scanner := bufio.NewScanner(inputFile)
+	for scanner.Scan() {
+		YamlConfigInfo.OrignalLines = append(YamlConfigInfo.OrignalLines, scanner.Text())
+	}
+
+	if err := scanner.Err(); err != nil {
+		fmt.Println("failed to scanner:", err)
+		os.Exit(3)
+	}
+}
+
+func WriteOrignalConfig(configFile string, paramName string, paramData map[string]any) error {
+	lines := YamlConfigInfo.OrignalLines
+	for i, line := range lines {
+		if strings.Contains(line, paramName) {
+			for k, v := range paramData {
+				// find the first line nearby the paramName
+				for j := i + 1; j < len(lines); j++ {
+					if strings.Contains(lines[j], k+":") {
+						index := strings.Index(lines[j], k)
+						// Determine the type of v
+						switch v := v.(type) {
+						case string:
+							lines[j] = lines[j][:index] + fmt.Sprintf("%s: \"%s\"", k, v)
+						// case int:
+						// 	lines[j] = lines[j][:index] + fmt.Sprintf("%s: %d", k, v)
+						// case float64:
+						// 	lines[j] = lines[j][:index] + fmt.Sprintf("%s: %f", k, v)
+						case bool:
+							lines[j] = lines[j][:index] + fmt.Sprintf("%s: %t", k, v)
+						default:
+							lines[j] = lines[j][:index] + fmt.Sprintf("%s: %v", k, v)
+						}
+						break
+					}
+				}
+			}
+			break
+		}
+	}
+
+	// write back to yaml file
+	outputFile, err := os.Create(configFile)
+	if err != nil {
+		fmt.Println(err)
+		return err
+	}
+	defer outputFile.Close()
+
+	writer := bufio.NewWriter(outputFile)
+	for _, line := range YamlConfigInfo.OrignalLines {
+		writer.WriteString(line + "\n")
+	}
+	writer.Flush()
+	return nil
+}
+
+func WriteYamlConfig(newConfigData YamlConfig, configFile string) error {
 	// 将配置转换回YAML数据
 	newYamlData, err := yaml.Marshal(&newConfigData)
 	if err != nil {
 		log.Errorf("Failed to marshal YAML: %v", err)
+		return err
 	}
 
 	// 将新的YAML数据写入文件
 	err = os.WriteFile(configFile, newYamlData, 0644)
 	if err != nil {
 		log.Errorf("Failed to write YAML file: %v", err)
+		return err
 	}
+	return nil
 }
 
 var mapYaml map[string]interface{}
@@ -284,8 +375,30 @@ func ReadParamConfig(fileName string) *map[string]interface{} {
 	return &mapYaml
 }
 
+func UpdateStructFromMap(s any, updates map[string]any) {
+	v := reflect.ValueOf(s).Elem()
+	t := v.Type()
+
+	for key, value := range updates {
+		for i := 0; i < t.NumField(); i++ {
+			field := t.Field(i)
+			if field.Tag.Get("json") == key {
+				structField := v.FieldByName(field.Name)
+				if structField.IsValid() && structField.CanSet() {
+					// Convert value to the appropriate type if necessary
+					convertedValue := reflect.ValueOf(value).Convert(structField.Type())
+					if structField.Type() == convertedValue.Type() {
+						structField.Set(convertedValue)
+					}
+				}
+				break
+			}
+		}
+	}
+}
+
 func GetYamlConfig() *YamlConfig {
-	return &yamlConfig
+	return &YamlConfigInfo.ConfigLines
 }
 
 func GetAuthFromConfig() interface{} {

restagent/etc/restconf.yaml

@@ -11,7 +11,7 @@ logger:
 
 pprof: 
   enabled: true
-  addr: :36060
+  addr: :33060
 
 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
@@ -20,10 +20,10 @@ pprof:
 rest:
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 33040
+    port: 33030
 
 webServer:
-  enabled: false
+  enabled: true
   rootDir: d:/local.git/fe.ems.vue3/dist
   listen: 
     - addr: :80
@@ -38,29 +38,29 @@ webServer:
 database:
   type: mysql
   user: root
-  password: "root@1234"
+  password: "1000omc@kp!"
-  host: "192.168.5.59"
+  host: "127.0.0.1"
-  port: 3306
+  port: 33066
   name: "omc_db"
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/local.git/be.ems/restagent/database
 
-# Redis 缓存数据，数据源声明全小写
+# Redis data cache
 redis:
   dataSource:
-    # OMC系统使用库
+    # OMC system db
     default:
       port: 6379 # Redis port
-      host: "192.168.5.59" # Redis host
+      host: "127.0.0.1" # Redis host
-      password: "redis@1234"
+      password: "helloearth"
       db: 10 # Redis db_num
-    # UDM网元用户库
+    # UDM sub/auth db
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.5.60"
+      host: "127.0.0.1"
       password: "helloearth"
       db: 0 # Redis db_num
-  # 多个数据源时可以用这个指定默认的数据源
+  # used to specify the default data source for multiple data resourece
   defaultDataSourceName: "default"
 
 # sleep: time delay for after write buffer (millisecond)
@@ -77,6 +77,12 @@ mml:
   password: admin
   mmlHome: ./mmlhome
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
 # NE config
 ne:
   user: omcuser
@@ -123,29 +129,36 @@ omc:
 
 # Alarm module setting
 # Forward interface:
+# TLS Skip verify: true/false
 # email/sms
 # smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:GSM7BIT, 1:ASCII, 2:BINARY8BIT1, 3:LATIN1, 
+#             4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2
 alarm:
-  forwardAlarm: false
+  alarmEmailForward:
-  email:
+    enable: true
-    smtp: mail.agrandtech.com
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpext@agrandtech.com
+    user: smtpext@smtp.com
     password: "1000smtp@omc!"
-    # TLS skip verify: true/false
     tlsSkipVerify: true
-  smProxy: smsc
+  alarmSMSForward:
+    enable: true
+    mobileList: "1006,1008"
+    smscAddr: "192.168.14.212:2775"
+    systemID: "123456"
+    password: "123456"
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
     apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
     signName: xxx SMSC
     templateCode: 1000
-  smsc:
+  smProxy: smsc
-    addr: "192.168.13.114:2775"
-    systemID: "omc"
-    password: "omc123"
-    systemType: "UTRAN"
     
 #User authorized information
 # crypt: mysql/md5/bcrypt
@@ -181,12 +194,12 @@ testConfig:
   file: ./etc/testconfig.yaml
 
 # 静态文件配置, 相对项目根路径或填绝对路径
-# staticFile:
+staticFile:
-#   # 默认资源，dir目录需要预先创建
+  # 默认资源，dir目录需要预先创建
-#   default:
+  default:
-#     prefix: "/static"
+    prefix: "/static"
-#     dir: "./static"
+    dir: "./static"
-#   # 文件上传资源目录映射，与项目目录同级
+  # 文件上传资源目录映射，与项目目录同级
-#   upload:
+  upload:
-#     prefix: "/upload"
+    prefix: "/upload"
-#     dir: "./upload"
+    dir: "./upload"

restagent/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2407.1
+VERSION = 2.2410.2
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

restagent/restagent.go

@@ -11,6 +11,7 @@ import (
 
 	_ "net/http/pprof"
 
+	"be.ems/features"
 	"be.ems/features/dbrest"
 	"be.ems/features/event"
 	"be.ems/features/fm"
@@ -212,6 +213,12 @@ func main() {
 		fmt.Println("dborm.initDbClient err:", err)
 		os.Exit(4)
 	}
+	err = dborm.InitGormConnect(conf.Database.Type, conf.Database.User, conf.Database.Password,
+		conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam, true)
+	if err != nil {
+		fmt.Println("dborm.InitGormConnect err:", err)
+		os.Exit(4)
+	}
 	err = fm.InitDbClient(conf.Database.Type, conf.Database.User, conf.Database.Password,
 		conf.Database.Host, conf.Database.Port, conf.Database.Name, conf.Database.ConnParam)
 	if err != nil {
@@ -251,7 +258,10 @@ func main() {
 	// AMF上报的UE事件, 无前缀，暂时特殊处理
 	app.POST(event.UriUEEventAMF, event.PostUEEventFromAMF)
 
-	var listenLocalhost bool = false
+	// register feature service gin.Engine
+	features.InitServiceEngine(app)
+
+	// var listenLocalhost bool = false
 	for _, rest := range conf.Rest {
 		// ipv4 goroutines
 		if rest.IPv4 != "" {
@@ -262,16 +272,16 @@ func main() {
 				go HttpListen(listen, app)
 			}
 		}
-		if rest.IPv4 != "0.0.0.0" && !listenLocalhost {
+		// if rest.IPv4 != "0.0.0.0" && !listenLocalhost {
-			listenLocalhost = true
+		// 	listenLocalhost = true
-			// 默认启动localhost侦听
+		// 	// 默认启动localhost侦听
-			listenLocal := "127.0.0.1" + ":" + strconv.Itoa(int(rest.Port))
+		// 	listenLocal := "127.0.0.1" + ":" + strconv.Itoa(int(rest.Port))
-			if strings.ToLower(rest.Scheme) == "https" {
+		// 	if strings.ToLower(rest.Scheme) == "https" {
-				go HttpListenTLS(listenLocal, rest.CaFile, rest.CertFile, rest.KeyFile, rest.ClientAuthType, app)
+		// 		go HttpListenTLS(listenLocal, rest.CaFile, rest.CertFile, rest.KeyFile, rest.ClientAuthType, app)
-			} else {
+		// 	} else {
-				go HttpListen(listenLocal, app)
+		// 		go HttpListen(listenLocal, app)
-			}
+		// 	}
-		}
+		// }
 		// ipv6 goroutines
 		if rest.IPv6 != "" {
 			listenv6 := "[" + rest.IPv6 + "]" + ":" + strconv.Itoa(int(rest.Port))

src/app.go

@@ -16,6 +16,7 @@ import (
 	networkdata "be.ems/src/modules/network_data"
 	networkelement "be.ems/src/modules/network_element"
 	"be.ems/src/modules/system"
+	"be.ems/src/modules/tool"
 	"be.ems/src/modules/trace"
 	"be.ems/src/modules/ws"
 
@@ -97,7 +98,10 @@ func initAppEngine() *gin.Engine {
 // 初始全局默认
 func initDefeat(app *gin.Engine) {
 	// 全局中间件
-	app.Use(errorcatch.ErrorCatch(), middleware.Report(), middleware.Cors(), security.Security())
+	if config.Env() == "local" {
+		app.Use(middleware.Report())
+	}
+	app.Use(errorcatch.ErrorCatch(), middleware.Cors(), security.Security())
 
 	// 静态目录-静态资源
 	if v := config.Get("staticFile.default"); v != nil {
@@ -140,6 +144,8 @@ func initModulesRoute(app *gin.Engine) {
 	trace.Setup(app)
 	// 图表模块
 	chart.Setup(app)
+	// 工具模块
+	tool.Setup(app)
 	// ws 模块
 	ws.Setup(app)
 	// 调度任务模块--暂无接口

src/framework/config/config/config.default.yaml

@@ -1,7 +1,7 @@
 # 项目信息
 framework:
-  name: "CN EMS"
+  name: "OMC"
-  version: "2.2407.1"
+  version: "2.2410.2"
 
 # 应用服务配置
 server:
@@ -172,6 +172,13 @@ redis:
   # 多个数据源时可以用这个指定默认的数据源
   defaultDataSourceName: "default"
 
+# AES 加密
+aes:
+  # 接口密钥
+  apiKey: "T9ox2DCzpLfJIPzkH9pKhsOTMOEMJcFv"
+  # 网元主机密钥
+  hostKey: "AGT66VfY4SMaiT97a7df0aef1704d5c5"
+
 # 用户配置
 user:
   # 密码

src/framework/config/config/config.local.yaml

@@ -1,11 +1,11 @@
 # 应用服务配置
 server:
-  port: 3040
+  port: 33040
   proxy: true
 
 # 日志
 logger:
-  fileDir: "C:/usr/local/omc/log"
+  fileDir: "C:/var/log"
   level: 0 # 输出最低等级
 
 # 静态文件配置, 相对项目根路径或填绝对路径
@@ -28,11 +28,11 @@ gorm:
   dataSource:
     default:
       type: "mysql"
-      host: "192.168.0.229"
+      host: "127.0.0.1"
       port: 33066
       username: "root"
       password: "1000omc@kp!"
-      database: "omc_db_dev"
+      database: "omc_db"
       logging: true
 
 # Redis 缓存数据，数据源声明全小写
@@ -41,14 +41,14 @@ redis:
     # OMC系统使用库
     default:
       port: 6379 # Redis port
-      host: "192.168.0.229" # Redis host
+      host: "127.0.0.1" # Redis host
-      password: ""
+      password: "helloearth"
       db: 10 # Redis db_num
     # UDM网元用户库
     udmuser:
       port: 6379 # Redis port
-      host: "192.168.0.229"
+      host: "127.0.0.1"
-      password: ""
+      password: "helloearth"
       db: 0 # Redis db_num
   # 多个数据源时可以用这个指定默认的数据源
   defaultDataSourceName: "default"

src/framework/constants/result/result.go

@@ -8,8 +8,13 @@ const (
 	// 响应-msg错误失败
 	MSG_ERROR = "error"
 
-	// 响应-msg正常成功
-	CODE_SUCCESS = 1
 	// 响应-code正常成功
+	CODE_SUCCESS = 1
+	// 响应-msg正常成功
 	MSG_SUCCESS = "success"
+
+	// 响应-code加密数据
+	CODE_ENCRYPT = 2
+	// 响应-msg加密数据
+	MSG_ENCRYPT = "encrypt"
 )

src/framework/errorcatch/errorcatch.go

@@ -20,14 +20,14 @@ func ErrorCatch() gin.HandlerFunc {
 
 				// 返回错误响应给客户端
 				if config.Env() == "prod" {
-					c.JSON(500, result.ErrMsg("Internal Server Errors"))
+					c.JSON(500, result.CodeMsg(500, "Internal Server Errors"))
 				} else {
 					// 通过实现 error 接口的 Error() 方法自定义错误类型进行捕获
 					switch v := err.(type) {
 					case error:
-						c.JSON(500, result.ErrMsg(v.Error()))
+						c.JSON(500, result.CodeMsg(500, v.Error()))
 					default:
-						c.JSON(500, result.ErrMsg(fmt.Sprint(err)))
+						c.JSON(500, result.CodeMsg(500, fmt.Sprint(err)))
 					}
 				}
 

src/framework/i18n/i18n.go

@@ -26,7 +26,7 @@ func ClearLocaleData() {
 // LoadLocaleData 加载国际化数据
 func LoadLocaleData(language string) []localeItem {
 	dictType := fmt.Sprintf("i18n_%s", language)
-	dictTypeList := systemService.NewSysDictTypeImpl.DictDataCache(dictType)
+	dictTypeList := systemService.NewSysDictType.DictDataCache(dictType)
 	localeData := []localeItem{}
 	for _, v := range dictTypeList {
 		localeData = append(localeData, localeItem{
@@ -58,7 +58,7 @@ func UpdateKeyValue(language, key, value string) bool {
 	}
 
 	// 更新字典数据
-	sysDictDataService := systemService.NewSysDictDataImpl
+	sysDictDataService := systemService.NewSysDictData
 	item := sysDictDataService.SelectDictDataByCode(code)
 	if item.DictCode == code && item.DictLabel == key {
 		item.DictValue = value

src/framework/middleware/crypto_api.go

@@ -0,0 +1,151 @@
+package middleware
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"strings"
+
+	"be.ems/src/framework/config"
+	constResult "be.ems/src/framework/constants/result"
+	"be.ems/src/framework/logger"
+	"be.ems/src/framework/utils/crypto"
+	"be.ems/src/framework/utils/parse"
+	"github.com/gin-gonic/gin"
+)
+
+// CryptoApi 接口加解密
+//
+// 示例参数：middleware.CryptoApi(true, true)
+//
+// 参数表示：对请求解密，对响应加密
+//
+// 请将中间件放在最前置，对请求优先处理
+func CryptoApi(requestDecrypt, responseEncrypt bool) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		// 请求解密时对请求data注入
+		if requestDecrypt {
+			method := c.Request.Method
+			contentType := c.ContentType()
+			contentDe := ""
+			// 请求参数解析
+			if method == "GET" {
+				contentDe = c.Query("data")
+			} else if contentType == gin.MIMEJSON {
+				var body struct {
+					Data string `json:"data" binding:"required"`
+				}
+				if err := c.ShouldBindJSON(&body); err == nil {
+					contentDe = body.Data
+				}
+			}
+
+			// 是否存在data字段数据
+			if contentDe == "" {
+				c.JSON(400, map[string]any{
+					"code": constResult.CODE_ERROR,
+					"msg":  "decrypt not found field data",
+				})
+				c.Abort() // 停止执行后续的处理函数
+				return
+			}
+
+			// 解密-原数据加密前含16位长度iv
+			apiKey := config.Get("aes.apiKey").(string)
+			dataBodyStr, err := crypto.AESDecryptBase64(contentDe, apiKey)
+			if err != nil {
+				logger.Errorf("CryptoApi decrypt err => %v", err)
+				c.JSON(400, map[string]any{
+					"code": constResult.CODE_ERROR,
+					"msg":  "decrypted data could not be parsed",
+				})
+				c.Abort() // 停止执行后续的处理函数
+				return
+			}
+
+			// 分配回请求体
+			if method == "GET" {
+				var urlParams map[string]any
+				json.Unmarshal([]byte(dataBodyStr), &urlParams)
+				rawQuery := []string{}
+				for k, v := range urlParams {
+					rawQuery = append(rawQuery, fmt.Sprintf("%s=%v", k, v))
+				}
+				c.Request.URL.RawQuery = strings.Join(rawQuery, "&")
+			} else if contentType == gin.MIMEJSON {
+				c.Request.Body = io.NopCloser(bytes.NewBuffer([]byte(dataBodyStr)))
+			}
+		}
+
+		// 响应加密时替换原有的响应体
+		var rbw *replaceBodyWriter
+		if responseEncrypt {
+			rbw = &replaceBodyWriter{
+				body:           &bytes.Buffer{},
+				ResponseWriter: c.Writer,
+			}
+			c.Writer = rbw
+		}
+
+		// 调用下一个处理程序
+		c.Next()
+
+		// 响应加密时对响应data数据进行加密
+		if responseEncrypt {
+			// 满足成功并带数据的响应进行加密
+			if c.Writer.Status() == 200 {
+				var resBody map[string]any
+				json.Unmarshal(rbw.body.Bytes(), &resBody)
+				codeV, codeOk := resBody["code"]
+				dataV, dataOk := resBody["data"]
+				if codeOk && dataOk {
+					if parse.Number(codeV) == constResult.CODE_SUCCESS {
+						byteBodyData, _ := json.Marshal(dataV)
+						// 加密-原数据头加入标记16位长度iv终止符
+						apiKey := config.Get("aes.apiKey").(string)
+						contentEn, err := crypto.AESEncryptBase64("=:)"+string(byteBodyData), apiKey)
+						if err != nil {
+							logger.Errorf("CryptoApi encrypt err => %v", err)
+							rbw.ReplaceWrite([]byte(fmt.Sprintf(`{"code":"%d","msg":"encrypt err"}`, constResult.CODE_ERROR)))
+						} else {
+							// 响应加密
+							byteBody, _ := json.Marshal(map[string]any{
+								"code": constResult.CODE_ENCRYPT,
+								"msg":  constResult.MSG_ENCRYPT,
+								"data": contentEn,
+							})
+							rbw.ReplaceWrite(byteBody)
+						}
+					}
+				} else {
+					rbw.ReplaceWrite(nil)
+				}
+			} else {
+				rbw.ReplaceWrite(nil)
+			}
+		}
+		//
+	}
+}
+
+// replaceBodyWriter 替换默认的响应体
+type replaceBodyWriter struct {
+	gin.ResponseWriter
+	body *bytes.Buffer
+}
+
+// Write 写入响应体
+func (r replaceBodyWriter) Write(b []byte) (int, error) {
+	return r.body.Write(b)
+}
+
+// ReplaceWrite 替换响应体
+func (r *replaceBodyWriter) ReplaceWrite(b []byte) (int, error) {
+	if b == nil {
+		return r.ResponseWriter.Write(r.body.Bytes())
+	}
+	r.body = &bytes.Buffer{}
+	r.body.Write(b)
+	return r.ResponseWriter.Write(r.body.Bytes())
+}

src/framework/middleware/report.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"runtime"
 	"time"
 
 	"be.ems/src/framework/logger"
@@ -18,6 +19,10 @@ func Report() gin.HandlerFunc {
 
 		// 计算请求处理时间，并打印日志
 		duration := time.Since(start)
-		logger.Infof("%s %s report end=> %v", c.Request.Method, c.Request.RequestURI, duration)
+		// logger.Infof("%s %s report end=> %v", c.Request.Method, c.Request.RequestURI, duration)
+		// 获取当前活跃的goroutine数量
+		num := runtime.NumGoroutine()
+		// logger.Infof("当前活跃的goroutine数量 %d\n", num)
+		logger.Infof("\n访问接口 %s %s\n总耗时 %v\n当前活跃的goroutine数量 %d\n", c.Request.Method, c.Request.RequestURI, duration, num)
 	}
 }

src/framework/redis/conn.go

@@ -0,0 +1,61 @@
+package redis
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/redis/go-redis/v9"
+)
+
+// ConnRedis 连接redis对象
+type ConnRedis struct {
+	Addr     string `json:"addr"`     //  地址
+	Port     int64  `json:"port"`     // 端口
+	User     string `json:"user"`     //  用户名
+	Password string `json:"password"` // 认证密码
+	Database int    `json:"database"` // 数据库名称
+
+	DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开
+
+	Client *redis.Client `json:"client"`
+}
+
+// NewClient 创建Redis客户端
+func (c *ConnRedis) NewClient() (*ConnRedis, error) {
+	// IPV6地址协议
+	if strings.Contains(c.Addr, ":") {
+		c.Addr = fmt.Sprintf("[%s]", c.Addr)
+	}
+	addr := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+
+	// 默认等待5s
+	if c.DialTimeOut == 0 {
+		c.DialTimeOut = 5 * time.Second
+	}
+
+	// 连接
+	rdb := redis.NewClient(&redis.Options{
+		Addr: addr,
+		// Username:    c.User,
+		Password:    c.Password,
+		DB:          c.Database,
+		DialTimeout: c.DialTimeOut,
+	})
+
+	// 测试数据库连接
+	if _, err := rdb.Ping(context.Background()).Result(); err != nil {
+		return nil, err
+	}
+
+	c.Client = rdb
+	return c, nil
+}
+
+// Close 关闭当前Redis客户端
+func (c *ConnRedis) Close() {
+	if c.Client != nil {
+		c.Client.Close()
+	}
+}

src/framework/redis/redis.go

@@ -30,6 +30,15 @@ if tonumber(current) == 1 then
 end
 return tonumber(current);`)
 
+// 连接Redis实例
+func ConnectPush(source string, rdb *redis.Client) {
+	if rdb == nil {
+		delete(rdbMap, source)
+		return
+	}
+	rdbMap[source] = rdb
+}
+
 // 连接Redis实例
 func Connect() {
 	ctx := context.Background()
@@ -184,7 +193,7 @@ func GetKeys(source string, pattern string) ([]string, error) {
 	// 循环遍历获取匹配的键
 	for {
 		// 使用 SCAN 命令获取匹配的键
-		batchKeys, nextCursor, err := rdb.Scan(ctx, cursor, pattern, 100).Result()
+		batchKeys, nextCursor, err := rdb.Scan(ctx, cursor, pattern, 1000).Result()
 		if err != nil {
 			logger.Errorf("Failed to scan keys: %v", err)
 			return keys, err

src/framework/socket/tcp_client.go

@@ -0,0 +1,96 @@
+package socket
+
+import (
+	"bytes"
+	"fmt"
+	"net"
+	"strings"
+	"time"
+)
+
+// ConnTCP 连接TCP客户端
+type ConnTCP struct {
+	Addr string `json:"addr"` // 主机地址
+	Port int64  `json:"port"` // 端口
+
+	DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开
+
+	Client     *net.Conn `json:"client"`
+	LastResult string    `json:"lastResult"` // 记最后一次发送消息的结果
+}
+
+// New 创建TCP客户端
+func (c *ConnTCP) New() (*ConnTCP, error) {
+	// IPV6地址协议
+	proto := "tcp"
+	if strings.Contains(c.Addr, ":") {
+		proto = "tcp6"
+		c.Addr = fmt.Sprintf("[%s]", c.Addr)
+	}
+	address := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+
+	// 默认等待5s
+	if c.DialTimeOut == 0 {
+		c.DialTimeOut = 5 * time.Second
+	}
+
+	// 连接到服务端
+	client, err := net.DialTimeout(proto, address, c.DialTimeOut)
+	if err != nil {
+		return nil, err
+	}
+
+	c.Client = &client
+	return c, nil
+}
+
+// Close 关闭当前TCP客户端
+func (c *ConnTCP) Close() {
+	if c.Client != nil {
+		(*c.Client).Close()
+	}
+}
+
+// Send 发送消息
+func (c *ConnTCP) Send(msg []byte, timer time.Duration) (string, error) {
+	if c.Client == nil {
+		return "", fmt.Errorf("tcp client not connected")
+	}
+	conn := *c.Client
+
+	// 写入信息
+	if len(msg) > 0 {
+		if _, err := conn.Write(msg); err != nil {
+			return "", err
+		}
+	}
+
+	var buf bytes.Buffer
+	defer buf.Reset()
+
+	tmp := make([]byte, 1024)
+	for {
+		select {
+		case <-time.After(timer):
+			c.LastResult = buf.String()
+			return c.LastResult, fmt.Errorf("timeout")
+		default:
+			// 读取命令消息
+			n, err := conn.Read(tmp)
+			if n == 0 || err != nil {
+				tmp = nil
+				break
+			}
+
+			tmpStr := string(tmp[:n])
+			buf.WriteString(tmpStr)
+
+			// 是否有终止符
+			if strings.HasSuffix(tmpStr, ">") || strings.HasSuffix(tmpStr, "> ") || strings.HasSuffix(tmpStr, "# ") {
+				tmp = nil
+				c.LastResult = buf.String()
+				return c.LastResult, nil
+			}
+		}
+	}
+}

src/framework/socket/tcp_server.go

@@ -0,0 +1,77 @@
+package socket
+
+import (
+	"fmt"
+	"net"
+	"strings"
+
+	"be.ems/src/framework/logger"
+)
+
+// SocketTCP TCP服务端
+type SocketTCP struct {
+	Addr     string           `json:"addr"` // 主机地址
+	Port     int64            `json:"port"` // 端口
+	Listener *net.TCPListener `json:"listener"`
+	StopChan chan struct{}    `json:"stop"` // 停止信号
+}
+
+// New 创建TCP服务端
+func (s *SocketTCP) New() (*SocketTCP, error) {
+	// IPV6地址协议
+	proto := "tcp"
+	if strings.Contains(s.Addr, ":") {
+		proto = "tcp6"
+		s.Addr = fmt.Sprintf("[%s]", s.Addr)
+	}
+	address := fmt.Sprintf("%s:%d", s.Addr, s.Port)
+
+	// 解析 TCP 地址
+	tcpAddr, err := net.ResolveTCPAddr(proto, address)
+	if err != nil {
+		return nil, err
+	}
+
+	// 监听 TCP 地址
+	listener, err := net.ListenTCP(proto, tcpAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	s.Listener = listener
+	s.StopChan = make(chan struct{}, 1)
+	return s, nil
+}
+
+// Close 关闭当前TCP服务端
+func (s *SocketTCP) Close() {
+	if s.Listener != nil {
+		s.StopChan <- struct{}{}
+		(*s.Listener).Close()
+	}
+}
+
+// Resolve 处理消息
+func (s *SocketTCP) Resolve(callback func(conn *net.Conn, err error)) {
+	if s.Listener == nil {
+		callback(nil, fmt.Errorf("tcp service not created"))
+		return
+	}
+	listener := *s.Listener
+
+	for {
+		select {
+		case <-s.StopChan:
+			callback(nil, fmt.Errorf("udp service stop"))
+			return
+		default:
+			conn, err := listener.Accept()
+			if err != nil {
+				logger.Errorf("Error accepting connection: %v ", err)
+				continue
+			}
+			defer conn.Close()
+			callback(&conn, nil)
+		}
+	}
+}

src/framework/socket/udp_client.go

@@ -0,0 +1,96 @@
+package socket
+
+import (
+	"bytes"
+	"fmt"
+	"net"
+	"strings"
+	"time"
+)
+
+// ConnUDP 连接UDP客户端
+type ConnUDP struct {
+	Addr string `json:"addr"` // 主机地址
+	Port int64  `json:"port"` // 端口
+
+	DialTimeOut time.Duration `json:"dialTimeOut"` // 连接超时断开
+
+	Client     *net.Conn `json:"client"`
+	LastResult string    `json:"lastResult"` // 记最后一次发送消息的结果
+}
+
+// New 创建UDP客户端
+func (c *ConnUDP) New() (*ConnUDP, error) {
+	// IPV6地址协议
+	proto := "udp"
+	if strings.Contains(c.Addr, ":") {
+		proto = "udp6"
+		c.Addr = fmt.Sprintf("[%s]", c.Addr)
+	}
+	address := fmt.Sprintf("%s:%d", c.Addr, c.Port)
+
+	// 默认等待5s
+	if c.DialTimeOut == 0 {
+		c.DialTimeOut = 5 * time.Second
+	}
+
+	// 连接到服务端
+	client, err := net.DialTimeout(proto, address, c.DialTimeOut)
+	if err != nil {
+		return nil, err
+	}
+
+	c.Client = &client
+	return c, nil
+}
+
+// Close 关闭当前UDP客户端
+func (c *ConnUDP) Close() {
+	if c.Client != nil {
+		(*c.Client).Close()
+	}
+}
+
+// Send 发送消息
+func (c *ConnUDP) Send(msg []byte, ms int) (string, error) {
+	if c.Client == nil {
+		return "", fmt.Errorf("udp client not connected")
+	}
+	conn := *c.Client
+
+	// 写入信息
+	if len(msg) > 0 {
+		if _, err := conn.Write(msg); err != nil {
+			return "", err
+		}
+	}
+
+	var buf bytes.Buffer
+	defer buf.Reset()
+
+	tmp := make([]byte, 1024)
+	for {
+		select {
+		case <-time.After(time.Duration(time.Duration(ms).Milliseconds())):
+			c.LastResult = buf.String()
+			return c.LastResult, fmt.Errorf("timeout")
+		default:
+			// 读取命令消息
+			n, err := conn.Read(tmp)
+			if n == 0 || err != nil {
+				tmp = nil
+				break
+			}
+
+			tmpStr := string(tmp[:n])
+			buf.WriteString(tmpStr)
+
+			// 是否有终止符
+			if strings.HasSuffix(tmpStr, ">") || strings.HasSuffix(tmpStr, "> ") || strings.HasSuffix(tmpStr, "# ") {
+				tmp = nil
+				c.LastResult = buf.String()
+				return c.LastResult, nil
+			}
+		}
+	}
+}

src/framework/socket/udp_server.go

@@ -0,0 +1,67 @@
+package socket
+
+import (
+	"fmt"
+	"net"
+	"strings"
+)
+
+// SocketUDP UDP服务端
+type SocketUDP struct {
+	Addr     string        `json:"addr"` // 主机地址
+	Port     int64         `json:"port"` // 端口
+	Conn     *net.UDPConn  `json:"conn"`
+	StopChan chan struct{} `json:"stop"` // 停止信号
+}
+
+// New 创建UDP服务端
+func (s *SocketUDP) New() (*SocketUDP, error) {
+	// IPV6地址协议
+	proto := "udp"
+	if strings.Contains(s.Addr, ":") {
+		proto = "udp6"
+		s.Addr = fmt.Sprintf("[%s]", s.Addr)
+	}
+	address := fmt.Sprintf("%s:%d", s.Addr, s.Port)
+
+	// 解析 UDP 地址
+	udpAddr, err := net.ResolveUDPAddr(proto, address)
+	if err != nil {
+		return nil, err
+	}
+
+	// 监听 UDP 地址
+	conn, err := net.ListenUDP("udp", udpAddr)
+	if err != nil {
+		return nil, err
+	}
+
+	s.Conn = conn
+	s.StopChan = make(chan struct{}, 1)
+	return s, nil
+}
+
+// CloseService 关闭当前UDP服务端
+func (s *SocketUDP) Close() {
+	if s.Conn != nil {
+		s.StopChan <- struct{}{}
+		(*s.Conn).Close()
+	}
+}
+
+// Resolve 处理消息
+func (s *SocketUDP) Resolve(callback func(*net.UDPConn, error)) {
+	if s.Conn == nil {
+		callback(nil, fmt.Errorf("udp service not created"))
+		return
+	}
+
+	for {
+		select {
+		case <-s.StopChan:
+			callback(nil, fmt.Errorf("udp service not created"))
+		default:
+			callback(s.Conn, nil)
+		}
+	}
+}

src/framework/telnet/telnet.go

@@ -52,9 +52,6 @@ func (c *ConnTelnet) NewClient() (*ConnTelnet, error) {
 
 	c.Client = &client
 
-	// 调整窗口大小 (120 列 x 128 行)
-	requestPty(c.Client, 120, 128)
-
 	// 排空连接登录的信息
 	c.RunCMD("")
 	return c, nil
@@ -111,20 +108,9 @@ func (c *ConnTelnet) NewClientSession(cols, rows int) (*TelnetClientSession, err
 	if c.Client == nil {
 		return nil, fmt.Errorf("telnet client not connected")
 	}
-	requestPty(c.Client, cols, rows)
+	s := &TelnetClientSession{
-	return &TelnetClientSession{
 		Client: *c.Client,
-	}, nil
-}
-
-// requestPty 调整终端窗口大小
-func requestPty(client *net.Conn, cols, rows int) error {
-	if client == nil {
-		return fmt.Errorf("telnet client not connected")
 	}
-	conn := *client
+	// s.WindowChange(cols, rows)
-	// 需要确保接收方理解并正确处理发送窗口大小设置命令
+	return s, nil
-	conn.Write([]byte{255, 251, 31})
-	conn.Write([]byte{255, 250, 31, byte(cols >> 8), byte(cols & 0xFF), byte(rows >> 8), byte(rows & 0xFF), 255, 240})
-	return nil
 }

src/framework/telnet/telnet_session.go

@@ -19,6 +19,17 @@ func (s *TelnetClientSession) Close() {
 	}
 }
 
+// WindowChange informs the remote host about a terminal window dimension change to h rows and w columns.
+func (s *TelnetClientSession) WindowChange(h, w int) error {
+	if s.Client == nil {
+		return fmt.Errorf("client is nil to content write failed")
+	}
+	// 需要确保接收方理解并正确处理发送窗口大小设置命令
+	s.Client.Write([]byte{255, 251, 31})
+	s.Client.Write([]byte{255, 250, 31, byte(w >> 8), byte(w & 0xFF), byte(h >> 8), byte(h & 0xFF), 255, 240})
+	return nil
+}
+
 // Write 写入命令 不带回车(\n)也会执行根据客户端情况
 func (s *TelnetClientSession) Write(cmd string) (int, error) {
 	if s.Client == nil {
@@ -36,11 +47,11 @@ func (s *TelnetClientSession) Read() []byte {
 	buf := make([]byte, 1024)
 	// 设置读取超时时间为100毫秒
 	s.Client.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
-	_, err := s.Client.Read(buf)
+	n, err := s.Client.Read(buf)
 	if err != nil {
 		return []byte{}
 	}
-	return buf
+	return buf[:n]
 }
 
 // CombinedOutput 发送命令带结果返回

src/framework/utils/crypto/aes.go

@@ -10,12 +10,12 @@ import (
 	"io"
 )
 
-// StringEncryptByAES 字符串AES加密
+// AESEncryptBase64 AES加密转Base64字符串
-func StringEncryptByAES(text string) (string, error) {
+func AESEncryptBase64(text, key string) (string, error) {
 	if len(text) == 0 {
 		return "", nil
 	}
-	xpass, err := aesEncryptWithSalt([]byte(text))
+	xpass, err := AESEncrypt([]byte(text), []byte(key))
 	if err != nil {
 		return "", err
 	}
@@ -23,8 +23,8 @@ func StringEncryptByAES(text string) (string, error) {
 	return pass64, nil
 }
 
-// StringDecryptByAES 字符串AES解密
+// AESDecryptBase64 AES解密解Base64字符串
-func StringDecryptByAES(text string) (string, error) {
+func AESDecryptBase64(text, key string) (string, error) {
 	if len(text) == 0 {
 		return "", nil
 	}
@@ -32,21 +32,16 @@ func StringDecryptByAES(text string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-
+	tpass, err := AESDecrypt(bytesPass, []byte(key))
-	tpass, err := aesDecryptWithSalt(bytesPass)
 	if err != nil {
 		return "", err
 	}
 	return string(tpass), nil
 }
 
-// aesKey 字符串AES加解密密钥
+// AESEncrypt AES加密
-const aesKey = "AGT66VfY4SMaiT97a7df0aef1704d5c5"
+func AESEncrypt(plaintext, aeskey []byte) ([]byte, error) {
-
+	block, err := aes.NewCipher(aeskey)
-// const aesKey = "AGT66VfY4SMaiT97"
-// aesEncryptWithSalt AES加密
-func aesEncryptWithSalt(plaintext []byte) ([]byte, error) {
-	block, err := aes.NewCipher([]byte(aesKey))
 	if err != nil {
 		return nil, err
 	}
@@ -68,8 +63,8 @@ func aesEncryptWithSalt(plaintext []byte) ([]byte, error) {
 	return ciphertext, nil
 }
 
-// aesDecryptWithSalt AES解密
+// AESDecrypt AES解密
-func aesDecryptWithSalt(ciphertext []byte) ([]byte, error) {
+func AESDecrypt(ciphertext, aeskey []byte) ([]byte, error) {
 	blockSize := aes.BlockSize
 	if len(ciphertext) < blockSize {
 		return nil, fmt.Errorf("ciphertext too short")
@@ -77,12 +72,14 @@ func aesDecryptWithSalt(ciphertext []byte) ([]byte, error) {
 
 	iv := ciphertext[:blockSize]
 	ciphertext = ciphertext[blockSize:]
+	block, err := aes.NewCipher([]byte(aeskey))
 
-	block, err := aes.NewCipher([]byte(aesKey))
 	if err != nil {
 		return nil, err
 	}
-
+	if len(ciphertext) == 0 {
+		return nil, fmt.Errorf("ciphertext is invalid")
+	}
 	if len(ciphertext)%blockSize != 0 {
 		return nil, fmt.Errorf("ciphertext is not a multiple of the block size")
 	}

src/framework/utils/ctx/ctx.go

@@ -14,7 +14,6 @@ import (
 	"golang.org/x/text/language"
 
 	"github.com/gin-gonic/gin"
-	"github.com/gin-gonic/gin/binding"
 )
 
 // QueryMap 查询参数转换Map
@@ -30,7 +29,7 @@ func QueryMap(c *gin.Context) map[string]any {
 // BodyJSONMap JSON参数转换Map
 func BodyJSONMap(c *gin.Context) map[string]any {
 	params := make(map[string]any)
-	c.ShouldBindBodyWith(&params, binding.JSON)
+	c.ShouldBindBodyWithJSON(&params)
 	return params
 }
 
@@ -39,7 +38,7 @@ func RequestParamsMap(c *gin.Context) map[string]any {
 	params := make(map[string]any)
 	// json
 	if strings.HasPrefix(c.ContentType(), "application/json") {
-		c.ShouldBindBodyWith(&params, binding.JSON)
+		c.ShouldBindBodyWithJSON(&params)
 	}
 
 	// 表单

src/framework/utils/fetch/fetch.go

@@ -87,7 +87,7 @@ func Post(url string, data url.Values, headers map[string]string) ([]byte, error
 // PostJSON 发送 POST 请求，并将请求体序列化为 JSON 格式
 func PostJSON(url string, data any, headers map[string]string) ([]byte, error) {
 	client := &http.Client{
-		Timeout: 3 * time.Second, // 超时时间
+		Timeout: 10 * time.Second, // 超时时间
 	}
 
 	jsonData, err := json.Marshal(data)
@@ -180,7 +180,7 @@ func PostUploadFile(url string, params map[string]string, file *os.File) ([]byte
 // PutJSON 发送 PUT 请求，并将请求体序列化为 JSON 格式
 func PutJSON(url string, data any, headers map[string]string) ([]byte, error) {
 	client := &http.Client{
-		Timeout: 3 * time.Second, // 超时时间
+		Timeout: 10 * time.Second, // 超时时间
 	}
 
 	jsonData, err := json.Marshal(data)

src/framework/utils/file/csv.go

@@ -16,13 +16,9 @@ import (
 // data = append(data, []string{"1", "2", "3"})
 // err := file.WriterCSVFile(data, filePath)
 func WriterFileCSV(data [][]string, filePath string) error {
-	// 获取文件所在的目录路径
+	// 创建本地输出目录
-	dirPath := filepath.Dir(filePath)
+	if err := os.MkdirAll(filepath.Dir(filePath), 0775); err != nil {
-
+		return err
-	// 确保文件夹路径存在
-	err := os.MkdirAll(dirPath, 0775)
-	if err != nil {
-		logger.Errorf("MkdirAll dir %v", err)
 	}
 
 	// 创建或打开文件

src/framework/utils/file/file.go

@@ -351,5 +351,6 @@ func ParseUploadFileDir(subPath string) string {
 // filePath 上传文件路径
 func ParseUploadFilePath(filePath string) string {
 	prefix, dir := resourceUpload()
-	return strings.Replace(filePath, prefix, dir, 1)
+	absPath := strings.Replace(filePath, prefix, dir, 1)
+	return filepath.ToSlash(absPath)
 }

src/framework/utils/file/tar.go

@@ -0,0 +1,76 @@
+package file
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"io"
+	"os"
+	"path/filepath"
+)
+
+// CompressTarGZByDir 将目录下文件添加到 tar.gz 压缩文件
+func CompressTarGZByDir(zipFilePath, dirPath string) error {
+	// 创建本地输出目录
+	if err := os.MkdirAll(filepath.Dir(zipFilePath), 0775); err != nil {
+		return err
+	}
+
+	// 创建输出文件
+	tarFile, err := os.Create(zipFilePath)
+	if err != nil {
+		return err
+	}
+	defer tarFile.Close()
+
+	gw := gzip.NewWriter(tarFile)
+	defer gw.Close()
+
+	tw := tar.NewWriter(gw)
+	defer tw.Close()
+
+	// 遍历目录下的所有文件和子目录
+	err = filepath.Walk(dirPath, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		// 忽略目录
+		if info.IsDir() {
+			return nil
+		}
+
+		// 创建文件条目
+		header, err := tar.FileInfoHeader(info, "")
+		if err != nil {
+			return err
+		}
+		relPath, err := filepath.Rel(dirPath, path)
+		if err != nil {
+			return err
+		}
+		header.Name = relPath
+		if err := tw.WriteHeader(header); err != nil {
+			return err
+		}
+		if !info.Mode().IsRegular() {
+			return nil
+		}
+
+		// 打开文件
+		file, err := os.Open(path)
+		if err != nil {
+			return err
+		}
+		defer file.Close()
+
+		// 写入文件内容
+		_, err = io.Copy(tw, file)
+		if err != nil {
+			return err
+		}
+
+		return nil
+	})
+
+	return err
+}

src/framework/utils/file/zip.go

@@ -8,6 +8,55 @@ import (
 	"path/filepath"
 )
 
+// UnZip 解 ZIP 压缩文件输出到目录下
+func UnZip(zipFilePath, dirPath string) error {
+	// 打开ZIP文件进行读取
+	r, err := zip.OpenReader(zipFilePath)
+	if err != nil {
+		return err
+	}
+	defer r.Close()
+
+	// 创建本地输出目录
+	if err := os.MkdirAll(dirPath, 0775); err != nil {
+		return err
+	}
+
+	// 遍历ZIP文件中的每个文件并解压缩到输出目录
+	for _, f := range r.File {
+		// 打开ZIP文件中的文件
+		rc, err := f.Open()
+		if err != nil {
+			return err
+		}
+		defer rc.Close()
+
+		// 创建解压后的文件
+		path := filepath.ToSlash(filepath.Join(dirPath, f.Name))
+		if f.FileInfo().IsDir() {
+			// 如果是目录，创建目录
+			if err := os.MkdirAll(path, 0775); err != nil {
+				return err
+			}
+		} else {
+			if err = os.MkdirAll(filepath.Dir(path), 0775); err != nil {
+				return err
+			}
+			out, err := os.Create(path)
+			if err != nil {
+				return err
+			}
+			defer out.Close()
+
+			if _, err = io.Copy(out, rc); err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
 // CompressZipByFile 将单文件添加到 ZIP 压缩文件
 func CompressZipByFile(zipFilePath, filePath string) error {
 	// 创建一个新的 ZIP 文件
@@ -59,6 +108,11 @@ func CompressZipByFile(zipFilePath, filePath string) error {
 
 // CompressZipByDir 将目录下文件添加到 ZIP 压缩文件
 func CompressZipByDir(zipFilePath, dirPath string) error {
+	// 创建本地输出目录
+	if err := os.MkdirAll(filepath.Dir(zipFilePath), 0775); err != nil {
+		return err
+	}
+
 	// 创建输出文件
 	zipWriter, err := os.Create(zipFilePath)
 	if err != nil {

src/framework/utils/machine/launch.go

@@ -8,6 +8,7 @@ import (
 	"runtime"
 	"time"
 
+	"be.ems/src/framework/config"
 	"be.ems/src/framework/constants/common"
 	"be.ems/src/framework/logger"
 	"be.ems/src/framework/utils/cmd"
@@ -68,7 +69,8 @@ func codeFileRead() (map[string]any, error) {
 	}
 	content := string(bytes)
 	// 解密
-	contentDe, err := crypto.StringDecryptByAES(content)
+	hostKey := config.Get("aes.hostKey").(string)
+	contentDe, err := crypto.AESDecryptBase64(content, hostKey)
 	if err != nil {
 		logger.Errorf("CodeFileRead decrypt: %v", err.Error())
 		return mapData, fmt.Errorf("decrypt fail")
@@ -76,7 +78,7 @@ func codeFileRead() (map[string]any, error) {
 	// 序列化Map
 	mapData, err = parse.ConvertConfigToMap("json", string(contentDe))
 	if err != nil {
-		logger.Warnf("NeConfPara5GRead ConvertConfigToMap => %s", err.Error())
+		logger.Warnf("CodeFileRead ConvertConfigToMap => %s", err.Error())
 		return mapData, fmt.Errorf("content error")
 	}
 	return mapData, nil
@@ -86,7 +88,8 @@ func codeFileRead() (map[string]any, error) {
 func codeFileWrite(data map[string]any) error {
 	jsonByte, _ := json.Marshal(data)
 	// 加密
-	contentEn, err := crypto.StringEncryptByAES(string(jsonByte))
+	hostKey := config.Get("aes.hostKey").(string)
+	contentEn, err := crypto.AESEncryptBase64(string(jsonByte), hostKey)
 	if err != nil {
 		logger.Errorf("insert encrypt: %v", err.Error())
 		return fmt.Errorf("encrypt fail")
@@ -160,7 +163,7 @@ func Reset() error {
 		// return fmt.Errorf("not support window")
 	} else {
 		// 重置数据库
-		if _, err := cmd.Execf("sudo /usr/local/omc/bin/setomc.sh -m install"); err != nil {
+		if _, err := cmd.Execf("/usr/local/omc/bin/setomc.sh -m install"); err != nil {
 			return err
 		}
 		// 重启服务

src/framework/utils/parse/parse.go

@@ -17,46 +17,53 @@ import (
 )
 
 // Number 解析数值型
-func Number(str any) int64 {
+func Number(value any) int64 {
-	switch str := str.(type) {
+	switch v := value.(type) {
 	case string:
-		if str == "" {
+		if v == "" {
 			return 0
 		}
-		num, err := strconv.ParseInt(str, 10, 64)
+		num, err := strconv.ParseInt(v, 10, 64)
 		if err != nil {
 			return 0
 		}
 		return num
-	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+	case int, int8, int16, int32, int64:
-		return reflect.ValueOf(str).Int()
+		return reflect.ValueOf(v).Int()
+	case uint, uint8, uint16, uint32, uint64:
+		return int64(reflect.ValueOf(v).Uint())
 	case float32, float64:
-		return int64(reflect.ValueOf(str).Float())
+		return int64(reflect.ValueOf(v).Float())
+	case bool:
+		if v {
+			return 1
+		}
+		return 0
 	default:
 		return 0
 	}
 }
 
 // Boolean 解析布尔型
-func Boolean(str any) bool {
+func Boolean(value any) bool {
-	switch str := str.(type) {
+	switch v := value.(type) {
 	case string:
-		if str == "" || str == "false" || str == "0" {
+		b, err := strconv.ParseBool(v)
+		if err != nil {
 			return false
 		}
-		// 尝试将字符串解析为数字
+		return b
-		if num, err := strconv.ParseFloat(str, 64); err == nil {
+	case int, int8, int16, int32, int64:
-			return num != 0
+		num := reflect.ValueOf(v).Int()
-		}
+		return num != 0
-		return true
+	case uint, uint8, uint16, uint32, uint64:
-	case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64:
+		num := int64(reflect.ValueOf(v).Uint())
-		num := reflect.ValueOf(str).Int()
 		return num != 0
 	case float32, float64:
-		num := reflect.ValueOf(str).Float()
+		num := reflect.ValueOf(v).Float()
 		return num != 0
 	case bool:
-		return str
+		return v
 	default:
 		return false
 	}

src/framework/utils/ssh/files.go

@@ -24,9 +24,8 @@ type FileListRow struct {
 // 文件列表
 // search 文件名后模糊*
 //
-// return 目录大小，行记录，异常
+// return 行记录，异常
-func FileList(sshClient *ConnSSH, path, search string) (string, []FileListRow, error) {
+func FileList(sshClient *ConnSSH, path, search string) ([]FileListRow, error) {
-	totalSize := ""
 	var rows []FileListRow
 	rowStr := ""
 
@@ -35,40 +34,37 @@ func FileList(sshClient *ConnSSH, path, search string) (string, []FileListRow, e
 	if search != "" {
 		searchStr = search + searchStr
 	}
-	cmdStr := fmt.Sprintf("cd %s && ls -lthd --time-style=+%%s %s", path, searchStr)
+	// cd /var/log && find. -maxdepth 1 -name'mme*' -exec ls -lthd --time-style=+%s {} +
+	cmdStr := fmt.Sprintf("cd %s && find . -maxdepth 1 -name '%s' -exec ls -lthd --time-style=+%%s {} +", path, searchStr)
+	// cd /var/log && ls -lthd --time-style=+%s mme*
+	// cmdStr := fmt.Sprintf("cd %s && ls -lthd --time-style=+%%s %s", path, searchStr)
 
 	// 是否远程客户端读取
 	if sshClient == nil {
 		resultStr, err := cmd.Execf(cmdStr)
 		if err != nil {
 			logger.Errorf("Ne FileList Path: %s, Search: %s, Error:%s", path, search, err.Error())
-			return totalSize, rows, err
+			return rows, err
 		}
 		rowStr = resultStr
 	} else {
 		resultStr, err := sshClient.RunCMD(cmdStr)
 		if err != nil {
 			logger.Errorf("Ne FileList Path: %s, Search: %s, Error:%s", path, search, err.Error())
-			return totalSize, rows, err
+			return rows, err
 		}
 		rowStr = resultStr
 	}
 
 	// 遍历组装
 	rowStrList := strings.Split(rowStr, "\n")
-	for i, rowStr := range rowStrList {
+	for _, rowStr := range rowStrList {
 		if rowStr == "" {
 			continue
 		}
 		// 使用空格对字符串进行切割
 		fields := strings.Fields(rowStr)
 
-		// 无查询过滤会有total总计
-		if i == 0 && searchStr == "" {
-			totalSize = fields[1]
-			continue
-		}
-
 		// 拆分不足7位跳过
 		if len(fields) != 7 {
 			continue
@@ -83,6 +79,14 @@ func FileList(sshClient *ConnSSH, path, search string) (string, []FileListRow, e
 			fileType = "symlink"
 		}
 
+		// 文件名
+		fileName := fields[6]
+		if fileName == "." {
+			continue
+		} else if strings.HasPrefix(fileName, "./") {
+			fileName = strings.TrimPrefix(fileName, "./")
+		}
+
 		// 提取各个字段的值
 		rows = append(rows, FileListRow{
 			FileMode:     fileMode,
@@ -92,8 +96,8 @@ func FileList(sshClient *ConnSSH, path, search string) (string, []FileListRow, e
 			Group:        fields[3],
 			Size:         fields[4],
 			ModifiedTime: parse.Number(fields[5]),
-			FileName:     fields[6],
+			FileName:     fileName,
 		})
 	}
-	return totalSize, rows, nil
+	return rows, nil
 }

src/framework/utils/ssh/sftp.go

@@ -23,6 +23,13 @@ func (s *SSHClientSFTP) Close() {
 
 // CopyDirRemoteToLocal 复制目录-远程到本地
 func (s *SSHClientSFTP) CopyDirRemoteToLocal(remoteDir, localDir string) error {
+	// 创建本地目录
+	err := os.MkdirAll(localDir, 0775)
+	if err != nil {
+		logger.Errorf("CopyDirRemoteToLocal failed to creating local directory %s: => %s", localDir, err.Error())
+		return err
+	}
+
 	// 列出远程目录中的文件和子目录
 	remoteFiles, err := s.Client.ReadDir(remoteDir)
 	if err != nil {
@@ -30,17 +37,10 @@ func (s *SSHClientSFTP) CopyDirRemoteToLocal(remoteDir, localDir string) error {
 		return err
 	}
 
-	// 创建本地目录
-	err = os.MkdirAll(localDir, 0775)
-	if err != nil {
-		logger.Errorf("CopyDirRemoteToLocal failed to creating local directory %s: => %s", localDir, err.Error())
-		return err
-	}
-
 	// 遍历远程文件和子目录并复制到本地
 	for _, remoteFile := range remoteFiles {
-		remotePath := filepath.Join(remoteDir, remoteFile.Name())
+		remotePath := filepath.ToSlash(filepath.Join(remoteDir, remoteFile.Name()))
-		localPath := filepath.Join(localDir, remoteFile.Name())
+		localPath := filepath.ToSlash(filepath.Join(localDir, remoteFile.Name()))
 
 		if remoteFile.IsDir() {
 			// 如果是子目录，则递归复制子目录
@@ -51,89 +51,55 @@ func (s *SSHClientSFTP) CopyDirRemoteToLocal(remoteDir, localDir string) error {
 			}
 		} else {
 			// 如果是文件，则复制文件内容
-			remoteFile, err := s.Client.Open(remotePath)
+			if err := s.CopyFileRemoteToLocal(remotePath, localPath); err != nil {
-			if err != nil {
 				logger.Errorf("CopyDirRemoteToLocal failed to opening remote file %s: => %s", remotePath, err.Error())
 				continue
 			}
-			defer remoteFile.Close()
-
-			localFile, err := os.Create(localPath)
-			if err != nil {
-				logger.Errorf("CopyDirRemoteToLocal failed to creating local file %s: => %s", localPath, err.Error())
-				continue
-			}
-			defer localFile.Close()
-
-			_, err = io.Copy(localFile, remoteFile)
-			if err != nil {
-				logger.Errorf("CopyDirRemoteToLocal failed to copying file contents from %s to %s: => %s", remotePath, localPath, err.Error())
-				continue
-			}
 		}
 	}
 	return nil
 }
 
-// CopyDirRemoteToLocal 复制目录-本地到远程
+// CopyDirLocalToRemote 复制目录-本地到远程
 func (s *SSHClientSFTP) CopyDirLocalToRemote(localDir, remoteDir string) error {
-	// 创建远程目录
-	err := s.Client.MkdirAll(remoteDir)
-	if err != nil {
-		logger.Errorf("CopyDirLocalToRemote failed to creating remote directory %s: => %s", remoteDir, err.Error())
-		return err
-	}
-
 	// 遍历本地目录中的文件和子目录并复制到远程
-	err = filepath.Walk(localDir, func(localPath string, info os.FileInfo, err error) error {
+	err := filepath.Walk(localDir, func(localPath string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 
 		// 生成远程路径
-		remotePath := filepath.Join(remoteDir, localPath[len(localDir):])
+		remotePath := filepath.ToSlash(filepath.Join(remoteDir, localPath[len(localDir):]))
 
 		if info.IsDir() {
 			// 如果是子目录，则创建远程目录
-			err := s.Client.MkdirAll(remotePath)
+			if err := s.Client.MkdirAll(remotePath); err != nil {
-			if err != nil {
 				logger.Errorf("CopyDirLocalToRemote failed to creating remote directory %s: => %s", remotePath, err.Error())
-				return nil
+				return err
 			}
 		} else {
 			// 如果是文件，则复制文件内容
-			localFile, err := os.Open(localPath)
+			if err := s.CopyFileLocalToRemote(localPath, remotePath); err != nil {
-			if err != nil {
+				logger.Errorf("CopyDirLocalToRemote failed to copying remote file %s: => %s", localPath, err.Error())
-				logger.Errorf("CopyDirLocalToRemote failed to opening local file %s: => %s", localPath, err.Error())
+				return err
-				return nil
-			}
-			defer localFile.Close()
-
-			remoteFile, err := s.Client.Create(remotePath)
-			if err != nil {
-				logger.Errorf("CopyDirLocalToRemote failed to creating remote file %s: => %s", remotePath, err.Error())
-				return nil
-			}
-			defer remoteFile.Close()
-
-			_, err = io.Copy(remoteFile, localFile)
-			if err != nil {
-				logger.Errorf("CopyDirLocalToRemote failed to copying file contents from %s to %s: => %s", localPath, remotePath, err.Error())
-				return nil
 			}
 		}
 
 		return nil
 	})
 	if err != nil {
-		logger.Errorf("CopyDirLocalToRemote failed to walking local directory: => %s", err.Error())
+		logger.Errorf("CopyDirLocalToRemote failed to walking remote directory: => %s", err.Error())
 		return err
 	}
 	return nil
 }
 
-// CopyDirRemoteToLocal 复制文件-远程到本地
+// CopyFileRemoteToLocal 复制文件-远程到本地
 func (s *SSHClientSFTP) CopyFileRemoteToLocal(remotePath, localPath string) error {
+	if err := os.MkdirAll(filepath.Dir(localPath), 0775); err != nil {
+		return err
+	}
+
 	// 打开远程文件
 	remoteFile, err := s.Client.Open(remotePath)
 	if err != nil {
@@ -142,21 +108,6 @@ func (s *SSHClientSFTP) CopyFileRemoteToLocal(remotePath, localPath string) erro
 	}
 	defer remoteFile.Close()
 
-	if err := os.MkdirAll(filepath.Dir(localPath), 0775); err != nil {
-		return err
-	}
-
-	// 如果目标文件已经存在，先将目标文件重命名
-	// if info, err := os.Stat(localPath); err == nil && !info.IsDir() {
-	// 	ext := filepath.Ext(localPath)
-	// 	name := localPath[0 : len(localPath)-len(ext)]
-	// 	newName := fmt.Sprintf("%s-%s%s", name, time.Now().Format("20060102_150405"), ext)
-	// 	err := os.Rename(localPath, newName)
-	// 	if err != nil {
-	// 		return err
-	// 	}
-	// }
-
 	// 创建本地文件
 	localFile, err := os.Create(localPath)
 	if err != nil {
@@ -166,15 +117,14 @@ func (s *SSHClientSFTP) CopyFileRemoteToLocal(remotePath, localPath string) erro
 	defer localFile.Close()
 
 	// 复制文件内容
-	_, err = io.Copy(localFile, remoteFile)
+	if _, err = io.Copy(localFile, remoteFile); err != nil {
-	if err != nil {
 		logger.Errorf("CopyFileRemoteToLocal failed to copying contents: => %s", err.Error())
 		return err
 	}
 	return nil
 }
 
-// CopyDirRemoteToLocal 复制文件-本地到远程
+// CopyFileLocalToRemote 复制文件-本地到远程
 func (s *SSHClientSFTP) CopyFileLocalToRemote(localPath, remotePath string) error {
 	// 打开本地文件
 	localFile, err := os.Open(localPath)
@@ -184,6 +134,12 @@ func (s *SSHClientSFTP) CopyFileLocalToRemote(localPath, remotePath string) erro
 	}
 	defer localFile.Close()
 
+	// 创建远程目录
+	// if err := s.Client.MkdirAll(filepath.Dir(remotePath)); err != nil {
+	// 	logger.Errorf("CopyFileLocalToRemote failed to creating remote directory %s: => %s", remotePath, err.Error())
+	// 	return err
+	// }
+
 	// 创建远程文件
 	remoteFile, err := s.Client.Create(remotePath)
 	if err != nil {
@@ -193,8 +149,7 @@ func (s *SSHClientSFTP) CopyFileLocalToRemote(localPath, remotePath string) erro
 	defer remoteFile.Close()
 
 	// 复制文件内容
-	_, err = io.Copy(remoteFile, localFile)
+	if _, err = io.Copy(remoteFile, localFile); err != nil {
-	if err != nil {
 		logger.Errorf("CopyFileLocalToRemote failed to copying contents: => %s", err.Error())
 		return err
 	}

src/framework/utils/ssh/ssh.go

@@ -100,6 +100,7 @@ func (c *ConnSSH) RunCMD(cmd string) (string, error) {
 	defer session.Close()
 	buf, err := session.CombinedOutput(cmd)
 	if err != nil {
+		logger.Infof("RunCMD failed run command: => %s", cmd)
 		logger.Errorf("RunCMD failed run command: => %s", err.Error())
 	}
 	c.LastResult = string(buf)
@@ -211,11 +212,14 @@ func (c *ConnSSH) SendToAuthorizedKeys() error {
 	if err != nil {
 		return err
 	}
+	// "sudo mkdir -p ~/.ssh && sudo chown omcuser:omcuser ~/.ssh && sudo chmod 700 ~/.ssh"
+	// "sudo touch ~/.ssh/authorized_keys && sudo chown omcuser:omcuser ~/.ssh/authorized_keys && sudo chmod 600 ~/.ssh/authorized_keys"
+	// "echo 'ssh-rsa AAAAB3= pc-host\n' | sudo tee -a ~/.ssh/authorized_keys"
 	authorizedKeysEntry := fmt.Sprintln(strings.TrimSpace(publicKey))
 	cmdStrArr := []string{
-		fmt.Sprintf("sudo mkdir -p /home/%s/.ssh && sudo chown %s:%s /home/%s/.ssh && sudo chmod 700 /home/%s/.ssh", c.User, c.User, c.User, c.User, c.User),
+		fmt.Sprintf("sudo mkdir -p ~/.ssh && sudo chown %s:%s ~/.ssh && sudo chmod 700 ~/.ssh", c.User, c.User),
-		fmt.Sprintf("sudo touch /home/%s/.ssh/authorized_keys && sudo chown %s:%s /home/%s/.ssh/authorized_keys && sudo chmod 600 /home/%s/.ssh/authorized_keys", c.User, c.User, c.User, c.User, c.User),
+		fmt.Sprintf("sudo touch ~/.ssh/authorized_keys && sudo chown %s:%s ~/.ssh/authorized_keys && sudo chmod 600 ~/.ssh/authorized_keys", c.User, c.User),
-		fmt.Sprintf("echo '%s' | sudo tee -a /home/%s/.ssh/authorized_keys", authorizedKeysEntry, c.User),
+		fmt.Sprintf("echo '%s' | sudo tee -a ~/.ssh/authorized_keys", authorizedKeysEntry),
 	}
 	_, err = c.RunCMD(strings.Join(cmdStrArr, " && "))
 	if err != nil {

src/framework/utils/ua/ua.go

@@ -1,8 +1,8 @@
 package ua
 
-import "github.com/mssola/user_agent"
+import "github.com/mssola/useragent"
 
 // 获取user-agent信息
-func Info(userAgent string) *user_agent.UserAgent {
+func Info(userAgent string) *useragent.UserAgent {
-	return user_agent.New(userAgent)
+	return useragent.New(userAgent)
 }

src/framework/vo/result/result.go

@@ -1,7 +1,7 @@
 package result
 
 import (
-	"be.ems/src/framework/constants/result"
+	constResult "be.ems/src/framework/constants/result"
 )
 
 // CodeMsg 响应结果
@@ -15,8 +15,8 @@ func CodeMsg(code int, msg string) map[string]any {
 // 响应成功结果 map[string]any{}
 func Ok(v map[string]any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
-	args["msg"] = result.MSG_SUCCESS
+	args["msg"] = constResult.MSG_SUCCESS
 	// v合并到args
 	for key, value := range v {
 		args[key] = value
@@ -27,7 +27,7 @@ func Ok(v map[string]any) map[string]any {
 // 响应成功结果信息
 func OkMsg(msg string) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
 	args["msg"] = msg
 	return args
 }
@@ -35,8 +35,8 @@ func OkMsg(msg string) map[string]any {
 // 响应成功结果数据
 func OkData(data any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_SUCCESS
+	args["code"] = constResult.CODE_SUCCESS
-	args["msg"] = result.MSG_SUCCESS
+	args["msg"] = constResult.MSG_SUCCESS
 	args["data"] = data
 	return args
 }
@@ -44,8 +44,8 @@ func OkData(data any) map[string]any {
 // 响应失败结果 map[string]any{}
 func Err(v map[string]any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
+	args["code"] = constResult.CODE_ERROR
-	args["msg"] = result.MSG_ERROR
+	args["msg"] = constResult.MSG_ERROR
 	// v合并到args
 	for key, value := range v {
 		args[key] = value
@@ -56,7 +56,7 @@ func Err(v map[string]any) map[string]any {
 // 响应失败结果信息
 func ErrMsg(msg string) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
+	args["code"] = constResult.CODE_ERROR
 	args["msg"] = msg
 	return args
 }
@@ -64,8 +64,8 @@ func ErrMsg(msg string) map[string]any {
 // 响应失败结果数据
 func ErrData(data any) map[string]any {
 	args := make(map[string]any)
-	args["code"] = result.CODE_ERROR
+	args["code"] = constResult.CODE_ERROR
-	args["msg"] = result.MSG_ERROR
+	args["msg"] = constResult.MSG_ERROR
 	args["data"] = data
 	return args
 }

src/modules/chart/chart.go

@@ -13,10 +13,8 @@ import (
 func Setup(router *gin.Engine) {
 	logger.Infof("开始加载 ====> chart 模块路由")
 
-	chartGroup := router.Group("/chart")
+	// G6关系图
-
+	chartGraphGroup := router.Group("/chart/graph")
-	// 关系图
-	chartGraphGroup := chartGroup.Group("/graph")
 	{
 		chartGraphGroup.GET("",
 			middleware.PreAuthorize(nil),

src/modules/chart/controller/chart_graph.go

@@ -4,14 +4,14 @@ import (
 	"be.ems/src/framework/i18n"
 	"be.ems/src/framework/utils/ctx"
 	"be.ems/src/framework/vo/result"
-	chartService "be.ems/src/modules/chart/service"
+	"be.ems/src/modules/chart/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
 )
 
 // 实例化控制层 ChartGraphController 结构体
 var NewChartGraph = &ChartGraphController{
-	chartGraphService: chartService.NewChartGraphImpl,
+	chartGraphService: service.NewChartGraph,
 }
 
 // G6关系图
@@ -19,7 +19,7 @@ var NewChartGraph = &ChartGraphController{
 // PATH /graph
 type ChartGraphController struct {
 	// G6关系图数据表服务
-	chartGraphService chartService.IChartGraph
+	chartGraphService *service.ChartGraph
 }
 
 // 获取关系图组名

src/modules/chart/model/chart_graph.go

@@ -1,31 +1,32 @@
 package model
 
-// ChartGraph G6关系图数据对象 chart_graph
+// ChartGraph 图表-G6关系图数据对象 chart_graph
 type ChartGraph struct {
 	RowID     int64   `json:"rowId,omitempty" gorm:"column:row_id;primaryKey;autoIncrement"` // 记录ID
-	RowType   string  `json:"rowType,omitempty" gorm:"column:row_type"`                      // 记录类型(node/edge/combo)
+	RowType   string  `json:"rowType" gorm:"row_type"`                                       // 记录类型
-	RowGroup  string  `json:"rowGroup,omitempty" gorm:"column:row_group"`                    // 记录组名
+	RowGroup  string  `json:"rowGroup" gorm:"row_group"`                                     // 记录组名
-	ID        string  `json:"id,omitempty" gorm:"column:id"`                                 // 元素ID
+	ID        string  `json:"id" gorm:"id"`                                                  // 元素ID
-	Type      string  `json:"type,omitempty" gorm:"column:type"`                             // node/combo 类型
+	Type      string  `json:"type" gorm:"type"`                                              // node/combo 类型
-	Depth     int     `json:"depth,omitempty" gorm:"column:depth"`                           // node/combo 深度
+	Depth     int64   `json:"depth" gorm:"depth"`                                            // node/combo 深度
-	X         float64 `json:"x,omitempty" gorm:"column:x"`                                   // node/combo 横向坐标
+	X         float64 `json:"x" gorm:"x"`                                                    // node/combo 横向坐标
-	Y         float64 `json:"y,omitempty" gorm:"column:y"`                                   // node/combo 纵向坐标
+	Y         float64 `json:"y" gorm:"y"`                                                    // node/combo 纵向坐标
-	Size      string  `json:"size,omitempty" gorm:"column:size"`                             // node/combo 大小-JSON数组
+	Size      string  `json:"size" gorm:"size"`                                              // node/combo 大小-JSON数组
-	Icon      string  `json:"icon,omitempty" gorm:"column:icon"`                             // node-部分类型支持图标JSON配置
+	Icon      string  `json:"icon" gorm:"icon"`                                              // node-部分类型支持图标JSON配置
-	Img       string  `json:"img,omitempty" gorm:"column:img"`                               // node-img 图片
+	Img       string  `json:"img" gorm:"img"`                                                // node-img 图片
-	ClipCfg   string  `json:"clipCfg,omitempty" gorm:"column:clip_cfg"`                      // node-img 图片裁剪JSON配置
+	ClipCfg   string  `json:"clipCfg" gorm:"clip_cfg"`                                       // node-img 图片裁剪JSON配置
-	Direction string  `json:"direction,omitempty" gorm:"column:direction"`                   // node-triangle 三角形的方向(up/down/left/right)
+	Direction string  `json:"direction" gorm:"direction"`                                    // node-triangle 三角形的方向
-	Source    string  `json:"source,omitempty" gorm:"column:source"`                         // edge-边起始
+	Source    string  `json:"source" gorm:"source"`                                          // edge-边起始
-	Target    string  `json:"target,omitempty" gorm:"column:target"`                         // edge-边目标
+	Target    string  `json:"target" gorm:"target"`                                          // edge-边目标
-	ComboID   string  `json:"combo_id,omitempty" gorm:"column:combo_id"`                     // combo-分组
+	ComboId   string  `json:"comboId" gorm:"combo_id"`                                       // combo-分组
-	Padding   string  `json:"padding,omitempty" gorm:"column:padding"`                       // combo-JSON分组内边距
+	Padding   string  `json:"padding" gorm:"padding"`                                        // combo-JSON分组内边距
-	ParentID  string  `json:"parentId,omitempty" gorm:"column:parent_id"`                    // combo-父级分组
+	ParentId  string  `json:"parentId" gorm:"parent_id"`                                     // combo-父级分组
-	Children  string  `json:"children,omitempty" gorm:"column:children"`                     // combo-JSON分组内含元素
+	Children  string  `json:"children" gorm:"children"`                                      // combo-JSON分组内含元素
-	Style     string  `json:"style,omitempty" gorm:"column:style"`                           // 元素样式-JONS配置
+	Style     string  `json:"style" gorm:"style"`                                            // 元素样式-JONS配置
-	Label     string  `json:"label,omitempty" gorm:"column:label"`                           // 标签文本
+	Label     string  `json:"label" gorm:"label"`                                            // 标签文本
-	LabelCfg  string  `json:"labelCfg,omitempty" gorm:"column:label_cfg"`                    // 标签文本-JSON配置
+	LabelCfg  string  `json:"labelCfg" gorm:"label_cfg"`                                     // 标签文本-JSON配置
 }
 
-func (ChartGraph) TableName() string {
+// TableName 表名称
+func (*ChartGraph) TableName() string {
 	return "chart_graph"
 }

src/modules/chart/repository/chart_graph.go

@@ -1,21 +1,194 @@
 package repository
 
-import "be.ems/src/modules/chart/model"
+import (
+	"strings"
 
-// G6关系图数据 数据层接口
+	"be.ems/src/framework/datasource"
-type IChartGraph interface {
+	"be.ems/src/framework/logger"
-	// SelectPage 根据条件分页查询字典类型
+	"be.ems/src/framework/utils/parse"
-	SelectPage(query map[string]any) map[string]any
+	"be.ems/src/framework/utils/repo"
+	"be.ems/src/modules/chart/model"
+)
 
-	// SelectList 根据实体查询
+// 实例化数据层 ChartGraph 结构体
-	SelectList(graph model.ChartGraph) []model.ChartGraph
+var NewChartGraph = &ChartGraph{
+	selectSql: `select 
+	row_id, row_type, row_group,
+	id, type, depth, x, y, size, icon, img,
+	clip_cfg, direction,
+	source, target, combo_id,
+	padding, parent_id, children,
+	style, label, label_cfg
+	from chart_graph`,
 
-	// SelectGroup 查询组名
+	resultMap: map[string]string{
-	SelectGroup() []string
+		"row_id":    "RowID",
-
+		"row_type":  "RowType",
-	// Insert 批量添加
+		"row_group": "RowGroup",
-	Inserts(graphs []model.ChartGraph) int64
+		"id":        "ID",
-
+		"type":      "Type",
-	// Delete 删除组数据
+		"depth":     "Depth",
-	DeleteGroup(rowGroup string) int64
+		"x":         "X",
+		"y":         "Y",
+		"size":      "Size",
+		"icon":      "Icon",
+		"img":       "Img",
+		"clip_cfg":  "ClipCfg",
+		"direction": "Direction",
+		"source":    "Source",
+		"target":    "Target",
+		"combo_id":  "ComboID",
+		"padding":   "Padding",
+		"parent_id": "ParentID",
+		"children":  "Children",
+		"style":     "Style",
+		"label":     "Label",
+		"label_cfg": "LabelCfg",
+	},
+}
+
+// ChartGraph G6关系图数据表 数据层处理
+type ChartGraph struct {
+	// 查询视图对象SQL
+	selectSql string
+	// 结果字段与实体映射
+	resultMap map[string]string
+}
+
+// convertResultRows 将结果记录转实体结果组
+func (r *ChartGraph) convertResultRows(rows []map[string]any) []model.ChartGraph {
+	arr := make([]model.ChartGraph, 0)
+	for _, row := range rows {
+		item := model.ChartGraph{}
+		for key, value := range row {
+			if keyMapper, ok := r.resultMap[key]; ok {
+				repo.SetFieldValue(&item, keyMapper, value)
+			}
+		}
+		arr = append(arr, item)
+	}
+	return arr
+}
+
+// SelectPage 根据条件分页查询字典类型
+func (r *ChartGraph) SelectPage(query map[string]any) map[string]any {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if v, ok := query["rowType"]; ok && v != "" {
+		conditions = append(conditions, "row_type = ?")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
+	if v, ok := query["rowGroup"]; ok && v != "" {
+		conditions = append(conditions, "row_group = ?")
+		params = append(params, strings.Trim(v.(string), " "))
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	result := map[string]any{
+		"total": 0,
+		"rows":  []model.ChartGraph{},
+	}
+
+	// 查询数量 长度为0直接返回
+	totalSql := "select count(1) as 'total' from chart_graph"
+	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
+	if err != nil {
+		logger.Errorf("total err => %v", err)
+		return result
+	}
+	total := parse.Number(totalRows[0]["total"])
+	if total == 0 {
+		return result
+	} else {
+		result["total"] = total
+	}
+
+	// 分页
+	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
+	pageSql := " limit ?,? "
+	params = append(params, pageNum*pageSize)
+	params = append(params, pageSize)
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + pageSql
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+		return result
+	}
+
+	// 转换实体
+	result["rows"] = r.convertResultRows(results)
+	return result
+}
+
+// SelectList 根据实体查询
+func (r *ChartGraph) SelectList(graph model.ChartGraph) []model.ChartGraph {
+	// 查询条件拼接
+	var conditions []string
+	var params []any
+	if graph.RowType != "" {
+		conditions = append(conditions, "row_type = ?")
+		params = append(params, graph.RowType)
+	}
+	if graph.RowGroup != "" {
+		conditions = append(conditions, "row_group = ?")
+		params = append(params, graph.RowGroup)
+	}
+
+	// 构建查询条件语句
+	whereSql := ""
+	if len(conditions) > 0 {
+		whereSql += " where " + strings.Join(conditions, " and ")
+	}
+
+	// 查询数据
+	querySql := r.selectSql + whereSql + " order by depth asc "
+	results, err := datasource.RawDB("", querySql, params)
+	if err != nil {
+		logger.Errorf("query err => %v", err)
+	}
+
+	// 转换实体
+	return r.convertResultRows(results)
+}
+
+// SelectGroup 查询组名
+func (r *ChartGraph) SelectGroup() []string {
+	rows := []string{}
+	// 查询数量 长度为0直接返回
+	querySql := "select row_group as 'str' from chart_graph GROUP BY row_group"
+	strRows, err := datasource.RawDB("", querySql, nil)
+	if err != nil {
+		logger.Errorf("Query err => %v", err)
+		return rows
+	}
+	for _, v := range strRows {
+		rows = append(rows, v["str"].(string))
+	}
+	return rows
+}
+
+// Insert 批量添加
+func (r *ChartGraph) Inserts(graphs []model.ChartGraph) int64 {
+	tx := datasource.DefaultDB().CreateInBatches(graphs, 2000)
+	if err := tx.Error; err != nil {
+		logger.Errorf("CreateInBatches err => %v", err)
+	}
+	return tx.RowsAffected
+}
+
+// Delete 删除组数据
+func (r *ChartGraph) DeleteGroup(rowGroup string) int64 {
+	tx := datasource.DefaultDB().Where("row_group = ?", rowGroup).Delete(&model.ChartGraph{})
+	if err := tx.Error; err != nil {
+		logger.Errorf("Delete err => %v", err)
+	}
+	return tx.RowsAffected
 }

src/modules/chart/repository/chart_graph.impl.go

@@ -1,194 +0,0 @@
-package repository
-
-import (
-	"strings"
-
-	"be.ems/src/framework/datasource"
-	"be.ems/src/framework/logger"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/utils/repo"
-	"be.ems/src/modules/chart/model"
-)
-
-// 实例化数据层 NewChartGraphImpl 结构体
-var NewChartGraphImpl = &ChartGraphImpl{
-	selectSql: `select 
-	row_id, row_type, row_group,
-	id, type, depth, x, y, size, icon, img,
-	clip_cfg, direction,
-	source, target, combo_id,
-	padding, parent_id, children,
-	style, label, label_cfg
-	from chart_graph`,
-
-	resultMap: map[string]string{
-		"row_id":    "RowID",
-		"row_type":  "RowType",
-		"row_group": "RowGroup",
-		"id":        "ID",
-		"type":      "Type",
-		"depth":     "Depth",
-		"x":         "X",
-		"y":         "Y",
-		"size":      "Size",
-		"icon":      "Icon",
-		"img":       "Img",
-		"clip_cfg":  "ClipCfg",
-		"direction": "Direction",
-		"source":    "Source",
-		"target":    "Target",
-		"combo_id":  "ComboID",
-		"padding":   "Padding",
-		"parent_id": "ParentID",
-		"children":  "Children",
-		"style":     "Style",
-		"label":     "Label",
-		"label_cfg": "LabelCfg",
-	},
-}
-
-// ChartGraphImpl G6关系图数据表 数据层处理
-type ChartGraphImpl struct {
-	// 查询视图对象SQL
-	selectSql string
-	// 结果字段与实体映射
-	resultMap map[string]string
-}
-
-// convertResultRows 将结果记录转实体结果组
-func (r *ChartGraphImpl) convertResultRows(rows []map[string]any) []model.ChartGraph {
-	arr := make([]model.ChartGraph, 0)
-	for _, row := range rows {
-		item := model.ChartGraph{}
-		for key, value := range row {
-			if keyMapper, ok := r.resultMap[key]; ok {
-				repo.SetFieldValue(&item, keyMapper, value)
-			}
-		}
-		arr = append(arr, item)
-	}
-	return arr
-}
-
-// SelectPage 根据条件分页查询字典类型
-func (r *ChartGraphImpl) SelectPage(query map[string]any) map[string]any {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if v, ok := query["rowType"]; ok && v != "" {
-		conditions = append(conditions, "row_type = ?")
-		params = append(params, strings.Trim(v.(string), " "))
-	}
-	if v, ok := query["rowGroup"]; ok && v != "" {
-		conditions = append(conditions, "row_group = ?")
-		params = append(params, strings.Trim(v.(string), " "))
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	result := map[string]any{
-		"total": 0,
-		"rows":  []model.ChartGraph{},
-	}
-
-	// 查询数量 长度为0直接返回
-	totalSql := "select count(1) as 'total' from chart_graph"
-	totalRows, err := datasource.RawDB("", totalSql+whereSql, params)
-	if err != nil {
-		logger.Errorf("total err => %v", err)
-		return result
-	}
-	total := parse.Number(totalRows[0]["total"])
-	if total == 0 {
-		return result
-	} else {
-		result["total"] = total
-	}
-
-	// 分页
-	pageNum, pageSize := repo.PageNumSize(query["pageNum"], query["pageSize"])
-	pageSql := " limit ?,? "
-	params = append(params, pageNum*pageSize)
-	params = append(params, pageSize)
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + pageSql
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-		return result
-	}
-
-	// 转换实体
-	result["rows"] = r.convertResultRows(results)
-	return result
-}
-
-// SelectList 根据实体查询
-func (r *ChartGraphImpl) SelectList(graph model.ChartGraph) []model.ChartGraph {
-	// 查询条件拼接
-	var conditions []string
-	var params []any
-	if graph.RowType != "" {
-		conditions = append(conditions, "row_type = ?")
-		params = append(params, graph.RowType)
-	}
-	if graph.RowGroup != "" {
-		conditions = append(conditions, "row_group = ?")
-		params = append(params, graph.RowGroup)
-	}
-
-	// 构建查询条件语句
-	whereSql := ""
-	if len(conditions) > 0 {
-		whereSql += " where " + strings.Join(conditions, " and ")
-	}
-
-	// 查询数据
-	querySql := r.selectSql + whereSql + " order by depth asc "
-	results, err := datasource.RawDB("", querySql, params)
-	if err != nil {
-		logger.Errorf("query err => %v", err)
-	}
-
-	// 转换实体
-	return r.convertResultRows(results)
-}
-
-// SelectGroup 查询组名
-func (r *ChartGraphImpl) SelectGroup() []string {
-	rows := []string{}
-	// 查询数量 长度为0直接返回
-	querySql := "select row_group as 'str' from chart_graph GROUP BY row_group"
-	strRows, err := datasource.RawDB("", querySql, nil)
-	if err != nil {
-		logger.Errorf("Query err => %v", err)
-		return rows
-	}
-	for _, v := range strRows {
-		rows = append(rows, v["str"].(string))
-	}
-	return rows
-}
-
-// Insert 批量添加
-func (r *ChartGraphImpl) Inserts(graphs []model.ChartGraph) int64 {
-	tx := datasource.DefaultDB().CreateInBatches(graphs, 2000)
-	if err := tx.Error; err != nil {
-		logger.Errorf("CreateInBatches err => %v", err)
-	}
-	return tx.RowsAffected
-}
-
-// Delete 删除组数据
-func (r *ChartGraphImpl) DeleteGroup(rowGroup string) int64 {
-	tx := datasource.DefaultDB().Where("row_group = ?", rowGroup).Delete(&model.ChartGraph{})
-	if err := tx.Error; err != nil {
-		logger.Errorf("Delete err => %v", err)
-	}
-	return tx.RowsAffected
-}

src/modules/chart/service/chart_graph.go

@@ -1,16 +1,359 @@
 package service
 
-// G6关系图数据 服务层接口
+import (
-type IChartGraph interface {
+	"encoding/json"
-	// SelectGroup 查询组名
+	"strings"
-	SelectGroup() []string
 
-	// LoadData 查询所组图数据
+	"be.ems/src/framework/utils/parse"
-	LoadData(rowGroup, rowType string) map[string]any
+	"be.ems/src/modules/chart/model"
+	"be.ems/src/modules/chart/repository"
+)
 
-	// SaveData 添加组图数据
+// 实例化服务层 ChartGraph 结构体
-	SaveData(rowGroup string, data map[string]any) int64
+var NewChartGraph = &ChartGraph{
-
+	graphRepository: repository.NewChartGraph,
-	// DeleteGroup 删除所组图数据
+}
-	DeleteGroup(rowGroup string) int64
+
+// ChartGraph G6关系图数据表 服务层处理
+type ChartGraph struct {
+	// G6关系图数据服务
+	graphRepository *repository.ChartGraph
+}
+
+// SelectGroup 查询组名
+func (s *ChartGraph) SelectGroup() []string {
+	return s.graphRepository.SelectGroup()
+}
+
+// LoadData 查询所组图数据
+func (s *ChartGraph) LoadData(rowGroup, rowType string) map[string]any {
+	// 查询数据
+	graph := model.ChartGraph{
+		RowGroup: rowGroup,
+	}
+	if rowType != "" {
+		graph.RowType = rowType
+	}
+	data := s.graphRepository.SelectList(graph)
+
+	// 数据项
+	nodes := []map[string]any{}
+	edges := []map[string]any{}
+	combos := []map[string]any{}
+
+	for _, v := range data {
+		if v.RowType == "node" {
+			nodes = append(nodes, s.loadNode(v))
+		}
+		if v.RowType == "edge" {
+			edges = append(edges, s.loadEdge(v))
+		}
+		if v.RowType == "combo" {
+			combos = append(combos, s.loadCombo(v))
+		}
+	}
+
+	return map[string]any{
+		"nodes":  nodes,
+		"edges":  edges,
+		"combos": combos,
+	}
+}
+
+// loadNode 图数据Node
+func (s *ChartGraph) loadNode(v model.ChartGraph) map[string]any {
+	node := map[string]any{
+		"id":      v.ID,
+		"comboId": v.ComboId,
+		"x":       v.X,
+		"y":       v.Y,
+		"type":    v.Type,
+		"depth":   v.Depth,
+	}
+
+	// 元素样式
+	style := map[string]any{}
+	if len(v.Style) > 7 {
+		json.Unmarshal([]byte(v.Style), &style)
+	}
+	node["style"] = style
+
+	// 元素大小
+	if strings.Contains(v.Size, "[") {
+		sizeArr := []int64{}
+		json.Unmarshal([]byte(v.Size), &sizeArr)
+		node["size"] = sizeArr
+	} else {
+		node["size"] = parse.Number(v.Size)
+	}
+
+	// 标签文本
+	node["label"] = v.Label
+	labelCfg := map[string]any{}
+	if len(v.LabelCfg) > 7 {
+		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
+	}
+	node["labelCfg"] = labelCfg
+
+	// 三角形属性
+	if v.Type == "triangle" {
+		node["direction"] = v.Direction
+	}
+
+	// 图片属性
+	if strings.Index(v.Type, "image") == 0 {
+		node["img"] = v.Img
+		clipCfg := map[string]any{}
+		if len(v.ClipCfg) > 7 {
+			json.Unmarshal([]byte(v.ClipCfg), &clipCfg)
+		}
+		node["clipCfg"] = clipCfg
+	}
+
+	// 图标属性
+	if v.Icon != "" {
+		icon := map[string]any{}
+		if len(v.Icon) > 7 {
+			json.Unmarshal([]byte(v.Icon), &icon)
+		}
+		node["icon"] = icon
+	}
+
+	return node
+}
+
+// loadEdge 图数据Edge
+func (s *ChartGraph) loadEdge(v model.ChartGraph) map[string]any {
+	edge := map[string]any{
+		"id":     v.ID,
+		"source": v.Source,
+		"target": v.Target,
+		"type":   v.Type,
+	}
+
+	// 元素样式
+	style := map[string]any{}
+	if len(v.Style) > 7 {
+		json.Unmarshal([]byte(v.Style), &style)
+	}
+	edge["style"] = style
+
+	// 标签文本
+	edge["label"] = v.Label
+	labelCfg := map[string]any{}
+	if len(v.LabelCfg) > 7 {
+		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
+	}
+	edge["labelCfg"] = labelCfg
+
+	return edge
+}
+
+// loadCombo 图数据Combo
+func (s *ChartGraph) loadCombo(v model.ChartGraph) map[string]any {
+	combo := map[string]any{
+		"id":    v.ID,
+		"x":     v.X,
+		"y":     v.Y,
+		"type":  v.Type,
+		"depth": v.Depth,
+	}
+
+	// 元素样式
+	style := map[string]any{}
+	if len(v.Style) > 7 {
+		json.Unmarshal([]byte(v.Style), &style)
+	}
+	combo["style"] = style
+
+	// 元素大小
+	if strings.Contains(v.Size, "[") {
+		sizeArr := []int64{}
+		json.Unmarshal([]byte(v.Size), &sizeArr)
+		combo["size"] = sizeArr
+	} else {
+		combo["size"] = parse.Number(v.Size)
+	}
+
+	// 元素内边距
+	if strings.Contains(v.Padding, "[") {
+		paddingArr := []int64{}
+		json.Unmarshal([]byte(v.Padding), &paddingArr)
+		combo["padding"] = paddingArr
+	} else {
+		combo["padding"] = parse.Number(v.Padding)
+	}
+
+	// 标签文本
+	combo["label"] = v.Label
+	labelCfg := map[string]any{}
+	if len(v.LabelCfg) > 7 {
+		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
+	}
+	combo["labelCfg"] = labelCfg
+
+	// 分组内元素
+	if v.Children != "" {
+		children := []map[string]any{}
+		if len(v.Children) > 7 {
+			json.Unmarshal([]byte(v.Children), &children)
+		}
+		combo["children"] = children
+	}
+
+	return combo
+}
+
+// SaveData 添加组图数据
+func (s *ChartGraph) SaveData(rowGroup string, data map[string]any) int64 {
+	graphs := []model.ChartGraph{}
+	nodes := data["nodes"].([]map[string]any)
+	graphNodes := s.saveNode(rowGroup, nodes)
+	graphs = append(graphs, graphNodes...)
+	edges := data["edges"].([]map[string]any)
+	graphEdges := s.saveEdge(rowGroup, edges)
+	graphs = append(graphs, graphEdges...)
+	combos := data["combos"].([]map[string]any)
+	graphCombos := s.saveCombo(rowGroup, combos)
+	graphs = append(graphs, graphCombos...)
+	// 删除组数据后插入
+	if len(graphs) > 0 {
+		s.graphRepository.DeleteGroup(rowGroup)
+	}
+	return s.graphRepository.Inserts(graphs)
+}
+
+// saveNode 图数据Node
+func (s *ChartGraph) saveNode(rowGroup string, nodes []map[string]any) []model.ChartGraph {
+	var graphs []model.ChartGraph
+	for _, v := range nodes {
+		node := model.ChartGraph{
+			RowType:  "node",
+			RowGroup: rowGroup,
+			ID:       v["id"].(string),
+			X:        v["x"].(float64),
+			Y:        v["y"].(float64),
+			Type:     v["type"].(string),
+		}
+		if comboId, ok := v["comboId"]; ok && comboId != nil {
+			node.ComboId = comboId.(string)
+		}
+		if depth, ok := v["depth"]; ok && depth != nil {
+			node.Depth = int64(depth.(float64))
+		}
+		if styleByte, err := json.Marshal(v["style"]); err == nil {
+			node.Style = string(styleByte)
+		}
+
+		// 元素大小
+		if sizeByte, err := json.Marshal(v["size"]); err == nil {
+			node.Size = string(sizeByte)
+		}
+
+		// 标签文本
+		if label, ok := v["label"]; ok && label != nil {
+			node.Label = label.(string)
+		}
+		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
+			node.LabelCfg = string(labelCfgByte)
+		}
+		// 三角形属性
+		if direction, ok := v["direction"]; ok && direction != nil && node.Type == "triangle" {
+			node.Direction = direction.(string)
+		}
+		// 图片属性
+		if img, ok := v["img"]; ok && img != nil {
+			node.Img = img.(string)
+			if clipCfgByte, err := json.Marshal(v["clipCfg"]); err == nil {
+				node.ClipCfg = string(clipCfgByte)
+			}
+		}
+		// 图标属性
+		if icon, ok := v["icon"]; ok && icon != nil {
+			if iconByte, err := json.Marshal(icon); err == nil {
+				node.Icon = string(iconByte)
+			}
+		}
+
+		graphs = append(graphs, node)
+	}
+	return graphs
+}
+
+// saveEdge 图数据Edge
+func (s *ChartGraph) saveEdge(rowGroup string, edges []map[string]any) []model.ChartGraph {
+	var graphs []model.ChartGraph
+	for _, v := range edges {
+		edge := model.ChartGraph{
+			RowType:  "edge",
+			RowGroup: rowGroup,
+			ID:       v["id"].(string),
+			Source:   v["source"].(string),
+			Target:   v["target"].(string),
+			Type:     v["type"].(string),
+		}
+
+		if styleByte, err := json.Marshal(v["style"]); err == nil {
+			edge.Style = string(styleByte)
+		}
+
+		// 标签文本
+		if label, ok := v["label"]; ok && label != nil {
+			edge.Label = label.(string)
+		}
+		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
+			edge.LabelCfg = string(labelCfgByte)
+		}
+
+		graphs = append(graphs, edge)
+	}
+	return graphs
+}
+
+// saveCombo 图数据Combo
+func (s *ChartGraph) saveCombo(rowGroup string, combos []map[string]any) []model.ChartGraph {
+	var graphs []model.ChartGraph
+	for _, v := range combos {
+		combo := model.ChartGraph{
+			RowType:  "combo",
+			RowGroup: rowGroup,
+			ID:       v["id"].(string),
+			X:        v["x"].(float64),
+			Y:        v["y"].(float64),
+			Type:     v["type"].(string),
+		}
+		if depth, ok := v["depth"]; ok && depth != nil {
+			combo.Depth = int64(depth.(float64))
+		}
+		if styleByte, err := json.Marshal(v["style"]); err == nil {
+			combo.Style = string(styleByte)
+		}
+		if paddingByte, err := json.Marshal(v["padding"]); err == nil {
+			combo.Padding = string(paddingByte)
+		}
+		if childrenByte, err := json.Marshal(v["children"]); err == nil {
+			combo.Children = string(childrenByte)
+		}
+
+		// 元素大小
+		if sizeByte, err := json.Marshal(v["size"]); err == nil {
+			combo.Size = string(sizeByte)
+		}
+
+		// 标签文本
+		if label, ok := v["label"]; ok && label != nil {
+			combo.Label = label.(string)
+		}
+		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
+			combo.LabelCfg = string(labelCfgByte)
+		}
+
+		graphs = append(graphs, combo)
+	}
+	return graphs
+}
+
+// Delete 删除所组图数据
+func (s *ChartGraph) DeleteGroup(rowGroup string) int64 {
+	return s.graphRepository.DeleteGroup(rowGroup)
 }

src/modules/chart/service/chart_graph.impl.go

@@ -1,359 +0,0 @@
-package service
-
-import (
-	"strings"
-
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/modules/chart/model"
-	chartRepository "be.ems/src/modules/chart/repository"
-	"github.com/goccy/go-json"
-)
-
-// 实例化服务层 ChartGraphImpl 结构体
-var NewChartGraphImpl = &ChartGraphImpl{
-	graphRepository: chartRepository.NewChartGraphImpl,
-}
-
-// ChartGraphImpl G6关系图数据表 服务层处理
-type ChartGraphImpl struct {
-	// G6关系图数据服务
-	graphRepository chartRepository.IChartGraph
-}
-
-// SelectGroup 查询组名
-func (s *ChartGraphImpl) SelectGroup() []string {
-	return s.graphRepository.SelectGroup()
-}
-
-// LoadData 查询所组图数据
-func (s *ChartGraphImpl) LoadData(rowGroup, rowType string) map[string]any {
-	// 查询数据
-	graph := model.ChartGraph{
-		RowGroup: rowGroup,
-	}
-	if rowType != "" {
-		graph.RowType = rowType
-	}
-	data := s.graphRepository.SelectList(graph)
-
-	// 数据项
-	nodes := []map[string]any{}
-	edges := []map[string]any{}
-	combos := []map[string]any{}
-
-	for _, v := range data {
-		if v.RowType == "node" {
-			nodes = append(nodes, s.loadNode(v))
-		}
-		if v.RowType == "edge" {
-			edges = append(edges, s.loadEdge(v))
-		}
-		if v.RowType == "combo" {
-			combos = append(combos, s.loadCombo(v))
-		}
-	}
-
-	return map[string]any{
-		"nodes":  nodes,
-		"edges":  edges,
-		"combos": combos,
-	}
-}
-
-// loadNode 图数据Node
-func (s *ChartGraphImpl) loadNode(v model.ChartGraph) map[string]any {
-	node := map[string]any{
-		"id":      v.ID,
-		"comboId": v.ComboID,
-		"x":       v.X,
-		"y":       v.Y,
-		"type":    v.Type,
-		"depth":   v.Depth,
-	}
-
-	// 元素样式
-	style := map[string]any{}
-	if len(v.Style) > 7 {
-		json.Unmarshal([]byte(v.Style), &style)
-	}
-	node["style"] = style
-
-	// 元素大小
-	if strings.Contains(v.Size, "[") {
-		sizeArr := []int64{}
-		json.Unmarshal([]byte(v.Size), &sizeArr)
-		node["size"] = sizeArr
-	} else {
-		node["size"] = parse.Number(v.Size)
-	}
-
-	// 标签文本
-	node["label"] = v.Label
-	labelCfg := map[string]any{}
-	if len(v.LabelCfg) > 7 {
-		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
-	}
-	node["labelCfg"] = labelCfg
-
-	// 三角形属性
-	if v.Type == "triangle" {
-		node["direction"] = v.Direction
-	}
-
-	// 图片属性
-	if strings.Index(v.Type, "image") == 0 {
-		node["img"] = v.Img
-		clipCfg := map[string]any{}
-		if len(v.ClipCfg) > 7 {
-			json.Unmarshal([]byte(v.ClipCfg), &clipCfg)
-		}
-		node["clipCfg"] = clipCfg
-	}
-
-	// 图标属性
-	if v.Icon != "" {
-		icon := map[string]any{}
-		if len(v.Icon) > 7 {
-			json.Unmarshal([]byte(v.Icon), &icon)
-		}
-		node["icon"] = icon
-	}
-
-	return node
-}
-
-// loadEdge 图数据Edge
-func (s *ChartGraphImpl) loadEdge(v model.ChartGraph) map[string]any {
-	edge := map[string]any{
-		"id":     v.ID,
-		"source": v.Source,
-		"target": v.Target,
-		"type":   v.Type,
-	}
-
-	// 元素样式
-	style := map[string]any{}
-	if len(v.Style) > 7 {
-		json.Unmarshal([]byte(v.Style), &style)
-	}
-	edge["style"] = style
-
-	// 标签文本
-	edge["label"] = v.Label
-	labelCfg := map[string]any{}
-	if len(v.LabelCfg) > 7 {
-		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
-	}
-	edge["labelCfg"] = labelCfg
-
-	return edge
-}
-
-// loadCombo 图数据Combo
-func (s *ChartGraphImpl) loadCombo(v model.ChartGraph) map[string]any {
-	combo := map[string]any{
-		"id":    v.ID,
-		"x":     v.X,
-		"y":     v.Y,
-		"type":  v.Type,
-		"depth": v.Depth,
-	}
-
-	// 元素样式
-	style := map[string]any{}
-	if len(v.Style) > 7 {
-		json.Unmarshal([]byte(v.Style), &style)
-	}
-	combo["style"] = style
-
-	// 元素大小
-	if strings.Contains(v.Size, "[") {
-		sizeArr := []int64{}
-		json.Unmarshal([]byte(v.Size), &sizeArr)
-		combo["size"] = sizeArr
-	} else {
-		combo["size"] = parse.Number(v.Size)
-	}
-
-	// 元素内边距
-	if strings.Contains(v.Padding, "[") {
-		paddingArr := []int64{}
-		json.Unmarshal([]byte(v.Padding), &paddingArr)
-		combo["padding"] = paddingArr
-	} else {
-		combo["padding"] = parse.Number(v.Padding)
-	}
-
-	// 标签文本
-	combo["label"] = v.Label
-	labelCfg := map[string]any{}
-	if len(v.LabelCfg) > 7 {
-		json.Unmarshal([]byte(v.LabelCfg), &labelCfg)
-	}
-	combo["labelCfg"] = labelCfg
-
-	// 分组内元素
-	if v.Children != "" {
-		children := []map[string]any{}
-		if len(v.Children) > 7 {
-			json.Unmarshal([]byte(v.Children), &children)
-		}
-		combo["children"] = children
-	}
-
-	return combo
-}
-
-// SaveData 添加组图数据
-func (s *ChartGraphImpl) SaveData(rowGroup string, data map[string]any) int64 {
-	graphs := []model.ChartGraph{}
-	nodes := data["nodes"].([]map[string]any)
-	graphNodes := s.saveNode(rowGroup, nodes)
-	graphs = append(graphs, graphNodes...)
-	edges := data["edges"].([]map[string]any)
-	graphEdges := s.saveEdge(rowGroup, edges)
-	graphs = append(graphs, graphEdges...)
-	combos := data["combos"].([]map[string]any)
-	graphCombos := s.saveCombo(rowGroup, combos)
-	graphs = append(graphs, graphCombos...)
-	// 删除组数据后插入
-	if len(graphs) > 0 {
-		s.graphRepository.DeleteGroup(rowGroup)
-	}
-	return s.graphRepository.Inserts(graphs)
-}
-
-// saveNode 图数据Node
-func (s *ChartGraphImpl) saveNode(rowGroup string, nodes []map[string]any) []model.ChartGraph {
-	var graphs []model.ChartGraph
-	for _, v := range nodes {
-		node := model.ChartGraph{
-			RowType:  "node",
-			RowGroup: rowGroup,
-			ID:       v["id"].(string),
-			X:        v["x"].(float64),
-			Y:        v["y"].(float64),
-			Type:     v["type"].(string),
-		}
-		if comboId, ok := v["comboId"]; ok && comboId != nil {
-			node.ComboID = comboId.(string)
-		}
-		if depth, ok := v["depth"]; ok && depth != nil {
-			node.Depth = int(depth.(float64))
-		}
-		if styleByte, err := json.Marshal(v["style"]); err == nil {
-			node.Style = string(styleByte)
-		}
-
-		// 元素大小
-		if sizeByte, err := json.Marshal(v["size"]); err == nil {
-			node.Size = string(sizeByte)
-		}
-
-		// 标签文本
-		if label, ok := v["label"]; ok && label != nil {
-			node.Label = label.(string)
-		}
-		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
-			node.LabelCfg = string(labelCfgByte)
-		}
-		// 三角形属性
-		if direction, ok := v["direction"]; ok && direction != nil && node.Type == "triangle" {
-			node.Direction = direction.(string)
-		}
-		// 图片属性
-		if img, ok := v["img"]; ok && img != nil {
-			node.Img = img.(string)
-			if clipCfgByte, err := json.Marshal(v["clipCfg"]); err == nil {
-				node.ClipCfg = string(clipCfgByte)
-			}
-		}
-		// 图标属性
-		if icon, ok := v["icon"]; ok && icon != nil {
-			if iconByte, err := json.Marshal(icon); err == nil {
-				node.Icon = string(iconByte)
-			}
-		}
-
-		graphs = append(graphs, node)
-	}
-	return graphs
-}
-
-// saveEdge 图数据Edge
-func (s *ChartGraphImpl) saveEdge(rowGroup string, edges []map[string]any) []model.ChartGraph {
-	var graphs []model.ChartGraph
-	for _, v := range edges {
-		edge := model.ChartGraph{
-			RowType:  "edge",
-			RowGroup: rowGroup,
-			ID:       v["id"].(string),
-			Source:   v["source"].(string),
-			Target:   v["target"].(string),
-			Type:     v["type"].(string),
-		}
-
-		if styleByte, err := json.Marshal(v["style"]); err == nil {
-			edge.Style = string(styleByte)
-		}
-
-		// 标签文本
-		if label, ok := v["label"]; ok && label != nil {
-			edge.Label = label.(string)
-		}
-		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
-			edge.LabelCfg = string(labelCfgByte)
-		}
-
-		graphs = append(graphs, edge)
-	}
-	return graphs
-}
-
-// saveCombo 图数据Combo
-func (s *ChartGraphImpl) saveCombo(rowGroup string, combos []map[string]any) []model.ChartGraph {
-	var graphs []model.ChartGraph
-	for _, v := range combos {
-		combo := model.ChartGraph{
-			RowType:  "combo",
-			RowGroup: rowGroup,
-			ID:       v["id"].(string),
-			X:        v["x"].(float64),
-			Y:        v["y"].(float64),
-			Type:     v["type"].(string),
-		}
-		if depth, ok := v["depth"]; ok && depth != nil {
-			combo.Depth = int(depth.(float64))
-		}
-		if styleByte, err := json.Marshal(v["style"]); err == nil {
-			combo.Style = string(styleByte)
-		}
-		if paddingByte, err := json.Marshal(v["padding"]); err == nil {
-			combo.Padding = string(paddingByte)
-		}
-		if childrenByte, err := json.Marshal(v["children"]); err == nil {
-			combo.Children = string(childrenByte)
-		}
-
-		// 元素大小
-		if sizeByte, err := json.Marshal(v["size"]); err == nil {
-			combo.Size = string(sizeByte)
-		}
-
-		// 标签文本
-		if label, ok := v["label"]; ok && label != nil {
-			combo.Label = label.(string)
-		}
-		if labelCfgByte, err := json.Marshal(v["labelCfg"]); err == nil {
-			combo.LabelCfg = string(labelCfgByte)
-		}
-
-		graphs = append(graphs, combo)
-	}
-	return graphs
-}
-
-// Delete 删除所组图数据
-func (s *ChartGraphImpl) DeleteGroup(rowGroup string) int64 {
-	return s.graphRepository.DeleteGroup(rowGroup)
-}

src/modules/common/common.go

@@ -52,6 +52,7 @@ func Setup(router *gin.Engine) {
 			// 	Count: 10,
 			// 	Type:  middleware.LIMIT_IP,
 			// }),
+			middleware.CryptoApi(true, true),
 			controller.NewAccount.Login,
 		)
 		indexGroup.GET("/getInfo", middleware.PreAuthorize(nil), controller.NewAccount.Info)
@@ -74,6 +75,7 @@ func Setup(router *gin.Engine) {
 			// 	Count: 10,
 			// 	Type:  middleware.LIMIT_IP,
 			// }),
+			middleware.CryptoApi(true, true),
 			controller.NewRegister.Register,
 		)
 	}

src/modules/common/controller/account.go

@@ -17,7 +17,7 @@ import (
 
 // 实例化控制层 AccountController 结构体
 var NewAccount = &AccountController{
-	accountService:     commonService.NewAccountImpl,
+	accountService:     commonService.NewAccount,
 	sysLogLoginService: systemService.NewSysLogLoginImpl,
 }
 
@@ -25,8 +25,7 @@ var NewAccount = &AccountController{
 //
 // PATH /
 type AccountController struct {
-	// 账号身份操作服务
+	accountService *commonService.Account // 账号身份操作服务
-	accountService commonService.IAccount
 	// 系统登录访问
 	sysLogLoginService systemService.ISysLogLogin
 }

src/modules/common/controller/bootloader.go

@@ -18,7 +18,7 @@ import (
 
 // 实例化控制层 BootloaderController 结构体
 var NewBootloader = &BootloaderController{
-	accountService: commonService.NewAccountImpl,
+	accountService: commonService.NewAccount,
 	sysUserService: systemService.NewSysUserImpl,
 }
 
@@ -26,8 +26,7 @@ var NewBootloader = &BootloaderController{
 //
 // PATH /bootloader
 type BootloaderController struct {
-	// 账号身份操作服务
+	accountService *commonService.Account // 账号身份操作服务
-	accountService commonService.IAccount
 	// 用户信息服务
 	sysUserService systemService.ISysUser
 }

src/modules/common/service/account.go

@@ -1,24 +1,194 @@
 package service
 
-import "be.ems/src/framework/vo"
+import (
+	"fmt"
+	"time"
 
-// 账号身份操作服务 服务层接口
+	"be.ems/src/framework/config"
-type IAccount interface {
+	adminConstants "be.ems/src/framework/constants/admin"
-	// ValidateCaptcha 校验验证码
+	"be.ems/src/framework/constants/cachekey"
-	ValidateCaptcha(code, uuid string) error
+	"be.ems/src/framework/constants/common"
+	"be.ems/src/framework/redis"
+	"be.ems/src/framework/utils/crypto"
+	"be.ems/src/framework/utils/parse"
+	"be.ems/src/framework/vo"
+	"be.ems/src/modules/system/model"
+	systemService "be.ems/src/modules/system/service"
+)
 
-	// LoginByUsername 登录生成token
+// 实例化服务层 Account 结构体
-	LoginByUsername(username, password string) (vo.LoginUser, error)
+var NewAccount = &Account{
-
+	sysUserService:   systemService.NewSysUserImpl,
-	// UpdateLoginDateAndIP 更新登录时间和IP
+	sysConfigService: systemService.NewSysConfigImpl,
-	UpdateLoginDateAndIP(loginUser *vo.LoginUser) bool
+	sysRoleService:   systemService.NewSysRoleImpl,
-
+	sysMenuService:   systemService.NewSysMenuImpl,
-	// ClearLoginRecordCache 清除错误记录次数
+}
-	ClearLoginRecordCache(username string) bool
+
-
+// 账号身份操作服务 服务层处理
-	// RoleAndMenuPerms 角色和菜单数据权限
+type Account struct {
-	RoleAndMenuPerms(userId string, isAdmin bool) ([]string, []string)
+	// 用户信息服务
-
+	sysUserService systemService.ISysUser
-	// RouteMenus 前端路由所需要的菜单
+	// 参数配置服务
-	RouteMenus(userId string, isAdmin bool) []vo.Router
+	sysConfigService systemService.ISysConfig
+	// 角色服务
+	sysRoleService systemService.ISysRole
+	// 菜单服务
+	sysMenuService systemService.ISysMenu
+}
+
+// ValidateCaptcha 校验验证码
+func (s *Account) ValidateCaptcha(code, uuid string) error {
+	// 验证码检查，从数据库配置获取验证码开关 true开启，false关闭
+	captchaEnabledStr := s.sysConfigService.SelectConfigValueByKey("sys.account.captchaEnabled")
+	if !parse.Boolean(captchaEnabledStr) {
+		return nil
+	}
+	if code == "" || uuid == "" {
+		// 验证码信息错误
+		return fmt.Errorf("captcha.err")
+	}
+	verifyKey := cachekey.CAPTCHA_CODE_KEY + uuid
+	captcha, _ := redis.Get("", verifyKey)
+	if captcha == "" {
+		// 验证码已失效
+		return fmt.Errorf("captcha.errValid")
+	}
+	redis.Del("", verifyKey)
+	if captcha != code {
+		// 验证码错误
+		return fmt.Errorf("captcha.err")
+	}
+	return nil
+}
+
+// LoginByUsername 登录创建用户信息
+func (s *Account) LoginByUsername(username, password string) (vo.LoginUser, error) {
+	loginUser := vo.LoginUser{}
+
+	// 检查密码重试次数
+	retrykey, retryCount, lockTime, err := s.passwordRetryCount(username)
+	if err != nil {
+		return loginUser, err
+	}
+
+	// 查询用户登录账号
+	sysUser := s.sysUserService.SelectUserByUserName(username)
+	if sysUser.UserName != username {
+		return loginUser, fmt.Errorf("login.errNameOrPasswd")
+	}
+	if sysUser.DelFlag == common.STATUS_YES {
+		// 对不起，您的账号已被删除
+		return loginUser, fmt.Errorf("login.errDelFlag")
+	}
+	if sysUser.Status == common.STATUS_NO {
+		return loginUser, fmt.Errorf("login.errStatus")
+	}
+
+	// 检验用户密码
+	compareBool := crypto.BcryptCompare(password, sysUser.Password)
+	if !compareBool {
+		redis.SetByExpire("", retrykey, retryCount+1, lockTime)
+		// 用户不存在或密码错误
+		return loginUser, fmt.Errorf("login.errNameOrPasswd")
+	} else {
+		// 清除错误记录次数
+		s.ClearLoginRecordCache(username)
+	}
+
+	// 登录用户信息
+	loginUser.UserID = sysUser.UserID
+	loginUser.DeptID = sysUser.DeptID
+	loginUser.User = sysUser
+	// 用户权限组标识
+	isAdmin := config.IsAdmin(sysUser.UserID)
+	if isAdmin {
+		loginUser.Permissions = []string{adminConstants.PERMISSION}
+	} else {
+		perms := s.sysMenuService.SelectMenuPermsByUserId(sysUser.UserID)
+		loginUser.Permissions = parse.RemoveDuplicates(perms)
+	}
+	return loginUser, nil
+}
+
+// UpdateLoginDateAndIP 更新登录时间和IP
+func (s *Account) UpdateLoginDateAndIP(loginUser *vo.LoginUser) bool {
+	sysUser := loginUser.User
+	userInfo := model.SysUser{
+		UserID:      sysUser.UserID,
+		LoginIP:     sysUser.LoginIP,
+		LoginDate:   sysUser.LoginDate,
+		UpdateBy:    sysUser.UserName,
+		Sex:         sysUser.Sex,
+		PhoneNumber: sysUser.PhoneNumber,
+		Email:       sysUser.Email,
+		Remark:      sysUser.Remark,
+	}
+	rows := s.sysUserService.UpdateUser(userInfo)
+	return rows > 0
+}
+
+// ClearLoginRecordCache 清除错误记录次数
+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
+	}
+	return false
+}
+
+// passwordRetryCount 密码重试次数
+func (s *Account) passwordRetryCount(username string) (string, int64, time.Duration, error) {
+	// 从数据库配置获取登录次数和错误锁定时间
+	maxRetryCountStr := s.sysConfigService.SelectConfigValueByKey("sys.user.maxRetryCount")
+	lockTimeStr := s.sysConfigService.SelectConfigValueByKey("sys.user.lockTime")
+
+	// 验证登录次数和错误锁定时间
+	maxRetryCount := parse.Number(maxRetryCountStr)
+	lockTime := parse.Number(lockTimeStr)
+	// 验证缓存记录次数
+	retrykey := cachekey.PWD_ERR_CNT_KEY + username
+	retryCount, err := redis.Get("", retrykey)
+	if retryCount == "" || err != nil {
+		retryCount = "0"
+	}
+	// 是否超过错误值
+	retryCountInt64 := parse.Number(retryCount)
+	if retryCountInt64 >= maxRetryCount {
+		// 密码输入错误多次，帐户已被锁定
+		errorMsg := fmt.Errorf("login.errRetryPasswd")
+		return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, errorMsg
+	}
+	return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, nil
+}
+
+// RoleAndMenuPerms 角色和菜单数据权限
+func (s *Account) RoleAndMenuPerms(userId string, isAdmin bool) ([]string, []string) {
+	if isAdmin {
+		return []string{adminConstants.ROLE_KEY}, []string{adminConstants.PERMISSION}
+	} else {
+		// 角色key
+		roleGroup := []string{}
+		roles := s.sysRoleService.SelectRoleListByUserId(userId)
+		for _, role := range roles {
+			roleGroup = append(roleGroup, role.RoleKey)
+		}
+		// 菜单权限key
+		perms := s.sysMenuService.SelectMenuPermsByUserId(userId)
+		return parse.RemoveDuplicates(roleGroup), parse.RemoveDuplicates(perms)
+	}
+}
+
+// RouteMenus 前端路由所需要的菜单
+func (s *Account) RouteMenus(userId string, isAdmin bool) []vo.Router {
+	var buildMenus []vo.Router
+	if isAdmin {
+		menus := s.sysMenuService.SelectMenuTreeByUserId("*")
+		buildMenus = s.sysMenuService.BuildRouteMenus(menus, "")
+	} else {
+		menus := s.sysMenuService.SelectMenuTreeByUserId(userId)
+		buildMenus = s.sysMenuService.BuildRouteMenus(menus, "")
+	}
+	return buildMenus
 }

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

@@ -1,190 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"time"
-
-	"be.ems/src/framework/config"
-	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/utils/crypto"
-	"be.ems/src/framework/utils/parse"
-	"be.ems/src/framework/vo"
-	"be.ems/src/modules/system/model"
-	systemService "be.ems/src/modules/system/service"
-)
-
-// 实例化服务层 AccountImpl 结构体
-var NewAccountImpl = &AccountImpl{
-	sysUserService:   systemService.NewSysUserImpl,
-	sysConfigService: systemService.NewSysConfigImpl,
-	sysRoleService:   systemService.NewSysRoleImpl,
-	sysMenuService:   systemService.NewSysMenuImpl,
-}
-
-// 账号身份操作服务 服务层处理
-type AccountImpl struct {
-	// 用户信息服务
-	sysUserService systemService.ISysUser
-	// 参数配置服务
-	sysConfigService systemService.ISysConfig
-	// 角色服务
-	sysRoleService systemService.ISysRole
-	// 菜单服务
-	sysMenuService systemService.ISysMenu
-}
-
-// ValidateCaptcha 校验验证码
-func (s *AccountImpl) ValidateCaptcha(code, uuid string) error {
-	// 验证码检查，从数据库配置获取验证码开关 true开启，false关闭
-	captchaEnabledStr := s.sysConfigService.SelectConfigValueByKey("sys.account.captchaEnabled")
-	if !parse.Boolean(captchaEnabledStr) {
-		return nil
-	}
-	if code == "" || uuid == "" {
-		// 验证码信息错误
-		return fmt.Errorf("captcha.err")
-	}
-	verifyKey := cachekey.CAPTCHA_CODE_KEY + uuid
-	captcha, _ := redis.Get("", verifyKey)
-	if captcha == "" {
-		// 验证码已失效
-		return fmt.Errorf("captcha.errValid")
-	}
-	redis.Del("", verifyKey)
-	if captcha != code {
-		// 验证码错误
-		return fmt.Errorf("captcha.err")
-	}
-	return nil
-}
-
-// LoginByUsername 登录创建用户信息
-func (s *AccountImpl) LoginByUsername(username, password string) (vo.LoginUser, error) {
-	loginUser := vo.LoginUser{}
-
-	// 检查密码重试次数
-	retrykey, retryCount, lockTime, err := s.passwordRetryCount(username)
-	if err != nil {
-		return loginUser, err
-	}
-
-	// 查询用户登录账号
-	sysUser := s.sysUserService.SelectUserByUserName(username)
-	if sysUser.UserName != username {
-		return loginUser, fmt.Errorf("login.errNameOrPasswd")
-	}
-	if sysUser.DelFlag == common.STATUS_YES {
-		// 对不起，您的账号已被删除
-		return loginUser, fmt.Errorf("login.errDelFlag")
-	}
-	if sysUser.Status == common.STATUS_NO {
-		return loginUser, fmt.Errorf("login.errStatus")
-	}
-
-	// 检验用户密码
-	compareBool := crypto.BcryptCompare(password, sysUser.Password)
-	if !compareBool {
-		redis.SetByExpire("", retrykey, retryCount+1, lockTime)
-		// 用户不存在或密码错误
-		return loginUser, fmt.Errorf("login.errNameOrPasswd")
-	} else {
-		// 清除错误记录次数
-		s.ClearLoginRecordCache(username)
-	}
-
-	// 登录用户信息
-	loginUser.UserID = sysUser.UserID
-	loginUser.DeptID = sysUser.DeptID
-	loginUser.User = sysUser
-	// 用户权限组标识
-	isAdmin := config.IsAdmin(sysUser.UserID)
-	if isAdmin {
-		loginUser.Permissions = []string{adminConstants.PERMISSION}
-	} else {
-		perms := s.sysMenuService.SelectMenuPermsByUserId(sysUser.UserID)
-		loginUser.Permissions = parse.RemoveDuplicates(perms)
-	}
-	return loginUser, nil
-}
-
-// UpdateLoginDateAndIP 更新登录时间和IP
-func (s *AccountImpl) UpdateLoginDateAndIP(loginUser *vo.LoginUser) bool {
-	sysUser := loginUser.User
-	userInfo := model.SysUser{
-		UserID:    sysUser.UserID,
-		LoginIP:   sysUser.LoginIP,
-		LoginDate: sysUser.LoginDate,
-		UpdateBy:  sysUser.UserName,
-	}
-	rows := s.sysUserService.UpdateUser(userInfo)
-	return rows > 0
-}
-
-// ClearLoginRecordCache 清除错误记录次数
-func (s *AccountImpl) ClearLoginRecordCache(username string) bool {
-	cacheKey := cachekey.PWD_ERR_CNT_KEY + username
-	hasKey, _ := redis.Has("", cacheKey)
-	if hasKey {
-		delOk, _ := redis.Del("", cacheKey)
-		return delOk
-	}
-	return false
-}
-
-// passwordRetryCount 密码重试次数
-func (s *AccountImpl) passwordRetryCount(username string) (string, int64, time.Duration, error) {
-	// 从数据库配置获取登录次数和错误锁定时间
-	maxRetryCountStr := s.sysConfigService.SelectConfigValueByKey("sys.user.maxRetryCount")
-	lockTimeStr := s.sysConfigService.SelectConfigValueByKey("sys.user.lockTime")
-
-	// 验证登录次数和错误锁定时间
-	maxRetryCount := parse.Number(maxRetryCountStr)
-	lockTime := parse.Number(lockTimeStr)
-	// 验证缓存记录次数
-	retrykey := cachekey.PWD_ERR_CNT_KEY + username
-	retryCount, err := redis.Get("", retrykey)
-	if retryCount == "" || err != nil {
-		retryCount = "0"
-	}
-	// 是否超过错误值
-	retryCountInt64 := parse.Number(retryCount)
-	if retryCountInt64 >= maxRetryCount {
-		// 密码输入错误多次，帐户已被锁定
-		errorMsg := fmt.Errorf("login.errRetryPasswd")
-		return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, errorMsg
-	}
-	return retrykey, retryCountInt64, time.Duration(lockTime) * time.Minute, nil
-}
-
-// RoleAndMenuPerms 角色和菜单数据权限
-func (s *AccountImpl) RoleAndMenuPerms(userId string, isAdmin bool) ([]string, []string) {
-	if isAdmin {
-		return []string{adminConstants.ROLE_KEY}, []string{adminConstants.PERMISSION}
-	} else {
-		// 角色key
-		roleGroup := []string{}
-		roles := s.sysRoleService.SelectRoleListByUserId(userId)
-		for _, role := range roles {
-			roleGroup = append(roleGroup, role.RoleKey)
-		}
-		// 菜单权限key
-		perms := s.sysMenuService.SelectMenuPermsByUserId(userId)
-		return parse.RemoveDuplicates(roleGroup), parse.RemoveDuplicates(perms)
-	}
-}
-
-// RouteMenus 前端路由所需要的菜单
-func (s *AccountImpl) RouteMenus(userId string, isAdmin bool) []vo.Router {
-	var buildMenus []vo.Router
-	if isAdmin {
-		menus := s.sysMenuService.SelectMenuTreeByUserId("*")
-		buildMenus = s.sysMenuService.BuildRouteMenus(menus, "")
-	} else {
-		menus := s.sysMenuService.SelectMenuTreeByUserId(userId)
-		buildMenus = s.sysMenuService.BuildRouteMenus(menus, "")
-	}
-	return buildMenus
-}

src/modules/crontask/processor/exportTable/exportTable.go

@@ -0,0 +1,160 @@
+package exportTable
+
+import (
+	"database/sql"
+	"encoding/csv"
+	"encoding/json"
+	"fmt"
+	"os"
+	"time"
+
+	"be.ems/lib/dborm"
+	"be.ems/lib/log"
+	"be.ems/src/framework/cron"
+)
+
+var NewProcessor = &BarProcessor{
+	progress: 0,
+	count:    0,
+}
+
+// bar 队列任务处理
+type BarProcessor struct {
+	// 任务进度
+	progress int
+	// 执行次数
+	count int
+}
+
+type BarParams struct {
+	Duration  int    `json:"duration"`
+	TableName string `json:"tableName"`
+	Columns   string `json:"columns"`  // exported column name of time string
+	TimeCol   string `json:"timeCol"`  // time stamp of column name
+	TimeUnit  string `json:"timeUnit"` // timestamp unit: second/micro/milli
+	Extras    string `json:"extras"`   // extras condition for where
+	FilePath  string `json:"filePath"` // file path
+}
+
+func (s *BarProcessor) Execute(data any) (any, error) {
+	s.count++
+
+	options := data.(cron.JobData)
+	sysJob := options.SysJob
+	var params BarParams
+
+	err := json.Unmarshal([]byte(sysJob.TargetParams), &params)
+	if err != nil {
+		return nil, err
+	}
+
+	// mkdir if not exist
+	if _, err = os.Stat(params.FilePath); os.IsNotExist(err) {
+		err = os.MkdirAll(params.FilePath, os.ModePerm)
+		if err != nil {
+			log.Error("Failed to Mkdir:", err)
+			return nil, err
+		}
+	}
+	//duration = params.Duration
+
+	now := time.Now()
+	end := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
+	start := end.Add(-time.Duration(params.Duration) * time.Hour)
+
+	var startTime, endTime int64
+	switch params.TimeUnit {
+	case "second":
+		// 格式化时间戳为秒级
+		startTime = start.Unix()
+		endTime = end.Unix()
+	case "milli":
+		// 格式化时间戳为毫秒级
+		startTime = start.UnixMilli()
+		endTime = end.UnixMilli()
+	case "micro":
+		// 格式化时间戳为微妙级
+		startTime = start.UnixMicro()
+		endTime = end.UnixMicro()
+	default:
+		return nil, fmt.Errorf("error input parameter")
+	}
+	var query string
+	if params.Extras != "" {
+		query = fmt.Sprintf("SELECT %s FROM `%s` WHERE `%s` >= %d AND `%s` < %d AND %s",
+			params.Columns, params.TableName, params.TimeCol, startTime, params.TimeCol, endTime, params.Extras)
+	} else {
+		query = fmt.Sprintf("SELECT %s FROM `%s` WHERE `%s` >= %d AND `%s` < %d",
+			params.Columns, params.TableName, params.TimeCol, startTime, params.TimeCol, endTime)
+	}
+	log.Trace("query:", query)
+	filePath := fmt.Sprintf("%s/%s_export_%s.csv", params.FilePath, params.TableName, time.Now().Format("20060102150405"))
+	affected, err := s.exportData(query, filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	// 返回结果，用于记录执行结果
+	return map[string]any{
+		"msg":      "sucess",
+		"filePath": filePath,
+		"affected": affected,
+	}, nil
+}
+
+func (s *BarProcessor) exportData(query, filePath string) (int64, error) {
+	rows, err := dborm.XCoreDB().Query(query)
+	if err != nil {
+		return 0, err
+	}
+	defer rows.Close()
+
+	// 创建 CSV 文件
+	file, err := os.Create(filePath)
+	if err != nil {
+		return 0, err
+	}
+	defer file.Close()
+
+	writer := csv.NewWriter(file)
+	defer writer.Flush()
+
+	// 写入表头
+	columns, _ := rows.ColumnTypes()
+	header := make([]string, len(columns))
+	for i, col := range columns {
+		header[i] = col.Name()
+	}
+	if err := writer.Write(header); err != nil {
+		return 0, err
+	}
+
+	// 写入数据
+	var affected int64 = 0
+	for rows.Next() {
+		values := make([]sql.RawBytes, len(columns))
+		scanArgs := make([]interface{}, len(columns))
+		for i := range values {
+			scanArgs[i] = &values[i]
+		}
+
+		if err := rows.Scan(scanArgs...); err != nil {
+			return 0, err
+		}
+
+		record := make([]string, len(columns))
+		for i, val := range values {
+			if val == nil {
+				record[i] = ""
+			} else {
+				record[i] = string(val)
+			}
+		}
+		affected++
+		if err := writer.Write(record); err != nil {
+			return affected, err
+		}
+	}
+
+	return affected, nil
+}

src/modules/crontask/processor/monitor_sys_resource/monitor_sys_resource.go

@@ -1,4 +1,4 @@
-package monitorsysresource
+package monitor_sys_resource
 
 import (
 	"encoding/json"
@@ -10,7 +10,7 @@ import (
 )
 
 var NewProcessor = &MonitorSysResourceProcessor{
-	monitorService: monitorService.NewMonitorImpl,
+	monitorService: monitorService.NewMonitor,
 	count:          0,
 	openDataCancel: false,
 }
@@ -18,7 +18,7 @@ var NewProcessor = &MonitorSysResourceProcessor{
 // MonitorSysResourceProcessor 系统资源CPU/IO/Netword收集
 type MonitorSysResourceProcessor struct {
 	// 服务器系统相关信息服务
-	monitorService monitorService.IMonitor
+	monitorService *monitorService.Monitor
 	// 执行次数
 	count int
 	// 是否已经开启数据通道

src/modules/crontask/processor/ne_config_backup/ne_config_backup.go

@@ -0,0 +1,58 @@
+package ne_config_backup
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"be.ems/src/framework/cron"
+	"be.ems/src/framework/logger"
+	neModel "be.ems/src/modules/network_element/model"
+	neService "be.ems/src/modules/network_element/service"
+)
+
+var NewProcessor = &NeConfigBackupProcessor{
+	neConfigBackupService: neService.NewNeConfigBackup,
+	neInfoService:         neService.NewNeInfo,
+	count:                 0,
+}
+
+// NeConfigBackupProcessor 网元配置文件定期备份
+type NeConfigBackupProcessor struct {
+	neConfigBackupService *neService.NeConfigBackup // 网元配置文件备份记录服务
+	neInfoService         *neService.NeInfo         // 网元信息服务
+	count                 int                       // 执行次数
+}
+
+func (s *NeConfigBackupProcessor) Execute(data any) (any, error) {
+	s.count++ // 执行次数加一
+	options := data.(cron.JobData)
+	sysJob := options.SysJob
+	logger.Infof("重复 %v 任务ID %s", options.Repeat, sysJob.JobID)
+	// 返回结果，用于记录执行结果
+	result := map[string]any{
+		"count": s.count,
+	}
+
+	neList := s.neInfoService.SelectList(neModel.NeInfo{}, false, false)
+	for _, neInfo := range neList {
+		neTypeAndId := fmt.Sprintf("%s_%s", neInfo.NeType, neInfo.NeId)
+		// 将网元文件备份到本地
+		zipFilePath, err := s.neConfigBackupService.NeConfigNeToLocal(neInfo)
+		if err != nil {
+			result[neTypeAndId] = err.Error()
+			continue
+		}
+		// 新增备份记录
+		item := neModel.NeConfigBackup{
+			NeType:   neInfo.NeType,
+			NeId:     neInfo.NeId,
+			Name:     filepath.Base(zipFilePath),
+			Path:     zipFilePath,
+			CreateBy: "system",
+		}
+		s.neConfigBackupService.Insert(item)
+		result[neTypeAndId] = "ok"
+	}
+
+	return result, nil
+}