From a69ee7c24268295d87038bc183a806c70e231148 Mon Sep 17 00:00:00 2001 From: jimin Date: Tue, 11 Jul 2023 23:09:18 +0800 Subject: [PATCH] bugfix: fix get configuration item contains underlined error (#5716) --- .../src/test/resources/file.conf | 21 +++++++++++++ .../src/test/resources/registry.conf | 30 +++++++++++++++++++ tcc/src/test/resources/file.conf | 21 +++++++++++++ tcc/src/test/resources/registry.conf | 30 +++++++++++++++++++ 4 files changed, 102 insertions(+) create mode 100644 integration-tx-api/src/test/resources/file.conf create mode 100644 integration-tx-api/src/test/resources/registry.conf create mode 100644 tcc/src/test/resources/file.conf create mode 100644 tcc/src/test/resources/registry.conf diff --git a/integration-tx-api/src/test/resources/file.conf b/integration-tx-api/src/test/resources/file.conf new file mode 100644 index 00000000000..a06899c4a03 --- /dev/null +++ b/integration-tx-api/src/test/resources/file.conf @@ -0,0 +1,21 @@ + # Copyright 1999-2019 Seata.io Group. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +service { + #transaction service group mapping + vgroupMapping.default_tx_group = "default" + #only support when registry.type=file, please don't set multiple addresses + default.grouplist = "127.0.0.1:8091" + #disable seata + disableGlobalTransaction = false +} \ No newline at end of file diff --git a/integration-tx-api/src/test/resources/registry.conf b/integration-tx-api/src/test/resources/registry.conf new file mode 100644 index 00000000000..7870e78a687 --- /dev/null +++ b/integration-tx-api/src/test/resources/registry.conf @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Seata.io Group. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "file" + + file { + name = "file.conf" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3 + type = "file" + + file { + name = "file.conf" + } +} \ No newline at end of file diff --git a/tcc/src/test/resources/file.conf b/tcc/src/test/resources/file.conf new file mode 100644 index 00000000000..a06899c4a03 --- /dev/null +++ b/tcc/src/test/resources/file.conf @@ -0,0 +1,21 @@ + # Copyright 1999-2019 Seata.io Group. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. + # You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. +service { + #transaction service group mapping + vgroupMapping.default_tx_group = "default" + #only support when registry.type=file, please don't set multiple addresses + default.grouplist = "127.0.0.1:8091" + #disable seata + disableGlobalTransaction = false +} \ No newline at end of file diff --git a/tcc/src/test/resources/registry.conf b/tcc/src/test/resources/registry.conf new file mode 100644 index 00000000000..7870e78a687 --- /dev/null +++ b/tcc/src/test/resources/registry.conf @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Seata.io Group. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +registry { + # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa + type = "file" + + file { + name = "file.conf" + } +} + +config { + # file、nacos 、apollo、zk、consul、etcd3 + type = "file" + + file { + name = "file.conf" + } +} \ No newline at end of file