From 0a63b72daf19771bdf39bdeb1688098c8ee39257 Mon Sep 17 00:00:00 2001 From: fangyunzhong Date: Wed, 28 Dec 2022 07:15:45 +0000 Subject: [PATCH] =?UTF-8?q?fixed=203610a31=20from=20https://gitee.com/fang?= =?UTF-8?q?-yunzhong/developtools=5Fglobal=5Fresource=5Ftool/pulls/71=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9Eshared=E7=9A=84=E6=A8=A1=E5=9D=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangyunzhong --- include/config_parser.h | 1 + src/config_parser.cpp | 5 +++-- src/resource_merge.cpp | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/config_parser.h b/include/config_parser.h index 0f85dd0..6b090c7 100644 --- a/include/config_parser.h +++ b/include/config_parser.h @@ -29,6 +29,7 @@ public: HAR = 1, ENTRY = 2, FEATURE = 3, + SHARED = 4, }; ConfigParser(); diff --git a/src/config_parser.cpp b/src/config_parser.cpp index 5d9e780..2b32ab5 100644 --- a/src/config_parser.cpp +++ b/src/config_parser.cpp @@ -24,9 +24,10 @@ namespace Global { namespace Restool { using namespace std; const map ConfigParser::MODULE_TYPES = { - { "har", ModuleType::HAR, }, + { "har", ModuleType::HAR }, { "entry", ModuleType::ENTRY }, - { "feature", ModuleType::FEATURE } + { "feature", ModuleType::FEATURE }, + { "shared", ModuleType::SHARED } }; const map ConfigParser::JSON_STRING_IDS = { diff --git a/src/resource_merge.cpp b/src/resource_merge.cpp index 80a12c9..c96ea91 100644 --- a/src/resource_merge.cpp +++ b/src/resource_merge.cpp @@ -25,6 +25,7 @@ const vector ResourceMerge::ORDERS = { ConfigParser::ModuleType::NONE, ConfigParser::ModuleType::ENTRY, ConfigParser::ModuleType::FEATURE, + ConfigParser::ModuleType::SHARED, ConfigParser::ModuleType::HAR };