1
This commit is contained in:
parent
7f38d722b4
commit
d93c2ba089
@ -1,6 +1,7 @@
|
|||||||
{
|
{
|
||||||
"gamesapi_url": "https://game2006sapi-test.kingsome.cn",
|
"gamesapi_url": "https://game2006sapi-test.kingsome.cn",
|
||||||
"redirect_url": "https://game2006api-test.kingsome.cn",
|
"redirect_url": "https://game2006api-test.kingsome.cn",
|
||||||
|
"redirect_secret_key": "",
|
||||||
"max_concurrent_num": 10,
|
"max_concurrent_num": 10,
|
||||||
"request_over_time": 30
|
"request_over_time": 30
|
||||||
}
|
}
|
||||||
|
@ -34,6 +34,7 @@ require (
|
|||||||
github.com/goccy/go-json v0.10.2 // indirect
|
github.com/goccy/go-json v0.10.2 // indirect
|
||||||
github.com/golang/protobuf v1.5.0 // indirect
|
github.com/golang/protobuf v1.5.0 // indirect
|
||||||
github.com/gomodule/redigo v1.8.3 // indirect
|
github.com/gomodule/redigo v1.8.3 // indirect
|
||||||
|
github.com/google/uuid v1.6.0 // indirect
|
||||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||||
github.com/jinzhu/now v1.1.5 // indirect
|
github.com/jinzhu/now v1.1.5 // indirect
|
||||||
github.com/json-iterator/go v1.1.12 // indirect
|
github.com/json-iterator/go v1.1.12 // indirect
|
||||||
|
@ -36,6 +36,8 @@ github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUz
|
|||||||
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
|
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||||
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
||||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||||
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||||
|
@ -12,6 +12,7 @@ import (
|
|||||||
net_url "net/url"
|
net_url "net/url"
|
||||||
"strings"
|
"strings"
|
||||||
"errors"
|
"errors"
|
||||||
|
"github.com/google/uuid"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -38,12 +39,17 @@ func CaForward(c *gin.Context) {
|
|||||||
if !q5.StrContains(newUrl, "?") {
|
if !q5.StrContains(newUrl, "?") {
|
||||||
newUrl = newUrl + "?"
|
newUrl = newUrl + "?"
|
||||||
}
|
}
|
||||||
|
params := []*[]string{}
|
||||||
|
nonce := uuid.New().String()
|
||||||
|
nowTime := f5.GetApp().GetRealSeconds()
|
||||||
|
u := net_url.Values{}
|
||||||
{
|
{
|
||||||
u := net_url.Values{}
|
|
||||||
for k, v := range c.Request.URL.Query() {
|
for k, v := range c.Request.URL.Query() {
|
||||||
u.Set(k, v[0])
|
u.Set(k, v[0])
|
||||||
|
q5.AppendSlice(¶ms, &[]string{k, v[0]})
|
||||||
}
|
}
|
||||||
newUrl += u.Encode()
|
u.Set("__nonce", nonce)
|
||||||
|
u.Set("__timestamp", q5.ToString(nowTime))
|
||||||
}
|
}
|
||||||
|
|
||||||
var httpRequest *http.Request
|
var httpRequest *http.Request
|
||||||
@ -51,6 +57,8 @@ func CaForward(c *gin.Context) {
|
|||||||
switch strings.ToUpper(c.Request.Method) {
|
switch strings.ToUpper(c.Request.Method) {
|
||||||
case "GET": {
|
case "GET": {
|
||||||
service.SApiForward.IncGetTimes()
|
service.SApiForward.IncGetTimes()
|
||||||
|
u.Set("__sign", service.SApiForward.Sign(params, nonce, nowTime, ""))
|
||||||
|
newUrl += u.Encode()
|
||||||
httpRequest, createErr = http.NewRequest("GET", newUrl, nil)
|
httpRequest, createErr = http.NewRequest("GET", newUrl, nil)
|
||||||
if !f5.IsOnlineEnv() {
|
if !f5.IsOnlineEnv() {
|
||||||
f5.GetSysLog().Info("CaForward method:%s newUrl:%s ", c.Request.Method, newUrl)
|
f5.GetSysLog().Info("CaForward method:%s newUrl:%s ", c.Request.Method, newUrl)
|
||||||
@ -59,6 +67,8 @@ func CaForward(c *gin.Context) {
|
|||||||
case "POST": {
|
case "POST": {
|
||||||
service.SApiForward.IncPostTimes()
|
service.SApiForward.IncPostTimes()
|
||||||
if postData, err := c.GetRawData(); err == nil {
|
if postData, err := c.GetRawData(); err == nil {
|
||||||
|
u.Set("__sign", service.SApiForward.Sign(params, nonce, nowTime, string(postData)))
|
||||||
|
newUrl += u.Encode()
|
||||||
httpRequest, createErr = http.NewRequest("POST", newUrl, bytes.NewBuffer(postData))
|
httpRequest, createErr = http.NewRequest("POST", newUrl, bytes.NewBuffer(postData))
|
||||||
contentType := c.GetHeader("Content-Type")
|
contentType := c.GetHeader("Content-Type")
|
||||||
if contentType != "" {
|
if contentType != "" {
|
||||||
|
@ -26,6 +26,10 @@ func (this *ConfigTable) GetMaxConcurrentNum() int32 {
|
|||||||
return this.selfConf.GetMaxConcurrentNum()
|
return this.selfConf.GetMaxConcurrentNum()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *ConfigTable) GetRedirectSecretKey() string {
|
||||||
|
return this.selfConf.GetRedirectSecretKey()
|
||||||
|
}
|
||||||
|
|
||||||
func (this *ConfigTable) PostInit1() {
|
func (this *ConfigTable) PostInit1() {
|
||||||
this.selfConf = this.GetById(int64(0))
|
this.selfConf = this.GetById(int64(0))
|
||||||
if this.selfConf == nil {
|
if this.selfConf == nil {
|
||||||
|
@ -21,6 +21,7 @@ type Config struct {
|
|||||||
redirect_url string
|
redirect_url string
|
||||||
max_concurrent_num int32
|
max_concurrent_num int32
|
||||||
request_over_time int32
|
request_over_time int32
|
||||||
|
redirect_secret_key string
|
||||||
|
|
||||||
_flags1_ uint64
|
_flags1_ uint64
|
||||||
_flags2_ uint64
|
_flags2_ uint64
|
||||||
@ -106,6 +107,14 @@ func (this *Config) HasRequestOverTime() bool {
|
|||||||
return (this._flags1_ & (uint64(1) << 7)) > 0
|
return (this._flags1_ & (uint64(1) << 7)) > 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *Config) GetRedirectSecretKey() string {
|
||||||
|
return this.redirect_secret_key
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *Config) HasRedirectSecretKey() bool {
|
||||||
|
return (this._flags1_ & (uint64(1) << 8)) > 0
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
func (this *GamesapiCluster) LoadFromKv(kv map[string]interface{}) {
|
func (this *GamesapiCluster) LoadFromKv(kv map[string]interface{}) {
|
||||||
f5.ReadMetaTableField(&this.instance_id, "instance_id", &this._flags1_, 1, kv)
|
f5.ReadMetaTableField(&this.instance_id, "instance_id", &this._flags1_, 1, kv)
|
||||||
@ -121,4 +130,5 @@ func (this *Config) LoadFromKv(kv map[string]interface{}) {
|
|||||||
f5.ReadMetaTableField(&this.redirect_url, "redirect_url", &this._flags1_, 5, kv)
|
f5.ReadMetaTableField(&this.redirect_url, "redirect_url", &this._flags1_, 5, kv)
|
||||||
f5.ReadMetaTableField(&this.max_concurrent_num, "max_concurrent_num", &this._flags1_, 6, kv)
|
f5.ReadMetaTableField(&this.max_concurrent_num, "max_concurrent_num", &this._flags1_, 6, kv)
|
||||||
f5.ReadMetaTableField(&this.request_over_time, "request_over_time", &this._flags1_, 7, kv)
|
f5.ReadMetaTableField(&this.request_over_time, "request_over_time", &this._flags1_, 7, kv)
|
||||||
|
f5.ReadMetaTableField(&this.redirect_secret_key, "redirect_secret_key", &this._flags1_, 8, kv)
|
||||||
}
|
}
|
||||||
|
@ -18,4 +18,5 @@ message Config
|
|||||||
optional string redirect_url = 5;
|
optional string redirect_url = 5;
|
||||||
optional int32 max_concurrent_num = 6;
|
optional int32 max_concurrent_num = 6;
|
||||||
optional int32 request_over_time = 7;
|
optional int32 request_over_time = 7;
|
||||||
|
optional string redirect_secret_key = 8;
|
||||||
}
|
}
|
||||||
|
@ -100,3 +100,16 @@ func (this *sApiForward) getOrCreate(c *SApiForwardLockCache, accountId string)
|
|||||||
return u
|
return u
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (this *sApiForward) Sign(params []*[]string, nonce string, timeStamp int64, postData string) string {
|
||||||
|
sign := ""
|
||||||
|
signData := ""
|
||||||
|
q5.Sort(params, func (a *[]string, b *[]string) bool {
|
||||||
|
return (*a)[0] < (*b)[0]
|
||||||
|
})
|
||||||
|
for _, v := range params {
|
||||||
|
signData += (*v)[0] + "=" + (*v)[1] + "&"
|
||||||
|
}
|
||||||
|
signData += q5.Md5Str(nonce + q5.ToString(timeStamp) + postData + mt.Table.Config.GetRedirectSecretKey())
|
||||||
|
return sign
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user