sysnix
/
blog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sysnix 2023-10-24 18:29:11 +08:00
parent cc5aef3d87
commit e4db7e8e2c
42 changed files with 51 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
BlogAdminService/BlogAdmin Normal file
View File

Binary file not shown.

2
BlogAdminService/internal/controller/AdminController.go
View File

@ -1,7 +1,7 @@
package controller
import (
"BlogAdmin/internal/model/admin"
"Common/model/admin"
"log"
"github.com/kataras/iris/v12"

4
BlogAdminService/internal/controller/ArticleController.go
View File

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

8
BlogAdminService/internal/controller/DiaryController.go
View File

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

8
BlogAdminService/internal/controller/FileController.go
View File

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

4
BlogAdminService/internal/controller/LoginController.go
View File

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

4
BlogAdminService/internal/controller/VersionController.go
View File

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

8
BlogAdminService/internal/service/ArticleService.go
View File

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

4
BlogAdminService/internal/service/ContentService.go
View File

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

6
BlogAdminService/internal/service/FileService.go
View File

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

8
BlogFileService/cloud/remote/FileServiceRemote.go Normal file
View File

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

8
BlogFileService/internal/consts/ArticleState.go
View File

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

6
BlogFileService/internal/consts/ContentState.go
View File

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

21
BlogFileService/internal/consts/RedisConst.go
View File

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

2
BlogFileService/internal/controller/admin/FileController.go
View File

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

2
BlogFileService/internal/service/FileService.go
View File

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

2
BlogService/internal/async/ViewRecord.go
View File

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

8
BlogService/internal/consts/ArticleState.go
View File

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

6
BlogService/internal/consts/ContentState.go
View File

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

21
BlogService/internal/consts/RedisConst.go
View File

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

6
BlogService/internal/controller/ArticleController.go
View File

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

6
BlogService/internal/controller/DiaryController.go
View File

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

29
BlogService/internal/model/AjaxResult/AjaxResult.go
View File

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

19
BlogService/internal/model/vo/CommonContent.go
View File

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

4
BlogService/internal/service/ArticleService.go
View File

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

4
BlogService/internal/service/ContentService.go
View File

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

4
BlogService/internal/service/DinaryService.go
View File

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

0
BlogAdminService/internal/consts/ArticleState.go → Common/consts/ArticleState.go
View File

0
BlogAdminService/internal/consts/ContentState.go → Common/consts/ContentState.go
View File

0
BlogAdminService/internal/consts/RedisConst.go → Common/consts/RedisConst.go
View File

3
Common/go.mod Normal file
View File

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

0
BlogAdminService/internal/model/AjaxResult/AjaxResult.go → Common/model/AjaxResult/AjaxResult.go
View File

0
BlogAdminService/internal/model/admin/AdminArticel.go → Common/model/admin/AdminArticel.go
View File

0
BlogAdminService/internal/model/admin/AdminDiary.go → Common/model/admin/AdminDiary.go
View File

0
BlogAdminService/internal/model/admin/SysFile.go → Common/model/admin/SysFile.go
View File

0
BlogAdminService/internal/model/admin/SysUser.go → Common/model/admin/SysUser.go
View File

0
BlogAdminService/internal/model/admin/SysUserLogin.go → Common/model/admin/SysUserLogin.go
View File

0
BlogAdminService/internal/model/admin/SysVersion.go → Common/model/admin/SysVersion.go
View File

0
BlogAdminService/internal/model/vo/CommonContent.go → Common/model/vo/CommonContent.go
View File

0
BlogAdminService/internal/model/vo/CommonFiles.go → Common/model/vo/CommonFiles.go
View File

0
BlogAdminService/internal/model/vo/Page.go → Common/model/vo/Page.go
View File

1
go.work
View File

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