perf: 重构目录结构

2025-03-14 18:25:41 +08:00
parent 9befa00fd4
commit b3bb2d788f
430 changed files with 7167 additions and 12958 deletions
--- a/src/framework/config/config.go
+++ b/src/framework/config/config.go
@@ -12,9 +12,15 @@ import (
 	"github.com/spf13/viper"

 	libConfig "be.ems/lib/config"
-	libGlobal "be.ems/lib/global"
 )

+var (
+	Version   string = "-"
+	BuildTime string = "-"
+	GoVer     string = "-"
+)
+
+// 程序配置
 var conf *viper.Viper

 // 初始化程序配置
@@ -28,9 +34,9 @@ func InitConfig(configDir *embed.FS) {
 func initFlag() {
 	// --env prod
 	pflag.String("env", "prod", "Specify Run Environment Configuration local or prod")
-	// --c /etc/restconf.yaml
-	// -c /etc/restconf.yaml
-	pflag.StringP("config", "c", "./etc/restconf.yaml", "Specify Configuration File")
+	// --c /usr/local/etc/omc/omc.yaml
+	// -c /usr/local/etc/omc/omc.yaml
+	pflag.StringP("config", "c", "/usr/local/etc/omc/omc.yaml", "Specify Configuration File")
 	// --sqlPath ./sql/20250228.sql
 	pflag.String("sqlPath", "", "Execution SQL File Path")
 	// --sqlSource default
@@ -45,7 +51,7 @@ func initFlag() {

 	// 参数固定输出
 	if *pVersion {
-		buildInfo := fmt.Sprintf("OMC version: %s\n%s\n%s\n\n", libGlobal.Version, libGlobal.BuildTime, libGlobal.GoVer)
+		buildInfo := fmt.Sprintf("OMC \nBuildVer: %s\nBuildTime: %s\nBuildEnv: %s\n", Version, BuildTime, GoVer)
 		fmt.Println(buildInfo)
 		os.Exit(1)
 	}
@@ -74,7 +80,7 @@ func initViper(configDir *embed.FS) {

 	// 当期服务环境运行配置 => local
 	env := conf.GetString("env")
-	log.Printf("current service environment operation configuration => %s \n", env)
+	log.Printf("current service environment configuration => %s \n", env)

 	// 加载运行配置文件合并相同配置
 	envConfigPath := fmt.Sprintf("config/config.%s.yaml", env)
--- a/src/framework/utils/fetch/fetch.go
+++ b/src/framework/utils/fetch/fetch.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 	"time"

-	libGlobal "be.ems/lib/global"
+	"be.ems/src/framework/config"
 )

 // userAgent 自定义 User-Agent
-var userAgent = fmt.Sprintf("OMC/%s", libGlobal.Version)
+var userAgent = fmt.Sprintf("OMC/%s", config.Version)

 // Get 发送 GET 请求
 // timeout 超时时间（毫秒）
--- a/src/modules/common/controller/index.go
+++ b/src/modules/common/controller/index.go
@@ -1,9 +1,7 @@
 package controller

 import (
-	"fmt"
-
-	libGlobal "be.ems/lib/global"
+	"be.ems/src/framework/config"
 	"be.ems/src/framework/resp"

 	"github.com/gin-gonic/gin"
@@ -29,9 +27,9 @@ type IndexController struct{}
 //	@Description	Root Route
 //	@Router			/ [get]
 func (s *IndexController) Handler(c *gin.Context) {
-	name := "OMC"
-	version := libGlobal.Version
 	// str := "欢迎使用%s核心网管理平台，当前版本：%s，请通过前台地址访问。"
-	str := "%s Core Network Management, current version: %s"
-	c.JSON(200, resp.OkMsg(fmt.Sprintf(str, name, version)))
+	c.JSON(200, resp.OkData(map[string]any{
+		"name":    "OMC",
+		"version": config.Version,
+	}))
 }
--- a/src/modules/common/service/commont.go
+++ b/src/modules/common/service/commont.go
@@ -3,7 +3,6 @@ package service
 import (
 	"fmt"

-	"be.ems/lib/global"
 	"be.ems/src/framework/config"
 	"be.ems/src/framework/constants"
 	"be.ems/src/framework/utils/machine"
@@ -26,8 +25,8 @@ type Commont struct {
 func (s *Commont) SystemConfigInfo() map[string]string {
 	infoMap := map[string]string{}
 	// 获取打包注入的全局变量信息
-	infoMap["version"] = global.Version
-	infoMap["buildTime"] = global.BuildTime
+	infoMap["version"] = config.Version
+	infoMap["buildTime"] = config.BuildTime
 	// 系统首次使用标记
 	launchInfo := machine.LaunchInfo
 	if launchInfo != nil {
--- a/src/modules/network_data/controller/all_alarm_forward.go
+++ b/src/modules/network_data/controller/all_alarm_forward.go
@@ -29,12 +29,12 @@ type AlarmForwardController struct {
 //	@Tags			network_data/alarm_forward
 //	@Accept			json
 //	@Produce		json
-//	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)																					Enums(1,2,3,4)
-//	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																												default(event_time)
-//	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																									default(asc)
-//	@Param			pageNum			query		number	true	"pageNum"																																			default(1)
-//	@Param			pageSize		query		number	true	"pageSize"																																			default(10)
-//	@Success		200				{object}	object	"Response Results"
+//	@Param			neType		query		string	false	"NE Type"											Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)	Enums(1,2,3,4)
+//	@Param			sortField	query		string	false	"Sort fields, fill in result fields"				default(event_time)
+//	@Param			sortOrder	query		string	false	"Sort by ascending or descending order, asc desc"	default(asc)
+//	@Param			pageNum		query		number	true	"pageNum"											default(1)
+//	@Param			pageSize	query		number	true	"pageSize"											default(10)
+//	@Success		200			{object}	object	"Response Results"
 //	@Security		TokenAuth
 //	@Summary		Alarm Forward Log List
 //	@Description	Alarm Forward Log List
--- a/src/modules/network_data/controller/all_alarm_log.go
+++ b/src/modules/network_data/controller/all_alarm_log.go
@@ -34,7 +34,7 @@ type AlarmLogController struct {
 //	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
 //	@Param			neId			query		string	false	"NE ID The actual record is the network element RmUid"
 //	@Param			alarmLogType	query		string	false	"AlarmLog type Communication AlarmLogs=1, Equipment AlarmLogs=2, Processing faults=3, Environmental AlarmLogs=4, Quality of service AlarmLogs=5"	Enums(1,2,3,4,5)
-//	@Param			alarmStatus	query		string	false	"Alarm status 0:clear, 1:active"																													Enums(0,1)
+//	@Param			alarmStatus		query		string	false	"Alarm status 0:clear, 1:active"																													Enums(0,1)
 //	@Param			origSeverity	query		string	false	"Alarm Type 1: Critical, 2: Major, 3: Minor, 4: Warning"																							Enums(1,2,3,4)
 //	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																												default(event_time)
 //	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																									default(asc)
@@ -67,7 +67,7 @@ func (s AlarmLogController) List(c *gin.Context) {
 //	@Param			neType			query		string	false	"NE Type"	Enums(IMS,AMF,AUSF,UDM,SMF,PCF,NSSF,NRF,UPF,MME,CBC,OMC,SGWC,SMSC)
 //	@Param			neId			query		string	false	"NE ID The actual record is the network element RmUid"
 //	@Param			alarmLogType	query		string	false	"AlarmLog type Communication AlarmLogs=1, Equipment AlarmLogs=2, Processing faults=3, Environmental AlarmLogs=4, Quality of service AlarmLogs=5"	Enums(1,2,3,4,5)
-//	@Param			alarmStatus	query		string	false	"Alarm status 0:clear, 1:active"																													Enums(0,1)
+//	@Param			alarmStatus		query		string	false	"Alarm status 0:clear, 1:active"																													Enums(0,1)
 //	@Param			origSeverity	query		string	false	"Alarm Type 1: Critical, 2: Major, 3: Minor, 4: Warning"																							Enums(1,2,3,4)
 //	@Param			sortField		query		string	false	"Sort fields, fill in result fields"																												default(event_time)
 //	@Param			sortOrder		query		string	false	"Sort by ascending or descending order, asc desc"																									default(asc)
--- a/src/modules/network_element/ne_config_test.go
+++ b/src/modules/network_element/ne_config_test.go
@@ -21,15 +21,15 @@ import (

 const (
 	// 数据库
-	DbHost    = "127.0.0.1"
-	DbPort    = 33066
+	DbHost    = "192.168.9.58"
+	DbPort    = 13306
 	DbUser    = "root"
 	DbPassswd = "1000omc@kp!"
-	DbName    = "omc_db"
+	DbName    = "omc_db_lichang"
 	// 配置文件路径
-	configParamDir = "../../../config/param"
+	configParamDir = "../../../local/param"
 	// configParamFile = "*" // 目录下全部更新
-	configParamFile = "mme_param_config.yaml" // 单文件更新
+	configParamFile = "amf_param_config.yaml" // 单文件更新
 )

 func TestConfig(t *testing.T) {