From ecf6987fab5fe440898254a853b58855f50d6c83 Mon Sep 17 00:00:00 2001
From: youys <1272586223@qq.com>
Date: Tue, 7 Jan 2025 18:17:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(sonar):=20=E5=A2=9E=E5=8A=A0sonarToken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/educoder/ecsonar/services/SonarService.java  | 8 ++++++--
 src/main/resources/application.properties                 | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/net/educoder/ecsonar/services/SonarService.java b/src/main/java/net/educoder/ecsonar/services/SonarService.java
index bc66a31..e2a87d2 100644
--- a/src/main/java/net/educoder/ecsonar/services/SonarService.java
+++ b/src/main/java/net/educoder/ecsonar/services/SonarService.java
@@ -42,8 +42,8 @@ public class SonarService {
     @Value("${sonar.url}")
     String sonarUrl;
 
-//    @Value("${sonar.token}")
-//    String sonarToken;
+    @Value("${sonar.token}")
+    String sonarToken;
 
     @Value("${extract.path}")
     String extractProgramPath;
@@ -72,6 +72,7 @@ public class SonarService {
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
+                    "-Dsonar.login=" + sonarToken +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
 
             SystemUtil.ExecuteResp executeResp = SystemUtil.executeAndGetExitStatus(command);
@@ -82,6 +83,7 @@ public class SonarService {
                     "&& sonar-scanner " +
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
+                    "-Dsonar.login=" + sonarToken +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
                     "-Dsonar.cxx.cppcheck.reportPath=" + param.getCppCheckReportPath() + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
@@ -93,6 +95,7 @@ public class SonarService {
                     "&& sonar-scanner " +
                     "-Dsonar.host.url=" + sonarUrl + " " +
                     "-Dsonar.sourceEncoding=utf-8 " +
+                    "-Dsonar.login=" + sonarToken +
                     "-Dsonar.projectKey=" + param.getProjectKey() + " " +
                     "-Dsonar.cxx.cppcheck.reportPath=" + param.getCppCheckReportPath() + " " +
                     "-Dsonar.projectBaseDir=" + param.getProjectPath();
@@ -190,6 +193,7 @@ public class SonarService {
                 "-Dsonar.sourceEncoding=utf-8 " +
                 "-Dsonar.projectKey=" + key + " " +
                 "-Dsonar.java.binaries=./ " +
+                "-Dsonar.login=" + sonarToken +
                 "-Dsonar.projectBaseDir=" + projectPath;
         log.info("projectPath:{},key:{}, command: {}", projectPath, key, command);
         SystemUtil.executeAndGetExitStatus(command);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 52f91f4..de3424f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -45,8 +45,9 @@ excel.template.path=template.xlsx
 
 sonar.url=http://127.0.0.1:9000
 #sonar.url=http://117.50.14.123:9000
-# token令牌
-sonar.token=0253a518e824a976ea2f11aec17938cb0f8c0495
+# token令牌    02c142773360aebeedb4af1b178e20115ef46758
+#sonar.token=0253a518e824a976ea2f11aec17938cb0f8c0495
+sonar.token=02c142773360aebeedb4af1b178e20115ef46758
 
 extract.path=/usr/local/bin/unar
 #extract.path=/usr/bin/unar