Merge branch 'master' of gitee.com:openharmony/community into master

sig/sig-appframework/sig-appframework.md

@@ -21,7 +21,7 @@ OpenHarmony ApplicationFramework Governance Charter、ApplicationFramework Revie
   - third_party_weex-loader:https://gitee.com/openharmony/third_party_weex-loader
   - third_party_parse5:https://gitee.com/openharmony/third_party_parse5
   - third_party_glfw:https://gitee.com/openharmony/third_party_glfw
-  - global_resource_tool:"https://gitee.com/openharmony-sig/global_resource_tool"
+  - global_resource_tool:"https://gitee.com/openharmony/global_resource_tool"
   - third_party_chromium:https://gitee.com/openharmony/third_party_chromium
   - third_party_cef:https://gitee.com/openharmony/third_party_cef
   - web_webview:https://gitee.com/openharmony/web_webview

sig/sig-appframework/sig-appframework_cn.md

@@ -22,7 +22,7 @@ ApplicationFramework相关的设计评审、提交评审、《OpenHarmony Applic
   - third_party_weex-loader:https://gitee.com/openharmony/third_party_weex-loader
   - third_party_parse5:https://gitee.com/openharmony/third_party_parse5
   - third_party_glfw:https://gitee.com/openharmony/third_party_glfw
-  - global_resource_tool:"https://gitee.com/openharmony-sig/global_resource_tool"
+  - global_resource_tool:"https://gitee.com/openharmony/global_resource_tool"
   - third_party_chromium:https://gitee.com/openharmony/third_party_chromium
   - third_party_cef:https://gitee.com/openharmony/third_party_cef
   - web_webview:https://gitee.com/openharmony/web_webview

sig/sig-softbus/sig_softbus.md

@@ -26,6 +26,7 @@ Continuously contributes to the softbus of the OpenHarmony community, implements
   - communication_wifi: https://gitee.com/openharmony/communication_wifi
   - communication_wifi_lite: https://gitee.com/openharmony/communication_wifi_lite
   - communication_wifi_aware: https://gitee.com/openharmony/communication_wifi_aware
+  - base_location：https://gitee.com/openharmony/base_location
   - telephony_call_manager: https://gitee.com/openharmony/telephony_call_manager
   - telephony_cellular_call: https://gitee.com/openharmony/telephony_cellular_call
   - telephony_core_service: https://gitee.com/openharmony/telephony_core_service

sig/sig-softbus/sig_softbus_cn.md

@@ -25,6 +25,7 @@
   - communication_wifi：https://gitee.com/openharmony/communication_wifi
   - communication_wifi_lite：https://gitee.com/openharmony/communication_wifi_lite
   - communication_wifi_aware：https://gitee.com/openharmony/communication_wifi_aware
+  - base_location：https://gitee.com/openharmony/base_location
   - telephony_call_manager：https://gitee.com/openharmony/telephony_call_manager
   - telephony_cellular_call：https://gitee.com/openharmony/telephony_cellular_call
   - telephony_core_service：https://gitee.com/openharmony/telephony_core_service

sig/sigs.json

@@ -272,6 +272,7 @@
             "https://gitee.com/openharmony/communication_wifi",
             "https://gitee.com/openharmony/communication_wifi_lite",
             "https://gitee.com/openharmony/communication_wifi_aware",
+            "https://gitee.com/openharmony/base_location",
             "https://gitee.com/openharmony/telephony_call_manager",
             "https://gitee.com/openharmony/telephony_cellular_call",
             "https://gitee.com/openharmony/telephony_core_service",
@@ -294,6 +295,7 @@
             "foundation/communication/wifi",
             "foundation/communication/wifi_lite",
             "foundation/communication/wifi_aware",
+            "base/location",
             "base/telephony/call_manager",
             "base/telephony/cellular_call",
             "base/telephony/core_service",
@@ -681,14 +683,14 @@
             "utils/memory"
          ]
       },
-	  {
-		 "sig-name":"sig-miniblink",
+      {
+         "sig-name":"sig-miniblink",
          "projects":[
             "NONE"
          ],
          "project-path":[
-		 "NONE"
-		 ]
+         "NONE"
+         ]
      },
      {
          "sig-name": "sig-appframework",
@@ -698,7 +700,7 @@
             "https://gitee.com/openharmony/third_party_weex-loader",
             "https://gitee.com/openharmony/third_party_parse5",
             "https://gitee.com/openharmony/third_party_glfw",
-            "https://gitee.com/openharmony-sig/global_resource_tool",
+            "https://gitee.com/openharmony/global_resource_tool",
             "https://gitee.com/openharmony/third_party_chromium",
             "https://gitee.com/openharmony/third_party_cef",
             "https://gitee.com/openharmony/web_webview"
@@ -719,17 +721,17 @@
          "sig-name": "sig-test",
          "projects": [
             "https://gitee.com/openharmony/third_party_benchmark",
-			"https://gitee.com/openharmony/xts_acts",
-			"https://gitee.com/openharmony/xts_tools",
-			"https://gitee.com/openharmony/xts_hats",
-			"https://gitee.com/openharmony/xts_dcts"
+            "https://gitee.com/openharmony/xts_acts",
+            "https://gitee.com/openharmony/xts_tools",
+            "https://gitee.com/openharmony/xts_hats",
+            "https://gitee.com/openharmony/xts_dcts"
          ],
          "project-path": [
             "third_party/benchmark",
-			"test/xts/acts",
-			"test/xts/tools",
-			"test/xts/hats",
-			"test/xts/dcts"
+            "test/xts/acts",
+            "test/xts/tools",
+            "test/xts/hats",
+            "test/xts/dcts"
          ]
       },
         {

zh/committer.md

@@ -363,3 +363,5 @@
 |361|third_party_chromium|third_party/chromium|https://gitee.com/bigpumpkin|chenzhennan@huawei.com|https://gitee.com/leezheng_hz|lizheng@huawei.com|SIG_ApplicationFramework|
 |362|third_party_cef|third_party/cef|https://gitee.com/bigpumpkin|chenzhennan@huawei.com|https://gitee.com/leezheng_hz|lizheng@huawei.com|SIG_ApplicationFramework|
 |363|web_webview|base/web/webview|https://gitee.com/bigpumpkin|chenzhennan@huawei.com|https://gitee.com/leezheng_hz|lizheng@huawei.com|SIG_ApplicationFramework|
+|364|global_resource_tool|developtools/global_resource_tool|https://gitee.com/jameshw|jameslee@huawei.com|https://gitee.com/zhengbin5|zhengbin5@huawei.com|SIG_ApplicationFramework|
+|365|base_location|base/location|https://gitee.com/cheng_guohong|guohong.cheng@huawei.com|https://gitee.com/liu-binjun|liubinjun@huawei.com|SIG_SoftBus|
\ No newline at end of file