From 2c3ee7ded45e0b7229836dd7a58f0fb75a4ea28c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 17 Sep 2014 10:11:18 +0800 Subject: [PATCH] . --- editor/editors.go | 8 ++++---- file/files.go | 2 +- main.go | 2 +- notification/notifications.go | 2 +- output/outputs.go | 10 +++++----- shell/shells.go | 4 ++-- user/sessions.go | 2 +- user/users.go | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/editor/editors.go b/editor/editors.go index 5138205..ba680f4 100644 --- a/editor/editors.go +++ b/editor/editors.go @@ -30,7 +30,7 @@ type snippet struct { // 建立编辑器通道. func WSHandler(w http.ResponseWriter, r *http.Request) { - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) editorWS[sid], _ = websocket.Upgrade(w, r, nil, 1024, 1024) @@ -99,7 +99,7 @@ func AutocompleteHandler(w http.ResponseWriter, r *http.Request) { return } - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) path := args["path"].(string) @@ -174,7 +174,7 @@ func FindDeclarationHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) decoder := json.NewDecoder(r.Body) @@ -255,7 +255,7 @@ func FindUsagesHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) decoder := json.NewDecoder(r.Body) diff --git a/file/files.go b/file/files.go index 316b461..baecea4 100644 --- a/file/files.go +++ b/file/files.go @@ -23,7 +23,7 @@ func GetFiles(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) userSrc := conf.Wide.GetUserWorkspace(username) + string(os.PathSeparator) + "src" diff --git a/main.go b/main.go index f5f73d4..73bb72f 100644 --- a/main.go +++ b/main.go @@ -47,7 +47,7 @@ func indexHandler(w http.ResponseWriter, r *http.Request) { model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(r), "locale": i18n.GetLocale(r), "session": wideSession} - httpSession, _ := user.Session.Get(r, "wide-session") + httpSession, _ := user.HTTPSession.Get(r, "wide-session") if httpSession.IsNew { // TODO: 写死以 admin 作为用户登录 diff --git a/notification/notifications.go b/notification/notifications.go index 4348ddc..75a0ad1 100644 --- a/notification/notifications.go +++ b/notification/notifications.go @@ -67,7 +67,7 @@ func event2Notification(e *event.Event) { // 建立通知通道. func WSHandler(w http.ResponseWriter, r *http.Request) { - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) conn, _ := websocket.Upgrade(w, r, nil, 1024, 1024) diff --git a/output/outputs.go b/output/outputs.go index b1f7b18..ee62adb 100644 --- a/output/outputs.go +++ b/output/outputs.go @@ -26,7 +26,7 @@ var outputWS = map[string]*util.WSChannel{} // 建立输出通道. func WSHandler(w http.ResponseWriter, r *http.Request) { - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) conn, _ := websocket.Upgrade(w, r, nil, 1024, 1024) @@ -45,7 +45,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) decoder := json.NewDecoder(r.Body) @@ -150,7 +150,7 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) username := session.Values["username"].(string) @@ -314,7 +314,7 @@ func GoInstallHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) username := session.Values["username"].(string) @@ -439,7 +439,7 @@ func GoGetHandler(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") sid := session.Values["id"].(string) username := session.Values["username"].(string) diff --git a/shell/shells.go b/shell/shells.go index 6e41820..4024775 100644 --- a/shell/shells.go +++ b/shell/shells.go @@ -30,7 +30,7 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) { model := map[string]interface{}{"conf": conf.Wide, "i18n": i18n.GetAll(r), "locale": i18n.GetLocale(r)} - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") if session.IsNew { // TODO: 写死以 admin 作为用户登录 @@ -60,7 +60,7 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) { // 建立 Shell 通道. func WSHandler(w http.ResponseWriter, r *http.Request) { - session, _ := user.Session.Get(r, "wide-session") + session, _ := user.HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) sid := session.Values["id"].(string) diff --git a/user/sessions.go b/user/sessions.go index 559be74..78285c9 100644 --- a/user/sessions.go +++ b/user/sessions.go @@ -14,7 +14,7 @@ const ( ) // 用户 HTTP 会话，用于验证登录. -var Session = sessions.NewCookieStore([]byte("BEYOND")) +var HTTPSession = sessions.NewCookieStore([]byte("BEYOND")) // Wide 会话，对应一个浏览器 tab. type WideSession struct { diff --git a/user/users.go b/user/users.go index 50a3df2..765d3a9 100644 --- a/user/users.go +++ b/user/users.go @@ -48,7 +48,7 @@ func InitGitRepos(w http.ResponseWriter, r *http.Request) { data := map[string]interface{}{"succ": true} defer util.RetJSON(w, r, data) - session, _ := Session.Get(r, "wide-session") + session, _ := HTTPSession.Get(r, "wide-session") username := session.Values["username"].(string) userRepos := conf.Wide.GetUserWorkspace(username) + string(os.PathSeparator) + "src"