Merge branch 'dev_v1.1.2_wh' of moapp/jyPoints into feature/v1.1.2

resourceBrushLibrary/config/config.go

@@ -90,7 +90,7 @@ type taskConfig struct {
 func init() {
 	//程序配置文件
 	qu.ReadConfig(&Config)
-	qu.ReadConfig(&TaskConfig)
+	qu.ReadConfig("./task.json", &TaskConfig)
 	Mysql = &mysql.Mysql{
 		Address:      Config.Mysql.Address,
 		UserName:     Config.Mysql.UserName,

resourceBrushLibrary/entity/order.go

@@ -20,7 +20,7 @@ func OrderResource() {
 		OrderResourceRun(now, end)
 	}
 	TaskConfig.LastTime = end
-	qu.WriteSysConfig(TaskConfig)
+	qu.WriteSysConfig("./task.json", TaskConfig)
 }
 
 func OrderResourceRun(now time.Time, end int64) {

resourceBrushLibrary/rpc/message.go

@@ -1,15 +1,13 @@
 package rpc
 
 import (
-	"context"
-	"fmt"
-	"log"
-	. "resourceBrushLibrary/config"
-
 	"app.yhyue.com/moapp/MessageCenter/rpc/messageclient"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
+	"context"
+	"fmt"
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/zrpc"
+	"log"
 )
 
 var messageClient zrpc.Client
@@ -27,7 +25,7 @@ func init() {
 	}
 }
 
-//发消息
+// 发消息
 func SendMsg(req *message.MultipleSaveMsgReq) error {
 	resp, err := messageclient.NewMessage(messageClient).MultipleSaveMsg(context.Background(), req)
 	if err != nil {