update

Author: chenjie199234

codegen/tml/config/template_config.go

@@ -113,12 +113,11 @@ import (
 // AppConfig can hot update
 // this is the config used for this app
 type AppConfig struct {
-	HandlerTimeout     map[string]map[string]ctime.Duration $json:"handler_timeout"$      //first key path,second key method(GET,POST,PUT,PATCH,DELETE,CRPC,GRPC),value timeout
-	WebPathRewrite     map[string]map[string]string         $json:"web_path_rewrite"$     //first key method(GET,POST,PUT,PATCH,DELETE),second key origin url,value new url
-	HandlerRate        publicmids.MultiPathRateConfigs      $json:"handler_rate"$         //key:path
-	Accesses           publicmids.MultiPathAccessConfigs    $json:"accesses"$             //key:path
-	TokenSecret        string                               $json:"token_secret"$         //if don't need token check,this can be ingored
-	SessionTokenExpire ctime.Duration                       $json:"session_token_expire"$ //if don't need session and token check,this can be ignored
+	HandlerTimeout     map[string]map[string]ctime.Duration $json:"handler_timeout"$  //first key path,second key method(GET,POST,PUT,PATCH,DELETE,CRPC,GRPC),value timeout
+	WebPathRewrite     map[string]map[string]string         $json:"web_path_rewrite"$ //first key method(GET,POST,PUT,PATCH,DELETE),second key origin url,value new url
+	HandlerRate        publicmids.MultiPathRateConfigs      $json:"handler_rate"$     //key:path
+	Accesses           publicmids.MultiPathAccessConfigs    $json:"accesses"$         //key:path
+	TokenSecret        string                               $json:"token_secret"$     //if don't need token check,this can be ingored
 	Service            *ServiceConfig                       $json:"service"$
 }
 type ServiceConfig struct {

codegen/tml/configfile/template_configfile.go

@@ -147,7 +147,6 @@ const app = `{
 		}]
 	},
 	"token_secret":"test",
-	"session_token_expire":"24h",
 	"service":{
 
 	}

codegen/tml/mainfile/template_main.go

@@ -97,8 +97,7 @@ func main() {
 		xweb.UpdateHandlerTimeout(ac.HandlerTimeout)
 		xweb.UpdateWebPathRewrite(ac.WebPathRewrite)
 		publicmids.UpdateRateConfig(ac.HandlerRate)
-		publicmids.UpdateTokenConfig(ac.TokenSecret, ac.SessionTokenExpire.StdDuration())
-		publicmids.UpdateSessionConfig(ac.SessionTokenExpire.StdDuration())
+		publicmids.UpdateTokenConfig(ac.TokenSecret)
 		publicmids.UpdateAccessConfig(ac.Accesses)
 	})
 	if rateredis := config.GetRedis("rate_redis"); rateredis != nil {

internal/version/version.go

@@ -4,7 +4,7 @@ import "fmt"
 
 var major = 0
 var minor = 0
-var patch = 119
+var patch = 120
 var status = ""
 
 func String() string {

mids/session.go

@@ -14,11 +14,7 @@ import (
 )
 
 var sessionredis *redis.Client
-var sessionexpire time.Duration
 
-func UpdateSessionConfig(expire time.Duration) {
-	sessionexpire = expire
-}
 func UpdateSessionRedisInstance(c *redis.Client) {
 	if c == nil {
 		slog.WarnContext(nil, "[session] redis missing,all session event will be failed")
@@ -31,7 +27,7 @@ func UpdateSessionRedisInstance(c *redis.Client) {
 
 // return empty means make session failed
 // user should put the return data in web's Session header or metadata's Session field
-func MakeSession(ctx context.Context, userid, data string) string {
+func MakeSession(ctx context.Context, userid, data string,expire time.Duration) string {
 	redisclient := sessionredis
 	if redisclient == nil {
 		slog.ErrorContext(ctx, "[session.make] redis missing")
@@ -40,7 +36,7 @@ func MakeSession(ctx context.Context, userid, data string) string {
 	result := make([]byte, 8)
 	rand.Read(result)
 	sessionid := hex.EncodeToString(result)
-	if _, e := redisclient.SetEx(ctx, "session_"+userid, sessionid+"_"+data, sessionexpire).Result(); e != nil {
+	if _, e := redisclient.SetEx(ctx, "session_"+userid, sessionid+"_"+data, expire).Result(); e != nil {
 		slog.ErrorContext(ctx, "[session.make] write session data failed", slog.String("userid", userid), slog.String("error", e.Error()))
 		return ""
 	}

mids/session_test.go

@@ -19,8 +19,7 @@ func Test_Session(t *testing.T) {
 		IOTimeout:       ctime.Duration(time.Second),
 	}, nil)
 	UpdateSessionRedisInstance(client)
-	UpdateSessionConfig(time.Second)
-	sessionstr := MakeSession(context.Background(), "1", "123")
+	sessionstr := MakeSession(context.Background(), "1", "123",time.Second)
 	if sessionstr == "" {
 		t.Fatal("should make session success")
 	}
@@ -39,7 +38,7 @@ func Test_Session(t *testing.T) {
 	if status {
 		t.Fatal("should not verify success")
 	}
-	sessionstr = MakeSession(context.Background(), "1", "123")
+	sessionstr = MakeSession(context.Background(), "1", "123",time.Second)
 	if sessionstr == "" {
 		t.Fatal("should make session success")
 	}

mids/token.go

@@ -20,18 +20,16 @@ type Token struct {
 }
 
 var tokensecret string
-var tokenexpire time.Duration
 
-func UpdateTokenConfig(secret string, expire time.Duration) {
+func UpdateTokenConfig(secret string) {
 	tokensecret = secret
-	tokenexpire = expire
 }
 
 // return empty means make token failed
 // put the return data in web's Token header or metadata's Token field
-func MakeToken(ctx context.Context, puber, deployenv, runenv, userid, data string) string {
+func MakeToken(ctx context.Context, puber, deployenv, runenv, userid, data string, expire time.Duration) string {
 	start := time.Now()
-	end := start.Add(tokenexpire)
+	end := start.Add(expire)
 	t, _ := json.Marshal(&Token{
 		Puber:     puber,
 		DeployEnv: deployenv,

mids/token_test.go

@@ -9,8 +9,8 @@ import (
 func Test_Token(t *testing.T) {
 	userid := "userid1"
 	data := "dajsldjlashdohasobncasbjkdhaosjdoasjdoiajsodjnlajsnckjbakjsdashdjkasdoqhwofhbihdbvisadofjaoasdjlasjdlajsldjoaisjdoajsodijasdjlaksjdlkajsldjlaksjdlaslsdlaksjdlajsldjalsjdlasjdlajlsdjalsjdlasjdlasjdlkasjldkajsldkjalskdjlkjdlsjdoas"
-	UpdateTokenConfig("123", time.Second)
-	tokenstr := MakeToken(context.Background(), "corelib", "ali", "test", userid, data)
+	UpdateTokenConfig("123")
+	tokenstr := MakeToken(context.Background(), "corelib", "ali", "test", userid, data, time.Second)
 	if tokenstr == "" {
 		t.Fatal("should make token success")
 	}
@@ -24,12 +24,12 @@ func Test_Token(t *testing.T) {
 	if token.Data != data {
 		t.Fatal("data broken")
 	}
-	UpdateTokenConfig("abc", time.Second)
+	UpdateTokenConfig("abc")
 	token = VerifyToken(context.Background(), tokenstr)
 	if token != nil {
 		t.Fatal("should not verify token success")
 	}
-	UpdateTokenConfig("123", time.Second)
+	UpdateTokenConfig("123")
 	time.Sleep(time.Second * 2)
 	token = VerifyToken(context.Background(), tokenstr)
 	if token != nil {