Merge branch 'develop' of 192.168.3.17:zhanghongbo/qfw into develop

core/src/qfw/coreconfig/MessageConfig_test.go

@@ -26,6 +26,7 @@ func listFun() {
 }
 
 func TestList(t *testing.T) {
+	log.Println(time.Now().Hour())
 	tList = list.New()
 	for tList.Len() < 1000 {
 		tList.PushBack(int64(0))

core/src/qfw/coreutil/weixinrpc.go

@@ -20,75 +20,93 @@ func init() {
 
 //微信远程调用，实现模板发送消息
 func SendManagerNotifyMsg(p *qrpc.NotifyMsg) {
-	client, err := rpc.DialHTTP("tcp", rpcserver)
-	if err != nil {
-		log.Println(err.Error())
-		return
-	}
-	var repl qrpc.RpcResult
-	err = client.Call("WeiXinRpc.SendManagerNotifyMsg", p, &repl)
-	if err != nil {
-		log.Println(err.Error())
-	}
+	util.Try(func() {
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		var repl qrpc.RpcResult
+		err = client.Call("WeiXinRpc.SendManagerNotifyMsg", p, &repl)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}, func(e interface{}) {})
+
 }
 
 //微信远程调用，实现模板发送消息
 func SendIdentifyTplMsg(p *qrpc.NotifyMsg) {
-	//gob.Register(map[string]interface{}{})
-	client, err := rpc.DialHTTP("tcp", rpcserver)
-	if err != nil {
-		log.Println(err.Error())
-		return
-	}
-	var repl qrpc.RpcResult
-	err = client.Call("WeiXinRpc.SendIdentifyTplMsg", p, &repl)
-	if err != nil {
-		log.Println(err.Error())
-	}
+	util.Try(func() {
+		//gob.Register(map[string]interface{}{})
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		var repl qrpc.RpcResult
+		err = client.Call("WeiXinRpc.SendIdentifyTplMsg", p, &repl)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}, func(e interface{}) {})
 }
 
 //微信远程调用，实现模板发送消息
 func PayBonus(p *qrpc.BonusMsg) bool {
-	//gob.Register(map[string]interface{}{})
-	client, err := rpc.DialHTTP("tcp", rpcserver)
-	if err != nil {
-		log.Println(err.Error())
-		return false
-	}
-	var repl qrpc.RpcResult
-	err = client.Call("WeiXinRpc.PayBonus", p, &repl)
-	if err != nil {
-		log.Println(err.Error())
-	}
-	return repl == "SUCCESS"
+	b := false
+	util.Try(func() {
+		//gob.Register(map[string]interface{}{})
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		var repl qrpc.RpcResult
+		err = client.Call("WeiXinRpc.PayBonus", p, &repl)
+		if err != nil {
+			log.Println(err.Error())
+		}
+		b = (repl == "SUCCESS")
+	}, func(e interface{}) {})
+	return b
 }
 
 //取得JS接口参数
 func GetJSInterfaceParam(url string) []string {
 	var ret []string
-	client, err := rpc.DialHTTP("tcp", rpcserver)
-	if err != nil {
-		log.Println(err.Error())
-		return ret
-	}
-	err = client.Call("WeiXinRpc.GetJSInterfaceParam", url, &ret)
-	if err != nil {
-		log.Println(err.Error())
-	}
+	util.Try(func() {
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		err = client.Call("WeiXinRpc.GetJSInterfaceParam", url, &ret)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}, func(e interface{}) {})
 	return ret
 }
 
 //
 func GetShareQR(url uint32) string {
 	var ret string
-	client, err := rpc.DialHTTP("tcp", rpcserver)
-	if err != nil {
-		log.Println(err.Error())
-		return ret
-	}
-	err = client.Call("WeiXinRpc.GetShareQR", url, &ret)
-	if err != nil {
-		log.Println(err.Error())
-	}
+	util.Try(func() {
+		client, err := rpc.DialHTTP("tcp", rpcserver)
+		defer client.Close()
+		if err != nil {
+			log.Println(err.Error())
+			return
+		}
+		err = client.Call("WeiXinRpc.GetShareQR", url, &ret)
+		if err != nil {
+			log.Println(err.Error())
+		}
+	}, func(e interface{}) {})
 	return ret
 }

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -124,7 +124,7 @@
 			<div class="entinfo-basicinfo ent-layout-up">
 				<div class="b-com-title">
 					<span class="glyphicon jianzhu"></span>基本信息
-					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow">全国企业信用信息公示系统</a>)</font>
+					<font>(来源：<a href="http://gsxt.saic.gov.cn/" rel="nofollow" class="font-size-12">全国企业信用信息公示系统</a>)</font>
 				</div>
 				<div class="b-com-content">
 					<div class="entinfo-round">