浏览代码

对比模板

zhangjinkun 6 年之前
父节点
当前提交
6a79abc067
共有 3 个文件被更改,包括 16 次插入8 次删除
  1. 8 7
      src/main.go
  2. 8 1
      versioncomparison/config.json
  3. 二进制
      versioncomparison/template.xlsx

+ 8 - 7
src/main.go

@@ -9,16 +9,17 @@ import (
 	_ "jy/front"
 	. "jy/router"
 	"jy/util"
-	"log"
 	qu "qfw/util"
-	"qfw/util/elastic"
+	//"qfw/util/elastic"
 	redis "qfw/util/redis"
+
+	log "github.com/donnie4w/go-logger/logger"
 )
 
 func init() {
-	util.SetConsole(false)
-	util.SetLevel(util.DEBUG)
-	util.SetRollingDaily("./", "out.log")
+	log.SetConsole(false)
+	log.SetLevel(log.DEBUG)
+	log.SetRollingDaily("./", "out.log")
 	qu.ReadConfig(&util.Config)
 	qu.ReadConfig("./res/brandrule.json", &util.BrandRules)
 	qu.ReadConfig("./res/goods.json", &util.GoodsConfig)
@@ -32,7 +33,7 @@ func init() {
 	redis.InitRedisBySize(qu.ObjToString(util.Config["redis"]), 50, 30, 240)
 	//初始化elastic连接
 	//"winner=172.17.145.179:2710,buyer=172.17.145.179:2711"
-	elastic.InitElasticSize(qu.ObjToString(util.Config["elasticsearch"]), qu.IntAllDef(util.Config["elasticPoolSize"], 30))
+	//elastic.InitElasticSize(qu.ObjToString(util.Config["elasticsearch"]), qu.IntAllDef(util.Config["elasticPoolSize"], 30))
 }
 
 func main() {
@@ -40,7 +41,7 @@ func main() {
 	extract.ClearUdp()   //udp通知清理
 	go extract.Export()
 	go Router.Run(":" + qu.ObjToString(util.Config["port"]))
-	go log.Println("启动..", qu.ObjToString(util.Config["port"]))
+	go log.Debug("启动..", qu.ObjToString(util.Config["port"]))
 	lock := make(chan bool)
 	<-lock
 }

+ 8 - 1
versioncomparison/config.json

@@ -11,6 +11,13 @@
         "buyer",
         "bidamount",
         "budget",
-        "winner"
+        "winner",
+        "agency",
+        "buyerperson",
+        "buyertel",
+        "buyeraddr",
+        "agencyperson",
+        "agencytel",5d39d253a5cb26b9b7404ae1,5d3b23aaa5cb26b9b7c1ec59
+        "agencyaddr"
     ]
 }

二进制
versioncomparison/template.xlsx