diff --git a/src/HttpServer/logic/constdef.go b/src/HttpServer/logic/constdef.go index 48d7936..7f553d1 100644 --- a/src/HttpServer/logic/constdef.go +++ b/src/HttpServer/logic/constdef.go @@ -43,6 +43,7 @@ const ( const ( XIAOXINGXING_SERVERKEY = "33e0c3238c108a36d87025544c6a2d2f" + XIAOXINGXING_SDKURL = "33e0c3238c108a36d87025544c6a2d2f" ) const ( diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index b795ee8..22e37e2 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -349,11 +349,21 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr return errors.New("当前任务id错误") } - cfg := GetAchieveConfig(taskdesc.Taskid) - if cfg == nil || len(cfg.Reward) < 2 { - resp.Code = ERROR_SRV_ERROR - resp.Message = "网络错误" - return errors.New("获取配置失败") + var cfg *jsonconf.AchieveDesc + if req.Tasktype == 2 { + cfg = GetAchieveConfig(taskdesc.Taskid) + if cfg == nil || len(cfg.Reward) < 2 { + resp.Code = ERROR_SRV_ERROR + resp.Message = "网络错误" + return errors.New("获取配置失败") + } + } else { + cfg = GetTaskConfig(taskdesc.Taskid) + if cfg == nil || len(cfg.Reward) < 2 { + resp.Code = ERROR_SRV_ERROR + resp.Message = "网络错误" + return errors.New("获取配置失败") + } } //将状态置位已领取 @@ -723,6 +733,31 @@ func (uinfo *UserData) AddUserExp(num int) bool { return isup } +func GettotalParam(paramlist []string) string { + //排序 + sort.Strings(paramlist) + + //拼接 + sumparam := "" + for _, val := range paramlist { + sumparam += val + } + + return sumparam +} + +func GetHashValue(signsum string) string { + h := sha1.New() + h.Write([]byte(signsum)) + bs := h.Sum(nil) + sign := hex.EncodeToString(bs) + return sign +} + +func DoHttpPost(param []byte) (string, error) { + +} + func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) { return 0, nil } @@ -744,24 +779,13 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in ptyp := "typ=" + strconv.Itoa(atype) paramlist = append(paramlist, ptyp) - //排序 - sort.Strings(paramlist) - - //拼接 - sumparam := "" - for _, val := range paramlist { - sumparam += val - } - + sumparam := GettotalParam(paramlist) //加serverkey signsum := sumparam + XIAOXINGXING_SERVERKEY logger.Info("AddCoinToSdk sumparam=%v", signsum) //进行hash - h := sha1.New() - h.Write([]byte(signsum)) - bs := h.Sum(nil) - sign := hex.EncodeToString(bs) + sign := GetHashValue(signsum) var req AddCoinDesc req.Channel = channel @@ -773,6 +797,18 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in req.Typ = atype req.Uid = uuid + bys, err := json.Marshal(&req) + if err != nil { + logger.Error("AddCoinToSdk failed=%v", err) + return 0, err + } + res, err := DoHttpPost(bys) + if err != nil { + logger.Error("AddCoinToSdk failed=%v", err) + return 0, err + } + + logger.Info("AddCoinToSdk res=%v", res) return 0, nil } -- libgit2 0.21.0