2023-10-12

Nats/Nats.go

@@ -33,7 +33,7 @@ func init() {
 func NatsInit() {
 
 	// 发布-订阅 模式，异步订阅 test1
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Read_Menu_List", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Read_Menu_List", func(m *nats.Msg) {
 
 		var t_R lib.JSONS
 
@@ -58,7 +58,7 @@ func NatsInit() {
 
 	})
 
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Read_User_Bind_Menu_List", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Read_User_Bind_Menu_List", func(m *nats.Msg) {
 
 		var t_R lib.JSONS
 
@@ -94,7 +94,7 @@ func NatsInit() {
 
 	})
 
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Add_Power", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Add_Power", func(m *nats.Msg) {
 
 		var t_Req powerlibs.Power
 		var t_R lib.JSONS
@@ -130,7 +130,7 @@ func NatsInit() {
 
 	})
 
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Read_Power_ByT_id", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Read_Power_ByT_id", func(m *nats.Msg) {
 		fmt.Printf("ERP_AMS_Read_Power_ByT_id message: %+v\n", string(m.Data))
 
 		var t_R lib.JSONS
@@ -155,7 +155,7 @@ func NatsInit() {
 
 	})
 
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Update_Power", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Update_Power", func(m *nats.Msg) {
 
 		var t_Req powerlibs.Power
 		var t_R lib.JSONS
@@ -193,7 +193,7 @@ func NatsInit() {
 
 	})
 
-	_, _ = Nats.Subscribe(conf.Sys_Name+"_Delete_Power", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+conf.Sys_Name+"_Delete_Power", func(m *nats.Msg) {
 
 		var t_Req powerlibs.Power
 		var t_R lib.JSONS

Nats/NatsServer/NatsERP_user.go

@@ -2,6 +2,7 @@ package NatsServer
 
 import (
 	"ERP_ams/Nats"
+	"ERP_ams/conf"
 	"ERP_ams/logs"
 	natslibs "git.baozhida.cn/ERP_libs/Nats"
 	userlibs "git.baozhida.cn/ERP_libs/User"
@@ -11,7 +12,7 @@ import (
 // 验证TOKEY
 func Verification(GetCookie string, GetString string) (user userlibs.User, err error) {
 
-	nats := natslibs.NewNats(Nats.Nats)
+	nats := natslibs.NewNats(Nats.Nats, conf.NatsSubj_Prefix)
 	user, err = nats.Verification(GetCookie, GetString)
 	if err != nil {
 		logs.Error(lib.FuncName(), err)
@@ -22,7 +23,7 @@ func Verification(GetCookie string, GetString string) (user userlibs.User, err e
 }
 
 func Read_User_List_All() (user []userlibs.User, err error) {
-	nats := natslibs.NewNats(Nats.Nats)
+	nats := natslibs.NewNats(Nats.Nats, conf.NatsSubj_Prefix)
 	user, err = nats.Read_User_List_All()
 	if err != nil {
 		logs.Error(lib.FuncName(), err)
@@ -34,18 +35,18 @@ func Read_User_List_All() (user []userlibs.User, err error) {
 
 // 添加系统日志
 func AddSysLogs(T_class, T_title string, T_txt interface{}) {
-	nats := natslibs.NewNats(Nats.Nats)
+	nats := natslibs.NewNats(Nats.Nats, conf.NatsSubj_Prefix)
 	nats.AddSysLogs(T_class, T_title, T_txt)
 }
 
 // 添加用户日志
 func AddUserLogs(T_uuid, T_class, T_title string, T_txt interface{}) {
-	nats := natslibs.NewNats(Nats.Nats)
+	nats := natslibs.NewNats(Nats.Nats, conf.NatsSubj_Prefix)
 	nats.AddUserLogs(T_uuid, T_class, T_title, T_txt)
 }
 
 // 添加用户日志
 func AddNews(T_uuid, T_title, T_Url string) {
-	nats := natslibs.NewNats(Nats.Nats)
+	nats := natslibs.NewNats(Nats.Nats, conf.NatsSubj_Prefix)
 	nats.AddNews(T_uuid, T_title, T_Url)
 }

conf/app.conf

@@ -7,8 +7,8 @@ copyrequestbody = true
 
 Sys_Name = "ERP_AMS"
 # Nats
-# NatsServer_Url = "192.168.192.251:4222"
-NatsServer_Url = "175.178.229.79:4222"
+NatsServer_Url = "127.0.0.1:4222"
+NatsSubj_Prefix = ""
 
 
 # Mysql 线上

conf/config.go

@@ -4,6 +4,7 @@ import beego "github.com/beego/beego/v2/server/web"
 
 var Page_size = 10
 var NatsServer_Url, _ = beego.AppConfig.String("NatsServer_Url")
+var NatsSubj_Prefix, _ = beego.AppConfig.String("NatsSubj_Prefix")
 var RunMode, _ = beego.AppConfig.String("RunMode")
 
 var Sys_Name, _ = beego.AppConfig.String("Sys_Name")

controllers/Leave.go

@@ -300,12 +300,15 @@ func (c *LeaveController) Leave_Approval() {
 		return
 	}
 
+	T_State_str := ""
 	if T_State == 1 {
 		leave.T_State = Attendance.AttendancePass
+		T_State_str = "已通过"
 	}
 
 	if T_State == 0 {
 		leave.T_State = Attendance.AttendanceNotPass
+		T_State_str = "未通过"
 	}
 
 	id, err := Attendance.Update_Attendance(leave, "T_State")
@@ -316,7 +319,7 @@ func (c *LeaveController) Leave_Approval() {
 	}
 
 	NatsServer.AddUserLogs(c.User.T_uuid, "我的请假", "审批", leave)
-	NatsServer.AddNews(leave.T_uid, "【请假申请】您的请假申请已通过", conf.MyLeaveNewsUrl)
+	NatsServer.AddNews(leave.T_uid, "【请假申请】您的请假申请审批"+T_State_str, conf.MyLeaveNewsUrl)
 
 	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: id}
 	c.ServeJSON()