x

go.mod

@@ -3,7 +3,6 @@ module git.diulo.com/mogfee/protoc-gen-kit
 go 1.20
 
 require (
-	git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/envoyproxy/protoc-gen-validate v0.9.1
 	github.com/gin-gonic/gin v1.9.0
@@ -23,6 +22,7 @@ require (
 )
 
 require (
+	git.diulo.com/mogfee/go-common v0.0.0-20230303052654-06d7df6bfba3 // indirect
 	github.com/bytedance/sonic v1.8.3 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect

go.sum

@@ -1,5 +1,5 @@
-git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24 h1:fL1oF18chI61PjnQCBy4549A5j6isNKN3gyOnNP7bLM=
+git.diulo.com/mogfee/go-common v0.0.0-20230303052654-06d7df6bfba3 h1:ZItibdvUseuUkxCxy1hwn0qoOUGkICSwWyd0FoL4CTs=
-git.diulo.com/mogfee/go-common v0.0.0-20230301071202-cc79129d6a24/go.mod h1:Q3SH0klnjQIvM57Fi95URevaFXIhsb7DZa+ZcNEU88M=
+git.diulo.com/mogfee/go-common v0.0.0-20230303052654-06d7df6bfba3/go.mod h1:BIjzTu3M817MtQqclalia82/Gg5gP9omcDUY3XU13kQ=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.8.3 h1:pf6fGl5eqWYKkx1RcD4qpuX+BIUaduv/wTm5ekWJ80M=
 github.com/bytedance/sonic v1.8.3/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=

pkg/captcha/captcha.go

@@ -23,19 +23,17 @@ func Generate(store base64Captcha.Store) (id, b64s string, err error) {
 }
 
 type redisStore struct {
-	redis  *redis.Client
+	redis *redis.Client
-	server string
 }
 
-func NewRedisStore(server string, redis *redis.Client) *redisStore {
+func NewRedisStore(redis *redis.Client) *redisStore {
 	return &redisStore{
-		redis:  redis,
+		redis: redis,
-		server: server,
 	}
 }
 
 func (r *redisStore) Key(key string) string {
-	return fmt.Sprintf("captach:%s:%s", r.server, key)
+	return fmt.Sprintf("captach::%s", key)
 }
 func (r *redisStore) Set(id string, value string) error {
 	return r.redis.Set(r.Key(id), value, time.Second*3700).Err()

pkg/php_session_decoder/common.go

@@ -1,6 +1,6 @@
 package php_session_decoder
 
-import "git.diulo.com/mogfee/go-common/php_session_decoder/php_serialize"
+import "git.diulo.com/mogfee/protoc-gen-kit/pkg/php_session_decoder/php_serialize"
 
 const SEPARATOR_VALUE_NAME rune = '|'
 

pkg/php_session_decoder/decoder.go

@@ -2,7 +2,7 @@ package php_session_decoder
 
 import (
 	"bytes"
-	"git.diulo.com/mogfee/go-common/php_session_decoder/php_serialize"
+	"git.diulo.com/mogfee/protoc-gen-kit/pkg/php_session_decoder/php_serialize"
 	"io"
 	"strings"
 )

pkg/php_session_decoder/encoder.go

@@ -3,7 +3,7 @@ package php_session_decoder
 import (
 	"bytes"
 	"fmt"
-	"git.diulo.com/mogfee/go-common/php_session_decoder/php_serialize"
+	"git.diulo.com/mogfee/protoc-gen-kit/pkg/php_session_decoder/php_serialize"
 )
 
 type PhpEncoder struct {