style: 错误信息英文返回-lib包
This commit is contained in:
@@ -3,7 +3,6 @@ package services
|
||||
import (
|
||||
"bufio"
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"mime/multipart"
|
||||
@@ -220,7 +219,7 @@ func HandleUploadFormFile(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseMultipartForm(32 << 20)
|
||||
//mForm := r.MultipartForm
|
||||
|
||||
for k, _ := range r.MultipartForm.File {
|
||||
for k := range r.MultipartForm.File {
|
||||
// k is the key of file part
|
||||
file, fileHeader, err := r.FormFile(k)
|
||||
if err != nil {
|
||||
@@ -253,7 +252,7 @@ func PostFileHandler(w http.ResponseWriter, r *http.Request) {
|
||||
if !strings.Contains(r.Header.Get("Content-Type"), "multipart/form-data") {
|
||||
// 不支持的 Content-Type 类型
|
||||
fmt.Println("Invalid Content-Type: ", r.Header.Get("Content-Type"))
|
||||
http.Error(w, " 不支持的 Content-Type 类型", http.StatusBadRequest)
|
||||
http.Error(w, " Unsupported Content-Type Types", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -284,7 +283,8 @@ func PostFileHandler(w http.ResponseWriter, r *http.Request) {
|
||||
var buf = &bytes.Buffer{}
|
||||
// 非文件字段部分大小限制验证(非文件字段,go中filename会是空)
|
||||
if fileName == "" {
|
||||
var limitError = "请求主体中非文件字段" + formName + "超出大小限制"
|
||||
// "请求主体中非文件字段" + formName + "超出大小限制"
|
||||
var limitError = fmt.Sprintf("Non-file field %s in request body exceeds size limit", formName)
|
||||
err = uploadSizeLimit(buf, part, ValuesMax, limitError)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
@@ -294,7 +294,8 @@ func PostFileHandler(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// 文件字段部分大小限制验证
|
||||
var limitError = "请求主体中文件字段" + fileName + "超出大小限制"
|
||||
// "请求主体中文件字段" + fileName + "超出大小限制"
|
||||
var limitError = fmt.Sprintf("File field %s in request body exceeds size limit", fileName)
|
||||
err = uploadSizeLimit(buf, part, FilesMax, limitError)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
@@ -310,9 +311,11 @@ func PostFileHandler(w http.ResponseWriter, r *http.Request) {
|
||||
// 非逻辑内容,仅为测试使用
|
||||
var chunkNumber = r.Header.Get("chunk-number")
|
||||
if chunkNumber == "" {
|
||||
http.Error(w, "文件"+fileName+"上传成功", http.StatusOK)
|
||||
// "文件"+fileName+"上传成功"
|
||||
http.Error(w, fmt.Sprintf("File %s uploaded successfully", fileName), http.StatusOK)
|
||||
} else {
|
||||
http.Error(w, "分片文件"+fileName+chunkNumber+"上传成功", http.StatusOK)
|
||||
// "分片文件 %s %s 上传成功"
|
||||
http.Error(w, fmt.Sprintf("Sliced file %s %s uploaded successfully.", fileName, chunkNumber), http.StatusOK)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -326,7 +329,7 @@ func uploadSizeLimit(buf *bytes.Buffer, part *multipart.Part, maxLimit int64, li
|
||||
}
|
||||
maxLimit -= n
|
||||
if maxLimit < 0 {
|
||||
return errors.New(limitError)
|
||||
return fmt.Errorf(limitError)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -138,20 +138,14 @@ func ExtGetUriPageLimitString(r *http.Request) string {
|
||||
}
|
||||
|
||||
func IsJsonContentType(r *http.Request) bool {
|
||||
if strings.Contains(r.Header.Get("Content-Type"), "application/json") {
|
||||
return true
|
||||
}
|
||||
return false
|
||||
hType := r.Header.Get("Content-Type")
|
||||
return strings.Contains(hType, "application/json")
|
||||
}
|
||||
|
||||
func IsValidOAuthUri(r *http.Request) bool {
|
||||
vars := mux.Vars(r)
|
||||
apiVer := vars["apiVersion"] // 获取Uri
|
||||
if apiVer != "v1" {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
return apiVer == "v1"
|
||||
}
|
||||
|
||||
func IsVallidContentType(r *http.Request, checkFlag bool) bool {
|
||||
@@ -386,7 +380,7 @@ func CheckCommonValidRequest(w http.ResponseWriter, r *http.Request) (string, er
|
||||
// error processing ...
|
||||
// 401-1 response
|
||||
token, ret = oauth.IsCarriedToken(r)
|
||||
if ret == false {
|
||||
if !ret {
|
||||
log.Error("accessToken is not carried")
|
||||
ResponseUnauthorized401AccessTokenNotCarried(w)
|
||||
return token, err
|
||||
|
||||
Reference in New Issue
Block a user