diff --git a/BlogAdminService/BlogAdmin b/BlogAdminService/BlogAdmin new file mode 100644 index 0000000..c375323 Binary files /dev/null and b/BlogAdminService/BlogAdmin differ diff --git a/BlogAdminService/internal/controller/AdminController.go b/BlogAdminService/internal/controller/AdminController.go index 2057e57..a162d45 100644 --- a/BlogAdminService/internal/controller/AdminController.go +++ b/BlogAdminService/internal/controller/AdminController.go @@ -1,7 +1,7 @@ package controller import ( - "BlogAdmin/internal/model/admin" + "Common/model/admin" "log" "github.com/kataras/iris/v12" diff --git a/BlogAdminService/internal/controller/ArticleController.go b/BlogAdminService/internal/controller/ArticleController.go index 801ddd9..b5a7986 100644 --- a/BlogAdminService/internal/controller/ArticleController.go +++ b/BlogAdminService/internal/controller/ArticleController.go @@ -1,10 +1,10 @@ package controller import ( - "BlogAdmin/internal/model/AjaxResult" - "BlogAdmin/internal/model/admin" "BlogAdmin/internal/service" "BlogAdmin/third_party/SessionUtil" + "Common/model/AjaxResult" + "Common/model/admin" "html/template" "log" "net/http" diff --git a/BlogAdminService/internal/controller/DiaryController.go b/BlogAdminService/internal/controller/DiaryController.go index 824f66a..8268a12 100644 --- a/BlogAdminService/internal/controller/DiaryController.go +++ b/BlogAdminService/internal/controller/DiaryController.go @@ -1,12 +1,12 @@ package controller import ( - "BlogAdmin/internal/consts" - "BlogAdmin/internal/model/AjaxResult" - "BlogAdmin/internal/model/admin" - "BlogAdmin/internal/model/vo" "BlogAdmin/third_party/SessionUtil" "BlogAdmin/third_party/database" + "Common/consts" + "Common/model/AjaxResult" + "Common/model/admin" + "Common/model/vo" "bytes" "context" "image/jpeg" diff --git a/BlogAdminService/internal/controller/FileController.go b/BlogAdminService/internal/controller/FileController.go index 243ba0d..4b4c4f8 100644 --- a/BlogAdminService/internal/controller/FileController.go +++ b/BlogAdminService/internal/controller/FileController.go @@ -1,13 +1,13 @@ package controller import ( - "BlogAdmin/internal/consts" - "BlogAdmin/internal/model/AjaxResult" - "BlogAdmin/internal/model/admin" - "BlogAdmin/internal/model/vo" "BlogAdmin/internal/service" "BlogAdmin/third_party/SessionUtil" "BlogAdmin/third_party/database" + "Common/consts" + "Common/model/AjaxResult" + "Common/model/admin" + "Common/model/vo" "context" "net/http" "strings" diff --git a/BlogAdminService/internal/controller/LoginController.go b/BlogAdminService/internal/controller/LoginController.go index 15a4d2d..b66deb8 100644 --- a/BlogAdminService/internal/controller/LoginController.go +++ b/BlogAdminService/internal/controller/LoginController.go @@ -1,9 +1,9 @@ package controller import ( - "BlogAdmin/internal/model/AjaxResult" - "BlogAdmin/internal/model/admin" "BlogAdmin/third_party/database" + "Common/model/AjaxResult" + "Common/model/admin" "image/color" "log" "strings" diff --git a/BlogAdminService/internal/controller/VersionController.go b/BlogAdminService/internal/controller/VersionController.go index 76d48ae..0be26c0 100644 --- a/BlogAdminService/internal/controller/VersionController.go +++ b/BlogAdminService/internal/controller/VersionController.go @@ -1,10 +1,10 @@ package controller import ( - "BlogAdmin/internal/model/AjaxResult" - "BlogAdmin/internal/model/admin" "BlogAdmin/third_party/SessionUtil" "BlogAdmin/third_party/database" + "Common/model/AjaxResult" + "Common/model/admin" "time" "github.com/google/uuid" diff --git a/BlogAdminService/internal/service/ArticleService.go b/BlogAdminService/internal/service/ArticleService.go index e09e4e0..ba46bf4 100644 --- a/BlogAdminService/internal/service/ArticleService.go +++ b/BlogAdminService/internal/service/ArticleService.go @@ -1,11 +1,11 @@ package service import ( - "BlogAdmin/internal/consts" - "BlogAdmin/internal/model/admin" - "BlogAdmin/internal/model/blog" - "BlogAdmin/internal/model/vo" "BlogAdmin/third_party/database" + "Common/consts" + "Common/model/admin" + "Common/model/blog" + "Common/model/vo" "context" "errors" "strconv" diff --git a/BlogAdminService/internal/service/ContentService.go b/BlogAdminService/internal/service/ContentService.go index 6253409..7446e73 100644 --- a/BlogAdminService/internal/service/ContentService.go +++ b/BlogAdminService/internal/service/ContentService.go @@ -1,9 +1,9 @@ package service import ( - "BlogAdmin/internal/consts" - "BlogAdmin/internal/model/vo" "BlogAdmin/third_party/database" + "Common/consts" + "Common/model/vo" "context" "log" "time" diff --git a/BlogAdminService/internal/service/FileService.go b/BlogAdminService/internal/service/FileService.go index 17679f6..bfc9478 100644 --- a/BlogAdminService/internal/service/FileService.go +++ b/BlogAdminService/internal/service/FileService.go @@ -1,10 +1,10 @@ package service import ( - "BlogAdmin/internal/consts" - "BlogAdmin/internal/model/admin" - "BlogAdmin/internal/model/vo" "BlogAdmin/third_party/database" + "Common/consts" + "Common/model/admin" + "Common/model/vo" "context" "log" "time" diff --git a/BlogFileService/cloud/remote/FileServiceRemote.go b/BlogFileService/cloud/remote/FileServiceRemote.go new file mode 100644 index 0000000..936e681 --- /dev/null +++ b/BlogFileService/cloud/remote/FileServiceRemote.go @@ -0,0 +1,8 @@ +package remote + +type FileServiceRemote struct { +} + +func (*FileServiceRemote) UploadFile() { + +} diff --git a/BlogFileService/internal/consts/ArticleState.go b/BlogFileService/internal/consts/ArticleState.go deleted file mode 100644 index d001f19..0000000 --- a/BlogFileService/internal/consts/ArticleState.go +++ /dev/null @@ -1,8 +0,0 @@ -package consts - -//文章状态常量 -const ARTICLE_STATE_PUBLISH string = "publish" -const ARTICLE_STATE_DRAFT string = "draft" - -const ARTICLE_CONTENT_TYPE_MARKDOWN string = "markdown" -const ARTICLE_CONTENT_TYPE_TINYMCE string = "tinymce" diff --git a/BlogFileService/internal/consts/ContentState.go b/BlogFileService/internal/consts/ContentState.go deleted file mode 100644 index 5ec912b..0000000 --- a/BlogFileService/internal/consts/ContentState.go +++ /dev/null @@ -1,6 +0,0 @@ -package consts - -//文本状态常量 - -const CONTENT_STATE_PUBLISH string = "publish" -const CONTENT_STATE_DOWN string = "down" diff --git a/BlogFileService/internal/consts/RedisConst.go b/BlogFileService/internal/consts/RedisConst.go deleted file mode 100644 index 1d26993..0000000 --- a/BlogFileService/internal/consts/RedisConst.go +++ /dev/null @@ -1,21 +0,0 @@ -package consts - -//Redis - -//文章相关Key常量 -const REDIS_BLOG_ARTICLE string = "blog:article:" -const REDIS_BLOG_ARTICLE_LATEST string = "blog:article:latest" - -//日记相关Key常量 -const REDIS_BLOG_DIARY string = "blog:diary:" -const REDIS_BLOG_DIARY_LATEST string = "blog:diary:latest" - -//文件相关Key常量 -const REDIS_FILE string = "blog:file:" -const REDIS_FILE_BYTES string = "blog:file:bytes:" - -//文本相关Key常量 -const REDIS_BLOG_CONTENT string = "blog:content:" - -//点击量相关Key常量 -const REDIS_BLOG_VIEW_RECORD string = "blog:view:record" diff --git a/BlogFileService/internal/controller/admin/FileController.go b/BlogFileService/internal/controller/admin/FileController.go index 790890f..099a334 100644 --- a/BlogFileService/internal/controller/admin/FileController.go +++ b/BlogFileService/internal/controller/admin/FileController.go @@ -1,13 +1,13 @@ package admin import ( - "BlogFile/internal/consts" "BlogFile/internal/model/AjaxResult" "BlogFile/internal/model/admin" "BlogFile/internal/model/vo" "BlogFile/internal/service" "BlogFile/third_party/SessionUtil" "BlogFile/third_party/database" + "Common/consts" "context" "net/http" "strings" diff --git a/BlogFileService/internal/service/FileService.go b/BlogFileService/internal/service/FileService.go index 323a9b3..a2477bf 100644 --- a/BlogFileService/internal/service/FileService.go +++ b/BlogFileService/internal/service/FileService.go @@ -1,10 +1,10 @@ package service import ( - "BlogFile/internal/consts" "BlogFile/internal/model/admin" "BlogFile/internal/model/vo" "BlogFile/third_party/database" + "Common/consts" "context" "log" "time" diff --git a/BlogService/internal/async/ViewRecord.go b/BlogService/internal/async/ViewRecord.go index 94eecfe..cadb1a1 100644 --- a/BlogService/internal/async/ViewRecord.go +++ b/BlogService/internal/async/ViewRecord.go @@ -1,8 +1,8 @@ package async import ( - "Blog/internal/consts" "Blog/third_party/database" + "Common/consts" "context" "log" "math" diff --git a/BlogService/internal/consts/ArticleState.go b/BlogService/internal/consts/ArticleState.go deleted file mode 100644 index d001f19..0000000 --- a/BlogService/internal/consts/ArticleState.go +++ /dev/null @@ -1,8 +0,0 @@ -package consts - -//文章状态常量 -const ARTICLE_STATE_PUBLISH string = "publish" -const ARTICLE_STATE_DRAFT string = "draft" - -const ARTICLE_CONTENT_TYPE_MARKDOWN string = "markdown" -const ARTICLE_CONTENT_TYPE_TINYMCE string = "tinymce" diff --git a/BlogService/internal/consts/ContentState.go b/BlogService/internal/consts/ContentState.go deleted file mode 100644 index 5ec912b..0000000 --- a/BlogService/internal/consts/ContentState.go +++ /dev/null @@ -1,6 +0,0 @@ -package consts - -//文本状态常量 - -const CONTENT_STATE_PUBLISH string = "publish" -const CONTENT_STATE_DOWN string = "down" diff --git a/BlogService/internal/consts/RedisConst.go b/BlogService/internal/consts/RedisConst.go deleted file mode 100644 index 1d26993..0000000 --- a/BlogService/internal/consts/RedisConst.go +++ /dev/null @@ -1,21 +0,0 @@ -package consts - -//Redis - -//文章相关Key常量 -const REDIS_BLOG_ARTICLE string = "blog:article:" -const REDIS_BLOG_ARTICLE_LATEST string = "blog:article:latest" - -//日记相关Key常量 -const REDIS_BLOG_DIARY string = "blog:diary:" -const REDIS_BLOG_DIARY_LATEST string = "blog:diary:latest" - -//文件相关Key常量 -const REDIS_FILE string = "blog:file:" -const REDIS_FILE_BYTES string = "blog:file:bytes:" - -//文本相关Key常量 -const REDIS_BLOG_CONTENT string = "blog:content:" - -//点击量相关Key常量 -const REDIS_BLOG_VIEW_RECORD string = "blog:view:record" diff --git a/BlogService/internal/controller/ArticleController.go b/BlogService/internal/controller/ArticleController.go index d2fc03d..4b23001 100644 --- a/BlogService/internal/controller/ArticleController.go +++ b/BlogService/internal/controller/ArticleController.go @@ -2,11 +2,11 @@ package controller import ( "Blog/internal/async" - "Blog/internal/consts" - "Blog/internal/model/AjaxResult" - "Blog/internal/model/blog" "Blog/internal/service" "Blog/third_party/database" + "Common/consts" + "Common/model/AjaxResult" + "Common/model/blog" "context" "html/template" "log" diff --git a/BlogService/internal/controller/DiaryController.go b/BlogService/internal/controller/DiaryController.go index 5b24b8a..9e9a207 100644 --- a/BlogService/internal/controller/DiaryController.go +++ b/BlogService/internal/controller/DiaryController.go @@ -1,11 +1,11 @@ package controller import ( - "Blog/internal/consts" - "Blog/internal/model/AjaxResult" - "Blog/internal/model/blog" "Blog/internal/service" "Blog/third_party/database" + "Common/consts" + "Common/model/AjaxResult" + "Common/model/blog" "context" "log" diff --git a/BlogService/internal/model/AjaxResult/AjaxResult.go b/BlogService/internal/model/AjaxResult/AjaxResult.go deleted file mode 100644 index 3d48922..0000000 --- a/BlogService/internal/model/AjaxResult/AjaxResult.go +++ /dev/null @@ -1,29 +0,0 @@ -package AjaxResult - -type AjaxResult struct { - Msg string `json:"msg"` - Code int `json:"code"` - Data any `json:"data"` -} - -func Ok(data any) AjaxResult { - return AjaxResult{ - Code: 200, - Data: data, - } -} - -func OkMsg(msg string, data any) AjaxResult { - return AjaxResult{ - Code: 200, - Msg: msg, - Data: data, - } -} - -func Error(msg string) AjaxResult { - return AjaxResult{ - Code: 500, - Msg: msg, - } -} diff --git a/BlogService/internal/model/vo/CommonContent.go b/BlogService/internal/model/vo/CommonContent.go deleted file mode 100644 index 939a7d1..0000000 --- a/BlogService/internal/model/vo/CommonContent.go +++ /dev/null @@ -1,19 +0,0 @@ -package vo - -import "encoding/json" - -type CommonContent struct { - Id string `json:"id" gorm:"primary_key"` - RelId string `json:"relId"` - Content string `json:"content"` - State string `json:"state"` -} - -func (article *CommonContent) MarshalBinary() (data []byte, err error) { - // encoding.BinaryMarshaler - return json.Marshal(article) -} - -func (article *CommonContent) UnmarshalBinary(data []byte) (err error) { - return json.Unmarshal(data, article) -} diff --git a/BlogService/internal/service/ArticleService.go b/BlogService/internal/service/ArticleService.go index 30c1723..ed66c61 100644 --- a/BlogService/internal/service/ArticleService.go +++ b/BlogService/internal/service/ArticleService.go @@ -1,9 +1,9 @@ package service import ( - "Blog/internal/consts" - "Blog/internal/model/blog" "Blog/third_party/database" + "Common/consts" + "Common/model/blog" "context" "log" diff --git a/BlogService/internal/service/ContentService.go b/BlogService/internal/service/ContentService.go index 4c98dab..e9a6f30 100644 --- a/BlogService/internal/service/ContentService.go +++ b/BlogService/internal/service/ContentService.go @@ -1,9 +1,9 @@ package service import ( - "Blog/internal/consts" - "Blog/internal/model/vo" "Blog/third_party/database" + "Common/consts" + "Common/model/vo" "context" "log" "time" diff --git a/BlogService/internal/service/DinaryService.go b/BlogService/internal/service/DinaryService.go index 445edcc..77c084a 100644 --- a/BlogService/internal/service/DinaryService.go +++ b/BlogService/internal/service/DinaryService.go @@ -1,9 +1,9 @@ package service import ( - "Blog/internal/consts" - "Blog/internal/model/blog" "Blog/third_party/database" + "Common/consts" + "Common/model/blog" "context" "log" diff --git a/BlogAdminService/internal/consts/ArticleState.go b/Common/consts/ArticleState.go similarity index 100% rename from BlogAdminService/internal/consts/ArticleState.go rename to Common/consts/ArticleState.go diff --git a/BlogAdminService/internal/consts/ContentState.go b/Common/consts/ContentState.go similarity index 100% rename from BlogAdminService/internal/consts/ContentState.go rename to Common/consts/ContentState.go diff --git a/BlogAdminService/internal/consts/RedisConst.go b/Common/consts/RedisConst.go similarity index 100% rename from BlogAdminService/internal/consts/RedisConst.go rename to Common/consts/RedisConst.go diff --git a/Common/go.mod b/Common/go.mod new file mode 100644 index 0000000..7f8709a --- /dev/null +++ b/Common/go.mod @@ -0,0 +1,3 @@ +module Common + +go 1.21.1 diff --git a/BlogAdminService/internal/model/AjaxResult/AjaxResult.go b/Common/model/AjaxResult/AjaxResult.go similarity index 100% rename from BlogAdminService/internal/model/AjaxResult/AjaxResult.go rename to Common/model/AjaxResult/AjaxResult.go diff --git a/BlogAdminService/internal/model/admin/AdminArticel.go b/Common/model/admin/AdminArticel.go similarity index 100% rename from BlogAdminService/internal/model/admin/AdminArticel.go rename to Common/model/admin/AdminArticel.go diff --git a/BlogAdminService/internal/model/admin/AdminDiary.go b/Common/model/admin/AdminDiary.go similarity index 100% rename from BlogAdminService/internal/model/admin/AdminDiary.go rename to Common/model/admin/AdminDiary.go diff --git a/BlogAdminService/internal/model/admin/SysFile.go b/Common/model/admin/SysFile.go similarity index 100% rename from BlogAdminService/internal/model/admin/SysFile.go rename to Common/model/admin/SysFile.go diff --git a/BlogAdminService/internal/model/admin/SysUser.go b/Common/model/admin/SysUser.go similarity index 100% rename from BlogAdminService/internal/model/admin/SysUser.go rename to Common/model/admin/SysUser.go diff --git a/BlogAdminService/internal/model/admin/SysUserLogin.go b/Common/model/admin/SysUserLogin.go similarity index 100% rename from BlogAdminService/internal/model/admin/SysUserLogin.go rename to Common/model/admin/SysUserLogin.go diff --git a/BlogAdminService/internal/model/admin/SysVersion.go b/Common/model/admin/SysVersion.go similarity index 100% rename from BlogAdminService/internal/model/admin/SysVersion.go rename to Common/model/admin/SysVersion.go diff --git a/BlogAdminService/internal/model/vo/CommonContent.go b/Common/model/vo/CommonContent.go similarity index 100% rename from BlogAdminService/internal/model/vo/CommonContent.go rename to Common/model/vo/CommonContent.go diff --git a/BlogAdminService/internal/model/vo/CommonFiles.go b/Common/model/vo/CommonFiles.go similarity index 100% rename from BlogAdminService/internal/model/vo/CommonFiles.go rename to Common/model/vo/CommonFiles.go diff --git a/BlogAdminService/internal/model/vo/Page.go b/Common/model/vo/Page.go similarity index 100% rename from BlogAdminService/internal/model/vo/Page.go rename to Common/model/vo/Page.go diff --git a/go.work b/go.work index 633c863..781c935 100644 --- a/go.work +++ b/go.work @@ -4,4 +4,5 @@ use ( ./BlogAdminService ./BlogFileService ./BlogService + ./Common )