Browse Source

后端配置添加搜索数量限制

wangkaiyue 4 years ago
parent
commit
802591bc99

+ 1 - 0
jydocs-back/config.json

@@ -40,5 +40,6 @@
     "行业报告",
     "测试"
   ],
+  "searchNumLimit": 200,
   "shareUrl": "https://web-jydev-wky.jianyu360.cn/swordfish/SingleLogin"
 }

+ 3 - 2
jydocs-back/config/config.go

@@ -17,8 +17,9 @@ type appConfig struct {
 		Points  rpcConfig `json:"points"`  //剑鱼积分rpc接口
 		JyFile  rpcConfig `json:"jyFile"`  //剑鱼文件rpc接口
 	} `json:"rpcServers"` //rpc服务配置
-	IndexSearchTag []string `json:"indexSearchTag"`
-	ShareUrl       string   `json:"shareUrl"`
+	IndexSearchTag []string `json:"indexSearchTag"` //首页标签
+	SearchNumLimit int64    `json:"searchNumLimit"` //检索条数限制
+	ShareUrl       string   `json:"shareUrl"`       //分享地址
 }
 
 type rpcConfig struct {

+ 4 - 4
jydocs-back/db.json

@@ -15,13 +15,13 @@
       "password": "123456"
     }
   },
-  "nsqConfig": {
-    "address": "192.168.3.240:4260",
-    "appName": "jywx_node"
-  },
   "redis": {
     "main": {
       "address": "session=192.168.3.128:1712,other=192.168.3.128:1712"
     }
+  },
+  "nsqConfig": {
+    "address": "192.168.3.240:4260",
+    "appName": "jywx_node"
   }
 }

+ 1 - 1
jydocs-back/go.mod

@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	app.yhyue.com/moapp/jyPoints v0.0.0-20210319094929-f8c029fa5c82
-	app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0
+	app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1
 	app.yhyue.com/moapp/jybase v0.0.0-20210322021809-141cc2c37946
 	app.yhyue.com/moapp/jyfs v0.0.0-20210319011832-6cf539ddc5cd
 	app.yhyue.com/moapp/message v0.0.0-20210322082125-2a9762351105

+ 2 - 0
jydocs-back/go.sum

@@ -55,6 +55,8 @@ app.yhyue.com/moapp/jy_docs v0.0.0-20210323011904-8fb7e73d8a90 h1:csXuChAsCUi+73
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323011904-8fb7e73d8a90/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0 h1:I8NVbS/fuLVMmEjrzQ3xDgd6qG5kATn2vXo11z2fMtg=
 app.yhyue.com/moapp/jy_docs v0.0.0-20210323032815-1d9b66bd95c0/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
+app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1 h1:X+t4IH73+ftQv//DQRhP/r6leYNoew/w4Eebc++l3U4=
+app.yhyue.com/moapp/jy_docs v0.0.0-20210323090943-7ac2be34cfa1/go.mod h1:XQ0SPQX4rLnOBelx6WRl8wyRT6T9xhfGzxldglLsBgU=
 app.yhyue.com/moapp/jybase v0.0.0-20210317020927-18b0165f5ff9 h1:LVIuqXMqcclMwBbSmqEzXi0nIEiir+a2GpWAqksmfzk=
 app.yhyue.com/moapp/jybase v0.0.0-20210317020927-18b0165f5ff9/go.mod h1:29ShuI8y7qEyg2KviHSx1iamiCioBKdTMm2ndVzWAhk=
 app.yhyue.com/moapp/jybase v0.0.0-20210318061912-f5594310c8fe h1:RSQIrriyi534CCrI/sSLGW+Rd0X/0W4VDDXIalHVo8c=

+ 4 - 1
jydocs-back/servers/stdDoc.go

@@ -30,7 +30,7 @@ func (stdDoc *StdDoc) Search() {
 		sort := stdDoc.GetString("sort")                          //排序 tSort dSort vSort
 		pageNumReq, _ := stdDoc.GetInt("num")                     //页码 从1开始
 		pageSizeReq, _ := stdDoc.GetInt("size")                   //每页数量
-		pageNum, pageSize, err := public.PageNumParse(pageNumReq, pageSizeReq, 20*10)
+		pageNum, pageSize, err := public.PageNumParse(pageNumReq, pageSizeReq, config.JyDocsAppConfig.SearchNumLimit)
 		if err != nil {
 			return nil, err
 		}
@@ -44,6 +44,9 @@ func (stdDoc *StdDoc) Search() {
 		if err != nil {
 			return nil, err
 		}
+		if total > config.JyDocsAppConfig.SearchNumLimit {
+			total = config.JyDocsAppConfig.SearchNumLimit
+		}
 		return map[string]interface{}{
 			"total": total,
 			"list":  list,