提取公共引用的包到Common模块下

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"

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"

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"

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"

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"

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"

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"

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"

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"

BlogFileService/cloud/remote/FileServiceRemote.go

@@ -0,0 +1,8 @@
+package remote
+
+type FileServiceRemote struct {
+}
+
+func (*FileServiceRemote) UploadFile() {
+
+}

BlogFileService/internal/consts/ArticleState.go

@@ -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"

BlogFileService/internal/consts/ContentState.go

@@ -1,6 +0,0 @@
-package consts
-
-//文本状态常量
-
-const CONTENT_STATE_PUBLISH string = "publish"
-const CONTENT_STATE_DOWN string = "down"

BlogFileService/internal/consts/RedisConst.go

@@ -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"

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"

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"

BlogService/internal/async/ViewRecord.go

@@ -1,8 +1,8 @@
 package async
 
 import (
-	"Blog/internal/consts"
 	"Blog/third_party/database"
+	"Common/consts"
 	"context"
 	"log"
 	"math"

BlogService/internal/consts/ArticleState.go

@@ -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"

BlogService/internal/consts/ContentState.go

@@ -1,6 +0,0 @@
-package consts
-
-//文本状态常量
-
-const CONTENT_STATE_PUBLISH string = "publish"
-const CONTENT_STATE_DOWN string = "down"

BlogService/internal/consts/RedisConst.go

@@ -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"

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"

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"
 

BlogService/internal/model/AjaxResult/AjaxResult.go

@@ -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,
-	}
-}

BlogService/internal/model/vo/CommonContent.go

@@ -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)
-}

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"
 

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"

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"
 

Common/go.mod

@@ -0,0 +1,3 @@
+module Common
+
+go 1.21.1

go.work

@@ -4,4 +4,5 @@ use (
 	./BlogAdminService
 	./BlogFileService
 	./BlogService
+	./Common
 )