marge: 合并代码

lib/dborm/dborm.go

@@ -276,7 +276,7 @@ func XormGetAllNeInfo(nes *[]NeInfo) (*[]NeInfo, error) {
 		}
 		*nes = append(*nes, *ne)
 	}
-	log.Debug("nes:", nes)
+	log.Trace("nes:", nes)
 	return nes, nil
 }
 

lib/routes/routes.go

@@ -6,6 +6,7 @@ import (
 	//	"log"
 
 	"ems.agt/features/aaaa"
+	"ems.agt/features/cdr"
 	"ems.agt/features/cm"
 	"ems.agt/features/dbrest"
 	"ems.agt/features/file"
@@ -299,6 +300,9 @@ func init() {
 	Register("GET", ue.UriNSSFSubscriptions, ue.GetSubscriptionsFromNSSF, nil)
 	Register("GET", ue.CustomUriNSSFSubscriptions, ue.GetSubscriptionsFromNSSF, nil)
 
+	Register("POST", cdr.UriCDREvent, cdr.PostCDREventFromNF, nil)
+	Register("POST", cdr.CustomUriCDREvent, cdr.PostCDREventFromNF, nil)
+
 	// 进程网络
 	Register("GET", psnet.UriWs, psnet.ProcessWs, nil)
 	Register("POST", psnet.UriStop, psnet.StopProcess, nil)