From 011fcc7dd4a4807dfebdc0ac6e9df37a781142da Mon Sep 17 00:00:00 2001 From: boojack Date: Mon, 27 Jun 2022 22:09:06 +0800 Subject: [PATCH] chore: rename module --- api/system.go | 2 +- bin/server/cmd/root.go | 8 ++++---- bin/server/main.go | 2 +- go.mod | 2 +- server/auth.go | 5 +++-- server/basic_auth.go | 5 +++-- server/memo.go | 5 +++-- server/profile/profile.go | 3 ++- server/resource.go | 3 ++- server/server.go | 5 +++-- server/shortcut.go | 3 ++- server/system.go | 3 ++- server/tag.go | 3 ++- server/user.go | 5 +++-- server/webhook.go | 3 ++- store/db/db.go | 5 +++-- store/memo.go | 5 +++-- store/memo_organizer.go | 5 +++-- store/resource.go | 5 +++-- store/shortcut.go | 5 +++-- store/store.go | 3 ++- store/user.go | 5 +++-- 22 files changed, 54 insertions(+), 36 deletions(-) diff --git a/api/system.go b/api/system.go index 66756a4d..53d93502 100644 --- a/api/system.go +++ b/api/system.go @@ -1,6 +1,6 @@ package api -import "memos/server/profile" +import "github.com/usememos/memos/server/profile" type SystemStatus struct { Owner *User `json:"owner"` diff --git a/bin/server/cmd/root.go b/bin/server/cmd/root.go index 9ff059de..ec52fffb 100644 --- a/bin/server/cmd/root.go +++ b/bin/server/cmd/root.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - "memos/server" - "memos/server/profile" - "memos/store" - DB "memos/store/db" + "github.com/usememos/memos/server" + "github.com/usememos/memos/server/profile" + "github.com/usememos/memos/store" + DB "github.com/usememos/memos/store/db" ) const ( diff --git a/bin/server/main.go b/bin/server/main.go index 5c9f2063..6820963e 100644 --- a/bin/server/main.go +++ b/bin/server/main.go @@ -1,6 +1,6 @@ package main -import "memos/bin/server/cmd" +import "github.com/usememos/memos/bin/server/cmd" func main() { cmd.Execute() diff --git a/go.mod b/go.mod index 5651b366..94539d3d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module memos +module github.com/usememos/memos go 1.17 diff --git a/server/auth.go b/server/auth.go index 88517d2d..440c7a72 100644 --- a/server/auth.go +++ b/server/auth.go @@ -3,10 +3,11 @@ package server import ( "encoding/json" "fmt" - "memos/api" - "memos/common" "net/http" + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" + "github.com/labstack/echo/v4" "golang.org/x/crypto/bcrypt" ) diff --git a/server/basic_auth.go b/server/basic_auth.go index 3a8370da..2976c6d6 100644 --- a/server/basic_auth.go +++ b/server/basic_auth.go @@ -2,11 +2,12 @@ package server import ( "fmt" - "memos/api" - "memos/common" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" + "github.com/gorilla/sessions" "github.com/labstack/echo-contrib/session" "github.com/labstack/echo/v4" diff --git a/server/memo.go b/server/memo.go index 28896da4..526a747a 100644 --- a/server/memo.go +++ b/server/memo.go @@ -3,11 +3,12 @@ package server import ( "encoding/json" "fmt" - "memos/api" - "memos/common" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" + "github.com/labstack/echo/v4" ) diff --git a/server/profile/profile.go b/server/profile/profile.go index 8c4f6f57..8691bd73 100644 --- a/server/profile/profile.go +++ b/server/profile/profile.go @@ -2,11 +2,12 @@ package profile import ( "fmt" - "memos/common" "os" "path/filepath" "strconv" "strings" + + "github.com/usememos/memos/common" ) // Profile is the configuration to start main server. diff --git a/server/resource.go b/server/resource.go index 6a708d06..700329c3 100644 --- a/server/resource.go +++ b/server/resource.go @@ -4,10 +4,11 @@ import ( "encoding/json" "fmt" "io/ioutil" - "memos/api" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/labstack/echo/v4" ) diff --git a/server/server.go b/server/server.go index 91e5c974..9f18ed18 100644 --- a/server/server.go +++ b/server/server.go @@ -2,10 +2,11 @@ package server import ( "fmt" - "memos/server/profile" - "memos/store" "time" + "github.com/usememos/memos/server/profile" + "github.com/usememos/memos/store" + "github.com/gorilla/securecookie" "github.com/gorilla/sessions" "github.com/labstack/echo-contrib/session" diff --git a/server/shortcut.go b/server/shortcut.go index dd1c9122..bfdf5356 100644 --- a/server/shortcut.go +++ b/server/shortcut.go @@ -3,10 +3,11 @@ package server import ( "encoding/json" "fmt" - "memos/api" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/labstack/echo/v4" ) diff --git a/server/system.go b/server/system.go index 06a97923..04a82c8f 100644 --- a/server/system.go +++ b/server/system.go @@ -2,9 +2,10 @@ package server import ( "encoding/json" - "memos/api" "net/http" + "github.com/usememos/memos/api" + "github.com/labstack/echo/v4" ) diff --git a/server/tag.go b/server/tag.go index c6a94fab..17714ce3 100644 --- a/server/tag.go +++ b/server/tag.go @@ -2,10 +2,11 @@ package server import ( "encoding/json" - "memos/api" "net/http" "regexp" + "github.com/usememos/memos/api" + "github.com/labstack/echo/v4" ) diff --git a/server/user.go b/server/user.go index 14cda7bd..f266b400 100644 --- a/server/user.go +++ b/server/user.go @@ -3,11 +3,12 @@ package server import ( "encoding/json" "fmt" - "memos/api" - "memos/common" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" + "github.com/labstack/echo/v4" "golang.org/x/crypto/bcrypt" ) diff --git a/server/webhook.go b/server/webhook.go index 5b5661c4..0a5df079 100644 --- a/server/webhook.go +++ b/server/webhook.go @@ -4,10 +4,11 @@ import ( "encoding/json" "fmt" "io/ioutil" - "memos/api" "net/http" "strconv" + "github.com/usememos/memos/api" + "github.com/labstack/echo/v4" ) diff --git a/store/db/db.go b/store/db/db.go index 5eb432cc..482d41d0 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -6,11 +6,12 @@ import ( "errors" "fmt" "io/fs" - "memos/common" - "memos/server/profile" "os" "sort" + "github.com/usememos/memos/common" + "github.com/usememos/memos/server/profile" + _ "github.com/mattn/go-sqlite3" ) diff --git a/store/memo.go b/store/memo.go index e99120c5..abd645ff 100644 --- a/store/memo.go +++ b/store/memo.go @@ -3,9 +3,10 @@ package store import ( "database/sql" "fmt" - "memos/api" - "memos/common" "strings" + + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" ) // memoRaw is the store model for an Memo. diff --git a/store/memo_organizer.go b/store/memo_organizer.go index 2e5c39ac..666dbbe4 100644 --- a/store/memo_organizer.go +++ b/store/memo_organizer.go @@ -3,8 +3,9 @@ package store import ( "database/sql" "fmt" - "memos/api" - "memos/common" + + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" ) // memoOrganizerRaw is the store model for an MemoOrganizer. diff --git a/store/resource.go b/store/resource.go index 230480d6..f22c78d7 100644 --- a/store/resource.go +++ b/store/resource.go @@ -3,9 +3,10 @@ package store import ( "database/sql" "fmt" - "memos/api" - "memos/common" "strings" + + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" ) // resourceRaw is the store model for an Resource. diff --git a/store/shortcut.go b/store/shortcut.go index 0cd583c0..ee0ec044 100644 --- a/store/shortcut.go +++ b/store/shortcut.go @@ -3,9 +3,10 @@ package store import ( "database/sql" "fmt" - "memos/api" - "memos/common" "strings" + + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" ) // shortcutRaw is the store model for an Shortcut. diff --git a/store/store.go b/store/store.go index 442eadef..b7f7d8b2 100644 --- a/store/store.go +++ b/store/store.go @@ -2,7 +2,8 @@ package store import ( "database/sql" - "memos/server/profile" + + "github.com/usememos/memos/server/profile" ) // Store provides database access to all raw objects diff --git a/store/user.go b/store/user.go index 559c255e..19cd3689 100644 --- a/store/user.go +++ b/store/user.go @@ -3,9 +3,10 @@ package store import ( "database/sql" "fmt" - "memos/api" - "memos/common" "strings" + + "github.com/usememos/memos/api" + "github.com/usememos/memos/common" ) // userRaw is the store model for an User.