From 070b77cf83f3ed105c6bdca4fd2b7ffe62a406c6 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Mon, 21 Apr 2025 15:30:13 +0800
Subject: [PATCH] + [ci] fix lint pipeline.

---
 .gitfox/lint.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitfox/lint.yaml b/.gitfox/lint.yaml
index f7fa3278f2..3b53ef8764 100644
--- a/.gitfox/lint.yaml
+++ b/.gitfox/lint.yaml
@@ -15,7 +15,7 @@ spec:
               container:
                 image: hub.zentao.net/ci/alpine:3.19
               script:
-              - SONAR_PROJECT_KEY=$(echo $CI_REPO_NAME | tr '/' ':')
+              - SONAR_PROJECT_KEY=$(echo $CI_REPO_NAME-$GITFOX_COMMIT_AUTHOR | tr '/' ':')
               - echo "export SONAR_PROJECT_KEY=$SONAR_PROJECT_KEY" >> $GITFOX_CUSTOM_ENV
           - name: 配置scanner
             type: run
@@ -23,10 +23,10 @@ spec:
               container:
                 image: hub.zentao.net/ci/git:2.45.2
               script:
-              - git diff --name-only --diff-filter=d ${GITFOX_COMMIT_AFTER} ${GITFOX_COMMIT_BEFORE} | tee .changes
+              - git diff --name-only --diff-filter=d ${GITFOX_COMMIT_AFTER}${GITFOX_COMMIT_BEFORE} | tee .changes
               - |
                 cat > sonar-project.properties <<EOL
-                sonar.projectKey=$(echo $CI_REPO_NAME | tr '/' ':')
+                sonar.projectKey=$(echo $CI_REPO_NAME-$GITFOX_COMMIT_AUTHOR | tr '/' ':')
                 sonar.sources=.
                 sonar.language=php
                 sonar.branch.name=${GITFOX_TARGET_BRANCH}
@@ -69,11 +69,11 @@ spec:
                 content: |-
                   代码库: {{ .GITFOX_REPO_NAME }}
 
-                  [分析报告]({{ .SONAR_HOST_URL }}/dashboard?id={{ .SONAR_PROJECT_KEY }}&branch={{ .GITFOX_BRANCH }})
+                  [分析报告]({{ .SONAR_HOST_URL }}/dashboard?branch={{ .GITFOX_BRANCH }}&id={{ .SONAR_PROJECT_KEY }})
 
                   帐号 guest/guest
                 url: ${GITFOX_BUILD_LINK}
                 users:
                   "0": "liyang"
-                  "1": "{{ .GITFOX_COMMIT_AUTHOR}}"
+                  "1": "{{ .GITFOX_COMMIT_AUTHOR }}"
               name: gitfox-xuanim-plugin