逻辑删除

src/jy/admin/rule.go

@@ -60,7 +60,8 @@ func init() {
 	Admin.POST("/rulelogic/save", RuleLogicSave)
 	Admin.POST("/rulelogic/del", func(c *gin.Context) {
 		_id, _ := c.GetPostForm("_id")
-		b := Mgo.Del("rule_logic", `{"_id":"`+_id+`"}`)
+		//b := Mgo.Del("rule_logic", `{"_id":"`+_id+`"}`)
+		b := Mgo.UpdateById("rule_logic", _id, `{"$set":{"delete":true}}`)
 		c.JSON(200, gin.H{"rep": b})
 	})
 
@@ -111,7 +112,7 @@ func init() {
 
 func RulePreData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("rule_pre", `{"s_version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_pre", `{"s_version":"`+version+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "version": version})
 }
 func RulePreSave(c *gin.Context) {
@@ -121,6 +122,7 @@ func RulePreSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		s_type := data["s_type"]
 		code := ""
 		if s_type == "0" { //前置正则
@@ -145,7 +147,8 @@ func RulePreSearchById(c *gin.Context) {
 }
 func RulePreDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_pre", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_pre", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_pre", _id, `{"$set":{"delete":true}}`)
 	c.JSON(200, gin.H{"rep": b})
 }
 func RulePreLua(c *gin.Context) {
@@ -165,7 +168,7 @@ func RulePreLua(c *gin.Context) {
 
 func RuleBackData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("rule_back", `{"s_version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_back", `{"s_version":"`+version+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "version": version})
 }
 func RuleBackSave(c *gin.Context) {
@@ -175,6 +178,7 @@ func RuleBackSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		s_type := data["s_type"]
 		code := ""
 		if s_type == "0" { //前置正则
@@ -199,7 +203,8 @@ func RuleBackSearchById(c *gin.Context) {
 }
 func RuleBackDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_back", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_back", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_back", _id, `{"$set":{"delete":true}}`)
 	c.JSON(200, gin.H{"rep": b})
 }
 func RuleBackLua(c *gin.Context) {
@@ -220,7 +225,7 @@ func RuleBackLua(c *gin.Context) {
 func RuleLogicData(c *gin.Context) {
 	vid, _ := c.GetPostForm("vid")
 	pid, _ := c.GetPostForm("pid")
-	data, _ := Mgo.Find("rule_logic", `{"vid":"`+vid+`","pid":"`+pid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_logic", `{"vid":"`+vid+`","pid":"`+pid+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "vid": vid, "pid": pid})
 }
 func RuleLogicSave(c *gin.Context) {
@@ -230,6 +235,7 @@ func RuleLogicSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		b = Mgo.Save("rule_logic", data) != ""
 	} else {
 		data["l_lasttime"] = time.Now().Unix()
@@ -249,7 +255,7 @@ func RuleLogicPreData(c *gin.Context) {
 	vid, _ := c.GetPostForm("vid")
 	pid, _ := c.GetPostForm("pid")
 	sid, _ := c.GetPostForm("sid")
-	data, _ := Mgo.Find("rule_logicpre", `{"sid":"`+sid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_logicpre", `{"sid":"`+sid+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "vid": vid, "pid": pid, "sid": sid})
 }
 func RuleLogicPreSave(c *gin.Context) {
@@ -259,6 +265,7 @@ func RuleLogicPreSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		s_type := data["s_type"]
 		code := ""
 		if s_type == "0" { //抽取前置正则E_FE
@@ -278,14 +285,15 @@ func RuleLogicPreSave(c *gin.Context) {
 }
 func RuleLogicPreDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_logicpre", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_logicpre", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_logicpre", _id, `{"$set":{"delete":true}}`)
 	c.JSON(200, gin.H{"rep": b})
 }
 func RuleLogicBackData(c *gin.Context) {
 	vid, _ := c.GetPostForm("vid")
 	pid, _ := c.GetPostForm("pid")
 	sid, _ := c.GetPostForm("sid")
-	data, _ := Mgo.Find("rule_logicback", `{"sid":"`+sid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_logicback", `{"sid":"`+sid+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "vid": vid, "pid": pid, "sid": sid})
 }
 func RuleLogicBackSave(c *gin.Context) {
@@ -295,6 +303,7 @@ func RuleLogicBackSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		s_type := data["s_type"]
 		code := ""
 		if s_type == "0" { //抽取后置正则E_FE
@@ -314,14 +323,15 @@ func RuleLogicBackSave(c *gin.Context) {
 }
 func RuleLogicBackDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_logicback", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_logicback", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_logicback", _id, `{"$set":{"delete":true}}`)
 	c.JSON(200, gin.H{"rep": b})
 }
 func RuleLogicCoreData(c *gin.Context) {
 	vid, _ := c.GetPostForm("vid")
 	pid, _ := c.GetPostForm("pid")
 	sid, _ := c.GetPostForm("sid")
-	data, _ := Mgo.Find("rule_logicore", `{"sid":"`+sid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_logicore", `{"sid":"`+sid+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	c.JSON(200, gin.H{"data": data, "vid": vid, "pid": pid, "sid": sid})
 }
 func RuleLogicCoreSave(c *gin.Context) {
@@ -331,6 +341,7 @@ func RuleLogicCoreSave(c *gin.Context) {
 	if _id == "" {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
+		data["delete"] = false
 		s_type := data["s_type"]
 		code := ""
 		if s_type == "0" { //抽取逻辑正则
@@ -350,7 +361,8 @@ func RuleLogicCoreSave(c *gin.Context) {
 }
 func RuleLogicCoreDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_logicore", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_logicore", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_logicore", _id, `{"$set":{"delete":true}}`)
 	c.JSON(200, gin.H{"rep": b})
 }
 func RuleLogicCoreUse(c *gin.Context) {
@@ -363,7 +375,7 @@ func RuleLogicCoreUse(c *gin.Context) {
 //标签库列表
 func RuleTagData(c *gin.Context) {
 	version, _ := c.GetPostForm("version")
-	data, _ := Mgo.Find("rule_tag", `{"version":"`+version+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+	data, _ := Mgo.Find("rule_tag", `{"version":"`+version+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 	for _, d := range *data {
 		timeStr := time.Unix(d["intime"].(int64), 0).Format(Date_Short_Layout)
 		d["intime"] = timeStr
@@ -400,6 +412,7 @@ func RuleTagSave(c *gin.Context) {
 		"creater": username,
 		"intime":  time.Now().Unix(),
 		"type":    tp,
+		"delete":  false,
 	}
 	b := Mgo.Save("rule_tag", save)
 	if b != "" {
@@ -412,7 +425,8 @@ func RuleTagSave(c *gin.Context) {
 //删除标签
 func RuleTagDel(c *gin.Context) {
 	_id, _ := c.GetPostForm("_id")
-	b := Mgo.Del("rule_tag", `{"_id":"`+_id+`"}`)
+	//b := Mgo.Del("rule_tag", `{"_id":"`+_id+`"}`)
+	b := Mgo.UpdateById("rule_tag", _id, `{"$set":{"delete":true}}`)
 	if b {
 		c.JSON(200, gin.H{"rep": true})
 	} else {
@@ -443,6 +457,7 @@ func RuleTagEditSave(c *gin.Context) {
 			"intime":  (*data)["intime"],
 			"type":    (*data)["type"],
 			"content": content,
+			"delete":  false,
 		}
 		b := Mgo.Update("rule_tag", `{"_id":"`+_id+`"}`, set, false, false)
 		if b {

src/jy/admin/version.go

@@ -22,7 +22,7 @@ func init() {
 		)
 	})
 	Admin.POST("/version/data", func(c *gin.Context) {
-		data, _ := Mgo.Find("version", `{}`, `{"_id":-1}`, nil, false, -1, -1)
+		data, _ := Mgo.Find("version", `{"delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 		c.JSON(200, gin.H{"data": data})
 	})
 	Admin.POST("/version/save", func(c *gin.Context) {
@@ -36,6 +36,7 @@ func init() {
 			data["l_createtime"] = time.Now().Unix()
 			s_username := sessions.Default(c).Get("username").(string)
 			data["s_username"] = s_username
+			data["delete"] = false
 			Mgo.Save("version", data)
 			copyComRules(version, s_pversionid, s_username)
 			c.JSON(200, gin.H{"rep": true})
@@ -56,7 +57,8 @@ func init() {
 	})
 	Admin.POST("/version/del", func(c *gin.Context) {
 		_id, _ := c.GetPostForm("_id")
-		b := Mgo.Del("version", `{"_id":"`+_id+`"}`)
+		b := Mgo.UpdateById("version", _id, `{"$set":{"delete":true}}`)
+		//b := Mgo.Del("version", `{"_id":"`+_id+`"}`)
 		c.JSON(200, gin.H{"rep": b})
 	})
 	Admin.GET("/version/info", func(c *gin.Context) {
@@ -69,7 +71,7 @@ func init() {
 	})
 	Admin.POST("/version/infodata", func(c *gin.Context) {
 		vid, _ := c.GetPostForm("vid")
-		list, _ := Mgo.Find("versioninfo", `{"vid":"`+vid+`"}`, `{"_id":-1}`, nil, false, -1, -1)
+		list, _ := Mgo.Find("versioninfo", `{"vid":"`+vid+`","delete":false}`, `{"_id":-1}`, nil, false, -1, -1)
 		c.JSON(200, gin.H{"data": list, "vid": vid})
 	})
 	Admin.POST("/version/infosave", func(c *gin.Context) {
@@ -79,6 +81,7 @@ func init() {
 		data["l_createtime"] = time.Now().Unix()
 		data["s_username"] = sessions.Default(c).Get("username")
 		data["l_lasttime"] = time.Now().Unix()
+		data["delete"] = false
 		tmp, _ := Mgo.FindOne("versioninfo", `{"s_field":"`+s_field+`","vid":"`+vid+`"}`)
 		if len(*tmp) > 0 {
 			c.JSON(200, gin.H{"rep": false})
@@ -100,7 +103,8 @@ func init() {
 	})
 	Admin.POST("/version/infodel", func(c *gin.Context) {
 		_id, _ := c.GetPostForm("_id")
-		b := Mgo.Del("versioninfo", `{"_id":"`+_id+`"}`)
+		b := Mgo.UpdateById("versioninfo", _id, `{"$set":{"delete":true}}`)
+		//b := Mgo.Del("versioninfo", `{"_id":"`+_id+`"}`)
 		c.JSON(200, gin.H{"rep": b})
 	})
 }
@@ -110,7 +114,7 @@ func copyComRules(version, pvid, s_username string) {
 	tmp, _ := Mgo.FindById("version", pvid, nil)
 	oldversion := (*tmp)["version"].(string)
 	//克隆前置规则
-	plist, _ := Mgo.Find("rule_pre", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	plist, _ := Mgo.Find("rule_pre", `{"s_version":"`+oldversion+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *plist {
 		delete(v, "_id")
 		v["s_version"] = version
@@ -121,7 +125,7 @@ func copyComRules(version, pvid, s_username string) {
 		Mgo.Save("rule_pre", v)
 	}
 	//克隆后置规则
-	blist, _ := Mgo.Find("rule_back", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	blist, _ := Mgo.Find("rule_back", `{"s_version":"`+oldversion+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *blist {
 		delete(v, "_id")
 		v["s_version"] = version
@@ -132,7 +136,7 @@ func copyComRules(version, pvid, s_username string) {
 		Mgo.Save("rule_back", v)
 	}
 	//克隆tag
-	tlist, _ := Mgo.Find("tag", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	tlist, _ := Mgo.Find("tag", `{"s_version":"`+oldversion+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *tlist {
 		oldId := qu.BsonIdToSId(v["_id"])
 		delete(v, "_id")
@@ -140,7 +144,7 @@ func copyComRules(version, pvid, s_username string) {
 		v["s_creater"] = s_username
 		v["l_intime"] = time.Now().Unix()
 		newId := Mgo.Save("tag", v) //克隆父标签
-		td, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+oldId+`"}`, nil, nil, false, -1, -1)
+		td, _ := Mgo.Find("tagdetailinfo", `{"s_parentid":"`+oldId+`","delete":false}`, nil, nil, false, -1, -1)
 		for _, v2 := range *td {
 			delete(v2, "_id")
 			v2["s_version"] = version
@@ -151,7 +155,7 @@ func copyComRules(version, pvid, s_username string) {
 		}
 	}
 	//克隆函数
-	clist, _ := Mgo.Find("cleanup", `{"s_version":"`+oldversion+`"}`, nil, nil, false, -1, -1)
+	clist, _ := Mgo.Find("cleanup", `{"s_version":"`+oldversion+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *clist {
 		delete(v, "_id")
 		v["s_version"] = version
@@ -163,11 +167,11 @@ func copyComRules(version, pvid, s_username string) {
 
 //克隆版本Field
 func copyFieldRules(vid, pid, s_field, oldvid, s_username string) {
-	tmp, _ := Mgo.FindOne("versioninfo", `{"vid":"`+oldvid+`","s_field":"`+s_field+`"}`)
+	tmp, _ := Mgo.FindOne("versioninfo", `{"vid":"`+oldvid+`","s_field":"`+s_field+`","delete":false}`)
 	oldpid := qu.BsonIdToSId((*tmp)["_id"])
 	log.Println(s_field, oldvid, oldpid, s_username)
 	//克隆逻辑列表
-	logic, _ := Mgo.FindOne("rule_logic", `{"vid":"`+oldvid+`","pid":"`+oldpid+`"}`)
+	logic, _ := Mgo.FindOne("rule_logic", `{"vid":"`+oldvid+`","pid":"`+oldpid+`","delete":false}`)
 	oldsid := qu.BsonIdToSId((*logic)["_id"])
 	delete(*logic, "_id")
 	(*logic)["vid"] = vid
@@ -177,7 +181,7 @@ func copyFieldRules(vid, pid, s_field, oldvid, s_username string) {
 	(*logic)["s_username"] = s_username
 	sid := Mgo.Save("rule_logic", logic)
 	//克隆前置规则
-	plist, _ := Mgo.Find("rule_logicpre", `{"sid":"`+oldsid+`"}`, nil, nil, false, -1, -1)
+	plist, _ := Mgo.Find("rule_logicpre", `{"sid":"`+oldsid+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *plist {
 		delete(v, "_id")
 		v["vid"] = vid
@@ -190,7 +194,7 @@ func copyFieldRules(vid, pid, s_field, oldvid, s_username string) {
 		Mgo.Save("rule_logicpre", v)
 	}
 	//克隆抽取规则
-	elist, _ := Mgo.Find("rule_logicore", `{"sid":"`+oldsid+`"}`, nil, nil, false, -1, -1)
+	elist, _ := Mgo.Find("rule_logicore", `{"sid":"`+oldsid+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *elist {
 		delete(v, "_id")
 		v["vid"] = vid
@@ -203,7 +207,7 @@ func copyFieldRules(vid, pid, s_field, oldvid, s_username string) {
 		Mgo.Save("rule_logicore", v)
 	}
 	//克隆过滤规则
-	blist, _ := Mgo.Find("rule_logicback", `{"sid":"`+oldsid+`"}`, nil, nil, false, -1, -1)
+	blist, _ := Mgo.Find("rule_logicback", `{"sid":"`+oldsid+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *blist {
 		delete(v, "_id")
 		v["vid"] = vid

src/jy/extract/extractInit.go

@@ -86,7 +86,7 @@ func init() {
 func (e *ExtractTask) InitTestTaskInfo(resultcoll, trackcoll string) {
 	task, _ := db.Mgo.FindById("task", e.Id, nil)
 	if len(*task) > 1 {
-		v, _ := db.Mgo.FindOne("version", `{"version":"`+(*task)["s_version"].(string)+`"}`)
+		v, _ := db.Mgo.FindOne("version", `{"version":"`+(*task)["s_version"].(string)+`","delete":false}`)
 		e.TaskInfo = &TaskInfo{
 			Name:        (*task)["s_taskname"].(string),
 			Version:     (*task)["s_version"].(string),
@@ -109,7 +109,7 @@ func (e *ExtractTask) InitTaskInfo() {
 	task, _ := db.Mgo.FindById("task", e.Id, nil)
 	log.Println("task", task)
 	if len(*task) > 1 {
-		v, _ := db.Mgo.FindOne("version", `{"version":"`+(*task)["s_version"].(string)+`"}`)
+		v, _ := db.Mgo.FindOne("version", `{"version":"`+(*task)["s_version"].(string)+`","delete":false}`)
 		e.TaskInfo = &TaskInfo{
 			Name:      (*task)["s_taskname"].(string),
 			Version:   (*task)["s_version"].(string),
@@ -132,7 +132,7 @@ func (e *ExtractTask) InitTaskInfo() {
 //加载通用前置规则
 func (e *ExtractTask) InitRulePres() {
 	defer qu.Catch()
-	list, _ := db.Mgo.Find("rule_pre", `{"s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("rule_pre", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		rinfo := &RegLuaInfo{
 			Code:  v["s_code"].(string),
@@ -161,7 +161,7 @@ func (e *ExtractTask) InitRulePres() {
 //加载通用后置规则
 func (e *ExtractTask) InitRuleBacks() {
 	defer qu.Catch()
-	list, _ := db.Mgo.Find("rule_back", `{"s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("rule_back", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		rinfo := &RegLuaInfo{
 			Code:  v["s_code"].(string),
@@ -190,13 +190,13 @@ func (e *ExtractTask) InitRuleBacks() {
 //加载抽取规则
 func (e *ExtractTask) InitRuleCore() {
 	defer qu.Catch()
-	vinfos, _ := db.Mgo.Find("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`"}`, nil, nil, false, -1, -1)
+	vinfos, _ := db.Mgo.Find("versioninfo", `{"vid":"`+e.TaskInfo.VersionId+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, vinfo := range *vinfos {
 		if b, _ := vinfo["isuse"].(bool); !b {
 			continue
 		}
 		pid := qu.BsonIdToSId(vinfo["_id"])
-		list, _ := db.Mgo.Find("rule_logic", `{"pid":"`+pid+`"}`, nil, nil, false, -1, -1)
+		list, _ := db.Mgo.Find("rule_logic", `{"pid":"`+pid+`","delete":false}`, nil, nil, false, -1, -1)
 		for _, vv := range *list {
 			if b, _ := vv["isuse"].(bool); !b {
 				continue
@@ -207,7 +207,7 @@ func (e *ExtractTask) InitRuleCore() {
 			rcore.ExtFrom = qu.If(vv["extfrom"].(bool), "title", "detail").(string)
 			//前置规则
 			rulePres := []*RegLuaInfo{}
-			plist, _ := db.Mgo.Find("rule_logicpre", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`"}`, nil, nil, false, -1, -1)
+			plist, _ := db.Mgo.Find("rule_logicpre", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
 			for _, v := range *plist {
 				rinfo := &RegLuaInfo{
 					Code:  v["s_code"].(string),
@@ -236,7 +236,7 @@ func (e *ExtractTask) InitRuleCore() {
 
 			//后置规则
 			ruleBacks := []*RegLuaInfo{}
-			blist, _ := db.Mgo.Find("rule_logicback", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`"}`, nil, nil, false, -1, -1)
+			blist, _ := db.Mgo.Find("rule_logicback", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
 			for _, v := range *blist {
 				rinfo := &RegLuaInfo{
 					Code:  v["s_code"].(string),
@@ -265,7 +265,7 @@ func (e *ExtractTask) InitRuleCore() {
 
 			//抽取规则
 			ruleCores := []*RegLuaInfo{}
-			clist, _ := db.Mgo.Find("rule_logicore", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`"}`, nil, nil, false, -1, -1)
+			clist, _ := db.Mgo.Find("rule_logicore", `{"sid":"`+qu.BsonIdToSId(vv["_id"])+`","delete":false}`, nil, nil, false, -1, -1)
 			for _, v := range *clist {
 				if b, _ := v["isuse"].(bool); !b {
 					continue
@@ -322,7 +322,7 @@ func (e *ExtractTask) InitTag() {
 	defer qu.Catch()
 	e.Tag = map[string][]*Tag{}
 	//字符串标签库
-	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"string","s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"string","s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		field := qu.ObjToString(v["s_field"])
 		if tmp, ok := v["content"].([]interface{}); ok {
@@ -333,7 +333,7 @@ func (e *ExtractTask) InitTag() {
 		}
 	}
 	//正则标签库
-	list, _ = db.Mgo.Find("tagdetailinfo", `{"s_type":"reg","s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ = db.Mgo.Find("tagdetailinfo", `{"s_type":"reg","s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		field := qu.ObjToString(v["s_field"])
 		if tmp, ok := v["content"].([]interface{}); ok {
@@ -357,7 +357,7 @@ func getALLFields() []interface{} {
 
 //加载clear函数
 func (e *ExtractTask) InitClearFn() {
-	list, _ := db.Mgo.Find("cleanup", `{"s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("cleanup", `{"s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	fn := map[string][]string{}
 	for _, tmp := range *list {
 		field := tmp["s_field"].(string)
@@ -376,7 +376,7 @@ func (e *ExtractTask) InitClearFn() {
 func (e *ExtractTask) InitProvince() {
 	defer qu.Catch()
 	fn := map[string]interface{}{}
-	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"province","s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"province","s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	for _, v := range *list {
 		name := qu.ObjToString(v["s_name"])
 		fn[name] = qu.ObjArrToStringArr(v["content"].([]interface{}))
@@ -387,7 +387,7 @@ func (e *ExtractTask) InitProvince() {
 //加载城市简称
 func (e *ExtractTask) InitCitySim() {
 	defer qu.Catch()
-	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"citysim","s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"citysim","s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	fn := map[string]map[string]interface{}{}
 	for _, v := range *list {
 		name := qu.ObjToString(v["s_name"])
@@ -400,7 +400,7 @@ func (e *ExtractTask) InitCitySim() {
 //加载城市全称
 func (e *ExtractTask) InitCityAll() {
 	defer qu.Catch()
-	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"cityall","s_version":"`+e.TaskInfo.Version+`"}`, nil, nil, false, -1, -1)
+	list, _ := db.Mgo.Find("tagdetailinfo", `{"s_type":"cityall","s_version":"`+e.TaskInfo.Version+`","delete":false}`, nil, nil, false, -1, -1)
 	if len(*list) != 34 {
 		fmt.Println("加载城市配置文件出错", len(*list))
 	}

src/web/templates/admin/com_inc.html

@@ -21,9 +21,6 @@
 	<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
 	<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 	<![endif]-->
-	<!-- Google Font -->
-	<link rel="stylesheet"
-	     href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
 	<!-- js -->
 	<script src="/res/bower_components/jquery/dist/jquery.min.js"></script>
 	<script src="/res/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>