增加渠道信息
This commit is contained in:
@@ -37,18 +37,20 @@ type App struct {
|
||||
}
|
||||
|
||||
type DefaultSettings struct {
|
||||
Server string `json:"server"`
|
||||
Uploader string `json:"uploader"`
|
||||
Secret string `json:"secret"`
|
||||
Timeout string `json:"timeout"`
|
||||
Server string `json:"server"`
|
||||
Uploader string `json:"uploader"`
|
||||
Secret string `json:"secret"`
|
||||
Timeout string `json:"timeout"`
|
||||
SourceChannel string `json:"sourceChannel"`
|
||||
}
|
||||
|
||||
type UploadForm struct {
|
||||
Server string `json:"server"`
|
||||
Uploader string `json:"uploader"`
|
||||
Secret string `json:"secret"`
|
||||
Timeout string `json:"timeout"`
|
||||
Data string `json:"data"`
|
||||
Server string `json:"server"`
|
||||
Uploader string `json:"uploader"`
|
||||
Secret string `json:"secret"`
|
||||
Timeout string `json:"timeout"`
|
||||
SourceChannel string `json:"sourceChannel"`
|
||||
Data string `json:"data"`
|
||||
}
|
||||
|
||||
func NewApp() *App {
|
||||
@@ -61,10 +63,11 @@ func (a *App) startup(ctx context.Context) {
|
||||
|
||||
func (a *App) DefaultSettings() DefaultSettings {
|
||||
return DefaultSettings{
|
||||
Server: envDefault("HFB_SERVER", "http://127.0.0.1:8080"),
|
||||
Uploader: strings.TrimSpace(os.Getenv("HFB_UPLOADER_NAME")),
|
||||
Secret: strings.TrimSpace(os.Getenv("HFB_UPLOAD_SECRET")),
|
||||
Timeout: "15s",
|
||||
Server: envDefault("HFB_SERVER", "http://127.0.0.1:8080"),
|
||||
Uploader: strings.TrimSpace(os.Getenv("HFB_UPLOADER_NAME")),
|
||||
Secret: strings.TrimSpace(os.Getenv("HFB_UPLOAD_SECRET")),
|
||||
Timeout: "15s",
|
||||
SourceChannel: strings.TrimSpace(os.Getenv("HFB_SOURCE_CHANNEL")),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,7 +128,11 @@ func buildUploadRequest(form UploadForm) (hfb.ExternalUploadRequest, error) {
|
||||
if uploaderName == "" {
|
||||
return hfb.ExternalUploadRequest{}, fmt.Errorf("缺少上传人名称:请展开“连接配置”填写上传人,或在文本中增加“上传人:姓名”")
|
||||
}
|
||||
return hfb.NewExternalUploadRequest(uploaderName, parsed.Account, time.Now()), nil
|
||||
sourceChannel := strings.TrimSpace(form.SourceChannel)
|
||||
if sourceChannel == "" {
|
||||
return hfb.ExternalUploadRequest{}, fmt.Errorf("请选择订单来源渠道")
|
||||
}
|
||||
return hfb.NewExternalUploadRequest(uploaderName, sourceChannel, parsed.Account, time.Now()), nil
|
||||
}
|
||||
|
||||
func parseTimeout(raw string) (time.Duration, error) {
|
||||
|
||||
Reference in New Issue
Block a user