fix #2606 rename to fess_... indices

This commit is contained in:
Shinsuke Sugaya 2021-12-02 22:14:56 +09:00
parent c45779232f
commit 76bd6c6324
192 changed files with 199 additions and 475 deletions

View file

@ -7,144 +7,144 @@ map:{
# settings for indexes
; indexMap = map:{
# Index: .fess_user
; .fess_user.group = map:{
# Index: fess_user
; fess_user.group = map:{
; package = user
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_user.xml
}
; .fess_user.role = map:{
; fess_user.role = map:{
; package = user
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_user.xml
}
; .fess_user.user = map:{
; fess_user.user = map:{
; package = user
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_user.xml
}
# Index: .fess_user
; .fess_config.access_token = map:{
# Index: fess_user
; fess_config.access_token = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.bad_word = map:{
; fess_config.bad_word = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.boost_document_rule = map:{
; fess_config.boost_document_rule = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.crawling_info = map:{
; fess_config.crawling_info = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.crawling_info_param = map:{
; fess_config.crawling_info_param = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.data_config = map:{
; fess_config.data_config = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.duplicate_host = map:{
; fess_config.duplicate_host = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.elevate_word = map:{
; fess_config.elevate_word = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.elevate_word_to_label = map:{
; fess_config.elevate_word_to_label = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.failure_url = map:{
; fess_config.failure_url = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.file_authentication = map:{
; fess_config.file_authentication = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.file_config = map:{
; fess_config.file_config = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.job_log = map:{
; fess_config.job_log = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.key_match = map:{
; fess_config.key_match = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.label_type = map:{
; fess_config.label_type = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.path_mapping = map:{
; fess_config.path_mapping = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.related_content = map:{
; fess_config.related_content = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.related_query = map:{
; fess_config.related_query = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.request_header = map:{
; fess_config.request_header = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.role_type = map:{
; fess_config.role_type = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.scheduled_job = map:{
; fess_config.scheduled_job = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.thumbnail_queue = map:{
; fess_config.thumbnail_queue = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.web_authentication = map:{
; fess_config.web_authentication = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
; .fess_config.web_config = map:{
; fess_config.web_config = map:{
; package = config
; esclientDiFile = esclient.xml
; esfluteDiFile = esflute_config.xml
}
# Index: .fess_user
# Index: fess_user
; fess_log.click_log = map:{
; package = log
; esclientDiFile = esclient.xml

View file

@ -1,5 +1,5 @@
{
".fess_config.access_token" : {
"fess_config.access_token" : {
"aliases" : { },
"mappings" : {
"access_token" : {
@ -52,7 +52,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.access_token"
"provided_name" : "fess_config.access_token"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.bad_word" : {
"fess_config.bad_word" : {
"aliases" : { },
"mappings" : {
"bad_word" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.bad_word"
"provided_name" : "fess_config.bad_word"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.boost_document_rule" : {
"fess_config.boost_document_rule" : {
"aliases" : { },
"mappings" : {
"boost_document_rule" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.boost_document_rule"
"provided_name" : "fess_config.boost_document_rule"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.crawling_info" : {
"fess_config.crawling_info" : {
"aliases" : { },
"mappings" : {
"crawling_info" : {
@ -28,7 +28,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.crawling_info"
"provided_name" : "fess_config.crawling_info"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.crawling_info_param" : {
"fess_config.crawling_info_param" : {
"aliases" : { },
"mappings" : {
"crawling_info_param" : {
@ -28,7 +28,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.crawling_info_param"
"provided_name" : "fess_config.crawling_info_param"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.data_config" : {
"fess_config.data_config" : {
"aliases" : { },
"mappings" : {
"data_config" : {
@ -70,7 +70,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.data_config"
"provided_name" : "fess_config.data_config"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.duplicate_host" : {
"fess_config.duplicate_host" : {
"aliases" : { },
"mappings" : {
"duplicate_host" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.duplicate_host"
"provided_name" : "fess_config.duplicate_host"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.elevate_word" : {
"fess_config.elevate_word" : {
"aliases" : { },
"mappings" : {
"elevate_word" : {
@ -49,7 +49,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.elevate_word"
"provided_name" : "fess_config.elevate_word"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.elevate_word_to_label" : {
"fess_config.elevate_word_to_label" : {
"aliases" : { },
"mappings" : {
"elevate_word_to_label" : {
@ -22,7 +22,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.elevate_word_to_label"
"provided_name" : "fess_config.elevate_word_to_label"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.failure_url" : {
"fess_config.failure_url" : {
"aliases" : { },
"mappings" : {
"failure_url" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.failure_url"
"provided_name" : "fess_config.failure_url"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.file_authentication" : {
"fess_config.file_authentication" : {
"aliases" : { },
"mappings" : {
"file_authentication" : {
@ -49,7 +49,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.file_authentication"
"provided_name" : "fess_config.file_authentication"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.file_config" : {
"fess_config.file_config" : {
"aliases" : { },
"mappings" : {
"file_config" : {
@ -94,7 +94,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.file_config"
"provided_name" : "fess_config.file_config"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.job_log" : {
"fess_config.job_log" : {
"aliases" : { },
"mappings" : {
"job_log" : {
@ -43,7 +43,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.job_log"
"provided_name" : "fess_config.job_log"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.key_match" : {
"fess_config.key_match" : {
"aliases" : { },
"mappings" : {
"key_match" : {
@ -43,7 +43,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.key_match"
"provided_name" : "fess_config.key_match"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.label_type" : {
"fess_config.label_type" : {
"aliases" : { },
"mappings" : {
"label_type" : {
@ -58,7 +58,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.label_type"
"provided_name" : "fess_config.label_type"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.path_mapping" : {
"fess_config.path_mapping" : {
"aliases" : { },
"mappings" : {
"path_mapping" : {
@ -43,7 +43,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.path_mapping"
"provided_name" : "fess_config.path_mapping"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.related_content" : {
"fess_config.related_content" : {
"aliases" : { },
"mappings" : {
"related_content" : {
@ -40,7 +40,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.related_content"
"provided_name" : "fess_config.related_content"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.related_query" : {
"fess_config.related_query" : {
"aliases" : { },
"mappings" : {
"related_query" : {
@ -46,7 +46,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.related_query"
"provided_name" : "fess_config.related_query"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.request_header" : {
"fess_config.request_header" : {
"aliases" : { },
"mappings" : {
"request_header" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.request_header"
"provided_name" : "fess_config.request_header"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.role_type" : {
"fess_config.role_type" : {
"aliases" : { },
"mappings" : {
"role_type" : {
@ -37,7 +37,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.role_type"
"provided_name" : "fess_config.role_type"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.scheduled_job" : {
"fess_config.scheduled_job" : {
"aliases" : { },
"mappings" : {
"scheduled_job" : {
@ -55,7 +55,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.scheduled_job"
"provided_name" : "fess_config.scheduled_job"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.thumbnail_queue" : {
"fess_config.thumbnail_queue" : {
"aliases" : { },
"mappings" : {
"thumbnail_queue" : {
@ -34,7 +34,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.thumbnail_queue"
"provided_name" : "fess_config.thumbnail_queue"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.web_authentication" : {
"fess_config.web_authentication" : {
"aliases" : { },
"mappings" : {
"web_authentication" : {
@ -52,7 +52,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.web_authentication"
"provided_name" : "fess_config.web_authentication"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_config.web_config" : {
"fess_config.web_config" : {
"aliases" : { },
"mappings" : {
"web_config" : {
@ -97,7 +97,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_config.web_config"
"provided_name" : "fess_config.web_config"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_user.group" : {
"fess_user.group" : {
"aliases" : { },
"mappings" : {
"group" : {
@ -22,7 +22,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_user.group"
"provided_name" : "fess_user.group"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_user.role" : {
"fess_user.role" : {
"aliases" : { },
"mappings" : {
"role" : {
@ -19,7 +19,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_user.role"
"provided_name" : "fess_user.role"
}
}
}

View file

@ -1,5 +1,5 @@
{
".fess_user.user" : {
"fess_user.user" : {
"aliases" : { },
"mappings" : {
"user" : {
@ -148,7 +148,7 @@
"version" : {
"created" : "6000051"
},
"provided_name" : ".fess_user.user"
"provided_name" : "fess_user.user"
}
}
}

View file

@ -19,7 +19,6 @@ import javax.annotation.Resource;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.codelibs.fesen.client.IndicesAdminClient;
import org.codelibs.fess.annotation.Secured;
import org.codelibs.fess.app.service.ScheduledJobService;
import org.codelibs.fess.app.web.base.FessAdminAction;
@ -31,7 +30,6 @@ import org.codelibs.fess.es.config.exbhv.LabelTypeBhv;
import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
import org.codelibs.fess.es.user.exbhv.RoleBhv;
import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.util.UpgradeUtil;
import org.lastaflute.web.Execute;
import org.lastaflute.web.response.HtmlResponse;
@ -46,22 +44,6 @@ public class AdminUpgradeAction extends FessAdminAction {
//
private static final Logger logger = LogManager.getLogger(AdminUpgradeAction.class);
private static final String VERSION_12_0 = "12.0";
private static final String VERSION_12_1 = "12.1";
private static final String VERSION_12_2 = "12.2";
private static final String VERSION_12_3 = "12.3";
private static final String VERSION_12_4 = "12.4";
private static final String VERSION_12_5 = "12.5";
private static final String VERSION_12_6 = "12.6";
private static final String VERSION_12_7 = "12.7";
private static final String VERSION_13_0 = "13.0";
private static final String VERSION_13_1 = "13.1";
@ -157,217 +139,7 @@ public class AdminUpgradeAction extends FessAdminAction {
validate(form, messages -> {}, this::asIndexHtml);
verifyToken(this::asIndexHtml);
if (VERSION_12_0.equals(form.targetVersion)) {
try {
upgradeFrom12_0();
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_0, e.getLocalizedMessage()));
}
} else if (VERSION_12_1.equals(form.targetVersion)) {
try {
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_1, e.getLocalizedMessage()));
}
} else if (VERSION_12_2.equals(form.targetVersion)) {
try {
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_2, e.getLocalizedMessage()));
}
} else if (VERSION_12_3.equals(form.targetVersion)) {
try {
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_3, e.getLocalizedMessage()));
}
} else if (VERSION_12_4.equals(form.targetVersion)) {
try {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_4, e.getLocalizedMessage()));
}
} else if (VERSION_12_5.equals(form.targetVersion)) {
try {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_5, e.getLocalizedMessage()));
}
} else if (VERSION_12_6.equals(form.targetVersion) || VERSION_12_7.equals(form.targetVersion)) {
try {
upgradeFrom12_6();
upgradeFrom13_0();
upgradeFrom13_1();
upgradeFrom13_2();
upgradeFrom13_3();
upgradeFrom13_4();
upgradeFrom13_5();
upgradeFrom13_6();
upgradeFrom13_7();
upgradeFrom13_8();
upgradeFrom13_9();
upgradeFrom13_10();
upgradeFrom13_11();
upgradeFrom13_12();
upgradeFrom13_13();
upgradeFrom13_14();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_6, e.getLocalizedMessage()));
}
} else if (VERSION_13_0.equals(form.targetVersion)) {
if (VERSION_13_0.equals(form.targetVersion)) {
try {
upgradeFrom13_0();
upgradeFrom13_1();
@ -657,46 +429,6 @@ public class AdminUpgradeAction extends FessAdminAction {
return redirect(getClass());
}
private void upgradeFrom12_0() {
// nothing
}
private void upgradeFrom12_1() {
final IndicesAdminClient indicesClient = searchEngineClient.admin().indices();
UpgradeUtil.putMapping(indicesClient, "fess_log.search_log", "search_log",
"{\"dynamic_templates\": [" + "{\"documents\": {\"path_match\": \"documents.*\",\"mapping\": {\"type\": \"keyword\"}}}"//
+ "]}");
UpgradeUtil.addFieldMapping(indicesClient, "fess_log.click_log", "click_log", "urlId",
"{\"properties\":{\"urlId\":{\"type\":\"keyword\"}}}");
}
private void upgradeFrom12_2() {
// nothing
}
private void upgradeFrom12_3() {
ComponentUtil.getThumbnailManager().migrate();
}
private void upgradeFrom12_4() {
// nothing
}
private void upgradeFrom12_5() {
// nothing
}
private void upgradeFrom12_6() {
final IndicesAdminClient indicesClient = searchEngineClient.admin().indices();
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.web_config_to_role", res -> {});
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.file_config_to_role", res -> {});
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.data_config_to_role", res -> {});
UpgradeUtil.addFieldMapping(indicesClient, "fess_log.search_log", "search_log", "hitCountRelation",
"{\"properties\":{\"hitCountRelation\":{\"type\":\"keyword\"}}}");
}
private void upgradeFrom13_0() {
UpgradeUtil.addData(searchEngineClient, ".fess_config.scheduled_job", "label_updater",
"{\"name\":\"Label Updater\",\"target\":\"all\",\"cronExpression\":\"\",\"scriptType\":\"groovy\",\"scriptData\":\"return container.getComponent(\\\"updateLabelJob\\\").execute();\",\"jobLogging\":false,\"crawler\":false,\"available\":true,\"sortOrder\":11,\"createdBy\":\"system\",\"createdTime\":0,\"updatedBy\":\"system\",\"updatedTime\":0}");

View file

@ -171,9 +171,9 @@ public class SearchEngineClient implements Client {
private static final String LOG_INDEX_PREFIX = "fess_log";
private static final String USER_INDEX_PREFIX = ".fess_user";
private static final String USER_INDEX_PREFIX = "fess_user";
private static final String CONFIG_INDEX_PREFIX = ".fess_config";
private static final String CONFIG_INDEX_PREFIX = "fess_config";
protected FesenRunner runner;

View file

@ -51,7 +51,7 @@ public abstract class BsAccessTokenBhv extends EsAbstractBehavior<AccessToken, A
@Override
protected String asEsIndex() {
return ".fess_config.access_token";
return "fess_config.access_token";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsBadWordBhv extends EsAbstractBehavior<BadWord, BadWordCB
@Override
protected String asEsIndex() {
return ".fess_config.bad_word";
return "fess_config.bad_word";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsBoostDocumentRuleBhv extends EsAbstractBehavior<BoostDoc
@Override
protected String asEsIndex() {
return ".fess_config.boost_document_rule";
return "fess_config.boost_document_rule";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsCrawlingInfoBhv extends EsAbstractBehavior<CrawlingInfo,
@Override
protected String asEsIndex() {
return ".fess_config.crawling_info";
return "fess_config.crawling_info";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsCrawlingInfoParamBhv extends EsAbstractBehavior<Crawling
@Override
protected String asEsIndex() {
return ".fess_config.crawling_info_param";
return "fess_config.crawling_info_param";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsDataConfigBhv extends EsAbstractBehavior<DataConfig, Dat
@Override
protected String asEsIndex() {
return ".fess_config.data_config";
return "fess_config.data_config";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsDuplicateHostBhv extends EsAbstractBehavior<DuplicateHos
@Override
protected String asEsIndex() {
return ".fess_config.duplicate_host";
return "fess_config.duplicate_host";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsElevateWordBhv extends EsAbstractBehavior<ElevateWord, E
@Override
protected String asEsIndex() {
return ".fess_config.elevate_word";
return "fess_config.elevate_word";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsElevateWordToLabelBhv extends EsAbstractBehavior<Elevate
@Override
protected String asEsIndex() {
return ".fess_config.elevate_word_to_label";
return "fess_config.elevate_word_to_label";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsFailureUrlBhv extends EsAbstractBehavior<FailureUrl, Fai
@Override
protected String asEsIndex() {
return ".fess_config.failure_url";
return "fess_config.failure_url";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsFileAuthenticationBhv extends EsAbstractBehavior<FileAut
@Override
protected String asEsIndex() {
return ".fess_config.file_authentication";
return "fess_config.file_authentication";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsFileConfigBhv extends EsAbstractBehavior<FileConfig, Fil
@Override
protected String asEsIndex() {
return ".fess_config.file_config";
return "fess_config.file_config";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsJobLogBhv extends EsAbstractBehavior<JobLog, JobLogCB> {
@Override
protected String asEsIndex() {
return ".fess_config.job_log";
return "fess_config.job_log";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsKeyMatchBhv extends EsAbstractBehavior<KeyMatch, KeyMatc
@Override
protected String asEsIndex() {
return ".fess_config.key_match";
return "fess_config.key_match";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsLabelTypeBhv extends EsAbstractBehavior<LabelType, Label
@Override
protected String asEsIndex() {
return ".fess_config.label_type";
return "fess_config.label_type";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsPathMappingBhv extends EsAbstractBehavior<PathMapping, P
@Override
protected String asEsIndex() {
return ".fess_config.path_mapping";
return "fess_config.path_mapping";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsRelatedContentBhv extends EsAbstractBehavior<RelatedCont
@Override
protected String asEsIndex() {
return ".fess_config.related_content";
return "fess_config.related_content";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsRelatedQueryBhv extends EsAbstractBehavior<RelatedQuery,
@Override
protected String asEsIndex() {
return ".fess_config.related_query";
return "fess_config.related_query";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsRequestHeaderBhv extends EsAbstractBehavior<RequestHeade
@Override
protected String asEsIndex() {
return ".fess_config.request_header";
return "fess_config.request_header";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsRoleTypeBhv extends EsAbstractBehavior<RoleType, RoleTyp
@Override
protected String asEsIndex() {
return ".fess_config.role_type";
return "fess_config.role_type";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsScheduledJobBhv extends EsAbstractBehavior<ScheduledJob,
@Override
protected String asEsIndex() {
return ".fess_config.scheduled_job";
return "fess_config.scheduled_job";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsThumbnailQueueBhv extends EsAbstractBehavior<ThumbnailQu
@Override
protected String asEsIndex() {
return ".fess_config.thumbnail_queue";
return "fess_config.thumbnail_queue";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsWebAuthenticationBhv extends EsAbstractBehavior<WebAuthe
@Override
protected String asEsIndex() {
return ".fess_config.web_authentication";
return "fess_config.web_authentication";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsWebConfigBhv extends EsAbstractBehavior<WebConfig, WebCo
@Override
protected String asEsIndex() {
return ".fess_config.web_config";
return "fess_config.web_config";
}
@Override

View file

@ -30,7 +30,7 @@ public class AccessTokenBhv extends BsAccessTokenBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class BadWordBhv extends BsBadWordBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class BoostDocumentRuleBhv extends BsBoostDocumentRuleBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class CrawlingInfoBhv extends BsCrawlingInfoBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class CrawlingInfoParamBhv extends BsCrawlingInfoParamBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class DataConfigBhv extends BsDataConfigBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class DuplicateHostBhv extends BsDuplicateHostBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class ElevateWordBhv extends BsElevateWordBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class FailureUrlBhv extends BsFailureUrlBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class FileAuthenticationBhv extends BsFileAuthenticationBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class FileConfigBhv extends BsFileConfigBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class JobLogBhv extends BsJobLogBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class KeyMatchBhv extends BsKeyMatchBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class LabelTypeBhv extends BsLabelTypeBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class PathMappingBhv extends BsPathMappingBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class RelatedContentBhv extends BsRelatedContentBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class RelatedQueryBhv extends BsRelatedQueryBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class RequestHeaderBhv extends BsRequestHeaderBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class RoleTypeBhv extends BsRoleTypeBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -39,7 +39,7 @@ public class ScheduledJobBhv extends BsScheduledJobBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class ThumbnailQueueBhv extends BsThumbnailQueueBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class WebAuthenticationBhv extends BsWebAuthenticationBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -30,7 +30,7 @@ public class WebConfigBhv extends BsWebConfigBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexConfigIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_config"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_config"), name);
}
return indexName;
}

View file

@ -51,7 +51,7 @@ public abstract class BsGroupBhv extends EsAbstractBehavior<Group, GroupCB> {
@Override
protected String asEsIndex() {
return ".fess_user.group";
return "fess_user.group";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsRoleBhv extends EsAbstractBehavior<Role, RoleCB> {
@Override
protected String asEsIndex() {
return ".fess_user.role";
return "fess_user.role";
}
@Override

View file

@ -51,7 +51,7 @@ public abstract class BsUserBhv extends EsAbstractBehavior<User, UserCB> {
@Override
protected String asEsIndex() {
return ".fess_user.user";
return "fess_user.user";
}
@Override

View file

@ -36,7 +36,7 @@ public class GroupBhv extends BsGroupBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexUserIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_user"), name);
}
return indexName;
}

View file

@ -36,7 +36,7 @@ public class RoleBhv extends BsRoleBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexUserIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_user"), name);
}
return indexName;
}

View file

@ -42,7 +42,7 @@ public class UserBhv extends BsUserBhv {
protected String asEsIndex() {
if (indexName == null) {
final String name = ComponentUtil.getFessConfig().getIndexUserIndex();
indexName = super.asEsIndex().replaceFirst(Pattern.quote(".fess_user"), name);
indexName = super.asEsIndex().replaceFirst(Pattern.quote("fess_user"), name);
}
return indexName;
}

View file

@ -624,10 +624,10 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. 1 */
String INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas = "index.document.crawler.filter.number_of_replicas";
/** The key of the configuration. e.g. .fess_config */
/** The key of the configuration. e.g. fess_config */
String INDEX_CONFIG_INDEX = "index.config.index";
/** The key of the configuration. e.g. .fess_user */
/** The key of the configuration. e.g. fess_user */
String INDEX_USER_INDEX = "index.user.index";
/** The key of the configuration. e.g. fess_log */
@ -1073,7 +1073,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/** The key of the configuration. e.g. true */
String FTP_ROLE_FROM_FILE = "ftp.role.from.file";
/** The key of the configuration. e.g. .fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties,fess.json,doc.json */
/** The key of the configuration. e.g. fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json */
String INDEX_BACKUP_TARGETS = "index.backup.targets";
/** The key of the configuration. e.g. click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson */
@ -3573,14 +3573,14 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'index.config.index'. <br>
* The value is, e.g. .fess_config <br>
* The value is, e.g. fess_config <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getIndexConfigIndex();
/**
* Get the value for the key 'index.user.index'. <br>
* The value is, e.g. .fess_user <br>
* The value is, e.g. fess_user <br>
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
String getIndexUserIndex();
@ -4981,7 +4981,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
/**
* Get the value for the key 'index.backup.targets'. <br>
* The value is, e.g. .fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties,fess.json,doc.json <br>
* The value is, e.g. fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json <br>
* comment: backup
* @return The value of found property. (NotNull: if not found, exception but basically no way)
*/
@ -10231,8 +10231,8 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_QUEUE_number_of_replicas, "1");
defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_DATA_number_of_replicas, "1");
defaultMap.put(FessConfig.INDEX_DOCUMENT_CRAWLER_FILTER_number_of_replicas, "1");
defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, ".fess_config");
defaultMap.put(FessConfig.INDEX_USER_INDEX, ".fess_user");
defaultMap.put(FessConfig.INDEX_CONFIG_INDEX, "fess_config");
defaultMap.put(FessConfig.INDEX_USER_INDEX, "fess_user");
defaultMap.put(FessConfig.INDEX_LOG_INDEX, "fess_log");
defaultMap.put(FessConfig.INDEX_ADMIN_ARRAY_FIELDS, "lang,role,label,anchor,virtual_host");
defaultMap.put(FessConfig.INDEX_ADMIN_DATE_FIELDS, "expires,created,timestamp,last_modified");
@ -10349,7 +10349,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
defaultMap.put(FessConfig.FILE_ROLE_FROM_FILE, "true");
defaultMap.put(FessConfig.FTP_ROLE_FROM_FILE, "true");
defaultMap.put(FessConfig.INDEX_BACKUP_TARGETS,
".fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties,fess.json,doc.json");
"fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json");
defaultMap.put(FessConfig.INDEX_BACKUP_LOG_TARGETS, "click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson");
defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_ENABLED, "true");
defaultMap.put(FessConfig.LOGGING_SEARCH_DOCS_FIELDS,

View file

@ -431,88 +431,88 @@
<postConstruct name="addIndexConfig">
<arg>"fess/doc"</arg>
</postConstruct>
<!-- .fess_config index -->
<!-- fess_config index -->
<postConstruct name="addIndexConfig">
<arg>".fess_config.access_token/access_token"</arg>
<arg>"fess_config.access_token/access_token"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.bad_word/bad_word"</arg>
<arg>"fess_config.bad_word/bad_word"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.boost_document_rule/boost_document_rule"</arg>
<arg>"fess_config.boost_document_rule/boost_document_rule"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.crawling_info/crawling_info"</arg>
<arg>"fess_config.crawling_info/crawling_info"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.crawling_info_param/crawling_info_param"</arg>
<arg>"fess_config.crawling_info_param/crawling_info_param"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.data_config/data_config"</arg>
<arg>"fess_config.data_config/data_config"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.duplicate_host/duplicate_host"</arg>
<arg>"fess_config.duplicate_host/duplicate_host"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.elevate_word/elevate_word"</arg>
<arg>"fess_config.elevate_word/elevate_word"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.elevate_word_to_label/elevate_word_to_label"</arg>
<arg>"fess_config.elevate_word_to_label/elevate_word_to_label"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.failure_url/failure_url"</arg>
<arg>"fess_config.failure_url/failure_url"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.file_authentication/file_authentication"</arg>
<arg>"fess_config.file_authentication/file_authentication"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.file_config/file_config"</arg>
<arg>"fess_config.file_config/file_config"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.job_log/job_log"</arg>
<arg>"fess_config.job_log/job_log"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.key_match/key_match"</arg>
<arg>"fess_config.key_match/key_match"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.label_type/label_type"</arg>
<arg>"fess_config.label_type/label_type"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.path_mapping/path_mapping"</arg>
<arg>"fess_config.path_mapping/path_mapping"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.related_content/related_content"</arg>
<arg>"fess_config.related_content/related_content"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.related_query/related_query"</arg>
<arg>"fess_config.related_query/related_query"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.request_header/request_header"</arg>
<arg>"fess_config.request_header/request_header"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.role_type/role_type"</arg>
<arg>"fess_config.role_type/role_type"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.scheduled_job/scheduled_job"</arg>
<arg>"fess_config.scheduled_job/scheduled_job"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.thumbnail_queue/thumbnail_queue"</arg>
<arg>"fess_config.thumbnail_queue/thumbnail_queue"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.web_authentication/web_authentication"</arg>
<arg>"fess_config.web_authentication/web_authentication"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_config.web_config/web_config"</arg>
<arg>"fess_config.web_config/web_config"</arg>
</postConstruct>
<!-- .fess_user index -->
<!-- fess_user index -->
<postConstruct name="addIndexConfig">
<arg>".fess_user.user/user"</arg>
<arg>"fess_user.user/user"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_user.role/role"</arg>
<arg>"fess_user.role/role"</arg>
</postConstruct>
<postConstruct name="addIndexConfig">
<arg>".fess_user.group/group"</arg>
<arg>"fess_user.group/group"</arg>
</postConstruct>
<!-- fess_log index -->
<postConstruct name="addIndexConfig">

View file

@ -319,8 +319,8 @@ index.document.crawler.filter.number_of_shards=10
index.document.crawler.queue.number_of_replicas=1
index.document.crawler.data.number_of_replicas=1
index.document.crawler.filter.number_of_replicas=1
index.config.index=.fess_config
index.user.index=.fess_user
index.config.index=fess_config
index.user.index=fess_user
index.log.index=fess_log
# doc management
@ -581,7 +581,7 @@ file.role.from.file=true
ftp.role.from.file=true
# backup
index.backup.targets=.fess_basic_config.bulk,.fess_config.bulk,.fess_user.bulk,system.properties,fess.json,doc.json
index.backup.targets=fess_basic_config.bulk,fess_config.bulk,fess_user.bulk,system.properties,fess.json,doc.json
index.backup.log.targets=click_log.ndjson,favorite_log.ndjson,search_log.ndjson,user_info.ndjson
# logging

View file

@ -1,4 +0,0 @@
{"index":{"_index":".fess_user.role","_id":"YWRtaW4="}}
{"name":"admin"}
{"index":{"_index":".fess_user.role","_id":"Z3Vlc3Q="}}
{"name":"guest"}

Some files were not shown because too many files have changed in this diff Show more