Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

server/collection/internal/handler/routes.go

@@ -32,6 +32,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/collection/test_ai",
 				Handler: TestAiHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/collection/test_pdf",
+				Handler: TestPdfHandler(serverCtx),
+			},
 		},
 	)
 }

server/collection/internal/handler/testpdfhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/collection/internal/logic"
+	"fusenapi/server/collection/internal/svc"
+	"fusenapi/server/collection/internal/types"
+)
+
+func TestPdfHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.TestPdfReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewTestPdfLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.TestPdf(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/collection/internal/logic/testpdflogic.go

@@ -0,0 +1,49 @@
+package logic
+
+import (
+	"context"
+	"fusenapi/server/collection/internal/svc"
+	"fusenapi/server/collection/internal/types"
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+	"fusenapi/utils/pdf"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type TestPdfLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewTestPdfLogic(ctx context.Context, svcCtx *svc.ServiceContext) *TestPdfLogic {
+	return &TestPdfLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *TestPdfLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *TestPdfLogic) TestPdf(req *types.TestPdfReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	switch req.Type {
+	case "url":
+	case "html":
+	default:
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "invalid type")
+	}
+	res, err := pdf.HtmlToPdfBase64(req.Content, req.Type)
+	if err != nil {
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error())
+	}
+	return resp.SetStatus(basic.CodeOK, res)
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *TestPdfLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server/collection/internal/types/types.go

@@ -44,6 +44,11 @@ type TestAiReq struct {
 	Num int `form:"num"`
 }
 
+type TestPdfReq struct {
+	Content string `json:"content"`
+	Type    string `json:"type"`
+}
+
 type Request struct {
 }
 

server_api/collection.api

@@ -18,9 +18,12 @@ service collection {
 	//获取收藏列表
 	@handler GetCollectProductListHandler
 	get /api/collection/get_collect_product_list(GetCollectProductListReq) returns (response);
-	//测试
+	//测试算法合图并发
 	@handler TestAiHandler
 	get /api/collection/test_ai(TestAiReq) returns (response);
+	//测试pdf
+	@handler TestPdfHandler
+	post /api/collection/test_pdf(TestPdfReq) returns (response);
 }
 
 //收藏产品
@@ -56,7 +59,12 @@ type GetCollectProductListRspItem {
 	IsShelf          int64       `json:"is_shelf"`
 	IsDeleted        int64       `json:"is_deleted"`
 }
-//测试
+//测试算法
 type TestAiReq {
 	Num int `form:"num"`
+}
+//测试pdf
+type TestPdfReq {
+	Content string `json:"content"`
+	Type    string `json:"type"`
 }

utils/pdf/html_to_pdf.go

@@ -2,25 +2,27 @@ package pdf
 
 import (
 	"encoding/base64"
+	"errors"
 	"github.com/SebastiaanKlippert/go-wkhtmltopdf"
 	"strings"
 )
 
 /*
 html转 Pdf
-dataType = 1 为网页url dataType = 2为网页内容
 outFile为空则不保存(使用该方法需要安装工具 sudo apt-get install wkhtmltopdf)
 */
-func HtmlToPdfBase64(content string, dataType int, outFile ...string) (string, error) {
+func HtmlToPdfBase64(content string, dataType string, outFile ...string) (string, error) {
 	pdfg, err := wkhtmltopdf.NewPDFGenerator()
 	if err != nil {
 		return "", err
 	}
 	switch dataType {
-	case 1: //网页地址
+	case "url": //网页地址
 		pdfg.AddPage(wkhtmltopdf.NewPage(content))
-	case 2: //网页内容
+	case "html": //网页内容
 		pdfg.AddPage(wkhtmltopdf.NewPageReader(strings.NewReader(content)))
+	default:
+		return "", errors.New("invalid type")
 	}
 	//模式
 	pdfg.Orientation.Set(wkhtmltopdf.OrientationPortrait)