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

core/src/qfw/manage/auditing.go

@@ -21,6 +21,7 @@ import (
 	. "qfw/util/msg"
 	"qfw/util/redis"
 	qrpc "qfw/util/rpc"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
@@ -419,6 +420,17 @@ func (s *SystemManage) Auditcontent(_id string) error {
 
 //审核用户认证信息
 func (s *SystemManage) Updateaudit() error {
+	defer func() {
+		if err := recover(); err != nil {
+			for skip := 1; ; skip++ {
+				_, file, line, ok := runtime.Caller(skip)
+				if !ok {
+					break
+				}
+				go log.Printf("%v,%v\n", file, line)
+			}
+		}
+	}()
 	s.DisableHttpCache()
 	if s.Is("GET") {
 		return s.Render("/manage/systemsetting.html")
@@ -744,20 +756,22 @@ func (s *SystemManage) Updateaudit() error {
 			if (*f)["s_m_openid"] != nil {
 				openid = (*f)["s_m_openid"].(string)
 				go func() {
-					if i_freeze == 2 || i_freeze == 1 { //管理员通知
-						if i_freeze == 2 {
-							s_remark = fmt.Sprintf(util.GetPropertie("freeze.freezeRemark", coreconfig.MessageConfig).(string), freezeremark)
-							s_result = util.GetPropertie("freeze.freezeTitle", coreconfig.MessageConfig).(string)
-							s.Session().UpdateByCustomField("id", s_submitid, "i_freeze", 2)
-						} else {
-							s_remark = util.GetPropertie("freeze.unFreezeRemark", coreconfig.MessageConfig).(string)
-							s_result = util.GetPropertie("freeze.unFreezeTitle", coreconfig.MessageConfig).(string)
+					util.Try(func() {
+						if i_freeze == 2 || i_freeze == 1 { //管理员通知
+							if i_freeze == 2 {
+								s_remark = fmt.Sprintf(util.GetPropertie("freeze.freezeRemark", coreconfig.MessageConfig).(string), freezeremark)
+								s_result = util.GetPropertie("freeze.freezeTitle", coreconfig.MessageConfig).(string)
+								s.Session().UpdateByCustomField("id", s_submitid, "i_freeze", 2)
+							} else {
+								s_remark = util.GetPropertie("freeze.unFreezeRemark", coreconfig.MessageConfig).(string)
+								s_result = util.GetPropertie("freeze.unFreezeTitle", coreconfig.MessageConfig).(string)
+							}
+							coreutil.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: openid, Title: s_result, Detail: util.GetPropertie("freeze.manager", coreconfig.MessageConfig).(string), Remark: s_remark})
+						} else { //认证通知
+							s_detail = util.GetPropertie("indentify.success.wxdetail", coreconfig.MessageConfig).(string)
+							coreutil.SendIdentifyTplMsg(&qrpc.NotifyMsg{Openid: openid, Remark: s_remark, Detail: s_detail, Result: s_result})
 						}
-						coreutil.SendManagerNotifyMsg(&qrpc.NotifyMsg{Openid: openid, Title: s_result, Detail: util.GetPropertie("freeze.manager", coreconfig.MessageConfig).(string), Remark: s_remark})
-					} else { //认证通知
-						s_detail = util.GetPropertie("ptcindentify.success.wxdetail", coreconfig.MessageConfig).(string)
-						coreutil.SendIdentifyTplMsg(&qrpc.NotifyMsg{Openid: openid, Remark: s_remark, Detail: s_detail, Result: s_result})
-					}
+					}, func(e interface{}) {})
 				}()
 			}
 			go func() {

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 13:40:43"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 13:40:43"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 14:49:19"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 14:49:19"}},"marketisstart":true,"marketrate":300}