From d0f79c2c9fd25db956bb0afbf63e18ebe94f693a Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Sat, 11 Jan 2020 17:32:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20dubbo=20=E9=97=AE=E9=A2=98=20fix=20xxl-jo?=
 =?UTF-8?q?b=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/config/XxlJobConfiguration.java      |  2 +-
 ...rpc.Filter => org.apache.dubbo.rpc.Filter} |  0
 lab-34/lab-34-actuator-test/pom.xml           | 29 ++++++++++++++++
 .../lab34/actuatordemo/Application.java       | 13 +++++++
 .../controller/TestController.java            | 10 ++++++
 .../src/main/resources/application.yaml       | 13 +++++++
 lab-34/pom.xml                                |  3 +-
 lab-41/lab-41-demo01/pom.xml                  | 34 +++++++++++++++++++
 .../lab40/jenkinsdemo/Application.java        | 13 +++++++
 .../controller/DemoController.java            | 16 +++++++++
 .../src/main/resources/application.yaml       |  2 ++
 lab-41/pom.xml                                | 19 +++++++++++
 pom.xml                                       |  1 +
 13 files changed, 153 insertions(+), 2 deletions(-)
 rename lab-30/lab-30-dubbo-xml-demo/user-rpc-service-provider/src/main/resources/META-INF/dubbo/{com.alibaba.dubbo.rpc.Filter => org.apache.dubbo.rpc.Filter} (100%)
 create mode 100644 lab-34/lab-34-actuator-test/pom.xml
 create mode 100644 lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/Application.java
 create mode 100644 lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/controller/TestController.java
 create mode 100644 lab-34/lab-34-actuator-test/src/main/resources/application.yaml
 create mode 100644 lab-41/lab-41-demo01/pom.xml
 create mode 100644 lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/Application.java
 create mode 100644 lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/controller/DemoController.java
 create mode 100644 lab-41/lab-41-demo01/src/main/resources/application.yaml
 create mode 100644 lab-41/pom.xml

diff --git a/lab-28/lab-28-task-xxl-job/src/main/java/cn/iocoder/springboot/lab28/task/config/XxlJobConfiguration.java b/lab-28/lab-28-task-xxl-job/src/main/java/cn/iocoder/springboot/lab28/task/config/XxlJobConfiguration.java
index 83c32daa..db4c0e68 100644
--- a/lab-28/lab-28-task-xxl-job/src/main/java/cn/iocoder/springboot/lab28/task/config/XxlJobConfiguration.java
+++ b/lab-28/lab-28-task-xxl-job/src/main/java/cn/iocoder/springboot/lab28/task/config/XxlJobConfiguration.java
@@ -23,7 +23,7 @@ public class XxlJobConfiguration {
     @Value("${xxl.job.executor.logretentiondays}")
     private int logRetentionDays;
 
-    @Bean(initMethod = "start", destroyMethod = "destroy")
+    @Bean
     public XxlJobSpringExecutor xxlJobExecutor() {
         // 创建 XxlJobSpringExecutor 执行器
         XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
diff --git a/lab-30/lab-30-dubbo-xml-demo/user-rpc-service-provider/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/lab-30/lab-30-dubbo-xml-demo/user-rpc-service-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from lab-30/lab-30-dubbo-xml-demo/user-rpc-service-provider/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
rename to lab-30/lab-30-dubbo-xml-demo/user-rpc-service-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
diff --git a/lab-34/lab-34-actuator-test/pom.xml b/lab-34/lab-34-actuator-test/pom.xml
new file mode 100644
index 00000000..84f2b53f
--- /dev/null
+++ b/lab-34/lab-34-actuator-test/pom.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>lab-34-acturator-test</artifactId>
+
+    <dependencies>
+        <!-- 实现对 Spring MVC 的自动化配置 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- 实现对 Actuator 的自动化配置 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/Application.java b/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/Application.java
new file mode 100644
index 00000000..70532da9
--- /dev/null
+++ b/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/Application.java
@@ -0,0 +1,13 @@
+package cn.iocoder.springboot.lab34.actuatordemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
diff --git a/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/controller/TestController.java b/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/controller/TestController.java
new file mode 100644
index 00000000..6ce3a595
--- /dev/null
+++ b/lab-34/lab-34-actuator-test/src/main/java/cn/iocoder/springboot/lab34/actuatordemo/controller/TestController.java
@@ -0,0 +1,10 @@
+package cn.iocoder.springboot.lab34.actuatordemo.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class TestController {
+
+
+
+}
diff --git a/lab-34/lab-34-actuator-test/src/main/resources/application.yaml b/lab-34/lab-34-actuator-test/src/main/resources/application.yaml
new file mode 100644
index 00000000..34cda368
--- /dev/null
+++ b/lab-34/lab-34-actuator-test/src/main/resources/application.yaml
@@ -0,0 +1,13 @@
+management:
+  endpoints:
+    # Actuator HTTP 配置项，对应 WebEndpointProperties 配置类
+    web:
+      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
+      exposure:
+        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。
+        exclude: # 在 include 的基础上，需要排除的端点。通过设置 * ，可以排除所有端点。
+#  server:
+#    port: 8081
+#  endpoint:
+#    shutdown:
+#      enabled: true
diff --git a/lab-34/pom.xml b/lab-34/pom.xml
index 616096b3..434bb248 100644
--- a/lab-34/pom.xml
+++ b/lab-34/pom.xml
@@ -20,7 +20,8 @@
         <module>lab-34-actuator-demo-auditevents</module>
         <module>lab-34-actuator-demo-custom-endpoint</module>
         <module>lab-34-actuator-demo-security</module>
+
+        <module>lab-34-actuator-test</module>
     </modules>
 
-
 </project>
diff --git a/lab-41/lab-41-demo01/pom.xml b/lab-41/lab-41-demo01/pom.xml
new file mode 100644
index 00000000..bcba84da
--- /dev/null
+++ b/lab-41/lab-41-demo01/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.2.RELEASE</version>
+        <relativePath/> <!-- lookup parent from repository -->
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>lab-41-demo01</artifactId>
+    <version>1.0.0</version>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!-- 实现对 SpringMVC 的自动化配置 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/Application.java b/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/Application.java
new file mode 100644
index 00000000..135766fa
--- /dev/null
+++ b/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/Application.java
@@ -0,0 +1,13 @@
+package cn.iocoder.springboot.lab40.jenkinsdemo;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
diff --git a/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/controller/DemoController.java b/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/controller/DemoController.java
new file mode 100644
index 00000000..d10b18d0
--- /dev/null
+++ b/lab-41/lab-41-demo01/src/main/java/cn/iocoder/springboot/lab40/jenkinsdemo/controller/DemoController.java
@@ -0,0 +1,16 @@
+package cn.iocoder.springboot.lab40.jenkinsdemo.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/demo")
+public class DemoController {
+
+    @GetMapping("/echo")
+    public String echo() {
+        return "echo";
+    }
+
+}
diff --git a/lab-41/lab-41-demo01/src/main/resources/application.yaml b/lab-41/lab-41-demo01/src/main/resources/application.yaml
new file mode 100644
index 00000000..396333f0
--- /dev/null
+++ b/lab-41/lab-41-demo01/src/main/resources/application.yaml
@@ -0,0 +1,2 @@
+server:
+  port: 8079
diff --git a/lab-41/pom.xml b/lab-41/pom.xml
new file mode 100644
index 00000000..46e616bb
--- /dev/null
+++ b/lab-41/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>labs-parent</artifactId>
+        <groupId>cn.iocoder.springboot.labs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>lab-41</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>lab-41-demo01</module>
+    </modules>
+
+
+</project>
diff --git a/pom.xml b/pom.xml
index 64d155d3..ad24b9ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
         <module>lab-38</module>
         <module>lab-39</module>
         <module>lab-40</module>
+        <module>lab-41</module>
     </modules>