From 5fc3e236e4fb81cd5418becdcd1b7bcf16317d05 Mon Sep 17 00:00:00 2001
From: wenzl <wenzl@touzhijia.com>
Date: Thu, 26 Oct 2017 15:10:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?redis=20IdleTimeout=20=E4=BD=BF=E7=94=A8sec?=
 =?UTF-8?q?ond?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cache/redis.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/cache/redis.go b/cache/redis.go
index 31438c9..9d102b0 100644
--- a/cache/redis.go
+++ b/cache/redis.go
@@ -14,12 +14,12 @@ type Redis struct {
 
 //RedisOpts redis 连接属性
 type RedisOpts struct {
-	Host        string
-	Password    string
-	Database    int
-	MaxIdle     int
-	MaxActive   int
-	IdleTimeout time.Duration //second
+	Host        string `yml:"host" json:"host"`
+	Password    string `yml:"password" json:"password"`
+	Database    int    `yml:"database" json:"database"`
+	MaxIdle     int    `yml:"max_idle" json:"max_idle"`
+	MaxActive   int    `yml:"max_active" json:"max_active"`
+	IdleTimeout int32  `yml:"idle_timeout" json:"idle_timeout"` //second
 }
 
 //NewRedis 实例化
@@ -27,7 +27,7 @@ func NewRedis(opts *RedisOpts) *Redis {
 	pool := &redis.Pool{
 		MaxActive:   opts.MaxActive,
 		MaxIdle:     opts.MaxIdle,
-		IdleTimeout: opts.IdleTimeout,
+		IdleTimeout: time.Second * time.Duration(opts.IdleTimeout),
 		Dial: func() (redis.Conn, error) {
 			return redis.Dial("tcp", opts.Host,
 				redis.DialDatabase(opts.Database),

From 1867a9d3df623fe1bae4515c06bbb34a9f89d53c Mon Sep 17 00:00:00 2001
From: wenzl <wenzl@touzhijia.com>
Date: Sat, 4 Nov 2017 13:10:05 +0800
Subject: [PATCH 2/2] export GetTicket

---
 js/js.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/js.go b/js/js.go
index a8bdaa9..80f43bb 100644
--- a/js/js.go
+++ b/js/js.go
@@ -44,7 +44,7 @@ func NewJs(context *context.Context) *Js {
 func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	config = new(Config)
 	var ticketStr string
-	ticketStr, err = js.getTicket()
+	ticketStr, err = js.GetTicket()
 	if err != nil {
 		return
 	}
@@ -61,8 +61,8 @@ func (js *Js) GetConfig(uri string) (config *Config, err error) {
 	return
 }
 
-//getTicket 获取jsapi_tocket全局缓存
-func (js *Js) getTicket() (ticketStr string, err error) {
+//GetTicket 获取jsapi_tocket
+func (js *Js) GetTicket() (ticketStr string, err error) {
 	js.GetJsAPITicketLock().Lock()
 	defer js.GetJsAPITicketLock().Unlock()