提交接口

陆恒
1 parent bfc50df5
Showing 8 changed files with 241 additions and 16 deletions Show diff stats
src/HttpServer/jsonconf/jsonconf.go
src/HttpServer/logic/constdef.go
src/HttpServer/logic/datadef.go
src/HttpServer/logic/errordef.go
src/HttpServer/logic/function.go
src/HttpServer/logic/httpserver.go
src/HttpServer/logic/logic.go
src/common/redis/def.go
@@ -17,14 +17,14 @@ type SignConfig struct {
 }
  
 type GoldGunsConfig struct {
-	Level int `json:"level"`
-	Speed int `json:"speed"`
+	Level int   `json:"level"`
+	Speed int64 `json:"speed"`
 }
  
 type GoldChestConfig struct {
-	Boxid  int `json:"boxid"`
-	Score  int `json:"score"`
-	Reward int `json:"reward"`
+	Boxid  int   `json:"boxid"`
+	Score  int64 `json:"score"`
+	Reward int   `json:"reward"`
 }
  
 type GameConfig struct {
@@ -63,9 +63,13 @@ func GetGoldGunsConfig(level int) *GoldGunsConfig {
  
 func GetGoldChestConfig(boxid int) *GoldChestConfig {
  
+	finalid := boxid
+	if finalid > len(g_jsonconf.BoxConfig) {
+		finalid = g_jsonconf.BoxConfig[len(g_jsonconf.BoxConfig)-1].Boxid
+	}
 	var rt *GoldChestConfig
 	for _, val := range g_jsonconf.BoxConfig {
-		if val.Boxid == boxid {
+		if val.Boxid == finalid {
 			rt = &val
 			break
 		}
 package logic
+
+const (
+	DAILY_FETCH_CNT = 5 //每日领取宝箱次数
+)
 package logic
+
+//
+
+type GetcurpropertyReq struct {
+	Openid string `json:"openid"`
+}
+
+type GetcurpropertyData struct {
+	Protery  int64 `json:"protery"`
+	Speed    int64 `json:"speed"`
+	Curlevle int64 `json:"curlevle"`
+	Leftcnt  int   `json:"leftcnt"`
+}
+
+type GetcurpropertyResp struct {
+	ErrNum  int                `json:"errNum"`
+	RetMsg  string             `json:"retMsg"`
+	RetData GetcurpropertyData `json:"retData"`
+}
+
+//------------------------------------------------------------------------------------------------------
+
+type UserData struct {
+	Openid        string
+	LastGetTime   int   //上一次请求物资时间戳，如果超过三次时间间隔则不计算收益
+	LeftCnt       int   //当天剩余领取宝箱次数
+	MaxLevel      int   //当前最高枪等级
+	Property      int64 //当前物资
+	TotalFetchCnt int   //累计领取次数
+	SignRound     int   //签到轮数
+	SingDay       int   //签到天数
+	IsSign        int   //当天是否已经签到
+	TodaySec      int   //当天零点时间戳，用于判断跨天
+}
 package logic
  
 const (
-	ERROR_OK = 0 //没有错误
+	ERROR_OK                = 0 //没有错误
+	ERROR_UNMASH_JSONFAILED = 1 //json解析失败
+	ERROR_SERVER_FAILED     = 2 //j服务器错误
  
 )
 package logic
  
-import "net/http"
+import (
+	"HttpServer/jsonconf"
+	"HttpServer/redishandler"
+	"common/logger"
+	"common/redis"
+	"encoding/json"
+	"net/http"
+	"time"
+)
  
 func SetHeader(w http.ResponseWriter) {
 	w.Header().Set("Access-Control-Allow-Origin", "*") //允许访问所有域
 	w.Header().Set("Content-Type", "application/json")
 	w.Header().Set("Access-Control-Allow-Headers", "Content-Type,Uuid")
 }
+
+func SaveUserInfo(data *UserData) error {
+
+	savestr, err := json.Marshal(data)
+	if err != nil {
+		return err
+	}
+
+	err = redishandler.GetRedisClient().HSet(redis.USER_DATA_KEY, data.Openid, string(savestr))
+
+	return err
+}
+
+func GetUserInfo(openid string) (*UserData, error) {
+
+	//先判断用户是否存在 不存在创建新的用户
+	isexist, err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, openid)
+	if err != nil {
+		logger.Error("redis failed err=%v", err)
+		return nil, err
+	}
+
+	tmp := new(UserData)
+	if !isexist {
+		//不存在
+		//属于新登录的玩家数据
+		err = tmp.InitUserInfo(openid)
+	} else {
+		//已经登陆过了 需要获取玩家数据
+		data, err := redishandler.GetRedisClient().HGet(redis.USER_DATA_KEY, openid)
+		if err != nil {
+			return nil, err
+		}
+
+		err = json.Unmarshal([]byte(data), tmp)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	return tmp, nil
+}
+
+func (u *UserData) InitUserInfo(openid string) error {
+	nowtime := time.Now()
+	u.Openid = openid
+	u.SignRound = 1
+	u.IsSign = 0
+	u.LastGetTime = 0
+	u.LeftCnt = DAILY_FETCH_CNT
+	u.MaxLevel = 1
+	u.Property = 0
+	u.SingDay = 0
+	u.TodaySec = int(time.Date(nowtime.Year(), nowtime.Month(), nowtime.Day(), 0, 0, 0, 0, nowtime.Location()).Unix())
+	u.TotalFetchCnt = 0 //用于计算当前领取次数
+
+	err := SaveUserInfo(u)
+	if err != nil {
+		logger.Error("InitUserInfo err=%v", err)
+	}
+	return err
+}
+
+//计算当前领取宝箱需要的数值
+func (u *UserData) CalcCurLe() int64 {
+	cfg := jsonconf.GetGoldChestConfig(u.TotalFetchCnt + 1)
+	if cfg == nil {
+		logger.Error("CalcCurLe failed u=%v", u)
+		return 0
+	}
+
+	return cfg.Score
+}
+
+//计算速率
+func (u *UserData) CalcSpeed() int64 {
+	cfg := jsonconf.GetGoldGunsConfig(u.MaxLevel)
+	if cfg == nil {
+		logger.Error("CalcSpeed failed u=%v", u)
+		return 0
+	}
+	return cfg.Speed
+}
+
+//计算物资
+func (u *UserData) CalcProperty() {
+	nowtime := int(time.Now().Unix())
+	if nowtime < u.LastGetTime {
+		logger.Error("CalcProperty err n=%v,l=%v", nowtime, u.LastGetTime)
+	} else if nowtime >= u.LastGetTime+60*3 {
+		//超过三次请求了 不再计算离线收益
+
+	} else {
+		//计算一下离线收益
+		mult := nowtime - u.LastGetTime
+		speed := u.CalcSpeed()
+		u.Property += int64(mult) * speed
+	}
+	u.LastGetTime = nowtime
+
+	//判断跨天
+	if nowtime < u.TodaySec {
+		logger.Error("CalcProperty err2")
+		nowtt := time.Now()
+		u.TodaySec = int(time.Date(nowtt.Year(), nowtt.Month(), nowtt.Day(), 0, 0, 0, 0, nowtt.Location()).Unix())
+	} else {
+		if nowtime > u.TodaySec+86400 {
+			//跨天了
+			nowtt := time.Now()
+			u.TodaySec = int(time.Date(nowtt.Year(), nowtt.Month(), nowtt.Day(), 0, 0, 0, 0, nowtt.Location()).Unix())
+			u.LeftCnt = DAILY_FETCH_CNT
+			u.IsSign = 0
+			if u.SingDay == 7 {
+				u.SingDay = 0
+				u.SignRound++
+			}
+		}
+	}
+	//保存
+	err := SaveUserInfo(u)
+	if err != nil {
+		logger.Error("CalcProperty err=%v", err)
+	}
+}
@@ -43,7 +43,7 @@ func startServerHttpServe() {
 	http.HandleFunc("/eliminatestar/test", Testapi)    //测试接口
 	http.HandleFunc("/eliminatestar/clear", ClearData) //清除账号
 	//----------------------------------------------------------------------------------------
-
+	http.HandleFunc("/daycs/getcurproperty", Getcurproperty) //请求当前物资
 	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
 	CheckErr(err)
 }
@@ -67,9 +67,6 @@ func ClearData(w http.ResponseWriter, r *http.Request) {
 	logger.Info("ClearData , body:%v,uuid=%v", s, Uuid)
  
 	redishandler.GetRedisClient().HDel(redis.USER_DATA_KEY, strconv.Itoa(Uuid))
-	redishandler.GetRedisClient().HDel(redis.USER_TASKINFO_LIST, strconv.Itoa(Uuid))
-	redishandler.GetRedisClient().HDel(redis.USER_ACHIEVEMENTINFO_LIST, strconv.Itoa(Uuid))
-	redishandler.GetRedisClient().HDel(redis.USER_WITHDRAW_RECORDLIST, strconv.Itoa(Uuid))
  
 	fmt.Fprint(w, "success!")
 }
@@ -79,6 +76,16 @@ func Testapi(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprint(w, "success")
 }
  
+func Getcurproperty(w http.ResponseWriter, r *http.Request) {
+	result, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+
+	s := string(result)
+	logger.Info("Getcurproperty , body:%v", s)
+
+	HandlerGetcurproperty(w, s)
+}
+
 /*func Getnewlevelreward(w http.ResponseWriter, r *http.Request) {
  
 	Uuid := 0
 package logic
+
+import (
+	"common/logger"
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+func HandlerGetcurproperty(w http.ResponseWriter, data string) {
+	SetHeader(w)
+	var resp GetcurpropertyResp
+	resp.ErrNum = 0
+	var rdata GetcurpropertyReq
+	err := json.Unmarshal([]byte(data), &rdata)
+	for {
+		if err != nil {
+			logger.Info("json decode HandlerGetcurproperty data failed:%v,for:%v", err, data)
+			resp.RetMsg = "json解析失败"
+			resp.ErrNum = ERROR_UNMASH_JSONFAILED
+			break
+		}
+
+		uinfo, err := GetUserInfo(rdata.Openid)
+		if err != nil || uinfo == nil {
+			logger.Info(" HandlerGetcurproperty getdata failed:%v,for:%v", err, data)
+			resp.RetMsg = "服务器读取数据失败"
+			resp.ErrNum = ERROR_SERVER_FAILED
+			break
+		}
+
+		//需要处理一下物资计算
+		uinfo.CalcProperty()
+
+		//返回
+		resp.RetData.Leftcnt = uinfo.LeftCnt
+		resp.RetData.Curlevle = uinfo.CalcCurLe()
+		resp.RetData.Protery = uinfo.Property
+		resp.RetData.Speed = uinfo.CalcSpeed()
+
+		break
+	}
+	//回包
+	respstr, _ := json.Marshal(&resp)
+	fmt.Fprint(w, string(respstr))
+}
 package redis
  
 const (
-	USER_DATA_KEY   = "STARSTAR_USER_DATA_KEY"   //玩家数据
-	USER_WITHDRAW_RECORDLIST   = "STARSTAR_USER_WITHDRAW_RECORDLIST"   //玩家提现记录
-	USER_TASKINFO_LIST   = "STARSTAR_USER_TASKINFO_LIST"   //任务列表数据缓存
-	USER_ACHIEVEMENTINFO_LIST   = "STARSTAR_USER_ACHIEVEMENTINFO_LIST"   //成就列表数据缓存
+	USER_DATA_KEY = "DAYCS_USER_DATA_KEY" //玩家数据
  
 )
...	...	@@ -17,14 +17,14 @@ type SignConfig struct {
17	17	}
18	18
19	19	type GoldGunsConfig struct {
20		- Level int `json:"level"`
21		- Speed int `json:"speed"`
	20	+ Level int `json:"level"`
	21	+ Speed int64 `json:"speed"`
22	22	}
23	23
24	24	type GoldChestConfig struct {
25		- Boxid int `json:"boxid"`
26		- Score int `json:"score"`
27		- Reward int `json:"reward"`
	25	+ Boxid int `json:"boxid"`
	26	+ Score int64 `json:"score"`
	27	+ Reward int `json:"reward"`
28	28	}
29	29
30	30	type GameConfig struct {
...	...	@@ -63,9 +63,13 @@ func GetGoldGunsConfig(level int) *GoldGunsConfig {
63	63
64	64	func GetGoldChestConfig(boxid int) *GoldChestConfig {
65	65
	66	+ finalid := boxid
	67	+ if finalid > len(g_jsonconf.BoxConfig) {
	68	+ finalid = g_jsonconf.BoxConfig[len(g_jsonconf.BoxConfig)-1].Boxid
	69	+ }
66	70	var rt *GoldChestConfig
67	71	for _, val := range g_jsonconf.BoxConfig {
68		- if val.Boxid == boxid {
	72	+ if val.Boxid == finalid {
69	73	rt = &val
70	74	break
71	75	}
...	...
1	1	package logic
	2	+
	3	+const (
	4	+ DAILY_FETCH_CNT = 5 //每日领取宝箱次数
	5	+)
...	...
1	1	package logic
	2	+
	3	+//
	4	+
	5	+type GetcurpropertyReq struct {
	6	+ Openid string `json:"openid"`
	7	+}
	8	+
	9	+type GetcurpropertyData struct {
	10	+ Protery int64 `json:"protery"`
	11	+ Speed int64 `json:"speed"`
	12	+ Curlevle int64 `json:"curlevle"`
	13	+ Leftcnt int `json:"leftcnt"`
	14	+}
	15	+
	16	+type GetcurpropertyResp struct {
	17	+ ErrNum int `json:"errNum"`
	18	+ RetMsg string `json:"retMsg"`
	19	+ RetData GetcurpropertyData `json:"retData"`
	20	+}
	21	+
	22	+//------------------------------------------------------------------------------------------------------
	23	+
	24	+type UserData struct {
	25	+ Openid string
	26	+ LastGetTime int //上一次请求物资时间戳，如果超过三次时间间隔则不计算收益
	27	+ LeftCnt int //当天剩余领取宝箱次数
	28	+ MaxLevel int //当前最高枪等级
	29	+ Property int64 //当前物资
	30	+ TotalFetchCnt int //累计领取次数
	31	+ SignRound int //签到轮数
	32	+ SingDay int //签到天数
	33	+ IsSign int //当天是否已经签到
	34	+ TodaySec int //当天零点时间戳，用于判断跨天
	35	+}
...	...
1	1	package logic
2	2
3	3	const (
4		- ERROR_OK = 0 //没有错误
	4	+ ERROR_OK = 0 //没有错误
	5	+ ERROR_UNMASH_JSONFAILED = 1 //json解析失败
	6	+ ERROR_SERVER_FAILED = 2 //j服务器错误
5	7
6	8	)
...	...
1	1	package logic
2	2
3		-import "net/http"
	3	+import (
	4	+ "HttpServer/jsonconf"
	5	+ "HttpServer/redishandler"
	6	+ "common/logger"
	7	+ "common/redis"
	8	+ "encoding/json"
	9	+ "net/http"
	10	+ "time"
	11	+)
4	12
5	13	func SetHeader(w http.ResponseWriter) {
6	14	w.Header().Set("Access-Control-Allow-Origin", "*") //允许访问所有域
7	15	w.Header().Set("Content-Type", "application/json")
8	16	w.Header().Set("Access-Control-Allow-Headers", "Content-Type,Uuid")
9	17	}
	18	+
	19	+func SaveUserInfo(data *UserData) error {
	20	+
	21	+ savestr, err := json.Marshal(data)
	22	+ if err != nil {
	23	+ return err
	24	+ }
	25	+
	26	+ err = redishandler.GetRedisClient().HSet(redis.USER_DATA_KEY, data.Openid, string(savestr))
	27	+
	28	+ return err
	29	+}
	30	+
	31	+func GetUserInfo(openid string) (*UserData, error) {
	32	+
	33	+ //先判断用户是否存在不存在创建新的用户
	34	+ isexist, err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, openid)
	35	+ if err != nil {
	36	+ logger.Error("redis failed err=%v", err)
	37	+ return nil, err
	38	+ }
	39	+
	40	+ tmp := new(UserData)
	41	+ if !isexist {
	42	+ //不存在
	43	+ //属于新登录的玩家数据
	44	+ err = tmp.InitUserInfo(openid)
	45	+ } else {
	46	+ //已经登陆过了需要获取玩家数据
	47	+ data, err := redishandler.GetRedisClient().HGet(redis.USER_DATA_KEY, openid)
	48	+ if err != nil {
	49	+ return nil, err
	50	+ }
	51	+
	52	+ err = json.Unmarshal([]byte(data), tmp)
	53	+ if err != nil {
	54	+ return nil, err
	55	+ }
	56	+ }
	57	+
	58	+ return tmp, nil
	59	+}
	60	+
	61	+func (u *UserData) InitUserInfo(openid string) error {
	62	+ nowtime := time.Now()
	63	+ u.Openid = openid
	64	+ u.SignRound = 1
	65	+ u.IsSign = 0
	66	+ u.LastGetTime = 0
	67	+ u.LeftCnt = DAILY_FETCH_CNT
	68	+ u.MaxLevel = 1
	69	+ u.Property = 0
	70	+ u.SingDay = 0
	71	+ u.TodaySec = int(time.Date(nowtime.Year(), nowtime.Month(), nowtime.Day(), 0, 0, 0, 0, nowtime.Location()).Unix())
	72	+ u.TotalFetchCnt = 0 //用于计算当前领取次数
	73	+
	74	+ err := SaveUserInfo(u)
	75	+ if err != nil {
	76	+ logger.Error("InitUserInfo err=%v", err)
	77	+ }
	78	+ return err
	79	+}
	80	+
	81	+//计算当前领取宝箱需要的数值
	82	+func (u *UserData) CalcCurLe() int64 {
	83	+ cfg := jsonconf.GetGoldChestConfig(u.TotalFetchCnt + 1)
	84	+ if cfg == nil {
	85	+ logger.Error("CalcCurLe failed u=%v", u)
	86	+ return 0
	87	+ }
	88	+
	89	+ return cfg.Score
	90	+}
	91	+
	92	+//计算速率
	93	+func (u *UserData) CalcSpeed() int64 {
	94	+ cfg := jsonconf.GetGoldGunsConfig(u.MaxLevel)
	95	+ if cfg == nil {
	96	+ logger.Error("CalcSpeed failed u=%v", u)
	97	+ return 0
	98	+ }
	99	+ return cfg.Speed
	100	+}
	101	+
	102	+//计算物资
	103	+func (u *UserData) CalcProperty() {
	104	+ nowtime := int(time.Now().Unix())
	105	+ if nowtime < u.LastGetTime {
	106	+ logger.Error("CalcProperty err n=%v,l=%v", nowtime, u.LastGetTime)
	107	+ } else if nowtime >= u.LastGetTime+60*3 {
	108	+ //超过三次请求了不再计算离线收益
	109	+
	110	+ } else {
	111	+ //计算一下离线收益
	112	+ mult := nowtime - u.LastGetTime
	113	+ speed := u.CalcSpeed()
	114	+ u.Property += int64(mult) * speed
	115	+ }
	116	+ u.LastGetTime = nowtime
	117	+
	118	+ //判断跨天
	119	+ if nowtime < u.TodaySec {
	120	+ logger.Error("CalcProperty err2")
	121	+ nowtt := time.Now()
	122	+ u.TodaySec = int(time.Date(nowtt.Year(), nowtt.Month(), nowtt.Day(), 0, 0, 0, 0, nowtt.Location()).Unix())
	123	+ } else {
	124	+ if nowtime > u.TodaySec+86400 {
	125	+ //跨天了
	126	+ nowtt := time.Now()
	127	+ u.TodaySec = int(time.Date(nowtt.Year(), nowtt.Month(), nowtt.Day(), 0, 0, 0, 0, nowtt.Location()).Unix())
	128	+ u.LeftCnt = DAILY_FETCH_CNT
	129	+ u.IsSign = 0
	130	+ if u.SingDay == 7 {
	131	+ u.SingDay = 0
	132	+ u.SignRound++
	133	+ }
	134	+ }
	135	+ }
	136	+ //保存
	137	+ err := SaveUserInfo(u)
	138	+ if err != nil {
	139	+ logger.Error("CalcProperty err=%v", err)
	140	+ }
	141	+}
...	...
...	...	@@ -43,7 +43,7 @@ func startServerHttpServe() {
43	43	http.HandleFunc("/eliminatestar/test", Testapi) //测试接口
44	44	http.HandleFunc("/eliminatestar/clear", ClearData) //清除账号
45	45	//----------------------------------------------------------------------------------------
46		-
	46	+ http.HandleFunc("/daycs/getcurproperty", Getcurproperty) //请求当前物资
47	47	err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil)
48	48	CheckErr(err)
49	49	}
...	...	@@ -67,9 +67,6 @@ func ClearData(w http.ResponseWriter, r *http.Request) {
67	67	logger.Info("ClearData , body:%v,uuid=%v", s, Uuid)
68	68
69	69	redishandler.GetRedisClient().HDel(redis.USER_DATA_KEY, strconv.Itoa(Uuid))
70		- redishandler.GetRedisClient().HDel(redis.USER_TASKINFO_LIST, strconv.Itoa(Uuid))
71		- redishandler.GetRedisClient().HDel(redis.USER_ACHIEVEMENTINFO_LIST, strconv.Itoa(Uuid))
72		- redishandler.GetRedisClient().HDel(redis.USER_WITHDRAW_RECORDLIST, strconv.Itoa(Uuid))
73	70
74	71	fmt.Fprint(w, "success!")
75	72	}
...	...	@@ -79,6 +76,16 @@ func Testapi(w http.ResponseWriter, r *http.Request) {
79	76	fmt.Fprint(w, "success")
80	77	}
81	78
	79	+func Getcurproperty(w http.ResponseWriter, r *http.Request) {
	80	+ result, _ := ioutil.ReadAll(r.Body)
	81	+ r.Body.Close()
	82	+
	83	+ s := string(result)
	84	+ logger.Info("Getcurproperty , body:%v", s)
	85	+
	86	+ HandlerGetcurproperty(w, s)
	87	+}
	88	+
82	89	/func Getnewlevelreward(w http.ResponseWriter, r http.Request) {
83	90
84	91	Uuid := 0
...	...
1	1	package redis
2	2
3	3	const (
4		- USER_DATA_KEY = "STARSTAR_USER_DATA_KEY" //玩家数据
5		- USER_WITHDRAW_RECORDLIST = "STARSTAR_USER_WITHDRAW_RECORDLIST" //玩家提现记录
6		- USER_TASKINFO_LIST = "STARSTAR_USER_TASKINFO_LIST" //任务列表数据缓存
7		- USER_ACHIEVEMENTINFO_LIST = "STARSTAR_USER_ACHIEVEMENTINFO_LIST" //成就列表数据缓存
	4	+ USER_DATA_KEY = "DAYCS_USER_DATA_KEY" //玩家数据
8	5
9	6	)
...	...