From d901b1ab0ee0b690f5ac211b9cdb1db3a58bca86 Mon Sep 17 00:00:00 2001 From: yanweiyuan3 <yanweiyuan3@gmail.com> Date: 星期二, 10 十月 2023 17:45:58 +0800 Subject: [PATCH] Merge branch 'dev' into dev_yy --- _var/_Main/ModelSettings/Common/Development/_ROOT_Role_Development.properties | 55 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 7 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..58f022e 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= @@ -203,11 +204,11 @@ domainmodel.ediremotedatasourcedefinition.remotestorage.inputunitsfrommodel.parameters= domainmodel.ediremotedatasourcedefinition.remotestorage.inputunitsfrommodel.password= domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle=template:domainmodel.ediremotedatasourcedefinition -domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.connection= +domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.connection=dbodbc1 domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.maxcolumnnamelength=0 domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.maxtablenamelength=0 -domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.parameters= -domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.password= +domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.parameters=/datasource=orclpdb /owner=TIANMA /chardatatypeforstring /characterencoding=UTF-8 /appdatatypeforstring=wchar +domainmodel.ediremotedatasourcedefinition.remotestorage.localoracle.password=1 E9FE769DABE91891284EBBA6CEA8F41B 479d6f99-cffb-41e6-94f1-d35bdf20703c domainmodel.ediremotedatasourcedefinition.remotestorage.oracle=template:domainmodel.ediremotedatasourcedefinition domainmodel.ediremotedatasourcedefinition.remotestorage.oracle.connection=dbodbc1 domainmodel.ediremotedatasourcedefinition.remotestorage.oracle.maxcolumnnamelength=0 @@ -453,16 +454,56 @@ domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sendingcontentcharset=UTF-8 domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.sockettimeout=0 domainmodel.integratorconfig.dsendpoint.q3dspace_3dsendpoint.trustmanagername=Q3DSpace +domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint +domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.connectiongroupname=SERVER +domainmodel.integratorconfig.quintiqendpoint.jtmbrestserver_quintiqendpoint.outboundrequesttimeout=60 +domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint +domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.connectiongroupname=SERVER +domainmodel.integratorconfig.quintiqendpoint.panelmaterialrestserver_quintiqendpoint.outboundrequesttimeout=60 domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint=template:domainmodel.integratorconfig.quintiqendpoint domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.connectiongroupname=SERVER domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.integratorid=Q3DSpace domainmodel.integratorconfig.quintiqendpoint.q3dspace_quintiqendpoint.outboundrequesttimeout=60 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver=template:domainmodel.integratorconfig.restendpoint +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam1= +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationparam2= +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.authenticationtype=None +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.connectiontimeout=0 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.contenttype=JSON +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.enablehttpmessagelogging=true +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.includerawcontent=false +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.maxconnections=10 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.passonvalidationerrors=false +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.portnumber=8080 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.proxyportnumber=0 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.receivecontentcharset=ASCII +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.requesttimeout=60 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml" +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sendingcontentcharset=utf-8 +domainmodel.integratorconfig.restendpoint.jtmbrestserver_restserver.sockettimeout=0 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial=template:domainmodel.integratorconfig.restendpoint +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam1= +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationparam2= +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.authenticationtype=None +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.connectiontimeout=0 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.contenttype=JSON +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.enablehttpmessagelogging=false +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.includerawcontent=false +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.maxconnections=10 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.passonvalidationerrors=false +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.portnumber=8080 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.proxyportnumber=0 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.receivecontentcharset=ASCII +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.requesttimeout=60 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.restschemaurl="C:\\Users\\hongjli\\Desktop\\integratorrestexample\\openapi.yaml" +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sendingcontentcharset=utf-8 +domainmodel.integratorconfig.restendpoint.panelmaterialrestserver_restendpointpanelmaterial.sockettimeout=0 domainmodel.mdsstoragedefinitionmanager=template:domainmodel.mdsstoragedefinitionmanager domainmodel.mdsstoragedefinitionmanager.audittrailenabled=false domainmodel.mdsstoragedefinitionmanager.audittraillocation= domainmodel.mdsstoragedefinitionmanager.databaseenabled=false 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 +515,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