From 1aa9f2bb83dd9e4b7517f1cbf06b0db53979bb31 Mon Sep 17 00:00:00 2001 From: renhao <renhui.hao@capgemini.com> Date: 星期四, 21 九月 2023 15:20:28 +0800 Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_release' --- _var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/_var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties b/_var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties index a48fa85..2ba12ee 100644 --- a/_var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties +++ b/_var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties @@ -8,6 +8,7 @@ arg=template:serverargs arg.architectdependencies= arg.custom="" +arg.versioncontrolmode=true domainmodel.ediremotedatasourcedefinition.remotestorage.destination=template:domainmodel.ediremotedatasourcedefinition domainmodel.ediremotedatasourcedefinition.remotestorage.destination.connection= domainmodel.ediremotedatasourcedefinition.remotestorage.destination.parameters= @@ -460,9 +461,9 @@ domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false domainmodel.mdsstoragedefinitionmanager.audittraillocation= -domainmodel.mdsstoragedefinitionmanager.databaseenabled=false +domainmodel.mdsstoragedefinitionmanager.databaseenabled=true domainmodel.mdsstoragedefinitionmanager.datasetstoredatasource=MacroPlanner -domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=true +domainmodel.mdsstoragedefinitionmanager.datasetstoreenabled=false domainmodel.mdsstoragedefinitionmanager.datasetstoreislocal=false domainmodel.mdsstoragedefinitionmanager.dbformat=Legacy domainmodel.mdsstoragedefinitionmanager.defaultencryptioncertificate= @@ -474,11 +475,11 @@ domainmodel.mdsstoragedefinitionmanager.name=dbodbc1 domainmodel.mdsstoragedefinitionmanager.ociconnectionbasichost=10.110.14.50 domainmodel.mdsstoragedefinitionmanager.ociconnectionbasicport=1521 -domainmodel.mdsstoragedefinitionmanager.ociconnectionbasicservice=totddb +domainmodel.mdsstoragedefinitionmanager.ociconnectionbasicservice=totddb_jtmb domainmodel.mdsstoragedefinitionmanager.ociconnectiontnsname=totddb domainmodel.mdsstoragedefinitionmanager.ociconnectiontype=Basic -domainmodel.mdsstoragedefinitionmanager.parameters=/datasource=MacroPlannerInternalDB /user=otd -domainmodel.mdsstoragedefinitionmanager.password=1 65BA9039C6C6A82BFEAA7408A8F96867 d5a0fc9a-a372-4807-9f03-34bcf85e582d +domainmodel.mdsstoragedefinitionmanager.parameters=/datasource=MacroPlannerInternalDB /user=OTDJTMBUSER +domainmodel.mdsstoragedefinitionmanager.password=1 463752FBAC1C9172263ADBF875F4CBF3 d5a0fc9a-a372-4807-9f03-34bcf85e582d domainmodel.soapclientinterfacedefinition.interface.libdef_soapclients=template:domainmodel.soapclientinterfacedefinition domainmodel.soapclientinterfacedefinition.interface.libdef_soapclients.datasetkind= domainmodel.soapclientinterfacedefinition.interface.libdef_soapclients.datasetname= -- Gitblit v1.9.3