marge: 合并代码

features/fm/email.go

@@ -16,11 +16,27 @@ import (
 func AlarmEmailForward(alarmData *Alarm) error {
 	log.Info("AlarmEmailForward processing... ")
 
-	message := `
-    <p> Hello information,</p>
-		test, test	
-		<p style="text-indent:2em">Best Wishes!</p>
-	`
+	message := fmt.Sprintf(`
+	<p>Alarm information</p>
+		<p style="text-indent:2.5em">Sequence: %d</p>
+		<p style="text-indent:3em">NE name: %s</p>
+		<p style="text-indent:5em">Title: %s</p>
+		<p style="text-indent:3em">Severity: %s</p>
+		<p style="text-indent:2em">Event Time: %s</p>
+		<p style="text-indent:2em">Automatic send by OMC, don't reply!</p>
+	`, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime)
+
+	// message := fmt.Sprintf(`
+	// Alarm information
+
+	//       Sequence: %d
+	// 	   NE name: %s
+	//          Title: %s
+	//       Severity: %s
+	//     Event Time: %s
+
+	//    Automatic send by OMC, don't reply!
+	// `, alarmData.AlarmSeq, alarmData.NeName, alarmData.AlarmTitle, alarmData.OrigSeverity, alarmData.EventTime)
 
 	// QQ 邮箱：
 	// SMTP 服务器地址：smtp.qq.com（SSL协议端口：465/994 | 非SSL协议端口：25）
@@ -74,7 +90,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	m.SetBody("text/html", message)
 
 	// text/plain的意思是将文件设置为纯文本的形式，浏览器在获取到这种文件时并不会对其进行处理
-	// m.SetBody("text/plain", "纯文本")
+	//m.SetBody("text/plain", message)
 	// m.Attach("test.sh")   // 附件文件，可以是文件，照片，视频等等
 	// m.Attach("lolcatVideo.mp4") // 视频
 	// m.Attach("lolcat.jpg") // 照片
@@ -87,6 +103,10 @@ func AlarmEmailForward(alarmData *Alarm) error {
 	)
 	// 关闭SSL协议认证
 	d.TLSConfig = &tls.Config{InsecureSkipVerify: true}
+	if !config.GetYamlConfig().Alarm.Email.TlsSkipVerify {
+		// 打开SSL协议认证
+		d.TLSConfig = &tls.Config{InsecureSkipVerify: false}
+	}
 
 	if err := d.DialAndSend(m); err != nil {
 		operResult := fmt.Sprintf("Failed to DialAndSend:%v", err)
@@ -99,9 +119,7 @@ func AlarmEmailForward(alarmData *Alarm) error {
 		return err
 	}
 
-	operResult := fmt.Sprintf("Email sent successfully!:", err)
-	log.Error(operResult)
-	forwardLog.OperResult = operResult
+	forwardLog.OperResult = "Email sent successfully!"
 	affected, err := dborm.XormInsertAlarmForwardLog(forwardLog)
 	if err != nil && affected <= 0 {
 		log.Error("Failed to insert data:", err)

features/sys_menu/service/service_sys_menu.go

@@ -49,7 +49,17 @@ func (r *ServiceSysMenu) SelectMenuTreeByUserId(userId string) []model.SysMenu {
 // SelectMenuTreeSelectByUserId 根据用户ID查询菜单树结构信息
 func (r *ServiceSysMenu) SelectMenuTreeSelectByUserId(sysMenu model.SysMenu, userId string) []vo.TreeSelect {
 	sysMenus := r.sysMenuRepository.SelectMenuList(sysMenu, userId)
-	menus := r.parseDataToTree(sysMenus)
+
+	// 过滤旧前端菜单
+	sysMenusF := []model.SysMenu{}
+	for _, v := range sysMenus {
+		if v.Perms != "page" {
+			continue
+		}
+		sysMenusF = append(sysMenusF, v)
+	}
+
+	menus := r.parseDataToTree(sysMenusF)
 	tree := make([]vo.TreeSelect, 0)
 	for _, menu := range menus {
 		tree = append(tree, sysMenuTreeSelect(menu))

features/udm_user/api_udm_user.go

@@ -12,7 +12,6 @@ import (
 	"ems.agt/lib/core/conf"
 	mmlclient "ems.agt/lib/core/mml_client"
 	"ems.agt/lib/core/utils/ctx"
-	"ems.agt/lib/core/utils/parse"
 	"ems.agt/lib/core/vo/result"
 	"ems.agt/lib/dborm"
 	"ems.agt/lib/log"
@@ -212,15 +211,6 @@ func (s *UdmUserApi) UdmAuthUserList(w http.ResponseWriter, r *http.Request) {
 	querys := ctx.QueryMap(r)
 	querys["neId"] = ""
 	data := s.authUser.Page(querys)
-	// 遍历安全掩码
-	rows := data["rows"].([]model.UdmAuthUser)
-	maskRows := []model.UdmAuthUser{}
-	for _, v := range rows {
-		v.Ki = parse.SafeContent(v.Ki)
-		v.Opc = parse.SafeContent(v.Opc)
-		maskRows = append(maskRows, v)
-	}
-	data["rows"] = maskRows
 	ctx.JSON(w, 200, result.Ok(data))
 }
 
@@ -280,8 +270,6 @@ func (s *UdmUserApi) UdmAuthUserInfo(w http.ResponseWriter, r *http.Request) {
 
 		s.authUser.Insert(neId, userInfo)
 	}
-	userInfo.Ki = parse.SafeContent(userInfo.Ki)
-	userInfo.Opc = parse.SafeContent(userInfo.Opc)
 	ctx.JSON(w, 200, result.OkData(userInfo))
 
 }
@@ -519,9 +507,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
 		data := [][]string{}
 		data = append(data, []string{"imsi", "ki", "amf", "algo", "opc"})
 		for _, v := range list {
-			maskKi := parse.SafeContent(v.Ki)
-			maskOpc := parse.SafeContent(v.Opc)
-			data = append(data, []string{v.Imsi, maskKi, v.Amf, v.AlgoIndex, maskOpc})
+			data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc})
 		}
 		// 输出到文件
 		err := file.WriterCSVFile(data, filePath)
@@ -535,9 +521,7 @@ func (s *UdmUserApi) UdmAuthUserExport(w http.ResponseWriter, r *http.Request) {
 		// 转换数据
 		data := [][]string{}
 		for _, v := range list {
-			maskKi := parse.SafeContent(v.Ki)
-			maskOpc := parse.SafeContent(v.Opc)
-			data = append(data, []string{v.Imsi, maskKi, v.Amf, v.AlgoIndex, maskOpc})
+			data = append(data, []string{v.Imsi, v.Ki, v.Amf, v.AlgoIndex, v.Opc})
 		}
 		// 输出到文件
 		err = file.WriterTxtFile(data, filePath)