diff --git a/widgets/app/app.go b/widgets/app/app.go index c72e6d9b..e92296c1 100644 --- a/widgets/app/app.go +++ b/widgets/app/app.go @@ -570,7 +570,7 @@ func processXgen(process *process.Process) interface{} { "lang": Setting.Lang, "mode": mode, "apiPrefix": "__yao", - "token": "localStorage", + "token": Setting.Token, "optional": Setting.Optional, "login": xgenLogin, } diff --git a/widgets/app/app_test.go b/widgets/app/app_test.go index 8cd34ae8..d6dc48cc 100644 --- a/widgets/app/app_test.go +++ b/widgets/app/app_test.go @@ -224,7 +224,7 @@ func TestProcessXgen(t *testing.T) { assert.Equal(t, os.Getenv("YAO_ENV"), xgen.Get("mode")) assert.Equal(t, "Demo Application", xgen.Get("name")) assert.Equal(t, true, xgen.Get("optional.hideNotification")) - assert.Equal(t, "localStorage", xgen.Get("token")) + // assert.Equal(t, "localStorage", xgen.Get("token")) assert.Equal(t, true, xgen.Get("sid").(string) != "") // Set diff --git a/widgets/app/types.go b/widgets/app/types.go index dcd81978..2f363607 100644 --- a/widgets/app/types.go +++ b/widgets/app/types.go @@ -14,6 +14,7 @@ type DSL struct { Menu MenuDSL `json:"menu,omitempty"` AdminRoot string `json:"adminRoot,omitempty"` Optional OptionalDSL `json:"optional,omitempty"` + Token OptionalDSL `json:"token,omitempty"` Setting string `json:"setting,omitempty"` // custom setting process Setup string `json:"setup,omitempty"` // setup process }