|
@@ -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)
|