bugfix

controllers/calendar/calendar.go

@@ -86,7 +86,10 @@ func (c *CalendarController) DownloadImg() {
 					URI:  list[i].CustomerImg,
 					Name: list[i].ImgName + ".jpeg",
 				}
-				files = append(files, file)
+				if file.URI != "" {
+					files = append(files, file)
+				}
+
 			}
 
 		}
@@ -98,12 +101,17 @@ func (c *CalendarController) DownloadImg() {
 					URI:  list[i].CalendarImg,
 					Name: list[i].ImgName + ".jpeg",
 				}
-				files = append(files, file)
+				if file.URI != "" {
+					files = append(files, file)
+				}
 			}
 
 		}
 		zf = "电子台历.zip"
 	}
+	if len(files) <= 0 {
+		c.ResponseError(errors.New("图片为空"))
+	}
 	c.SaveNetFilesToZip(files, zf)
 }
 func (c *CalendarController) GetCalendarListFront() {

controllers/file.go

@@ -97,6 +97,32 @@ func (c *BaseController) UploadBase64Image() {
 	c.ResponseJSON(resp)
 }
 
+// func (c *BaseController) UploadBase64ImageGzip() {
+// 	base64Gzip := c.GetString("base64str")
+// 	baseZip := []byte(base64Gzip)
+// 	reader, err := gzip.NewReader(bytes.NewReader(baseZip))
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+// 	baseByte, err := ioutil.ReadAll(reader)
+// 	baseStr := string(baseByte)
+// 	base64Str, err := url.QueryUnescape(baseStr)
+// 	if err != nil {
+// 		c.ResponseError(utils.LogError("上传 Base64 图片失败", err))
+// 	}
+
+// 	imgURL, err := c.uploadStringToAliOSS(base64Str)
+// 	if err != nil {
+// 		c.ResponseError(err)
+// 	}
+
+// 	resp := map[string]interface{}{
+// 		"url": imgURL,
+// 	}
+
+// 	c.ResponseJSON(resp)
+// }
+
 // uploadStringToAliOSS 上传文件到阿里云
 func (c *BaseController) uploadStringToAliOSS(fStr string) (string, error) {
 	aliConf, ok := c.Configer[AliYunConf]

models/course/course.go

@@ -712,7 +712,7 @@ WHERE
 	a.org_id = '` + orgId + `' 
 	AND a.STATUS = ` + strconv.Itoa(models.STATUS_NORMAL) + ` 
 ORDER BY
-	a.begin_date DESC 
+	a.begin_date ASC 
 	LIMIT ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	err := m.db.Sql(sql).Find(&course)
 	return course, err

utils/aliyun.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"bytes"
+	"compress/gzip"
 	"encoding/base64"
 	"net/http"
 	"strings"
@@ -29,17 +30,26 @@ func UploadFileToBucket(cli *oss.Client, req *http.Request, bucket, fromFront st
 		return "", err
 	}
 	defer file.Close()
-
 	fname := fh.Filename
 	if len(nameSuffix) > 0 && nameSuffix[0] != "" {
 		fArr := strings.Split(fname, ".")
 		fArr[0] = fArr[0] + nameSuffix[0]
 		fname = strings.Join(fArr, ".")
 	}
-
-	err = bkt.PutObject(fname, file)
-	if err != nil {
-		return "", err
+	if req.Header.Get("Content-Encoding") == "gzip" {
+		reader, err := gzip.NewReader(file)
+		if err != nil {
+			return "", err
+		}
+		err = bkt.PutObject(fname, reader)
+		if err != nil {
+			return "", err
+		}
+	} else {
+		err = bkt.PutObject(fname, file)
+		if err != nil {
+			return "", err
+		}
 	}
 
 	return strings.Join([]string{