Merge branch 'release-wzy-gome'

# Conflicts:
#	upstream/upstream.go

elastic/base.go

@@ -8,17 +8,17 @@ import (
 	"os"
 )
 
-func connection() (search *elastic.Client,err error){
+func connection() (search *elastic.Client, err error) {
 	opts := []elastic.ClientOptionFunc{
 		elastic.SetURL("http://" + g.Cfg().Get("Es.Url").(string)),
 		elastic.SetSniff(false),
 		elastic.SetBasicAuth(g.Cfg().Get("Es.UserName").(string), g.Cfg().Get("Es.Password").(string)),
-		elastic.SetInfoLog(log.New(os.Stdout,"",log.LstdFlags)),
+		elastic.SetInfoLog(log.New(os.Stdout, "", log.LstdFlags)),
 		elastic.SetErrorLog(log.New(os.Stderr, "ELASTIC ", log.LstdFlags)),
 	}
 	client, err := elastic.NewClient(opts...)
 	if err != nil {
-		logs.Error("Es 链接失败 error:【%v】",err)
+		logs.Error("Es 链接失败 error:【%v】", err)
 	}
-	return client,err
+	return client, err
 }

upstream/upstream.go

 package upstream
 
+import (
+	"github.com/gogf/gf/frame/g"
+)
+
 const (
-	Jd     = 2
-	Ali    = 6
-	Tm     = 7
-	Cloud  = 1
-	Sn = 8
-	Gome = 10
+	Jd    = 2
+	Ali   = 6
+	Tm    = 7
+	Cloud = 1
+	Sn    = 8
+	Gome  = 10
 )
 
 var (
@@ -23,4 +27,53 @@ var (
 	RefundAgree              = 301
 	RefundRefuse             = 302
 	RefundSuccess            = 303
-)
\ No newline at end of file
+)
+
+func GetUpstreamList() (res interface{}, err error) {
+	res = g.List{
+		g.Map{
+			"key":  Jd,
+			"name": GetUpstreamName(Jd),
+		},
+		g.Map{
+			"key":  Ali,
+			"name": GetUpstreamName(Ali),
+		},
+		g.Map{
+			"key":  Tm,
+			"name": GetUpstreamName(Tm),
+		},
+		g.Map{
+			"key":  Cloud,
+			"name": GetUpstreamName(Cloud),
+		},
+		g.Map{
+			"key":  Sn,
+			"name": GetUpstreamName(Sn),
+		},
+		g.Map{
+			"key":  Gome,
+			"name": GetUpstreamName(Gome),
+		},
+	}
+	return
+}
+
+func GetUpstreamName(source int) string {
+	switch source {
+	case Jd:
+		return "京东"
+	case Ali:
+		return "阿里"
+	case Tm:
+		return "天猫"
+	case Cloud:
+		return "云仓"
+	case Sn:
+		return "苏宁"
+	case Gome:
+		return "国美"
+	default:
+		return "未知来源"
+	}
+}