From 6e8ebf781ac457b7ec77f7e4c9ade4c3d36002bc Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:42:05 +0800
Subject: [PATCH] merge master

---
 main.go |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/main.go b/main.go
index 32fa0e0..e70f7b2 100644
--- a/main.go
+++ b/main.go
@@ -17,9 +17,12 @@
 	"fmt"
 	"github.com/golang/protobuf/proto"
 	"github.com/spf13/viper"
+	"basic.com/valib/logger.git"
+
 	"ruleprocess/cache"
 	"ruleprocess/ruleserver"
 	"sync"
+	"github.com/spf13/viper"
 )
 
 var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")

--
Gitblit v1.8.0