Merge branch 'master' of http://10.8.230.114:3000/wangbin/log-server

model/log/log_statistics.go

@@ -28,7 +28,7 @@ type StatisticsLog struct {
 	LoginOk               int     `json:"login_ok"`
 	LoginFail             int     `json:"login_fail"`
 	XmyLoginOk            int     `json:"xmy_login_ok"`
-	XmyLoginFail          int     `json:"xmy_login_ok"`
+	XmyLoginFail          int     `json:"xmy_login_fail"`
 	WxLoginOk             int     `json:"wx_login_ok"`
 	WxLoginFail           int     `json:"wx_login_fail"`
 	MzLoginOk             int     `json:"mz_login_ok"`

service/levelMonitor/image_record.go

@@ -123,6 +123,7 @@ func (s *ImageRecordService) GetImageRecordList(record levelRequest.ImageRecordR
 	//遍历更改日期格式
 	for i, _ := range recordList {
 		recordList[i].CreateDate = recordList[i].CreateDate[:10]
+		recordList[i].ImageBase64 = "data:image/png;base64," + recordList[i].ImageBase64
 	}
 	return recordList, total, err
 }