msb-public
/
paopao-ce
mirror of https://github.com/rocboss/paopao-ce
1
0
Code Issues Projects Releases Wiki Activity

merge from main

Browse Source
pull/97/head
alimy 2 years ago
parent cbb4a3d5a5 3e08e7f90b
commit cddde2d117
7 changed files with 3735 additions and 67 deletions
Show Stats Download Patch File Download Diff File

16
internal/service/post.go
Unescape View File

@ -91,6 +91,17 @@ func (p *PostContentItem) Check() error {
return nil return nil
} }
func tagsFrom(originTags []string) []string {
tags := make([]string, 0, len(originTags))
for _, tag := range originTags {
// TODO: 优化tag有效性检测
if tag = strings.TrimSpace(tag); len(tag) > 0 {
tags = append(tags, tag)
}
}
return tags
}
// CreatePost 创建文章 // CreatePost 创建文章
// TODO: maybe have bug need optimize for use transaction to create post // TODO: maybe have bug need optimize for use transaction to create post
func CreatePost(c *gin.Context, userID int64, param PostCreationReq) (*model.Post, error) { func CreatePost(c *gin.Context, userID int64, param PostCreationReq) (*model.Post, error) {
@ -99,9 +110,10 @@ func CreatePost(c *gin.Context, userID int64, param PostCreationReq) (*model.Pos
ip = "未知" ip = "未知"
} }
tags := tagsFrom(param.Tags)
post := &model.Post{ post := &model.Post{
UserID: userID, UserID: userID,
Tags: strings.Join(param.Tags, ","), Tags: strings.Join(tags, ","),
IP: ip, IP: ip,
IPLoc: util.GetIPLoc(ip), IPLoc: util.GetIPLoc(ip),
AttachmentPrice: param.AttachmentPrice, AttachmentPrice: param.AttachmentPrice,
@ -138,7 +150,7 @@ func CreatePost(c *gin.Context, userID int64, param PostCreationReq) (*model.Pos
// TODO: 目前非私密文章才能有如下操作，后续再优化 // TODO: 目前非私密文章才能有如下操作，后续再优化
if post.Visibility != model.PostVisitPrivate { if post.Visibility != model.PostVisitPrivate {
// 创建标签 // 创建标签
for _, t := range param.Tags { for _, t := range tags {
tag := &model.Tag{ tag := &model.Tag{
UserID: userID, UserID: userID,
Tag: t, Tag: t,

2
web/package.json
Unescape View File

@ -30,7 +30,7 @@
"vuex": "^4.0.2" "vuex": "^4.0.2"
}, },
"devDependencies": { "devDependencies": {
"@tauri-apps/cli": "^1.0.0-rc.7", "@tauri-apps/cli": "^1.0.0",
"@types/node": "^17.0.35", "@types/node": "^17.0.35",
"@types/qrcode": "^1.4.2", "@types/qrcode": "^1.4.2",
"@vitejs/plugin-vue": "^2.3.3", "@vitejs/plugin-vue": "^2.3.3",

1
web/src-tauri/.gitignore vendored
Unescape View File

@ -2,4 +2,3 @@
# will have compiled files and executables # will have compiled files and executables
/target/ /target/
WixTools WixTools
Cargo.lock

3654
web/src-tauri/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
web/src-tauri/Cargo.toml
Unescape View File

@ -9,10 +9,10 @@ edition = "2021"
rust-version = "1.57" rust-version = "1.57"
[build-dependencies] [build-dependencies]
tauri-build = { version = "1.0.0-rc.12", features = [] } tauri-build = { version = "1.0", features = [] }
[dependencies] [dependencies]
tauri = { version = "1.0.0-rc.12", features = ["api-all"] } tauri = { version = "1.0", features = ["api-all", "macos-private-api"] }
[features] [features]
# by default Tauri runs in production mode # by default Tauri runs in production mode

9
web/src-tauri/tauri.conf.json
Unescape View File

@ -10,6 +10,7 @@
"withGlobalTauri": true "withGlobalTauri": true
}, },
"tauri": { "tauri": {
"macOSPrivateApi": true,
"bundle": { "bundle": {
"active": true, "active": true,
"targets": "all", "targets": "all",
@ -60,11 +61,13 @@
}, },
"windows": [ "windows": [
{ {
"title": "泡泡 - 一个清新文艺的微社区", "title": "泡泡 | 一个清新文艺的微社区",
"width": 1080, "width": 1080,
"height": 800, "height": 800,
"resizable": true, "resizable": false,
"fullscreen": false "fullscreen": false,
"transparent": true,
"decorations": true
} }
], ],
"security": { "security": {

116
web/yarn.lock
Unescape View File

@ -84,65 +84,65 @@
estree-walker "^2.0.1" estree-walker "^2.0.1"
picomatch "^2.2.2" picomatch "^2.2.2"
"@tauri-apps/cli-darwin-arm64@1.0.0-rc.13": "@tauri-apps/cli-darwin-arm64@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.13.tgz#da73a770835ffd63a149d8becf50d3781e1c97dd" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0.tgz#9ab439898b4d05a6e43df4451a42fa21e9d5eaa1"
integrity sha512-/EqOz7ASHOU98H58Ibbkg12pLG/P5oyQz8OlueaMYryajkJdmi+bHTkJ05DfbS0owAaHkRJ6f+NmoW/AnyqUbg== integrity sha512-0ryomgLjdpylXypMPVXLU3PZCde3Sw5nwN4coUhBcHPBLFRb8QPet+nweVK/HiZ3mxg8WeIazvpx2s8hS0l2GQ==
"@tauri-apps/cli-darwin-x64@1.0.0-rc.13": "@tauri-apps/cli-darwin-x64@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.13.tgz#e120cc623fddca3eb9d7fea0c2de057c7440a821" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0.tgz#5ffc8d444c7dc1cab14c8c743a929e448f1b1e93"
integrity sha512-bvZ0MBKFD1kc4gdVPXgwUA6tHNKj0EmlQK0Xolk6PYP9vZZeNTP1vejevW0bh2IqxC8DuqUArbG9USXwu+LFbQ== integrity sha512-oejvYUT4dEfzBi+FWMj+CMz4cZ6C2gEFHrUtKVLdTXr8Flj5UTwdB1YPGQjiOqk73LOI7cB/vXxb9DZT+Lrxgg==
"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.13": "@tauri-apps/cli-linux-arm-gnueabihf@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.13.tgz#3052a59788ae57ad690d4bc09bf0756bc8808116" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0.tgz#c24d63b4637a0c20b9671f0284968b164482f6ee"
integrity sha512-yODvfUkNvtYYdDTOJSDXMx9fpoEB66I2PTrYx1UKonKTEaLrQDcpw2exD/S9LPQzCYgyTuJ/kHRhG1uLdO/UUQ== integrity sha512-yAu78v8TeXNx/ETS5F2G2Uw/HX+LQvZkX94zNiqFsAj7snfWI/IqSUM52OBrdh/D0EC9NCdjUJ7Vuo32uxf7tg==
"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.13": "@tauri-apps/cli-linux-arm64-gnu@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.13.tgz#9c4094473890c165a4fb22132229ed8212559f79" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0.tgz#dfb107a3d5f56dc0356126135f941261ffad10a3"
integrity sha512-kVDJHERD8CmTeMcd2VTnD/nVCHdnNAK8a6ur3l0KTR1iF8A1AtN/sPahMQjK4f7Ar00UDjIzTw74liqakOeiZg== integrity sha512-YFUN/S58AN317njAynzcQ+EHhRsCDXqmp5g9Oiqmcdg1vU7fPWZivVLc1WHz+0037C7JnsX5PtKpNYewP/+Oqw==
"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.13": "@tauri-apps/cli-linux-arm64-musl@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.13.tgz#16270a6d3b9289993b9b4d837f63dba4991d9be5" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0.tgz#72ebfc5066c6fac82b513c20fbec6ab841b3ee05"
integrity sha512-PFHz+0xKCGMqqn2TmbOSPvTRS61xJQV7srwTZjs5sHBvK536mdBnF/6V6BPEvTn5LzfRnxMu2A5X5GFkYnrZ7w== integrity sha512-al+TxMGoNVikEvRQfMyYE/mdjUcUNMo5brkCIAb+fL4rWQlAhAnYVzmg/rM8N4nhdXm1MOaYAagQmxr8898dNA==
"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.13": "@tauri-apps/cli-linux-x64-gnu@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.13.tgz#d2f5031f9597300a5814dc8b4d3c59e8dc25a871" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0.tgz#76f791378468a9ca2678885f0d14e05f4fd0d0c8"
integrity sha512-EWhTOUNHaaMM7mxp/ue+Osnzn6/o9/7qVle3MSnNI9pGQzumc/dOtBs+sWS/NPXdVEiWKET2mFMK120KJlYcQQ== integrity sha512-KQmYlYyGpn6/2kSl9QivWG6EIepm6PJd57e6IKmYwAyNhLr2XfGl1CLuocUQQgO+jprjT70HXp+MXD0tcB0+Sw==
"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.13": "@tauri-apps/cli-linux-x64-musl@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.13.tgz#9d8b02de7bd5af71c5d3d5be96ec88f3f29c8fbd" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0.tgz#12ccc0747c88e9c2cbdf21834b94718c8da689ca"
integrity sha512-i8lsKw5iAGTAhqSQHeUCISLjhRXNrloHPoFCaSZtU0/GAPGbW/qST7u593h7cKWxRooeMwzo74ij4GhgmddClQ== integrity sha512-Qpaq5lZz569Aea6jfrRchgfEJaOrfLpCRBATcF8CJFFwVKmfCUcoV+MxbCIW30Zqw5Y06njC/ffa3261AV/ZIQ==
"@tauri-apps/cli-win32-ia32-msvc@1.0.0-rc.13": "@tauri-apps/cli-win32-ia32-msvc@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.13.tgz#1fcf6bed5a89af2cb30a2fe2e823ca486ded61b7" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0.tgz#5d56df6dbb62c11cae28b826619fbbad9a158399"
integrity sha512-rJxSqWIQXeeT2oLzSiQyqZPgDKSGH5sK7MUr8cOCBitqy3T0COlOMX4O7hhqF3cJ/5s0aX+MuNZBzF/D0QUcxA== integrity sha512-e2DzFqEMI+s+gv14UupdI91gPxTbUJTbbfQlTHdQlOsTk4HEZTsh+ibAYBcCLAaMRW38NEsFlAUe1lQA0iRu/w==
"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.13": "@tauri-apps/cli-win32-x64-msvc@1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.13.tgz#ed2feaf3b3a120c1460cae8941443563d14840bb" resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0.tgz#6227331d177118323cff13bc6bfb04894130c83f"
integrity sha512-ifOTrJVQoBAQUYX+EVnE4XJ/FCMHs4FQ8qxGNszqkSxrU24mmT7La6tzj77352q80KnxRa05xjjLL6GGhmzXRg== integrity sha512-lWSs90pJeQX+L31IqIzmRhwLayEeyTh7mga0AxX8G868hvdLtcXCQA/rKoFtGdVLuHAx4+M+CBF5SMYb76xGYA==
"@tauri-apps/cli@^1.0.0-rc.7": "@tauri-apps/cli@^1.0.0":
version "1.0.0-rc.13" version "1.0.0"
resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.13.tgz#e58127ebe24c6cc81c3258229219056199421500" resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0.tgz#28f021a2db4c2087b569845d42b4fe7978ccee19"
integrity sha512-q7i45Mi1SMv5XllNoX09QS4Q/fYVFwD6piVYmqMSrKY/T5RwedQhytiVH60TxC2xk6o0akVHa7BdYiyJvXNR8A== integrity sha512-4eHnk3p0xnCXd9Zel3kLvdiiSURnN98GMFvWUAdirm5AjyOjcx8TIET/jqRYmYKE5yd+LMQqYMUfHRwA6JJUkg==
optionalDependencies: optionalDependencies:
"@tauri-apps/cli-darwin-arm64" "1.0.0-rc.13" "@tauri-apps/cli-darwin-arm64" "1.0.0"
"@tauri-apps/cli-darwin-x64" "1.0.0-rc.13" "@tauri-apps/cli-darwin-x64" "1.0.0"
"@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.13" "@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0"
"@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.13" "@tauri-apps/cli-linux-arm64-gnu" "1.0.0"
"@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.13" "@tauri-apps/cli-linux-arm64-musl" "1.0.0"
"@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.13" "@tauri-apps/cli-linux-x64-gnu" "1.0.0"
"@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.13" "@tauri-apps/cli-linux-x64-musl" "1.0.0"
"@tauri-apps/cli-win32-ia32-msvc" "1.0.0-rc.13" "@tauri-apps/cli-win32-ia32-msvc" "1.0.0"
"@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.13" "@tauri-apps/cli-win32-x64-msvc" "1.0.0"
"@types/jest@^27.0.1": "@types/jest@^27.0.1":
version "27.4.1" version "27.4.1"

Write Preview
Loading…
Cancel
Save