xg

src/util/config.go

@@ -13,21 +13,21 @@ var (
 	MgoCus          *mongodb.MongodbSim //企业服务库
 	JYMgo           *mongodb.MongodbSim
 	MgoEn           *mongodb.MongodbSim
-	JyProMgo		*mongodb.MongodbSim
+	JyProMgo        *mongodb.MongodbSim
 	EsIndex, EsType string
 	MgoEnC          string
 	Subday          float64
 	PreviewHref     string //数据预览地址
 	JyCollNameOne   string
 	JyCollNameTwo   string
-
-	JyRecord		string
-	JyMgoColl		string
-	JyProRecord		string
-	RedisJYName		string
-	RedisDelKey1	string
-	RedisDelKey2	string
-	RedisDelKey3	string
+	JyRecord        string
+	JyMgoColl       string
+	JyProRecord     string
+	RedisJYName     string
+	RedisDelKey1    string
+	RedisDelKey2    string
+	RedisDelKey3    string
+	CustomerApi     string
 )
 
 var (
@@ -53,7 +53,6 @@ func InitMgoPool() {
 		DbName:      qu.ObjToString(Sysconfig["dbname"]),
 	}
 	Mgo.InitPool()
-<<<<<<< HEAD
 
 	customer := Sysconfig["customer"].(map[string]interface{})
 	CustomerApi = qu.ObjToString(customer["api"])
@@ -63,8 +62,7 @@ func InitMgoPool() {
 		DbName:      qu.ObjToString(customer["dbname"]),
 	}
 	MgoCus.InitPool()
-=======
->>>>>>> b88fed297bb7eab04eac3a7aad1ea8992a3684ac
+
 }
 
 func initMgoEn() {
@@ -94,8 +92,8 @@ func initJYMgo() {
 	jypro := *qu.ObjToMap(Sysconfig["jy_pro"])
 	JyProMgo = &mongodb.MongodbSim{
 		MongodbAddr: qu.ObjToString(jypro["mgodb"]),
-		Size: 		 qu.IntAll(jypro["dbsize"]),
-		DbName: 	 qu.ObjToString(jypro["dbname"]),
+		Size:        qu.IntAll(jypro["dbsize"]),
+		DbName:      qu.ObjToString(jypro["dbname"]),
 	}
 	JyMgoColl = qu.ObjToString(jypro["coll"])
 	JyProMgo.InitPool()

src/util/util.go

@@ -1,11 +1,12 @@
 package util
 
 import (
-	"github.com/shopspring/decimal"
 	"net/http"
 	qu "qfw/util"
 	"reflect"
 	"strconv"
+
+	"github.com/shopspring/decimal"
 )
 
 //数据类型转换
@@ -51,7 +52,7 @@ func deleteSlice(arr []string, v string) []string {
  *	前端科学计数法处理
  */
 func FormatNumber(tmp map[string]interface{}) {
-	for k, v := range tmp{
+	for k, v := range tmp {
 		if reflect.TypeOf(v).Name() == reflect.Float64.String() {
 			num, _ := decimal.NewFromString(strconv.FormatFloat(qu.Float64All(v), 'e', -1, 64))
 			tmp[k], _ = num.Float64()