zoie 1 anno fa
parent
commit
4793fa9496
4 ha cambiato i file con 26 aggiunte e 25 eliminazioni
  1. 8 8
      Nats/Nats.go
  2. 13 12
      Nats/NatsServer/NatsERP.go
  3. 4 5
      conf/app.conf
  4. 1 0
      conf/config.go

+ 8 - 8
Nats/Nats.go

@@ -30,7 +30,7 @@ func init() {
 
 func NatsInit() {
 	// 请求-响应, 响应 test3 消息。
-	_, _ = Nats.Subscribe("ERP_User_verification", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_User_verification", func(m *nats.Msg) {
 		fmt.Printf("ERP_User_verification message: %v\n", string(m.Data))
 
 		type T_R struct {
@@ -58,7 +58,7 @@ func NatsInit() {
 		_ = Nats.Publish(m.Reply, b)
 	})
 	// 请求-响应 获取所有用户列表
-	_, _ = Nats.Subscribe("ERP_User_Read_User_List_All", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_User_Read_User_List_All", func(m *nats.Msg) {
 
 		type T_R struct {
 			Code int16            `xml:"Code"`
@@ -74,8 +74,8 @@ func NatsInit() {
 		b, _ := msgpack.Marshal(&t_R)
 		_ = Nats.Publish(m.Reply, b)
 	})
-	// 请求-响应 获取所有用户列表
-	_, _ = Nats.Subscribe("ERP_User_Read_User_List_T_uuid", func(m *nats.Msg) {
+	// 请求-响应 获取用户列表
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_User_Read_User_List_T_uuid", func(m *nats.Msg) {
 
 		type T_S struct {
 			T_uuid []string
@@ -113,7 +113,7 @@ func NatsInit() {
 		_ = Nats.Publish(m.Reply, b)
 	})
 	// 请求-响应 获取所有权限列表
-	_, _ = Nats.Subscribe("ERP_User_Read_Power_List_All", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_User_Read_Power_List_All", func(m *nats.Msg) {
 
 		type T_R struct {
 			Code  int16               `xml:"Code"`
@@ -131,7 +131,7 @@ func NatsInit() {
 		_ = Nats.Publish(m.Reply, b)
 	})
 	// 发布-订阅 模式,异步订阅 系统日志
-	_, _ = Nats.Subscribe("ERP_AddSysLogs", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_AddSysLogs", func(m *nats.Msg) {
 		fmt.Printf("ERP_AddSysLogs message: %v\n", string(m.Data))
 
 		type T_S struct {
@@ -153,7 +153,7 @@ func NatsInit() {
 
 	})
 	// 发布-订阅 模式,异步订阅 用户日志
-	_, _ = Nats.Subscribe("ERP_AddUserLogs", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_AddUserLogs", func(m *nats.Msg) {
 		fmt.Printf("ERP_AddUserLogs message: %v\n", string(m.Data))
 
 		type T_S struct {
@@ -175,7 +175,7 @@ func NatsInit() {
 
 	})
 	// 发布-订阅 模式,异步订阅 消息
-	_, _ = Nats.Subscribe("ERP_AddNews", func(m *nats.Msg) {
+	_, _ = Nats.Subscribe(conf.NatsSubj_Prefix+"ERP_AddNews", func(m *nats.Msg) {
 		fmt.Printf("ERP_AddNews message: %v\n", string(m.Data))
 
 		type T_S struct {

+ 13 - 12
Nats/NatsServer/NatsERP.go

@@ -2,6 +2,7 @@ package NatsServer
 
 import (
 	"ERP_user/Nats"
+	"ERP_user/conf"
 	"ERP_user/logs"
 	"ERP_user/models/Account"
 	"errors"
@@ -15,7 +16,7 @@ import (
 
 func ERP_Read_Menu_List(prefix string) ([]menulibs.Menu, error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Read_Menu_List")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Read_Menu_List")
 	msg, err := Nats.Nats.Request(subj, []byte(""), 3*time.Second)
 	if err != nil {
 		logs.Error(lib.FuncName(), sysName, err)
@@ -34,14 +35,14 @@ func ERP_Read_Menu_List(prefix string) ([]menulibs.Menu, error) {
 		logs.Error(lib.FuncName(), sysName, err)
 		return nil, err
 	}
-	fmt.Printf("ERP_Read_Menu_List: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	return t_R.Data, nil
 }
 
 func ERP_Read_User_Bind_Menu_List(prefix string, T_power string) ([]menulibs.Menu, error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Read_User_Bind_Menu_List")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Read_User_Bind_Menu_List")
 	msg, err := Nats.Nats.Request(subj, []byte(T_power), 3*time.Second)
 	if err != nil {
 		logs.Error(lib.FuncName(), sysName, err)
@@ -60,14 +61,14 @@ func ERP_Read_User_Bind_Menu_List(prefix string, T_power string) ([]menulibs.Men
 		logs.Error(lib.FuncName(), sysName, err)
 		return nil, err
 	}
-	fmt.Printf("ERP_Read_Menu_List: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	return t_R.Data, nil
 }
 
 func ERP_Add_Power(prefix string, power powerlibs.Power) (id int, err error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Add_Power")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Add_Power")
 
 	b, _ := msgpack.Marshal(&power)
 
@@ -89,7 +90,7 @@ func ERP_Add_Power(prefix string, power powerlibs.Power) (id int, err error) {
 		logs.Error(lib.FuncName(), sysName, err)
 		return
 	}
-	fmt.Printf("ERP_Add_Power: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	if t_R.Code != 200 {
 		err = errors.New(t_R.Msg)
@@ -102,7 +103,7 @@ func ERP_Add_Power(prefix string, power powerlibs.Power) (id int, err error) {
 
 func ERP_Read_Power_ByT_id(prefix string, T_id string) (r powerlibs.Power, err error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Read_Power_ByT_id")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Read_Power_ByT_id")
 
 	msg, err := Nats.Nats.Request(subj, []byte(T_id), 3*time.Second)
 	if err != nil {
@@ -122,7 +123,7 @@ func ERP_Read_Power_ByT_id(prefix string, T_id string) (r powerlibs.Power, err e
 		logs.Error(lib.FuncName(), sysName, err)
 		return
 	}
-	fmt.Printf("ERP_Read_Power_ByT_id: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	if t_R.Code != 200 {
 		err = errors.New(t_R.Msg)
@@ -135,7 +136,7 @@ func ERP_Read_Power_ByT_id(prefix string, T_id string) (r powerlibs.Power, err e
 
 func ERP_Update_Power(prefix string, power powerlibs.Power) (id int, err error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Update_Power")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Update_Power")
 
 	b, _ := msgpack.Marshal(&power)
 
@@ -157,7 +158,7 @@ func ERP_Update_Power(prefix string, power powerlibs.Power) (id int, err error)
 		logs.Error(lib.FuncName(), sysName, err)
 		return
 	}
-	fmt.Printf("ERP_Update_Power: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	if t_R.Code != 200 {
 		err = errors.New(t_R.Msg)
@@ -170,7 +171,7 @@ func ERP_Update_Power(prefix string, power powerlibs.Power) (id int, err error)
 
 func ERP_Delete_Power(prefix string, power powerlibs.Power) (id int64, err error) {
 	sysName := Account.Get_Sys_Name(prefix)
-	subj := fmt.Sprintf("%s_%s", prefix, "Delete_Power")
+	subj := conf.NatsSubj_Prefix + fmt.Sprintf("%s_%s", prefix, "Delete_Power")
 
 	b, _ := msgpack.Marshal(&power)
 
@@ -192,7 +193,7 @@ func ERP_Delete_Power(prefix string, power powerlibs.Power) (id int64, err error
 		logs.Error(lib.FuncName(), sysName, err)
 		return
 	}
-	fmt.Printf("ERP_Delete_Power: %+v\n", t_R)
+	fmt.Printf("%s: %+v\n", subj, t_R)
 
 	if t_R.Code != 200 {
 		err = errors.New(t_R.Msg)

+ 4 - 5
conf/app.conf

@@ -5,11 +5,10 @@ Graceful = true
 EnableDocs = true
 copyrequestbody = true
 
-# NatsServer_Url = "192.168.192.251:4222"
-NatsServer_Url = "175.178.229.79:4222"
-
+NatsServer_Url = "127.0.0.1:4222"
+NatsSubj_Prefix = ""
 # Mysql 线上
-MysqlServer_UrlPort = "192.168.192.251:3306"
+MysqlServer_UrlPort = "127.0.0.1:3316"
 MysqlServer_Database = "erp_user_test"
 MysqlServer_Username = "erp_user_test"
 MysqlServer_Password = "C8iaSLwhRpCermaR"
@@ -17,7 +16,7 @@ MysqlServer_MaxIdleConnections = 100
 MysqlServer_MaxOpenConnections = 200
 
 # Redis
-Redis_address = "192.168.192.251:6379"
+Redis_address = "127.0.0.1:6378"
 Redis_password = ""
 Redis_dbNum = "2"
 

+ 1 - 0
conf/config.go

@@ -6,6 +6,7 @@ import (
 
 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")
 
 // Mysql