Compare commits
No commits in common. "7ea988ccc599868ed9a3c0d792eed49183c5d7a2" and "7735b710ddd9eafd8c459d416d97dfe35918e99a" have entirely different histories.
7ea988ccc5
...
7735b710dd
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
|||||||
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
|
// Code generated by protoc-gen-go-triple. DO NOT EDIT.
|
||||||
// versions:
|
// versions:
|
||||||
// - protoc-gen-go-triple v1.0.8
|
// - protoc-gen-go-triple v1.0.8
|
||||||
// - protoc v4.24.0--rc1
|
// - protoc v3.20.3
|
||||||
// source: pb/bundle.proto
|
// source: pb/bundle.proto
|
||||||
|
|
||||||
package bundle
|
package bundle
|
||||||
|
@ -679,8 +679,6 @@ func AntomWebhook(c *gin.Context) {
|
|||||||
TimeUnit: timeUnit,
|
TimeUnit: timeUnit,
|
||||||
AssociatedorderNumber: resp.OutTradeNo, //增值服务订单号
|
AssociatedorderNumber: resp.OutTradeNo, //增值服务订单号
|
||||||
Type: 2, //自行购买
|
Type: 2, //自行购买
|
||||||
OperatorName: orderLimit.UserName,
|
|
||||||
OperatorId: orderLimit.UserId,
|
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
service.Error(c, err)
|
service.Error(c, err)
|
||||||
|
@ -118,13 +118,7 @@ func ToExcelByType(titleList []string, dataList []interface{}, dataType string,
|
|||||||
// ResponseXls content 为上面生成的io.ReadSeeker, fileTag 为返回前端的文件名
|
// ResponseXls content 为上面生成的io.ReadSeeker, fileTag 为返回前端的文件名
|
||||||
func ResponseXls(c *gin.Context, content io.ReadSeeker, fileTag string) {
|
func ResponseXls(c *gin.Context, content io.ReadSeeker, fileTag string) {
|
||||||
fileName := fmt.Sprintf("%s.%s", fileTag, ExcelPrefix)
|
fileName := fmt.Sprintf("%s.%s", fileTag, ExcelPrefix)
|
||||||
// 返回 Excel 文件流给前端
|
c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
|
||||||
c.Header("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
|
c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
|
||||||
c.Header("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
|
|
||||||
c.Header("File-Name", fmt.Sprintf("%s", fileName))
|
|
||||||
c.Header("Access-Control-Expose-Headers", "File-Name")
|
|
||||||
//_ = c.Writer(c.Writer)
|
|
||||||
//c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
|
|
||||||
//c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
|
|
||||||
http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
|
http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user