Merge branch 'feature/v1.0.31' into feature/v1.0.32

api/biService.api

@@ -115,7 +115,6 @@ type (
 		EntUserId  int64  `header:"entUserId,optional"`
 		EntId      int64  `header:"entId,optional"`
 		FileType   string `form:"fileType"`
-		FileName   string `form:"fileName"`
 	}
 	SendMailReq {
 		Title   string `json:"title"`

api/internal/handler/routes.go

@@ -18,6 +18,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: ClueAddHandler(serverCtx),
 			},
 			{
+				// 新增受理单
 				Method:  http.MethodPost,
 				Path:    "/biService/addAcceptance",
 				Handler: addAcceptanceHandler(serverCtx),
@@ -28,11 +29,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: AddProjectReqHandler(serverCtx),
 			},
 			{
+				// 资讯全量导出
 				Method:  http.MethodPost,
 				Path:    "/biService/allInfoExport",
 				Handler: allInfoExportHandler(serverCtx),
 			},
 			{
+				// 项目全量导出
 				Method:  http.MethodPost,
 				Path:    "/biService/allProjectExport",
 				Handler: allProjectExportHandler(serverCtx),
@@ -58,6 +61,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: ClueImportTlHandler(serverCtx),
 			},
 			{
+				// 创建线索
 				Method:  http.MethodPost,
 				Path:    "/biService/createClueByPhone",
 				Handler: createClueHandler(serverCtx),
@@ -78,6 +82,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: DrawClueHandler(serverCtx),
 			},
 			{
+				// 公司类型
 				Method:  http.MethodPost,
 				Path:    "/biService/getCompanyType",
 				Handler: getCompanyTypeHandler(serverCtx),
@@ -88,6 +93,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: GetInfoIdHandler(serverCtx),
 			},
 			{
+				// 资讯操作
 				Method:  http.MethodPost,
 				Path:    "/biService/infoOperate",
 				Handler: infoOperateHandler(serverCtx),
@@ -98,36 +104,43 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: MyDataAssetHandler(serverCtx),
 			},
 			{
+				// 用户身份
 				Method:  http.MethodPost,
 				Path:    "/biService/myInfo",
 				Handler: MyinfoHandler(serverCtx),
 			},
 			{
+				// 资源中台授权
 				Method:  http.MethodPost,
 				Path:    "/biService/resEmpower",
 				Handler: ResEmpowerHandler(serverCtx),
 			},
 			{
+				// 发送邮件
 				Method:  http.MethodPost,
 				Path:    "/biService/sendCommonndMail",
 				Handler: sendComMailHandler(serverCtx),
 			},
 			{
+				// 数据导出(通用)，发邮件
 				Method:  http.MethodPost,
 				Path:    "/biService/sendMail",
 				Handler: sendMailHandler(serverCtx),
 			},
 			{
+				// bi通用接口
 				Method:  http.MethodPost,
 				Path:    "/biService/sqlManage",
 				Handler: sqlManageHandler(serverCtx),
 			},
 			{
+				// 客成线索移交
 				Method:  http.MethodPost,
 				Path:    "/biService/transferClueByPhone",
 				Handler: transferClueSuccHandler(serverCtx),
 			},
 			{
+				// 附件上传
 				Method:  http.MethodPost,
 				Path:    "/biService/upFile",
 				Handler: upFileHandler(serverCtx),

api/internal/logic/upfilelogic.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"io"
 	"net/http"
+	"net/url"
 	"strings"
 
 	"bp.jydev.jianyu360.cn/BaseService/biService/api/internal/svc"
@@ -49,6 +50,21 @@ func (l *UpFileLogic) UpFile(req *types.UpFileReq) (resp *types.BiResp, err erro
 		break
 	}
 	fileSize := size + "KB"
+	fileName := ""
+	formUrl := l.r.Form.Get("url")
+	u, err := url.Parse(formUrl)
+	if err != nil {
+		fmt.Println("Failed to parse URL:", err)
+		return
+	}
+	queryValues, _ := url.ParseQuery(u.RawQuery)
+	fileName = queryValues.Get("fileId")
+	index := strings.Index(fileName, "-")
+	// 截取 "-" 后边的内容
+	fileName = fileName[index+1:]
+	if fileName == "" {
+		return &types.BiResp{Error_code: -1, Error_msg: "附件名称不能为空，url参数有误"}, nil
+	}
 	res, err := l.svcCtx.BiServiceRpc.UpFile(l.ctx, &biservice.UpFileReq{
 		AppId:      req.AppId,
 		UserId:     req.BaseUserId,
@@ -57,7 +73,7 @@ func (l *UpFileLogic) UpFile(req *types.UpFileReq) (resp *types.BiResp, err erro
 		EntId:      req.EntId,
 		Stype:      req.FileType,
 		File:       bt,
-		FileName:   req.FileName,
+		FileName:   fileName,
 		FileSize:   fileSize,
 	})
 	data := gconv.Map(gconv.UnsafeBytesToStr(res.Data))

api/internal/types/types.go

@@ -128,7 +128,6 @@ type UpFileReq struct {
 	EntUserId  int64  `header:"entUserId,optional"`
 	EntId      int64  `header:"entId,optional"`
 	FileType   string `form:"fileType"`
-	FileName   string `form:"fileName"`
 }
 
 type AddProjectReq struct {