From f99145deacb0f7a3bfdcc31cceef50afc898d5c1 Mon Sep 17 00:00:00 2001
From: wh_zcy <wh_zcy@yeah.net>
Date: Mon, 29 Aug 2022 18:46:19 +0800
Subject: [PATCH] update

---
 cmd/v2/service/sshService.go | 7 +++----
 comm/imodule.go              | 2 +-
 modules/rtask/api_choose.go  | 5 +----
 modules/rtask/module.go      | 5 +++++
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/v2/service/sshService.go b/cmd/v2/service/sshService.go
index f9ef17e6d..d88b13b22 100644
--- a/cmd/v2/service/sshService.go
+++ b/cmd/v2/service/sshService.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"net"
 	"os"
 	"time"
@@ -87,10 +86,10 @@ func (ss *SSHService) RunShell(shell string) {
 		session *ssh.Session
 		err     error
 	)
-	
+
 	//获取session，这个session是用来远程执行操作的
 	if session, err = ss.Client.NewSession(); err != nil {
-		log.Fatalln("error occurred:", err)
+		logrus.Errorf("error newsession:%v", err)
 	}
 	// 使用 session.Shell() 模拟终端时，所建立的终端参数
 	modes := ssh.TerminalModes{
@@ -105,7 +104,7 @@ func (ss *SSHService) RunShell(shell string) {
 
 	//执行shell
 	if output, err := session.CombinedOutput(shell); err != nil {
-		log.Fatalln("error occurred:", err)
+		logrus.Errorf("error CombinedOutput:%v", err)
 	} else {
 		ss.LastResult = string(output)
 	}
diff --git a/comm/imodule.go b/comm/imodule.go
index 350dd3784..d0304ad1c 100644
--- a/comm/imodule.go
+++ b/comm/imodule.go
@@ -113,7 +113,7 @@ type (
 	// 随机任务
 	IRtask interface {
 		//任务触发
-		SendToRtask(session IUserSession, param *pb.RtaskParam) (code pb.ErrorCode)
+		SendToRtask(session IUserSession, rtaskType int32, params ...interface{}) (code pb.ErrorCode)
 	}
 
 	//好友
diff --git a/modules/rtask/api_choose.go b/modules/rtask/api_choose.go
index 931d2d1f8..2a8dd4a4f 100644
--- a/modules/rtask/api_choose.go
+++ b/modules/rtask/api_choose.go
@@ -61,13 +61,13 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 		frtaskArr = &pb.FrtaskIds{}
 	}
 
-	// 更新完成的任务
 	//验证该任务是否已完成
 	if _, ok := utils.Findx(frtaskArr.RtaskIds, req.RtaskId); ok {
 		code = pb.ErrorCode_RtaskFinished
 		return
 	}
 
+	// 更新完成的任务
 	frtaskArr.RtaskIds = append(frtaskArr.RtaskIds, req.RtaskId)
 	if rtask.FrtaskIds == nil {
 		rtask.FrtaskIds = make(map[int32]*pb.FrtaskIds)
@@ -80,9 +80,6 @@ func (this *apiComp) Choose(session comm.IUserSession, req *pb.RtaskChooseReq) (
 		code = pb.ErrorCode_SystemError
 	}
 
-	//发奖励
-	code = this.moduleRtask.DispenseRes(session, sideConf.Reward, true)
-
 	rsp := &pb.RtaskChooseResp{
 		RtaskId:  req.RtaskId,
 		ChooseId: req.ChooseId,
diff --git a/modules/rtask/module.go b/modules/rtask/module.go
index 6cb0b9db5..52a61a17f 100644
--- a/modules/rtask/module.go
+++ b/modules/rtask/module.go
@@ -6,6 +6,7 @@ import (
 	"go_dreamfactory/lego/core"
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules"
+	"go_dreamfactory/pb"
 	cfg "go_dreamfactory/sys/configure/structs"
 )
 
@@ -112,3 +113,7 @@ func (this *ModuleRtask) initRtaskHandle() {
 		}
 	}
 }
+
+func SendToRtask(session comm.IUserSession, rtaskType int32, params ...interface{}) (code pb.ErrorCode) {
+	return
+}