Merge branch 'feature_merge'

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

.drone.yml

@@ -0,0 +1,39 @@
+kind: pipeline  # kind 属性定义了对象的种类。此示例定义了一个管道对象。
+type: docker    # type 属性定义管道的类型。此示例定义了一个 Docker 管道，其中每个管道步骤都在 Docker 容器内执行。
+name: default   # name 属性定义了管道的名称。您可以为您的项目定义一个或多个管道
+
+steps:
+  - name: code-analysis
+    #image: plugins/sonarqube-scanner:linux-amd64
+    image: plugins/sonarqube-scanner:linux-amd64
+    settings:
+      sonar_host: http://10.0.4.16:9000
+      sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e
+      sonar_name: pert
+      sonar_key: pert
+      level: TRACE
+      showProfiling: true
+      binaries: .
+
+#kind: pipeline
+#type: exec
+#name: default
+#
+#platform:
+#  os: linux
+#  arch: amd64
+#
+#steps:
+#  - name: greeting
+#    commands:
+#      - echo hello world
+#node:
+#  role: pi-runner
+#---
+#kind: pipeline
+#type: docker
+#name: code-analysis
+#
+
+#node:
+#  role: pi-runner

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

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

pom.xml

@@ -25,7 +25,7 @@
     <name>hly_project</name>
     <description>Demo project for Spring Boot</description>
     <properties>
-        <java.version>8</java.version>
+        <java.version>17</java.version>
         <spring-cloud.version>2020.0.2</spring-cloud.version>
     </properties>
 

sonar-project.properties

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