Commit 28992a4fc1415a086c948714318e6187ca88d3c7
1 parent
5781eafa
Exists in
master
提交
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
src/HttpServer/logic/logic.go
| @@ -2857,14 +2857,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -2857,14 +2857,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 2857 | if err != nil { | 2857 | if err != nil { |
| 2858 | logger.Error("HandlerPutCattoWareHouse json unmarshal failed=%v", err) | 2858 | logger.Error("HandlerPutCattoWareHouse json unmarshal failed=%v", err) |
| 2859 | resp.Code = 1 | 2859 | resp.Code = 1 |
| 2860 | - resp.Message = "json failed" | 2860 | + resp.Message = "服务器错误" |
| 2861 | break | 2861 | break |
| 2862 | } | 2862 | } |
| 2863 | udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(uuid)) | 2863 | udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(uuid)) |
| 2864 | if err != nil { | 2864 | if err != nil { |
| 2865 | logger.Info("HandlerPutCattoWareHouse failed err=%v", err) | 2865 | logger.Info("HandlerPutCattoWareHouse failed err=%v", err) |
| 2866 | resp.Code = 1 | 2866 | resp.Code = 1 |
| 2867 | - resp.Message = "get redis failed" | 2867 | + resp.Message = "服务器错误" |
| 2868 | break | 2868 | break |
| 2869 | } | 2869 | } |
| 2870 | udata := new(UserWareHouseData) | 2870 | udata := new(UserWareHouseData) |
| @@ -2879,14 +2879,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -2879,14 +2879,14 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 2879 | if err != nil || uinfo == nil { | 2879 | if err != nil || uinfo == nil { |
| 2880 | logger.Error("HandlerPutCattoWareHouse getuserinfo failed=%v", err) | 2880 | logger.Error("HandlerPutCattoWareHouse getuserinfo failed=%v", err) |
| 2881 | resp.Code = 1 | 2881 | resp.Code = 1 |
| 2882 | - resp.Message = "get userinfo failed" | 2882 | + resp.Message = "服务器错误" |
| 2883 | break | 2883 | break |
| 2884 | } | 2884 | } |
| 2885 | 2885 | ||
| 2886 | if rdata.Position < 0 || rdata.Position >= len(uinfo.PosInfo) { | 2886 | if rdata.Position < 0 || rdata.Position >= len(uinfo.PosInfo) { |
| 2887 | logger.Error("HandlerPutCattoWareHouse posnotvalid failed=%v", err) | 2887 | logger.Error("HandlerPutCattoWareHouse posnotvalid failed=%v", err) |
| 2888 | resp.Code = 1 | 2888 | resp.Code = 1 |
| 2889 | - resp.Message = "posnotvalid" | 2889 | + resp.Message = "服务器错误" |
| 2890 | break | 2890 | break |
| 2891 | } | 2891 | } |
| 2892 | if uinfo.PosInfo[rdata.Position].StartTime != 0 { | 2892 | if uinfo.PosInfo[rdata.Position].StartTime != 0 { |
| @@ -2901,7 +2901,7 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -2901,7 +2901,7 @@ func HandlerPutCattoWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 2901 | if rtval == -1 { | 2901 | if rtval == -1 { |
| 2902 | logger.Error("HandlerPutCattoWareHouse warehouse full failed=%v", err) | 2902 | logger.Error("HandlerPutCattoWareHouse warehouse full failed=%v", err) |
| 2903 | resp.Code = 1 | 2903 | resp.Code = 1 |
| 2904 | - resp.Message = "warehouse full" | 2904 | + resp.Message = "仓库已满，无法加入" |
| 2905 | break | 2905 | break |
| 2906 | } | 2906 | } |
| 2907 | 2907 |