修改细节 ， 维护信息等等

src/config.json

@@ -4,13 +4,6 @@
   "mgodb": "192.168.3.207:27092",
   "dbsize": 5,
   "dbname": "datatag",
-  "jydbname": "extract_kf",
-  "jycollname1": "zk_xiufu_test",
-  "jycollname2": "zk_xiufu_test01",
-  "redis_jy": "jy_log=127.0.0.1:6379",
-  "redis_jy_name": "jy_log",
-  "redisdelkey1": "jypcdetail_",
-  "redisdelkey2": "jypcdetail__rec",
   "mgodben": "192.168.3.207:27092",
   "dbnameen": "enterprise",
   "mongoenc": "winner_enterprise",
@@ -25,10 +18,23 @@
     "to": "wangjianghan@topnet.net.cn",
     "api": "http://10.171.112.160:19281/_send/_mail"
   },
+  "jymgo":{
+    "jyaddr": "192.168.3.207:27092",
+    "jydbsize": 5,
+    "jydbname": "extract_kf",
+    "jycollname1": "zk_xiufu_test",
+    "jycollname2": "zk_xiufu_test01"
+  },
+  "jyredis": {
+    "redis_jy": "jy_log=127.0.0.1:6379",
+    "redis_jy_name": "jy_log",
+    "redisdelkey1": "jypcdetail_",
+    "redisdelkey2": "jypcdetail__rec"
+  },
   "indexNode": {
       "addr": "127.0.0.1",
-      "port": 15833,
-      "stype": "biddingall",
+      "port": 11117,
+      "stype": "bidding",
       "memo": "生索引"
   }
 }

src/service/repair_rule.go

@@ -10,16 +10,23 @@ import (
 	qu "qfw/util"
 	"qfw/util/elastic"
 	"qfw/util/redis"
+	"regexp"
 	"time"
 	"udptask"
 	. "util"
 )
 
+var (
+	rpre *regexp.Regexp = regexp.MustCompile("https://www.jianyu360.com/article/content/")
+	rsuf *regexp.Regexp = regexp.MustCompile("(.html).*")
+)
+
+
 type RepairRule struct {
 	*xweb.Action
 	repairList     xweb.Mapper `xweb:"/service/jianyu/repair"`
 	searchID       xweb.Mapper `xweb:"/service/jianyu/searchID"`
-	searchHref     xweb.Mapper `xweb:"/service/jianyu/searchHref"`
+	searchJyurl     xweb.Mapper `xweb:"/service/jianyu/searchJyurl"`
 	repairEdit     xweb.Mapper `xweb:"/service/jianyu/edit"`
 	repairDelete   xweb.Mapper `xweb:"/service/jianyu/delete"`
 	repairSave     xweb.Mapper `xweb:"/service/jianyu/save"`
@@ -29,7 +36,6 @@ type RepairRule struct {
 
 }
 
-
 func (jy *RepairRule) RepairList() {
 	defer qu.Catch()
 	jy.Render("repair/jianyu_repair.html")
@@ -43,8 +49,30 @@ func (jy *RepairRule) RepairNewSave() {
 	request_data := GetPostForm(jy.Request)
 	updata:=qu.ObjToMap(request_data["data"])
 	reasons := qu.ObjToString(request_data["reasons"])
-	//tmp_json,_ :=json.Marshal(updata)
-	//new_data:=qu.ObjToMap(string(tmp_json))
+
+	//处理个别字段
+	if val, ok := (*updata)["comeintime"];ok{
+		(*updata)["comeintime"] = qu.Int64All(val)
+	}else {
+		curtime := time.Now().Unix()
+		(*updata)["comeintime"] = curtime
+	}
+
+	if val, ok := (*updata)["publishtime"];ok{
+		(*updata)["publishtime"] = qu.Int64All(val)
+	}else {
+		pt:= int64(0)
+		(*updata)["publishtime"] = pt
+	}
+
+	if val, ok := (*updata)["infoformat"];ok{
+		(*updata)["infoformat"] = qu.IntAll(val)
+	}else {
+		(*updata)["infoformat"] = 1
+	}
+
+	(*updata)["extracttype"] = 0
+
 	delete(*updata,"_id")
 	cur_id:=JYMgo.Save(JyCollNameOne,*updata)
 	if cur_id!="" {
@@ -108,7 +136,16 @@ func (jy *RepairRule) RepairCreate() {
 	defer qu.Catch()
 	jy.T["detail"] = map[string]string{"detail":""}
 	jy.T["contenthtml"] = map[string]string{"contenthtml":""}
-	jy.T["data"] = map[string]string{"title":"新增信息等等"}
+	jy.T["data"] = map[string]string{
+		"title":"",
+		"site":"",
+		"spidercode":"",
+		"href":"",
+		"channel":"",
+		"toptype":"",
+		"subtype":"",
+		"area":"",
+	}
 	jy.Render("repair/jianyu_create.html", &jy.T)
 }
 
@@ -205,9 +242,37 @@ func (jy *RepairRule) RepairSave() {
 		reasons := qu.ObjToString(request_data["reasons"])
 		id := qu.ObjToString((*updata)["_id"])
 		old_data, _ := JYMgo.FindById(coll,id,"")//记录当前表的源数据
-		//new_data:=*updata
-		//tmp_json,_ :=json.Marshal(updata)
-		//new_data:=qu.ObjToMap(string(tmp_json))
+
+
+
+		//处理个别字段
+		if val, ok := (*updata)["comeintime"];ok{
+			(*updata)["comeintime"] = qu.Int64All(val)
+		}else {
+			curtime := time.Now().Unix()
+			(*updata)["comeintime"] = curtime
+		}
+
+		if val, ok := (*updata)["publishtime"];ok{
+			(*updata)["publishtime"] = qu.Int64All(val)
+		}else {
+			pt:= int64(0)
+			(*updata)["publishtime"] = pt
+		}
+
+		if val, ok := (*updata)["infoformat"];ok{
+			(*updata)["infoformat"] = qu.IntAll(val)
+		}else {
+			(*updata)["infoformat"] = 1
+		}
+
+		(*updata)["extracttype"] = 0
+
+
+
+
+
+
 
 		query := bson.M{
 			"_id": qu.StringTOBsonId(id),
@@ -324,13 +389,19 @@ func (jy *RepairRule) SearchID() {
 	}
 }
 
-func (jy *RepairRule) SearchHref() {
+func (jy *RepairRule) SearchJyurl() {
 	defer qu.Catch()
 	if jy.Method() == "POST" {
-		href := jy.GetString("href")
-		data_one, rep_one := JYMgo.Find(JyCollNameOne, bson.M{"href": href}, nil, nil, false, -1, -1)
+
+		jyurl := jy.GetString("jyurl")
+		jyurl = rpre.ReplaceAllString(jyurl, "")
+		jyurl = rsuf.ReplaceAllString(jyurl, "")
+		new_id:=qu.CommonDecodeArticle("content", jyurl)[0]
+		log.Println(new_id)
+
+		data_one, rep_one := JYMgo.Find(JyCollNameOne, bson.M{"_id": qu.StringTOBsonId(new_id)}, nil, nil, false, -1, -1)
 		if !rep_one ||len(*data_one)<=0 {
-			data_two, rep_two := JYMgo.Find(JyCollNameTwo, bson.M{"href": href}, nil, nil, false, -1, -1)
+			data_two, rep_two := JYMgo.Find(JyCollNameTwo, bson.M{"_id": qu.StringTOBsonId(new_id)}, nil, nil, false, -1, -1)
 			if !rep_two ||len(*data_two)<=0 {
 				jy.ServeJson(map[string]interface{}{
 					"rep": false,

src/util/config.go

@@ -62,23 +62,24 @@ func initMgoEn() {
 }
 
 func initJYMgo()  {
+	jymgo := *qu.ObjToMap(Sysconfig["jymgo"])
 	JYMgo = &mongodb.MongodbSim{
-		MongodbAddr: qu.ObjToString(Sysconfig["mgodben"]),
-		Size:        qu.IntAll(Sysconfig["dbsize"]),
-		DbName:      qu.ObjToString(Sysconfig["jydbname"]),
+		MongodbAddr: qu.ObjToString(jymgo["jyaddr"]),
+		Size:        qu.IntAll(jymgo["jydbsize"]),
+		DbName:      qu.ObjToString(jymgo["jydbname"]),
 	}
-	JyCollNameOne = qu.ObjToString(Sysconfig["jycollname1"])
-	JyCollNameTwo = qu.ObjToString(Sysconfig["jycollname2"])
+	JyCollNameOne = qu.ObjToString(jymgo["jycollname1"])
+	JyCollNameTwo = qu.ObjToString(jymgo["jycollname2"])
 	JyRecord = "jymodifylog"
 	JYMgo.InitPool()
-
 }
 
 func initJYRedis()  {
-	redis.InitRedisBySize(qu.ObjToString(Sysconfig["redis_jy"]), 50, 30, 240)
-	RedisJYName = qu.ObjToString(Sysconfig["redis_jy_name"])
-	RedisDelKey1 = qu.ObjToString(Sysconfig["redisdelkey1"])
-	RedisDelKey2 = qu.ObjToString(Sysconfig["redisdelkey2"])
+	jyredis := *qu.ObjToMap(Sysconfig["jyredis"])
+	redis.InitRedisBySize(qu.ObjToString(jyredis["redis_jy"]), 50, 30, 240)
+	RedisJYName = qu.ObjToString(jyredis["redis_jy_name"])
+	RedisDelKey1 = qu.ObjToString(jyredis["redisdelkey1"])
+	RedisDelKey2 = qu.ObjToString(jyredis["redisdelkey2"])
 }
 
 

src/web/templates/repair/jianyu_create.html

@@ -95,7 +95,7 @@
             for (var k in data) {
                 updata[k] = data[k]
             }
-            alert(JSON.stringify(updata))
+
             var content = document.getElementById('jsonContentHtml').value;
             var conData = JSON.parse(content)
             updata["contenthtml"] = conData["contenthtml"]
@@ -105,6 +105,14 @@
             updata["detail"] = detData["detail"]
 
             alert(JSON.stringify(updata))
+            //处理特殊字段
+            if (checkAddDict(updata)) {
+                let msg = "title,site,spidercode\nhref,channel,toptype\nsubtype,area,detail,contenthtml\n非空必填信息,请补充完善信息"
+                showMsg(msg)
+                return;
+            }
+
+
             $.ajax({
                 url: "/service/jianyu/newSave",
                 type: 'POST',
@@ -118,10 +126,15 @@
                 }
             })
         });
-
-
     }
 
-
+    function checkAddDict(data) {
+        if (data["title"]==""||data["site"]==""||data["spidercode"]==""||
+            data["href"]==""||data["channel"]==""|| data["toptype"]==""||
+            data["subtype"]==""|| data["area"]==""){
+            return true
+        }
+        return false
+    }
 
 </script>

src/web/templates/repair/jianyu_edit.html

@@ -95,6 +95,7 @@
             for (var k in data) {
                 updata[k] = data[k]
             }
+
             var content = document.getElementById('jsonContentHtml').value;
             var conData = JSON.parse(content)
             updata["contenthtml"] = conData["contenthtml"]
@@ -103,7 +104,13 @@
             var detData = JSON.parse(detail)
             updata["detail"] = detData["detail"]
 
-            // alert(JSON.stringify(updata))
+            alert(JSON.stringify(updata))
+            //处理特殊字段
+            if (checkAddDict(updata)) {
+                let msg = "title,site,spidercode\nhref,channel,toptype\nsubtype,area,detail,contenthtml\n非空必填信息,请补充完善信息"
+                showMsg(msg)
+                return;
+            }
 
             $.ajax({
                 url: "/service/jianyu/save",
@@ -121,7 +128,14 @@
 
     }
 
-
+    function checkAddDict(data) {
+        if (data["title"]==""||data["site"]==""||data["spidercode"]==""||
+            data["href"]==""||data["channel"]==""|| data["toptype"]==""||
+            data["subtype"]==""|| data["area"]==""){
+            return true
+        }
+        return false
+    }
 
 
 

src/web/templates/repair/jianyu_repair.html

@@ -61,8 +61,8 @@
                         <div class="tab-content">
                             <input class="j-input__inner" type="text" placeholder="请输入查询的id" id="idSea">
                             <img src="/picture/img_search.jpg" class="search-icon" onclick="idSearch()" />
-                            <input class="j-input__inner" type="text" placeholder="请输入查询的href" id="hrefSea">
-                            <img src="/picture/img_search.jpg" class="search-icon" onclick="hrefSearch()" />
+                            <input class="j-input__inner" type="text" placeholder="请输入查询的剑鱼链接" id="jyurlSea">
+                            <img src="/picture/img_search.jpg" class="search-icon" onclick="jyurlSearch()" />
                         </div>
 
                         <table id="dataTable" class="table table-bordered table-hover">
@@ -99,7 +99,7 @@
             "lengthChange": false,
             "searching": false,
             "ordering": false,
-            "info": true,
+            "info": false,
             "autoWidth": false,
             "serverSide": false,
             "language": {
@@ -159,19 +159,19 @@
             }
         })
     }
-    function hrefSearch() {
-        var search_name = $('#hrefSea').val()
+    function jyurlSearch() {
+        var search_name = $('#jyurlSea').val()
         $.ajax({
-            url:"/service/jianyu/searchHref",
+            url:"/service/jianyu/searchJyurl",
             type:"post",
-            data:{"href": search_name},
+            data:{"jyurl": search_name},
             success:function(r){
                 if (r.rep) {
                     curColl = r.orgColl
                     $('#dataTable').dataTable().fnClearTable();
                     $('#dataTable').dataTable().fnAddData(r.data);
                 }else {
-                    showTip("请输入正确的href")
+                    showTip("请输入正确的剑鱼链接")
                 }
             }
         })