Merge pull request 'feature_merge' (#11) from feature_merge into master

Reviewed-on: #11

.drone.yml

@@ -26,11 +26,6 @@ steps:
     #image: plugins/sonarqube-scanner:linux-amd64
     #https://github.com/drone-plugins/sonarqube-scanner/blob/main/DOCS.md
     image: plugins/sonarqube-scanner:linux-amd64
-    commands: # commands 属性将在 Docker 容器内执行的 shell 命令列表定义为容器入口点。如果任何命令返回非零退出代码，则管道步骤将失败。
-      - echo 1-${DRONE_BRANCH}
-      - echo 2-${DRONE_PULL_REQUEST}
-      - echo 3-${DRONE_SOURCE_BRANCH}
-      - echo 4-${DRONE_TARGET_BRANCH}
     settings:
       sonar_host: http://10.0.4.16:9000
       sonar_token: squ_d37ffc4085858b55e0b379c68e09a8163b2ba81d
@@ -42,10 +37,12 @@ steps:
       build_number: ${DRONE_BUILD_NUMBER}
       build_version: ${DRONE_BUILD_VERSION}
       binaries: .
-      sonar.branch.name: ${DRONE_BRANCH} # for branch analysis
-      sonar.pullrequest.key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
-      sonar.pullrequest.branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
-      sonar.pullrequest.base:  ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
+      pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
+      pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
+      pr_base:  ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
+      sonar_pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration
+      sonar_pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration
+      sonar_pr_base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration
 
 #kind: pipeline
 #type: exec

hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java

@@ -18,6 +18,7 @@ public class ClientApplication {
 
     public static void main(String[] args) {
 
+        System.out.println("demo");
 
         SpringApplication.run(ClientApplication.class, args);
     }

sonar-project.properties

@@ -1,2 +0,0 @@
-sonar.projectKey=pert
-sonar.sources=.