fengweiqiang 6 жил өмнө
parent
commit
4565358c79

+ 13 - 4
src/udpfileserver/main.go

@@ -91,7 +91,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 					qmap := qu.ObjToMap(v)
 					mid := (*qmap)["_id"]
 					if v, ok := (*qmap)[MgoFileFiled].(map[string]interface{}); !ok {
-						log.Println(mid, "mgo 没有字段", MgoFileFiled)
+						//log.Println(mid, "mgo 没有字段", MgoFileFiled)
 						continue
 					} else {
 						switch v["attachments"].(type) {
@@ -108,6 +108,12 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 										log.Println(mid, "mgo ", MgoFileFiled,"没有fid ")
 										continue
 									}
+									//if (strings.Contains(qu.ObjToString(fileinfo["url"]),"fs.qmx.top")|| strings.Contains(qu.ObjToString(fileinfo["url"]),"fj1.jianyu360.com"))&& (strings.TrimSpace(qu.ObjToString(fileinfo["content"]))==""||strings.Contains(qu.ObjToString(fileinfo["content"]),"error") ){
+									//	save(mid,attk, qmap, &fileinfo,&updateNum)
+									//	<-ChanB
+									//}else {
+									//	<-ChanB
+									//}
 									//if qu.ObjToString(fileinfo["update"]) ==""{
 									//	<-ChanB
 									//	log.Println(mid, "mgo ", MgoFileFiled,"没有update ")
@@ -123,6 +129,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 			}
 			//识别完以后再次查询数据库,进行下一轮识别
 			log.Println("处理查询数据结束...",jsq,time.Now().Sub(stime))
+			//SendMail("处理完成")
 			//进行下一轮识别
 			forfunc(lid)
 		} else {
@@ -138,6 +145,7 @@ func processUdpMsg(act byte, data []byte, ra *net.UDPAddr) {
 func save(mid interface{},attk string, qmap, fileinfo *map[string]interface{},updatenum *int) {
 	defer qu.Catch()
 	type FileData struct {
+		ObjId   string //Id
 		OrgUrl  string //源下载地址
 		Fid     string
 		Name    string
@@ -160,7 +168,8 @@ func save(mid interface{},attk string, qmap, fileinfo *map[string]interface{},up
 		fffpath = fffpath[1:]
 	}
 	fileData := &FileData{
-		OrgUrl: qu.ObjToString((*fileinfo)["org_url"]),
+		ObjId:mid.(bson.ObjectId).String(),
+		OrgUrl: qu.ObjToString((*fileinfo)["url"]),
 		Name: qu.ObjToString((*fileinfo)["filename"]),
 		Fid:  qu.ObjToString((*fileinfo)["fid"]), //附件id
 		Type: fffpath,
@@ -230,7 +239,7 @@ func save(mid interface{},attk string, qmap, fileinfo *map[string]interface{},up
 		}
 		rdlock.Unlock()
 	} else {
-		log.Println(mid, "调用rpc服务解析异常:",qu.ObjToString((*fileinfo)["fid"]), rdata["err"])
+		log.Println(mid, "调用rpc服务解析异常:",mid,qu.ObjToString((*fileinfo)["fid"]), rdata["err"])
 	}
 
 }
@@ -251,7 +260,7 @@ func SendMail( body string ) error {
 	m.SetHeader("From","Get to" + "<" + mailConn["user"] + ">")  //这种方式可以添加别名,即“XD Game”, 也可以直接用<code>m.SetHeader("From",mailConn["user"])</code> 读者可以自行实验下效果
 	m.SetHeader("To", []string{"550838476@qq.com"}...)  //发送给多个用户
 	m.SetHeader("Subject", "MongoId")  //设置邮件主题
-	m.SetBody("text/html", body)     //设置邮件正文
+	m.SetBody("text/html","服务器五:"+ body)     //设置邮件正文
 
 	d := gomail.NewDialer(mailConn["host"], port, mailConn["user"], mailConn["pass"])