wip:tj

internal/jyutil/path.go

@@ -13,7 +13,7 @@ import (
 func GetFilePath(str, filetype string) string {
 	var tmp = time.Now().Format("20060102150405001")
 	var name = tmp + common.GetComplexRandom(8, 0, 0) + "." + str
-	uploadPath := g.Cfg().MustGet(ctx, "upload_path").String()
+	uploadPath := g.Cfg("global").MustGet(ctx, "upload_path").String()
 	var pathStr = uploadPath + filetype + "/" + tmp[:4] + "/" + tmp[4:6] + "/" + tmp[6:8] + "/"
 	if err := os.MkdirAll(pathStr, 0700); err != nil {
 		g.Log().Errorf(context.Background(), "创建文件夹 %s异常 %v", pathStr, err)
@@ -22,7 +22,7 @@ func GetFilePath(str, filetype string) string {
 }
 
 func GetRequestPath(absolutePath string) string {
-	uploadPath := g.Cfg().MustGet(ctx, "upload_path").String()
+	uploadPath := g.Cfg("global").MustGet(ctx, "upload_path").String()
 	lastPart := filepath.Base(uploadPath)
 	relativePath, err := filepath.Rel(uploadPath, absolutePath)
 	if err != nil {

internal/logic/order/contractPdf.go

@@ -29,6 +29,7 @@ import (
 const (
 	bigMemberContractNoFlag = "JYDZ05"
 	subVipContractNoFlag    = "JYDZ06"
+	staticSourceDir         = "resources/static/contract/"
 
 	/*
 	  1  超级订阅：https://www.kdocs.cn/l/cpqTn293crus
@@ -336,7 +337,7 @@ func (detail *ContractDetail) getDocxFile(createTime time.Time) (filePath string
 	//计算第一页空行数，把落款固定到最下部
 
 	// read and parse the template docx
-	doc, err := docx.Open(fmt.Sprintf("web/static/contract/%s.docx", detail.ContractTemplate))
+	doc, err := docx.Open(fmt.Sprintf("%s%s.docx", staticSourceDir, detail.ContractTemplate))
 	if err != nil {
 		return "", errors.Wrap(err, "docx文件模版文件异常")
 	}
@@ -426,7 +427,7 @@ func (detail *ContractDetail) convertWordToPDF(inputDocxPath string) error {
 					y = 500 + rand.Int63n(200)
 				}
 
-				exeSeal := exec.Command(commandName, commandArg, fmt.Sprintf("convert %s \\( %s -resize 50%% \\) -gravity southeast -geometry +%d+%d -composite  %s", fileTmpPath, "web/static/contract/z.png", x, y, fileTmpPath))
+				exeSeal := exec.Command(commandName, commandArg, fmt.Sprintf("convert %s \\( %s -resize 50%% \\) -gravity southeast -geometry +%d+%d -composite  %s", fileTmpPath, fmt.Sprintf("%sz.png", staticSourceDir), x, y, fileTmpPath))
 				if _, err := exeSeal.CombinedOutput(); err != nil {
 					return errors.Wrap(err, "Command execution exeSeal failed:")
 				}