diff --git a/.gitattributes b/.gitattributes
index affc14b3..1880a5ac 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
*.js linguist-language=go
*.css linguist-language=go
-*.vue linguist-language=go
\ No newline at end of file
+*.json linguist-language=go
+*.html linguist-language=go
\ No newline at end of file
diff --git a/paopao-api/.gitignore b/.gitignore
similarity index 100%
rename from paopao-api/.gitignore
rename to .gitignore
diff --git a/paopao-api/Dockerfile b/Dockerfile
similarity index 100%
rename from paopao-api/Dockerfile
rename to Dockerfile
diff --git a/README.md b/README.md
index c0396184..b8cbc39d 100644
--- a/README.md
+++ b/README.md
@@ -1,58 +1,128 @@
-# PaoPao CE
+
-官网 https://www.paopao.info
-## 1. 代码说明
+
+[![Forks][forks-shield]][forks-url]
+[![Stargazers][stars-shield]][stars-url]
+[![MIT License][license-shield]][license-url]
+[![Contributors][contributors-shield]][contributors-url]
+[![Issues][issues-shield]][issues-url]
-- paopao-api 泡泡后端
-- paopao-web 泡泡前端
+
+
-- 需要安装 Zinc (轻量级全文搜索引擎),可以查阅 https://zincsearch.com/ 安装
-### 2.1 paopao-api 后端服务
-- 导入 `paopao-api` 目录下的`paopao.sql`文件至数据库
+## 1. 截图预览
-- 拷贝 config.yaml.sample 文件至 config.yaml,然后按照注释完成配置修改
+[![明色主题][product-light-screenshot]](https://www.paopao.info)
-```
-cd 项目根目录/paopao-api
-go mod download
-go build .
-```
-编译成功后,将产出 `paopao-api` 二进制文件,运行:
+[![暗色主题][product-dark-screenshot]](https://www.paopao.info)
-```
-chmod +x paopao-api
-./paopao-api
-```
+更多演示请前往[官网](https://www.paopao.info)体验(谢绝灌水)
-即可正常启动
+(back to top)
+
+## 2. 快速开始
-### 2.2 paopao-web 前端服务
+### 2.1 技术栈
-编译前需要修改 .env里面的后端地址
+PaoPao主要由以下优秀的开源项目/工具构建
-```
-cd 项目根目录/paopao-web
-vim .env
-yarn
-yarn build
-```
-build完成后,可以在dist目录获取编译产出,配置nginx指向至该目录即可
+* [Go](https://go.dev/)
+* [Gin](https://gin-gonic.com/)
+* [Zinc](https://zinclabs.io/)
+* [Naive UI](https://www.naiveui.com/)
+* [Vue.js](https://vuejs.org/)
+* [Vite.js](https://vitejs.dev/)
-## 3. 其他
+### 2.2 环境要求
-后端服务建议使用 supervisor 守护进程,然后通过nginx反向代理
+- Go (1.17+)
+- Node.js (14+)
+- MySQL (5.7+)
+- Redis
+- Zinc
-短信通道使用的juhe数据,如果申请不下来,可以考虑替换其他服务商的
+\* Zinc是一款轻量级全文搜索引擎,可以查阅 https://zincsearch.com/ 安装
+
+以上环境版本为PaoPao官方的开发版本,仅供参考,其他版本的环境未进行测试
+
+
+
+### 3. 安装说明
+
+克隆代码库
+ ```sh
+ git clone https://github.com/rocboss/paopao-ce.git
+ ```
+#### 3.1 后端
+
+1. 导入项目根目录下的 `paopao.sql` 文件至MySQL数据库
+2. 拷贝项目根目录下 `config.yaml.sample` 文件至 `config.yaml`,按照注释完成配置编辑
+3. 编译后端
+ ```sh
+ go mod download
+ go build .
+ ```
+4. 启动后端
+ ```sh
+ chmod +x paopao-api
+ ./paopao-api
+ ```
-代码结构比较简单,喜欢的朋友欢迎贡献PR。
+#### 3.2 前端
+1. 进入前端目录 `paopao-web`,编辑 `.env` 文件中后端服务地址,下载依赖包
+ ```sh
+ cd 项目根目录/paopao-web
+ vim .env
+ yarn
+ ```
+2. 编译前端
+ ```sh
+ yarn build
+ ```
+
+ build完成后,可以在dist目录获取编译产出,配置nginx指向至该目录即可
+
+#### 3.3 其他
+
+建议后端服务使用 `supervisor` 守护进程,并通过nginx反向代理后,提供API给前端服务调用。
+
+短信通道使用的juhe数据,如果申请不下来,可以考虑替换其他服务商的
+代码结构比较简单,喜欢的朋友欢迎给个Star、贡献PR。
+
+
+[contributors-shield]: https://img.shields.io/github/contributors/rocboss/paopao-ce?style=flat
+[contributors-url]: https://github.com/rocboss/paopao-ce/graphs/contributors
+[forks-shield]: https://img.shields.io/github/forks/rocboss/paopao-ce?style=flat
+[forks-url]: https://github.com/rocboss/paopao-ce/network/members
+[stars-shield]: https://img.shields.io/github/stars/rocboss/paopao-ce.svg?style=flat
+[stars-url]: https://github.com/rocboss/paopao-ce/stargazers
+[issues-shield]: https://img.shields.io/github/issues/rocboss/paopao-ce.svg?style=flat
+[issues-url]: https://github.com/rocboss/paopao-ce/issues
+[license-shield]: https://img.shields.io/github/license/rocboss/paopao-ce.svg?style=flat
+[license-url]: https://github.com/rocboss/paopao-ce/blob/master/LICENSE.txt
+[linkedin-shield]: https://img.shields.io/badge/-LinkedIn-black.svg?style=flat&logo=linkedin&colorB=555
+[product-light-screenshot]: https://assets.rocboss.com/imgs/2c/ab/06/82/mpySb2pha5dxmpOXcw==-0682.jpg
+[product-dark-screenshot]: https://assets.rocboss.com/imgs/33/11/17/48/mpySb2phapVqmpWVcw==-1748.jpg
\ No newline at end of file
diff --git a/paopao-api/comic.ttf b/comic.ttf
similarity index 100%
rename from paopao-api/comic.ttf
rename to comic.ttf
diff --git a/paopao-api/config.yaml.sample b/config.yaml.sample
similarity index 100%
rename from paopao-api/config.yaml.sample
rename to config.yaml.sample
diff --git a/paopao-api/configs/alipayAppCertPublicKey.crt b/configs/alipayAppCertPublicKey.crt
similarity index 100%
rename from paopao-api/configs/alipayAppCertPublicKey.crt
rename to configs/alipayAppCertPublicKey.crt
diff --git a/paopao-api/configs/alipayCertPublicKey_RSA2.crt b/configs/alipayCertPublicKey_RSA2.crt
similarity index 100%
rename from paopao-api/configs/alipayCertPublicKey_RSA2.crt
rename to configs/alipayCertPublicKey_RSA2.crt
diff --git a/paopao-api/configs/alipayRootCert.crt b/configs/alipayRootCert.crt
similarity index 100%
rename from paopao-api/configs/alipayRootCert.crt
rename to configs/alipayRootCert.crt
diff --git a/paopao-api/global/db.go b/global/db.go
similarity index 100%
rename from paopao-api/global/db.go
rename to global/db.go
diff --git a/paopao-api/global/setting.go b/global/setting.go
similarity index 91%
rename from paopao-api/global/setting.go
rename to global/setting.go
index 8e91467c..1e26d29c 100644
--- a/paopao-api/global/setting.go
+++ b/global/setting.go
@@ -3,7 +3,7 @@ package global
import (
"sync"
- "github.com/rocboss/paopao-api/pkg/setting"
+ "github.com/rocboss/paopao-ce/pkg/setting"
"github.com/sirupsen/logrus"
)
diff --git a/paopao-api/go.mod b/go.mod
similarity index 97%
rename from paopao-api/go.mod
rename to go.mod
index 891994c4..b2de5097 100644
--- a/paopao-api/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/rocboss/paopao-api
+module github.com/rocboss/paopao-ce
go 1.16
diff --git a/paopao-api/go.sum b/go.sum
similarity index 100%
rename from paopao-api/go.sum
rename to go.sum
diff --git a/paopao-api/init.go b/init.go
similarity index 91%
rename from paopao-api/init.go
rename to init.go
index 7faf8510..9382471f 100644
--- a/paopao-api/init.go
+++ b/init.go
@@ -6,10 +6,10 @@ import (
"time"
"github.com/go-redis/redis/v8"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/logger"
- "github.com/rocboss/paopao-api/pkg/setting"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/logger"
+ "github.com/rocboss/paopao-ce/pkg/setting"
)
func init() {
diff --git a/paopao-api/internal/dao/attachment.go b/internal/dao/attachment.go
similarity index 72%
rename from paopao-api/internal/dao/attachment.go
rename to internal/dao/attachment.go
index d4e018df..41d1e825 100644
--- a/paopao-api/internal/dao/attachment.go
+++ b/internal/dao/attachment.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) CreateAttachment(attachment *model.Attachment) (*model.Attachment, error) {
return attachment.Create(d.engine)
diff --git a/paopao-api/internal/dao/comment.go b/internal/dao/comment.go
similarity index 95%
rename from paopao-api/internal/dao/comment.go
rename to internal/dao/comment.go
index fd850d19..d190c0f1 100644
--- a/paopao-api/internal/dao/comment.go
+++ b/internal/dao/comment.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) GetComments(conditions *model.ConditionsT, offset, limit int) ([]*model.Comment, error) {
return (&model.Comment{}).List(d.engine, conditions, offset, limit)
diff --git a/paopao-api/internal/dao/comment_content.go b/internal/dao/comment_content.go
similarity index 95%
rename from paopao-api/internal/dao/comment_content.go
rename to internal/dao/comment_content.go
index be2f6731..e982b306 100644
--- a/paopao-api/internal/dao/comment_content.go
+++ b/internal/dao/comment_content.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) GetCommentContentsByIDs(ids []int64) ([]*model.CommentContent, error) {
commentContent := &model.CommentContent{}
diff --git a/paopao-api/internal/dao/dao.go b/internal/dao/dao.go
similarity index 83%
rename from paopao-api/internal/dao/dao.go
rename to internal/dao/dao.go
index 1ae8afb6..c1745f14 100644
--- a/paopao-api/internal/dao/dao.go
+++ b/internal/dao/dao.go
@@ -1,7 +1,7 @@
package dao
import (
- "github.com/rocboss/paopao-api/pkg/zinc"
+ "github.com/rocboss/paopao-ce/pkg/zinc"
"gorm.io/gorm"
)
diff --git a/paopao-api/internal/dao/message.go b/internal/dao/message.go
similarity index 95%
rename from paopao-api/internal/dao/message.go
rename to internal/dao/message.go
index 2ad39452..afaaaa76 100644
--- a/paopao-api/internal/dao/message.go
+++ b/internal/dao/message.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) CreateMessage(msg *model.Message) (*model.Message, error) {
return msg.Create(d.engine)
diff --git a/paopao-api/internal/dao/post.go b/internal/dao/post.go
similarity index 98%
rename from paopao-api/internal/dao/post.go
rename to internal/dao/post.go
index d55daf80..290135f2 100644
--- a/paopao-api/internal/dao/post.go
+++ b/internal/dao/post.go
@@ -3,7 +3,7 @@ package dao
import (
"time"
- "github.com/rocboss/paopao-api/internal/model"
+ "github.com/rocboss/paopao-ce/internal/model"
)
func (d *Dao) CreatePost(post *model.Post) (*model.Post, error) {
diff --git a/paopao-api/internal/dao/post_content.go b/internal/dao/post_content.go
similarity index 90%
rename from paopao-api/internal/dao/post_content.go
rename to internal/dao/post_content.go
index 25219a45..eded8b60 100644
--- a/paopao-api/internal/dao/post_content.go
+++ b/internal/dao/post_content.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) CreatePostContent(content *model.PostContent) (*model.PostContent, error) {
return content.Create(d.engine)
diff --git a/paopao-api/internal/dao/search.go b/internal/dao/search.go
similarity index 98%
rename from paopao-api/internal/dao/search.go
rename to internal/dao/search.go
index e7cb3e0f..803ca738 100644
--- a/paopao-api/internal/dao/search.go
+++ b/internal/dao/search.go
@@ -1,7 +1,7 @@
package dao
import (
- "github.com/rocboss/paopao-api/pkg/zinc"
+ "github.com/rocboss/paopao-ce/pkg/zinc"
)
type SearchType string
diff --git a/paopao-api/internal/dao/tag.go b/internal/dao/tag.go
similarity index 91%
rename from paopao-api/internal/dao/tag.go
rename to internal/dao/tag.go
index bcb7eb99..a15565db 100644
--- a/paopao-api/internal/dao/tag.go
+++ b/internal/dao/tag.go
@@ -1,6 +1,6 @@
package dao
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (d *Dao) CreateTag(tag *model.Tag) (*model.Tag, error) {
t, err := tag.Get(d.engine)
diff --git a/paopao-api/internal/dao/user.go b/internal/dao/user.go
similarity index 97%
rename from paopao-api/internal/dao/user.go
rename to internal/dao/user.go
index 064abe06..d6cbe471 100644
--- a/paopao-api/internal/dao/user.go
+++ b/internal/dao/user.go
@@ -10,8 +10,8 @@ import (
"strings"
"time"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
"gopkg.in/resty.v1"
)
diff --git a/paopao-api/internal/dao/wallet.go b/internal/dao/wallet.go
similarity index 97%
rename from paopao-api/internal/dao/wallet.go
rename to internal/dao/wallet.go
index 2bacf72c..becae12b 100644
--- a/paopao-api/internal/dao/wallet.go
+++ b/internal/dao/wallet.go
@@ -1,8 +1,8 @@
package dao
import (
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
"gorm.io/gorm"
)
diff --git a/paopao-api/internal/middleware/jwt.go b/internal/middleware/jwt.go
similarity index 89%
rename from paopao-api/internal/middleware/jwt.go
rename to internal/middleware/jwt.go
index ceea76be..d3db89f0 100644
--- a/paopao-api/internal/middleware/jwt.go
+++ b/internal/middleware/jwt.go
@@ -5,10 +5,10 @@ import (
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func JWT() gin.HandlerFunc {
diff --git a/paopao-api/internal/middleware/priv.go b/internal/middleware/priv.go
similarity index 81%
rename from paopao-api/internal/middleware/priv.go
rename to internal/middleware/priv.go
index 993f64a3..6f048e66 100644
--- a/paopao-api/internal/middleware/priv.go
+++ b/internal/middleware/priv.go
@@ -2,9 +2,9 @@ package middleware
import (
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func Priv() gin.HandlerFunc {
diff --git a/paopao-api/internal/model/attachment.go b/internal/model/attachment.go
similarity index 100%
rename from paopao-api/internal/model/attachment.go
rename to internal/model/attachment.go
diff --git a/paopao-api/internal/model/captcha.go b/internal/model/captcha.go
similarity index 100%
rename from paopao-api/internal/model/captcha.go
rename to internal/model/captcha.go
diff --git a/paopao-api/internal/model/comment.go b/internal/model/comment.go
similarity index 100%
rename from paopao-api/internal/model/comment.go
rename to internal/model/comment.go
diff --git a/paopao-api/internal/model/comment_content.go b/internal/model/comment_content.go
similarity index 100%
rename from paopao-api/internal/model/comment_content.go
rename to internal/model/comment_content.go
diff --git a/paopao-api/internal/model/comment_reply.go b/internal/model/comment_reply.go
similarity index 100%
rename from paopao-api/internal/model/comment_reply.go
rename to internal/model/comment_reply.go
diff --git a/paopao-api/internal/model/message.go b/internal/model/message.go
similarity index 100%
rename from paopao-api/internal/model/message.go
rename to internal/model/message.go
diff --git a/paopao-api/internal/model/model.go b/internal/model/model.go
similarity index 96%
rename from paopao-api/internal/model/model.go
rename to internal/model/model.go
index ed0aff85..6010b1b2 100644
--- a/paopao-api/internal/model/model.go
+++ b/internal/model/model.go
@@ -4,8 +4,8 @@ import (
"fmt"
"time"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/pkg/setting"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/pkg/setting"
"gorm.io/driver/mysql"
"gorm.io/gorm"
"gorm.io/gorm/logger"
diff --git a/paopao-api/internal/model/post.go b/internal/model/post.go
similarity index 100%
rename from paopao-api/internal/model/post.go
rename to internal/model/post.go
diff --git a/paopao-api/internal/model/post_attachment_bill.go b/internal/model/post_attachment_bill.go
similarity index 100%
rename from paopao-api/internal/model/post_attachment_bill.go
rename to internal/model/post_attachment_bill.go
diff --git a/paopao-api/internal/model/post_collection.go b/internal/model/post_collection.go
similarity index 100%
rename from paopao-api/internal/model/post_collection.go
rename to internal/model/post_collection.go
diff --git a/paopao-api/internal/model/post_content.go b/internal/model/post_content.go
similarity index 100%
rename from paopao-api/internal/model/post_content.go
rename to internal/model/post_content.go
diff --git a/paopao-api/internal/model/post_star.go b/internal/model/post_star.go
similarity index 100%
rename from paopao-api/internal/model/post_star.go
rename to internal/model/post_star.go
diff --git a/paopao-api/internal/model/tag.go b/internal/model/tag.go
similarity index 100%
rename from paopao-api/internal/model/tag.go
rename to internal/model/tag.go
diff --git a/paopao-api/internal/model/user.go b/internal/model/user.go
similarity index 100%
rename from paopao-api/internal/model/user.go
rename to internal/model/user.go
diff --git a/paopao-api/internal/model/wallet_recharge.go b/internal/model/wallet_recharge.go
similarity index 100%
rename from paopao-api/internal/model/wallet_recharge.go
rename to internal/model/wallet_recharge.go
diff --git a/paopao-api/internal/model/wallet_statement.go b/internal/model/wallet_statement.go
similarity index 100%
rename from paopao-api/internal/model/wallet_statement.go
rename to internal/model/wallet_statement.go
diff --git a/paopao-api/internal/routers/api/attachment.go b/internal/routers/api/attachment.go
similarity index 96%
rename from paopao-api/internal/routers/api/attachment.go
rename to internal/routers/api/attachment.go
index b4911b6a..6ff07630 100644
--- a/paopao-api/internal/routers/api/attachment.go
+++ b/internal/routers/api/attachment.go
@@ -9,12 +9,12 @@ import (
"github.com/disintegration/imaging"
"github.com/gin-gonic/gin"
"github.com/gofrs/uuid"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func GeneratePath(s string) string {
diff --git a/paopao-api/internal/routers/api/comment.go b/internal/routers/api/comment.go
similarity index 93%
rename from paopao-api/internal/routers/api/comment.go
rename to internal/routers/api/comment.go
index 3ee49fe3..842e57b1 100644
--- a/paopao-api/internal/routers/api/comment.go
+++ b/internal/routers/api/comment.go
@@ -2,12 +2,12 @@ package api
import (
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func GetPostComments(c *gin.Context) {
diff --git a/paopao-api/internal/routers/api/home.go b/internal/routers/api/home.go
similarity index 88%
rename from paopao-api/internal/routers/api/home.go
rename to internal/routers/api/home.go
index 8b2fb5c1..fb48f07d 100644
--- a/paopao-api/internal/routers/api/home.go
+++ b/internal/routers/api/home.go
@@ -10,13 +10,13 @@ import (
"github.com/afocus/captcha"
"github.com/gin-gonic/gin"
"github.com/gofrs/uuid"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
- "github.com/rocboss/paopao-api/pkg/util"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
+ "github.com/rocboss/paopao-ce/pkg/util"
)
const MAX_PHONE_CAPTCHA = 10
diff --git a/paopao-api/internal/routers/api/message.go b/internal/routers/api/message.go
similarity index 85%
rename from paopao-api/internal/routers/api/message.go
rename to internal/routers/api/message.go
index 5cf30403..ae508922 100644
--- a/paopao-api/internal/routers/api/message.go
+++ b/internal/routers/api/message.go
@@ -2,11 +2,11 @@ package api
import (
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func GetUnreadMsgCount(c *gin.Context) {
diff --git a/paopao-api/internal/routers/api/post.go b/internal/routers/api/post.go
similarity index 95%
rename from paopao-api/internal/routers/api/post.go
rename to internal/routers/api/post.go
index 75bae0e2..270fb207 100644
--- a/paopao-api/internal/routers/api/post.go
+++ b/internal/routers/api/post.go
@@ -2,13 +2,13 @@ package api
import (
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/dao"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/dao"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
func GetPostList(c *gin.Context) {
diff --git a/paopao-api/internal/routers/api/user.go b/internal/routers/api/user.go
similarity index 98%
rename from paopao-api/internal/routers/api/user.go
rename to internal/routers/api/user.go
index af50ffb8..92ba4b72 100644
--- a/paopao-api/internal/routers/api/user.go
+++ b/internal/routers/api/user.go
@@ -7,12 +7,12 @@ import (
"unicode/utf8"
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/internal/service"
- "github.com/rocboss/paopao-api/pkg/app"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/internal/service"
+ "github.com/rocboss/paopao-ce/pkg/app"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
"github.com/smartwalle/alipay/v3"
)
diff --git a/paopao-api/internal/routers/router.go b/internal/routers/router.go
similarity index 97%
rename from paopao-api/internal/routers/router.go
rename to internal/routers/router.go
index 8d5057c6..61925756 100644
--- a/paopao-api/internal/routers/router.go
+++ b/internal/routers/router.go
@@ -5,8 +5,8 @@ import (
"github.com/gin-contrib/cors"
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/internal/middleware"
- "github.com/rocboss/paopao-api/internal/routers/api"
+ "github.com/rocboss/paopao-ce/internal/middleware"
+ "github.com/rocboss/paopao-ce/internal/routers/api"
)
func NewRouter() *gin.Engine {
diff --git a/paopao-api/internal/service/attachment.go b/internal/service/attachment.go
similarity index 74%
rename from paopao-api/internal/service/attachment.go
rename to internal/service/attachment.go
index 1db2ba13..2f4bfc88 100644
--- a/paopao-api/internal/service/attachment.go
+++ b/internal/service/attachment.go
@@ -1,6 +1,6 @@
package service
-import "github.com/rocboss/paopao-api/internal/model"
+import "github.com/rocboss/paopao-ce/internal/model"
func (svc *Service) CreateAttachment(attachment *model.Attachment) (*model.Attachment, error) {
return svc.dao.CreateAttachment(attachment)
diff --git a/paopao-api/internal/service/avatar.go b/internal/service/avatar.go
similarity index 100%
rename from paopao-api/internal/service/avatar.go
rename to internal/service/avatar.go
diff --git a/paopao-api/internal/service/comment.go b/internal/service/comment.go
similarity index 97%
rename from paopao-api/internal/service/comment.go
rename to internal/service/comment.go
index f75af600..9ef87f67 100644
--- a/paopao-api/internal/service/comment.go
+++ b/internal/service/comment.go
@@ -4,10 +4,10 @@ import (
"strings"
"time"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/errcode"
- "github.com/rocboss/paopao-api/pkg/util"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
+ "github.com/rocboss/paopao-ce/pkg/util"
)
type CommentCreationReq struct {
diff --git a/paopao-api/internal/service/message.go b/internal/service/message.go
similarity index 94%
rename from paopao-api/internal/service/message.go
rename to internal/service/message.go
index 619dce5f..6b77fda3 100644
--- a/paopao-api/internal/service/message.go
+++ b/internal/service/message.go
@@ -1,8 +1,8 @@
package service
import (
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
type ReadMessageReq struct {
diff --git a/paopao-api/internal/service/post.go b/internal/service/post.go
similarity index 98%
rename from paopao-api/internal/service/post.go
rename to internal/service/post.go
index e9ffc303..e9ca0942 100644
--- a/paopao-api/internal/service/post.go
+++ b/internal/service/post.go
@@ -7,11 +7,11 @@ import (
"strings"
"time"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/dao"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/util"
- "github.com/rocboss/paopao-api/pkg/zinc"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/dao"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/util"
+ "github.com/rocboss/paopao-ce/pkg/zinc"
)
type TagType string
diff --git a/paopao-api/internal/service/service.go b/internal/service/service.go
similarity index 77%
rename from paopao-api/internal/service/service.go
rename to internal/service/service.go
index 7caae23e..e0b3db36 100644
--- a/paopao-api/internal/service/service.go
+++ b/internal/service/service.go
@@ -2,9 +2,9 @@ package service
import (
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/dao"
- "github.com/rocboss/paopao-api/pkg/zinc"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/dao"
+ "github.com/rocboss/paopao-ce/pkg/zinc"
)
type Service struct {
diff --git a/paopao-api/internal/service/sign.go b/internal/service/sign.go
similarity index 87%
rename from paopao-api/internal/service/sign.go
rename to internal/service/sign.go
index f836173b..53aa58e4 100644
--- a/paopao-api/internal/service/sign.go
+++ b/internal/service/sign.go
@@ -4,8 +4,8 @@ import (
"fmt"
"sort"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/pkg/util"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/pkg/util"
)
func (svc *Service) GetParamSign(param map[string]interface{}, secretKey string) string {
diff --git a/paopao-api/internal/service/user.go b/internal/service/user.go
similarity index 97%
rename from paopao-api/internal/service/user.go
rename to internal/service/user.go
index 953dabaf..5cdbc208 100644
--- a/paopao-api/internal/service/user.go
+++ b/internal/service/user.go
@@ -8,11 +8,11 @@ import (
"unicode/utf8"
"github.com/gofrs/uuid"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/convert"
- "github.com/rocboss/paopao-api/pkg/errcode"
- "github.com/rocboss/paopao-api/pkg/util"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/convert"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
+ "github.com/rocboss/paopao-ce/pkg/util"
)
const MAX_CAPTCHA_TIMES = 2
diff --git a/paopao-api/internal/service/wallet.go b/internal/service/wallet.go
similarity index 89%
rename from paopao-api/internal/service/wallet.go
rename to internal/service/wallet.go
index 8887980c..60526937 100644
--- a/paopao-api/internal/service/wallet.go
+++ b/internal/service/wallet.go
@@ -3,9 +3,9 @@ package service
import (
"time"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/model"
- "github.com/rocboss/paopao-api/pkg/errcode"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/model"
+ "github.com/rocboss/paopao-ce/pkg/errcode"
)
type RechargeReq struct {
diff --git a/paopao-api/main.go b/main.go
similarity index 86%
rename from paopao-api/main.go
rename to main.go
index 35c68f3d..3bf3441f 100644
--- a/paopao-api/main.go
+++ b/main.go
@@ -5,8 +5,8 @@ import (
"net/http"
"github.com/gin-gonic/gin"
- "github.com/rocboss/paopao-api/global"
- "github.com/rocboss/paopao-api/internal/routers"
+ "github.com/rocboss/paopao-ce/global"
+ "github.com/rocboss/paopao-ce/internal/routers"
)
func main() {
diff --git a/paopao-web/README.md b/paopao-web/README.md
deleted file mode 100644
index eea15cef..00000000
--- a/paopao-web/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Vue 3 + Vite
-
-This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `