更新SSO请求地址

README.md

@@ -15,11 +15,11 @@
 ```
 ### 2.引入
 ```go
-go get -u golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk
+go get -u golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk
 ```
 或 Go Module 
 ```go
-import "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
+import "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
 ```
 
 ### 3.服务端认证及返回处理
@@ -34,9 +34,9 @@ package applications
 import (
     "github.com/astaxie/beego"
     "github.com/astaxie/beego/context"
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth"
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/signers"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/signers"
     "golib.gaore.com/GaoreGo/grlogs"
 )
 
@@ -81,7 +81,7 @@ func init() {
 在`services`目录下以服务归类新建文件夹, 如`jedi`为短信服务，以 `RpcRequest` 和 `BaseResponse` 以基类写好请求子类和响应子类。一个请求接口对应一对请求和响应类。
 
 ```go
-import "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
+import "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
 
 const (
 	HOST    = "jedi"  // 如果非全域名会自动补全.gaore.com , 如jedi 会自动补全jedi.goare.com, 也可以打全域名 test.uu89.com
@@ -132,8 +132,8 @@ GET param_1=111&param_2=10086&param_3=false
 package jedi
 
 import (
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 // 定义请求体

sdk/auth/crediantial.go

@@ -1,6 +1,6 @@
 package auth
 
-import "golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+import "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 
 var debug utils.Debug
 

sdk/auth/rali_signature_composer.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"net/http"
 	"net/url"
 	"sort"

sdk/auth/roa_signature_composer.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"net/http"
 	"net/url"
 	"strconv"

sdk/auth/rpc_signature_composer.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"net/http"
 	"net/url"
 	"strconv"

sdk/auth/signer.go

@@ -2,10 +2,10 @@ package auth
 
 import (
 	"errors"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/signers"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/signers"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 	"net/http"
 )
 

sdk/auth/signers/access_key_siginer.go

@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/base64"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
 )
 
 type AccessKeySigner struct {

sdk/auth/signers/ali_appcode_signer.go

@@ -4,7 +4,7 @@ import (
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
 )
 
 type AliAppcodeSigner struct {

sdk/auth/signers/sts_token_signer.go

@@ -3,7 +3,7 @@ package signers
 import (
 	"crypto/md5"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
 )
 
 type StsTokenSigner struct {

sdk/client.go

@@ -5,11 +5,11 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/auth/credentials"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/auth/credentials"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -24,7 +24,7 @@ import (
 var Version = "0.0.1"
 var defaultConnectTimeout = 5 * time.Second
 var defaultReadTimeout = 10 * time.Second
-var defaultDomain = ".gaore.com"
+var defaultDomain = ".gaore.com.hk"
 var DefaultUserAgent = fmt.Sprintf("GaoreGoSdk (%s;%s) Golang/%s Core/%s", runtime.GOOS, runtime.GOARCH, strings.Trim(runtime.Version(), "go"), Version)
 
 var debug utils.Debug

sdk/config.go

@@ -1,7 +1,7 @@
 package sdk
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"net/http"
 	"time"
 )

sdk/requests/request.go

@@ -3,7 +3,7 @@ package requests
 import (
 	"errors"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"io"
 	"math/cmplx"
 	"reflect"
@@ -236,7 +236,7 @@ func defaultBaseRequest() (request *baseRequest) {
 		Method:       GET,
 		QueryParams:  make(map[string]string),
 		Headers: map[string]string{
-			"Gr-Sdk-Client":      "golang/1.14",
+			"Gr-Sdk-Client":      "golang/1.19.4",
 			"Gr-Sdk-Invoke-Type": "normal",
 			"Accept-Encoding":    Json,
 		},

sdk/requests/rpc_request.go

@@ -2,7 +2,7 @@ package requests
 
 import (
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/utils"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/utils"
 	"io"
 	"strings"
 )

sdk/responses/response.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 	"io/ioutil"
 	"net/http"
 	"strings"

services/apk/add_apk.go

@@ -1,8 +1,8 @@
 package apk
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type AddApkRequest struct {

services/apk/add_top.go

@@ -1,8 +1,8 @@
 package apk
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type AddTopRequest struct {

services/apk/client.go

@@ -2,8 +2,8 @@ package apk
 
 import (
 	"encoding/json"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 )
 
 const (

services/apk/refresh_apk.go

@@ -1,8 +1,8 @@
 package apk
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type RefreshApkRequest struct {

services/apk/search_apk.go

@@ -1,8 +1,8 @@
 package apk
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 	"time"
 )
 

services/callback/client.go

@@ -1,8 +1,8 @@
 package callback
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 )
 
 const (

services/callback/send_action.go

@@ -1,8 +1,8 @@
 package callback
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 const OS_ANDROID = 2

services/jedi/README.md

@@ -4,7 +4,7 @@
 ```go 
 import (
     "fmt"
-    "golib.gaore.com/GaoreGo/gaore-common-sdk-go/services/jedi"
+    "golib.gaore.com/GaoreGo/haiwai-common-sdk-go/services/jedi"
 )
 
 func main() {

services/jedi/client.go

@@ -1,8 +1,8 @@
 package jedi
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 	"strings"
 )
 

services/jedi/send_sms.go

@@ -1,8 +1,8 @@
 package jedi
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type SendSmsRequest struct {

services/mail/client.go

@@ -3,8 +3,8 @@ package mail
 import (
 	"crypto/md5"
 	"fmt"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 	"time"
 )
 

services/mail/end_email.go

@@ -1,8 +1,8 @@
 package mail
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type PostEmailRequest struct {

services/mkt/client.go

@@ -1,8 +1,8 @@
 package mkt
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 )
 
 const (

services/mkt/pkg_notice.go

@@ -1,8 +1,8 @@
 package mkt
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 // PkgNoticeRequest 打包通知请求信息

services/sso/client.go

@@ -1,8 +1,8 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 )
 
 const (
@@ -11,6 +11,18 @@ const (
 
 var HOST = requests.Host{
 	Default: "sso",
+	Func: func(s string) string {
+		host := map[string]string{
+			requests.RELEASE: "sso.gaore.com.hk",
+			requests.PRE:     "sso.gaore.com",
+			requests.TEST:    "sso.gaore.com",
+		}
+		if s, ok := host[s]; ok {
+			return s
+		} else {
+			return "sso.gaore.com.hk"
+		}
+	},
 }
 
 type Client struct {

services/sso/code_auth.go

@@ -1,8 +1,8 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type CodeAuthRequest struct {

services/sso/get_user.go

@@ -1,8 +1,8 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type GetUserInfoRequest struct {

services/sso/refresh_token.go

@@ -1,8 +1,8 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type RefreshTokenRequest struct {

services/sso/search_user.go

@@ -1,8 +1,8 @@
 package sso
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type SearchUserRequest struct {

services/www/client.go

@@ -1,8 +1,8 @@
 package www
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
 )
 
 const (

services/www/get_pwd.go

@@ -1,8 +1,8 @@
 package www
 
 import (
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/requests"
-	"golib.gaore.com/GaoreGo/gaore-common-sdk-go/sdk/responses"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/requests"
+	"golib.gaore.com/GaoreGo/haiwai-common-sdk-go/sdk/responses"
 )
 
 type GetPwdRequest struct {