Commit 4a4851ff030da4d4b84ca98ce0d7cb89d446733b
1 parent
db937d38
Exists in
master
and in
4 other branches
提交
Showing
2 changed files
with
55 additions
and
18 deletions
Show diff stats
src/HttpServer/logic/constdef.go
src/HttpServer/logic/function.go
| ... | ... | @@ -349,11 +349,21 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr |
| 349 | 349 | return errors.New("当前任务id错误") |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - cfg := GetAchieveConfig(taskdesc.Taskid) | |
| 353 | - if cfg == nil || len(cfg.Reward) < 2 { | |
| 354 | - resp.Code = ERROR_SRV_ERROR | |
| 355 | - resp.Message = "网络错误" | |
| 356 | - return errors.New("获取配置失败") | |
| 352 | + var cfg *jsonconf.AchieveDesc | |
| 353 | + if req.Tasktype == 2 { | |
| 354 | + cfg = GetAchieveConfig(taskdesc.Taskid) | |
| 355 | + if cfg == nil || len(cfg.Reward) < 2 { | |
| 356 | + resp.Code = ERROR_SRV_ERROR | |
| 357 | + resp.Message = "网络错误" | |
| 358 | + return errors.New("获取配置失败") | |
| 359 | + } | |
| 360 | + } else { | |
| 361 | + cfg = GetTaskConfig(taskdesc.Taskid) | |
| 362 | + if cfg == nil || len(cfg.Reward) < 2 { | |
| 363 | + resp.Code = ERROR_SRV_ERROR | |
| 364 | + resp.Message = "网络错误" | |
| 365 | + return errors.New("获取配置失败") | |
| 366 | + } | |
| 357 | 367 | } |
| 358 | 368 | |
| 359 | 369 | //将状态置位已领取 |
| ... | ... | @@ -723,6 +733,31 @@ func (uinfo *UserData) AddUserExp(num int) bool { |
| 723 | 733 | return isup |
| 724 | 734 | } |
| 725 | 735 | |
| 736 | +func GettotalParam(paramlist []string) string { | |
| 737 | + //排序 | |
| 738 | + sort.Strings(paramlist) | |
| 739 | + | |
| 740 | + //拼接 | |
| 741 | + sumparam := "" | |
| 742 | + for _, val := range paramlist { | |
| 743 | + sumparam += val | |
| 744 | + } | |
| 745 | + | |
| 746 | + return sumparam | |
| 747 | +} | |
| 748 | + | |
| 749 | +func GetHashValue(signsum string) string { | |
| 750 | + h := sha1.New() | |
| 751 | + h.Write([]byte(signsum)) | |
| 752 | + bs := h.Sum(nil) | |
| 753 | + sign := hex.EncodeToString(bs) | |
| 754 | + return sign | |
| 755 | +} | |
| 756 | + | |
| 757 | +func DoHttpPost(param []byte) (string, error) { | |
| 758 | + | |
| 759 | +} | |
| 760 | + | |
| 726 | 761 | func GetCoinFromSdk(uuid int, gameid string, channel string) (int, error) { |
| 727 | 762 | return 0, nil |
| 728 | 763 | } |
| ... | ... | @@ -744,24 +779,13 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in |
| 744 | 779 | ptyp := "typ=" + strconv.Itoa(atype) |
| 745 | 780 | paramlist = append(paramlist, ptyp) |
| 746 | 781 | |
| 747 | - //排序 | |
| 748 | - sort.Strings(paramlist) | |
| 749 | - | |
| 750 | - //拼接 | |
| 751 | - sumparam := "" | |
| 752 | - for _, val := range paramlist { | |
| 753 | - sumparam += val | |
| 754 | - } | |
| 755 | - | |
| 782 | + sumparam := GettotalParam(paramlist) | |
| 756 | 783 | //加serverkey |
| 757 | 784 | signsum := sumparam + XIAOXINGXING_SERVERKEY |
| 758 | 785 | logger.Info("AddCoinToSdk sumparam=%v", signsum) |
| 759 | 786 | |
| 760 | 787 | //进行hash |
| 761 | - h := sha1.New() | |
| 762 | - h.Write([]byte(signsum)) | |
| 763 | - bs := h.Sum(nil) | |
| 764 | - sign := hex.EncodeToString(bs) | |
| 788 | + sign := GetHashValue(signsum) | |
| 765 | 789 | |
| 766 | 790 | var req AddCoinDesc |
| 767 | 791 | req.Channel = channel |
| ... | ... | @@ -773,6 +797,18 @@ func AddCoinToSdk(uuid int, goldnum int, gameid string, channel string, atype in |
| 773 | 797 | req.Typ = atype |
| 774 | 798 | req.Uid = uuid |
| 775 | 799 | |
| 800 | + bys, err := json.Marshal(&req) | |
| 801 | + if err != nil { | |
| 802 | + logger.Error("AddCoinToSdk failed=%v", err) | |
| 803 | + return 0, err | |
| 804 | + } | |
| 805 | + res, err := DoHttpPost(bys) | |
| 806 | + if err != nil { | |
| 807 | + logger.Error("AddCoinToSdk failed=%v", err) | |
| 808 | + return 0, err | |
| 809 | + } | |
| 810 | + | |
| 811 | + logger.Info("AddCoinToSdk res=%v", res) | |
| 776 | 812 | return 0, nil |
| 777 | 813 | } |
| 778 | 814 | ... | ... |