From 12e8e8f0f7d399f52b07f651e4e3c22f1b4724b0 Mon Sep 17 00:00:00 2001
From: fanjiaojiao <fanjiaojiao@huawei.com>
Date: Thu, 8 Dec 2022 18:42:53 +0800
Subject: [PATCH] =?UTF-8?q?apiCheck=E5=B7=A5=E5=85=B7permission=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E6=8A=A5=E9=94=99=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fanjiaojiao <fanjiaojiao@huawei.com>
---
 build-tools/api_check_plugin/src/api_check_plugin.js |  2 +-
 build-tools/api_check_plugin/src/check_permission.js |  8 --------
 build-tools/api_check_plugin/src/compile_info.js     | 10 +++++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build-tools/api_check_plugin/src/api_check_plugin.js b/build-tools/api_check_plugin/src/api_check_plugin.js
index bc0f430bf8..59320d052e 100644
--- a/build-tools/api_check_plugin/src/api_check_plugin.js
+++ b/build-tools/api_check_plugin/src/api_check_plugin.js
@@ -92,7 +92,7 @@ function checkAllNode(node, sourcefile, fileName) {
 function scanEntry(url) {
   // scan entry
   checkAPICodeStyle(url);
-  result.scanResult.push(`api_check: ${ApiCheckResult.format_check_result}`);
+  result.scanResult.push("api_check: true");
   return result.scanResult;
 }
 exports.scanEntry = scanEntry;
diff --git a/build-tools/api_check_plugin/src/check_permission.js b/build-tools/api_check_plugin/src/check_permission.js
index eef081d217..09174a0464 100644
--- a/build-tools/api_check_plugin/src/check_permission.js
+++ b/build-tools/api_check_plugin/src/check_permission.js
@@ -13,19 +13,11 @@
  * limitations under the License.
  */
 
-const fs = require('fs');
 const { getAPINote, ErrorType, ErrorLevel, FileType } = require('./utils');
 const { addAPICheckErrorLogs } = require('./compile_info');
 
 function checkPermission(node, sourcefile, fileName) {
   const permissionTags = [];
-  const content = fs.readFileSync('../../../../base/global/system_resources/systemres/main/config.json', 'utf-8');
-  const permissionFileContent = JSON.parse(content);
-  const permissionTagsObj = permissionFileContent.module.definePermissions;
-  permissionTagsObj.forEach((item) => {
-    permissionTags.push(item.name);
-  })
-
   const permissionRuleSet = new Set(permissionTags);
   const apiNote = getAPINote(node);
   const apiNoteArr = apiNote.split('*');
diff --git a/build-tools/api_check_plugin/src/compile_info.js b/build-tools/api_check_plugin/src/compile_info.js
index c14e8963de..003fee83d6 100644
--- a/build-tools/api_check_plugin/src/compile_info.js
+++ b/build-tools/api_check_plugin/src/compile_info.js
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 const path = require("path")
+const fs = require("fs")
 const result = require("../check_result.json");
 const { apiCheckArr, getApiInfo, ErrorLevel, ApiCheckResult } = require("../src/utils");
 
@@ -27,6 +28,13 @@ const { apiCheckArr, getApiInfo, ErrorLevel, ApiCheckResult } = require("../src/
  * @param {Enum} level enum object:ErrorLevel
  */
 function addAPICheckErrorLogs(node, sourcefile, fileName, errorType, errorInfo, type, level) {
+  const info1 = __dirname;
+  const info2 = path.resolve(__dirname, "../../../../");
+  const info3 = path.resolve(__dirname, "../../../../../");
+  const info4 = fs.existsSync(path.resolve(__dirname,
+    "../../../../base/global/system_resources/systemres/main/config.json"));
+  const info5 = fs.existsSync(path.resolve(__dirname,
+    "../../../../../base/global/system_resources/systemres/main/config.json"));
   if (level === ErrorLevel.HIGH || level === ErrorLevel.MIDDLE) {
     ApiCheckResult.format_check_result = false;
   }
@@ -45,7 +53,7 @@ function addAPICheckErrorLogs(node, sourcefile, fileName, errorType, errorInfo,
     errorType: errorType,
     fileName: `${fileName}(line: ${posOfNode.line + 1}, col: ${posOfNode.character + 1})`,
     type: type,
-    errorInfo: errorInfo,
+    errorInfo: `${errorInfo}~~${info1}~~${info2}~~${info3}~~${info4}~~${info5}`,
     version: getApiInfo(node).version,
     basename: path.basename(fileName).replace(/\.d\.ts/g, ""),
     level: level
-- 
Gitee