From 1f116774b76ea592a21289707dbc2ceaa663580a Mon Sep 17 00:00:00 2001 From: midoks Date: Tue, 20 Aug 2019 18:46:32 +0800 Subject: [PATCH] up --- plugins/solr/index.py | 4 + plugins/solr/tpl/solrconfig.xml | 1067 ++++++++++++++++++++++++++++++- 2 files changed, 1061 insertions(+), 10 deletions(-) diff --git a/plugins/solr/index.py b/plugins/solr/index.py index 804425a0f..e83cedee0 100755 --- a/plugins/solr/index.py +++ b/plugins/solr/index.py @@ -145,6 +145,10 @@ def restart(): def reload(): file = initDreplace() data = runShell(file + ' reload') + + solr_log = getServerDir() + "/server/logs/solr.log" + public.writeFile(solr_log, "") + if data[1] == '': return 'ok' return 'fail' diff --git a/plugins/solr/tpl/solrconfig.xml b/plugins/solr/tpl/solrconfig.xml index e832f8bda..eb42afd77 100644 --- a/plugins/solr/tpl/solrconfig.xml +++ b/plugins/solr/tpl/solrconfig.xml @@ -1,10 +1,77 @@ + + + + + + 6.3.0 + + + @@ -15,103 +82,740 @@ - ' + - + + + ${solr.data.dir:} + + + + + + + + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + + + + + + + + + + + + + + + + + + + + + + ${solr.ulog.dir:} ${solr.ulog.numVersionBuckets:65536} + ${solr.autoCommit.maxTime:15000} false + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + - + + + + + + 1024 + + + + + + + + + + + + + + + + + + true + + + + 20 + + 200 + + + + + + false + 2 + + + + + + + + - - - db-data-config.xml - - + + - + explicit 10 + + + + + + + + + explicit @@ -120,6 +824,16 @@ + + explicit @@ -138,6 +852,11 @@ + @@ -147,26 +866,121 @@ _text_ + + + + text_general + + + + default _text_ solr.DirectSolrSpellChecker + internal + 0.5 + 2 + 1 + 5 + 4 + 0.01 + + + + + default on true @@ -183,9 +997,19 @@ + + true @@ -195,8 +1019,18 @@ + + + + true @@ -208,11 +1042,21 @@ + + string elevate.xml + explicit @@ -222,8 +1066,14 @@ + + + @@ -232,15 +1082,22 @@ + + 70 + 0.5 + [-\w ,/\n\"']{20,200} + @@ -249,24 +1106,36 @@ ]]> + + + + + + + - + + @@ -292,7 +1161,10 @@ + WORD + + en US @@ -300,7 +1172,31 @@ + + + + @@ -357,18 +1253,169 @@ + + + + + + + + + + + + + + text/plain; charset=UTF-8 + ${velocity.template.base.dir:} ${velocity.solr.resource.loader.enabled:true} ${velocity.params.resource.loader.enabled:false} + 5 + + + + + + + + + + +