Browse Source

查询数据功能修改

mxs 3 tháng trước cách đây
mục cha
commit
b69a1ff830
3 tập tin đã thay đổi với 21 bổ sung21 xóa
  1. 8 8
      src/config.json
  2. 11 12
      src/service/jy_service.go
  3. 2 1
      src/service/repair_service.go

+ 8 - 8
src/config.json

@@ -1,7 +1,7 @@
 {
   "port": "7000",
   "udpport": ":11117",
-  "mgodb": "192.168.3.71:29099",
+  "mgodb": "172.20.45.130:27017",
   "dbsize": 5,
   "dbname": "datatag",
   "uname": "",
@@ -18,14 +18,14 @@
   "jy_info_back": "jy_modify_log",
   "jy_pro_back": "jy_pro_modify_log",
   "jymgo": {
-    "jyaddr": "192.168.3.71:29099",
+    "jyaddr": "172.20.45.130:27017",
     "jydbsize": 5,
-    "jydbname": "wjh",
+    "jydbname": "qfw",
     "jycollname1": "bidding",
     "jycollname2": "bidding_back"
   },
   "entmgo": {
-    "jyaddr": "192.168.3.71:29099",
+    "jyaddr": "172.20.45.130:27017",
     "jydbsize": 5,
     "jydbname": "wjh"
   },
@@ -52,7 +52,7 @@
     "coll": "jh_project"
   },
   "oprd_db": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.130:27017",
     "dbsize": 5,
     "dbname": "wjh"
   },
@@ -62,17 +62,17 @@
     "memo": "修改项目"
   },
   "lua_db": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.130:27017",
     "dbsize": 5,
     "dbname": "spider"
   },
   "python_db": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.130:27017",
     "dbsize": 5,
     "dbname": "py_spider"
   },
   "edit_db": {
-    "addr": "192.168.3.71:29099",
+    "addr": "172.20.45.130:27017",
     "dbsize": 5,
     "dbname": "edit"
   },

+ 11 - 12
src/service/jy_service.go

@@ -39,18 +39,17 @@ func (jy *JyData) FindInfo() {
 			if strings.Contains(identity, "page_workDesktop/work-bench") {
 				identity = rpreUrl.ReplaceAllString(identity, "")
 			}
-			if strings.Contains(identity, "content") {
-				identity = rpre.ReplaceAllString(identity, "")
-				identity = rsuf.ReplaceAllString(identity, "")
-				id = qu.CommonDecodeArticle("content", identity)[0]
-			} else if strings.Contains(identity, "bdprivate") {
-				identity = rpre1.ReplaceAllString(identity, "")
-				identity = rsuf.ReplaceAllString(identity, "")
-				id = qu.CommonDecodeArticle("bdprivate", identity)[0]
-			} else if strings.Contains(identity, "mailprivate") {
-				identity = rpre2.ReplaceAllString(identity, "")
-				identity = rsuf.ReplaceAllString(identity, "")
-				id = qu.CommonDecodeArticle("mailprivate", identity)[0]
+			matchArr := regpre.FindAllStringSubmatch(identity, -1)
+			if len(matchArr) == 1 && len(matchArr[0]) == 3 {
+				qu.Debug("findInfo --- type/decode id ---", matchArr[0][1], matchArr[0][2])
+				id = qu.CommonDecodeArticle(matchArr[0][1], matchArr[0][2])[0]
+				//if strings.Contains(identity, "content") {
+				//	id = qu.CommonDecodeArticle("content", identity)[0]
+				//} else if strings.Contains(identity, "bdprivate") {
+				//	id = qu.CommonDecodeArticle("bdprivate", identity)[0]
+				//} else if strings.Contains(identity, "mailprivate") {
+				//	id = qu.CommonDecodeArticle("mailprivate", identity)[0]
+				//}
 			}
 		}
 		qu.Debug("findInfo --- url/id ---", id)

+ 2 - 1
src/service/repair_service.go

@@ -29,6 +29,7 @@ import (
 
 var (
 	rpreUrl       = regexp.MustCompile("^https[\\w\\W]{0,200}link=")
+	regpre        = regexp.MustCompile(".*/(content|bdprivate|mailprivate)/(.*).html")
 	rpre          = regexp.MustCompile("https://www.jianyu360.cn/article/content/")
 	rpre1         = regexp.MustCompile("https://www.jianyu360.cn/article/bdprivate/")
 	rpre2         = regexp.MustCompile("https://www.jianyu360.cn/article/mailprivate/")
@@ -1609,7 +1610,7 @@ func (jy *RepairRule) UpFile() {
 			"rep": true,
 		})
 		Mgo.Save("jy_upfile_log", bson.M{"infoid": id, "value": "上传附件", "createtime": time.Now().Unix(), "modifyuser": user["name"]})
-
+		go delDetailRedis(id) //清除缓存
 	} else {
 		_ = jy.Render("repair/jy_file_upload.html")
 	}