From d511da8ab46c00fa07f5e7c951f0b47182d27ce9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 4 Jun 2020 08:45:28 +0800 Subject: [PATCH 001/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20spring=20boot=20ja?= =?UTF-8?q?r=20=E5=90=AF=E5=8A=A8=E5=8E=9F=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + lab-39/lab-39-demo/pom.xml | 4 ++ .../lab39/skywalkingdemo/Application.java | 39 ++++++++++++++++++- pom.xml | 2 +- 4 files changed, 44 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3768ff02b..3d67fe1eb 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ * [《芋道 Spring Boot 快速入门》](http://www.iocoder.cn/Spring-Boot/quick-start/?github) * [《芋道 Spring Boot 自动配置原理》](http://www.iocoder.cn/Spring-Boot/autoconfigure/?github) 对应 [lab-47](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-47) +* [《芋道 Spring Boot 芋道 Spring Boot Jar 启动原理》](http://www.iocoder.cn/Spring-Boot/jar/?github) ## 开发工具 diff --git a/lab-39/lab-39-demo/pom.xml b/lab-39/lab-39-demo/pom.xml index 199ba33df..b0bec084f 100644 --- a/lab-39/lab-39-demo/pom.xml +++ b/lab-39/lab-39-demo/pom.xml @@ -18,6 +18,10 @@ org.springframework.boot spring-boot-starter-web + + + + diff --git a/lab-39/lab-39-demo/src/main/java/cn/iocoder/springboot/lab39/skywalkingdemo/Application.java b/lab-39/lab-39-demo/src/main/java/cn/iocoder/springboot/lab39/skywalkingdemo/Application.java index 62665a610..6bf7234d7 100644 --- a/lab-39/lab-39-demo/src/main/java/cn/iocoder/springboot/lab39/skywalkingdemo/Application.java +++ b/lab-39/lab-39-demo/src/main/java/cn/iocoder/springboot/lab39/skywalkingdemo/Application.java @@ -3,10 +3,47 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import java.io.IOException; +import java.net.URISyntaxException; + @SpringBootApplication public class Application { - public static void main(String[] args) { + public static void main(String[] args) throws URISyntaxException, IOException { +// ProtectionDomain protectionDomain = Launcher.class.getProtectionDomain(); +// CodeSource codeSource = protectionDomain.getCodeSource(); +// URI location = (codeSource != null) ? codeSource.getLocation().toURI() : null; +// String path = (location != null) ? location.getSchemeSpecificPart() : null; +// if (path == null) { +// throw new IllegalStateException("Unable to determine code source archive"); +// } +// File root = new File(path); +// System.out.println(root + "" + root.isDirectory()); +// // 创建 Archive 对象 +// Archive archive = new JarFileArchive(root); +// // 创建 EntryFilter 对象 +// Archive.EntryFilter filter = new Archive.EntryFilter() { +// +// static final String BOOT_INF_CLASSES = "BOOT-INF/classes/"; +// +// static final String BOOT_INF_LIB = "BOOT-INF/lib/"; +// +// @Override +// public boolean matches(Archive.Entry entry) { +// // 如果是目录的情况，只要 BOOT-INF/classes/ 目录 +// if (entry.isDirectory()) { +// return entry.getName().equals(BOOT_INF_CLASSES); +// } +// // 如果是文件的情况，只要 BOOT-INF/lib/ 目录下的 `jar` 包 +// return entry.getName().startsWith(BOOT_INF_LIB); +// } +// +// }; +// // 执行读取 +// for (Archive item : archive.getNestedArchives(filter)) { +// System.out.println(item.getUrl()); +// } + SpringApplication.run(Application.class, args); } diff --git a/pom.xml b/pom.xml index f94b8e36b..71acae865 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ - + lab-22 From 9311ff22470997390192da7ecf5d7fa90be1fbff Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 6 Jun 2020 11:41:21 +0800 Subject: [PATCH 002/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CAT=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-61/lab-61-demo/pom.xml | 61 +++++++++++++++++++ .../springboot/lab61/catdemo/Application.java | 13 ++++ .../catdemo/controller/DemoController.java | 31 ++++++++++ .../main/resources/META-INF/app.properties | 1 + lab-61/pom.xml | 18 ++++++ pom.xml | 3 +- 6 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 lab-61/lab-61-demo/pom.xml create mode 100644 lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java create mode 100644 lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java create mode 100644 lab-61/lab-61-demo/src/main/resources/META-INF/app.properties create mode 100644 lab-61/pom.xml diff --git a/lab-61/lab-61-demo/pom.xml b/lab-61/lab-61-demo/pom.xml new file mode 100644 index 000000000..a578a18a7 --- /dev/null +++ b/lab-61/lab-61-demo/pom.xml @@ -0,0 +1,61 @@ + + + + lab-61 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61-demo + + + 1.8 + 1.8 + 2.2.4.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.dianping.cat + cat-client + 3.0.0 + + + + + + + central + Maven2 Central Repository + default + http://repo1.maven.org/maven2 + + + unidal.releases + http://unidal.org/nexus/content/repositories/releases/ + + + + diff --git a/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java new file mode 100644 index 000000000..839d868c1 --- /dev/null +++ b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab61.catdemo; + +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-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java new file mode 100644 index 000000000..df5ec2ea5 --- /dev/null +++ b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java @@ -0,0 +1,31 @@ +package cn.iocoder.springboot.lab61.catdemo.controller; + +import com.dianping.cat.Cat; +import com.dianping.cat.message.Transaction; +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("/transaction") + public String echo() { + Transaction t = Cat.newTransaction("URL", "pageName"); + try { + +// yourBusiness(); + + t.setStatus(Transaction.SUCCESS); + } catch (Exception e) { + t.setStatus(e); + } finally { + t.complete(); + } + return "success"; + } + + + +} diff --git a/lab-61/lab-61-demo/src/main/resources/META-INF/app.properties b/lab-61/lab-61-demo/src/main/resources/META-INF/app.properties new file mode 100644 index 000000000..f266ce248 --- /dev/null +++ b/lab-61/lab-61-demo/src/main/resources/META-INF/app.properties @@ -0,0 +1 @@ +app.name=demo-application diff --git a/lab-61/pom.xml b/lab-61/pom.xml new file mode 100644 index 000000000..1e98e1ff4 --- /dev/null +++ b/lab-61/pom.xml @@ -0,0 +1,18 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61 + pom + + lab-61-demo + + + diff --git a/pom.xml b/pom.xml index 71acae865..eb08f406d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ - lab-22 + @@ -98,6 +98,7 @@ + lab-61 From 404f28ddfe39e20578ef716c5f89514adfff955e Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 7 Jun 2020 11:07:50 +0800 Subject: [PATCH 003/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CAT=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catdemo/controller/DemoController.java | 67 ++++++++++++++++++- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java index df5ec2ea5..0d008f103 100644 --- a/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java +++ b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab61.catdemo.controller; import com.dianping.cat.Cat; +import com.dianping.cat.message.Event; import com.dianping.cat.message.Transaction; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -10,22 +11,82 @@ @RequestMapping("/demo") public class DemoController { + /** + * 监控模型 Transaction 的示例 + */ @GetMapping("/transaction") - public String echo() { + public String transaction() { + // 创建 Transaction 对象 Transaction t = Cat.newTransaction("URL", "pageName"); try { + // ... yourBusiness(); 业务逻辑 -// yourBusiness(); - + // 设置 Transaction 的状态为成功 t.setStatus(Transaction.SUCCESS); } catch (Exception e) { + // 设置 Transaction 的状态为异常 t.setStatus(e); } finally { + // 标记 Transaction 结束 t.complete(); } return "success"; } + /** + * 监控模型 Event 的示例 01 + */ + @GetMapping("/event-01") + public String event01() { + // Cat.logEvent("URL.Server", "127.0.0.1"); + Cat.logEvent("URL.Server2", "127.0.0.1", Event.SUCCESS, "data"); + return "success"; + } + + /** + * 监控模型 Event 的示例 02 + */ + @GetMapping("/event-02") + public String event02() { + try { + int result = 1 / 0; + } catch (Throwable e) { + Cat.logError(e); + // Cat.logError("custom-message", e); + } + return "success"; + } + + /** + * 监控模型 Event 的示例 03 + */ + @GetMapping("/event-03") + public String event03() { + try { + int result = 1 / 0; + } catch (Throwable e) { + Cat.logErrorWithCategory("custom-category", e); + // Cat.logErrorWithCategory("custom-category", "custom-message", e); + } + return "success"; + } + /** + * 监控模型 Metric 示例 01 + */ + @GetMapping("/metric-01") + public String metric01() { + Cat.logMetricForCount("visit.count", 1); + return "success"; + } + + /** + * 监控模型 Metric 示例 02 + */ + @GetMapping("/metric-02") + public String metric02() { + Cat.logMetricForDuration("visit.duration", 10L); + return "success"; + } } From f092cfc17729d46dcd56737f29b7a6e83b222d22 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 8 Jun 2020 07:20:07 +0800 Subject: [PATCH 004/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CAT=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catdemo/controller/DemoController.java | 4 +- lab-61/lab-61-logback/pom.xml | 61 +++++++++++++++++++ .../springboot/lab61/catdemo/Application.java | 13 ++++ .../catdemo/controller/LoggerController.java | 25 ++++++++ .../main/resources/META-INF/app.properties | 1 + .../src/main/resources/logback-spring.xml | 21 +++++++ lab-61/pom.xml | 1 + 7 files changed, 124 insertions(+), 2 deletions(-) create mode 100644 lab-61/lab-61-logback/pom.xml create mode 100644 lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java create mode 100644 lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/LoggerController.java create mode 100644 lab-61/lab-61-logback/src/main/resources/META-INF/app.properties create mode 100644 lab-61/lab-61-logback/src/main/resources/logback-spring.xml diff --git a/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java index 0d008f103..65fb7ff55 100644 --- a/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java +++ b/lab-61/lab-61-demo/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java @@ -17,7 +17,7 @@ public class DemoController { @GetMapping("/transaction") public String transaction() { // 创建 Transaction 对象 - Transaction t = Cat.newTransaction("URL", "pageName"); + Transaction t = Cat.newTransaction("URL", "/demo/transaction"); try { // ... yourBusiness(); 业务逻辑 @@ -39,7 +39,7 @@ public String transaction() { @GetMapping("/event-01") public String event01() { // Cat.logEvent("URL.Server", "127.0.0.1"); - Cat.logEvent("URL.Server2", "127.0.0.1", Event.SUCCESS, "data"); + Cat.logEvent("URL.Server", "127.0.0.1", Event.SUCCESS, "data"); return "success"; } diff --git a/lab-61/lab-61-logback/pom.xml b/lab-61/lab-61-logback/pom.xml new file mode 100644 index 000000000..6995312d0 --- /dev/null +++ b/lab-61/lab-61-logback/pom.xml @@ -0,0 +1,61 @@ + + + + lab-61 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61-logback + + + 1.8 + 1.8 + 2.2.4.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.dianping.cat + cat-client + 3.0.0 + + + + + + + central + Maven2 Central Repository + default + http://repo1.maven.org/maven2 + + + unidal.releases + http://unidal.org/nexus/content/repositories/releases/ + + + + diff --git a/lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java b/lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java new file mode 100644 index 000000000..839d868c1 --- /dev/null +++ b/lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab61.catdemo; + +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-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/LoggerController.java b/lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/LoggerController.java new file mode 100644 index 000000000..338e9bcfd --- /dev/null +++ b/lab-61/lab-61-logback/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/LoggerController.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab61.catdemo.controller; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/logger") +public class LoggerController { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @GetMapping("/error") + public String error() { + try { + int result = 1 / 0; + } catch (Throwable e) { + logger.error("计算异常", e); + } + return "success"; + } + +} diff --git a/lab-61/lab-61-logback/src/main/resources/META-INF/app.properties b/lab-61/lab-61-logback/src/main/resources/META-INF/app.properties new file mode 100644 index 000000000..f266ce248 --- /dev/null +++ b/lab-61/lab-61-logback/src/main/resources/META-INF/app.properties @@ -0,0 +1 @@ +app.name=demo-application diff --git a/lab-61/lab-61-logback/src/main/resources/logback-spring.xml b/lab-61/lab-61-logback/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..d79d252f2 --- /dev/null +++ b/lab-61/lab-61-logback/src/main/resources/logback-spring.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-61/pom.xml b/lab-61/pom.xml index 1e98e1ff4..f94a1d3c4 100644 --- a/lab-61/pom.xml +++ b/lab-61/pom.xml @@ -13,6 +13,7 @@ pom lab-61-demo + lab-61-logback From 4edadf1f0ccf068416707c5fc34162b68c81586b Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 8 Jun 2020 07:55:52 +0800 Subject: [PATCH 005/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CAT=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-61/lab-61-springmvc/pom.xml | 61 +++++++++++++++++++ .../springboot/lab61/catdemo/Application.java | 13 ++++ .../catdemo/config/CatFilterConfigure.java | 24 ++++++++ .../catdemo/controller/DemoController.java | 16 +++++ .../main/resources/META-INF/app.properties | 1 + lab-61/pom.xml | 1 + 6 files changed, 116 insertions(+) create mode 100644 lab-61/lab-61-springmvc/pom.xml create mode 100644 lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java create mode 100644 lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/config/CatFilterConfigure.java create mode 100644 lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java create mode 100644 lab-61/lab-61-springmvc/src/main/resources/META-INF/app.properties diff --git a/lab-61/lab-61-springmvc/pom.xml b/lab-61/lab-61-springmvc/pom.xml new file mode 100644 index 000000000..14243dc13 --- /dev/null +++ b/lab-61/lab-61-springmvc/pom.xml @@ -0,0 +1,61 @@ + + + + lab-61 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61-springmvc + + + 1.8 + 1.8 + 2.2.4.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.dianping.cat + cat-client + 3.0.0 + + + + + + + central + Maven2 Central Repository + default + http://repo1.maven.org/maven2 + + + unidal.releases + http://unidal.org/nexus/content/repositories/releases/ + + + + diff --git a/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java new file mode 100644 index 000000000..839d868c1 --- /dev/null +++ b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/Application.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab61.catdemo; + +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-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/config/CatFilterConfigure.java b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/config/CatFilterConfigure.java new file mode 100644 index 000000000..8326e0117 --- /dev/null +++ b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/config/CatFilterConfigure.java @@ -0,0 +1,24 @@ +package cn.iocoder.springboot.lab61.catdemo.config; + +import com.dianping.cat.servlet.CatFilter; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class CatFilterConfigure { + + @Bean + public FilterRegistrationBean catFilter() { + // 创建 CatFilter 对象 + CatFilter filter = new CatFilter(); + // 创建 FilterRegistrationBean 对象 + FilterRegistrationBean registration = new FilterRegistrationBean<>(); + registration.setFilter(filter); + registration.addUrlPatterns("/*"); // 匹配所有 URL + registration.setName("cat-filter"); + registration.setOrder(1); + return registration; + } + +} diff --git a/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java new file mode 100644 index 000000000..3e231ad5d --- /dev/null +++ b/lab-61/lab-61-springmvc/src/main/java/cn/iocoder/springboot/lab61/catdemo/controller/DemoController.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab61.catdemo.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("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-61/lab-61-springmvc/src/main/resources/META-INF/app.properties b/lab-61/lab-61-springmvc/src/main/resources/META-INF/app.properties new file mode 100644 index 000000000..f266ce248 --- /dev/null +++ b/lab-61/lab-61-springmvc/src/main/resources/META-INF/app.properties @@ -0,0 +1 @@ +app.name=demo-application diff --git a/lab-61/pom.xml b/lab-61/pom.xml index f94a1d3c4..7965633f9 100644 --- a/lab-61/pom.xml +++ b/lab-61/pom.xml @@ -14,6 +14,7 @@ lab-61-demo lab-61-logback + lab-61-springmvc From f1cccfa1c2c689c33347d00395cab4a069509c2b Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 8 Jun 2020 19:27:27 +0800 Subject: [PATCH 006/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20CAT=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++++++++++- ...7\260 CAT \345\205\245\351\227\250\343\200\213.md" | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 "lab-61/\343\200\212\350\212\213\351\201\223 Spring Boot \347\233\221\346\216\247\345\271\263\345\217\260 CAT \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 3d67fe1eb..3b9ce8fe6 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ * [《芋道 Spring Boot 监控端点 Actuator 入门》](http://www.iocoder.cn/Spring-Boot/Actuator/?github) 对应 [lab-34](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-34) * [《芋道 Spring Boot 监控工具 Admin 入门》](http://www.iocoder.cn/Spring-Boot/Admin/?github) 对应 [lab-35](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-35) * [《芋道 Spring Boot 监控平台 Prometheus + Grafana 入门》](http://www.iocoder.cn/Spring-Boot/Prometheus-and-Grafana/?github) 对应 [lab-36](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-36) -* 《芋道 Spring Boot 监控平台 CAT 入门》计划中... +* [《芋道 Spring Boot 监控平台 CAT 入门》](http://www.iocoder.cn/Spring-Boot/CAT/?github) 对应 [lab-61](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-61) ## 日志管理 @@ -292,6 +292,15 @@ * [《芋道 Spring Boot 链路追踪 Zipkin》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Sleuth/?github) 的[「13. Dubbo 示例」](#)小节 * [《芋道 Spring Cloud 链路追踪 Spring Cloud Sleuth》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Sleuth/?github) 的[「7. Dubbo 示例」](#)小节 +## 监控管理 + +**[CAT](http://www.iocoder.cn/CAT/install/?github)** +* [《芋道 Spring Boot 监控平台 CAT 入门》](http://www.iocoder.cn/Spring-Boot/CAT/?github) 的[「13. Dubbo 集成」](#)小节 + +TODO Dubbo-Admin + +**** + # 消息队列 MQ 专栏 ## RocketMQ diff --git "a/lab-61/\343\200\212\350\212\213\351\201\223 Spring Boot \347\233\221\346\216\247\345\271\263\345\217\260 CAT \345\205\245\351\227\250\343\200\213.md" "b/lab-61/\343\200\212\350\212\213\351\201\223 Spring Boot \347\233\221\346\216\247\345\271\263\345\217\260 CAT \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..8198d9a8a --- /dev/null +++ "b/lab-61/\343\200\212\350\212\213\351\201\223 Spring Boot \347\233\221\346\216\247\345\271\263\345\217\260 CAT \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From ebf6be8b63cb0c30da535b6a7c5f7e4273e3f625 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 8 Jun 2020 19:28:37 +0800 Subject: [PATCH 007/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 72 +++++++++++++++++++ .../consumer/DemoConsumerApplication.java | 69 ++++++++++++++++++ .../src/main/resources/application.yaml | 12 ++++ .../pom.xml | 66 +++++++++++++++++ .../provider/DemoProviderApplication.java | 27 +++++++ .../src/main/resources/application.yaml | 12 ++++ labx-25/pom.xml | 20 ++++++ pom.xml | 3 +- 8 files changed, 280 insertions(+), 1 deletion(-) create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/consumer/DemoConsumerApplication.java create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/resources/application.yaml create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/provider/DemoProviderApplication.java create mode 100644 labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/resources/application.yaml create mode 100644 labx-25/pom.xml diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml new file mode 100644 index 000000000..a1854f3b4 --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml @@ -0,0 +1,72 @@ + + + + labx-25 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-25-sc-zookeeper-discovery-demo01-consumer + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-commons + + + + + org.springframework.cloud + spring-cloud-starter-netflix-ribbon + + + + + org.apache.curator + curator-x-discovery + + + org.springframework.cloud + spring-cloud-zookeeper-discovery + + + + diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/consumer/DemoConsumerApplication.java b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/consumer/DemoConsumerApplication.java new file mode 100644 index 000000000..e4969562b --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/consumer/DemoConsumerApplication.java @@ -0,0 +1,69 @@ +package cn.iocoder.springcloud.labx25.zookeeperdemo.consumer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import java.util.List; + +@SpringBootApplication +// @EnableDiscoveryClient +public class DemoConsumerApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoConsumerApplication.class, args); + } + + @Configuration + public class RestTemplateConfiguration { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + } + + @RestController + static class TestController { + + @Autowired + private DiscoveryClient discoveryClient; + @Autowired + private RestTemplate restTemplate; + @Autowired + private LoadBalancerClient loadBalancerClient; + + @GetMapping("/hello") + public String hello(String name) { + // 获得服务 `demo-provider` 的一个实例 + ServiceInstance instance; + if (true) { + // 获取服务 `demo-provider` 对应的实例列表 + List instances = discoveryClient.getInstances("demo-provider"); + // 选择第一个 + instance = instances.size() > 0 ? instances.get(0) : null; + } else { + instance = loadBalancerClient.choose("demo-provider"); + } + // 发起调用 + if (instance == null) { + throw new IllegalStateException("获取不到实例"); + } + String targetUrl = instance.getUri() + "/echo?name=" + name; + String response = restTemplate.getForObject(targetUrl, String.class); + // 返回结果 + return "consumer:" + response; + } + + } + +} diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/resources/application.yaml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..34c38ba57 --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +spring: + application: + name: demo-consumer # Spring 应用名 + cloud: + zookeeper: + connect-string: 127.0.0.1:2181 + # Zookeeper 作为注册中心的配置项，对应 ZookeeperDiscoveryProperties 配置类 + discovery: + root: /services # Zookeeper 数据存储的根节点，默认为 /services + +server: + port: 28080 # 服务器端口。默认为 8080 diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml new file mode 100644 index 000000000..fdffce80b --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml @@ -0,0 +1,66 @@ + + + + labx-25 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-25-sc-zookeeper-discovery-demo01-provider + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-commons + + + + + org.apache.curator + curator-x-discovery + + + org.springframework.cloud + spring-cloud-zookeeper-discovery + + + + diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/provider/DemoProviderApplication.java b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/provider/DemoProviderApplication.java new file mode 100644 index 000000000..361dd1a62 --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx25/zookeeperdemo/provider/DemoProviderApplication.java @@ -0,0 +1,27 @@ +package cn.iocoder.springcloud.labx25.zookeeperdemo.provider; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +@EnableDiscoveryClient +public class DemoProviderApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoProviderApplication.class, args); + } + + @RestController + static class TestController { + + @GetMapping("/echo") + public String echo(String name) { + return "provider:" + name; + } + + } + +} diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/resources/application.yaml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/resources/application.yaml new file mode 100644 index 000000000..d90b3159e --- /dev/null +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +spring: + application: + name: demo-provider # Spring 应用名 + cloud: + zookeeper: + connect-string: 127.0.0.1:2181 + # Zookeeper 作为注册中心的配置项，对应 ZookeeperDiscoveryProperties 配置类 + discovery: + root: /services # Zookeeper 数据存储的根节点，默认为 /services + +server: + port: 18080 # 服务器端口。默认为 8080 diff --git a/labx-25/pom.xml b/labx-25/pom.xml new file mode 100644 index 000000000..85ec7fbfb --- /dev/null +++ b/labx-25/pom.xml @@ -0,0 +1,20 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-25 + pom + + + labx-25-sc-zookeeper-discovery-demo01-provider + labx-25-sc-zookeeper-discovery-demo01-consumer + + + diff --git a/pom.xml b/pom.xml index eb08f406d..85baff081 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,7 @@ + @@ -98,7 +99,7 @@ - lab-61 + labx-25 From 0569509a7cabfcb551f55dbeda4e0cb09bfd20be Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 8 Jun 2020 21:11:25 +0800 Subject: [PATCH 008/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 18 +----------------- .../pom.xml | 12 +----------- ...er \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 3 +-- 4 files changed, 4 insertions(+), 30 deletions(-) create mode 100644 "labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml index a1854f3b4..21507d988 100644 --- a/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-consumer/pom.xml @@ -46,26 +46,10 @@ spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-commons - - - - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - - - - org.apache.curator - curator-x-discovery - org.springframework.cloud - spring-cloud-zookeeper-discovery + spring-cloud-starter-zookeeper-discovery diff --git a/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml index fdffce80b..ba3f79d14 100644 --- a/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml +++ b/labx-25/labx-25-sc-zookeeper-discovery-demo01-provider/pom.xml @@ -46,20 +46,10 @@ spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-commons - - - - org.apache.curator - curator-x-discovery - org.springframework.cloud - spring-cloud-zookeeper-discovery + spring-cloud-starter-zookeeper-discovery diff --git "a/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" "b/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..4f618702c --- /dev/null +++ "b/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index 85baff081..ff0293ff1 100644 --- a/pom.xml +++ b/pom.xml @@ -98,8 +98,7 @@ - - labx-25 + From 7a314df5770c6dfa295db196ccb80ee2b8420b8a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 9 Jun 2020 07:28:36 +0800 Subject: [PATCH 009/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labx-26-sc-zookeeper-config-demo/pom.xml | 56 +++++++++++++++++++ .../labx26/zookeeperdemo/DemoApplication.java | 13 +++++ .../zookeeperdemo/config/OrderProperties.java | 52 +++++++++++++++++ .../controller/DemoController.java | 44 +++++++++++++++ .../src/main/resources/bootstrap.yaml | 14 +++++ labx-26/pom.xml | 18 ++++++ pom.xml | 1 + 7 files changed, 198 insertions(+) create mode 100644 labx-26/labx-26-sc-zookeeper-config-demo/pom.xml create mode 100644 labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml create mode 100644 labx-26/pom.xml diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/pom.xml b/labx-26/labx-26-sc-zookeeper-config-demo/pom.xml new file mode 100644 index 000000000..923d19740 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-demo/pom.xml @@ -0,0 +1,56 @@ + + + + labx-26 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-26-sc-zookeeper-config-demo + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-zookeeper-config + + + + diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java new file mode 100644 index 000000000..c5953230e --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class); + } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java new file mode 100644 index 000000000..10a303b71 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java @@ -0,0 +1,52 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "order") +public class OrderProperties { + + /** + * 订单支付超时时长，单位：秒。 + */ + private Integer payTimeoutSeconds; + + /** + * 订单创建频率，单位：秒 + */ + private Integer createFrequencySeconds; + +// /** +// * 配置描述 +// */ +// private String desc; + + public Integer getPayTimeoutSeconds() { + return payTimeoutSeconds; + } + + public OrderProperties setPayTimeoutSeconds(Integer payTimeoutSeconds) { + this.payTimeoutSeconds = payTimeoutSeconds; + return this; + } + + public Integer getCreateFrequencySeconds() { + return createFrequencySeconds; + } + + public OrderProperties setCreateFrequencySeconds(Integer createFrequencySeconds) { + this.createFrequencySeconds = createFrequencySeconds; + return this; + } + +// public String getDesc() { +// return desc; +// } +// +// public OrderProperties setDesc(String desc) { +// this.desc = desc; +// return this; +// } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java new file mode 100644 index 000000000..e45a04427 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo.controller; + +import cn.iocoder.springcloud.labx26.zookeeperdemo.config.OrderProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private OrderProperties orderProperties; + + /** + * 测试 @ConfigurationProperties 注解的配置属性类 + */ + @GetMapping("/test01") + public OrderProperties test01() { + return orderProperties; + } + + @Value(value = "${order.pay-timeout-seconds}") // @NacosValue(value = "${order.pay-timeout-seconds}") + private Integer payTimeoutSeconds; + @Value(value = "${order.create-frequency-seconds}") // @NacosValue(value = "${order.create-frequency-seconds}") + private Integer createFrequencySeconds; + + /** + * 测试 @Value 注解的属性 + */ + @GetMapping("/test02") + public Map test02() { + Map results = new HashMap(); + results.put("payTimeoutSeconds", payTimeoutSeconds); + results.put("createFrequencySeconds", createFrequencySeconds); + return results; + } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml new file mode 100644 index 000000000..0ffeadd0b --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml @@ -0,0 +1,14 @@ +spring: + application: + name: demo-application + + cloud: + zookeeper: + connect-string: 127.0.0.1:2181 + # Zookeeper 作为配置中心的配置项，对应 ZookeeperConfigProperties 配置类 + config: + root: /config # Zookeeper 数据存储的根节点，默认为 /config + default-context: application # 默认读取 Zookeeper 配置的目录，默认为 application + profile-separator: \, # 多环境目录分隔符，默认为 , + watcher: + enabled: true # 是否开启 Watch 功能，监听 Zookeeper 数据的变化。默认为 true，实现实时监听配置的更新 diff --git a/labx-26/pom.xml b/labx-26/pom.xml new file mode 100644 index 000000000..2f3c32d64 --- /dev/null +++ b/labx-26/pom.xml @@ -0,0 +1,18 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-26 + + + labx-26-sc-zookeeper-config-demo + + + diff --git a/pom.xml b/pom.xml index ff0293ff1..cf309d007 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,7 @@ + labx-26 From 42ddf15aef78910f8ea4a5b46abde9ee7d21f22e Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 9 Jun 2020 08:09:32 +0800 Subject: [PATCH 010/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...5\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" | 2 +- .../src/main/resources/bootstrap.yaml | 2 +- ...5\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 "labx-26/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" diff --git "a/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" "b/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" index 4f618702c..92494b564 100644 --- "a/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" +++ "b/labx-25/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" @@ -1 +1 @@ - + diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml index 0ffeadd0b..bd59d7510 100644 --- a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml @@ -8,7 +8,7 @@ spring: # Zookeeper 作为配置中心的配置项，对应 ZookeeperConfigProperties 配置类 config: root: /config # Zookeeper 数据存储的根节点，默认为 /config - default-context: application # 默认读取 Zookeeper 配置的目录，默认为 application + default-context: application # 读取 Zookeeper 配置的默认目录，默认为 application profile-separator: \, # 多环境目录分隔符，默认为 , watcher: enabled: true # 是否开启 Watch 功能，监听 Zookeeper 数据的变化。默认为 true，实现实时监听配置的更新 diff --git "a/labx-26/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" "b/labx-26/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..52183b17a --- /dev/null +++ "b/labx-26/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 ZooKeeper \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From 13aa1df2c872bcbc1b9b38432a81110a730ca108 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 9 Jun 2020 09:01:57 +0800 Subject: [PATCH 011/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=BF=83=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 56 +++++++++++++++++++ .../labx26/zookeeperdemo/DemoApplication.java | 13 +++++ .../zookeeperdemo/config/OrderProperties.java | 52 +++++++++++++++++ .../controller/DemoController.java | 44 +++++++++++++++ .../src/main/resources/bootstrap.yaml | 14 +++++ .../src/main/resources/bootstrap.yaml | 2 +- labx-26/pom.xml | 1 + 7 files changed, 181 insertions(+), 1 deletion(-) create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/resources/bootstrap.yaml diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml new file mode 100644 index 000000000..46e21c5ec --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml @@ -0,0 +1,56 @@ + + + + labx-26 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-26-sc-zookeeper-config-auto-refresh + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-zookeeper-config + + + + diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java new file mode 100644 index 000000000..c5953230e --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/DemoApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class); + } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java new file mode 100644 index 000000000..10a303b71 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/config/OrderProperties.java @@ -0,0 +1,52 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "order") +public class OrderProperties { + + /** + * 订单支付超时时长，单位：秒。 + */ + private Integer payTimeoutSeconds; + + /** + * 订单创建频率，单位：秒 + */ + private Integer createFrequencySeconds; + +// /** +// * 配置描述 +// */ +// private String desc; + + public Integer getPayTimeoutSeconds() { + return payTimeoutSeconds; + } + + public OrderProperties setPayTimeoutSeconds(Integer payTimeoutSeconds) { + this.payTimeoutSeconds = payTimeoutSeconds; + return this; + } + + public Integer getCreateFrequencySeconds() { + return createFrequencySeconds; + } + + public OrderProperties setCreateFrequencySeconds(Integer createFrequencySeconds) { + this.createFrequencySeconds = createFrequencySeconds; + return this; + } + +// public String getDesc() { +// return desc; +// } +// +// public OrderProperties setDesc(String desc) { +// this.desc = desc; +// return this; +// } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java new file mode 100644 index 000000000..e45a04427 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo.controller; + +import cn.iocoder.springcloud.labx26.zookeeperdemo.config.OrderProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private OrderProperties orderProperties; + + /** + * 测试 @ConfigurationProperties 注解的配置属性类 + */ + @GetMapping("/test01") + public OrderProperties test01() { + return orderProperties; + } + + @Value(value = "${order.pay-timeout-seconds}") // @NacosValue(value = "${order.pay-timeout-seconds}") + private Integer payTimeoutSeconds; + @Value(value = "${order.create-frequency-seconds}") // @NacosValue(value = "${order.create-frequency-seconds}") + private Integer createFrequencySeconds; + + /** + * 测试 @Value 注解的属性 + */ + @GetMapping("/test02") + public Map test02() { + Map results = new HashMap(); + results.put("payTimeoutSeconds", payTimeoutSeconds); + results.put("createFrequencySeconds", createFrequencySeconds); + return results; + } + +} diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/resources/bootstrap.yaml b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/resources/bootstrap.yaml new file mode 100644 index 000000000..20b372380 --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/resources/bootstrap.yaml @@ -0,0 +1,14 @@ +spring: + application: + name: demo-application + + cloud: + zookeeper: + connect-string: 127.0.0.1:2181 + # Zookeeper 作为配置中心的配置项，对应 ZookeeperConfigProperties 配置类 + config: + root: /config # Zookeeper 数据存储的根节点，默认为 /config + default-context: application # 读取 Zookeeper 配置的默认目录，默认为 application + profile-separator: ',' # 多环境目录分隔符，默认为 , + watcher: + enabled: true # 是否开启 Watch 功能，监听 Zookeeper 数据的变化。默认为 true，实现实时监听配置的更新 diff --git a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml index bd59d7510..20b372380 100644 --- a/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml +++ b/labx-26/labx-26-sc-zookeeper-config-demo/src/main/resources/bootstrap.yaml @@ -9,6 +9,6 @@ spring: config: root: /config # Zookeeper 数据存储的根节点，默认为 /config default-context: application # 读取 Zookeeper 配置的默认目录，默认为 application - profile-separator: \, # 多环境目录分隔符，默认为 , + profile-separator: ',' # 多环境目录分隔符，默认为 , watcher: enabled: true # 是否开启 Watch 功能，监听 Zookeeper 数据的变化。默认为 true，实现实时监听配置的更新 diff --git a/labx-26/pom.xml b/labx-26/pom.xml index 2f3c32d64..b5e3a44a4 100644 --- a/labx-26/pom.xml +++ b/labx-26/pom.xml @@ -13,6 +13,7 @@ labx-26-sc-zookeeper-config-demo + labx-26-sc-zookeeper-config-auto-refresh From ca36e672a0e417c225ea08959f5e2c3aa2009065 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 9 Jun 2020 21:04:41 +0800 Subject: [PATCH 012/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Spring=20Cloud=20Z?= =?UTF-8?q?ookeeper=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- lab-48/pom.xml | 1 + lab-62/pom.xml | 19 ++++++++++++++ .../pom.xml | 2 ++ .../DemoEnvironmentChangeListener.java | 26 +++++++++++++++++++ pom.xml | 3 ++- 6 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 lab-62/pom.xml create mode 100644 labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/listener/DemoEnvironmentChangeListener.java diff --git a/README.md b/README.md index 3b9ce8fe6..6a942fa1c 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,7 @@ * [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01) * [《芋道 Spring Cloud Netflix 注册中心 Eureka 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Eureka?github) 对应 [labx-22](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-22) -* 《芋道 Spring Cloud 注册中心 Zookeeper 入门》计划中... +* [《芋道 Spring Cloud 注册中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Discovery/?github) 对应 [labx-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-25) * 《芋道 Spring Cloud 注册中心 Consul 入门》计划中... * 《芋道 Spring Cloud 注册中心 Etcd 入门》计划中... @@ -203,6 +203,7 @@ * [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05) * [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09) * [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12) +* [《芋道 Spring Cloud 配置中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Config/?github) 对应 [labx-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-26) ## 消息队列 diff --git a/lab-48/pom.xml b/lab-48/pom.xml index be39149e0..d4dc38d7a 100644 --- a/lab-48/pom.xml +++ b/lab-48/pom.xml @@ -11,6 +11,7 @@ lab-48 pom + lab-48-demo diff --git a/lab-62/pom.xml b/lab-62/pom.xml new file mode 100644 index 000000000..3353b5b23 --- /dev/null +++ b/lab-62/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-62 + pom + + + lab-62-sofarpc-xml-demo + + + diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml index 46e21c5ec..1724021c0 100644 --- a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/pom.xml @@ -12,6 +12,8 @@ labx-26-sc-zookeeper-config-auto-refresh + 1.8 + 1.8 2.2.4.RELEASE Hoxton.SR1 diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/listener/DemoEnvironmentChangeListener.java b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/listener/DemoEnvironmentChangeListener.java new file mode 100644 index 000000000..d49bb69ad --- /dev/null +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/listener/DemoEnvironmentChangeListener.java @@ -0,0 +1,26 @@ +package cn.iocoder.springcloud.labx26.zookeeperdemo.listener; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.context.environment.EnvironmentChangeEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.stereotype.Component; + +@Component +public class DemoEnvironmentChangeListener implements ApplicationListener { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ConfigurableEnvironment environment; + + @Override + public void onApplicationEvent(EnvironmentChangeEvent event) { + for (String key : event.getKeys()) { + logger.info("[onApplicationEvent][key({}) 最新 value 为 {}]", key, environment.getProperty(key)); + } + } + +} diff --git a/pom.xml b/pom.xml index cf309d007..cd8d9a06f 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,8 @@ - labx-26 + + lab-62 From 2a2720e6febc75ef031b3e26d3dcad7be0b87df8 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 9 Jun 2020 21:05:28 +0800 Subject: [PATCH 013/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SOFARPC=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 14 +++++ .../lab62/rpc/api/UserRpcService.java | 27 +++++++++ .../springboot/lab62/rpc/dto/UserAddDTO.java | 37 ++++++++++++ .../springboot/lab62/rpc/dto/UserDTO.java | 49 ++++++++++++++++ .../pom.xml | 45 +++++++++++++++ .../lab62/rpc/ConsumerApplication.java | 16 ++++++ .../lab62/rpc/controller/UserController.java | 23 ++++++++ .../src/main/resources/application.yaml | 5 ++ .../src/main/resources/sofarpc.xml | 16 ++++++ .../pom.xml | 56 +++++++++++++++++++ .../lab62/rpc/ProviderApplication.java | 16 ++++++ .../lab62/rpc/service/UserRpcServiceImpl.java | 24 ++++++++ .../src/main/resources/application.yaml | 5 ++ .../src/main/resources/sofarpc.xml | 16 ++++++ lab-62/lab-62-sofarpc-xml-demo/pom.xml | 20 +++++++ 15 files changed, 369 insertions(+) create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/pom.xml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml create mode 100644 lab-62/lab-62-sofarpc-xml-demo/pom.xml diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/pom.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/pom.xml new file mode 100644 index 000000000..86274d12b --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/pom.xml @@ -0,0 +1,14 @@ + + + + lab-62-sofarpc-xml-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-62-sofarpc-xml-demo-user-rpc-service-api + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java new file mode 100644 index 000000000..b79c3f12c --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab62.rpc.api; + +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; + +/** + * 用户服务 RPC Service 接口 + */ +public interface UserRpcService { + + /** + * 根据指定用户编号，获得用户信息 + * + * @param id 用户编号 + * @return 用户信息 + */ + UserDTO get(Integer id); + + /** + * 添加新用户，返回新添加的用户编号 + * + * @param addDTO 添加的用户信息 + * @return 用户编号 + */ + Integer add(UserAddDTO addDTO); + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java new file mode 100644 index 000000000..f0840f1c5 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab62.rpc.dto; + +import java.io.Serializable; + +/** + * 用户添加 DTO + */ +public class UserAddDTO implements Serializable { + + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public String getName() { + return name; + } + + public UserAddDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserAddDTO setGender(Integer gender) { + this.gender = gender; + return this; + } + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java new file mode 100644 index 000000000..d9b700749 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab62.rpc.dto; + +import java.io.Serializable; + +/** + * 用户信息 DTO + */ +public class UserDTO implements Serializable { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public Integer getId() { + return id; + } + + public UserDTO setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public UserDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserDTO setGender(Integer gender) { + this.gender = gender; + return this; + } +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml new file mode 100644 index 000000000..d50fd9998 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml @@ -0,0 +1,45 @@ + + + + + + + com.alipay.sofa + sofaboot-dependencies + 3.3.2 + + 4.0.0 + + lab-62-sofarpc-xml-demo-user-rpc-service-consumer + + + + + cn.iocoder.springboot.labs + lab-62-sofarpc-xml-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.alipay.sofa + rpc-sofa-boot-starter + + + + + org.apache.curator + curator-framework + + + + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java new file mode 100644 index 000000000..63b8f478b --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab62.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:sofarpc.xml") +public class ConsumerApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ConsumerApplication.class, args);; + } + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java new file mode 100644 index 000000000..93cc320ce --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java @@ -0,0 +1,23 @@ +package cn.iocoder.springboot.lab62.rpc.controller; + +import cn.iocoder.springboot.lab62.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private UserRpcService userRpcService; + + @GetMapping("/get") + public UserDTO get(@RequestParam("id") Integer id) { + return userRpcService.get(id); + } + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..f856006a7 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-consumer # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注解中心 diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml new file mode 100644 index 000000000..2437f5d53 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml new file mode 100644 index 000000000..91819670f --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml @@ -0,0 +1,56 @@ + + + + + + + com.alipay.sofa + sofaboot-dependencies + 3.3.2 + + 4.0.0 + + lab-62-sofarpc-xml-demo-user-rpc-service-provider + + + + + + + + + + + + + + + + cn.iocoder.springboot.labs + lab-62-sofarpc-xml-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + com.alipay.sofa + rpc-sofa-boot-starter + + + + + org.apache.curator + curator-framework + + + + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java new file mode 100644 index 000000000..d2aef2780 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab62.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:sofarpc.xml") +public class ProviderApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ProviderApplication.class, args); + } + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java new file mode 100644 index 000000000..d56a0b126 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java @@ -0,0 +1,24 @@ +package cn.iocoder.springboot.lab62.rpc.service; + + +import cn.iocoder.springboot.lab62.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; +import org.springframework.stereotype.Service; + +@Service +public class UserRpcServiceImpl implements UserRpcService { + + @Override + public UserDTO get(Integer id) { + return new UserDTO().setId(id) + .setName("没有昵称：" + id) + .setGender(id % 2 + 1); // 1 - 男；2 - 女 + } + + @Override + public Integer add(UserAddDTO addDTO) { + return (int) (System.currentTimeMillis() / 1000); // 嘿嘿，随便返回一个 id + } + +} diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml new file mode 100644 index 000000000..11f12a3d1 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-provider # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注解中心 diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml new file mode 100644 index 000000000..3e96aebd2 --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/pom.xml b/lab-62/lab-62-sofarpc-xml-demo/pom.xml new file mode 100644 index 000000000..744ec1c4f --- /dev/null +++ b/lab-62/lab-62-sofarpc-xml-demo/pom.xml @@ -0,0 +1,20 @@ + + + + lab-62 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-62-sofarpc-xml-demo + pom + + lab-62-sofarpc-xml-demo-user-rpc-service-api + lab-62-sofarpc-xml-demo-user-rpc-service-provider + lab-62-sofarpc-xml-demo-user-rpc-service-consumer + + + From f7fe0a245de03dde4322b3683a0cf7a78fd03859 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 10 Jun 2020 20:46:23 +0800 Subject: [PATCH 014/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SOFARPC=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 16 ++++ .../lab62/rpc/api/UserRpcService.java | 27 +++++++ .../springboot/lab62/rpc/dto/UserAddDTO.java | 37 +++++++++ .../springboot/lab62/rpc/dto/UserDTO.java | 49 ++++++++++++ .../pom.xml | 45 +++++++++++ .../lab62/rpc/ConsumerApplication.java | 15 ++++ .../lab62/rpc/controller/UserController.java | 32 ++++++++ .../src/main/resources/application.yaml | 5 ++ .../pom.xml | 56 ++++++++++++++ .../lab62/rpc/ProviderApplication.java | 15 ++++ .../lab62/rpc/service/UserRpcServiceImpl.java | 27 +++++++ .../src/main/resources/application.yaml | 5 ++ .../lab-62-sofarpc-annotations-demo/pom.xml | 21 +++++ .../lab62/rpc/controller/UserController.java | 13 +++- .../src/main/resources/application.yaml | 2 +- .../pom.xml | 4 +- .../src/main/resources/application.yaml | 2 +- .../src/main/resources/sofarpc.xml | 4 - lab-62/pom.xml | 1 + "lab-62/\343\200\212\343\200\213.md" | 0 .../pom.xml | 45 +++++++++++ .../lab62/rpc/ConsumerApplication.java | 16 ++++ .../lab62/rpc/controller/UserController.java | 28 +++++++ .../src/main/resources/application.yaml | 5 ++ .../src/main/resources/sofarpc.xml | 16 ++++ .../pom.xml | 14 ++++ .../lab63/rpc/api/UserRpcService.java | 27 +++++++ .../springboot/lab63/rpc/dto/UserAddDTO.java | 37 +++++++++ .../springboot/lab63/rpc/dto/UserDTO.java | 49 ++++++++++++ .../pom.xml | 77 +++++++++++++++++++ .../lab63/rpc/ProviderApplication.java | 16 ++++ .../lab63/rpc/service/UserRpcServiceImpl.java | 24 ++++++ .../src/main/resources/application.yaml | 5 ++ .../src/main/resources/motan.xml | 0 .../src/main/resources/sofarpc.xml | 12 +++ lab-63/lab-63-motan-xml-demo/pom.xml | 20 +++++ lab-63/pom.xml | 18 +++++ pom.xml | 4 +- 38 files changed, 776 insertions(+), 13 deletions(-) create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/pom.xml create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/pom.xml create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/resources/application.yaml create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/pom.xml create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/resources/application.yaml create mode 100644 lab-62/lab-62-sofarpc-annotations-demo/pom.xml create mode 100644 "lab-62/\343\200\212\343\200\213.md" create mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/pom.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml create mode 100644 lab-63/lab-63-motan-xml-demo/pom.xml create mode 100644 lab-63/pom.xml diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/pom.xml b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/pom.xml new file mode 100644 index 000000000..065b0b880 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/pom.xml @@ -0,0 +1,16 @@ + + + + lab-62-sofarpc-xml-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-62-sofarpc-annotations-demo-user-rpc-service-api + + + + diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java new file mode 100644 index 000000000..b79c3f12c --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/api/UserRpcService.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab62.rpc.api; + +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; + +/** + * 用户服务 RPC Service 接口 + */ +public interface UserRpcService { + + /** + * 根据指定用户编号，获得用户信息 + * + * @param id 用户编号 + * @return 用户信息 + */ + UserDTO get(Integer id); + + /** + * 添加新用户，返回新添加的用户编号 + * + * @param addDTO 添加的用户信息 + * @return 用户编号 + */ + Integer add(UserAddDTO addDTO); + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java new file mode 100644 index 000000000..f0840f1c5 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserAddDTO.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab62.rpc.dto; + +import java.io.Serializable; + +/** + * 用户添加 DTO + */ +public class UserAddDTO implements Serializable { + + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public String getName() { + return name; + } + + public UserAddDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserAddDTO setGender(Integer gender) { + this.gender = gender; + return this; + } + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java new file mode 100644 index 000000000..d9b700749 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab62/rpc/dto/UserDTO.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab62.rpc.dto; + +import java.io.Serializable; + +/** + * 用户信息 DTO + */ +public class UserDTO implements Serializable { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public Integer getId() { + return id; + } + + public UserDTO setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public UserDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserDTO setGender(Integer gender) { + this.gender = gender; + return this; + } +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/pom.xml b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/pom.xml new file mode 100644 index 000000000..1910695d1 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/pom.xml @@ -0,0 +1,45 @@ + + + + + + + com.alipay.sofa + sofaboot-dependencies + 3.3.2 + + 4.0.0 + + lab-62-sofarpc-annotations-demo-user-rpc-service-consumer + + + + + cn.iocoder.springboot.labs + lab-62-sofarpc-annotations-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.alipay.sofa + rpc-sofa-boot-starter + + + + + org.apache.curator + curator-framework + + + + + diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java new file mode 100644 index 000000000..9e13db95a --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java @@ -0,0 +1,15 @@ +package cn.iocoder.springboot.lab62.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +//@ImportResource("classpath:sofarpc.xml") +public class ConsumerApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ConsumerApplication.class, args);; + } + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java new file mode 100644 index 000000000..ed29dd207 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab62.rpc.controller; + +import cn.iocoder.springboot.lab62.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; +import com.alipay.sofa.runtime.api.annotation.SofaReference; +import com.alipay.sofa.runtime.api.annotation.SofaReferenceBinding; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/user") +public class UserController { + + @SofaReference(binding = @SofaReferenceBinding(bindingType = "bolt")) + private UserRpcService userRpcService; + + @GetMapping("/get") + public UserDTO get(@RequestParam("id") Integer id) { + return userRpcService.get(id); + } + + @GetMapping("/add") // 为了方便测试，实际使用 @PostMapping + public Integer add(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + UserAddDTO addDTO = new UserAddDTO().setName(name).setGender(gender); + return userRpcService.add(addDTO); + } + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..f5299bd67 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-consumer/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-consumer # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFARPC 注解中心 diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/pom.xml b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/pom.xml new file mode 100644 index 000000000..2ce6d8da2 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/pom.xml @@ -0,0 +1,56 @@ + + + + + + + com.alipay.sofa + sofaboot-dependencies + 3.4.0 + + 4.0.0 + + lab-62-sofarpc-annotations-demo-user-rpc-service-provider + + + + + + + + + + + + + + + + cn.iocoder.springboot.labs + lab-62-sofarpc-annotations-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + com.alipay.sofa + rpc-sofa-boot-starter + + + + + org.apache.curator + curator-framework + + + + + diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java new file mode 100644 index 000000000..89c2f0b78 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/ProviderApplication.java @@ -0,0 +1,15 @@ +package cn.iocoder.springboot.lab62.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +//@ImportResource("classpath:sofarpc.xml") +public class ProviderApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ProviderApplication.class, args); + } + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java new file mode 100644 index 000000000..35fee2637 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab62/rpc/service/UserRpcServiceImpl.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab62.rpc.service; + + +import cn.iocoder.springboot.lab62.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; +import com.alipay.sofa.runtime.api.annotation.SofaService; +import com.alipay.sofa.runtime.api.annotation.SofaServiceBinding; +import org.springframework.stereotype.Service; + +@Service +@SofaService(bindings = @SofaServiceBinding(bindingType = "bolt")) +public class UserRpcServiceImpl implements UserRpcService { + + @Override + public UserDTO get(Integer id) { + return new UserDTO().setId(id) + .setName("没有昵称：" + id) + .setGender(id % 2 + 1); // 1 - 男；2 - 女 + } + + @Override + public Integer add(UserAddDTO addDTO) { + return (int) (System.currentTimeMillis() / 1000); // 嘿嘿，随便返回一个 id + } + +} diff --git a/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/resources/application.yaml new file mode 100644 index 000000000..9e8d2d359 --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/lab-62-sofarpc-annotations-demo-user-rpc-service-provider/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-provider # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注册中心 diff --git a/lab-62/lab-62-sofarpc-annotations-demo/pom.xml b/lab-62/lab-62-sofarpc-annotations-demo/pom.xml new file mode 100644 index 000000000..00a8fb60a --- /dev/null +++ b/lab-62/lab-62-sofarpc-annotations-demo/pom.xml @@ -0,0 +1,21 @@ + + + + lab-62 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-62-sofarpc-annotations-demo + pom + + + lab-62-sofarpc-annotations-demo-user-rpc-service-api + lab-62-sofarpc-annotations-demo-user-rpc-service-provider + lab-62-sofarpc-annotations-demo-user-rpc-service-consumer + + + diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java index 93cc320ce..406f30cea 100644 --- a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java @@ -1,12 +1,10 @@ package cn.iocoder.springboot.lab62.rpc.controller; import cn.iocoder.springboot.lab62.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab62.rpc.dto.UserAddDTO; import cn.iocoder.springboot.lab62.rpc.dto.UserDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/user") @@ -20,4 +18,11 @@ public UserDTO get(@RequestParam("id") Integer id) { return userRpcService.get(id); } + @GetMapping("/add") // 为了方便测试，实际使用 @PostMapping + public Integer add(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + UserAddDTO addDTO = new UserAddDTO().setName(name).setGender(gender); + return userRpcService.add(addDTO); + } + } diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml index f856006a7..f5299bd67 100644 --- a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml @@ -2,4 +2,4 @@ spring: application: name: user-service-consumer # 应用名 -com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注解中心 +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFARPC 注解中心 diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml index 91819670f..933e11486 100644 --- a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/pom.xml @@ -8,7 +8,7 @@ com.alipay.sofa sofaboot-dependencies - 3.3.2 + 3.4.0 4.0.0 @@ -33,7 +33,7 @@ 1.0-SNAPSHOT - + org.springframework.boot spring-boot-starter diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml index 11f12a3d1..9e8d2d359 100644 --- a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml @@ -2,4 +2,4 @@ spring: application: name: user-service-provider # 应用名 -com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注解中心 +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注册中心 diff --git a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml index 3e96aebd2..44c6492cd 100644 --- a/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml +++ b/lab-62/lab-62-sofarpc-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml @@ -10,7 +10,3 @@ - - - - diff --git a/lab-62/pom.xml b/lab-62/pom.xml index 3353b5b23..ada99022c 100644 --- a/lab-62/pom.xml +++ b/lab-62/pom.xml @@ -14,6 +14,7 @@ lab-62-sofarpc-xml-demo + lab-62-sofarpc-annotations-demo diff --git "a/lab-62/\343\200\212\343\200\213.md" "b/lab-62/\343\200\212\343\200\213.md" new file mode 100644 index 000000000..e69de29bb diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml new file mode 100644 index 000000000..e6ac7a409 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml @@ -0,0 +1,45 @@ + + + + + + + com.alipay.sofa + sofaboot-dependencies + 3.3.2 + + 4.0.0 + + lab-63-sofarpc-xml-demo-user-rpc-service-consumer + + + + + cn.iocoder.springboot.labs + lab-63-sofarpc-xml-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.alipay.sofa + rpc-sofa-boot-starter + + + + + org.apache.curator + curator-framework + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java new file mode 100644 index 000000000..fe0da3c28 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab63.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:sofarpc.xml") +public class ConsumerApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ConsumerApplication.class, args);; + } + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java new file mode 100644 index 000000000..38221966f --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab63.rpc.controller; + +import cn.iocoder.springboot.lab63.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/user") +public class UserController { + + @Autowired + private UserRpcService userRpcService; + + @GetMapping("/get") + public UserDTO get(@RequestParam("id") Integer id) { + return userRpcService.get(id); + } + + @GetMapping("/add") // 为了方便测试，实际使用 @PostMapping + public Integer add(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + UserAddDTO addDTO = new UserAddDTO().setName(name).setGender(gender); + return userRpcService.add(addDTO); + } + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..f5299bd67 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-consumer # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFARPC 注解中心 diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml new file mode 100644 index 000000000..65513a898 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/pom.xml new file mode 100644 index 000000000..76a90d3f5 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/pom.xml @@ -0,0 +1,14 @@ + + + + lab-63-motan-xml-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-xml-demo-user-rpc-service-api + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java new file mode 100644 index 000000000..158785180 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab63.rpc.api; + +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; + +/** + * 用户服务 RPC Service 接口 + */ +public interface UserRpcService { + + /** + * 根据指定用户编号，获得用户信息 + * + * @param id 用户编号 + * @return 用户信息 + */ + UserDTO get(Integer id); + + /** + * 添加新用户，返回新添加的用户编号 + * + * @param addDTO 添加的用户信息 + * @return 用户编号 + */ + Integer add(UserAddDTO addDTO); + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java new file mode 100644 index 000000000..292297614 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab63.rpc.dto; + +import java.io.Serializable; + +/** + * 用户添加 DTO + */ +public class UserAddDTO implements Serializable { + + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public String getName() { + return name; + } + + public UserAddDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserAddDTO setGender(Integer gender) { + this.gender = gender; + return this; + } + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java new file mode 100644 index 000000000..b6941d1ee --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab63.rpc.dto; + +import java.io.Serializable; + +/** + * 用户信息 DTO + */ +public class UserDTO implements Serializable { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public Integer getId() { + return id; + } + + public UserDTO setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public UserDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserDTO setGender(Integer gender) { + this.gender = gender; + return this; + } +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml new file mode 100644 index 000000000..f8b6509f3 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml @@ -0,0 +1,77 @@ + + + + lab-63-motan-xml-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-xml-demo-user-rpc-service-provider + + + 1.8 + 1.8 + 2.2.4.RELEASE + 1.1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-63-motan-xml-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + com.weibo + motan-core + ${moton.version} + + + com.weibo + motan-transport-netty + ${moton.version} + + + com.weibo + motan-registry-zookeeper + ${moton.version} + + + com.weibo + motan-springsupport + ${moton.version} + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java new file mode 100644 index 000000000..c16b2d494 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab63.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:sofarpc.xml") +public class ProviderApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ProviderApplication.class, args); + } + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java new file mode 100644 index 000000000..303f8da11 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java @@ -0,0 +1,24 @@ +package cn.iocoder.springboot.lab63.rpc.service; + + +import cn.iocoder.springboot.lab63.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; +import org.springframework.stereotype.Service; + +@Service +public class UserRpcServiceImpl implements UserRpcService { + + @Override + public UserDTO get(Integer id) { + return new UserDTO().setId(id) + .setName("没有昵称：" + id) + .setGender(id % 2 + 1); // 1 - 男；2 - 女 + } + + @Override + public Integer add(UserAddDTO addDTO) { + return (int) (System.currentTimeMillis() / 1000); // 嘿嘿，随便返回一个 id + } + +} diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml new file mode 100644 index 000000000..9e8d2d359 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +spring: + application: + name: user-service-provider # 应用名 + +com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注册中心 diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml new file mode 100644 index 000000000..e69de29bb diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml new file mode 100644 index 000000000..e4d0a31e6 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/pom.xml b/lab-63/lab-63-motan-xml-demo/pom.xml new file mode 100644 index 000000000..e6722f965 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/pom.xml @@ -0,0 +1,20 @@ + + + + lab-63 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-xml-demo + pom + + lab-63-motan-xml-demo-user-rpc-service-api + lab-63-motan-xml-demo-user-rpc-service-provider + + + + diff --git a/lab-63/pom.xml b/lab-63/pom.xml new file mode 100644 index 000000000..95efef5c6 --- /dev/null +++ b/lab-63/pom.xml @@ -0,0 +1,18 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63 + + + lab-63-motan-xml-demo + + + diff --git a/pom.xml b/pom.xml index cd8d9a06f..f78d32137 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,8 @@ + lab-62 + lab-63 @@ -100,7 +102,7 @@ - lab-62 + From ac2ee410c55f2f130156fe3d37bef9acb61860d4 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 10 Jun 2020 21:59:48 +0800 Subject: [PATCH 015/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SOFARPC=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "lab-62/\343\200\212\343\200\213.md" | 0 ... Spring Boot SOFARPC \345\205\245\351\227\250\343\200\213.md" | 1 + 2 files changed, 1 insertion(+) delete mode 100644 "lab-62/\343\200\212\343\200\213.md" create mode 100644 "lab-62/\343\200\212\350\212\213\351\201\223 Spring Boot SOFARPC \345\205\245\351\227\250\343\200\213.md" diff --git "a/lab-62/\343\200\212\343\200\213.md" "b/lab-62/\343\200\212\343\200\213.md" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/lab-62/\343\200\212\350\212\213\351\201\223 Spring Boot SOFARPC \345\205\245\351\227\250\343\200\213.md" "b/lab-62/\343\200\212\350\212\213\351\201\223 Spring Boot SOFARPC \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..75bb7bf46 --- /dev/null +++ "b/lab-62/\343\200\212\350\212\213\351\201\223 Spring Boot SOFARPC \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From 3f99bc4e9774ba126627731f67916a7588771601 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 10 Jun 2020 23:45:23 +0800 Subject: [PATCH 016/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Motan=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 45 ------------ .../src/main/resources/application.yaml | 5 -- .../src/main/resources/sofarpc.xml | 16 ----- .../pom.xml | 71 +++++++++++++++++++ .../lab63}/rpc/ConsumerApplication.java | 2 +- .../lab63}/rpc/controller/UserController.java | 0 .../src/main/resources/application.yaml | 3 + .../src/main/resources/motan.xml | 16 +++++ .../pom.xml | 12 +--- .../lab63/rpc/ProviderApplication.java | 6 +- .../src/main/resources/application.yaml | 2 - .../src/main/resources/motan.xml | 22 ++++++ .../src/main/resources/sofarpc.xml | 12 ---- lab-63/lab-63-motan-xml-demo/pom.xml | 2 +- pom.xml | 2 +- 15 files changed, 123 insertions(+), 93 deletions(-) delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/pom.xml rename lab-63/lab-63-motan-xml-demo/{lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62 => lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63}/rpc/ConsumerApplication.java (91%) rename lab-63/lab-63-motan-xml-demo/{lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62 => lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63}/rpc/controller/UserController.java (100%) create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml create mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml deleted file mode 100644 index e6ac7a409..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - com.alipay.sofa - sofaboot-dependencies - 3.3.2 - - 4.0.0 - - lab-63-sofarpc-xml-demo-user-rpc-service-consumer - - - - - cn.iocoder.springboot.labs - lab-63-sofarpc-xml-demo-user-rpc-service-api - 1.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-web - - - - - com.alipay.sofa - rpc-sofa-boot-starter - - - - - org.apache.curator - curator-framework - - - - - diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml deleted file mode 100644 index f5299bd67..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml +++ /dev/null @@ -1,5 +0,0 @@ -spring: - application: - name: user-service-consumer # 应用名 - -com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFARPC 注解中心 diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml b/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml deleted file mode 100644 index 65513a898..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/resources/sofarpc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/pom.xml new file mode 100644 index 000000000..46f2e2c12 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/pom.xml @@ -0,0 +1,71 @@ + + + + lab-63-motan-xml-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-xml-demo-user-rpc-service-consumer + + + 1.8 + 1.8 + 2.2.4.RELEASE + 1.1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-63-motan-xml-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.weibo + motan-core + ${moton.version} + + + com.weibo + motan-transport-netty4 + ${moton.version} + + + com.weibo + motan-registry-zookeeper + ${moton.version} + + + com.weibo + motan-springsupport + ${moton.version} + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java similarity index 91% rename from lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java rename to lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java index fe0da3c28..b51093c78 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/ConsumerApplication.java +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.ImportResource; @SpringBootApplication -@ImportResource("classpath:sofarpc.xml") +@ImportResource("classpath:motan.xml") public class ConsumerApplication { public static void main(String[] args) { diff --git a/lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java similarity index 100% rename from lab-63/lab-63-motan-xml-demo/lab-62-sofarpc-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab62/rpc/controller/UserController.java rename to lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..15227189c --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +spring: + application: + name: user-service-consumer # 应用名 diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml new file mode 100644 index 000000000..4011a4025 --- /dev/null +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml index f8b6509f3..a8e78cbf2 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/pom.xml @@ -31,7 +31,7 @@ - + cn.iocoder.springboot.labs lab-63-motan-xml-demo-user-rpc-service-api @@ -44,7 +44,7 @@ spring-boot-starter - + com.weibo motan-core @@ -52,7 +52,7 @@ com.weibo - motan-transport-netty + motan-transport-netty4 ${moton.version} @@ -66,12 +66,6 @@ ${moton.version} - - - - - - diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java index c16b2d494..db71f5416 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java @@ -1,16 +1,20 @@ package cn.iocoder.springboot.lab63.rpc; +import com.weibo.api.motan.common.MotanConstants; +import com.weibo.api.motan.util.MotanSwitcherUtil; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ImportResource; @SpringBootApplication -@ImportResource("classpath:sofarpc.xml") +@ImportResource("classpath:motan.xml") public class ProviderApplication { public static void main(String[] args) { + // 启动 Spring Boot 应用 SpringApplication.run(ProviderApplication.class, args); + MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true); } } diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml index 9e8d2d359..6bc94f31d 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml @@ -1,5 +1,3 @@ spring: application: name: user-service-provider # 应用名 - -com.alipay.sofa.rpc.registry.address: zookeeper://127.0.0.1:2181 # SOFA RPC 注册中心 diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml index e69de29bb..b255d8f60 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml deleted file mode 100644 index e4d0a31e6..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/sofarpc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/lab-63/lab-63-motan-xml-demo/pom.xml b/lab-63/lab-63-motan-xml-demo/pom.xml index e6722f965..846a599b8 100644 --- a/lab-63/lab-63-motan-xml-demo/pom.xml +++ b/lab-63/lab-63-motan-xml-demo/pom.xml @@ -14,7 +14,7 @@ lab-63-motan-xml-demo-user-rpc-service-api lab-63-motan-xml-demo-user-rpc-service-provider - + lab-63-motan-xml-demo-user-rpc-service-consumer diff --git a/pom.xml b/pom.xml index f78d32137..1bbdc534a 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ - lab-62 + lab-63 From 7efaa26c65fc1bd64502cffad4d5512f30ab532a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 11 Jun 2020 09:29:33 +0800 Subject: [PATCH 017/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Motan=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 14 ++++ .../lab63/rpc/api/UserRpcService.java | 27 +++++++ .../springboot/lab63/rpc/dto/UserAddDTO.java | 37 ++++++++++ .../springboot/lab63/rpc/dto/UserDTO.java | 49 +++++++++++++ .../pom.xml | 71 +++++++++++++++++++ .../lab63/rpc/ConsumerApplication.java | 16 +++++ .../lab63/rpc/controller/UserController.java | 32 +++++++++ .../src/main/resources/motan.xml | 18 +++++ .../pom.xml | 71 +++++++++++++++++++ .../lab63/rpc/ProviderApplication.java | 20 ++++++ .../lab63/rpc/service/UserRpcServiceImpl.java | 26 +++++++ .../src/main/resources/motan.xml | 20 ++++++ lab-63/lab-63-motan-annotations-demo/pom.xml | 20 ++++++ .../src/main/resources/application.yaml | 3 - .../src/main/resources/motan.xml | 10 +-- .../lab63/rpc/ProviderApplication.java | 2 +- .../src/main/resources/application.yaml | 3 - .../src/main/resources/motan.xml | 14 ++-- lab-63/pom.xml | 1 + 19 files changed, 434 insertions(+), 20 deletions(-) create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/pom.xml create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/pom.xml create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/pom.xml create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java create mode 100644 lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/resources/motan.xml create mode 100644 lab-63/lab-63-motan-annotations-demo/pom.xml delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml delete mode 100644 lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/pom.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/pom.xml new file mode 100644 index 000000000..f09acb3e9 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/pom.xml @@ -0,0 +1,14 @@ + + + + lab-63-motan-annotations-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-annotations-demo-user-rpc-service-api + + diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java new file mode 100644 index 000000000..158785180 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/api/UserRpcService.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab63.rpc.api; + +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; + +/** + * 用户服务 RPC Service 接口 + */ +public interface UserRpcService { + + /** + * 根据指定用户编号，获得用户信息 + * + * @param id 用户编号 + * @return 用户信息 + */ + UserDTO get(Integer id); + + /** + * 添加新用户，返回新添加的用户编号 + * + * @param addDTO 添加的用户信息 + * @return 用户编号 + */ + Integer add(UserAddDTO addDTO); + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java new file mode 100644 index 000000000..292297614 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserAddDTO.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab63.rpc.dto; + +import java.io.Serializable; + +/** + * 用户添加 DTO + */ +public class UserAddDTO implements Serializable { + + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public String getName() { + return name; + } + + public UserAddDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserAddDTO setGender(Integer gender) { + this.gender = gender; + return this; + } + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java new file mode 100644 index 000000000..b6941d1ee --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-api/src/main/java/cn/iocoder/springboot/lab63/rpc/dto/UserDTO.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab63.rpc.dto; + +import java.io.Serializable; + +/** + * 用户信息 DTO + */ +public class UserDTO implements Serializable { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String name; + /** + * 性别 + */ + private Integer gender; + + public Integer getId() { + return id; + } + + public UserDTO setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public UserDTO setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserDTO setGender(Integer gender) { + this.gender = gender; + return this; + } +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/pom.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/pom.xml new file mode 100644 index 000000000..ed4de02dc --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/pom.xml @@ -0,0 +1,71 @@ + + + + lab-63-motan-annotations-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-annotations-demo-user-rpc-service-consumer + + + 1.8 + 1.8 + 2.2.4.RELEASE + 1.1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-63-motan-annotations-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.weibo + motan-core + ${moton.version} + + + com.weibo + motan-transport-netty4 + ${moton.version} + + + com.weibo + motan-registry-zookeeper + ${moton.version} + + + com.weibo + motan-springsupport + ${moton.version} + + + + + diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java new file mode 100644 index 000000000..b51093c78 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/ConsumerApplication.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab63.rpc; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:motan.xml") +public class ConsumerApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ConsumerApplication.class, args);; + } + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java new file mode 100644 index 000000000..5c3f43b2a --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/java/cn/iocoder/springboot/lab63/rpc/controller/UserController.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab63.rpc.controller; + +import cn.iocoder.springboot.lab63.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; +import com.weibo.api.motan.config.springsupport.annotation.MotanReferer; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/user") +public class UserController { + +// @Autowired + @MotanReferer + private UserRpcService userRpcService; + + @GetMapping("/get") + public UserDTO get(@RequestParam("id") Integer id) { + return userRpcService.get(id); + } + + @GetMapping("/add") // 为了方便测试，实际使用 @PostMapping + public Integer add(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + UserAddDTO addDTO = new UserAddDTO().setName(name).setGender(gender); + return userRpcService.add(addDTO); + } + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml new file mode 100644 index 000000000..ac4fcabbf --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/pom.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/pom.xml new file mode 100644 index 000000000..9597fa63c --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/pom.xml @@ -0,0 +1,71 @@ + + + + lab-63-motan-annotations-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-annotations-demo-user-rpc-service-provider + + + 1.8 + 1.8 + 2.2.4.RELEASE + 1.1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-63-motan-annotations-demo-user-rpc-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + com.weibo + motan-core + ${moton.version} + + + com.weibo + motan-transport-netty4 + ${moton.version} + + + com.weibo + motan-registry-zookeeper + ${moton.version} + + + com.weibo + motan-springsupport + ${moton.version} + + + + + diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java new file mode 100644 index 000000000..ec3623698 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java @@ -0,0 +1,20 @@ +package cn.iocoder.springboot.lab63.rpc; + +import com.weibo.api.motan.common.MotanConstants; +import com.weibo.api.motan.util.MotanSwitcherUtil; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ImportResource; + +@SpringBootApplication +@ImportResource("classpath:motan.xml") +public class ProviderApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(ProviderApplication.class, args); + // 设置 Motan 开启对外服务 + MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true); + } + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java new file mode 100644 index 000000000..3845c76b8 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/service/UserRpcServiceImpl.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab63.rpc.service; + + +import cn.iocoder.springboot.lab63.rpc.api.UserRpcService; +import cn.iocoder.springboot.lab63.rpc.dto.UserAddDTO; +import cn.iocoder.springboot.lab63.rpc.dto.UserDTO; +import com.weibo.api.motan.config.springsupport.annotation.MotanService; +import org.springframework.stereotype.Service; + +@Service +@MotanService(export = "motan2:8001") +public class UserRpcServiceImpl implements UserRpcService { + + @Override + public UserDTO get(Integer id) { + return new UserDTO().setId(id) + .setName("没有昵称：" + id) + .setGender(id % 2 + 1); // 1 - 男；2 - 女 + } + + @Override + public Integer add(UserAddDTO addDTO) { + return (int) (System.currentTimeMillis() / 1000); // 嘿嘿，随便返回一个 id + } + +} diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/resources/motan.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/resources/motan.xml new file mode 100644 index 000000000..71250dd0d --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-provider/src/main/resources/motan.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/lab-63/lab-63-motan-annotations-demo/pom.xml b/lab-63/lab-63-motan-annotations-demo/pom.xml new file mode 100644 index 000000000..de6847d74 --- /dev/null +++ b/lab-63/lab-63-motan-annotations-demo/pom.xml @@ -0,0 +1,20 @@ + + + + lab-63 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-63-motan-annotations-demo + pom + + lab-63-motan-annotations-demo-user-rpc-service-api + lab-63-motan-annotations-demo-user-rpc-service-provider + lab-63-motan-annotations-demo-user-rpc-service-consumer + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml deleted file mode 100644 index 15227189c..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/application.yaml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - application: - name: user-service-consumer # 应用名 diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml index 4011a4025..1120a8094 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-consumer/src/main/resources/motan.xml @@ -4,13 +4,15 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://api.weibo.com/schema/motan http://api.weibo.com/schema/motan.xsd"> - + - - + + + diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java index db71f5416..ec3623698 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/java/cn/iocoder/springboot/lab63/rpc/ProviderApplication.java @@ -11,9 +11,9 @@ public class ProviderApplication { public static void main(String[] args) { - // 启动 Spring Boot 应用 SpringApplication.run(ProviderApplication.class, args); + // 设置 Motan 开启对外服务 MotanSwitcherUtil.setSwitcherValue(MotanConstants.REGISTRY_HEARTBEAT_SWITCHER, true); } diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml deleted file mode 100644 index 6bc94f31d..000000000 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/application.yaml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - application: - name: user-service-provider # 应用名 diff --git a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml index b255d8f60..f26f1acce 100644 --- a/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml +++ b/lab-63/lab-63-motan-xml-demo/lab-63-motan-xml-demo-user-rpc-service-provider/src/main/resources/motan.xml @@ -4,19 +4,15 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://api.weibo.com/schema/motan http://api.weibo.com/schema/motan.xsd"> - - + + - - - - - - - + + diff --git a/lab-63/pom.xml b/lab-63/pom.xml index 95efef5c6..a16873b13 100644 --- a/lab-63/pom.xml +++ b/lab-63/pom.xml @@ -13,6 +13,7 @@ lab-63-motan-xml-demo + lab-63-motan-annotations-demo From 1b50b85d54ed2aab126c563e1d04ce2cf0e22510 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 11 Jun 2020 19:02:10 +0800 Subject: [PATCH 018/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Motan=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../src/main/resources/motan.xml | 2 ++ ...Spring Boot Motan \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 "lab-63/\343\200\212\350\212\213\351\201\223 Spring Boot Motan \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 6a942fa1c..709932fdb 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) * [《芋道 Spring Boot 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Boot/Feign/?github) 对应 [lab-58](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-58) -* 《芋道 Spring Boot Motan 入门》计划中... +* [《芋道 Spring Boot SOFARPC 入门》](http://www.iocoder.cn/Spring-Boot/SOFARPC/?github) 对应 [lab-62](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-62) +* [《芋道 Spring Boot Motan 入门》](http://www.iocoder.cn/Spring-Boot/Motan/?github) 对应 [lab-63](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-63) * 《芋道 Spring Boot WebService 入门》计划中... -* 《芋道 Spring Boot SOFARPC 入门》计划中... * 《芋道 Spring Boot gRPC 入门》计划中... * 《芋道 Spring Boot RSocket 入门》计划中... diff --git a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml index ac4fcabbf..fad844d39 100644 --- a/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml +++ b/lab-63/lab-63-motan-annotations-demo/lab-63-motan-annotations-demo-user-rpc-service-consumer/src/main/resources/motan.xml @@ -15,4 +15,6 @@ + + diff --git "a/lab-63/\343\200\212\350\212\213\351\201\223 Spring Boot Motan \345\205\245\351\227\250\343\200\213.md" "b/lab-63/\343\200\212\350\212\213\351\201\223 Spring Boot Motan \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..42b28dc7a --- /dev/null +++ "b/lab-63/\343\200\212\350\212\213\351\201\223 Spring Boot Motan \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index 1bbdc534a..2d9e53d85 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ - lab-63 + From 1ed2283f8d03532551273635228089fe3ed810e3 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 11 Jun 2020 19:18:08 +0800 Subject: [PATCH 019/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 62 +++++++++++++++++ .../consumer/DemoConsumerApplication.java | 69 +++++++++++++++++++ .../src/main/resources/application.yaml | 12 ++++ .../pom.xml | 62 +++++++++++++++++ .../provider/DemoProviderApplication.java | 27 ++++++++ .../src/main/resources/application.yaml | 14 ++++ labx-27/pom.xml | 19 +++++ pom.xml | 1 + 8 files changed, 266 insertions(+) create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-consumer/pom.xml create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/consumer/DemoConsumerApplication.java create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-provider/pom.xml create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/provider/DemoProviderApplication.java create mode 100644 labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml create mode 100644 labx-27/pom.xml diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-consumer/pom.xml b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/pom.xml new file mode 100644 index 000000000..07ed65f1f --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/pom.xml @@ -0,0 +1,62 @@ + + + + labx-27 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-27-sc-consul-discovery-demo01-consumer + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-discovery + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/consumer/DemoConsumerApplication.java b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/consumer/DemoConsumerApplication.java new file mode 100644 index 000000000..34345b79a --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/consumer/DemoConsumerApplication.java @@ -0,0 +1,69 @@ +package cn.iocoder.springcloud.labx27.consuldemo.consumer; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import java.util.List; + +@SpringBootApplication +// @EnableDiscoveryClient +public class DemoConsumerApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoConsumerApplication.class, args); + } + + @Configuration + public class RestTemplateConfiguration { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + } + + @RestController + static class TestController { + + @Autowired + private DiscoveryClient discoveryClient; + @Autowired + private RestTemplate restTemplate; + @Autowired + private LoadBalancerClient loadBalancerClient; + + @GetMapping("/hello") + public String hello(String name) { + // 获得服务 `demo-provider` 的一个实例 + ServiceInstance instance; + if (true) { + // 获取服务 `demo-provider` 对应的实例列表 + List instances = discoveryClient.getInstances("demo-provider"); + // 选择第一个 + instance = instances.size() > 0 ? instances.get(0) : null; + } else { + instance = loadBalancerClient.choose("demo-provider"); + } + // 发起调用 + if (instance == null) { + throw new IllegalStateException("获取不到实例"); + } + String targetUrl = instance.getUri() + "/echo?name=" + name; + String response = restTemplate.getForObject(targetUrl, String.class); + // 返回结果 + return "consumer:" + response; + } + + } + +} diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml new file mode 100644 index 000000000..34c38ba57 --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml @@ -0,0 +1,12 @@ +spring: + application: + name: demo-consumer # Spring 应用名 + cloud: + zookeeper: + connect-string: 127.0.0.1:2181 + # Zookeeper 作为注册中心的配置项，对应 ZookeeperDiscoveryProperties 配置类 + discovery: + root: /services # Zookeeper 数据存储的根节点，默认为 /services + +server: + port: 28080 # 服务器端口。默认为 8080 diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-provider/pom.xml b/labx-27/labx-27-sc-consul-discovery-demo01-provider/pom.xml new file mode 100644 index 000000000..56575e946 --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-provider/pom.xml @@ -0,0 +1,62 @@ + + + + labx-27 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-27-sc-consul-discovery-demo01-provider + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-discovery + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/provider/DemoProviderApplication.java b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/provider/DemoProviderApplication.java new file mode 100644 index 000000000..ff936efb1 --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/java/cn/iocoder/springcloud/labx27/consuldemo/provider/DemoProviderApplication.java @@ -0,0 +1,27 @@ +package cn.iocoder.springcloud.labx27.consuldemo.provider; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@SpringBootApplication +@EnableDiscoveryClient +public class DemoProviderApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoProviderApplication.class, args); + } + + @RestController + static class TestController { + + @GetMapping("/echo") + public String echo(String name) { + return "provider:" + name; + } + + } + +} diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml new file mode 100644 index 000000000..bc15da4e3 --- /dev/null +++ b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml @@ -0,0 +1,14 @@ +spring: + application: + name: demo-provider # Spring 应用名 + cloud: + # Spring Cloud Consul 通用配置项，对应 ConsulProperties 类 + consul: + host: 127.0.0.1 # Consul 主机 + port: 8500 # Consul 端口 + # Spring Cloud Consul Discovery 配置项，对应 ConsulDiscoveryProperties 类 + discovery: + service-name: ${spring.application.name} # 注册到 Consul 的服务名，默认为 `spring.application.name` 配置项 + +server: + port: 18080 # 服务器端口。默认为 8080 diff --git a/labx-27/pom.xml b/labx-27/pom.xml new file mode 100644 index 000000000..0e65b75c8 --- /dev/null +++ b/labx-27/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-27 + + + labx-27-sc-consul-discovery-demo01-provider + labx-27-sc-consul-discovery-demo01-consumer + + + diff --git a/pom.xml b/pom.xml index 2d9e53d85..fe4ba1c50 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,7 @@ + labx-27 From 3b58d9ebc1dfae456dfce01ce378350fb29271ac Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 11 Jun 2020 22:17:36 +0800 Subject: [PATCH 020/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- labx-27/pom.xml | 1 + labx-28/labx-28-sc-consul-config-demo/pom.xml | 56 +++++++++++++++++++ .../labx28/consuldemo/DemoApplication.java | 13 +++++ .../consuldemo/config/OrderProperties.java | 52 +++++++++++++++++ .../consuldemo/controller/DemoController.java | 44 +++++++++++++++ .../src/main/resources/bootstrap.yaml | 15 +++++ labx-28/pom.xml | 19 +++++++ pom.xml | 1 + 8 files changed, 201 insertions(+) create mode 100644 labx-28/labx-28-sc-consul-config-demo/pom.xml create mode 100644 labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java create mode 100644 labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java create mode 100644 labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java create mode 100644 labx-28/labx-28-sc-consul-config-demo/src/main/resources/bootstrap.yaml create mode 100644 labx-28/pom.xml diff --git a/labx-27/pom.xml b/labx-27/pom.xml index 0e65b75c8..291a242a4 100644 --- a/labx-27/pom.xml +++ b/labx-27/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-27 + pom labx-27-sc-consul-discovery-demo01-provider diff --git a/labx-28/labx-28-sc-consul-config-demo/pom.xml b/labx-28/labx-28-sc-consul-config-demo/pom.xml new file mode 100644 index 000000000..4539900c4 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-demo/pom.xml @@ -0,0 +1,56 @@ + + + + labx-28 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-28-sc-consul-config-demo + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-config + + + + diff --git a/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java new file mode 100644 index 000000000..85ded4243 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springcloud.labx28.consuldemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class); + } + +} diff --git a/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java new file mode 100644 index 000000000..eb8192919 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java @@ -0,0 +1,52 @@ +package cn.iocoder.springcloud.labx28.consuldemo.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "order") +public class OrderProperties { + + /** + * 订单支付超时时长，单位：秒。 + */ + private Integer payTimeoutSeconds; + + /** + * 订单创建频率，单位：秒 + */ + private Integer createFrequencySeconds; + +// /** +// * 配置描述 +// */ +// private String desc; + + public Integer getPayTimeoutSeconds() { + return payTimeoutSeconds; + } + + public OrderProperties setPayTimeoutSeconds(Integer payTimeoutSeconds) { + this.payTimeoutSeconds = payTimeoutSeconds; + return this; + } + + public Integer getCreateFrequencySeconds() { + return createFrequencySeconds; + } + + public OrderProperties setCreateFrequencySeconds(Integer createFrequencySeconds) { + this.createFrequencySeconds = createFrequencySeconds; + return this; + } + +// public String getDesc() { +// return desc; +// } +// +// public OrderProperties setDesc(String desc) { +// this.desc = desc; +// return this; +// } + +} diff --git a/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java new file mode 100644 index 000000000..57a4603d8 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-demo/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springcloud.labx28.consuldemo.controller; + +import cn.iocoder.springcloud.labx28.consuldemo.config.OrderProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private OrderProperties orderProperties; + + /** + * 测试 @ConfigurationProperties 注解的配置属性类 + */ + @GetMapping("/test01") + public OrderProperties test01() { + return orderProperties; + } + + @Value(value = "${order.pay-timeout-seconds}") // @NacosValue(value = "${order.pay-timeout-seconds}") + private Integer payTimeoutSeconds; + @Value(value = "${order.create-frequency-seconds}") // @NacosValue(value = "${order.create-frequency-seconds}") + private Integer createFrequencySeconds; + + /** + * 测试 @Value 注解的属性 + */ + @GetMapping("/test02") + public Map test02() { + Map results = new HashMap(); + results.put("payTimeoutSeconds", payTimeoutSeconds); + results.put("createFrequencySeconds", createFrequencySeconds); + return results; + } + +} diff --git a/labx-28/labx-28-sc-consul-config-demo/src/main/resources/bootstrap.yaml b/labx-28/labx-28-sc-consul-config-demo/src/main/resources/bootstrap.yaml new file mode 100644 index 000000000..8f8cb1366 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-demo/src/main/resources/bootstrap.yaml @@ -0,0 +1,15 @@ +spring: + application: + name: demo-application + + cloud: + # Spring Cloud Consul 通用配置项，对应 ConsulProperties 类 + consul: + host: 127.0.0.1 # Consul 主机 + port: 8500 # Consul 端口 + # Spring Cloud Consul Config 配置项，对应 ConsulConfigProperties 类 + config: + format: YAML # Consul 配置的格式 + prefix: config # Consul 配置的目录 + data-key: data # Consul 配置的文件 + profile-separator: ',' # 多环境目录分隔符，默认为 , diff --git a/labx-28/pom.xml b/labx-28/pom.xml new file mode 100644 index 000000000..a603bb363 --- /dev/null +++ b/labx-28/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-28 + pom + + + labx-28-sc-consul-config-demo + + + diff --git a/pom.xml b/pom.xml index fe4ba1c50..70cc6e50e 100644 --- a/pom.xml +++ b/pom.xml @@ -104,6 +104,7 @@ labx-27 + labx-28 From bc357232a8b5cbbe953b670beffe8e588bcdb7d9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 00:04:12 +0800 Subject: [PATCH 021/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yaml | 12 ++++++++---- .../src/main/resources/application.yaml | 1 + ...3 Consul \345\205\245\351\227\250\343\200\213.md" | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 "labx-27/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml index 34c38ba57..cbc7f59fb 100644 --- a/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml +++ b/labx-27/labx-27-sc-consul-discovery-demo01-consumer/src/main/resources/application.yaml @@ -1,12 +1,16 @@ spring: application: name: demo-consumer # Spring 应用名 + cloud: - zookeeper: - connect-string: 127.0.0.1:2181 - # Zookeeper 作为注册中心的配置项，对应 ZookeeperDiscoveryProperties 配置类 + # Spring Cloud Consul 通用配置项，对应 ConsulProperties 类 + consul: + host: 127.0.0.1 # Consul 主机 + port: 8500 # Consul 端口 + # Spring Cloud Consul Discovery 配置项，对应 ConsulDiscoveryProperties 类 discovery: - root: /services # Zookeeper 数据存储的根节点，默认为 /services + service-name: ${spring.application.name} # 注册到 Consul 的服务名，默认为 `spring.application.name` 配置项 + health-check-path: /actuator/health # 健康检查的接口，默认为 /actuator/health，由 Spring Boot Actuator 提供 server: port: 28080 # 服务器端口。默认为 8080 diff --git a/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml index bc15da4e3..7ff3beeeb 100644 --- a/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml +++ b/labx-27/labx-27-sc-consul-discovery-demo01-provider/src/main/resources/application.yaml @@ -9,6 +9,7 @@ spring: # Spring Cloud Consul Discovery 配置项，对应 ConsulDiscoveryProperties 类 discovery: service-name: ${spring.application.name} # 注册到 Consul 的服务名，默认为 `spring.application.name` 配置项 + health-check-path: /actuator/health # 健康检查的接口，默认为 /actuator/health，由 Spring Boot Actuator 提供 server: port: 18080 # 服务器端口。默认为 8080 diff --git "a/labx-27/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" "b/labx-27/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..675afd6e1 --- /dev/null +++ "b/labx-27/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\263\250\345\206\214\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From eb180ec5a631c86f327b6f5767025a8f935595b6 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 08:29:38 +0800 Subject: [PATCH 022/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 56 +++++++++++++++++++ .../labx28/consuldemo/DemoApplication.java | 13 +++++ .../consuldemo/config/OrderProperties.java | 52 +++++++++++++++++ .../consuldemo/controller/DemoController.java | 44 +++++++++++++++ .../src/main/resources/bootstrap.yaml | 15 +++++ pom.xml | 3 +- 6 files changed, 181 insertions(+), 2 deletions(-) create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/src/main/resources/bootstrap.yaml diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml b/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml new file mode 100644 index 000000000..fa89b96b5 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml @@ -0,0 +1,56 @@ + + + + labx-28 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-28-sc-consul-config-auto-refresh + + + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-config + + + + diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java new file mode 100644 index 000000000..85ded4243 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/DemoApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springcloud.labx28.consuldemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class); + } + +} diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java new file mode 100644 index 000000000..eb8192919 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/config/OrderProperties.java @@ -0,0 +1,52 @@ +package cn.iocoder.springcloud.labx28.consuldemo.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "order") +public class OrderProperties { + + /** + * 订单支付超时时长，单位：秒。 + */ + private Integer payTimeoutSeconds; + + /** + * 订单创建频率，单位：秒 + */ + private Integer createFrequencySeconds; + +// /** +// * 配置描述 +// */ +// private String desc; + + public Integer getPayTimeoutSeconds() { + return payTimeoutSeconds; + } + + public OrderProperties setPayTimeoutSeconds(Integer payTimeoutSeconds) { + this.payTimeoutSeconds = payTimeoutSeconds; + return this; + } + + public Integer getCreateFrequencySeconds() { + return createFrequencySeconds; + } + + public OrderProperties setCreateFrequencySeconds(Integer createFrequencySeconds) { + this.createFrequencySeconds = createFrequencySeconds; + return this; + } + +// public String getDesc() { +// return desc; +// } +// +// public OrderProperties setDesc(String desc) { +// this.desc = desc; +// return this; +// } + +} diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java new file mode 100644 index 000000000..57a4603d8 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springcloud.labx28.consuldemo.controller; + +import cn.iocoder.springcloud.labx28.consuldemo.config.OrderProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private OrderProperties orderProperties; + + /** + * 测试 @ConfigurationProperties 注解的配置属性类 + */ + @GetMapping("/test01") + public OrderProperties test01() { + return orderProperties; + } + + @Value(value = "${order.pay-timeout-seconds}") // @NacosValue(value = "${order.pay-timeout-seconds}") + private Integer payTimeoutSeconds; + @Value(value = "${order.create-frequency-seconds}") // @NacosValue(value = "${order.create-frequency-seconds}") + private Integer createFrequencySeconds; + + /** + * 测试 @Value 注解的属性 + */ + @GetMapping("/test02") + public Map test02() { + Map results = new HashMap(); + results.put("payTimeoutSeconds", payTimeoutSeconds); + results.put("createFrequencySeconds", createFrequencySeconds); + return results; + } + +} diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/resources/bootstrap.yaml b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/resources/bootstrap.yaml new file mode 100644 index 000000000..8f8cb1366 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/resources/bootstrap.yaml @@ -0,0 +1,15 @@ +spring: + application: + name: demo-application + + cloud: + # Spring Cloud Consul 通用配置项，对应 ConsulProperties 类 + consul: + host: 127.0.0.1 # Consul 主机 + port: 8500 # Consul 端口 + # Spring Cloud Consul Config 配置项，对应 ConsulConfigProperties 类 + config: + format: YAML # Consul 配置的格式 + prefix: config # Consul 配置的目录 + data-key: data # Consul 配置的文件 + profile-separator: ',' # 多环境目录分隔符，默认为 , diff --git a/pom.xml b/pom.xml index 70cc6e50e..b0bdadb69 100644 --- a/pom.xml +++ b/pom.xml @@ -102,8 +102,7 @@ - - labx-27 + labx-28 From aff2ada345fc4ef36e0390c404074b66d9e039ff Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 19:01:07 +0800 Subject: [PATCH 023/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DemoController.java | 1 + .../pom.xml | 2 + .../consuldemo/controller/DemoController.java | 2 + .../DemoEnvironmentChangeListener.java | 26 ++++++++ labx-28/pom.xml | 1 + ...l \345\205\245\351\227\250\343\200\213.md" | 1 + .../pom.xml | 58 ++++++++++++++++++ .../listenerdemo/ListenerDemoApplication.java | 15 +++++ .../listenerdemo/event/UserRegisterEvent.java | 27 +++++++++ .../listener/UserRegisterListener.java | 22 +++++++ .../src/main/resources/application.yml | 12 ++++ .../pom.xml | 59 +++++++++++++++++++ .../PublisherDemoApplication.java | 14 +++++ .../controller/DemoController.java | 36 +++++++++++ .../event/UserRegisterEvent.java | 27 +++++++++ .../consul/binder/ConsulSendingHandler.java | 46 +++++++++++++++ .../src/main/resources/application.yml | 16 +++++ labx-29/pom.xml | 20 +++++++ pom.xml | 4 +- 19 files changed, 388 insertions(+), 1 deletion(-) create mode 100644 labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/listener/DemoEnvironmentChangeListener.java create mode 100644 "labx-28/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml create mode 100644 labx-29/pom.xml diff --git a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java index e45a04427..a0c36f7d6 100644 --- a/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java +++ b/labx-26/labx-26-sc-zookeeper-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx26/zookeeperdemo/controller/DemoController.java @@ -12,6 +12,7 @@ @RestController @RequestMapping("/demo") +@RefreshScope public class DemoController { @Autowired diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml b/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml index fa89b96b5..30034a28e 100644 --- a/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/pom.xml @@ -12,6 +12,8 @@ labx-28-sc-consul-config-auto-refresh + 1.8 + 1.8 2.2.4.RELEASE Hoxton.SR1 diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java index 57a4603d8..4ada7ce67 100644 --- a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/controller/DemoController.java @@ -3,6 +3,7 @@ import cn.iocoder.springcloud.labx28.consuldemo.config.OrderProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -12,6 +13,7 @@ @RestController @RequestMapping("/demo") +@RefreshScope public class DemoController { @Autowired diff --git a/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/listener/DemoEnvironmentChangeListener.java b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/listener/DemoEnvironmentChangeListener.java new file mode 100644 index 000000000..33683c387 --- /dev/null +++ b/labx-28/labx-28-sc-consul-config-auto-refresh/src/main/java/cn/iocoder/springcloud/labx28/consuldemo/listener/DemoEnvironmentChangeListener.java @@ -0,0 +1,26 @@ +package cn.iocoder.springcloud.labx28.consuldemo.listener; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.context.environment.EnvironmentChangeEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.stereotype.Component; + +@Component +public class DemoEnvironmentChangeListener implements ApplicationListener { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ConfigurableEnvironment environment; + + @Override + public void onApplicationEvent(EnvironmentChangeEvent event) { + for (String key : event.getKeys()) { + logger.info("[onApplicationEvent][key({}) 最新 value 为 {}]", key, environment.getProperty(key)); + } + } + +} diff --git a/labx-28/pom.xml b/labx-28/pom.xml index a603bb363..002f0069e 100644 --- a/labx-28/pom.xml +++ b/labx-28/pom.xml @@ -14,6 +14,7 @@ labx-28-sc-consul-config-demo + labx-28-sc-consul-config-auto-refresh diff --git "a/labx-28/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" "b/labx-28/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..2b7a83aef --- /dev/null +++ "b/labx-28/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Consul \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml b/labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml new file mode 100644 index 000000000..813346829 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml @@ -0,0 +1,58 @@ + + + + labx-29 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-29-sc-bus-consul-demo-listener + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-bus + + + + diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java new file mode 100644 index 000000000..ef24b9b86 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java @@ -0,0 +1,15 @@ +package cn.iocoder.springcloud.labx29.listenerdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan; + +@SpringBootApplication +@RemoteApplicationEventScan +public class ListenerDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(ListenerDemoApplication.class, args); + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java new file mode 100644 index 000000000..4a25297f6 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java @@ -0,0 +1,27 @@ +package cn.iocoder.springcloud.labx29.listenerdemo.event; + +import org.springframework.cloud.bus.event.RemoteApplicationEvent; + +/** + * 用户注册事件 + */ +public class UserRegisterEvent extends RemoteApplicationEvent { + + /** + * 用户名 + */ + private String username; + + public UserRegisterEvent() { // 序列化 + } + + public UserRegisterEvent(Object source, String originService, String destinationService, String username) { + super(source, originService); + this.username = username; + } + + public String getUsername() { + return username; + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java new file mode 100644 index 000000000..a4c526976 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java @@ -0,0 +1,22 @@ +package cn.iocoder.springcloud.labx29.listenerdemo.listener; + +import cn.iocoder.springcloud.labx29.listenerdemo.event.UserRegisterEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +/** + * 用户注册事件的监听器 + */ +@Component +public class UserRegisterListener implements ApplicationListener { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void onApplicationEvent(UserRegisterEvent event) { + logger.info("[onApplicationEvent][监听到用户({}) 注册]", event.getUsername()); + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml new file mode 100644 index 000000000..da9aa2898 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml @@ -0,0 +1,12 @@ +spring: + application: + name: listener-demo + + cloud: + # Consul + consul: + host: 127.0.0.1 + port: 8500 + +server: + port: ${random.int[10000,19999]} # 随机端口，方便启动多个消费者 diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml b/labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml new file mode 100644 index 000000000..c582e50de --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml @@ -0,0 +1,59 @@ + + + + labx-29 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-29-sc-bus-consul-demo-publisher + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-bus + + + + diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java new file mode 100644 index 000000000..0dd9a255b --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springcloud.labx29.publisherdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +//@RemoteApplicationEventScan +public class PublisherDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(PublisherDemoApplication.class, args); + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java new file mode 100644 index 000000000..144f7d082 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java @@ -0,0 +1,36 @@ +package cn.iocoder.springcloud.labx29.publisherdemo.controller; + +import cn.iocoder.springcloud.labx29.publisherdemo.event.UserRegisterEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.bus.ServiceMatcher; +import org.springframework.context.ApplicationEventPublisher; +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 { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private ApplicationEventPublisher applicationEventPublisher; + + @Autowired + private ServiceMatcher busServiceMatcher; + + @GetMapping("/register") + public String register(String username) { + // ... 执行注册逻辑 + logger.info("[register][执行用户({}) 的注册逻辑]", username); + + // ... 发布 + applicationEventPublisher.publishEvent(new UserRegisterEvent(this, busServiceMatcher.getServiceId(), + null, username)); + return "success"; + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java new file mode 100644 index 000000000..6936d8ed5 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java @@ -0,0 +1,27 @@ +package cn.iocoder.springcloud.labx29.publisherdemo.event; + +import org.springframework.cloud.bus.event.RemoteApplicationEvent; + +/** + * 用户注册事件 + */ +public class UserRegisterEvent extends RemoteApplicationEvent { + + /** + * 用户名 + */ + private String username; + + public UserRegisterEvent() { // 序列化 + } + + public UserRegisterEvent(Object source, String originService, String destinationService, String username) { + super(source, originService); + this.username = username; + } + + public String getUsername() { + return username; + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java new file mode 100644 index 000000000..76ed381e1 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java @@ -0,0 +1,46 @@ +package org.springframework.cloud.consul.binder; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.QueryParams; +import com.ecwid.consul.v1.Response; +import com.ecwid.consul.v1.event.model.Event; +import com.ecwid.consul.v1.event.model.EventParams; +import org.springframework.integration.handler.AbstractMessageHandler; +import org.springframework.messaging.Message; + +/** + * Adapter that converts and sends Messages as Consul events. + * + * @author Spencer Gibb + */ +public class ConsulSendingHandler extends AbstractMessageHandler { + + private final ConsulClient consul; + + private final String eventName; + + public ConsulSendingHandler(ConsulClient consul, String eventName) { + this.consul = consul; + this.eventName = eventName; + } + + @Override + protected void handleMessageInternal(Message message) { + if (this.logger.isTraceEnabled()) { + this.logger.trace("Publishing message" + message); + } + + // 转换成 String + Object payload = message.getPayload(); + if (payload instanceof byte[]) { + payload = new String((byte[]) payload); + } + + // TODO: support headers + // TODO: support consul event filters: NodeFilter, ServiceFilter, TagFilter + Response event = this.consul.eventFire(this.eventName, (String) payload, + new EventParams(), QueryParams.DEFAULT); + // TODO: return event? + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml new file mode 100644 index 000000000..899fc2f2d --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml @@ -0,0 +1,16 @@ +server: + port: 8081 + +spring: + application: + name: publisher-demo + + cloud: + # Consul + consul: + host: 127.0.0.1 + port: 8500 + # Bus 相关配置项，对应 BusProperties + bus: + enabled: true # 是否开启，默认为 true + destination: springCloudBus # 目标消息队列，默认为 springCloudBus diff --git a/labx-29/pom.xml b/labx-29/pom.xml new file mode 100644 index 000000000..0fb2f4d1c --- /dev/null +++ b/labx-29/pom.xml @@ -0,0 +1,20 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-29 + pom + + labx-29-sc-bus-consul-demo-publisher + labx-29-sc-bus-consul-demo-listener + + + + diff --git a/pom.xml b/pom.xml index b0bdadb69..f51d7c634 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ - + lab-31 @@ -103,7 +103,9 @@ + labx-28 + labx-29 From 3f912bb7119d421f771722aa3a89b95a0a5083a9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 22:10:46 +0800 Subject: [PATCH 024/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 64 +++++++++++++++++++ .../listenerdemo/ListenerDemoApplication.java | 15 +++++ .../listenerdemo/event/UserRegisterEvent.java | 27 ++++++++ .../listener/UserRegisterListener.java | 22 +++++++ .../src/main/resources/application.yml | 19 ++++++ labx-29/pom.xml | 1 + pom.xml | 4 +- 7 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml new file mode 100644 index 000000000..88bbd31c7 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml @@ -0,0 +1,64 @@ + + + + labx-29 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-29-sc-bus-consul-demo-listener-actuator + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-consul-bus + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java new file mode 100644 index 000000000..ef24b9b86 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java @@ -0,0 +1,15 @@ +package cn.iocoder.springcloud.labx29.listenerdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.bus.jackson.RemoteApplicationEventScan; + +@SpringBootApplication +@RemoteApplicationEventScan +public class ListenerDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(ListenerDemoApplication.class, args); + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java new file mode 100644 index 000000000..4a25297f6 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java @@ -0,0 +1,27 @@ +package cn.iocoder.springcloud.labx29.listenerdemo.event; + +import org.springframework.cloud.bus.event.RemoteApplicationEvent; + +/** + * 用户注册事件 + */ +public class UserRegisterEvent extends RemoteApplicationEvent { + + /** + * 用户名 + */ + private String username; + + public UserRegisterEvent() { // 序列化 + } + + public UserRegisterEvent(Object source, String originService, String destinationService, String username) { + super(source, originService); + this.username = username; + } + + public String getUsername() { + return username; + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java new file mode 100644 index 000000000..a4c526976 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java @@ -0,0 +1,22 @@ +package cn.iocoder.springcloud.labx29.listenerdemo.listener; + +import cn.iocoder.springcloud.labx29.listenerdemo.event.UserRegisterEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +/** + * 用户注册事件的监听器 + */ +@Component +public class UserRegisterListener implements ApplicationListener { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void onApplicationEvent(UserRegisterEvent event) { + logger.info("[onApplicationEvent][监听到用户({}) 注册]", event.getUsername()); + } + +} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml new file mode 100644 index 000000000..16d2476e4 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: listener-demo + + cloud: + # Consul + consul: + host: 127.0.0.1 + port: 8500 + +server: + port: 18080 # 随机端口，方便启动多个消费者 + +management: + endpoints: + # Actuator HTTP 配置项，对应 WebEndpointProperties 配置类 + web: + exposure: + include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-29/pom.xml b/labx-29/pom.xml index 0fb2f4d1c..9a715297a 100644 --- a/labx-29/pom.xml +++ b/labx-29/pom.xml @@ -14,6 +14,7 @@ labx-29-sc-bus-consul-demo-publisher labx-29-sc-bus-consul-demo-listener + labx-29-sc-bus-consul-demo-listener-actuator diff --git a/pom.xml b/pom.xml index f51d7c634..2a28e45b1 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ - lab-31 + @@ -104,7 +104,7 @@ - labx-28 + labx-29 From 98cd933cffab0b26c61b0cddbdf3f6a31b9a2118 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 22:16:01 +0800 Subject: [PATCH 025/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binder/ConsulSendingHandler.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java new file mode 100644 index 000000000..1d1d7cb11 --- /dev/null +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java @@ -0,0 +1,46 @@ +package cn.iocoder.springcloud.labx29.listenerdemo.binder; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.QueryParams; +import com.ecwid.consul.v1.Response; +import com.ecwid.consul.v1.event.model.Event; +import com.ecwid.consul.v1.event.model.EventParams; +import org.springframework.integration.handler.AbstractMessageHandler; +import org.springframework.messaging.Message; + +/** + * Adapter that converts and sends Messages as Consul events. + * + * @author Spencer Gibb + */ +public class ConsulSendingHandler extends AbstractMessageHandler { + + private final ConsulClient consul; + + private final String eventName; + + public ConsulSendingHandler(ConsulClient consul, String eventName) { + this.consul = consul; + this.eventName = eventName; + } + + @Override + protected void handleMessageInternal(Message message) { + if (this.logger.isTraceEnabled()) { + this.logger.trace("Publishing message" + message); + } + + // 转换成 String + Object payload = message.getPayload(); + if (payload instanceof byte[]) { + payload = new String((byte[]) payload); + } + + // TODO: support headers + // TODO: support consul event filters: NodeFilter, ServiceFilter, TagFilter + Response event = this.consul.eventFire(this.eventName, (String) payload, + new EventParams(), QueryParams.DEFAULT); + // TODO: return event? + } + +} From f7d504e313a39ee2d18d7887c7315d49346d77b3 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 22:50:28 +0800 Subject: [PATCH 026/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 78 +++++++++++++++++++ .../ConfigServerApplication.java | 15 ++++ .../src/main/resources/application.yml | 24 ++++++ .../pom.xml | 72 +++++++++++++++++ .../userapplication/UserApplication.java | 13 ++++ .../config/OrderProperties.java | 38 +++++++++ .../controller/DemoController.java | 46 +++++++++++ .../src/main/resources/application.yml | 6 ++ .../src/main/resources/bootstrap.yml | 9 +++ .../consul}/binder/ConsulSendingHandler.java | 2 +- 10 files changed, 302 insertions(+), 1 deletion(-) create mode 100644 labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml create mode 100644 labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java create mode 100644 labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml create mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml rename labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/{cn/iocoder/springcloud/labx29/listenerdemo => org/springframework/cloud/consul}/binder/ConsulSendingHandler.java (95%) diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml new file mode 100644 index 000000000..12be52485 --- /dev/null +++ b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml @@ -0,0 +1,78 @@ + + + + labx-12 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-20-sc-config-server-git-auto-refresh-by-bus + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-config-server + + + + + com.alibaba.cloud + spring-cloud-starter-bus-rocketmq + + + + + org.springframework.cloud + spring-cloud-config-monitor + + + + diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java new file mode 100644 index 000000000..8a941740e --- /dev/null +++ b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java @@ -0,0 +1,15 @@ +package cn.iocoder.springcloud.labx20.configserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.config.server.EnableConfigServer; + +@SpringBootApplication +@EnableConfigServer +public class ConfigServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ConfigServerApplication.class, args); + } + +} diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml new file mode 100644 index 000000000..0b07c33c9 --- /dev/null +++ b/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 8888 + +spring: + application: + name: demo-config-server + + profiles: + active: git # 使用的 Spring Cloud Config Server 的存储器方案 + # Spring Cloud Config 相关配置项 + cloud: + config: + server: + # Spring Cloud Config Server 的 Git 存储器的配置项，对应 MultipleJGitEnvironmentProperties 类 + git: + uri: https://github.com/YunaiV/demo-config-server.git # Git 仓库地址 + search-paths: / # 读取文件的根地址 + default-label: master # 使用的默认分支，默认为 master + # username: ${CODING_USERNAME} # 账号 + # password: ${CODING_PASSWORD} # 密码 + +# rocketmq 配置项，对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml new file mode 100644 index 000000000..4a7d09d5a --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml @@ -0,0 +1,72 @@ + + + + labx-12 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-20-sc-config-user-application-auto-refresh-by-bus + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.cloud + spring-cloud-starter-config + + + + + com.alibaba.cloud + spring-cloud-starter-bus-rocketmq + + + + diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java new file mode 100644 index 000000000..246d51142 --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springcloud.labx20.userapplication; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } + +} diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java new file mode 100644 index 000000000..48d3dd537 --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java @@ -0,0 +1,38 @@ +package cn.iocoder.springcloud.labx20.userapplication.config; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Component +@ConfigurationProperties(prefix = "order") +public class OrderProperties { + + /** + * 订单支付超时时长，单位：秒。 + */ + private Integer payTimeoutSeconds; + + /** + * 订单创建频率，单位：秒 + */ + private Integer createFrequencySeconds; + + public Integer getPayTimeoutSeconds() { + return payTimeoutSeconds; + } + + public OrderProperties setPayTimeoutSeconds(Integer payTimeoutSeconds) { + this.payTimeoutSeconds = payTimeoutSeconds; + return this; + } + + public Integer getCreateFrequencySeconds() { + return createFrequencySeconds; + } + + public OrderProperties setCreateFrequencySeconds(Integer createFrequencySeconds) { + this.createFrequencySeconds = createFrequencySeconds; + return this; + } + +} diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java new file mode 100644 index 000000000..4dca3287d --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java @@ -0,0 +1,46 @@ +package cn.iocoder.springcloud.labx20.userapplication.controller; + +import cn.iocoder.springcloud.labx20.userapplication.config.OrderProperties; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.HashMap; +import java.util.Map; + +@RestController +@RequestMapping("/demo") +@RefreshScope +public class DemoController { + + @Autowired + private OrderProperties orderProperties; + + /** + * 测试 @ConfigurationProperties 注解的配置属性类 + */ + @GetMapping("/test01") + public OrderProperties test01() { + return orderProperties; + } + + @Value(value = "${order.pay-timeout-seconds}") + private Integer payTimeoutSeconds; + @Value(value = "${order.create-frequency-seconds}") + private Integer createFrequencySeconds; + + /** + * 测试 @Value 注解的属性 + */ + @GetMapping("/test02") + public Map test02() { + Map result = new HashMap<>(); + result.put("payTimeoutSeconds", payTimeoutSeconds); + result.put("createFrequencySeconds", createFrequencySeconds); + return result; + } + +} diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml new file mode 100644 index 000000000..4bb5b8a86 --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml @@ -0,0 +1,6 @@ +# rocketmq 配置项，对应 RocketMQProperties 配置类 +rocketmq: + name-server: 127.0.0.1:9876 # RocketMQ Namesrv + +server: + port: 8081 diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml new file mode 100644 index 000000000..6ae779eeb --- /dev/null +++ b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml @@ -0,0 +1,9 @@ +spring: + application: + name: user-application + + cloud: + # Spring Cloud Config Client 配置项，对应 ConfigClientProperties 类 + config: + uri: http://127.0.0.1:8888 # Spring Cloud Config Server 的地址 + name: ${spring.application.name} # 读取的配置文件的名字，默认为 ${spring.application.name} diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java similarity index 95% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java rename to labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java index 1d1d7cb11..76ed381e1 100644 --- a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/binder/ConsulSendingHandler.java +++ b/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx29.listenerdemo.binder; +package org.springframework.cloud.consul.binder; import com.ecwid.consul.v1.ConsulClient; import com.ecwid.consul.v1.QueryParams; From 98285e40ccdf697dfab97326a049866867bf9cfd Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 12 Jun 2020 22:59:42 +0800 Subject: [PATCH 027/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 6 ------ .../pom.xml | 18 +++++------------- .../ConfigServerApplication.java | 2 +- .../src/main/resources/application.yml | 7 ++++--- .../pom.xml | 18 +++++------------- .../userapplication/UserApplication.java | 2 +- .../config/OrderProperties.java | 2 +- .../controller/DemoController.java | 4 ++-- .../src/main/resources/application.yml | 9 +++++++++ .../src/main/resources/bootstrap.yml | 0 labx-29/pom.xml | 3 +++ 11 files changed, 31 insertions(+), 40 deletions(-) delete mode 100644 labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus => labx-29-sc-config-server-git-auto-refresh-by-bus}/pom.xml (77%) rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/configserverdemo/ConfigServerApplication.java (87%) rename labx-29/{labx-20-sc-config-server-git-auto-refresh-by-bus => labx-29-sc-config-server-git-auto-refresh-by-bus}/src/main/resources/application.yml (85%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus => labx-29-sc-config-user-application-auto-refresh-by-bus}/pom.xml (76%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/UserApplication.java (84%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/config/OrderProperties.java (93%) rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20 => labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29}/userapplication/controller/DemoController.java (91%) create mode 100644 labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename labx-29/{labx-20-sc-config-user-application-auto-refresh-by-bus => labx-29-sc-config-user-application-auto-refresh-by-bus}/src/main/resources/bootstrap.yml (100%) diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml deleted file mode 100644 index 4bb5b8a86..000000000 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv - -server: - port: 8081 diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml similarity index 77% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml index 12be52485..eb3266588 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/pom.xml +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml @@ -3,20 +3,19 @@ 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"> - labx-12 + labx-29 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 - labx-20-sc-config-server-git-auto-refresh-by-bus + labx-29-sc-config-server-git-auto-refresh-by-bus 1.8 1.8 2.2.4.RELEASE Hoxton.SR1 - 2.2.0.RELEASE + - com.alibaba.cloud - spring-cloud-starter-bus-rocketmq + org.springframework.cloud + spring-cloud-starter-consul-bus diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java similarity index 87% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java index 8a941740e..0c06eaeee 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/configserverdemo/ConfigServerApplication.java +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.configserverdemo; +package cn.iocoder.springcloud.labx29.configserverdemo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml similarity index 85% rename from labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml index 0b07c33c9..08dd620e5 100644 --- a/labx-29/labx-20-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml +++ b/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml @@ -19,6 +19,7 @@ spring: # username: ${CODING_USERNAME} # 账号 # password: ${CODING_PASSWORD} # 密码 -# rocketmq 配置项，对应 RocketMQProperties 配置类 -rocketmq: - name-server: 127.0.0.1:9876 # RocketMQ Namesrv + # Consul + consul: + host: 127.0.0.1 + port: 8500 diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml similarity index 76% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml index 4a7d09d5a..c7b67ab27 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/pom.xml +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml @@ -3,20 +3,19 @@ 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"> - labx-12 + labx-29 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 - labx-20-sc-config-user-application-auto-refresh-by-bus + labx-29-sc-config-user-application-auto-refresh-by-bus 1.8 1.8 2.2.4.RELEASE Hoxton.SR1 - 2.2.0.RELEASE + - com.alibaba.cloud - spring-cloud-starter-bus-rocketmq + org.springframework.cloud + spring-cloud-starter-consul-bus diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java similarity index 84% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java index 246d51142..30fbebb95 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/UserApplication.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.userapplication; +package cn.iocoder.springcloud.labx29.userapplication; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java similarity index 93% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java index 48d3dd537..326ecb684 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/config/OrderProperties.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java @@ -1,4 +1,4 @@ -package cn.iocoder.springcloud.labx20.userapplication.config; +package cn.iocoder.springcloud.labx29.userapplication.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java similarity index 91% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java index 4dca3287d..fc35e8615 100644 --- a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx20/userapplication/controller/DemoController.java +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java @@ -1,6 +1,6 @@ -package cn.iocoder.springcloud.labx20.userapplication.controller; +package cn.iocoder.springcloud.labx29.userapplication.controller; -import cn.iocoder.springcloud.labx20.userapplication.config.OrderProperties; +import cn.iocoder.springcloud.labx29.userapplication.config.OrderProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cloud.context.config.annotation.RefreshScope; diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml new file mode 100644 index 000000000..8ed25b849 --- /dev/null +++ b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml @@ -0,0 +1,9 @@ +spring: + cloud: + # Consul + consul: + host: 127.0.0.1 + port: 8500 + +server: + port: 8081 diff --git a/labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml b/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml similarity index 100% rename from labx-29/labx-20-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml rename to labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml diff --git a/labx-29/pom.xml b/labx-29/pom.xml index 9a715297a..0522e4e0f 100644 --- a/labx-29/pom.xml +++ b/labx-29/pom.xml @@ -15,6 +15,9 @@ labx-29-sc-bus-consul-demo-publisher labx-29-sc-bus-consul-demo-listener labx-29-sc-bus-consul-demo-listener-actuator + + labx-29-sc-config-server-git-auto-refresh-by-bus + labx-29-sc-config-user-application-auto-refresh-by-bus From 43d33e3b255f881393dcd42558825714ecdf7c7d Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 13 Jun 2020 00:55:00 +0800 Subject: [PATCH 028/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Consul=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++++-- ...277 Bus Consul \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 "labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 709932fdb..843f03691 100644 --- a/README.md +++ b/README.md @@ -170,8 +170,8 @@ * [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01) * [《芋道 Spring Cloud Netflix 注册中心 Eureka 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Eureka?github) 对应 [labx-22](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-22) * [《芋道 Spring Cloud 注册中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Discovery/?github) 对应 [labx-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-25) -* 《芋道 Spring Cloud 注册中心 Consul 入门》计划中... -* 《芋道 Spring Cloud 注册中心 Etcd 入门》计划中... +* [《芋道 Spring Cloud 注册中心 Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Consul-Discovery/?github) 对应 [labx-27](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-27) +* [《芋道 Spring Cloud 注册中心 Etcd 入门》](http://www.iocoder.cn/Spring-Cloud/Etcd/?github) ## 服务调用 @@ -204,6 +204,8 @@ * [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09) * [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12) * [《芋道 Spring Cloud 配置中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Config/?github) 对应 [labx-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-26) +* [《芋道 Spring Cloud 配置中心 Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Consul-Config/?github) 对应 [labx-28](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-28) +* [《芋道 Spring Cloud 配置中心 Etcd 入门》](http://www.iocoder.cn/Spring-Cloud/Etcd/?github) ## 消息队列 @@ -217,6 +219,7 @@ * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) * [《芋道 Spring Cloud 事件总线 Bus RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-RabbitMQ/?github) 对应 [labx-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-19) * [《芋道 Spring Cloud 事件总线 Bus Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Kafka/?github) 对应 [labx-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-18) +* [《芋道 Spring Cloud 事件总线 Bus Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Consul/?github) 对应 [labx-29](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-29) ## 分布式事务 diff --git "a/labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" "b/labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..1fb466904 --- /dev/null +++ "b/labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index 2a28e45b1..6db5e3d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ - labx-29 + From 53698a50afa049347d6ac0663411ec96ae4d3e65 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 13 Jun 2020 21:51:59 +0800 Subject: [PATCH 029/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20grpc=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-64-grpc-demo-user-service-api/pom.xml | 72 +++++++++++++++++++ .../src/main/proto/UserService.proto | 32 +++++++++ .../lab-64-grpc-demo-user-service/pom.xml | 22 ++++++ .../userservice/UserServiceApplication.java | 4 ++ .../userservice/rpc/UserServiceGrpcImpl.java | 28 ++++++++ lab-64/lab-64-grpc-demo/pom.xml | 20 ++++++ lab-64/pom.xml | 19 +++++ pom.xml | 1 + 8 files changed, 198 insertions(+) create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java create mode 100644 lab-64/lab-64-grpc-demo/pom.xml create mode 100644 lab-64/pom.xml diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml new file mode 100644 index 000000000..7eeb78c05 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml @@ -0,0 +1,72 @@ + + + + lab-64-grpc-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-demo-user-service-api + + + + 1.23.0 + + 1.8 + 1.8 + 1.6.2 + 0.6.1 + 3.4.1 + + + + + io.grpc + grpc-protobuf + ${io.grpc.version} + + + io.grpc + grpc-stub + ${io.grpc.version} + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + + com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier} + + grpc-java + + io.grpc:protoc-gen-grpc-java:1.23.0:exe:${os.detected.classifier} + + + + + + compile + compile-custom + + + + + + + + diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto new file mode 100644 index 000000000..e06d940d4 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto @@ -0,0 +1,32 @@ +syntax = "proto3"; +option java_multiple_files = true; + +package cn.iocoder.springboot.lab64.userservice.api; + +message UserGetRequest { + int32 id = 1; +} + +message UserGetResponse { + int32 id = 1; + string name = 2; + int32 gender = 3; +} + +message UserCreateRequest { + string name = 1; + int32 gender = 2; +} + +message UserCreateResponse { + int32 id = 1; +} + +service UserService { + + rpc get(UserGetRequest) returns (UserGetResponse); + + rpc create(UserCreateRequest) returns (UserCreateResponse); + +} + diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml new file mode 100644 index 000000000..0c210348d --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml @@ -0,0 +1,22 @@ + + + + lab-64-grpc-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-demo-user-service + + + + cn.iocoder.springboot.labs + lab-64-grpc-demo-user-service-api + 1.0-SNAPSHOT + + + + diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java new file mode 100644 index 000000000..b3076cf2b --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java @@ -0,0 +1,4 @@ +package cn.iocoder.springboot.lab64.userservice; + +public class UserServiceApplication { +} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java new file mode 100644 index 000000000..4a8fab863 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab64.userservice.rpc; + +import cn.iocoder.springboot.lab64.userservice.api.*; +import io.grpc.stub.StreamObserver; + +public class UserServiceGrpcImpl extends UserServiceGrpc.UserServiceImplBase { + + @Override + public void get(UserGetRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserGetResponse.Builder builder = UserGetResponse.newBuilder(); + builder.setId(request.getId()) + .setName("没有昵称：" + request.getId()) + .setGender(request.getId() % 2 + 1); + // 返回响应 + responseObserver.onNext(builder.build()); + } + + @Override + public void create(UserCreateRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserCreateResponse.Builder builder = UserCreateResponse.newBuilder(); + builder.setId((int) (System.currentTimeMillis() / 1000)); + // 返回响应 + responseObserver.onNext(builder.build()); + } + +} diff --git a/lab-64/lab-64-grpc-demo/pom.xml b/lab-64/lab-64-grpc-demo/pom.xml new file mode 100644 index 000000000..cbbc8185a --- /dev/null +++ b/lab-64/lab-64-grpc-demo/pom.xml @@ -0,0 +1,20 @@ + + + + lab-64 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-demo + pom + + lab-64-grpc-demo-user-service + lab-64-grpc-demo-user-service-api + + + + diff --git a/lab-64/pom.xml b/lab-64/pom.xml new file mode 100644 index 000000000..e63428147 --- /dev/null +++ b/lab-64/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64 + + pom + + lab-64-grpc-demo + + + diff --git a/pom.xml b/pom.xml index 6db5e3d3e..5e1ea7c4e 100644 --- a/pom.xml +++ b/pom.xml @@ -106,6 +106,7 @@ + lab-64 From 5dc20cda8eb57dcf805866de9ec69f2558be47b5 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 13 Jun 2020 23:12:34 +0800 Subject: [PATCH 030/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20grpc=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-64-grpc-demo-application/pom.xml | 55 +++++++++++++++++++ .../lab64/demo/DemoApplication.java | 14 +++++ .../lab64/demo/config/GrpcConfig.java | 31 +++++++++++ .../lab64/demo/controller/DemoController.java | 39 +++++++++++++ .../lab-64-grpc-demo-user-service-api/pom.xml | 1 - .../lab-64-grpc-demo-user-service/pom.xml | 33 +++++++++++ .../userservice/UserServiceApplication.java | 14 +++++ .../lab64/userservice/config/GrpcConfig.java | 32 +++++++++++ .../userservice/rpc/UserServiceGrpcImpl.java | 4 ++ lab-64/lab-64-grpc-demo/pom.xml | 1 + 10 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java create mode 100644 lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml new file mode 100644 index 000000000..bbb142d88 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml @@ -0,0 +1,55 @@ + + + + lab-64-grpc-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-demo-application + + + + 1.23.0 + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + cn.iocoder.springboot.labs + lab-64-grpc-demo-user-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + io.grpc + grpc-netty + ${io.grpc.version} + + + + diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java new file mode 100644 index 000000000..a7b0d8b19 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab64.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java new file mode 100644 index 000000000..99e6027d9 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java @@ -0,0 +1,31 @@ +package cn.iocoder.springboot.lab64.demo.config; + +import cn.iocoder.springboot.lab64.userservice.api.UserServiceGrpc; +import io.grpc.ManagedChannel; +import io.grpc.netty.NettyChannelBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class GrpcConfig { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + private static final Integer GRPC_PORT = 8888; + + @Bean + public ManagedChannel userGrpcManagedChannel() { + return NettyChannelBuilder.forAddress("127.0.0.1", GRPC_PORT).usePlaintext().build(); + } + + @Bean + public UserServiceGrpc.UserServiceBlockingStub userServiceGrpc() { + // 创建 ManagedChannel 对象 + ManagedChannel userGrpcManagedChannel = this.userGrpcManagedChannel(); + // 创建 UserServiceGrpc 对象 + return UserServiceGrpc.newBlockingStub(userGrpcManagedChannel); + } + +} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java new file mode 100644 index 000000000..30934eaca --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java @@ -0,0 +1,39 @@ +package cn.iocoder.springboot.lab64.demo.controller; + +import cn.iocoder.springboot.lab64.userservice.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private UserServiceGrpc.UserServiceBlockingStub userServiceGrpc; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + // 创建请求 + UserGetRequest request = UserGetRequest.newBuilder().setId(id).build(); + // 执行 gRPC 请求 + UserGetResponse response = userServiceGrpc.get(request); + // 响应 + return response.getName(); + } + + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 创建请求 + UserCreateRequest request = UserCreateRequest.newBuilder() + .setName(name).setGender(gender).build(); + // 执行 gRPC 请求 + UserCreateResponse response = userServiceGrpc.create(request); + // 响应 + return response.getId(); + } + +} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml index 7eeb78c05..69444d8dc 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml @@ -19,7 +19,6 @@ 1.8 1.6.2 0.6.1 - 3.4.1 diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml index 0c210348d..b708a015f 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml @@ -11,12 +11,45 @@ lab-64-grpc-demo-user-service + + + 1.23.0 + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + cn.iocoder.springboot.labs lab-64-grpc-demo-user-service-api 1.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter + + + + io.grpc + grpc-netty + ${io.grpc.version} + diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java index b3076cf2b..e588f0bf8 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java @@ -1,4 +1,18 @@ package cn.iocoder.springboot.lab64.userservice; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.concurrent.CountDownLatch; + +@SpringBootApplication public class UserServiceApplication { + + public static void main(String[] args) throws InterruptedException { + // 启动 Spring Boot 应用 + SpringApplication.run(UserServiceApplication.class, args); + // 阻塞，避免应用退出 + new CountDownLatch(1).await(); + } + } diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java new file mode 100644 index 000000000..fe8362b53 --- /dev/null +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab64.userservice.config; + +import cn.iocoder.springboot.lab64.userservice.rpc.UserServiceGrpcImpl; +import io.grpc.Server; +import io.grpc.ServerBuilder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.io.IOException; + +@Configuration +public class GrpcConfig { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + private static final Integer GRPC_PORT = 8888; + + @Bean + public Server grpcServer(final UserServiceGrpcImpl userServiceGrpc) throws IOException { + // 创建 gRPC Server 对象 + Server server = ServerBuilder.forPort(GRPC_PORT) + .addService(userServiceGrpc) + .build(); + // 启动 gRPC Server + server.start(); + logger.info("[grpcServer][启动完成，端口为({})]", server.getPort()); + return server; + } + +} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java index 4a8fab863..ec289a581 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java @@ -2,7 +2,9 @@ import cn.iocoder.springboot.lab64.userservice.api.*; import io.grpc.stub.StreamObserver; +import org.springframework.stereotype.Service; +@Service public class UserServiceGrpcImpl extends UserServiceGrpc.UserServiceImplBase { @Override @@ -14,6 +16,7 @@ public void get(UserGetRequest request, StreamObserver response .setGender(request.getId() % 2 + 1); // 返回响应 responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); } @Override @@ -23,6 +26,7 @@ public void create(UserCreateRequest request, StreamObserver builder.setId((int) (System.currentTimeMillis() / 1000)); // 返回响应 responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); } } diff --git a/lab-64/lab-64-grpc-demo/pom.xml b/lab-64/lab-64-grpc-demo/pom.xml index cbbc8185a..d724e9314 100644 --- a/lab-64/lab-64-grpc-demo/pom.xml +++ b/lab-64/lab-64-grpc-demo/pom.xml @@ -14,6 +14,7 @@ lab-64-grpc-demo-user-service lab-64-grpc-demo-user-service-api + lab-64-grpc-demo-application From 08e53883ad0eb1585832ccd164ac6a29fada3627 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 14 Jun 2020 11:47:35 +0800 Subject: [PATCH 031/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20grpc=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-64-grpc-demo-application/pom.xml | 2 + .../lab64/demo/config/GrpcConfig.java | 8 +-- .../lab64/demo/controller/DemoController.java | 2 +- .../lab-64-grpc-demo-user-service-api/pom.xml | 14 ++-- .../src/main/proto/UserService.proto | 1 - .../lab-64-grpc-demo-user-service/pom.xml | 4 +- .../lab64/userservice/config/GrpcConfig.java | 3 + .../lab-64-grpc-starter-application/pom.xml | 56 +++++++++++++++ .../lab64/demo/DemoApplication.java | 14 ++++ .../lab64/demo/controller/DemoController.java | 39 ++++++++++ .../src/main/resources/application.yml | 6 ++ .../pom.xml | 71 +++++++++++++++++++ .../src/main/proto/UserService.proto | 31 ++++++++ .../lab-64-grpc-starter-user-service/pom.xml | 56 +++++++++++++++ .../userservice/UserServiceApplication.java | 14 ++++ .../userservice/rpc/UserServiceGrpcImpl.java | 32 +++++++++ .../src/main/resources/application.yml | 4 ++ lab-64/lab-64-grpc-starter/pom.xml | 21 ++++++ lab-64/pom.xml | 1 + 19 files changed, 363 insertions(+), 16 deletions(-) create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/pom.xml create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/resources/application.yml create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/pom.xml create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/src/main/proto/UserService.proto create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/pom.xml create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java create mode 100644 lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/resources/application.yml create mode 100644 lab-64/lab-64-grpc-starter/pom.xml diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml index bbb142d88..ab73d9317 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/pom.xml @@ -33,6 +33,7 @@ + cn.iocoder.springboot.labs lab-64-grpc-demo-user-service-api @@ -45,6 +46,7 @@ spring-boot-starter-web + io.grpc grpc-netty diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java index 99e6027d9..801b2250a 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/config/GrpcConfig.java @@ -2,22 +2,18 @@ import cn.iocoder.springboot.lab64.userservice.api.UserServiceGrpc; import io.grpc.ManagedChannel; -import io.grpc.netty.NettyChannelBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import io.grpc.ManagedChannelBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class GrpcConfig { - private final Logger logger = LoggerFactory.getLogger(getClass()); - private static final Integer GRPC_PORT = 8888; @Bean public ManagedChannel userGrpcManagedChannel() { - return NettyChannelBuilder.forAddress("127.0.0.1", GRPC_PORT).usePlaintext().build(); + return ManagedChannelBuilder.forAddress("127.0.0.1", GRPC_PORT).usePlaintext().build(); } @Bean diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java index 30934eaca..857698eee 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java @@ -26,7 +26,7 @@ public String get(@RequestParam("id") Integer id) { @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping public Integer create(@RequestParam("name") String name, - @RequestParam("gender") Integer gender) { + @RequestParam("gender") Integer gender) { // 创建请求 UserCreateRequest request = UserCreateRequest.newBuilder() .setName(name).setGender(gender).build(); diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml index 69444d8dc..3ea70853b 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/pom.xml @@ -13,7 +13,7 @@ - 1.23.0 + 1.30.0 1.8 1.8 @@ -22,11 +22,13 @@ + io.grpc grpc-protobuf ${io.grpc.version} + io.grpc grpc-stub @@ -36,6 +38,7 @@ + kr.motd.maven os-maven-plugin @@ -43,18 +46,15 @@ + org.xolstice.maven.plugins protobuf-maven-plugin ${protobuf-maven-plugin.version} - - com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier} - grpc-java - - io.grpc:protoc-gen-grpc-java:1.23.0:exe:${os.detected.classifier} - + com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto index e06d940d4..c3c6ef211 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service-api/src/main/proto/UserService.proto @@ -29,4 +29,3 @@ service UserService { rpc create(UserCreateRequest) returns (UserCreateResponse); } - diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml index b708a015f..49e81154e 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/pom.xml @@ -13,7 +13,7 @@ - 1.23.0 + 1.30.0 2.2.4.RELEASE 1.8 @@ -33,6 +33,7 @@ + cn.iocoder.springboot.labs lab-64-grpc-demo-user-service-api @@ -45,6 +46,7 @@ spring-boot-starter + io.grpc grpc-netty diff --git a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java index fe8362b53..a593124c8 100644 --- a/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java +++ b/lab-64/lab-64-grpc-demo/lab-64-grpc-demo-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/config/GrpcConfig.java @@ -15,6 +15,9 @@ public class GrpcConfig { private final Logger logger = LoggerFactory.getLogger(getClass()); + /** + * gRPC Server 端口 + */ private static final Integer GRPC_PORT = 8888; @Bean diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/pom.xml b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/pom.xml new file mode 100644 index 000000000..a82dd0a6e --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/pom.xml @@ -0,0 +1,56 @@ + + + + lab-64-grpc-starter + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-starter-application + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-64-grpc-starter-user-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + net.devh + grpc-client-spring-boot-starter + 2.8.0.RELEASE + + + + diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java new file mode 100644 index 000000000..a7b0d8b19 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab64.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java new file mode 100644 index 000000000..3fdc7c845 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/java/cn/iocoder/springboot/lab64/demo/controller/DemoController.java @@ -0,0 +1,39 @@ +package cn.iocoder.springboot.lab64.demo.controller; + +import cn.iocoder.springboot.lab64.userservice.api.*; +import net.devh.boot.grpc.client.inject.GrpcClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @GrpcClient("userService") + private UserServiceGrpc.UserServiceBlockingStub userServiceGrpc; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + // 创建请求 + UserGetRequest request = UserGetRequest.newBuilder().setId(id).build(); + // 执行 gRPC 请求 + UserGetResponse response = userServiceGrpc.get(request); + // 响应 + return response.getName(); + } + + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 创建请求 + UserCreateRequest request = UserCreateRequest.newBuilder() + .setName(name).setGender(gender).build(); + // 执行 gRPC 请求 + UserCreateResponse response = userServiceGrpc.create(request); + // 响应 + return response.getId(); + } + +} diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/resources/application.yml b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/resources/application.yml new file mode 100644 index 000000000..4c429ab86 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-application/src/main/resources/application.yml @@ -0,0 +1,6 @@ +grpc: + # gRPC 客户端配置，对应 GrpcChannelsProperties 配置类的映射 + client: + userService: + address: 'static://127.0.0.1:8888' # 用户服务的地址 + negotiation-type: plaintext diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/pom.xml b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/pom.xml new file mode 100644 index 000000000..3fe23cc32 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/pom.xml @@ -0,0 +1,71 @@ + + + + lab-64-grpc-starter + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-starter-user-service-api + + + + 1.30.0 + + 1.8 + 1.8 + 1.6.2 + 0.6.1 + + + + + + io.grpc + grpc-protobuf + ${io.grpc.version} + + + + io.grpc + grpc-stub + ${io.grpc.version} + + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + grpc-java + com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} + + + + + compile + compile-custom + + + + + + + + diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/src/main/proto/UserService.proto b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/src/main/proto/UserService.proto new file mode 100644 index 000000000..c3c6ef211 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service-api/src/main/proto/UserService.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; +option java_multiple_files = true; + +package cn.iocoder.springboot.lab64.userservice.api; + +message UserGetRequest { + int32 id = 1; +} + +message UserGetResponse { + int32 id = 1; + string name = 2; + int32 gender = 3; +} + +message UserCreateRequest { + string name = 1; + int32 gender = 2; +} + +message UserCreateResponse { + int32 id = 1; +} + +service UserService { + + rpc get(UserGetRequest) returns (UserGetResponse); + + rpc create(UserCreateRequest) returns (UserCreateResponse); + +} diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/pom.xml b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/pom.xml new file mode 100644 index 000000000..019efab03 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/pom.xml @@ -0,0 +1,56 @@ + + + + lab-64-grpc-starter + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-starter-user-service + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + lab-64-grpc-starter-user-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + net.devh + grpc-server-spring-boot-starter + 2.8.0.RELEASE + + + + diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java new file mode 100644 index 000000000..78f2966f6 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/UserServiceApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab64.userservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UserServiceApplication { + + public static void main(String[] args) throws InterruptedException { + // 启动 Spring Boot 应用 + SpringApplication.run(UserServiceApplication.class, args); + } + +} diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java new file mode 100644 index 000000000..2e9068435 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/java/cn/iocoder/springboot/lab64/userservice/rpc/UserServiceGrpcImpl.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab64.userservice.rpc; + +import cn.iocoder.springboot.lab64.userservice.api.*; +import io.grpc.stub.StreamObserver; +import net.devh.boot.grpc.server.service.GrpcService; + +@GrpcService +public class UserServiceGrpcImpl extends UserServiceGrpc.UserServiceImplBase { + + @Override + public void get(UserGetRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserGetResponse.Builder builder = UserGetResponse.newBuilder(); + builder.setId(request.getId()) + .setName("没有昵称：" + request.getId()) + .setGender(request.getId() % 2 + 1); + // 返回响应 + responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); + } + + @Override + public void create(UserCreateRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserCreateResponse.Builder builder = UserCreateResponse.newBuilder(); + builder.setId((int) (System.currentTimeMillis() / 1000)); + // 返回响应 + responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); + } + +} diff --git a/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/resources/application.yml b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/resources/application.yml new file mode 100644 index 000000000..15c20088b --- /dev/null +++ b/lab-64/lab-64-grpc-starter/lab-64-grpc-starter-user-service/src/main/resources/application.yml @@ -0,0 +1,4 @@ +grpc: + # gRPC 服务器配置，对应 GrpcServerProperties 配置类 + server: + port: 8888 diff --git a/lab-64/lab-64-grpc-starter/pom.xml b/lab-64/lab-64-grpc-starter/pom.xml new file mode 100644 index 000000000..aefca10b8 --- /dev/null +++ b/lab-64/lab-64-grpc-starter/pom.xml @@ -0,0 +1,21 @@ + + + + lab-64 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-64-grpc-starter + pom + + lab-64-grpc-starter-user-service + lab-64-grpc-starter-user-service-api + lab-64-grpc-starter-application + + + + diff --git a/lab-64/pom.xml b/lab-64/pom.xml index e63428147..95b3bb1fa 100644 --- a/lab-64/pom.xml +++ b/lab-64/pom.xml @@ -14,6 +14,7 @@ pom lab-64-grpc-demo + lab-64-grpc-starter From 5c41b74259d9717a6c61bb4044e8956a8abe15a4 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 14 Jun 2020 22:05:35 +0800 Subject: [PATCH 032/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20grpc=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...23 Spring Boot gRPC \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 "lab-64/\343\200\212\350\212\213\351\201\223 Spring Boot gRPC \345\205\245\351\227\250\343\200\213.md" diff --git "a/lab-64/\343\200\212\350\212\213\351\201\223 Spring Boot gRPC \345\205\245\351\227\250\343\200\213.md" "b/lab-64/\343\200\212\350\212\213\351\201\223 Spring Boot gRPC \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..57f8cb1af --- /dev/null +++ "b/lab-64/\343\200\212\350\212\213\351\201\223 Spring Boot gRPC \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index 5e1ea7c4e..f2f8a507d 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,7 @@ + @@ -106,7 +107,6 @@ - lab-64 From 211fab1dad5f2c33d402f76fd854e0b4350f62c9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 14 Jun 2020 22:16:42 +0800 Subject: [PATCH 033/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20cloud=20+=20grpc?= =?UTF-8?q?=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labx-30-grpc-cloud-application/pom.xml | 56 +++++++++++++++ .../labx30/demo/DemoApplication.java | 14 ++++ .../demo/controller/DemoController.java | 39 ++++++++++ .../src/main/resources/application.yml | 6 ++ .../pom.xml | 71 +++++++++++++++++++ .../src/main/proto/UserService.proto | 31 ++++++++ .../labx-30-grpc-cloud-user-service/pom.xml | 56 +++++++++++++++ .../userservice/UserServiceApplication.java | 14 ++++ .../userservice/rpc/UserServiceGrpcImpl.java | 32 +++++++++ .../src/main/resources/application.yml | 4 ++ labx-30/labx-30-grpc-cloud/pom.xml | 21 ++++++ labx-30/pom.xml | 19 +++++ pom.xml | 1 + 13 files changed, 364 insertions(+) create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java create mode 100644 labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml create mode 100644 labx-30/labx-30-grpc-cloud/pom.xml create mode 100644 labx-30/pom.xml diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml new file mode 100644 index 000000000..25cf3471b --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml @@ -0,0 +1,56 @@ + + + + labx-30-grpc-cloud + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-30-grpc-cloud-application + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + labx-30-grpc-cloud-user-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + net.devh + grpc-client-spring-boot-starter + 2.8.0.RELEASE + + + + diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java new file mode 100644 index 000000000..d7e5840f9 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springcloud.labx30.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java new file mode 100644 index 000000000..4400ec6c0 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java @@ -0,0 +1,39 @@ +package cn.iocoder.springcloud.labx30.demo.controller; + +import cn.iocoder.springcloud.labx30.userservice.api.*; +import net.devh.boot.grpc.client.inject.GrpcClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @GrpcClient("userService") + private UserServiceGrpc.UserServiceBlockingStub userServiceGrpc; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + // 创建请求 + UserGetRequest request = UserGetRequest.newBuilder().setId(id).build(); + // 执行 gRPC 请求 + UserGetResponse response = userServiceGrpc.get(request); + // 响应 + return response.getName(); + } + + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 创建请求 + UserCreateRequest request = UserCreateRequest.newBuilder() + .setName(name).setGender(gender).build(); + // 执行 gRPC 请求 + UserCreateResponse response = userServiceGrpc.create(request); + // 响应 + return response.getId(); + } + +} diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml new file mode 100644 index 000000000..4c429ab86 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml @@ -0,0 +1,6 @@ +grpc: + # gRPC 客户端配置，对应 GrpcChannelsProperties 配置类的映射 + client: + userService: + address: 'static://127.0.0.1:8888' # 用户服务的地址 + negotiation-type: plaintext diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml new file mode 100644 index 000000000..683113c1e --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml @@ -0,0 +1,71 @@ + + + + labx-30-grpc-cloud + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-30-grpc-cloud-user-service-api + + + + 1.30.0 + + 1.8 + 1.8 + 1.6.2 + 0.6.1 + + + + + + io.grpc + grpc-protobuf + ${io.grpc.version} + + + + io.grpc + grpc-stub + ${io.grpc.version} + + + + + + + + kr.motd.maven + os-maven-plugin + ${os-maven-plugin.version} + + + + + + org.xolstice.maven.plugins + protobuf-maven-plugin + ${protobuf-maven-plugin.version} + + grpc-java + com.google.protobuf:protoc:3.9.1:exe:${os.detected.classifier} + io.grpc:protoc-gen-grpc-java:${io.grpc.version}:exe:${os.detected.classifier} + + + + + compile + compile-custom + + + + + + + + diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto new file mode 100644 index 000000000..c5562a03b --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto @@ -0,0 +1,31 @@ +syntax = "proto3"; +option java_multiple_files = true; + +package cn.iocoder.springcloud.labx30.userservice.api; + +message UserGetRequest { + int32 id = 1; +} + +message UserGetResponse { + int32 id = 1; + string name = 2; + int32 gender = 3; +} + +message UserCreateRequest { + string name = 1; + int32 gender = 2; +} + +message UserCreateResponse { + int32 id = 1; +} + +service UserService { + + rpc get(UserGetRequest) returns (UserGetResponse); + + rpc create(UserCreateRequest) returns (UserCreateResponse); + +} diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml new file mode 100644 index 000000000..48c0ed8f0 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml @@ -0,0 +1,56 @@ + + + + labx-30-grpc-cloud + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-30-grpc-cloud-user-service + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + cn.iocoder.springboot.labs + labx-30-grpc-cloud-user-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + net.devh + grpc-server-spring-boot-starter + 2.8.0.RELEASE + + + + diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java new file mode 100644 index 000000000..e11fcdff7 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springcloud.labx30.userservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UserServiceApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(UserServiceApplication.class, args); + } + +} diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java new file mode 100644 index 000000000..36360c1ac --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java @@ -0,0 +1,32 @@ +package cn.iocoder.springcloud.labx30.userservice.rpc; + +import cn.iocoder.springcloud.labx30.userservice.api.*; +import io.grpc.stub.StreamObserver; +import net.devh.boot.grpc.server.service.GrpcService; + +@GrpcService +public class UserServiceGrpcImpl extends UserServiceGrpc.UserServiceImplBase { + + @Override + public void get(UserGetRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserGetResponse.Builder builder = UserGetResponse.newBuilder(); + builder.setId(request.getId()) + .setName("没有昵称：" + request.getId()) + .setGender(request.getId() % 2 + 1); + // 返回响应 + responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); + } + + @Override + public void create(UserCreateRequest request, StreamObserver responseObserver) { + // 创建响应对象 + UserCreateResponse.Builder builder = UserCreateResponse.newBuilder(); + builder.setId((int) (System.currentTimeMillis() / 1000)); + // 返回响应 + responseObserver.onNext(builder.build()); + responseObserver.onCompleted(); + } + +} diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml new file mode 100644 index 000000000..15c20088b --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml @@ -0,0 +1,4 @@ +grpc: + # gRPC 服务器配置，对应 GrpcServerProperties 配置类 + server: + port: 8888 diff --git a/labx-30/labx-30-grpc-cloud/pom.xml b/labx-30/labx-30-grpc-cloud/pom.xml new file mode 100644 index 000000000..f0cf089b7 --- /dev/null +++ b/labx-30/labx-30-grpc-cloud/pom.xml @@ -0,0 +1,21 @@ + + + + labx-30 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-30-grpc-cloud + pom + + labx-30-grpc-cloud-user-service + labx-30-grpc-cloud-user-service-api + labx-30-grpc-cloud-application + + + + diff --git a/labx-30/pom.xml b/labx-30/pom.xml new file mode 100644 index 000000000..1d0c73f1b --- /dev/null +++ b/labx-30/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + labx-30 + pom + + + labx-30-grpc-cloud + + + diff --git a/pom.xml b/pom.xml index f2f8a507d..48ec434f9 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,7 @@ + labx-30 From c3956e6889f4a2f782f2c5a7b8f9acd1b08681dd Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 14 Jun 2020 22:41:54 +0800 Subject: [PATCH 034/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20cloud=20+=20grpc?= =?UTF-8?q?=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labx-30-grpc-cloud-application/pom.xml | 26 ++++++++++++++++ .../demo/controller/DemoController.java | 2 +- .../src/main/resources/application.yml | 12 ++++++-- .../labx-30-grpc-cloud-user-service/pom.xml | 30 +++++++++++++++++-- .../userservice/rpc/UserServiceGrpcImpl.java | 6 ++++ .../src/main/resources/application.yml | 14 ++++++++- 6 files changed, 84 insertions(+), 6 deletions(-) diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml index 25cf3471b..bcd21e990 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml @@ -14,11 +14,17 @@ 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE 1.8 1.8 + @@ -28,6 +34,20 @@ pom import + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + @@ -51,6 +71,12 @@ grpc-client-spring-boot-starter 2.8.0.RELEASE + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java index 4400ec6c0..1c373bc4e 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java @@ -11,7 +11,7 @@ @RequestMapping("/demo") public class DemoController { - @GrpcClient("userService") + @GrpcClient("user-service") private UserServiceGrpc.UserServiceBlockingStub userServiceGrpc; @GetMapping("/get") diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml index 4c429ab86..4fcc806c3 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml @@ -1,6 +1,14 @@ +spring: + application: + name: demo-application # 应用名 + cloud: + nacos: + # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类 + discovery: + server-addr: 127.0.0.1:8848 # Nacos 服务器地址 + grpc: # gRPC 客户端配置，对应 GrpcChannelsProperties 配置类的映射 client: - userService: - address: 'static://127.0.0.1:8888' # 用户服务的地址 + user-service: negotiation-type: plaintext diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml index 48c0ed8f0..1f2b2d09f 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml @@ -14,11 +14,17 @@ 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE 1.8 1.8 + @@ -28,6 +34,20 @@ pom import + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + @@ -39,10 +59,10 @@ 1.0-SNAPSHOT - + org.springframework.boot - spring-boot-starter + spring-boot-starter-web @@ -51,6 +71,12 @@ grpc-server-spring-boot-starter 2.8.0.RELEASE + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java index 36360c1ac..ca2f0206e 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java @@ -3,12 +3,17 @@ import cn.iocoder.springcloud.labx30.userservice.api.*; import io.grpc.stub.StreamObserver; import net.devh.boot.grpc.server.service.GrpcService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @GrpcService public class UserServiceGrpcImpl extends UserServiceGrpc.UserServiceImplBase { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override public void get(UserGetRequest request, StreamObserver responseObserver) { + logger.info("[get]"); // 创建响应对象 UserGetResponse.Builder builder = UserGetResponse.newBuilder(); builder.setId(request.getId()) @@ -21,6 +26,7 @@ public void get(UserGetRequest request, StreamObserver response @Override public void create(UserCreateRequest request, StreamObserver responseObserver) { + logger.info("[create]"); // 创建响应对象 UserCreateResponse.Builder builder = UserCreateResponse.newBuilder(); builder.setId((int) (System.currentTimeMillis() / 1000)); diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml index 15c20088b..28a21ccea 100644 --- a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml +++ b/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml @@ -1,4 +1,16 @@ +spring: + application: + name: user-service # 应用名 + cloud: + nacos: + # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类 + discovery: + server-addr: 127.0.0.1:8848 # Nacos 服务器地址 + grpc: # gRPC 服务器配置，对应 GrpcServerProperties 配置类 server: - port: 8888 + port: 0 # gRPC Server 随机端口 + +server: + port: 0 # Web Server 随机端口 From 1bcc7882f9624b7f60bd40aec00c889c7dc2f36f Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 15 Jun 2020 07:35:39 +0800 Subject: [PATCH 035/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20cloud=20+=20grpc?= =?UTF-8?q?=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 ++- ... Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 "labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 843f03691..b57d66c56 100644 --- a/README.md +++ b/README.md @@ -57,9 +57,9 @@ * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) * [《芋道 Spring Boot 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Boot/Feign/?github) 对应 [lab-58](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-58) +* [《芋道 Spring Boot gRPC 入门》](http://www.iocoder.cn/Spring-Boot/gRPC/?github) 对应 [lab-64](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-64) * [《芋道 Spring Boot SOFARPC 入门》](http://www.iocoder.cn/Spring-Boot/SOFARPC/?github) 对应 [lab-62](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-62) * [《芋道 Spring Boot Motan 入门》](http://www.iocoder.cn/Spring-Boot/Motan/?github) 对应 [lab-63](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-63) -* 《芋道 Spring Boot WebService 入门》计划中... * 《芋道 Spring Boot gRPC 入门》计划中... * 《芋道 Spring Boot RSocket 入门》计划中... @@ -178,6 +178,7 @@ * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) +* [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30) ## 服务容错 diff --git "a/labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" "b/labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..fafae1f78 --- /dev/null +++ "b/labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index 48ec434f9..0be8634ca 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,7 @@ - labx-30 + From c26967183a7a1523bad9988eaa4a6a6c0750ffaf Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 15 Jun 2020 08:38:09 +0800 Subject: [PATCH 036/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 43 +++++++++++++++++++ .../userservice/UserServiceApplication.java | 18 ++++++++ .../src/main/resources/users.xsd | 36 ++++++++++++++++ lab-65/lab-65-spring-ws-demo/pom.xml | 19 ++++++++ lab-65/pom.xml | 18 ++++++++ pom.xml | 1 + 6 files changed, 135 insertions(+) create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd create mode 100644 lab-65/lab-65-spring-ws-demo/pom.xml create mode 100644 lab-65/pom.xml diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml new file mode 100644 index 000000000..f64aeb30e --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml @@ -0,0 +1,43 @@ + + + + lab4-64-spring-ws-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-spring-ws-demo-user-service + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter + + + + + diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java new file mode 100644 index 000000000..08762ae5a --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab65.userservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.concurrent.CountDownLatch; + +@SpringBootApplication +public class UserServiceApplication { + + public static void main(String[] args) throws InterruptedException { + // 启动 Spring Boot 应用 + SpringApplication.run(UserServiceApplication.class, args); + // 阻塞，避免应用退出 + new CountDownLatch(1).await(); + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd new file mode 100644 index 000000000..8d941e482 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-65/lab-65-spring-ws-demo/pom.xml b/lab-65/lab-65-spring-ws-demo/pom.xml new file mode 100644 index 000000000..a4a807148 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/pom.xml @@ -0,0 +1,19 @@ + + + + lab-65 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab4-64-spring-ws-demo + pom + + lab-65-spring-ws-demo-user-service + + + + diff --git a/lab-65/pom.xml b/lab-65/pom.xml new file mode 100644 index 000000000..bb7ee428d --- /dev/null +++ b/lab-65/pom.xml @@ -0,0 +1,18 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65 + pom + + lab4-64-spring-ws-demo + + + diff --git a/pom.xml b/pom.xml index 0be8634ca..089fe3611 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,7 @@ + lab-65 From 1315127affc00d73bf5c34df68a944065cb01fff Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 15 Jun 2020 20:09:17 +0800 Subject: [PATCH 037/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 42 +++++++++++++++++- .../userservice/config/WebServiceConfig.java | 31 +++++++++++++ .../userservice/endpoint/UserEndpoint.java | 24 ++++++++++ .../src/main/resources/application.yml | 3 ++ .../src/main/resources/users.xsd | 44 ++++++++++--------- 5 files changed, 122 insertions(+), 22 deletions(-) create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml index f64aeb30e..75acf8f09 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml @@ -32,12 +32,50 @@ - + + + + + + + org.springframework.boot - spring-boot-starter + spring-boot-starter-web-services + + + + + wsdl4j + wsdl4j + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + 2.5.0 + + + xjc + + xjc + + + + + + ${project.basedir}/src/main/resources/users.xsd + + cn.iocoder.springboot.lab65.userservice.model + + + + + diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java new file mode 100644 index 000000000..40fed7768 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java @@ -0,0 +1,31 @@ +package cn.iocoder.springboot.lab65.userservice.config; + +import org.springframework.boot.autoconfigure.webservices.WebServicesProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; +import org.springframework.xml.xsd.SimpleXsdSchema; +import org.springframework.xml.xsd.XsdSchema; + +@Configuration +public class WebServiceConfig { + + public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; + + @Bean + public XsdSchema usersSchema() { + return new SimpleXsdSchema(new ClassPathResource("users.xsd")); + } + + @Bean(name = "users") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema usersSchema, WebServicesProperties properties) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setLocationUri(properties.getPath()); + wsdl11Definition.setTargetNamespace(NAMESPACE_URI); + wsdl11Definition.setSchema(usersSchema); + wsdl11Definition.setPortTypeName("UsersPort"); + return wsdl11Definition; + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java new file mode 100644 index 000000000..b6c6cba38 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java @@ -0,0 +1,24 @@ +package cn.iocoder.springboot.lab65.userservice.endpoint; + +import cn.iocoder.springboot.lab65.userservice.config.WebServiceConfig; +import cn.iocoder.springboot.lab65.userservice.model.UserGetRequest; +import cn.iocoder.springboot.lab65.userservice.model.UserGetResponse; +import org.springframework.ws.server.endpoint.annotation.Endpoint; +import org.springframework.ws.server.endpoint.annotation.PayloadRoot; +import org.springframework.ws.server.endpoint.annotation.RequestPayload; +import org.springframework.ws.server.endpoint.annotation.ResponsePayload; + +@Endpoint +public class UserEndpoint { + + @PayloadRoot(namespace = WebServiceConfig.NAMESPACE_URI, localPart = "UserGetRequest") + @ResponsePayload + public UserGetResponse get(@RequestPayload UserGetRequest request) { + UserGetResponse response = new UserGetResponse(); + response.setId(request.getId()); + response.setName("没有昵称：" + request.getId()); + response.setGender(request.getId() % 2 + 1); + return response; + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml new file mode 100644 index 000000000..b49781bb9 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml @@ -0,0 +1,3 @@ +spring: + webservices: + path: /ws diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd index 8d941e482..742ec690b 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd @@ -1,36 +1,40 @@ - + - + + + + + + + + + + + - + - + + - - - - - - - - + + + + + + + - - - - - - - From 65bbd8a6bc562011918becef67986dd34e9f47f8 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 16 Jun 2020 00:37:19 +0800 Subject: [PATCH 038/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 14 +++------- .../userservice/config/WebServiceConfig.java | 28 +++++++++++++------ .../userservice/endpoint/UserEndpoint.java | 10 +++++++ .../src/main/resources/application.yml | 3 -- 4 files changed, 34 insertions(+), 21 deletions(-) delete mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml index 75acf8f09..08e63b836 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml @@ -32,29 +32,22 @@ - - - - - - org.springframework.boot spring-boot-starter-web-services - + wsdl4j wsdl4j - - + org.codehaus.mojo jaxb2-maven-plugin @@ -68,13 +61,14 @@ + ${project.basedir}/src/main/resources/users.xsd + cn.iocoder.springboot.lab65.userservice.model - diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java index 40fed7768..d57c8d7c0 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java @@ -1,31 +1,43 @@ package cn.iocoder.springboot.lab65.userservice.config; -import org.springframework.boot.autoconfigure.webservices.WebServicesProperties; +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.transport.http.MessageDispatcherServlet; import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; import org.springframework.xml.xsd.SimpleXsdSchema; import org.springframework.xml.xsd.XsdSchema; @Configuration +@EnableWs // 开启 Web Services 服务 public class WebServiceConfig { public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + return new ServletRegistrationBean<>(servlet, "/ws/*"); + } + @Bean public XsdSchema usersSchema() { return new SimpleXsdSchema(new ClassPathResource("users.xsd")); } - @Bean(name = "users") - public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema usersSchema, WebServicesProperties properties) { - DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); - wsdl11Definition.setLocationUri(properties.getPath()); - wsdl11Definition.setTargetNamespace(NAMESPACE_URI); - wsdl11Definition.setSchema(usersSchema); + @Bean(name = "users") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema usersSchema) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setLocationUri("/ws"); + wsdl11Definition.setTargetNamespace(NAMESPACE_URI); + wsdl11Definition.setSchema(usersSchema); wsdl11Definition.setPortTypeName("UsersPort"); return wsdl11Definition; - } + } } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java index b6c6cba38..6dee32ce3 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java @@ -1,6 +1,8 @@ package cn.iocoder.springboot.lab65.userservice.endpoint; import cn.iocoder.springboot.lab65.userservice.config.WebServiceConfig; +import cn.iocoder.springboot.lab65.userservice.model.UserCreateRequest; +import cn.iocoder.springboot.lab65.userservice.model.UserCreateResponse; import cn.iocoder.springboot.lab65.userservice.model.UserGetRequest; import cn.iocoder.springboot.lab65.userservice.model.UserGetResponse; import org.springframework.ws.server.endpoint.annotation.Endpoint; @@ -21,4 +23,12 @@ public UserGetResponse get(@RequestPayload UserGetRequest request) { return response; } + @PayloadRoot(namespace = WebServiceConfig.NAMESPACE_URI, localPart = "UserCreateRequest") + @ResponsePayload + public UserCreateResponse create(@RequestPayload UserCreateRequest request) { + UserCreateResponse response = new UserCreateResponse(); + response.setId((int) (System.currentTimeMillis() / 1000)); + return response; + } + } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml deleted file mode 100644 index b49781bb9..000000000 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/application.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - webservices: - path: /ws From 7fc06d784095b29c25044efdc0121a596c35f834 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 16 Jun 2020 08:06:17 +0800 Subject: [PATCH 039/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-65-spring-ws-demo-application/pom.xml | 75 +++++++++++++++++++ .../lab65/demo/DemoApplication.java | 14 ++++ .../lab65/demo/client/UserClient.java | 21 ++++++ .../lab65/demo/config/WebServicesConfig.java | 27 +++++++ .../lab65/demo/controller/DemoController.java | 38 ++++++++++ .../src/main/resources/application.yml | 2 + ...viceConfig.java => WebServicesConfig.java} | 2 +- .../userservice/endpoint/UserEndpoint.java | 6 +- lab-65/lab-65-spring-ws-demo/pom.xml | 1 + 9 files changed, 182 insertions(+), 4 deletions(-) create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java create mode 100644 lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml rename lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/{WebServiceConfig.java => WebServicesConfig.java} (98%) diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml new file mode 100644 index 000000000..5aa73d5bb --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml @@ -0,0 +1,75 @@ + + + + lab4-64-spring-ws-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-spring-ws-demo-application + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web-services + + + + + wsdl4j + wsdl4j + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.14.0 + + + + generate + + + + + WSDL + + + http://localhost:8080/ws/users.wsdl + + + cn.iocoder.springboot.lab65.demo.wsdl + + + + + + diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java new file mode 100644 index 000000000..1a3adfe72 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab65.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java new file mode 100644 index 000000000..159dba5bc --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java @@ -0,0 +1,21 @@ +package cn.iocoder.springboot.lab65.demo.client; + +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import org.springframework.ws.client.core.support.WebServiceGatewaySupport; +import org.springframework.ws.soap.client.core.SoapActionCallback; + +public class UserClient extends WebServiceGatewaySupport { + + public static final String WEB_SERVICES_URI = "http://127.0.0.1:8080/ws"; + + private static final String WE_SERVICES_NAMESPACE = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; + + public UserGetResponse getUser(Integer id) { + UserGetRequest request = new UserGetRequest(); + request.setId(id); + return (UserGetResponse) getWebServiceTemplate().marshalSendAndReceive( + request, new SoapActionCallback(WE_SERVICES_NAMESPACE + "/UserCreateRequest")); + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java new file mode 100644 index 000000000..ee4464613 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab65.demo.config; + +import cn.iocoder.springboot.lab65.demo.client.UserClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.oxm.jaxb.Jaxb2Marshaller; + +@Configuration +public class WebServicesConfig { + + @Bean + public Jaxb2Marshaller marshaller() { + Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); + marshaller.setContextPath("cn.iocoder.springboot.lab65.demo.wsdl"); + return marshaller; + } + + @Bean + public UserClient countryClient(Jaxb2Marshaller marshaller) { + UserClient client = new UserClient(); + client.setDefaultUri(UserClient.WEB_SERVICES_URI); + client.setMarshaller(marshaller); + client.setUnmarshaller(marshaller); + return client; + } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java new file mode 100644 index 000000000..e98159b86 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab65.demo.controller; + +import cn.iocoder.springboot.lab65.demo.client.UserClient; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private UserClient userClient; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + // 执行 Web Services 请求 + UserGetResponse response = userClient.getUser(id); + // 响应 + return response.getName(); + } + +// @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping +// public Integer create(@RequestParam("name") String name, +// @RequestParam("gender") Integer gender) { +// // 创建请求 +// UserCreateRequest request = UserCreateRequest.newBuilder() +// .setName(name).setGender(gender).build(); +// // 执行 gRPC 请求 +// UserCreateResponse response = userServiceGrpc.create(request); +// // 响应 +// return response.getId(); +// } + +} diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml new file mode 100644 index 000000000..f9e9468c1 --- /dev/null +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 9090 diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java similarity index 98% rename from lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java rename to lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java index d57c8d7c0..85ea7afdc 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServiceConfig.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java @@ -13,7 +13,7 @@ @Configuration @EnableWs // 开启 Web Services 服务 -public class WebServiceConfig { +public class WebServicesConfig { public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java index 6dee32ce3..e5542d2b1 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/endpoint/UserEndpoint.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab65.userservice.endpoint; -import cn.iocoder.springboot.lab65.userservice.config.WebServiceConfig; +import cn.iocoder.springboot.lab65.userservice.config.WebServicesConfig; import cn.iocoder.springboot.lab65.userservice.model.UserCreateRequest; import cn.iocoder.springboot.lab65.userservice.model.UserCreateResponse; import cn.iocoder.springboot.lab65.userservice.model.UserGetRequest; @@ -13,7 +13,7 @@ @Endpoint public class UserEndpoint { - @PayloadRoot(namespace = WebServiceConfig.NAMESPACE_URI, localPart = "UserGetRequest") + @PayloadRoot(namespace = WebServicesConfig.NAMESPACE_URI, localPart = "UserGetRequest") @ResponsePayload public UserGetResponse get(@RequestPayload UserGetRequest request) { UserGetResponse response = new UserGetResponse(); @@ -23,7 +23,7 @@ public UserGetResponse get(@RequestPayload UserGetRequest request) { return response; } - @PayloadRoot(namespace = WebServiceConfig.NAMESPACE_URI, localPart = "UserCreateRequest") + @PayloadRoot(namespace = WebServicesConfig.NAMESPACE_URI, localPart = "UserCreateRequest") @ResponsePayload public UserCreateResponse create(@RequestPayload UserCreateRequest request) { UserCreateResponse response = new UserCreateResponse(); diff --git a/lab-65/lab-65-spring-ws-demo/pom.xml b/lab-65/lab-65-spring-ws-demo/pom.xml index a4a807148..d7499d80a 100644 --- a/lab-65/lab-65-spring-ws-demo/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/pom.xml @@ -13,6 +13,7 @@ pom lab-65-spring-ws-demo-user-service + lab-65-spring-ws-demo-application From 0ab7e924fbe61be301f8d1b121f10c990a3496d6 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 16 Jun 2020 19:16:49 +0800 Subject: [PATCH 040/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-61/lab-61-cat-opentracing-demo/pom.xml | 68 ++++++++++++++ .../src/main/java/catdemo/Application.java | 13 +++ .../java/catdemo/config/ZipkinConfig.java | 16 ++++ .../catdemo/controller/DemoController.java | 38 ++++++++ .../main/resources/META-INF/app.properties | 1 + lab-61/lab-61-cat-opentracing/pom.xml | 51 +++++++++++ .../lab61/cat/opentracing/CatSpan.java | 89 +++++++++++++++++++ .../lab61/cat/opentracing/CatSpanBuilder.java | 65 ++++++++++++++ .../lab61/cat/opentracing/CatTracer.java | 36 ++++++++ .../springboot/lab61/cat/opentracing/Tag.java | 21 +++++ lab-61/pom.xml | 2 + .../lab-65-spring-ws-demo-application/pom.xml | 4 +- .../lab65/demo/client/UserClient.java | 21 +++-- .../lab65/demo/config/WebServicesConfig.java | 6 +- .../lab65/demo/controller/DemoController.java | 20 ++--- .../pom.xml | 2 +- .../userservice/UserServiceApplication.java | 6 +- .../userservice/config/WebServicesConfig.java | 11 ++- .../src/main/resources/users.xsd | 6 +- lab-65/lab-65-ws-feign-client/pom.xml | 85 ++++++++++++++++++ .../lab65/demo/FeignDemoApplication.java | 13 +++ .../lab65/demo/config/FeignConfig.java | 26 ++++++ .../lab65/demo/controller/DemoController.java | 44 +++++++++ .../demo/feign/UserServiceFeignClient.java | 25 ++++++ .../src/main/resources/application.yml | 2 + lab-65/pom.xml | 3 +- pom.xml | 2 +- 27 files changed, 644 insertions(+), 32 deletions(-) create mode 100644 lab-61/lab-61-cat-opentracing-demo/pom.xml create mode 100644 lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/Application.java create mode 100644 lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/config/ZipkinConfig.java create mode 100644 lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/controller/DemoController.java create mode 100644 lab-61/lab-61-cat-opentracing-demo/src/main/resources/META-INF/app.properties create mode 100644 lab-61/lab-61-cat-opentracing/pom.xml create mode 100644 lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpan.java create mode 100644 lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpanBuilder.java create mode 100644 lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatTracer.java create mode 100644 lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/Tag.java create mode 100644 lab-65/lab-65-ws-feign-client/pom.xml create mode 100644 lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/FeignDemoApplication.java create mode 100644 lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/config/FeignConfig.java create mode 100644 lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java create mode 100644 lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/feign/UserServiceFeignClient.java create mode 100644 lab-65/lab-65-ws-feign-client/src/main/resources/application.yml diff --git a/lab-61/lab-61-cat-opentracing-demo/pom.xml b/lab-61/lab-61-cat-opentracing-demo/pom.xml new file mode 100644 index 000000000..044668dd1 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing-demo/pom.xml @@ -0,0 +1,68 @@ + + + + lab-61 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61-cat-opentracing-demo + + + 1.8 + 1.8 + 2.2.4.RELEASE + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + com.dianping.cat + cat-client + 3.0.0 + + + + + cn.iocoder.springboot.labs + lab-61-cat-opentracing + 1.0-SNAPSHOT + + + + + + + central + Maven2 Central Repository + default + http://repo1.maven.org/maven2 + + + unidal.releases + http://unidal.org/nexus/content/repositories/releases/ + + + + diff --git a/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/Application.java b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/Application.java new file mode 100644 index 000000000..23f629f8b --- /dev/null +++ b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/Application.java @@ -0,0 +1,13 @@ +package catdemo; + +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-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/config/ZipkinConfig.java b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/config/ZipkinConfig.java new file mode 100644 index 000000000..d90eecd85 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/config/ZipkinConfig.java @@ -0,0 +1,16 @@ +package catdemo.config; + +import cn.iocoder.springboot.lab61.cat.opentracing.CatTracer; +import io.opentracing.Tracer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class ZipkinConfig { + + @Bean + public Tracer openTracer() { + return new CatTracer(); + } + +} diff --git a/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/controller/DemoController.java b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/controller/DemoController.java new file mode 100644 index 000000000..dab24db56 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing-demo/src/main/java/catdemo/controller/DemoController.java @@ -0,0 +1,38 @@ +package catdemo.controller; + +import com.dianping.cat.Cat; +import io.opentracing.Span; +import io.opentracing.Tracer; +import org.springframework.beans.factory.annotation.Autowired; +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 { + + @Autowired + private Tracer tracer; + + /** + * 监控模型 Transaction 的示例 + */ + @GetMapping("/test") + public String test() { + // 创建一个 Span + Span parentSpan = tracer.buildSpan("parent").start(); + + Span childSpan = tracer.buildSpan("child").start(); + childSpan.finish(); + + Cat.logEvent("测试事件", "123"); + + // 结束一个 Span + parentSpan.finish(); + + // 返回 + return "opentracing"; + } + +} diff --git a/lab-61/lab-61-cat-opentracing-demo/src/main/resources/META-INF/app.properties b/lab-61/lab-61-cat-opentracing-demo/src/main/resources/META-INF/app.properties new file mode 100644 index 000000000..f266ce248 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing-demo/src/main/resources/META-INF/app.properties @@ -0,0 +1 @@ +app.name=demo-application diff --git a/lab-61/lab-61-cat-opentracing/pom.xml b/lab-61/lab-61-cat-opentracing/pom.xml new file mode 100644 index 000000000..fea05c196 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing/pom.xml @@ -0,0 +1,51 @@ + + + + lab-61 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-61-cat-opentracing + + + + 1.8 + 1.8 + + + + + + com.dianping.cat + cat-client + 3.0.0 + + + + + io.opentracing + opentracing-api + 0.33.0 + + + + + + + + central + Maven2 Central Repository + default + http://repo1.maven.org/maven2 + + + unidal.releases + http://unidal.org/nexus/content/repositories/releases/ + + + + diff --git a/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpan.java b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpan.java new file mode 100644 index 000000000..8768aa3ae --- /dev/null +++ b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpan.java @@ -0,0 +1,89 @@ +package cn.iocoder.springboot.lab61.cat.opentracing; + +import com.dianping.cat.message.Transaction; +import io.opentracing.Span; +import io.opentracing.SpanContext; +import io.opentracing.tag.Tag; + +import java.util.Map; + +public class CatSpan implements Span { + + private Transaction transaction; + + public CatSpan(Transaction transaction) { + this.transaction = transaction; + } + + @Override + public SpanContext context() { + return null; + } + + @Override + public Span setTag(String key, String value) { + return null; + } + + @Override + public Span setTag(String key, boolean value) { + return null; + } + + @Override + public Span setTag(String key, Number value) { + return null; + } + + @Override + public Span setTag(Tag tag, T value) { + return null; + } + + @Override + public Span log(Map fields) { + return null; + } + + @Override + public Span log(long timestampMicroseconds, Map fields) { + return null; + } + + @Override + public Span log(String event) { + return null; + } + + @Override + public Span log(long timestampMicroseconds, String event) { + return null; + } + + @Override + public Span setBaggageItem(String key, String value) { + return null; + } + + @Override + public String getBaggageItem(String key) { + return null; + } + + @Override + public Span setOperationName(String operationName) { + return null; + } + + @Override + public void finish() { + transaction.setStatus(Transaction.SUCCESS); + transaction.complete(); + } + + @Override + public void finish(long finishMicros) { + + } + +} diff --git a/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpanBuilder.java b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpanBuilder.java new file mode 100644 index 000000000..5f212b21f --- /dev/null +++ b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatSpanBuilder.java @@ -0,0 +1,65 @@ +package cn.iocoder.springboot.lab61.cat.opentracing; + +import com.dianping.cat.Cat; +import com.dianping.cat.message.Transaction; +import io.opentracing.Span; +import io.opentracing.SpanContext; +import io.opentracing.Tracer; +import io.opentracing.tag.Tag; + +import java.util.LinkedList; +import java.util.List; + +public class CatSpanBuilder implements Tracer.SpanBuilder { + + private List tags = new LinkedList<>(); + private String operationName; + + public CatSpanBuilder(String operationName) { + this.operationName = operationName; + } + + public Tracer.SpanBuilder asChildOf(SpanContext parent) { + return null; + } + + public Tracer.SpanBuilder asChildOf(Span parent) { + return null; + } + + public Tracer.SpanBuilder addReference(String referenceType, SpanContext referencedContext) { + return null; + } + + public Tracer.SpanBuilder ignoreActiveSpan() { + return null; + } + + public Tracer.SpanBuilder withTag(String key, String value) { + tags.add(new cn.iocoder.springboot.lab61.cat.opentracing.Tag(key, value)); + return this; + } + + public Tracer.SpanBuilder withTag(String key, boolean value) { + return null; + } + + public Tracer.SpanBuilder withTag(String key, Number value) { + return null; + } + + public Tracer.SpanBuilder withTag(Tag tag, T value) { + return null; + } + + public Tracer.SpanBuilder withStartTimestamp(long microseconds) { + return null; + } + + public Span start() { + Transaction transaction = Cat.newTransaction("Opentracing", operationName); + // TODO tag 的处理 + return new CatSpan(transaction); + } + +} diff --git a/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatTracer.java b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatTracer.java new file mode 100644 index 000000000..858b0e230 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/CatTracer.java @@ -0,0 +1,36 @@ +package cn.iocoder.springboot.lab61.cat.opentracing; + +import io.opentracing.*; +import io.opentracing.propagation.Format; + +public class CatTracer implements Tracer { + + public ScopeManager scopeManager() { + return null; + } + + public Span activeSpan() { + return null; + } + + public Scope activateSpan(Span span) { + return null; + } + + public SpanBuilder buildSpan(String operationName) { + return new CatSpanBuilder(operationName); + } + + public void inject(SpanContext spanContext, Format format, C carrier) { + + } + + public SpanContext extract(Format format, C carrier) { + return null; + } + + public void close() { + + } + +} diff --git a/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/Tag.java b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/Tag.java new file mode 100644 index 000000000..b0e2a1447 --- /dev/null +++ b/lab-61/lab-61-cat-opentracing/src/main/java/cn/iocoder/springboot/lab61/cat/opentracing/Tag.java @@ -0,0 +1,21 @@ +package cn.iocoder.springboot.lab61.cat.opentracing; + +public class Tag { + + private String key; + private String value; + + public Tag(String key, String value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public String getValue() { + return value; + } + +} diff --git a/lab-61/pom.xml b/lab-61/pom.xml index 7965633f9..de788e24e 100644 --- a/lab-61/pom.xml +++ b/lab-61/pom.xml @@ -15,6 +15,8 @@ lab-61-demo lab-61-logback lab-61-springmvc + lab-61-cat-opentracing + lab-61-cat-opentracing-demo diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml index 5aa73d5bb..80345a4d7 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml @@ -60,12 +60,14 @@ + WSDL - http://localhost:8080/ws/users.wsdl + http://127.0.0.1:8080/ws/users.wsdl + cn.iocoder.springboot.lab65.demo.wsdl diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java index 159dba5bc..5ad60a720 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java @@ -1,21 +1,28 @@ package cn.iocoder.springboot.lab65.demo.client; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; import org.springframework.ws.client.core.support.WebServiceGatewaySupport; -import org.springframework.ws.soap.client.core.SoapActionCallback; public class UserClient extends WebServiceGatewaySupport { - public static final String WEB_SERVICES_URI = "http://127.0.0.1:8080/ws"; - - private static final String WE_SERVICES_NAMESPACE = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; - public UserGetResponse getUser(Integer id) { + // 创建请求对象 UserGetRequest request = new UserGetRequest(); request.setId(id); - return (UserGetResponse) getWebServiceTemplate().marshalSendAndReceive( - request, new SoapActionCallback(WE_SERVICES_NAMESPACE + "/UserCreateRequest")); + // 执行请求 + return (UserGetResponse) getWebServiceTemplate().marshalSendAndReceive(request); + } + + public UserCreateResponse createUser(String name, Integer gender) { + // 创建请求对象 + UserCreateRequest request = new UserCreateRequest(); + request.setName(name); + request.setGender(gender); + // 执行请求 + return (UserCreateResponse) getWebServiceTemplate().marshalSendAndReceive(request); } } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java index ee4464613..34c197300 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java @@ -8,17 +8,19 @@ @Configuration public class WebServicesConfig { + // 创建 Jaxb2Marshaller Bean，实现 XML 与 Bean 的互相转换 @Bean public Jaxb2Marshaller marshaller() { Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); - marshaller.setContextPath("cn.iocoder.springboot.lab65.demo.wsdl"); + marshaller.setContextPath("cn.iocoder.springboot.lab65.demo.wsdl"); // 用户服务的 WSDL 文件 return marshaller; } + // 创建 UserClient Bean @Bean public UserClient countryClient(Jaxb2Marshaller marshaller) { UserClient client = new UserClient(); - client.setDefaultUri(UserClient.WEB_SERVICES_URI); + client.setDefaultUri("http://127.0.0.1:8080/ws"); // 用户服务的 Web Services 地址 client.setMarshaller(marshaller); client.setUnmarshaller(marshaller); return client; diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java index e98159b86..b9f4a9f0f 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab65.demo.controller; import cn.iocoder.springboot.lab65.demo.client.UserClient; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -23,16 +24,13 @@ public String get(@RequestParam("id") Integer id) { return response.getName(); } -// @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping -// public Integer create(@RequestParam("name") String name, -// @RequestParam("gender") Integer gender) { -// // 创建请求 -// UserCreateRequest request = UserCreateRequest.newBuilder() -// .setName(name).setGender(gender).build(); -// // 执行 gRPC 请求 -// UserCreateResponse response = userServiceGrpc.create(request); -// // 响应 -// return response.getId(); -// } + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 执行 Web Services 请求 + UserCreateResponse response = userClient.createUser(name, gender); + // 响应 + return response.getId(); + } } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml index 08e63b836..f96323b91 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml @@ -32,7 +32,7 @@ - + org.springframework.boot spring-boot-starter-web-services diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java index 08762ae5a..b76a9450f 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java @@ -3,16 +3,12 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import java.util.concurrent.CountDownLatch; - @SpringBootApplication public class UserServiceApplication { - public static void main(String[] args) throws InterruptedException { + public static void main(String[] args) { // 启动 Spring Boot 应用 SpringApplication.run(UserServiceApplication.class, args); - // 阻塞，避免应用退出 - new CountDownLatch(1).await(); } } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java index 85ea7afdc..6bacbd553 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java @@ -6,14 +6,18 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.config.annotation.WsConfigurerAdapter; +import org.springframework.ws.server.EndpointInterceptor; import org.springframework.ws.transport.http.MessageDispatcherServlet; import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; import org.springframework.xml.xsd.SimpleXsdSchema; import org.springframework.xml.xsd.XsdSchema; +import java.util.List; + @Configuration @EnableWs // 开启 Web Services 服务 -public class WebServicesConfig { +public class WebServicesConfig extends WsConfigurerAdapter { public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; @@ -40,4 +44,9 @@ public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema usersSchema) { return wsdl11Definition; } + @Override + public void addInterceptors(List interceptors) { + // 可自定义附加拦截器 + } + } diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd index 742ec690b..c3685ebba 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/src/main/resources/users.xsd @@ -2,6 +2,7 @@ targetNamespace="https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo" elementFormDefault="qualified"> + @@ -9,7 +10,7 @@ - + @@ -20,6 +21,7 @@ + @@ -28,7 +30,7 @@ - + diff --git a/lab-65/lab-65-ws-feign-client/pom.xml b/lab-65/lab-65-ws-feign-client/pom.xml new file mode 100644 index 000000000..26206e2b7 --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/pom.xml @@ -0,0 +1,85 @@ + + + + lab-65 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-ws-feign-client + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.github.openfeign + feign-core + 11.0 + + + + io.github.openfeign + feign-soap + 11.0 + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.14.0 + + + + generate + + + + + + WSDL + + + http://127.0.0.1:8080/ws/users.wsdl + + + + cn.iocoder.springboot.lab65.demo.wsdl + + + + + + diff --git a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/FeignDemoApplication.java b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/FeignDemoApplication.java new file mode 100644 index 000000000..acc2efc51 --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/FeignDemoApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab65.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FeignDemoApplication { + + public static void main(String[] args) { + SpringApplication.run(FeignDemoApplication.class, args); + } + +} diff --git a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/config/FeignConfig.java b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/config/FeignConfig.java new file mode 100644 index 000000000..94f438c1b --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/config/FeignConfig.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab65.demo.config; + +import cn.iocoder.springboot.lab65.demo.feign.UserServiceFeignClient; +import feign.Feign; +import feign.jaxb.JAXBContextFactory; +import feign.soap.SOAPDecoder; +import feign.soap.SOAPEncoder; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FeignConfig { + + private static final JAXBContextFactory JAXB_FACTORY = new JAXBContextFactory.Builder() + .withMarshallerJAXBEncoding("UTF-8") + .build(); + + @Bean + public UserServiceFeignClient userServiceFeignClient() { + return Feign.builder() + .encoder(new SOAPEncoder(JAXB_FACTORY)) + .decoder(new SOAPDecoder(JAXB_FACTORY)) + .target(UserServiceFeignClient.class, "http://127.0.0.1:8080/ws"); // 目标地址 + } + +} diff --git a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java new file mode 100644 index 000000000..9dd5da738 --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springboot.lab65.demo.controller; + +import cn.iocoder.springboot.lab65.demo.feign.UserServiceFeignClient; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private UserServiceFeignClient userClient; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + UserGetRequest request = new UserGetRequest(); + request.setId(id); + // 执行 Web Services 请求 + UserGetResponse response = userClient.getUser(request); + // 响应 + return response.getName(); + } + + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 创建 + UserCreateRequest request = new UserCreateRequest(); + request.setName(name); + request.setGender(gender); + // 执行 Web Services 请求 + UserCreateResponse response = userClient.createUser(request); + // 响应 + return response.getId(); + } + +} diff --git a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/feign/UserServiceFeignClient.java b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/feign/UserServiceFeignClient.java new file mode 100644 index 000000000..c001e1685 --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/feign/UserServiceFeignClient.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab65.demo.feign; + +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import feign.Headers; +import feign.RequestLine; + +/** + * 用户服务 Feign Client + */ +public interface UserServiceFeignClient { + + // 获得用户详情 + @RequestLine("POST /") + @Headers("Content-Type: text/xml") + UserGetResponse getUser(UserGetRequest request); + + // 创建用户 + @RequestLine("POST /") + @Headers("Content-Type: text/xml") + UserCreateResponse createUser(UserCreateRequest request); + +} diff --git a/lab-65/lab-65-ws-feign-client/src/main/resources/application.yml b/lab-65/lab-65-ws-feign-client/src/main/resources/application.yml new file mode 100644 index 000000000..f9e9468c1 --- /dev/null +++ b/lab-65/lab-65-ws-feign-client/src/main/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 9090 diff --git a/lab-65/pom.xml b/lab-65/pom.xml index bb7ee428d..b8c3259ce 100644 --- a/lab-65/pom.xml +++ b/lab-65/pom.xml @@ -12,7 +12,8 @@ lab-65 pom - lab4-64-spring-ws-demo + lab-65-spring-ws-demo + lab-65-ws-feign-client diff --git a/pom.xml b/pom.xml index 089fe3611..d2acc4bc5 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,7 @@ + lab-65 @@ -108,7 +109,6 @@ - lab-65 From e51ad0ab4f4c580aeb8561d5fb49fc576e2ded1f Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 16 Jun 2020 23:04:21 +0800 Subject: [PATCH 041/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-65-cxf-ws-demo-user-service/pom.xml | 43 +++++++++++ .../userservice/UserServiceApplication.java | 14 ++++ .../userservice/config/WebServicesConfig.java | 28 +++++++ .../userservice/request/UserGetRequest.java | 22 ++++++ .../userservice/response/UserGetResponse.java | 47 +++++++++++ .../userservice/service/UserService.java | 17 ++++ .../userservice/service/UserServiceImpl.java | 37 +++++++++ .../src/main/resources/application.yml | 3 + .../lab-65-spring-ws-demo-application/pom.xml | 77 +++++++++++++++++++ .../lab65/demo/DemoApplication.java | 14 ++++ .../lab65/demo/client/UserClient.java | 28 +++++++ .../lab65/demo/config/WebServicesConfig.java | 29 +++++++ .../lab65/demo/controller/DemoController.java | 36 +++++++++ .../src/main/resources/application.yml | 2 + lab-65/lab-65-cxf-ws-demo/pom.xml | 20 +++++ .../lab-65-spring-ws-demo-application/pom.xml | 2 +- .../pom.xml | 2 +- lab-65/lab-65-spring-ws-demo/pom.xml | 2 +- lab-65/pom.xml | 1 + 19 files changed, 421 insertions(+), 3 deletions(-) create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/pom.xml create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserGetRequest.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserGetResponse.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml create mode 100644 lab-65/lab-65-cxf-ws-demo/pom.xml diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/pom.xml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/pom.xml new file mode 100644 index 000000000..142fa8159 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/pom.xml @@ -0,0 +1,43 @@ + + + + lab-65-spring-ws-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-cxf-ws-demo-user-service + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + 3.3.6 + + + + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java new file mode 100644 index 000000000..b76a9450f --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/UserServiceApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab65.userservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UserServiceApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(UserServiceApplication.class, args); + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java new file mode 100644 index 000000000..be1d49a84 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab65.userservice.config; + +import cn.iocoder.springboot.lab65.userservice.service.UserService; +import org.apache.cxf.Bus; +import org.apache.cxf.bus.spring.SpringBus; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.xml.ws.Endpoint; + +@Configuration +public class WebServicesConfig { + + public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; + + @Bean(name = Bus.DEFAULT_BUS_ID) + public SpringBus springBus() { + return new SpringBus(); + } + + @Bean + public Endpoint endpoint(UserService userService) { + Endpoint endpoint = Endpoint.create(userService); + endpoint.publish("/user");//发布地址 + return endpoint; + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserGetRequest.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserGetRequest.java new file mode 100644 index 000000000..e31db6a5c --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserGetRequest.java @@ -0,0 +1,22 @@ +package cn.iocoder.springboot.lab65.userservice.request; + +/** + * 获得用户信息 Request + */ +public class UserGetRequest { + + /** + * 用户编号 + */ + private Integer id; + + public Integer getId() { + return id; + } + + public UserGetRequest setId(Integer id) { + this.id = id; + return this; + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserGetResponse.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserGetResponse.java new file mode 100644 index 000000000..684587482 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserGetResponse.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab65.userservice.response; + +/** + * 获得用户信息 Response + */ +public class UserGetResponse { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String name; + /** + * 性别别 + */ + private Integer gender; + + public Integer getId() { + return id; + } + + public UserGetResponse setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public UserGetResponse setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserGetResponse setGender(Integer gender) { + this.gender = gender; + return this; + } +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java new file mode 100644 index 000000000..aa3d7f93d --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java @@ -0,0 +1,17 @@ +package cn.iocoder.springboot.lab65.userservice.service; + +import cn.iocoder.springboot.lab65.userservice.config.WebServicesConfig; +import cn.iocoder.springboot.lab65.userservice.request.UserGetRequest; +import cn.iocoder.springboot.lab65.userservice.response.UserGetResponse; + +import javax.jws.WebService; + +@WebService(targetNamespace = WebServicesConfig.NAMESPACE_URI +// , +// name = "userPortName" +) +public interface UserService { + + UserGetResponse get(UserGetRequest request); + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java new file mode 100644 index 000000000..7b0c6f712 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab65.userservice.service; + +import cn.iocoder.springboot.lab65.userservice.config.WebServicesConfig; +import cn.iocoder.springboot.lab65.userservice.request.UserGetRequest; +import cn.iocoder.springboot.lab65.userservice.response.UserGetResponse; +import org.springframework.stereotype.Service; + +import javax.jws.WebService; + +@WebService( + serviceName = "userService", // 服务名称 + targetNamespace = WebServicesConfig.NAMESPACE_URI, // WSDL 命名空间 + endpointInterface = "cn.iocoder.springboot.lab65.userservice.service.UserService" // Web Services 对应接口 +// name = "userPortType", // portType 名称，作为客户端生成代码时的接口名称 TODO +// portName = "userPortName" // port 名称 TODO +) +@Service +public class UserServiceImpl implements UserService { + + @Override + public UserGetResponse get(UserGetRequest request) { + UserGetResponse response = new UserGetResponse(); + response.setId(request.getId()); + response.setName("没有昵称：" + request.getId()); + response.setGender(request.getId() % 2 + 1); + return response; + } + +// @PayloadRoot(namespace = WebServicesConfig.NAMESPACE_URI, localPart = "UserCreateRequest") +// @ResponsePayload +// public UserCreateResponse create(@RequestPayload UserCreateRequest request) { +// UserCreateResponse response = new UserCreateResponse(); +// response.setId((int) (System.currentTimeMillis() / 1000)); +// return response; +// } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml new file mode 100644 index 000000000..a3643e9bb --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml @@ -0,0 +1,3 @@ +# CXF 配置项，对应 CxfProperties 配置类 +cxf: + path: /ws/ # CXF CXFServlet 的匹配路径 diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml new file mode 100644 index 000000000..df1533cc8 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml @@ -0,0 +1,77 @@ + + + + lab-65-spring-ws-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-spring-ws-demo-application + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web-services + + + + + wsdl4j + wsdl4j + + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.14.0 + + + + generate + + + + + + WSDL + + + http://127.0.0.1:8080/ws/users.wsdl + + + + cn.iocoder.springboot.lab65.demo.wsdl + + + + + + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java new file mode 100644 index 000000000..1a3adfe72 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java @@ -0,0 +1,14 @@ +package cn.iocoder.springboot.lab65.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + // 启动 Spring Boot 应用 + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java new file mode 100644 index 000000000..5ad60a720 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab65.demo.client; + +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import org.springframework.ws.client.core.support.WebServiceGatewaySupport; + +public class UserClient extends WebServiceGatewaySupport { + + public UserGetResponse getUser(Integer id) { + // 创建请求对象 + UserGetRequest request = new UserGetRequest(); + request.setId(id); + // 执行请求 + return (UserGetResponse) getWebServiceTemplate().marshalSendAndReceive(request); + } + + public UserCreateResponse createUser(String name, Integer gender) { + // 创建请求对象 + UserCreateRequest request = new UserCreateRequest(); + request.setName(name); + request.setGender(gender); + // 执行请求 + return (UserCreateResponse) getWebServiceTemplate().marshalSendAndReceive(request); + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java new file mode 100644 index 000000000..34c197300 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java @@ -0,0 +1,29 @@ +package cn.iocoder.springboot.lab65.demo.config; + +import cn.iocoder.springboot.lab65.demo.client.UserClient; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.oxm.jaxb.Jaxb2Marshaller; + +@Configuration +public class WebServicesConfig { + + // 创建 Jaxb2Marshaller Bean，实现 XML 与 Bean 的互相转换 + @Bean + public Jaxb2Marshaller marshaller() { + Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); + marshaller.setContextPath("cn.iocoder.springboot.lab65.demo.wsdl"); // 用户服务的 WSDL 文件 + return marshaller; + } + + // 创建 UserClient Bean + @Bean + public UserClient countryClient(Jaxb2Marshaller marshaller) { + UserClient client = new UserClient(); + client.setDefaultUri("http://127.0.0.1:8080/ws"); // 用户服务的 Web Services 地址 + client.setMarshaller(marshaller); + client.setUnmarshaller(marshaller); + return client; + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java new file mode 100644 index 000000000..b9f4a9f0f --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -0,0 +1,36 @@ +package cn.iocoder.springboot.lab65.demo.controller; + +import cn.iocoder.springboot.lab65.demo.client.UserClient; +import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; +import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private UserClient userClient; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + // 执行 Web Services 请求 + UserGetResponse response = userClient.getUser(id); + // 响应 + return response.getName(); + } + + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 执行 Web Services 请求 + UserCreateResponse response = userClient.createUser(name, gender); + // 响应 + return response.getId(); + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml new file mode 100644 index 000000000..f9e9468c1 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml @@ -0,0 +1,2 @@ +server: + port: 9090 diff --git a/lab-65/lab-65-cxf-ws-demo/pom.xml b/lab-65/lab-65-cxf-ws-demo/pom.xml new file mode 100644 index 000000000..81f5bd495 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/pom.xml @@ -0,0 +1,20 @@ + + + + lab-65 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-cxf-ws-demo + pom + + lab-65-cxf-ws-demo-user-service + + + + + diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml index 80345a4d7..df1533cc8 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-application/pom.xml @@ -3,7 +3,7 @@ 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"> - lab4-64-spring-ws-demo + lab-65-spring-ws-demo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml index f96323b91..2c82e19a1 100644 --- a/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/lab-65-spring-ws-demo-user-service/pom.xml @@ -3,7 +3,7 @@ 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"> - lab4-64-spring-ws-demo + lab-65-spring-ws-demo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-65/lab-65-spring-ws-demo/pom.xml b/lab-65/lab-65-spring-ws-demo/pom.xml index d7499d80a..17153b8eb 100644 --- a/lab-65/lab-65-spring-ws-demo/pom.xml +++ b/lab-65/lab-65-spring-ws-demo/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab4-64-spring-ws-demo + lab-65-spring-ws-demo pom lab-65-spring-ws-demo-user-service diff --git a/lab-65/pom.xml b/lab-65/pom.xml index b8c3259ce..936c1f214 100644 --- a/lab-65/pom.xml +++ b/lab-65/pom.xml @@ -14,6 +14,7 @@ lab-65-spring-ws-demo lab-65-ws-feign-client + lab-65-cxf-ws-demo From 87639c6106e9782435be91991a02232ee416deb6 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 17 Jun 2020 07:08:46 +0800 Subject: [PATCH 042/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-65-cxf-ws-demo-application/pom.xml | 95 +++++++++++++++++++ .../lab65/demo/DemoApplication.java | 0 .../lab65/demo/config/WebServicesConfig.java | 19 ++++ .../lab65/demo/controller/DemoController.java | 42 ++++++++ .../src/main/resources/application.yml | 0 .../src/main/resources/wsdl/user.wsdl | 59 ++++++++++++ .../lab-65-spring-ws-demo-application/pom.xml | 77 --------------- .../lab65/demo/client/UserClient.java | 28 ------ .../lab65/demo/config/WebServicesConfig.java | 29 ------ .../lab65/demo/controller/DemoController.java | 36 ------- lab-65/lab-65-cxf-ws-demo/pom.xml | 2 +- .../lab65/demo/controller/DemoController.java | 3 +- 12 files changed, 218 insertions(+), 172 deletions(-) create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml rename lab-65/lab-65-cxf-ws-demo/{lab-65-spring-ws-demo-application => lab-65-cxf-ws-demo-application}/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java (100%) create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java rename lab-65/lab-65-cxf-ws-demo/{lab-65-spring-ws-demo-application => lab-65-cxf-ws-demo-application}/src/main/resources/application.yml (100%) create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl delete mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml delete mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java delete mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java delete mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml new file mode 100644 index 000000000..d338becad --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml @@ -0,0 +1,95 @@ + + + + lab-65-cxf-ws-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-65-cxf-ws-demo-application + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.apache.cxf + cxf-spring-boot-starter-jaxws + 3.3.6 + + + + + + + org.apache.cxf + cxf-codegen-plugin + 3.2.5 + + + generate-sources + generate-sources + + ${project.build.directory}/generated/cxf + + + src/main/resources/wsdl/user.wsdl + classpath:wsdl/user.wsdl + + + + + wsdl2java + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java similarity index 100% rename from lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java rename to lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/DemoApplication.java diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java new file mode 100644 index 000000000..0745b3cd6 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java @@ -0,0 +1,19 @@ +package cn.iocoder.springboot.lab65.demo.config; + +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserService; +import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class WebServicesConfig { + + @Bean + public UserService userService() { + JaxWsProxyFactoryBean jaxWsProxyFactoryBean = new JaxWsProxyFactoryBean(); + jaxWsProxyFactoryBean.setServiceClass(UserService.class); + jaxWsProxyFactoryBean.setAddress("http://127.0.0.1:8080/ws/user"); + return (UserService) jaxWsProxyFactoryBean.create(); + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java new file mode 100644 index 000000000..6f5f72b24 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -0,0 +1,42 @@ +package cn.iocoder.springboot.lab65.demo.controller; + +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserGetRequest; +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserGetResponse; +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/demo") +public class DemoController { + + @Autowired + private UserService userService; + + @GetMapping("/get") + public String get(@RequestParam("id") Integer id) { + UserGetRequest request = new UserGetRequest(); + request.setId(id); + // 执行 Web Services 请求 + UserGetResponse response = userService.get(request); + // 响应 + return response.getName(); + } + +// @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping +// public Integer create(@RequestParam("name") String name, +// @RequestParam("gender") Integer gender) { +// // 请求 +// UserCreateRequest request = new UserCreateRequest(); +// request.setName(name); +// request.setGender(gender); +// // 执行 Web Services 请求 +// UserCreateResponse response = userClient.createUser(name, gender); +// // 响应 +// return response.getId(); +// } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml similarity index 100% rename from lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/resources/application.yml rename to lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl new file mode 100644 index 000000000..180e4b08b --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml deleted file mode 100644 index df1533cc8..000000000 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - lab-65-spring-ws-demo - cn.iocoder.springboot.labs - 1.0-SNAPSHOT - - 4.0.0 - - lab-65-spring-ws-demo-application - - - - 2.2.4.RELEASE - - 1.8 - 1.8 - - - - - - org.springframework.boot - spring-boot-starter-parent - ${spring.boot.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-starter-web-services - - - - - wsdl4j - wsdl4j - - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.14.0 - - - - generate - - - - - - WSDL - - - http://127.0.0.1:8080/ws/users.wsdl - - - - cn.iocoder.springboot.lab65.demo.wsdl - - - - - - diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java deleted file mode 100644 index 5ad60a720..000000000 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/client/UserClient.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.springboot.lab65.demo.client; - -import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateRequest; -import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; -import cn.iocoder.springboot.lab65.demo.wsdl.UserGetRequest; -import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; -import org.springframework.ws.client.core.support.WebServiceGatewaySupport; - -public class UserClient extends WebServiceGatewaySupport { - - public UserGetResponse getUser(Integer id) { - // 创建请求对象 - UserGetRequest request = new UserGetRequest(); - request.setId(id); - // 执行请求 - return (UserGetResponse) getWebServiceTemplate().marshalSendAndReceive(request); - } - - public UserCreateResponse createUser(String name, Integer gender) { - // 创建请求对象 - UserCreateRequest request = new UserCreateRequest(); - request.setName(name); - request.setGender(gender); - // 执行请求 - return (UserCreateResponse) getWebServiceTemplate().marshalSendAndReceive(request); - } - -} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java deleted file mode 100644 index 34c197300..000000000 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.iocoder.springboot.lab65.demo.config; - -import cn.iocoder.springboot.lab65.demo.client.UserClient; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.oxm.jaxb.Jaxb2Marshaller; - -@Configuration -public class WebServicesConfig { - - // 创建 Jaxb2Marshaller Bean，实现 XML 与 Bean 的互相转换 - @Bean - public Jaxb2Marshaller marshaller() { - Jaxb2Marshaller marshaller = new Jaxb2Marshaller(); - marshaller.setContextPath("cn.iocoder.springboot.lab65.demo.wsdl"); // 用户服务的 WSDL 文件 - return marshaller; - } - - // 创建 UserClient Bean - @Bean - public UserClient countryClient(Jaxb2Marshaller marshaller) { - UserClient client = new UserClient(); - client.setDefaultUri("http://127.0.0.1:8080/ws"); // 用户服务的 Web Services 地址 - client.setMarshaller(marshaller); - client.setUnmarshaller(marshaller); - return client; - } - -} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java deleted file mode 100644 index b9f4a9f0f..000000000 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-spring-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.springboot.lab65.demo.controller; - -import cn.iocoder.springboot.lab65.demo.client.UserClient; -import cn.iocoder.springboot.lab65.demo.wsdl.UserCreateResponse; -import cn.iocoder.springboot.lab65.demo.wsdl.UserGetResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/demo") -public class DemoController { - - @Autowired - private UserClient userClient; - - @GetMapping("/get") - public String get(@RequestParam("id") Integer id) { - // 执行 Web Services 请求 - UserGetResponse response = userClient.getUser(id); - // 响应 - return response.getName(); - } - - @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping - public Integer create(@RequestParam("name") String name, - @RequestParam("gender") Integer gender) { - // 执行 Web Services 请求 - UserCreateResponse response = userClient.createUser(name, gender); - // 响应 - return response.getId(); - } - -} diff --git a/lab-65/lab-65-cxf-ws-demo/pom.xml b/lab-65/lab-65-cxf-ws-demo/pom.xml index 81f5bd495..06c8a0bbd 100644 --- a/lab-65/lab-65-cxf-ws-demo/pom.xml +++ b/lab-65/lab-65-cxf-ws-demo/pom.xml @@ -13,7 +13,7 @@ pom lab-65-cxf-ws-demo-user-service - + lab-65-cxf-ws-demo-application diff --git a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java index 9dd5da738..dd8c6f516 100644 --- a/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java +++ b/lab-65/lab-65-ws-feign-client/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -20,6 +20,7 @@ public class DemoController { @GetMapping("/get") public String get(@RequestParam("id") Integer id) { + // 请求 UserGetRequest request = new UserGetRequest(); request.setId(id); // 执行 Web Services 请求 @@ -31,7 +32,7 @@ public String get(@RequestParam("id") Integer id) { @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping public Integer create(@RequestParam("name") String name, @RequestParam("gender") Integer gender) { - // 创建 + // 请求 UserCreateRequest request = new UserCreateRequest(); request.setName(name); request.setGender(gender); From 0c95e445f667dc8143b94aeb25016d381bf7b8be Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 17 Jun 2020 07:56:19 +0800 Subject: [PATCH 043/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-65-cxf-ws-demo-application/pom.xml | 29 ++----------- ...{WebServicesConfig.java => CXFConfig.java} | 7 +++- .../lab65/demo/controller/DemoController.java | 28 ++++++------- .../src/main/resources/application.yml | 2 - .../src/main/resources/wsdl/user.wsdl | 42 +++++++++++++++++++ ...{WebServicesConfig.java => CXFConfig.java} | 4 +- .../request/UserCreateRequest.java | 35 ++++++++++++++++ .../response/UserCreateResponse.java | 22 ++++++++++ .../userservice/service/UserService.java | 11 ++--- .../userservice/service/UserServiceImpl.java | 24 +++++------ .../src/main/resources/application.yml | 3 ++ 11 files changed, 143 insertions(+), 64 deletions(-) rename lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/{WebServicesConfig.java => CXFConfig.java} (77%) delete mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml rename lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/{WebServicesConfig.java => CXFConfig.java} (89%) create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserCreateRequest.java create mode 100644 lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserCreateResponse.java diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml index d338becad..baf7310ed 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/pom.xml @@ -42,6 +42,7 @@ + org.apache.cxf cxf-codegen-plugin @@ -51,13 +52,15 @@ generate-sources generate-sources - ${project.build.directory}/generated/cxf + src/main/resources/wsdl/user.wsdl classpath:wsdl/user.wsdl + + ${project.build.directory}/generated/cxf wsdl2java @@ -65,30 +68,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java similarity index 77% rename from lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java rename to lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java index 0745b3cd6..997c73b4b 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/WebServicesConfig.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java @@ -6,13 +6,16 @@ import org.springframework.context.annotation.Configuration; @Configuration -public class WebServicesConfig { +public class CXFConfig { @Bean public UserService userService() { JaxWsProxyFactoryBean jaxWsProxyFactoryBean = new JaxWsProxyFactoryBean(); + // 设置 UserService 接口 jaxWsProxyFactoryBean.setServiceClass(UserService.class); - jaxWsProxyFactoryBean.setAddress("http://127.0.0.1:8080/ws/user"); + // 设置 Web Services 地址 + jaxWsProxyFactoryBean.setAddress("http://127.0.0.1:9090/ws/user"); + // 创建 return (UserService) jaxWsProxyFactoryBean.create(); } diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java index 6f5f72b24..52ce4bc60 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -1,8 +1,6 @@ package cn.iocoder.springboot.lab65.demo.controller; -import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserGetRequest; -import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserGetResponse; -import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserService; +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -26,17 +24,17 @@ public String get(@RequestParam("id") Integer id) { return response.getName(); } -// @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping -// public Integer create(@RequestParam("name") String name, -// @RequestParam("gender") Integer gender) { -// // 请求 -// UserCreateRequest request = new UserCreateRequest(); -// request.setName(name); -// request.setGender(gender); -// // 执行 Web Services 请求 -// UserCreateResponse response = userClient.createUser(name, gender); -// // 响应 -// return response.getId(); -// } + @GetMapping("/create") // 为了方便测试，实际使用 @PostMapping + public Integer create(@RequestParam("name") String name, + @RequestParam("gender") Integer gender) { + // 请求 + UserCreateRequest request = new UserCreateRequest(); + request.setName(name); + request.setGender(gender); + // 执行 Web Services 请求 + UserCreateResponse response = userService.create(request); + // 响应 + return response.getId(); + } } diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml deleted file mode 100644 index f9e9468c1..000000000 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/application.yml +++ /dev/null @@ -1,2 +0,0 @@ -server: - port: 9090 diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl index 180e4b08b..3baac207a 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl @@ -1,6 +1,8 @@ + + @@ -25,6 +27,27 @@ + + + + + + + + + + + + + + + + + + + + + @@ -33,11 +56,21 @@ + + + + + + + + + + @@ -50,6 +83,15 @@ + + + + + + + + + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java similarity index 89% rename from lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java rename to lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java index be1d49a84..e8aac5fd6 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/WebServicesConfig.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java @@ -9,7 +9,7 @@ import javax.xml.ws.Endpoint; @Configuration -public class WebServicesConfig { +public class CXFConfig { public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; @@ -19,7 +19,7 @@ public SpringBus springBus() { } @Bean - public Endpoint endpoint(UserService userService) { + public Endpoint userServiceEndpoint(UserService userService) { Endpoint endpoint = Endpoint.create(userService); endpoint.publish("/user");//发布地址 return endpoint; diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserCreateRequest.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserCreateRequest.java new file mode 100644 index 000000000..e375f6f6b --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/request/UserCreateRequest.java @@ -0,0 +1,35 @@ +package cn.iocoder.springboot.lab65.userservice.request; + +/** + * 创建用户信息 Request + */ +public class UserCreateRequest { + + /** + * 昵称 + */ + private String name; + /** + * 性别别 + */ + private Integer gender; + + public String getName() { + return name; + } + + public UserCreateRequest setName(String name) { + this.name = name; + return this; + } + + public Integer getGender() { + return gender; + } + + public UserCreateRequest setGender(Integer gender) { + this.gender = gender; + return this; + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserCreateResponse.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserCreateResponse.java new file mode 100644 index 000000000..465176ff4 --- /dev/null +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/response/UserCreateResponse.java @@ -0,0 +1,22 @@ +package cn.iocoder.springboot.lab65.userservice.response; + +/** + * 创建用户信息 Response + */ +public class UserCreateResponse { + + /** + * 用户编号 + */ + private Integer id; + + public Integer getId() { + return id; + } + + public UserCreateResponse setId(Integer id) { + this.id = id; + return this; + } + +} diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java index aa3d7f93d..7ff052fcb 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserService.java @@ -1,17 +1,18 @@ package cn.iocoder.springboot.lab65.userservice.service; -import cn.iocoder.springboot.lab65.userservice.config.WebServicesConfig; +import cn.iocoder.springboot.lab65.userservice.config.CXFConfig; +import cn.iocoder.springboot.lab65.userservice.request.UserCreateRequest; import cn.iocoder.springboot.lab65.userservice.request.UserGetRequest; +import cn.iocoder.springboot.lab65.userservice.response.UserCreateResponse; import cn.iocoder.springboot.lab65.userservice.response.UserGetResponse; import javax.jws.WebService; -@WebService(targetNamespace = WebServicesConfig.NAMESPACE_URI -// , -// name = "userPortName" -) +@WebService(targetNamespace = CXFConfig.NAMESPACE_URI) public interface UserService { UserGetResponse get(UserGetRequest request); + UserCreateResponse create(UserCreateRequest request); + } diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java index 7b0c6f712..dd67c0d22 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java @@ -1,20 +1,19 @@ package cn.iocoder.springboot.lab65.userservice.service; -import cn.iocoder.springboot.lab65.userservice.config.WebServicesConfig; +import cn.iocoder.springboot.lab65.userservice.config.CXFConfig; +import cn.iocoder.springboot.lab65.userservice.request.UserCreateRequest; import cn.iocoder.springboot.lab65.userservice.request.UserGetRequest; +import cn.iocoder.springboot.lab65.userservice.response.UserCreateResponse; import cn.iocoder.springboot.lab65.userservice.response.UserGetResponse; import org.springframework.stereotype.Service; import javax.jws.WebService; +@Service @WebService( serviceName = "userService", // 服务名称 - targetNamespace = WebServicesConfig.NAMESPACE_URI, // WSDL 命名空间 - endpointInterface = "cn.iocoder.springboot.lab65.userservice.service.UserService" // Web Services 对应接口 -// name = "userPortType", // portType 名称，作为客户端生成代码时的接口名称 TODO -// portName = "userPortName" // port 名称 TODO + targetNamespace = CXFConfig.NAMESPACE_URI // WSDL 命名空间 ) -@Service public class UserServiceImpl implements UserService { @Override @@ -26,12 +25,11 @@ public UserGetResponse get(UserGetRequest request) { return response; } -// @PayloadRoot(namespace = WebServicesConfig.NAMESPACE_URI, localPart = "UserCreateRequest") -// @ResponsePayload -// public UserCreateResponse create(@RequestPayload UserCreateRequest request) { -// UserCreateResponse response = new UserCreateResponse(); -// response.setId((int) (System.currentTimeMillis() / 1000)); -// return response; -// } + @Override + public UserCreateResponse create(UserCreateRequest request) { + UserCreateResponse response = new UserCreateResponse(); + response.setId((int) (System.currentTimeMillis() / 1000)); + return response; + } } diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml index a3643e9bb..2d5ca931a 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/resources/application.yml @@ -1,3 +1,6 @@ # CXF 配置项，对应 CxfProperties 配置类 cxf: path: /ws/ # CXF CXFServlet 的匹配路径 + +server: + port: 9090 # 设置服务器端口为 9090 From 92aeb797c2040579a4722ddf8a29ee16e745d6e5 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 18 Jun 2020 07:46:57 +0800 Subject: [PATCH 044/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20WebService=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../lab-15-spring-data-elasticsearch/pom.xml | 1 - .../lab65/demo/config/CXFConfig.java | 2 +- .../lab65/demo/controller/DemoController.java | 2 +- .../src/main/resources/wsdl/user.wsdl | 72 +++++++------- .../lab65/userservice/config/CXFConfig.java | 2 +- .../userservice/service/UserServiceImpl.java | 2 +- lab-65/lab-65-ws-feign-client/pom.xml | 6 -- ...s \345\205\245\351\227\250\343\200\213.md" | 1 + lab-66/lab-66-spring-data-solr/pom.xml | 49 ++++++++++ .../lab15/springdatasolr/Application.java | 7 ++ .../dataobject/SolrProductDO.java | 93 +++++++++++++++++++ .../repository/ProductRepository.java | 8 ++ .../src/main/resources/application.yml | 6 ++ .../repository/ProductRepositoryTest.java | 60 ++++++++++++ lab-66/pom.xml | 19 ++++ 16 files changed, 284 insertions(+), 48 deletions(-) create mode 100644 "lab-65/\343\200\212\350\212\213\351\201\223 Spring Boot Web Services \345\205\245\351\227\250\343\200\213.md" create mode 100644 lab-66/lab-66-spring-data-solr/pom.xml create mode 100644 lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/Application.java create mode 100644 lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java create mode 100644 lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository.java create mode 100644 lab-66/lab-66-spring-data-solr/src/main/resources/application.yml create mode 100644 lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepositoryTest.java create mode 100644 lab-66/pom.xml diff --git a/README.md b/README.md index b57d66c56..f4af41ad2 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,9 @@ * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) * [《芋道 Spring Boot 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Boot/Feign/?github) 对应 [lab-58](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-58) * [《芋道 Spring Boot gRPC 入门》](http://www.iocoder.cn/Spring-Boot/gRPC/?github) 对应 [lab-64](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-64) +* [《芋道 Spring Boot Web Services 入门》](http://www.iocoder.cn/Spring-Boot/Web-Services/?github) 对应 [lab-65](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65) * [《芋道 Spring Boot SOFARPC 入门》](http://www.iocoder.cn/Spring-Boot/SOFARPC/?github) 对应 [lab-62](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-62) * [《芋道 Spring Boot Motan 入门》](http://www.iocoder.cn/Spring-Boot/Motan/?github) 对应 [lab-63](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-63) -* 《芋道 Spring Boot gRPC 入门》计划中... * 《芋道 Spring Boot RSocket 入门》计划中... ## 数据访问 diff --git a/lab-15/lab-15-spring-data-elasticsearch/pom.xml b/lab-15/lab-15-spring-data-elasticsearch/pom.xml index df7e8f22d..fda7103b5 100644 --- a/lab-15/lab-15-spring-data-elasticsearch/pom.xml +++ b/lab-15/lab-15-spring-data-elasticsearch/pom.xml @@ -25,7 +25,6 @@ spring-boot-starter-test test - diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java index 997c73b4b..08defc3c3 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/config/CXFConfig.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab65.demo.config; -import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.UserService; +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_cxf_ws_demo.UserService; import org.apache.cxf.jaxws.JaxWsProxyFactoryBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java index 52ce4bc60..a47fa99f2 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/java/cn/iocoder/springboot/lab65/demo/controller/DemoController.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab65.demo.controller; -import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_spring_ws_demo.*; +import https.github_com.yunaiv.springboot_labs.tree.master.lab_65.lab_65_cxf_ws_demo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl index 3baac207a..f6ff60d50 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-application/src/main/resources/wsdl/user.wsdl @@ -1,101 +1,101 @@ - + - + - + - + - + - + + - + - + - + - - - + - + - + - - + - + - + - + + + - - - - - - + + + + + + - - - - + + + + - + - + - + - + - + - + - + diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java index e8aac5fd6..2ad37024b 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/config/CXFConfig.java @@ -11,7 +11,7 @@ @Configuration public class CXFConfig { - public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-spring-ws-demo"; + public static final String NAMESPACE_URI = "https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-65/lab-65-cxf-ws-demo"; @Bean(name = Bus.DEFAULT_BUS_ID) public SpringBus springBus() { diff --git a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java index dd67c0d22..e7510be56 100644 --- a/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java +++ b/lab-65/lab-65-cxf-ws-demo/lab-65-cxf-ws-demo-user-service/src/main/java/cn/iocoder/springboot/lab65/userservice/service/UserServiceImpl.java @@ -12,7 +12,7 @@ @Service @WebService( serviceName = "userService", // 服务名称 - targetNamespace = CXFConfig.NAMESPACE_URI // WSDL 命名空间 + targetNamespace = CXFConfig.NAMESPACE_URI // Namespace 命名空间 ) public class UserServiceImpl implements UserService { diff --git a/lab-65/lab-65-ws-feign-client/pom.xml b/lab-65/lab-65-ws-feign-client/pom.xml index 26206e2b7..2fdeedb59 100644 --- a/lab-65/lab-65-ws-feign-client/pom.xml +++ b/lab-65/lab-65-ws-feign-client/pom.xml @@ -39,12 +39,6 @@ spring-boot-starter-web - - - io.github.openfeign - feign-core - 11.0 - io.github.openfeign diff --git "a/lab-65/\343\200\212\350\212\213\351\201\223 Spring Boot Web Services \345\205\245\351\227\250\343\200\213.md" "b/lab-65/\343\200\212\350\212\213\351\201\223 Spring Boot Web Services \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..47e13e1ca --- /dev/null +++ "b/lab-65/\343\200\212\350\212\213\351\201\223 Spring Boot Web Services \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/lab-66/lab-66-spring-data-solr/pom.xml b/lab-66/lab-66-spring-data-solr/pom.xml new file mode 100644 index 000000000..30e851cfd --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/pom.xml @@ -0,0 +1,49 @@ + + + + lab-66 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-66-spring-data-solr + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-data-solr + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/Application.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/Application.java new file mode 100644 index 000000000..fcb13bb3f --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/Application.java @@ -0,0 +1,7 @@ +package cn.iocoder.springboot.lab15.springdatasolr; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { +} diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java new file mode 100644 index 000000000..e7f875832 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java @@ -0,0 +1,93 @@ +package cn.iocoder.springboot.lab15.springdatasolr.dataobject; + +import org.springframework.data.annotation.Id; +import org.springframework.data.solr.core.mapping.Indexed; +import org.springframework.data.solr.core.mapping.SolrDocument; + +@SolrDocument(collection = "new_core") +public class SolrProductDO { + + /** + * ID 主键 + */ + @Id + private Integer id; + + /** + * SPU 名字 + */ + @Indexed(value = "name") + private String name; + /** + * 描述 + */ + @Indexed(value = "description") + private String description; + /** + * 分类编号 + */ + @Indexed(value = "cid") + private Integer cid; + /** + * 分类名 + */ + @Indexed(value = "category_name") + private String categoryName; + + public Integer getId() { + return id; + } + + public SolrProductDO setId(Integer id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public SolrProductDO setName(String name) { + this.name = name; + return this; + } + + public String getDescription() { + return description; + } + + public SolrProductDO setDescription(String description) { + this.description = description; + return this; + } + + public Integer getCid() { + return cid; + } + + public SolrProductDO setCid(Integer cid) { + this.cid = cid; + return this; + } + + public String getCategoryName() { + return categoryName; + } + + public SolrProductDO setCategoryName(String categoryName) { + this.categoryName = categoryName; + return this; + } + + @Override + public String toString() { + return "SolrProductDO{" + + "id=" + id + + ", name='" + name + '\'' + + ", description='" + description + '\'' + + ", cid=" + cid + + ", categoryName='" + categoryName + '\'' + + '}'; + } + +} diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository.java new file mode 100644 index 000000000..0dd8f9ed1 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository.java @@ -0,0 +1,8 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.springframework.data.solr.repository.SolrCrudRepository; + +public interface ProductRepository extends SolrCrudRepository { + +} diff --git a/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml b/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml new file mode 100644 index 000000000..afc2af0cf --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml @@ -0,0 +1,6 @@ +spring: + data: + solr: + host: 'http://127.0.0.1:8983/solr' + repositories: + enabled: true diff --git a/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepositoryTest.java b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepositoryTest.java new file mode 100644 index 000000000..c41d3dd59 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepositoryTest.java @@ -0,0 +1,60 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.Application; +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Arrays; +import java.util.Optional; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) +public class ProductRepositoryTest { + + @Autowired + private ProductRepository productRepository; + + @Test // 插入一条记录 + public void testInsert() { + SolrProductDO product = new SolrProductDO(); + product.setId(1); // 一般 Solr 的 ID 编号，使用 DB 数据对应的编号。这里，先写死 + product.setName("芋道源码"); + product.setDescription("我只是一个描述"); + product.setCid(2); + product.setCategoryName("技术"); + productRepository.save(product); + } + + // 这里要注意，如果使用 save 方法来更新的话，必须是全量字段，否则其它字段会被覆盖。 + // 所以，这里仅仅是作为一个示例。 + @Test // 更新一条记录 + public void testUpdate() { + SolrProductDO product = new SolrProductDO(); + product.setId(1); + product.setCid(2); + product.setCategoryName("技术-Java"); + productRepository.save(product); + } + + @Test // 根据 ID 编号，删除一条记录 + public void testDelete() { + productRepository.deleteById(1); + } + + @Test // 根据 ID 编号，查询一条记录 + public void testSelectById() { + Optional userDO = productRepository.findById(1); + System.out.println(userDO.isPresent()); + } + + @Test // 根据 ID 编号数组，查询多条记录 + public void testSelectByIds() { + Iterable users = productRepository.findAllById(Arrays.asList(1, 4)); + users.forEach(System.out::println); + } + +} diff --git a/lab-66/pom.xml b/lab-66/pom.xml new file mode 100644 index 000000000..70f574cc8 --- /dev/null +++ b/lab-66/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-66 + pom + + lab-66-spring-data-solr + + + + From 11fd613579c9dc30b4ace6eba02a8c20a09829ff Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 18 Jun 2020 07:47:30 +0800 Subject: [PATCH 045/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20Solr=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d2acc4bc5..eccf39412 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ - lab-65 + @@ -109,6 +109,7 @@ + lab-66 From 558c49526d6501ff55752dbd7572cd22de9add03 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 18 Jun 2020 19:16:20 +0800 Subject: [PATCH 046/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20Solr=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 15 +++-- .../dataobject/SolrProductDO.java | 9 +-- .../repository/ProductRepository02.java | 12 ++++ .../repository/ProductRepository03.java | 17 ++++++ .../src/main/resources/application.yml | 5 +- .../repository/ProductRepository02Test.java | 57 +++++++++++++++++++ .../repository/ProductRepository03Test.java | 26 +++++++++ ...r \345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 2 +- 9 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02.java create mode 100644 lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03.java create mode 100644 lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02Test.java create mode 100644 lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03Test.java create mode 100644 "lab-66/\343\200\212\350\212\213\351\201\223 Spring Boot Web Solr \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index f4af41ad2..d9a875e13 100644 --- a/README.md +++ b/README.md @@ -65,19 +65,24 @@ ## 数据访问 -* [《芋道 Spring Boot Redis 入门》](http://www.iocoder.cn/Spring-Boot/Redis/?github) 对应 [lab-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-11) -* [《芋道 Spring Boot 缓存 Cache 入门》](http://www.iocoder.cn/Spring-Boot/Cache/?github) 对应 [lab-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-21) +**关系数据库** + * [《芋道 Spring Boot 数据库连接池入门》](http://www.iocoder.cn/Spring-Boot/datasource-pool/?github) 对应 [lab-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-19) * [《芋道 Spring Boot MyBatis 入门》](http://www.iocoder.cn/Spring-Boot/MyBatis/?github) 对应 [lab-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-12) * [《芋道 Spring Boot JPA 入门》](http://www.iocoder.cn/Spring-Boot/JPA/?github) 对应 [lab-13](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-13) * [《芋道 Spring Boot JdbcTemplate 入门》](http://www.iocoder.cn/Spring-Boot/JdbcTemplate/?github) 对应 [lab-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-14) -* [《芋道 Spring Boot Elasticsearch 入门》](http://www.iocoder.cn/Spring-Boot/Elasticsearch/?github) 对应 [lab-15](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-15) -* 《芋道 Spring Boot Solr 入门》计划中... -* [《芋道 Spring Boot MongoDB 入门》](http://www.iocoder.cn/Spring-Boot/MongoDB/?github) 对应 [lab-16](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-16) * [《芋道 Spring Boot 多数据源（读写分离）入门》](http://www.iocoder.cn/Spring-Boot/dynamic-datasource/?github) 对应 [lab-17](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-17) * [《芋道 Spring Boot 分库分表入门》](http://www.iocoder.cn/Spring-Boot/sharding-datasource/?github) 对应 [lab-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-18) * [《芋道 Spring Boot 数据库版本管理入门》](http://www.iocoder.cn/Spring-Boot/database-version-control/?github) 对应 [lab-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-20) +**非关系数据库** + +* [《芋道 Spring Boot Redis 入门》](http://www.iocoder.cn/Spring-Boot/Redis/?github) 对应 [lab-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-11) +* [《芋道 Spring Boot 缓存 Cache 入门》](http://www.iocoder.cn/Spring-Boot/Cache/?github) 对应 [lab-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-21) +* [《芋道 Spring Boot MongoDB 入门》](http://www.iocoder.cn/Spring-Boot/MongoDB/?github) 对应 [lab-16](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-16) +* [《芋道 Spring Boot Elasticsearch 入门》](http://www.iocoder.cn/Spring-Boot/Elasticsearch/?github) 对应 [lab-15](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-15) +* [《芋道 Spring Boot Solr 入门》](http://www.iocoder.cn/Spring-Boot/Solr/?github) 对应 [lab-66](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-66) + ## 事务管理 * [《芋道 Spring Boot 分布式事务 Seata 入门》](http://www.iocoder.cn/Spring-Boot/Seata/?github) 对应 [lab-52](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-52) diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java index e7f875832..11fed5deb 100644 --- a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/dataobject/SolrProductDO.java @@ -11,27 +11,28 @@ public class SolrProductDO { * ID 主键 */ @Id + @Indexed(name = "id", type = "int") private Integer id; /** * SPU 名字 */ - @Indexed(value = "name") + @Indexed(name = "name", type = "string") private String name; /** * 描述 */ - @Indexed(value = "description") + @Indexed(name = "description", type = "string") private String description; /** * 分类编号 */ - @Indexed(value = "cid") + @Indexed(name = "cid", type = "cid") private Integer cid; /** * 分类名 */ - @Indexed(value = "category_name") + @Indexed(name = "category_name", type = "string") private String categoryName; public Integer getId() { diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02.java new file mode 100644 index 000000000..216363bf1 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02.java @@ -0,0 +1,12 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.springframework.data.solr.repository.SolrCrudRepository; + +public interface ProductRepository02 extends SolrCrudRepository { + + SolrProductDO findByName(String name); + +// Page findByNameLike(String name, Pageable pageable); + +} diff --git a/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03.java b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03.java new file mode 100644 index 000000000..33aef1bdf --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/main/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03.java @@ -0,0 +1,17 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.springframework.data.solr.repository.Query; +import org.springframework.data.solr.repository.SolrCrudRepository; + +import java.util.List; + +public interface ProductRepository03 extends SolrCrudRepository { + + /** + * 根据 name 匹配商品名或者商品分类，获得符合的商品列表 + */ + @Query("name:?0 OR category_name:?0") + List findByCustomQuery(String name); + +} diff --git a/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml b/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml index afc2af0cf..3ed773e11 100644 --- a/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml +++ b/lab-66/lab-66-spring-data-solr/src/main/resources/application.yml @@ -1,6 +1,5 @@ spring: data: + # Spring Data Solr 配置项，对应 SolrProperties 配置类 solr: - host: 'http://127.0.0.1:8983/solr' - repositories: - enabled: true + host: 'http://127.0.0.1:8983/solr' # Solr 服务器地址 diff --git a/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02Test.java b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02Test.java new file mode 100644 index 000000000..d7c3ddff0 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository02Test.java @@ -0,0 +1,57 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.Application; +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) +public class ProductRepository02Test { + + @Autowired + private ProductRepository02 productRepository; + + @Test // 根据名字获得一条记录 + public void testFindByName() { + SolrProductDO product = productRepository.findByName("芋道源码"); + System.out.println(product); + } + +// @Test // 使用 name 模糊查询，分页返回结果 +// public void testFindByNameLike() { +// // 根据情况，是否要制造测试数据 +// if (false) { +// testInsert(); +// } +// +// // 创建排序条件 +// Sort sort = Sort.by(Sort.Direction.DESC, "id"); // ID 倒序 +// // 创建分页条件。 +// Pageable pageable = PageRequest.of(0, 10, sort); +// // 执行分页操作 +// Page page = productRepository.findByNameLike("芋道", pageable); +// // 打印 +// System.out.println(page.getTotalElements()); +// System.out.println(page.getTotalPages()); +// } +// +// /** +// * 为了给分页制造一点数据 +// */ +// private void testInsert() { +// for (int i = 1; i <= 100; i++) { +// SolrProductDO product = new SolrProductDO(); +// product.setId(i); // 一般 ES 的 ID 编号，使用 DB 数据对应的编号。这里，先写死 +// product.setName("芋道源码：" + i); +// product.setDescription("我只是一个描述"); +// product.setCid(1); +// product.setCategoryName("技术"); +// productRepository.save(product); +// } +// } + +} diff --git a/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03Test.java b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03Test.java new file mode 100644 index 000000000..753027263 --- /dev/null +++ b/lab-66/lab-66-spring-data-solr/src/test/java/cn/iocoder/springboot/lab15/springdatasolr/repository/ProductRepository03Test.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab15.springdatasolr.repository; + +import cn.iocoder.springboot.lab15.springdatasolr.Application; +import cn.iocoder.springboot.lab15.springdatasolr.dataobject.SolrProductDO; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = Application.class) +public class ProductRepository03Test { + + @Autowired + private ProductRepository03 productRepository; + + @Test + public void testFindByCustomQuery() { + List products = productRepository.findByCustomQuery("技术"); + System.out.println(products.size()); + } + +} diff --git "a/lab-66/\343\200\212\350\212\213\351\201\223 Spring Boot Web Solr \345\205\245\351\227\250\343\200\213.md" "b/lab-66/\343\200\212\350\212\213\351\201\223 Spring Boot Web Solr \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..65412077d --- /dev/null +++ "b/lab-66/\343\200\212\350\212\213\351\201\223 Spring Boot Web Solr \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index eccf39412..c89c0aa5a 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,7 @@ + @@ -109,7 +110,6 @@ - lab-66 From 0ba1edb60007732738212d07765351c3f0d5dd32 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 18 Jun 2020 22:22:47 +0800 Subject: [PATCH 047/115] =?UTF-8?q?=E5=BC=80=E5=A7=8B=20Netty=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-67-netty-demo-client/pom.xml | 56 +++++++++++++ .../NettyClientApplication.java | 4 + .../config/NettyClientConfig.java | 21 +++++ .../lab-67-netty-demo-common/pom.xml | 55 +++++++++++++ .../nettycommondemo/codec/Invocation.java | 41 ++++++++++ .../codec/InvocationDecoder.java | 39 +++++++++ .../codec/InvocationEncoder.java | 20 +++++ .../nettycommondemo/dispacher/Message.java | 4 + .../dispacher/MessageDispatcher.java | 28 +++++++ .../dispacher/MessageHandler.java | 20 +++++ .../dispacher/MessageHandlerContainer.java | 76 ++++++++++++++++++ .../lab-67-netty-demo-server/pom.xml | 56 +++++++++++++ .../NettyServerApplication.java | 13 +++ .../config/NettyServerConfig.java | 21 +++++ .../nettyserverdemo/server/NettyServer.java | 80 +++++++++++++++++++ .../server/NettyServerHandlerInitializer.java | 31 +++++++ .../src/main/resources/application.yml | 2 + lab-67/lab-67-netty-demo/pom.xml | 21 +++++ lab-67/pom.xml | 19 +++++ pom.xml | 1 + 20 files changed, 608 insertions(+) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/pom.xml create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/pom.xml create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/pom.xml create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/NettyServerApplication.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/resources/application.yml create mode 100644 lab-67/lab-67-netty-demo/pom.xml create mode 100644 lab-67/pom.xml diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/pom.xml b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/pom.xml new file mode 100644 index 000000000..5904c2d14 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/pom.xml @@ -0,0 +1,56 @@ + + + + lab-67-netty-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-67-netty-demo-client + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.netty + netty-all + 4.1.50.Final + + + + + cn.iocoder.springboot.labs + lab-67-netty-demo-common + 1.0-SNAPSHOT + + + + diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java new file mode 100644 index 000000000..13d4254c3 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java @@ -0,0 +1,4 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo; + +public class NettyClientApplication { +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java new file mode 100644 index 000000000..54a83d0e7 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java @@ -0,0 +1,21 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.config; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandlerContainer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class NettyClientConfig { + + @Bean + public MessageDispatcher messageDispatcher() { + return new MessageDispatcher(); + } + + @Bean + public MessageHandlerContainer messageHandlerContainer() { + return new MessageHandlerContainer(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/pom.xml b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/pom.xml new file mode 100644 index 000000000..503b3b40b --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/pom.xml @@ -0,0 +1,55 @@ + + + + lab-67-netty-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-67-netty-demo-common + + + + 1.8 + 1.8 + + + + + + io.netty + netty-all + 4.1.50.Final + + + + + com.alibaba + fastjson + 1.2.71 + + + + + org.springframework + spring-aop + 5.2.5.RELEASE + + + org.springframework + spring-context + 5.2.5.RELEASE + + + + + org.slf4j + slf4j-api + 1.7.30 + + + + diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java new file mode 100644 index 000000000..537be1599 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java @@ -0,0 +1,41 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.codec; + +public class Invocation { + + /** + * 类型 - 心跳请求 + */ + public static final String TYPE_HEARTBEAT_REQUEST = "HEARTBEAT_REQUEST"; + /** + * 类型 - 心跳响应 + */ + public static final String TYPE_HEARTBEAT_RESPONSE = "HEARTBEAT_RESPONSE"; + + /** + * 类型 + */ + private String type; + /** + * 消息 + */ + private String message; + + public String getType() { + return type; + } + + public Invocation setType(String type) { + this.type = type; + return this; + } + + public String getMessage() { + return message; + } + + public Invocation setMessage(String message) { + this.message = message; + return this; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java new file mode 100644 index 000000000..a097f7468 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java @@ -0,0 +1,39 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.codec; + +import com.alibaba.fastjson.JSON; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.CorruptedFrameException; + +import java.util.List; + +public class InvocationDecoder extends ByteToMessageDecoder { + + @Override + protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { + // 标记当前读取位置 + in.markReaderIndex(); + // 判断是否能够读取 length 长度 + if (in.readableBytes() <= 4) { + return; + } + // 读取长度 + int length = in.readInt(); + if (length < 0) { + throw new CorruptedFrameException("negative length: " + length); + } + // 如果 message 不够可读，则退回到原读取位置 + if (in.readableBytes() < length) { + in.resetReaderIndex(); + return; + } + // 读取内容 + ByteBuf byteBuf = in.readRetainedSlice(length); + // 解析成 Invocation + byte[] content = byteBuf.array(); + Invocation invocation = JSON.parseObject(content, Invocation.class); + out.add(invocation); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java new file mode 100644 index 000000000..b69216f5d --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java @@ -0,0 +1,20 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.codec; + +import com.alibaba.fastjson.JSON; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToByteEncoder; + +public class InvocationEncoder extends MessageToByteEncoder { + + @Override + protected void encode(ChannelHandlerContext ctx, Invocation invocation, ByteBuf out) { + // 将 Invocation 转换成 byte[] 数组 + byte[] content = JSON.toJSONBytes(invocation); + // 写入 length + out.writeInt(content.length); + // 写入内容 + out.writeBytes(content); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java new file mode 100644 index 000000000..7ee0f6b46 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java @@ -0,0 +1,4 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; + +public interface Message { +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java new file mode 100644 index 000000000..28776af08 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import com.alibaba.fastjson.JSON; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import org.springframework.beans.factory.annotation.Autowired; + +@ChannelHandler.Sharable +public class MessageDispatcher extends SimpleChannelInboundHandler { + + @Autowired + private MessageHandlerContainer messageHandlerContainer; + + @Override + protected void channelRead0(ChannelHandlerContext ctx, Invocation invocation) { + // 获得 type 对应的 MessageHandler 处理器 + MessageHandler messageHandler = messageHandlerContainer.getMessageHandler(invocation.getType()); + // 解析消息 + Class messageClass = MessageHandlerContainer.getMessageClass(messageHandler); + Message message = JSON.parseObject(invocation.getMessage(), messageClass); + // 执行逻辑 + // noinspection unchecked + messageHandler.execute(ctx.channel(), message); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java new file mode 100644 index 000000000..c70bb69d3 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java @@ -0,0 +1,20 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; + +import io.netty.channel.Channel; + +public interface MessageHandler { + + /** + * 执行处理消息 + * + * @param channel 通道 + * @param message 消息 + */ + void execute(Channel channel, T message); + + /** + * @return 消息类型，即每个 Message 实现类上的 TYPE 静态字段 + */ + String getType(); + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java new file mode 100644 index 000000000..424676016 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java @@ -0,0 +1,76 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.aop.framework.AopProxyUtils; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationContext; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class MessageHandlerContainer implements InitializingBean { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + /** + * 消息类型与 MessageHandler 的映射 + */ + private final Map handlers = new HashMap<>(); + + @Autowired + private ApplicationContext applicationContext; + + @Override + public void afterPropertiesSet() throws Exception { + // 通过 ApplicationContext 获得所有 MessageHandler Bean + applicationContext.getBeansOfType(MessageHandler.class).values() // 获得所有 MessageHandler Bean + .forEach(messageHandler -> handlers.put(messageHandler.getType(), messageHandler)); // 添加到 handlers 中 + logger.info("[afterPropertiesSet][消息处理器数量：{}]", handlers.size()); + } + + protected MessageHandler getMessageHandler(String type) { + MessageHandler handler = handlers.get(type); + if (handler == null) { + throw new IllegalArgumentException(String.format("类型(%s) 找不到匹配的 MessageHandler 处理器", type)); + } + return handler; + } + + public static Class getMessageClass(MessageHandler handler) { + // 获得 Bean 对应的 Class 类名。因为有可能被 AOP 代理过。 + Class targetClass = AopProxyUtils.ultimateTargetClass(handler); + // 获得接口的 Type 数组 + Type[] interfaces = targetClass.getGenericInterfaces(); + Class superclass = targetClass.getSuperclass(); + while ((Objects.isNull(interfaces) || 0 == interfaces.length) && Objects.nonNull(superclass)) { // 此处，是以父类的接口为准 + interfaces = superclass.getGenericInterfaces(); + superclass = targetClass.getSuperclass(); + } + if (Objects.nonNull(interfaces)) { + // 遍历 interfaces 数组 + for (Type type : interfaces) { + // 要求 type 是泛型参数 + if (type instanceof ParameterizedType) { + ParameterizedType parameterizedType = (ParameterizedType) type; + // 要求是 MessageHandler 接口 + if (Objects.equals(parameterizedType.getRawType(), MessageHandler.class)) { + Type[] actualTypeArguments = parameterizedType.getActualTypeArguments(); + // 取首个元素 + if (Objects.nonNull(actualTypeArguments) && actualTypeArguments.length > 0) { + return (Class) actualTypeArguments[0]; + } else { + throw new IllegalStateException(String.format("类型(%s) 获得不到消息类型", handler)); + } + } + } + } + } + throw new IllegalStateException(String.format("类型(%s) 获得不到消息类型", handler)); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/pom.xml b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/pom.xml new file mode 100644 index 000000000..f5b6f3082 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/pom.xml @@ -0,0 +1,56 @@ + + + + lab-67-netty-demo + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-67-netty-demo-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter + + + + + io.netty + netty-all + 4.1.50.Final + + + + + cn.iocoder.springboot.labs + lab-67-netty-demo-common + 1.0-SNAPSHOT + + + + diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/NettyServerApplication.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/NettyServerApplication.java new file mode 100644 index 000000000..eae612c71 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/NettyServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class NettyServerApplication { + + public static void main(String[] args) { + SpringApplication.run(NettyServerApplication.class, args); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java new file mode 100644 index 000000000..7db3f2caa --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java @@ -0,0 +1,21 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.config; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandlerContainer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class NettyServerConfig { + + @Bean + public MessageDispatcher messageDispatcher() { + return new MessageDispatcher(); + } + + @Bean + public MessageHandlerContainer messageHandlerContainer() { + return new MessageHandlerContainer(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java new file mode 100644 index 000000000..b1c2449f0 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java @@ -0,0 +1,80 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.server; + +import io.netty.bootstrap.ServerBootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioServerSocketChannel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import java.net.InetSocketAddress; + +@Component +public class NettyServer { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${netty.port}") + private Integer port; + + @Autowired + private NettyServerHandlerInitializer nettyServerHandlerInitializer; + + /** + * boss 线程组，用于服务端接受客户端的连接 + */ + private EventLoopGroup bossGroup = new NioEventLoopGroup(); + /** + * worker 线程组，用于服务端接受客户端的数据读写 + */ + private EventLoopGroup workerGroup = new NioEventLoopGroup(); + /** + * Netty Server Channel + */ + private Channel channel; + + /** + * 启动 Netty Server + */ + @PostConstruct + public void start() throws InterruptedException { + // 创建 ServerBootstrap 对象，用于 Netty Server 启动 + ServerBootstrap bootstrap = new ServerBootstrap(); + bootstrap.group(bossGroup, workerGroup) // 设置两个 EventLoopGroup 对象 + .channel(NioServerSocketChannel.class) // 指定 Channel 为服务端 NioServerSocketChannel + .localAddress(new InetSocketAddress(port)) // 设置 Netty Server 的端口 + .option(ChannelOption.SO_BACKLOG, 1024) // 服务端 accept 队列的大小 + .childOption(ChannelOption.SO_KEEPALIVE, true) // TCP Keepalive 机制，实现 TCP 层级的心跳保活功能 + .childOption(ChannelOption.TCP_NODELAY, true) // 允许较小的数据包的发送，降低延迟 + .childHandler(nettyServerHandlerInitializer); + // 绑定端口，并同步等待成功，即启动服务端 + ChannelFuture future = bootstrap.bind().sync(); + if (future.isSuccess()) { + channel = future.channel(); + logger.info("[start][Netty Server 启动在 {} 端口]", port); + } + } + + /** + * 关闭 Netty Server + */ + @PreDestroy + public void shutdown() { + // 关闭 Netty Server + if (channel != null) { + channel.close(); + } + // 优雅关闭两个 EventLoopGroup 对象 + bossGroup.shutdownGracefully(); + workerGroup.shutdownGracefully(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java new file mode 100644 index 000000000..b7a374e4b --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java @@ -0,0 +1,31 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.server; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class NettyServerHandlerInitializer extends ChannelInitializer { + + @Autowired + private MessageDispatcher messageDispatcher; + + @Override + protected void initChannel(Channel ch) throws Exception { + ch.pipeline() + // 空闲检测 +// .addLast(new ServerIdleStateHandler()) + // 编码器 + .addLast(new InvocationEncoder()) + // 解码器 + .addLast(new InvocationDecoder()) + // 服务端处理器 + .addLast(messageDispatcher) + ; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/resources/application.yml b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/resources/application.yml new file mode 100644 index 000000000..26ad40574 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/resources/application.yml @@ -0,0 +1,2 @@ +netty: + port: 8888 # Netty Server 端口 diff --git a/lab-67/lab-67-netty-demo/pom.xml b/lab-67/lab-67-netty-demo/pom.xml new file mode 100644 index 000000000..63d830bf2 --- /dev/null +++ b/lab-67/lab-67-netty-demo/pom.xml @@ -0,0 +1,21 @@ + + + + lab-67 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-67-netty-demo + pom + + lab-67-netty-demo-server + lab-67-netty-demo-client + lab-67-netty-demo-common + + + + diff --git a/lab-67/pom.xml b/lab-67/pom.xml new file mode 100644 index 000000000..b27593c1b --- /dev/null +++ b/lab-67/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-67 + pom + + lab-67-netty-demo + + + + diff --git a/pom.xml b/pom.xml index c89c0aa5a..2ed43b88e 100644 --- a/pom.xml +++ b/pom.xml @@ -110,6 +110,7 @@ + lab-67 From f03685cc639652afdb7673f7b945f70014c0f93d Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 19 Jun 2020 07:57:08 +0800 Subject: [PATCH 048/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=AE=8C=E6=88=90=20Server=20=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NettyClientApplication.java | 9 +++ .../nettyclientdemo/client/NettyClient.java | 75 +++++++++++++++++++ .../NettyClientHandlerInitializer.java} | 6 +- .../src/main/resources/application.yml | 4 + .../server/NettyChannelManager.java | 29 +++++++ .../nettyserverdemo/server/NettyServer.java | 6 +- .../server/handler/NettyServerHandler.java | 40 ++++++++++ .../NettyServerHandlerInitializer.java | 43 +++++++++++ 8 files changed, 205 insertions(+), 7 deletions(-) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java rename lab-67/lab-67-netty-demo/{lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java => lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java} (85%) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/resources/application.yml create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java index 13d4254c3..2990fbea1 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/NettyClientApplication.java @@ -1,4 +1,13 @@ package cn.iocoder.springboot.lab67.nettyclientdemo; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication public class NettyClientApplication { + + public static void main(String[] args) { + SpringApplication.run(NettyClientApplication.class, args); + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java new file mode 100644 index 000000000..53470abf7 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java @@ -0,0 +1,75 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.client; + +import io.netty.bootstrap.Bootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.nio.NioSocketChannel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +@Component +public class NettyClient { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Value("${netty.server.host}") + private String serverHost; + @Value("${netty.server.port}") + private Integer serverPort; + + @Autowired + private NettyClientHandlerInitializer nettyClientHandlerInitializer; + + /** + * 线程组，用于客户端对服务端的链接、数据读写 + */ + private EventLoopGroup eventGroup = new NioEventLoopGroup(); + /** + * Netty Client Channel + */ + private Channel channel; + + /** + * 启动 Netty Server + */ + @PostConstruct + public void start() throws InterruptedException { + // 创建 Bootstrap 对象，用于 Netty Client 启动 + Bootstrap bootstrap = new Bootstrap(); + bootstrap.group(eventGroup) // 设置一个 EventLoopGroup 对象 + .channel(NioSocketChannel.class) // 指定 Channel 为客户端 NioSocketChannel + .remoteAddress(serverHost, serverPort) // 指定链接服务器的地址 + .option(ChannelOption.SO_KEEPALIVE, true) // TCP Keepalive 机制，实现 TCP 层级的心跳保活功能 + .option(ChannelOption.TCP_NODELAY, true) // 允许较小的数据包的发送，降低延迟 + .handler(nettyClientHandlerInitializer); + // 链接服务器，并同步等待成功，即启动客户端 + ChannelFuture future = bootstrap.connect().sync(); + if (future.isSuccess()) { + channel = future.channel(); + logger.info("[start][Netty Client 链接服务器({}:{}) 成功]", serverHost, serverPort); + } + } + + /** + * 关闭 Netty Server + */ + @PreDestroy + public void shutdown() { + // 关闭 Netty Client + if (channel != null) { + channel.close(); + } + // 优雅关闭一个 EventLoopGroup 对象 + eventGroup.shutdownGracefully(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java similarity index 85% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java index b7a374e4b..0215404e9 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServerHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettyserverdemo.server; +package cn.iocoder.springboot.lab67.nettyclientdemo.client; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Component -public class NettyServerHandlerInitializer extends ChannelInitializer { +public class NettyClientHandlerInitializer extends ChannelInitializer { @Autowired private MessageDispatcher messageDispatcher; @@ -23,7 +23,7 @@ protected void initChannel(Channel ch) throws Exception { .addLast(new InvocationEncoder()) // 解码器 .addLast(new InvocationDecoder()) - // 服务端处理器 + // 客户端处理器 .addLast(messageDispatcher) ; } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/resources/application.yml b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/resources/application.yml new file mode 100644 index 000000000..472ca627b --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/resources/application.yml @@ -0,0 +1,4 @@ +netty: + server: + host: 127.0.0.1 # Netty Server 地址 + port: 8888 # Netty Server 端口 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java new file mode 100644 index 000000000..ae02a6005 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java @@ -0,0 +1,29 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.server; + +import io.netty.channel.Channel; +import io.netty.channel.ChannelId; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +@Component +public class NettyChannelManager { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private ConcurrentMap channels = new ConcurrentHashMap<>(); + + public void add(Channel channel) { + channels.put(channel.id(), channel); + logger.info("[add][一个新的连接({})加入]", channel.id()); + } + + public void remove(Channel channel) { + channels.remove(channel.id()); + logger.info("[add][一个连接({})离开]", channel.id()); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java index b1c2449f0..d7a3ca9fd 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java @@ -1,10 +1,8 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.server; +import cn.iocoder.springboot.lab67.nettyserverdemo.server.handler.NettyServerHandlerInitializer; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; +import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import org.slf4j.Logger; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java new file mode 100644 index 000000000..de98d43c2 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java @@ -0,0 +1,40 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.server.handler; + +import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class NettyServerHandler extends ChannelInboundHandlerAdapter { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private NettyChannelManager channelManager; + + @Override + public void channelActive(ChannelHandlerContext ctx) { + // 从管理器中添加 + channelManager.add(ctx.channel()); + } + + @Override + public void channelUnregistered(ChannelHandlerContext ctx) { + // 从管理器中移除 + channelManager.remove(ctx.channel()); + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id()); + // 从管理器中移除 + channelManager.remove(ctx.channel()); + // 断开连接 + ctx.channel().close(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java new file mode 100644 index 000000000..2914ceef6 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java @@ -0,0 +1,43 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.server.handler; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.handler.timeout.ReadTimeoutHandler; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.concurrent.TimeUnit; + +@Component +public class NettyServerHandlerInitializer extends ChannelInitializer { + + /** + * 心跳超时时间 + */ + private static final Integer READ_TIMEOUT_SECONDS = 1 * 10; + + @Autowired + private MessageDispatcher messageDispatcher; + @Autowired + private NettyServerHandler nettyServerHandler; + + @Override + protected void initChannel(Channel ch) throws Exception { + ch.pipeline() + // 空闲检测 + .addLast(new ReadTimeoutHandler(READ_TIMEOUT_SECONDS, TimeUnit.SECONDS)) + // 编码器 + .addLast(new InvocationEncoder()) + // 解码器 + .addLast(new InvocationDecoder()) + // 消息分发器 + .addLast(messageDispatcher) + // 服务端处理器 + .addLast(nettyServerHandler) + ; + } + +} From 155ca51db76a963ce1700279093f2037c6e74830 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 19 Jun 2020 08:54:55 +0800 Subject: [PATCH 049/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=AE=8C=E6=88=90=E5=BF=83=E8=B7=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nettyclientdemo/client/NettyClient.java | 3 +- .../client/handler/NettyClientHandler.java | 38 +++++++++++++++++++ .../NettyClientHandlerInitializer.java | 15 +++++++- .../HeartbeatResponseHandler.java | 25 ++++++++++++ .../nettycommondemo/codec/Invocation.java | 20 +++++----- .../codec/InvocationDecoder.java | 4 +- .../heartbeat/HeartbeatRequest.java | 15 ++++++++ .../heartbeat/HeartbeatResponse.java | 15 ++++++++ .../HeartbeatRequestHandler.java | 30 +++++++++++++++ .../server/NettyChannelManager.java | 4 +- .../server/handler/NettyServerHandler.java | 4 +- .../NettyServerHandlerInitializer.java | 2 +- 12 files changed, 157 insertions(+), 18 deletions(-) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java rename lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/{ => handler}/NettyClientHandlerInitializer.java (68%) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java index 53470abf7..c6eb0d196 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java @@ -1,5 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.client; +import cn.iocoder.springboot.lab67.nettyclientdemo.client.handler.NettyClientHandlerInitializer; import io.netty.bootstrap.Bootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; @@ -55,7 +56,7 @@ public void start() throws InterruptedException { ChannelFuture future = bootstrap.connect().sync(); if (future.isSuccess()) { channel = future.channel(); - logger.info("[start][Netty Client 链接服务器({}:{}) 成功]", serverHost, serverPort); + logger.info("[start][Netty Client 连接服务器({}:{}) 成功]", serverHost, serverPort); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java new file mode 100644 index 000000000..085a49c91 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.client.handler; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatRequest; +import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelInboundHandlerAdapter; +import io.netty.handler.timeout.IdleStateEvent; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class NettyClientHandler extends ChannelInboundHandlerAdapter { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws Exception { + // 空闲时，向服务端发起一次心跳 + if (event instanceof IdleStateEvent) { + HeartbeatRequest heartbeatRequest = new HeartbeatRequest(); + ctx.writeAndFlush(new Invocation(HeartbeatRequest.TYPE, heartbeatRequest)) + .addListener(ChannelFutureListener.CLOSE_ON_FAILURE); + logger.info("[userEventTriggered][发起一次心跳]"); + } else { + super.userEventTriggered(ctx, event); + } + } + + @Override + public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { + logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id(), cause); + // 断开连接 + ctx.channel().close(); + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java similarity index 68% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java index 0215404e9..ece6f0627 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClientHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java @@ -1,30 +1,41 @@ -package cn.iocoder.springboot.lab67.nettyclientdemo.client; +package cn.iocoder.springboot.lab67.nettyclientdemo.client.handler; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; +import io.netty.handler.timeout.IdleStateHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component public class NettyClientHandlerInitializer extends ChannelInitializer { + /** + * 心跳超时时间 + */ + private static final Integer WRITE_TIMEOUT_SECONDS = 3; + @Autowired private MessageDispatcher messageDispatcher; + @Autowired + private NettyClientHandler nettyClientHandler; + @Override protected void initChannel(Channel ch) throws Exception { ch.pipeline() // 空闲检测 -// .addLast(new ServerIdleStateHandler()) + .addLast(new IdleStateHandler(WRITE_TIMEOUT_SECONDS, 0, 0)) // 编码器 .addLast(new InvocationEncoder()) // 解码器 .addLast(new InvocationDecoder()) // 客户端处理器 .addLast(messageDispatcher) + // 客户端处理器 + .addLast(nettyClientHandler) ; } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java new file mode 100644 index 000000000..73de2ce9f --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatResponse; +import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class HeartbeatResponseHandler implements MessageHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(Channel channel, HeartbeatResponse message) { + logger.info("[execute][收到连接({}) 的心跳响应]", channel.id()); + } + + @Override + public String getType() { + return HeartbeatResponse.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java index 537be1599..a3cd78a76 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java @@ -1,15 +1,9 @@ package cn.iocoder.springboot.lab67.nettycommondemo.codec; -public class Invocation { +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import com.alibaba.fastjson.JSON; - /** - * 类型 - 心跳请求 - */ - public static final String TYPE_HEARTBEAT_REQUEST = "HEARTBEAT_REQUEST"; - /** - * 类型 - 心跳响应 - */ - public static final String TYPE_HEARTBEAT_RESPONSE = "HEARTBEAT_RESPONSE"; +public class Invocation { /** * 类型 @@ -20,6 +14,14 @@ public class Invocation { */ private String message; + public Invocation() { + } + + public Invocation(String type, Message message) { + this.type = type; + this.message = JSON.toJSONString(message); + } + public String getType() { return type; } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java index a097f7468..076cd812e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java @@ -29,9 +29,9 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { return; } // 读取内容 - ByteBuf byteBuf = in.readRetainedSlice(length); + byte[] content = new byte[length]; + in.readBytes(content); // 解析成 Invocation - byte[] content = byteBuf.array(); Invocation invocation = JSON.parseObject(content, Invocation.class); out.add(invocation); } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java new file mode 100644 index 000000000..61b4c4fb5 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java @@ -0,0 +1,15 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.heartbeat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 消息 - 心跳请求 + */ +public class HeartbeatRequest implements Message { + + /** + * 类型 - 心跳请求 + */ + public static final String TYPE = "HEARTBEAT_REQUEST"; + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java new file mode 100644 index 000000000..43ce9a699 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java @@ -0,0 +1,15 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.heartbeat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 消息 - 心跳响应 + */ +public class HeartbeatResponse implements Message { + + /** + * 类型 - 心跳响应 + */ + public static final String TYPE = "HEARTBEAT_RESPONSE"; + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java new file mode 100644 index 000000000..768c16c74 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java @@ -0,0 +1,30 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatRequest; +import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatResponse; +import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class HeartbeatRequestHandler implements MessageHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(Channel channel, HeartbeatRequest message) { + logger.info("[execute][收到连接({}) 的心跳请求]", channel.id()); + // 响应心跳 + HeartbeatResponse response = new HeartbeatResponse(); + channel.writeAndFlush(new Invocation(HeartbeatResponse.TYPE, response)); + } + + @Override + public String getType() { + return HeartbeatRequest.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java index ae02a6005..52b27ff03 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java @@ -18,12 +18,12 @@ public class NettyChannelManager { public void add(Channel channel) { channels.put(channel.id(), channel); - logger.info("[add][一个新的连接({})加入]", channel.id()); + logger.info("[add][一个连接({})加入]", channel.id()); } public void remove(Channel channel) { channels.remove(channel.id()); - logger.info("[add][一个连接({})离开]", channel.id()); + logger.info("[remove][一个连接({})离开]", channel.id()); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java index de98d43c2..fc6af4ee7 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.server.handler; import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; +import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import org.slf4j.Logger; @@ -9,6 +10,7 @@ import org.springframework.stereotype.Component; @Component +@ChannelHandler.Sharable public class NettyServerHandler extends ChannelInboundHandlerAdapter { private Logger logger = LoggerFactory.getLogger(getClass()); @@ -30,7 +32,7 @@ public void channelUnregistered(ChannelHandlerContext ctx) { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id()); + logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id(), cause); // 从管理器中移除 channelManager.remove(ctx.channel()); // 断开连接 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java index 2914ceef6..beea028ce 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java @@ -17,7 +17,7 @@ public class NettyServerHandlerInitializer extends ChannelInitializer { /** * 心跳超时时间 */ - private static final Integer READ_TIMEOUT_SECONDS = 1 * 10; + private static final Integer READ_TIMEOUT_SECONDS = 1000; @Autowired private MessageDispatcher messageDispatcher; From 64d3076c9574663b3aa936839173aca2690599ac Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 19 Jun 2020 09:27:22 +0800 Subject: [PATCH 050/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=A2=9E=E5=8A=A0=E9=87=8D=E8=BF=9E=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nettyclientdemo/client/NettyClient.java | 50 +++++++++++++++---- .../client/handler/NettyClientHandler.java | 13 +++++ 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java index c6eb0d196..5209ab7cb 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java @@ -2,10 +2,7 @@ import cn.iocoder.springboot.lab67.nettyclientdemo.client.handler.NettyClientHandlerInitializer; import io.netty.bootstrap.Bootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelOption; -import io.netty.channel.EventLoopGroup; +import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioSocketChannel; import org.slf4j.Logger; @@ -16,10 +13,16 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; +import java.util.concurrent.TimeUnit; @Component public class NettyClient { + /** + * 重连频率，单位：秒 + */ + private static final Integer RECONNECT_SECONDS = 20; + private Logger logger = LoggerFactory.getLogger(getClass()); @Value("${netty.server.host}") @@ -37,7 +40,7 @@ public class NettyClient { /** * Netty Client Channel */ - private Channel channel; + private volatile Channel channel; /** * 启动 Netty Server @@ -52,12 +55,37 @@ public void start() throws InterruptedException { .option(ChannelOption.SO_KEEPALIVE, true) // TCP Keepalive 机制，实现 TCP 层级的心跳保活功能 .option(ChannelOption.TCP_NODELAY, true) // 允许较小的数据包的发送，降低延迟 .handler(nettyClientHandlerInitializer); - // 链接服务器，并同步等待成功，即启动客户端 - ChannelFuture future = bootstrap.connect().sync(); - if (future.isSuccess()) { - channel = future.channel(); - logger.info("[start][Netty Client 连接服务器({}:{}) 成功]", serverHost, serverPort); - } + // 链接服务器，并异步等待成功，即启动客户端 + bootstrap.connect().addListener(new ChannelFutureListener() { + + @Override + public void operationComplete(ChannelFuture future) throws Exception { + // 连接失败 + if (!future.isSuccess()) { + logger.error("[start][Netty Client 连接服务器({}:{}) 失败]", serverHost, serverPort); + reconnect(); + return; + } + // 连接成功 + channel = future.channel(); + logger.info("[start][Netty Client 连接服务器({}:{}) 成功]", serverHost, serverPort); + } + + }); + } + + public void reconnect() { + eventGroup.schedule(new Runnable() { + @Override + public void run() { + logger.info("[reconnect][开始重连]"); + try { + start(); + } catch (InterruptedException e) { + logger.error("[reconnect][重连失败]", e); + } + } + }, RECONNECT_SECONDS, TimeUnit.SECONDS); } /** diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java index 085a49c91..823e5fad1 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java @@ -1,5 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.client.handler; +import cn.iocoder.springboot.lab67.nettyclientdemo.client.NettyClient; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatRequest; import io.netty.channel.ChannelFutureListener; @@ -8,6 +9,7 @@ import io.netty.handler.timeout.IdleStateEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component @@ -15,6 +17,9 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter { private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private NettyClient nettyClient; + @Override public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws Exception { // 空闲时，向服务端发起一次心跳 @@ -28,6 +33,14 @@ public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws E } } + @Override + public void channelInactive(ChannelHandlerContext ctx) throws Exception { + // 发起重连 + nettyClient.reconnect(); + // 继续触发事件 + super.channelInactive(ctx); + } + @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id(), cause); From f6f93b5c3d19f93fb0e483720db8b3fc0ece8eac Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 19 Jun 2020 19:09:46 +0800 Subject: [PATCH 051/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nettyclientdemo/client/NettyClient.java | 20 ++++++ .../client/handler/NettyClientHandler.java | 4 +- .../NettyClientHandlerInitializer.java | 8 +-- .../controller/TestController.java | 26 ++++++++ .../message/auth/AuthRequest.java | 33 ++++++++++ .../message/auth/AuthResponse.java | 47 ++++++++++++++ .../chat/ChatRedirectToUserRequest.java | 47 ++++++++++++++ .../message/chat/ChatSendResponse.java | 60 ++++++++++++++++++ .../message/chat/ChatSendToAllRequest.java | 47 ++++++++++++++ .../message/chat/ChatSendToOneRequest.java | 61 +++++++++++++++++++ .../message}/heartbeat/HeartbeatRequest.java | 7 ++- .../message}/heartbeat/HeartbeatResponse.java | 7 ++- .../auth/AuthResponseHandler.java | 25 ++++++++ .../ChatRedirectToUserRequestHandler.java | 25 ++++++++ .../chat/ChatSendResponseHandler.java | 25 ++++++++ .../HeartbeatResponseHandler.java | 4 +- .../nettycommondemo/codec/Invocation.java | 12 ++++ .../codec/InvocationDecoder.java | 5 ++ .../codec/InvocationEncoder.java | 5 ++ .../message/auth/AuthRequest.java | 33 ++++++++++ .../message/auth/AuthResponse.java | 47 ++++++++++++++ .../chat/ChatRedirectToUserRequest.java | 47 ++++++++++++++ .../message/chat/ChatSendResponse.java | 60 ++++++++++++++++++ .../message/chat/ChatSendToAllRequest.java | 47 ++++++++++++++ .../message/chat/ChatSendToOneRequest.java | 61 +++++++++++++++++++ .../message/heartbeat/HeartbeatRequest.java | 20 ++++++ .../message/heartbeat/HeartbeatResponse.java | 20 ++++++ .../auth/AuthRequestHandler.java | 42 +++++++++++++ .../chat/ChatSendToAllHandler.java | 36 +++++++++++ .../chat/ChatSendToOneHandler.java | 36 +++++++++++ .../HeartbeatRequestHandler.java | 6 +- .../server/NettyChannelManager.java | 48 +++++++++++++++ .../nettyserverdemo/server/NettyServer.java | 7 ++- .../NettyServerHandlerInitializer.java | 2 +- 34 files changed, 966 insertions(+), 14 deletions(-) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/controller/TestController.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java rename lab-67/lab-67-netty-demo/{lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo => lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message}/heartbeat/HeartbeatRequest.java (62%) rename lab-67/lab-67-netty-demo/{lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo => lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message}/heartbeat/HeartbeatResponse.java (62%) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java rename lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/{ => heartbeat}/HeartbeatResponseHandler.java (87%) create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java rename lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/{ => heartbeat}/HeartbeatRequestHandler.java (83%) diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java index 5209ab7cb..6984b068e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.client; import cn.iocoder.springboot.lab67.nettyclientdemo.client.handler.NettyClientHandlerInitializer; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; import io.netty.channel.nio.NioEventLoopGroup; @@ -86,6 +87,7 @@ public void run() { } } }, RECONNECT_SECONDS, TimeUnit.SECONDS); + logger.info("[reconnect][{} 秒后将发起重连]", RECONNECT_SECONDS); } /** @@ -101,4 +103,22 @@ public void shutdown() { eventGroup.shutdownGracefully(); } + /** + * 发送消息 + * + * @param invocation 消息体 + */ + public void send(Invocation invocation) { + if (channel == null) { + logger.error("[send][连接不存在]"); + return; + } + if (!channel.isActive()) { + logger.error("[send][连接({})未激活]", channel.id()); + return; + } + // 发送消息 + channel.writeAndFlush(invocation); + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java index 823e5fad1..c9e5c891c 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java @@ -2,8 +2,9 @@ import cn.iocoder.springboot.lab67.nettyclientdemo.client.NettyClient; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; -import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatRequest; +import cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat.HeartbeatRequest; import io.netty.channel.ChannelFutureListener; +import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.timeout.IdleStateEvent; @@ -13,6 +14,7 @@ import org.springframework.stereotype.Component; @Component +@ChannelHandler.Sharable public class NettyClientHandler extends ChannelInboundHandlerAdapter { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java index ece6f0627..820991b32 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java @@ -15,7 +15,7 @@ public class NettyClientHandlerInitializer extends ChannelInitializer { /** * 心跳超时时间 */ - private static final Integer WRITE_TIMEOUT_SECONDS = 3; + private static final Integer READ_TIMEOUT_SECONDS = 60; @Autowired private MessageDispatcher messageDispatcher; @@ -24,15 +24,15 @@ public class NettyClientHandlerInitializer extends ChannelInitializer { private NettyClientHandler nettyClientHandler; @Override - protected void initChannel(Channel ch) throws Exception { + protected void initChannel(Channel ch) { ch.pipeline() // 空闲检测 - .addLast(new IdleStateHandler(WRITE_TIMEOUT_SECONDS, 0, 0)) + .addLast(new IdleStateHandler(READ_TIMEOUT_SECONDS, 0, 0)) // 编码器 .addLast(new InvocationEncoder()) // 解码器 .addLast(new InvocationDecoder()) - // 客户端处理器 + // 消息分发器 .addLast(messageDispatcher) // 客户端处理器 .addLast(nettyClientHandler) diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/controller/TestController.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/controller/TestController.java new file mode 100644 index 000000000..aba5cb7b4 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/controller/TestController.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.controller; + +import cn.iocoder.springboot.lab67.nettyclientdemo.client.NettyClient; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/test") +public class TestController { + + @Autowired + private NettyClient nettyClient; + + @PostMapping("/mock") + public String mock(String type, String message) { + // 创建 Invocation 对象 + Invocation invocation = new Invocation(type, message); + // 发送消息 + nettyClient.send(invocation); + return "success"; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java new file mode 100644 index 000000000..aeebf46d2 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java @@ -0,0 +1,33 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.auth; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 用户认证请求 + */ +public class AuthRequest implements Message { + + public static final String TYPE = "AUTH_REQUEST"; + + /** + * 认证 Token + */ + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public AuthRequest setAccessToken(String accessToken) { + this.accessToken = accessToken; + return this; + } + + @Override + public String toString() { + return "AuthRequest{" + + "accessToken='" + accessToken + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java new file mode 100644 index 000000000..7a451fd6f --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.auth; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 用户认证响应 + */ +public class AuthResponse implements Message { + + public static final String TYPE = "AUTH_RESPONSE"; + + /** + * 响应状态码 + */ + private Integer code; + /** + * 响应提示 + */ + private String message; + + public Integer getCode() { + return code; + } + + public AuthResponse setCode(Integer code) { + this.code = code; + return this; + } + + public String getMessage() { + return message; + } + + public AuthResponse setMessage(String message) { + this.message = message; + return this; + } + + @Override + public String toString() { + return "AuthResponse{" + + "code=" + code + + ", message='" + message + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java new file mode 100644 index 000000000..86d83c55c --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 转发消息给一个用户的 Message + */ +public class ChatRedirectToUserRequest implements Message { + + public static final String TYPE = "CHAT_REDIRECT_TO_USER_REQUEST"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getMsgId() { + return msgId; + } + + public ChatRedirectToUserRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public String getContent() { + return content; + } + + public ChatRedirectToUserRequest setContent(String content) { + this.content = content; + return this; + } + + @Override + public String toString() { + return "ChatRedirectToUserRequest{" + + "msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java new file mode 100644 index 000000000..36401503b --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java @@ -0,0 +1,60 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 聊天发送消息结果的 Response + */ +public class ChatSendResponse implements Message { + + public static final String TYPE = "CHAT_SEND_RESPONSE"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 响应状态码 + */ + private Integer code; + /** + * 响应提示 + */ + private String message; + + public String getMsgId() { + return msgId; + } + + public ChatSendResponse setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public Integer getCode() { + return code; + } + + public ChatSendResponse setCode(Integer code) { + this.code = code; + return this; + } + + public String getMessage() { + return message; + } + + public ChatSendResponse setMessage(String message) { + this.message = message; + return this; + } + + @Override + public String toString() { + return "ChatSendResponse{" + + "msgId='" + msgId + '\'' + + ", code=" + code + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java new file mode 100644 index 000000000..11d4f81db --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 发送给所有人的群聊消息的 Message + */ +public class ChatSendToAllRequest implements Message { + + public static final String TYPE = "CHAT_SEND_TO_ALL_REQUEST"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getContent() { + return content; + } + + public ChatSendToAllRequest setContent(String content) { + this.content = content; + return this; + } + + public String getMsgId() { + return msgId; + } + + public ChatSendToAllRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + @Override + public String toString() { + return "ChatSendToAllRequest{" + + "msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java new file mode 100644 index 000000000..2833860c1 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java @@ -0,0 +1,61 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 发送给指定人的私聊消息 Request + */ +public class ChatSendToOneRequest implements Message { + + public static final String TYPE = "CHAT_SEND_TO_ONE_REQUEST"; + + /** + * 发送给的用户 + */ + private String toUser; + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getToUser() { + return toUser; + } + + public ChatSendToOneRequest setToUser(String toUser) { + this.toUser = toUser; + return this; + } + + public String getMsgId() { + return msgId; + } + + public ChatSendToOneRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public String getContent() { + return content; + } + + public ChatSendToOneRequest setContent(String content) { + this.content = content; + return this; + } + + @Override + public String toString() { + return "ChatSendToOneRequest{" + + "toUser='" + toUser + '\'' + + ", msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java similarity index 62% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java index 61b4c4fb5..ca1e1f032 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.heartbeat; +package cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat; import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; @@ -12,4 +12,9 @@ public class HeartbeatRequest implements Message { */ public static final String TYPE = "HEARTBEAT_REQUEST"; + @Override + public String toString() { + return "HeartbeatRequest{}"; + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java similarity index 62% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java index 43ce9a699..f8a0442fe 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/heartbeat/HeartbeatResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.heartbeat; +package cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat; import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; @@ -12,4 +12,9 @@ public class HeartbeatResponse implements Message { */ public static final String TYPE = "HEARTBEAT_RESPONSE"; + @Override + public String toString() { + return "HeartbeatResponse{}"; + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java new file mode 100644 index 000000000..9b570ff27 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.auth; + +import cn.iocoder.springboot.lab67.nettyclientdemo.message.auth.AuthResponse; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class AuthResponseHandler implements MessageHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(Channel channel, AuthResponse message) { + logger.info("[execute][认证结果：{}]", message); + } + + @Override + public String getType() { + return AuthResponse.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java new file mode 100644 index 000000000..8cd745c10 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.chat; + +import cn.iocoder.springboot.lab67.nettyclientdemo.message.chat.ChatRedirectToUserRequest; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class ChatRedirectToUserRequestHandler implements MessageHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(Channel channel, ChatRedirectToUserRequest message) { + logger.info("[execute][收到消息：{}]", message); + } + + @Override + public String getType() { + return ChatRedirectToUserRequest.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java new file mode 100644 index 000000000..c37e91b69 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.chat; + +import cn.iocoder.springboot.lab67.nettyclientdemo.message.chat.ChatSendResponse; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import io.netty.channel.Channel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +@Component +public class ChatSendResponseHandler implements MessageHandler { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Override + public void execute(Channel channel, ChatSendResponse message) { + logger.info("[execute][发送结果：{}]", message); + } + + @Override + public String getType() { + return ChatSendResponse.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java similarity index 87% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java index 73de2ce9f..4a9b61de1 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/HeartbeatResponseHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java @@ -1,7 +1,7 @@ -package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler; +package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.heartbeat; import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; -import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatResponse; +import cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat.HeartbeatResponse; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java index a3cd78a76..db011af25 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java @@ -17,6 +17,11 @@ public class Invocation { public Invocation() { } + public Invocation(String type, String message) { + this.type = type; + this.message = message; + } + public Invocation(String type, Message message) { this.type = type; this.message = JSON.toJSONString(message); @@ -40,4 +45,11 @@ public Invocation setMessage(String message) { return this; } + @Override + public String toString() { + return "Invocation{" + + "type='" + type + '\'' + + ", message='" + message + '\'' + + '}'; + } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java index 076cd812e..e5a8d039a 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java @@ -5,11 +5,15 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.CorruptedFrameException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; public class InvocationDecoder extends ByteToMessageDecoder { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { // 标记当前读取位置 @@ -34,6 +38,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf in, List out) { // 解析成 Invocation Invocation invocation = JSON.parseObject(content, Invocation.class); out.add(invocation); + logger.info("[decode][连接({}) 解析到一条消息({})]", ctx.channel().id(), invocation.toString()); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java index b69216f5d..3a6d9d66e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java @@ -4,9 +4,13 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class InvocationEncoder extends MessageToByteEncoder { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Override protected void encode(ChannelHandlerContext ctx, Invocation invocation, ByteBuf out) { // 将 Invocation 转换成 byte[] 数组 @@ -15,6 +19,7 @@ protected void encode(ChannelHandlerContext ctx, Invocation invocation, ByteBuf out.writeInt(content.length); // 写入内容 out.writeBytes(content); + logger.info("[decode][连接({}) 编码了一条消息({})]", ctx.channel().id(), invocation.toString()); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java new file mode 100644 index 000000000..401d32441 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java @@ -0,0 +1,33 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.auth; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 用户认证请求 + */ +public class AuthRequest implements Message { + + public static final String TYPE = "AUTH_REQUEST"; + + /** + * 认证 Token + */ + private String accessToken; + + public String getAccessToken() { + return accessToken; + } + + public AuthRequest setAccessToken(String accessToken) { + this.accessToken = accessToken; + return this; + } + + @Override + public String toString() { + return "AuthRequest{" + + "accessToken='" + accessToken + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java new file mode 100644 index 000000000..68886c687 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.auth; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 用户认证响应 + */ +public class AuthResponse implements Message { + + public static final String TYPE = "AUTH_RESPONSE"; + + /** + * 响应状态码 + */ + private Integer code; + /** + * 响应提示 + */ + private String message; + + public Integer getCode() { + return code; + } + + public AuthResponse setCode(Integer code) { + this.code = code; + return this; + } + + public String getMessage() { + return message; + } + + public AuthResponse setMessage(String message) { + this.message = message; + return this; + } + + @Override + public String toString() { + return "AuthResponse{" + + "code=" + code + + ", message='" + message + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java new file mode 100644 index 000000000..11b96850c --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 转发消息给一个用户的 Message + */ +public class ChatRedirectToUserRequest implements Message { + + public static final String TYPE = "CHAT_REDIRECT_TO_USER_REQUEST"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getMsgId() { + return msgId; + } + + public ChatRedirectToUserRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public String getContent() { + return content; + } + + public ChatRedirectToUserRequest setContent(String content) { + this.content = content; + return this; + } + + @Override + public String toString() { + return "ChatRedirectToUserRequest{" + + "msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java new file mode 100644 index 000000000..3957072d4 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java @@ -0,0 +1,60 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 聊天发送消息结果的 Response + */ +public class ChatSendResponse implements Message { + + public static final String TYPE = "CHAT_SEND_RESPONSE"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 响应状态码 + */ + private Integer code; + /** + * 响应提示 + */ + private String message; + + public String getMsgId() { + return msgId; + } + + public ChatSendResponse setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public Integer getCode() { + return code; + } + + public ChatSendResponse setCode(Integer code) { + this.code = code; + return this; + } + + public String getMessage() { + return message; + } + + public ChatSendResponse setMessage(String message) { + this.message = message; + return this; + } + + @Override + public String toString() { + return "ChatSendResponse{" + + "msgId='" + msgId + '\'' + + ", code=" + code + + ", message='" + message + '\'' + + '}'; + } +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java new file mode 100644 index 000000000..e40d7ada5 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 发送给所有人的群聊消息的 Message + */ +public class ChatSendToAllRequest implements Message { + + public static final String TYPE = "CHAT_SEND_TO_ALL_REQUEST"; + + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getContent() { + return content; + } + + public ChatSendToAllRequest setContent(String content) { + this.content = content; + return this; + } + + public String getMsgId() { + return msgId; + } + + public ChatSendToAllRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + @Override + public String toString() { + return "ChatSendToAllRequest{" + + "msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java new file mode 100644 index 000000000..a8b8fea7e --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java @@ -0,0 +1,61 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 发送给指定人的私聊消息 Request + */ +public class ChatSendToOneRequest implements Message { + + public static final String TYPE = "CHAT_SEND_TO_ONE_REQUEST"; + + /** + * 发送给的用户 + */ + private String toUser; + /** + * 消息编号 + */ + private String msgId; + /** + * 内容 + */ + private String content; + + public String getToUser() { + return toUser; + } + + public ChatSendToOneRequest setToUser(String toUser) { + this.toUser = toUser; + return this; + } + + public String getMsgId() { + return msgId; + } + + public ChatSendToOneRequest setMsgId(String msgId) { + this.msgId = msgId; + return this; + } + + public String getContent() { + return content; + } + + public ChatSendToOneRequest setContent(String content) { + this.content = content; + return this; + } + + @Override + public String toString() { + return "ChatSendToOneRequest{" + + "toUser='" + toUser + '\'' + + ", msgId='" + msgId + '\'' + + ", content='" + content + '\'' + + '}'; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java new file mode 100644 index 000000000..8ad5fa61f --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java @@ -0,0 +1,20 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 消息 - 心跳请求 + */ +public class HeartbeatRequest implements Message { + + /** + * 类型 - 心跳请求 + */ + public static final String TYPE = "HEARTBEAT_REQUEST"; + + @Override + public String toString() { + return "HeartbeatRequest{}"; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java new file mode 100644 index 000000000..ea9135390 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java @@ -0,0 +1,20 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat; + +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; + +/** + * 消息 - 心跳响应 + */ +public class HeartbeatResponse implements Message { + + /** + * 类型 - 心跳响应 + */ + public static final String TYPE = "HEARTBEAT_RESPONSE"; + + @Override + public String toString() { + return "HeartbeatResponse{}"; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java new file mode 100644 index 000000000..bc28f585c --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java @@ -0,0 +1,42 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.auth; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.auth.AuthRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.auth.AuthResponse; +import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; +import io.netty.channel.Channel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +@Component +public class AuthRequestHandler implements MessageHandler { + + @Autowired + private NettyChannelManager nettyChannelManager; + + @Override + public void execute(Channel channel, AuthRequest authRequest) { + // 如果未传递 accessToken + if (StringUtils.isEmpty(authRequest.getAccessToken())) { + AuthResponse authResponse = new AuthResponse().setCode(1).setMessage("认证 accessToken 未传入"); + channel.writeAndFlush(new Invocation(AuthResponse.TYPE, authResponse)); + return; + } + + // 添加到 WebSocketUtil 中 + // 考虑到代码简化，我们先直接使用 accessToken 作为 User + nettyChannelManager.addUser(channel, authRequest.getAccessToken()); + + // 判断是否认证成功。这里，假装直接成功 + AuthResponse authResponse = new AuthResponse().setCode(0); + channel.writeAndFlush(new Invocation(AuthResponse.TYPE, authResponse)); + } + + @Override + public String getType() { + return AuthRequest.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java new file mode 100644 index 000000000..8f6f54c08 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java @@ -0,0 +1,36 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendResponse; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendToAllRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatRedirectToUserRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; +import io.netty.channel.Channel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ChatSendToAllHandler implements MessageHandler { + + @Autowired + private NettyChannelManager nettyChannelManager; + + @Override + public void execute(Channel channel, ChatSendToAllRequest message) { + // 这里，假装直接成功 + ChatSendResponse sendResponse = new ChatSendResponse().setMsgId(message.getMsgId()).setCode(0); + channel.writeAndFlush(new Invocation(ChatSendResponse.TYPE, sendResponse)); + + // 创建转发的消息，并广播发送 + ChatRedirectToUserRequest sendToUserRequest = new ChatRedirectToUserRequest().setMsgId(message.getMsgId()) + .setContent(message.getContent()); + nettyChannelManager.sendAll(new Invocation(ChatRedirectToUserRequest.TYPE, sendToUserRequest)); + } + + @Override + public String getType() { + return ChatSendToAllRequest.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java new file mode 100644 index 000000000..a1f3fa9c5 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java @@ -0,0 +1,36 @@ +package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.chat; + +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; +import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendResponse; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendToOneRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatRedirectToUserRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; +import io.netty.channel.Channel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class ChatSendToOneHandler implements MessageHandler { + + @Autowired + private NettyChannelManager nettyChannelManager; + + @Override + public void execute(Channel channel, ChatSendToOneRequest message) { + // 这里，假装直接成功 + ChatSendResponse sendResponse = new ChatSendResponse().setMsgId(message.getMsgId()).setCode(0); + channel.writeAndFlush(new Invocation(ChatSendResponse.TYPE, sendResponse)); + + // 创建转发的消息，发送给指定用户 + ChatRedirectToUserRequest sendToUserRequest = new ChatRedirectToUserRequest().setMsgId(message.getMsgId()) + .setContent(message.getContent()); + nettyChannelManager.send(message.getToUser(), new Invocation(ChatRedirectToUserRequest.TYPE, sendToUserRequest)); + } + + @Override + public String getType() { + return ChatSendToOneRequest.TYPE; + } + +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java similarity index 83% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java index 768c16c74..d7f474cbe 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/HeartbeatRequestHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java @@ -1,9 +1,9 @@ -package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler; +package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.heartbeat; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; -import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatRequest; -import cn.iocoder.springboot.lab67.nettycommondemo.heartbeat.HeartbeatResponse; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat.HeartbeatRequest; +import cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat.HeartbeatResponse; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java index 52b27ff03..a75b7aa58 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java @@ -1,7 +1,9 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.server; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import io.netty.channel.Channel; import io.netty.channel.ChannelId; +import io.netty.util.AttributeKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -12,18 +14,64 @@ @Component public class NettyChannelManager { + private static final AttributeKey CHANNEL_ATTR_KEY_USER = AttributeKey.newInstance("user"); + private Logger logger = LoggerFactory.getLogger(getClass()); private ConcurrentMap channels = new ConcurrentHashMap<>(); + private ConcurrentMap userChannels = new ConcurrentHashMap<>(); public void add(Channel channel) { channels.put(channel.id(), channel); logger.info("[add][一个连接({})加入]", channel.id()); } + public void addUser(Channel channel, String user) { + Channel existChannel = channels.get(channel.id()); + if (existChannel == null) { + logger.error("[addUser][连接({}) 不存在]", channel.id()); + return; + } + // 设置属性 + channel.attr(CHANNEL_ATTR_KEY_USER).set(user); + // 添加到 userChannels + userChannels.put(user, channel); + } + public void remove(Channel channel) { + // 移除 channels channels.remove(channel.id()); + // 移除 userChannels + if (channel.hasAttr(CHANNEL_ATTR_KEY_USER)) { + userChannels.remove(channel.attr(CHANNEL_ATTR_KEY_USER).get()); + } logger.info("[remove][一个连接({})离开]", channel.id()); } + public void send(String user, Invocation invocation) { + // 获得用户对应的 Channel + Channel channel = userChannels.get(user); + if (channel == null) { + logger.error("[send][连接不存在]"); + return; + } + if (!channel.isActive()) { + logger.error("[send][连接({})未激活]", channel.id()); + return; + } + // 发送消息 + channel.writeAndFlush(invocation); + } + + public void sendAll(Invocation invocation) { + for (Channel channel : channels.values()) { + if (!channel.isActive()) { + logger.error("[send][连接({})未激活]", channel.id()); + return; + } + // 发送消息 + channel.writeAndFlush(invocation); + } + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java index d7a3ca9fd..e77ae0f98 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java @@ -2,7 +2,10 @@ import cn.iocoder.springboot.lab67.nettyserverdemo.server.handler.NettyServerHandlerInitializer; import io.netty.bootstrap.ServerBootstrap; -import io.netty.channel.*; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelOption; +import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.nio.NioServerSocketChannel; import org.slf4j.Logger; @@ -25,6 +28,8 @@ public class NettyServer { @Autowired private NettyServerHandlerInitializer nettyServerHandlerInitializer; + @Autowired + private NettyChannelManager nettyChannelManager; /** * boss 线程组，用于服务端接受客户端的连接 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java index beea028ce..0016b333a 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java @@ -17,7 +17,7 @@ public class NettyServerHandlerInitializer extends ChannelInitializer { /** * 心跳超时时间 */ - private static final Integer READ_TIMEOUT_SECONDS = 1000; + private static final Integer READ_TIMEOUT_SECONDS = 3 * 60; @Autowired private MessageDispatcher messageDispatcher; From 05ec04980e15346e9544ed5cbd15bb49cffe645a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 21 Jun 2020 20:37:09 +0800 Subject: [PATCH 052/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=A2=9E=E5=8A=A0=E4=B8=9A=E5=8A=A1=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab67/nettycommondemo/dispacher/Message.java | 4 ---- .../lab67/nettycommondemo/dispatcher/Message.java | 7 +++++++ .../{dispacher => dispatcher}/MessageDispatcher.java | 2 +- .../{dispacher => dispatcher}/MessageHandler.java | 2 +- .../{dispacher => dispatcher}/MessageHandlerContainer.java | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java create mode 100644 lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/Message.java rename lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/{dispacher => dispatcher}/MessageDispatcher.java (94%) rename lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/{dispacher => dispatcher}/MessageHandler.java (85%) rename lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/{dispacher => dispatcher}/MessageHandlerContainer.java (98%) diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java deleted file mode 100644 index 7ee0f6b46..000000000 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/Message.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; - -public interface Message { -} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/Message.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/Message.java new file mode 100644 index 000000000..ba45bc409 --- /dev/null +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/Message.java @@ -0,0 +1,7 @@ +package cn.iocoder.springboot.lab67.nettycommondemo.dispatcher; + +/** + * 消息接口 + */ +public interface Message { +} diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java similarity index 94% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java index 28776af08..25af338a3 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageDispatcher.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; +package cn.iocoder.springboot.lab67.nettycommondemo.dispatcher; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import com.alibaba.fastjson.JSON; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandler.java similarity index 85% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandler.java index c70bb69d3..b2b2f0ae4 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandler.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; +package cn.iocoder.springboot.lab67.nettycommondemo.dispatcher; import io.netty.channel.Channel; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java similarity index 98% rename from lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java rename to lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java index 424676016..eccb378cf 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispacher/MessageHandlerContainer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab67.nettycommondemo.dispacher; +package cn.iocoder.springboot.lab67.nettycommondemo.dispatcher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From 55d1b125a107eef0e680590513adf3a39ab10ce9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 22 Jun 2020 09:08:48 +0800 Subject: [PATCH 053/115] =?UTF-8?q?Netty=20=E5=85=A5=E9=97=A8=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=20-=20=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../nettyclientdemo/client/NettyClient.java | 3 +- .../client/handler/NettyClientHandler.java | 28 ++++++------ .../NettyClientHandlerInitializer.java | 4 +- .../config/NettyClientConfig.java | 4 +- .../message/auth/AuthRequest.java | 2 +- .../message/auth/AuthResponse.java | 2 +- .../chat/ChatRedirectToUserRequest.java | 2 +- .../message/chat/ChatSendResponse.java | 2 +- .../message/chat/ChatSendToAllRequest.java | 2 +- .../message/chat/ChatSendToOneRequest.java | 2 +- .../message/heartbeat/HeartbeatRequest.java | 2 +- .../message/heartbeat/HeartbeatResponse.java | 2 +- .../auth/AuthResponseHandler.java | 2 +- .../ChatRedirectToUserRequestHandler.java | 2 +- .../chat/ChatSendResponseHandler.java | 2 +- .../heartbeat/HeartbeatResponseHandler.java | 2 +- .../nettycommondemo/codec/Invocation.java | 9 +++- .../codec/InvocationDecoder.java | 3 ++ .../codec/InvocationEncoder.java | 3 ++ .../dispatcher/MessageDispatcher.java | 3 +- .../dispatcher/MessageHandlerContainer.java | 16 ++++++- .../config/NettyServerConfig.java | 4 +- .../message/auth/AuthRequest.java | 2 +- .../message/auth/AuthResponse.java | 2 +- .../chat/ChatRedirectToUserRequest.java | 2 +- .../message/chat/ChatSendResponse.java | 2 +- .../message/chat/ChatSendToAllRequest.java | 2 +- .../message/chat/ChatSendToOneRequest.java | 2 +- .../message/heartbeat/HeartbeatRequest.java | 2 +- .../message/heartbeat/HeartbeatResponse.java | 2 +- .../auth/AuthRequestHandler.java | 2 +- .../chat/ChatSendToAllHandler.java | 2 +- .../chat/ChatSendToOneHandler.java | 2 +- .../heartbeat/HeartbeatRequestHandler.java | 2 +- .../server/NettyChannelManager.java | 43 +++++++++++++++++++ .../nettyserverdemo/server/NettyServer.java | 3 +- .../server/handler/NettyServerHandler.java | 5 ++- .../NettyServerHandlerInitializer.java | 10 +++-- ...y \345\205\245\351\227\250\343\200\213.md" | 1 + 40 files changed, 132 insertions(+), 56 deletions(-) create mode 100644 "lab-67/\343\200\212\350\212\213\351\201\223 Spring Boot Netty \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index d9a875e13..68636d6e6 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ ## RPC 开发 +* [《芋道 Spring Boot Netty 入门》](http://www.iocoder.cn/Spring-Boot/Netty/?github) 对应 [lab-67](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-67) * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) * [《芋道 Spring Boot 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Boot/Feign/?github) 对应 [lab-58](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-58) * [《芋道 Spring Boot gRPC 入门》](http://www.iocoder.cn/Spring-Boot/gRPC/?github) 对应 [lab-64](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-64) diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java index 6984b068e..476e9bc7c 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/NettyClient.java @@ -44,12 +44,13 @@ public class NettyClient { private volatile Channel channel; /** - * 启动 Netty Server + * 启动 Netty Client */ @PostConstruct public void start() throws InterruptedException { // 创建 Bootstrap 对象，用于 Netty Client 启动 Bootstrap bootstrap = new Bootstrap(); + // 设置 Bootstrap 的各种属性。 bootstrap.group(eventGroup) // 设置一个 EventLoopGroup 对象 .channel(NioSocketChannel.class) // 指定 Channel 为客户端 NioSocketChannel .remoteAddress(serverHost, serverPort) // 指定链接服务器的地址 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java index c9e5c891c..a4ee7c923 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandler.java @@ -1,8 +1,8 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.client.handler; import cn.iocoder.springboot.lab67.nettyclientdemo.client.NettyClient; -import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat.HeartbeatRequest; +import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; @@ -22,19 +22,6 @@ public class NettyClientHandler extends ChannelInboundHandlerAdapter { @Autowired private NettyClient nettyClient; - @Override - public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws Exception { - // 空闲时，向服务端发起一次心跳 - if (event instanceof IdleStateEvent) { - HeartbeatRequest heartbeatRequest = new HeartbeatRequest(); - ctx.writeAndFlush(new Invocation(HeartbeatRequest.TYPE, heartbeatRequest)) - .addListener(ChannelFutureListener.CLOSE_ON_FAILURE); - logger.info("[userEventTriggered][发起一次心跳]"); - } else { - super.userEventTriggered(ctx, event); - } - } - @Override public void channelInactive(ChannelHandlerContext ctx) throws Exception { // 发起重连 @@ -50,4 +37,17 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { ctx.channel().close(); } + @Override + public void userEventTriggered(ChannelHandlerContext ctx, Object event) throws Exception { + // 空闲时，向服务端发起一次心跳 + if (event instanceof IdleStateEvent) { + logger.info("[userEventTriggered][发起一次心跳]"); + HeartbeatRequest heartbeatRequest = new HeartbeatRequest(); + ctx.writeAndFlush(new Invocation(HeartbeatRequest.TYPE, heartbeatRequest)) + .addListener(ChannelFutureListener.CLOSE_ON_FAILURE); + } else { + super.userEventTriggered(ctx, event); + } + } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java index 820991b32..5c995c255 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/client/handler/NettyClientHandlerInitializer.java @@ -2,10 +2,11 @@ import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageDispatcher; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; import io.netty.handler.timeout.IdleStateHandler; +import io.netty.handler.timeout.ReadTimeoutHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -28,6 +29,7 @@ protected void initChannel(Channel ch) { ch.pipeline() // 空闲检测 .addLast(new IdleStateHandler(READ_TIMEOUT_SECONDS, 0, 0)) + .addLast(new ReadTimeoutHandler(3 * READ_TIMEOUT_SECONDS)) // 编码器 .addLast(new InvocationEncoder()) // 解码器 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java index 54a83d0e7..2a06df404 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/config/NettyClientConfig.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.config; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandlerContainer; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandlerContainer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java index aeebf46d2..74b6464a9 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.auth; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 用户认证请求 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java index 7a451fd6f..77c4b3d4f 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/auth/AuthResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.auth; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 用户认证响应 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java index 86d83c55c..6cafeb026 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatRedirectToUserRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 转发消息给一个用户的 Message diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java index 36401503b..5674f776b 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 聊天发送消息结果的 Response diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java index 11d4f81db..525457c99 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToAllRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 发送给所有人的群聊消息的 Message diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java index 2833860c1..2ae55aaa2 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/chat/ChatSendToOneRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 发送给指定人的私聊消息 Request diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java index ca1e1f032..70eeb8d93 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 消息 - 心跳请求 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java index f8a0442fe..531c04a22 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/message/heartbeat/HeartbeatResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 消息 - 心跳响应 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java index 9b570ff27..9ad857fa1 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/auth/AuthResponseHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.auth; import cn.iocoder.springboot.lab67.nettyclientdemo.message.auth.AuthResponse; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java index 8cd745c10..ea9c42d7e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatRedirectToUserRequestHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.chat; import cn.iocoder.springboot.lab67.nettyclientdemo.message.chat.ChatRedirectToUserRequest; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java index c37e91b69..b86072bf3 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/chat/ChatSendResponseHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.chat; import cn.iocoder.springboot.lab67.nettyclientdemo.message.chat.ChatSendResponse; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import io.netty.channel.Channel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java index 4a9b61de1..50e57eb2e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-client/src/main/java/cn/iocoder/springboot/lab67/nettyclientdemo/messagehandler/heartbeat/HeartbeatResponseHandler.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyclientdemo.messagehandler.heartbeat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import cn.iocoder.springboot.lab67.nettyclientdemo.message.heartbeat.HeartbeatResponse; import io.netty.channel.Channel; import org.slf4j.Logger; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java index db011af25..828a0438c 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/Invocation.java @@ -1,8 +1,11 @@ package cn.iocoder.springboot.lab67.nettycommondemo.codec; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; import com.alibaba.fastjson.JSON; +/** + * 通信协议的消息体 + */ public class Invocation { /** @@ -10,10 +13,11 @@ public class Invocation { */ private String type; /** - * 消息 + * 消息，JSON 格式 */ private String message; + // 空构造方法 public Invocation() { } @@ -52,4 +56,5 @@ public String toString() { ", message='" + message + '\'' + '}'; } + } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java index e5a8d039a..b91bfa041 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationDecoder.java @@ -10,6 +10,9 @@ import java.util.List; +/** + * {@link Invocation} 解码器 + */ public class InvocationDecoder extends ByteToMessageDecoder { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java index 3a6d9d66e..3784dd5ff 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java @@ -7,6 +7,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * {@link Invocation} 编码器 + */ public class InvocationEncoder extends MessageToByteEncoder { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java index 25af338a3..b947a5d40 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java @@ -17,8 +17,9 @@ public class MessageDispatcher extends SimpleChannelInboundHandler { protected void channelRead0(ChannelHandlerContext ctx, Invocation invocation) { // 获得 type 对应的 MessageHandler 处理器 MessageHandler messageHandler = messageHandlerContainer.getMessageHandler(invocation.getType()); - // 解析消息 + // 获得 MessageHandler 处理器 的消息类 Class messageClass = MessageHandlerContainer.getMessageClass(messageHandler); + // 解析消息 Message message = JSON.parseObject(invocation.getMessage(), messageClass); // 执行逻辑 // noinspection unchecked diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java index eccb378cf..f1b70d2a9 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageHandlerContainer.java @@ -33,7 +33,13 @@ public void afterPropertiesSet() throws Exception { logger.info("[afterPropertiesSet][消息处理器数量：{}]", handlers.size()); } - protected MessageHandler getMessageHandler(String type) { + /** + * 获得类型对应的 MessageHandler + * + * @param type 类型 + * @return MessageHandler + */ + MessageHandler getMessageHandler(String type) { MessageHandler handler = handlers.get(type); if (handler == null) { throw new IllegalArgumentException(String.format("类型(%s) 找不到匹配的 MessageHandler 处理器", type)); @@ -41,7 +47,13 @@ protected MessageHandler getMessageHandler(String type) { return handler; } - public static Class getMessageClass(MessageHandler handler) { + /** + * 获得 MessageHandler 处理的消息类 + * + * @param handler 处理器 + * @return 消息类 + */ + static Class getMessageClass(MessageHandler handler) { // 获得 Bean 对应的 Class 类名。因为有可能被 AOP 代理过。 Class targetClass = AopProxyUtils.ultimateTargetClass(handler); // 获得接口的 Type 数组 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java index 7db3f2caa..cdffd588b 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/config/NettyServerConfig.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.config; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandlerContainer; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandlerContainer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java index 401d32441..684b362d9 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.auth; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 用户认证请求 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java index 68886c687..c2c8bc1bc 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/auth/AuthResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.auth; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 用户认证响应 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java index 11b96850c..53360b549 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatRedirectToUserRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 转发消息给一个用户的 Message diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java index 3957072d4..ebb07c50c 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 聊天发送消息结果的 Response diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java index e40d7ada5..b2c5e8d62 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToAllRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 发送给所有人的群聊消息的 Message diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java index a8b8fea7e..4f72aecb4 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/chat/ChatSendToOneRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.chat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 发送给指定人的私聊消息 Request diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java index 8ad5fa61f..78218853e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatRequest.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 消息 - 心跳请求 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java index ea9135390..87b390186 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/message/heartbeat/HeartbeatResponse.java @@ -1,6 +1,6 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.Message; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.Message; /** * 消息 - 心跳响应 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java index bc28f585c..cbf5b6b95 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.auth; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import cn.iocoder.springboot.lab67.nettyserverdemo.message.auth.AuthRequest; import cn.iocoder.springboot.lab67.nettyserverdemo.message.auth.AuthResponse; import cn.iocoder.springboot.lab67.nettyserverdemo.server.NettyChannelManager; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java index 8f6f54c08..eaf0ec77b 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToAllHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.chat; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendResponse; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendToAllRequest; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatRedirectToUserRequest; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java index a1f3fa9c5..b9d3ae8c6 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/chat/ChatSendToOneHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.chat; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendResponse; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatSendToOneRequest; import cn.iocoder.springboot.lab67.nettyserverdemo.message.chat.ChatRedirectToUserRequest; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java index d7f474cbe..56739913e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/heartbeat/HeartbeatRequestHandler.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab67.nettyserverdemo.messagehandler.heartbeat; import cn.iocoder.springboot.lab67.nettycommondemo.codec.Invocation; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageHandler; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageHandler; import cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat.HeartbeatRequest; import cn.iocoder.springboot.lab67.nettyserverdemo.message.heartbeat.HeartbeatResponse; import io.netty.channel.Channel; diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java index a75b7aa58..43f6a00bc 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyChannelManager.java @@ -11,21 +11,48 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +/** + * 客户端 Channel 管理器。提供两种功能： + * 1. 客户端 Channel 的管理 + * 2. 向客户端 Channel 发送消息 + */ @Component public class NettyChannelManager { + /** + * {@link Channel#attr(AttributeKey)} 属性中，表示 Channel 对应的用户 + */ private static final AttributeKey CHANNEL_ATTR_KEY_USER = AttributeKey.newInstance("user"); private Logger logger = LoggerFactory.getLogger(getClass()); + /** + * Channel 映射 + */ private ConcurrentMap channels = new ConcurrentHashMap<>(); + /** + * 用户与 Channel 的映射。 + * + * 通过它，可以获取用户对应的 Channel。这样，我们可以向指定用户发送消息。 + */ private ConcurrentMap userChannels = new ConcurrentHashMap<>(); + /** + * 添加 Channel 到 {@link #channels} 中 + * + * @param channel Channel + */ public void add(Channel channel) { channels.put(channel.id(), channel); logger.info("[add][一个连接({})加入]", channel.id()); } + /** + * 添加指定用户到 {@link #userChannels} 中 + * + * @param channel Channel + * @param user 用户 + */ public void addUser(Channel channel, String user) { Channel existChannel = channels.get(channel.id()); if (existChannel == null) { @@ -38,6 +65,11 @@ public void addUser(Channel channel, String user) { userChannels.put(user, channel); } + /** + * 将 Channel 从 {@link #channels} 和 {@link #userChannels} 中移除 + * + * @param channel Channel + */ public void remove(Channel channel) { // 移除 channels channels.remove(channel.id()); @@ -48,6 +80,12 @@ public void remove(Channel channel) { logger.info("[remove][一个连接({})离开]", channel.id()); } + /** + * 向指定用户发送消息 + * + * @param user 用户 + * @param invocation 消息体 + */ public void send(String user, Invocation invocation) { // 获得用户对应的 Channel Channel channel = userChannels.get(user); @@ -63,6 +101,11 @@ public void send(String user, Invocation invocation) { channel.writeAndFlush(invocation); } + /** + * 向所有用户发送消息 + * + * @param invocation 消息体 + */ public void sendAll(Invocation invocation) { for (Channel channel : channels.values()) { if (!channel.isActive()) { diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java index e77ae0f98..d6c3642cd 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/NettyServer.java @@ -28,8 +28,6 @@ public class NettyServer { @Autowired private NettyServerHandlerInitializer nettyServerHandlerInitializer; - @Autowired - private NettyChannelManager nettyChannelManager; /** * boss 线程组，用于服务端接受客户端的连接 @@ -51,6 +49,7 @@ public class NettyServer { public void start() throws InterruptedException { // 创建 ServerBootstrap 对象，用于 Netty Server 启动 ServerBootstrap bootstrap = new ServerBootstrap(); + // 设置 ServerBootstrap 的各种属性 bootstrap.group(bossGroup, workerGroup) // 设置两个 EventLoopGroup 对象 .channel(NioServerSocketChannel.class) // 指定 Channel 为服务端 NioServerSocketChannel .localAddress(new InetSocketAddress(port)) // 设置 Netty Server 的端口 diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java index fc6af4ee7..6525d2697 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandler.java @@ -9,6 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +/** + * 服务端 Channel 实现类，提供对客户端 Channel 建立连接、断开连接、异常时的处理 + */ @Component @ChannelHandler.Sharable public class NettyServerHandler extends ChannelInboundHandlerAdapter { @@ -33,8 +36,6 @@ public void channelUnregistered(ChannelHandlerContext ctx) { @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { logger.error("[exceptionCaught][连接({}) 发生异常]", ctx.channel().id(), cause); - // 从管理器中移除 - channelManager.remove(ctx.channel()); // 断开连接 ctx.channel().close(); } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java index 0016b333a..0998fd6b5 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/server/handler/NettyServerHandlerInitializer.java @@ -2,9 +2,10 @@ import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationDecoder; import cn.iocoder.springboot.lab67.nettycommondemo.codec.InvocationEncoder; -import cn.iocoder.springboot.lab67.nettycommondemo.dispacher.MessageDispatcher; +import cn.iocoder.springboot.lab67.nettycommondemo.dispatcher.MessageDispatcher; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelPipeline; import io.netty.handler.timeout.ReadTimeoutHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -25,8 +26,11 @@ public class NettyServerHandlerInitializer extends ChannelInitializer { private NettyServerHandler nettyServerHandler; @Override - protected void initChannel(Channel ch) throws Exception { - ch.pipeline() + protected void initChannel(Channel ch) { + // 获得 Channel 对应的 ChannelPipeline + ChannelPipeline channelPipeline = ch.pipeline(); + // 添加一堆 NettyServerHandler 到 ChannelPipeline 中 + channelPipeline // 空闲检测 .addLast(new ReadTimeoutHandler(READ_TIMEOUT_SECONDS, TimeUnit.SECONDS)) // 编码器 diff --git "a/lab-67/\343\200\212\350\212\213\351\201\223 Spring Boot Netty \345\205\245\351\227\250\343\200\213.md" "b/lab-67/\343\200\212\350\212\213\351\201\223 Spring Boot Netty \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..2d2fbf9f0 --- /dev/null +++ "b/lab-67/\343\200\212\350\212\213\351\201\223 Spring Boot Netty \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From 1c0447366bdc00889d701346d148cc1cc8fd4373 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 23 Jun 2020 19:20:48 +0800 Subject: [PATCH 054/115] =?UTF-8?q?Dubbo=20Admin=20=E5=85=A5=E9=97=A8?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- .../src/main/resources/application.yaml | 7 +++++-- ...0\237\345\205\245\351\227\250\343\200\213.md" | 1 + .../nettycommondemo/codec/InvocationEncoder.java | 2 +- .../dispatcher/MessageDispatcher.java | 16 ++++++++++++++-- .../messagehandler/auth/AuthRequestHandler.java | 6 ++++-- pom.xml | 2 +- 7 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 "lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 68636d6e6..75e8c6353 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,8 @@ * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) * [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) - +* [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) + # Spring Cloud 专栏 ## 注册中心 @@ -308,9 +309,8 @@ **[CAT](http://www.iocoder.cn/CAT/install/?github)** * [《芋道 Spring Boot 监控平台 CAT 入门》](http://www.iocoder.cn/Spring-Boot/CAT/?github) 的[「13. Dubbo 集成」](#)小节 -TODO Dubbo-Admin - -**** +**[Dubbo Admin](http://www.iocoder.cn/Dubbo/Admin/?github)** +* [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) # 消息队列 MQ 专栏 diff --git a/lab-30/lab-30-dubbo-annotations-demo/user-rpc-service-provider-02/src/main/resources/application.yaml b/lab-30/lab-30-dubbo-annotations-demo/user-rpc-service-provider-02/src/main/resources/application.yaml index 58798bdb5..608fb4f33 100644 --- a/lab-30/lab-30-dubbo-annotations-demo/user-rpc-service-provider-02/src/main/resources/application.yaml +++ b/lab-30/lab-30-dubbo-annotations-demo/user-rpc-service-provider-02/src/main/resources/application.yaml @@ -3,9 +3,12 @@ dubbo: # Dubbo 应用配置 application: name: user-service-provider # 应用名 - # Dubbo 注册中心配 + # Dubbo 注册中心配置 registry: - address: zookeeper://127.0.0.1:2181 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: zookeeper://127.0.0.1:2181 # 注册中心地址。配置多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + # Dubbo 元数据中心配置 + metadata-report: + address: zookeeper://127.0.0.1:2181 # 元数据中心地址。元数据中心的说明，可见 http://dubbo.apache.org/zh-cn/docs/user/references/metadata/introduction.html # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 diff --git "a/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..a0b594c79 --- /dev/null +++ "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java index 3784dd5ff..e378d201f 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/codec/InvocationEncoder.java @@ -22,7 +22,7 @@ protected void encode(ChannelHandlerContext ctx, Invocation invocation, ByteBuf out.writeInt(content.length); // 写入内容 out.writeBytes(content); - logger.info("[decode][连接({}) 编码了一条消息({})]", ctx.channel().id(), invocation.toString()); + logger.info("[encode][连接({}) 编码了一条消息({})]", ctx.channel().id(), invocation.toString()); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java index b947a5d40..bb4da3482 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-common/src/main/java/cn/iocoder/springboot/lab67/nettycommondemo/dispatcher/MessageDispatcher.java @@ -7,12 +7,17 @@ import io.netty.channel.SimpleChannelInboundHandler; import org.springframework.beans.factory.annotation.Autowired; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + @ChannelHandler.Sharable public class MessageDispatcher extends SimpleChannelInboundHandler { @Autowired private MessageHandlerContainer messageHandlerContainer; + private final ExecutorService executor = Executors.newFixedThreadPool(200); + @Override protected void channelRead0(ChannelHandlerContext ctx, Invocation invocation) { // 获得 type 对应的 MessageHandler 处理器 @@ -22,8 +27,15 @@ protected void channelRead0(ChannelHandlerContext ctx, Invocation invocation) { // 解析消息 Message message = JSON.parseObject(invocation.getMessage(), messageClass); // 执行逻辑 - // noinspection unchecked - messageHandler.execute(ctx.channel(), message); + executor.submit(new Runnable() { + + @Override + public void run() { + // noinspection unchecked + messageHandler.execute(ctx.channel(), message); + } + + }); } } diff --git a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java index cbf5b6b95..e0fae683e 100644 --- a/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java +++ b/lab-67/lab-67-netty-demo/lab-67-netty-demo-server/src/main/java/cn/iocoder/springboot/lab67/nettyserverdemo/messagehandler/auth/AuthRequestHandler.java @@ -25,11 +25,13 @@ public void execute(Channel channel, AuthRequest authRequest) { return; } - // 添加到 WebSocketUtil 中 + // ... 此处应有一段 + + // 将用户和 Channel 绑定 // 考虑到代码简化，我们先直接使用 accessToken 作为 User nettyChannelManager.addUser(channel, authRequest.getAccessToken()); - // 判断是否认证成功。这里，假装直接成功 + // 响应认证成功 AuthResponse authResponse = new AuthResponse().setCode(0); channel.writeAndFlush(new Invocation(AuthResponse.TYPE, authResponse)); } diff --git a/pom.xml b/pom.xml index 2ed43b88e..ced6a7b07 100644 --- a/pom.xml +++ b/pom.xml @@ -77,6 +77,7 @@ + @@ -110,7 +111,6 @@ - lab-67 From 29661245aceb8d53bb055a492b17aa33a085039e Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 24 Jun 2020 08:14:13 +0800 Subject: [PATCH 055/115] =?UTF-8?q?=E9=87=8D=E5=86=99=20OAuth2=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-68/lab-68-demo01-resource-server/pom.xml | 56 +++++++++++++++++++ .../ResourceServerApplication.java | 4 ++ .../config/OAuth2ResourceServer.java | 26 +++++++++ .../controller/ExampleController.java | 18 ++++++ lab-68/pom.xml | 19 +++++++ pom.xml | 5 +- 6 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 lab-68/lab-68-demo01-resource-server/pom.xml create mode 100644 lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java create mode 100644 lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java create mode 100644 lab-68/pom.xml diff --git a/lab-68/lab-68-demo01-resource-server/pom.xml b/lab-68/lab-68-demo01-resource-server/pom.xml new file mode 100644 index 000000000..caa0680d8 --- /dev/null +++ b/lab-68/lab-68-demo01-resource-server/pom.xml @@ -0,0 +1,56 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo01-resource-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + org.springframework.security.oauth + spring-security-oauth2 + 2.5.0.RELEASE + + + + + diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..cdf4a6f23 --- /dev/null +++ b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,4 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +public class ResourceServerApplication { +} diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java new file mode 100644 index 000000000..4b4d15ecd --- /dev/null +++ b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; + +/** + * 资源服务器 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter { + + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + // 对 "/api/**" 开启认证 + .anyRequest() + .authenticated() + .and() + .requestMatchers() + .antMatchers("/api/**"); + } + +} diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml new file mode 100644 index 000000000..3b86700d2 --- /dev/null +++ b/lab-68/pom.xml @@ -0,0 +1,19 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68 + pom + + lab-68-demo01-resource-server + + + + diff --git a/pom.xml b/pom.xml index ced6a7b07..45ef9d3cb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,9 @@ - - + lab-02 + lab-68 + From 4d8a5b254c33c6565eaddc3f5f90a4e6d4c4aaeb Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 24 Jun 2020 12:13:05 +0800 Subject: [PATCH 056/115] =?UTF-8?q?=E7=A0=94=E7=A9=B6=E4=B8=8B=20OAuth2=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 62 +++++++++++++++++++ .../ResourceServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 37 +++++++++++ .../config/OAuth2ResourceServerConfig.java | 16 +++++ .../config/SecurityConfig.java | 48 ++++++++++++++ .../controller/ExampleController.java | 0 .../ResourceServerApplication.java | 4 -- .../config/OAuth2ResourceServer.java | 26 -------- .../pom.xml | 16 +++-- .../ResourceServerApplication.java | 13 ++++ .../config/OAuth2ResourceServerConfig.java | 28 +++++++++ .../config/SecurityConfig.java | 18 ++++++ .../controller/ExampleController.java | 18 ++++++ .../src/main/resources/application.yml | 10 +++ lab-68/pom.xml | 3 +- 15 files changed, 276 insertions(+), 36 deletions(-) create mode 100644 lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml create mode 100644 lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename lab-68/{lab-68-demo01-resource-server => lab-68-demo01-resource-owner-password-credentials-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) delete mode 100644 lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java delete mode 100644 lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java rename lab-68/{lab-68-demo01-resource-server => lab-68-demo02-resource-server}/pom.xml (75%) create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml new file mode 100644 index 000000000..7342978f1 --- /dev/null +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml @@ -0,0 +1,62 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo01-resource-owner-password-credentials-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..cfe85fc6a --- /dev/null +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,37 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + // 用户认证 + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("password") // 密码模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..349400c1d --- /dev/null +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig { + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..6cfbe5919 --- /dev/null +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,48 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .antMatchers("/oauth2/keys").permitAll() + // 对所有 URL 都进行认证 + .anyRequest() + .authenticated(); + } + +} diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java deleted file mode 100644 index cdf4a6f23..000000000 --- a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java +++ /dev/null @@ -1,4 +0,0 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo; - -public class ResourceServerApplication { -} diff --git a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java b/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java deleted file mode 100644 index 4b4d15ecd..000000000 --- a/lab-68/lab-68-demo01-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServer.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; -import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; - -/** - * 资源服务器 - */ -@Configuration -@EnableResourceServer -public class OAuth2ResourceServer extends ResourceServerConfigurerAdapter { - - @Override - public void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() - // 对 "/api/**" 开启认证 - .anyRequest() - .authenticated() - .and() - .requestMatchers() - .antMatchers("/api/**"); - } - -} diff --git a/lab-68/lab-68-demo01-resource-server/pom.xml b/lab-68/lab-68-demo02-resource-server/pom.xml similarity index 75% rename from lab-68/lab-68-demo01-resource-server/pom.xml rename to lab-68/lab-68-demo02-resource-server/pom.xml index caa0680d8..97319742e 100644 --- a/lab-68/lab-68-demo01-resource-server/pom.xml +++ b/lab-68/lab-68-demo02-resource-server/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-68-demo01-resource-server + lab-68-demo02-resource-server @@ -44,13 +44,19 @@ spring-boot-starter-security + + + + + + + - org.springframework.security.oauth - spring-security-oauth2 - 2.5.0.RELEASE + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} - diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..19ec87097 --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,28 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { + +// @Override +// public void configure(ResourceServerSecurityConfigurer resources) throws Exception { +// resources. +// super.configure(resources); +// } +// +// @Override +// public void configure(HttpSecurity http) throws Exception { +// super.configure(http); +// } + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..655acb24a --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +//@Configuration +//@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + // 对所有 URL 都进行认证 + .anyRequest() + .authenticated(); + } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml new file mode 100644 index 000000000..c8226475f --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml @@ -0,0 +1,10 @@ +server: + port: 9090 + +security: + oauth2: + client: + client-id: clientapp + client-secret: 112233 + resource: + token-info-uri: diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 3b86700d2..c8a699e20 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -12,7 +12,8 @@ lab-68 pom - lab-68-demo01-resource-server + lab-68-demo01-resource-owner-password-credentials-server + lab-68-demo02-resource-server From 1b9487c4c20e056fcdc51a556257ed32ab85fb9f Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 24 Jun 2020 12:42:33 +0800 Subject: [PATCH 057/115] =?UTF-8?q?=E7=A0=94=E7=A9=B6=E4=B8=8B=20OAuth2=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SecurityConfig.java | 1 - lab-68/lab-68-demo02-auth-server/pom.xml | 62 +++++++++++++++++++ .../ResourceServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 44 +++++++++++++ .../config/OAuth2ResourceServerConfig.java | 18 ++++++ .../config/SecurityConfig.java | 47 ++++++++++++++ .../controller/ExampleController.java | 18 ++++++ .../src/main/resources/application.yml | 1 + .../src/main/resources/application.yml | 2 +- lab-68/pom.xml | 1 + 10 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 lab-68/lab-68-demo02-auth-server/pom.xml create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java create mode 100644 lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java index 6cfbe5919..ec0459823 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -39,7 +39,6 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { @Override protected void configure(HttpSecurity http) throws Exception { http.authorizeRequests() - .antMatchers("/oauth2/keys").permitAll() // 对所有 URL 都进行认证 .anyRequest() .authenticated(); diff --git a/lab-68/lab-68-demo02-auth-server/pom.xml b/lab-68/lab-68-demo02-auth-server/pom.xml new file mode 100644 index 000000000..3bf21705d --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/pom.xml @@ -0,0 +1,62 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo02-auth-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-security + + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..597a7a7c4 --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,44 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + // 用户认证 + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.tokenKeyAccess("permitAll()") + .checkTokenAccess("isAuthenticated()"); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("password") // 密码模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..821ec8e17 --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig { + + + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..fe4d42a95 --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + + @Override + protected void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + // 对所有 URL 都进行认证 + .anyRequest() + .permitAll(); + } + +} diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml new file mode 100644 index 000000000..98b2266e1 --- /dev/null +++ b/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml @@ -0,0 +1 @@ +debug: true diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml index c8226475f..3ccbd09dc 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml +++ b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml @@ -7,4 +7,4 @@ security: client-id: clientapp client-secret: 112233 resource: - token-info-uri: + token-info-uri: http://127.0.0.1:8080/oauth/check_token diff --git a/lab-68/pom.xml b/lab-68/pom.xml index c8a699e20..2e38a86b0 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -14,6 +14,7 @@ lab-68-demo01-resource-owner-password-credentials-server lab-68-demo02-resource-server + lab-68-demo02-auth-server From 2d6132ad95ae7170a8d798f2728d6c568f8fab37 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 24 Jun 2020 19:19:28 +0800 Subject: [PATCH 058/115] =?UTF-8?q?=E7=A0=94=E7=A9=B6=E4=B8=8B=20OAuth2=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/OAuth2ResourceServerConfig.java | 18 ------- .../controller/ExampleController.java | 18 ------- .../src/main/resources/application.yml | 1 - .../pom.xml | 9 +--- .../AuthorizationServerApplication.java} | 6 +-- .../OAuth2AuthorizationServerConfig.java | 10 ++-- .../config/SecurityConfig.java | 11 +--- lab-68/lab-68-demo02-resource-server/pom.xml | 8 +-- .../config/OAuth2ResourceServerConfig.java | 26 +++++---- .../config/SecurityConfig.java | 18 ------- .../controller/LoginController.java | 54 +++++++++++++++++++ .../src/main/resources/application.yml | 4 +- lab-68/pom.xml | 4 +- pom.xml | 4 +- 14 files changed, 92 insertions(+), 99 deletions(-) delete mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java delete mode 100644 lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java delete mode 100644 lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml rename lab-68/{lab-68-demo02-auth-server => lab-68-demo02-authorization-server-with-resource-owner-password-credentials}/pom.xml (84%) rename lab-68/{lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java => lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java} (52%) rename lab-68/{lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo => lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo}/config/OAuth2AuthorizationServerConfig.java (86%) rename lab-68/{lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo => lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo}/config/SecurityConfig.java (80%) delete mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java deleted file mode 100644 index 821ec8e17..000000000 --- a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; - -/** - * 资源服务器配置 - */ -@Configuration -@EnableResourceServer -public class OAuth2ResourceServerConfig { - - - -} - -// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 -// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java deleted file mode 100644 index 2114a466f..000000000 --- a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 示例模块 Controller - */ -@RestController -@RequestMapping("/api/example") -public class ExampleController { - - @RequestMapping("/hello") - public String hello() { - return "world"; - } - -} diff --git a/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml deleted file mode 100644 index 98b2266e1..000000000 --- a/lab-68/lab-68-demo02-auth-server/src/main/resources/application.yml +++ /dev/null @@ -1 +0,0 @@ -debug: true diff --git a/lab-68/lab-68-demo02-auth-server/pom.xml b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml similarity index 84% rename from lab-68/lab-68-demo02-auth-server/pom.xml rename to lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml index 3bf21705d..a48bbdba9 100644 --- a/lab-68/lab-68-demo02-auth-server/pom.xml +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-68-demo02-auth-server + lab-68-demo02-authorization-server-with-resource-owner-password-credentials @@ -44,13 +44,6 @@ spring-boot-starter-security - - - - - - - org.springframework.security.oauth.boot diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 52% rename from lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java index 630affa7b..d08ae7c82 100644 --- a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -1,13 +1,13 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo; +package cn.iocoder.springboot.lab68.authorizationserverdemo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class ResourceServerApplication { +public class AuthorizationServerApplication { public static void main(String[] args) { - SpringApplication.run(ResourceServerApplication.class, args); + SpringApplication.run(AuthorizationServerApplication.class, args); } } diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 86% rename from lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 597a7a7c4..bb5bd507a 100644 --- a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.config; +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; @@ -16,7 +16,9 @@ @EnableAuthorizationServer public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { - // 用户认证 + /** + * 用户认证 Manager + */ @Autowired private AuthenticationManager authenticationManager; @@ -27,8 +29,10 @@ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws E @Override public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); oauthServer.tokenKeyAccess("permitAll()") - .checkTokenAccess("isAuthenticated()"); + .checkTokenAccess("permitAll()"); } @Override diff --git a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 80% rename from lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java index fe4d42a95..9da10ba5a 100644 --- a/lab-68/lab-68-demo02-auth-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -1,11 +1,10 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.config; +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.password.NoOpPasswordEncoder; @@ -36,12 +35,4 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { .withUser("yunai").password("1024").roles("USER"); } - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() - // 对所有 URL 都进行认证 - .anyRequest() - .permitAll(); - } - } diff --git a/lab-68/lab-68-demo02-resource-server/pom.xml b/lab-68/lab-68-demo02-resource-server/pom.xml index 97319742e..c0ca916bf 100644 --- a/lab-68/lab-68-demo02-resource-server/pom.xml +++ b/lab-68/lab-68-demo02-resource-server/pom.xml @@ -39,10 +39,10 @@ - - org.springframework.boot - spring-boot-starter-security - + + + + diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index 19ec87097..ce90a21fc 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab68.resourceserverdemo.config; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; @@ -11,18 +12,21 @@ @EnableResourceServer public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { -// @Override -// public void configure(ResourceServerSecurityConfigurer resources) throws Exception { -// resources. -// super.configure(resources); -// } + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .antMatchers("/login").permitAll() + .anyRequest().authenticated() + ; + } + // -// @Override -// public void configure(HttpSecurity http) throws Exception { -// super.configure(http); +// @Bean +// public OAuth2RestTemplate oauth2RestTemplate(OAuth2ProtectedResourceDetails details) { +// OAuth2RestTemplate oAuth2RestTemplate = new OAuth2RestTemplate(details); +// +// /* To validate if required configurations are in place during startup */ +// return oAuth2RestTemplate; // } } - -// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 -// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java deleted file mode 100644 index 655acb24a..000000000 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.iocoder.springboot.lab68.resourceserverdemo.config; - -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -//@Configuration -//@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() - // 对所有 URL 都进行认证 - .anyRequest() - .authenticated(); - } - -} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java new file mode 100644 index 000000000..5765cd3f7 --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java @@ -0,0 +1,54 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.security.oauth2.client.OAuth2RestTemplate; +import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider; +import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/") +public class LoginController { + +// @Autowired +// private OAuth2ProtectedResourceDetails details; + + @PostMapping("/login") + public String login(@RequestParam("username") String username, + @RequestParam("password") String password) { + ResourceOwnerPasswordResourceDetails resourceDetails = new ResourceOwnerPasswordResourceDetails(); + resourceDetails.setUsername(username); + resourceDetails.setPassword(password); + resourceDetails.setClientId("clientapp"); + resourceDetails.setClientSecret("112233"); + resourceDetails.setAccessTokenUri("http://127.0.0.1:8080/oauth/token"); +// resourceDetails.setAccessTokenUri("http://127.0.0.1:8080/oauth/authorize"); + OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails); +// resourceDetails.setClientAuthenticationScheme(AuthenticationScheme.form); // fetch access_token by sending authentication data in HTTP Body +// resourceDetails.setAuthenticationScheme(AuthenticationScheme.header); // send access_token via HTTP Header 'Bearer' field when accessing actual service +// +// DefaultAccessTokenRequest defaultAccessTokenRequest = new DefaultAccessTokenRequest(); + restTemplate.setAccessTokenProvider(new ResourceOwnerPasswordAccessTokenProvider()); + OAuth2AccessToken accessToken = restTemplate.getAccessToken(); + + String result = restTemplate.postForObject("http://127.0.0.1:8080/oauth/authorize", resourceDetails, + String.class); + return ""; + } + +// public String login() { +// ResourceOwnerPasswordResourceDetails resourceDetails = new ResourceOwnerPasswordResourceDetails(); +// resourceDetails.setUsername("roy"); +// resourceDetails.setPassword("spring"); +// resourceDetails.setAccessTokenUri(format("http://localhost:%d/oauth/token", port)); +// resourceDetails.setClientId("clientapp"); +// resourceDetails.setClientSecret("123456"); +// resourceDetails.setGrantType("password"); +// resourceDetails.setScope(asList("read", "write")); +// +// } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml index 3ccbd09dc..05600270f 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml +++ b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml @@ -3,8 +3,10 @@ server: security: oauth2: + # OAuth2 Client 配置 client: client-id: clientapp client-secret: 112233 + # OAuth2 Resource 配置 resource: - token-info-uri: http://127.0.0.1:8080/oauth/check_token + token-info-uri: http://127.0.0.1:8080/oauth/check_token # 获得 Token 信息的 URL diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 2e38a86b0..2e63f9ba3 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -12,9 +12,9 @@ lab-68 pom - lab-68-demo01-resource-owner-password-credentials-server + lab-68-demo02-resource-server - lab-68-demo02-auth-server + lab-68-demo02-authorization-server-with-resource-owner-password-credentials diff --git a/pom.xml b/pom.xml index 45ef9d3cb..895a5fbcc 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,7 @@ - lab-02 - lab-68 + @@ -79,6 +78,7 @@ + lab-68 From 6be1196e9e5a97d05506c1e62a8a2089133afdfd Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 24 Jun 2020 19:40:54 +0800 Subject: [PATCH 059/115] =?UTF-8?q?=E7=A0=94=E7=A9=B6=E4=B8=8B=20OAuth2=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 7 --- .../OAuth2AuthorizationServerConfig.java | 8 ++-- .../config/OAuth2ResourceServerConfig.java | 11 +---- .../controller/LoginController.java | 46 +++++++------------ .../src/main/resources/application.yml | 6 ++- lab-68/pom.xml | 2 +- 6 files changed, 28 insertions(+), 52 deletions(-) diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml index 7342978f1..27f7b4c60 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml @@ -44,13 +44,6 @@ spring-boot-starter-security - - - - - - - org.springframework.security.oauth.boot diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index bb5bd507a..e41c4f1ae 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -29,10 +29,10 @@ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws E @Override public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { -// oauthServer.tokenKeyAccess("isAuthenticated()") -// .checkTokenAccess("isAuthenticated()"); - oauthServer.tokenKeyAccess("permitAll()") - .checkTokenAccess("permitAll()"); + oauthServer.tokenKeyAccess("isAuthenticated()") + .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); } @Override diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index ce90a21fc..af05b9888 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -15,18 +15,11 @@ public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter @Override public void configure(HttpSecurity http) throws Exception { http.authorizeRequests() + // 设置 /login 无需权限访问 .antMatchers("/login").permitAll() + // 设置其它请求，需要认证后访问 .anyRequest().authenticated() ; } -// -// @Bean -// public OAuth2RestTemplate oauth2RestTemplate(OAuth2ProtectedResourceDetails details) { -// OAuth2RestTemplate oAuth2RestTemplate = new OAuth2RestTemplate(details); -// -// /* To validate if required configurations are in place during startup */ -// return oAuth2RestTemplate; -// } - } diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java index 5765cd3f7..809c9a9db 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java @@ -1,5 +1,8 @@ package cn.iocoder.springboot.lab68.resourceserverdemo.controller; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.security.oauth2.OAuth2ClientProperties; import org.springframework.security.oauth2.client.OAuth2RestTemplate; import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider; import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails; @@ -13,42 +16,27 @@ @RequestMapping("/") public class LoginController { -// @Autowired -// private OAuth2ProtectedResourceDetails details; + @Autowired + private OAuth2ClientProperties oauth2ClientProperties; + + @Value("${security.oauth2.access-token-uri}") + private String accessTokenUri; @PostMapping("/login") - public String login(@RequestParam("username") String username, - @RequestParam("password") String password) { + public OAuth2AccessToken login(@RequestParam("username") String username, + @RequestParam("password") String password) { + // 创建 ResourceOwnerPasswordResourceDetails 对象 ResourceOwnerPasswordResourceDetails resourceDetails = new ResourceOwnerPasswordResourceDetails(); + resourceDetails.setAccessTokenUri(accessTokenUri); + resourceDetails.setClientId(oauth2ClientProperties.getClientId()); + resourceDetails.setClientSecret(oauth2ClientProperties.getClientSecret()); resourceDetails.setUsername(username); resourceDetails.setPassword(password); - resourceDetails.setClientId("clientapp"); - resourceDetails.setClientSecret("112233"); - resourceDetails.setAccessTokenUri("http://127.0.0.1:8080/oauth/token"); -// resourceDetails.setAccessTokenUri("http://127.0.0.1:8080/oauth/authorize"); + // 创建 OAuth2RestTemplate 对象 OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails); -// resourceDetails.setClientAuthenticationScheme(AuthenticationScheme.form); // fetch access_token by sending authentication data in HTTP Body -// resourceDetails.setAuthenticationScheme(AuthenticationScheme.header); // send access_token via HTTP Header 'Bearer' field when accessing actual service -// -// DefaultAccessTokenRequest defaultAccessTokenRequest = new DefaultAccessTokenRequest(); restTemplate.setAccessTokenProvider(new ResourceOwnerPasswordAccessTokenProvider()); - OAuth2AccessToken accessToken = restTemplate.getAccessToken(); - - String result = restTemplate.postForObject("http://127.0.0.1:8080/oauth/authorize", resourceDetails, - String.class); - return ""; + // 获取访问令牌 + return restTemplate.getAccessToken(); } -// public String login() { -// ResourceOwnerPasswordResourceDetails resourceDetails = new ResourceOwnerPasswordResourceDetails(); -// resourceDetails.setUsername("roy"); -// resourceDetails.setPassword("spring"); -// resourceDetails.setAccessTokenUri(format("http://localhost:%d/oauth/token", port)); -// resourceDetails.setClientId("clientapp"); -// resourceDetails.setClientSecret("123456"); -// resourceDetails.setGrantType("password"); -// resourceDetails.setScope(asList("read", "write")); -// -// } - } diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml index 05600270f..724133552 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml +++ b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml @@ -3,10 +3,12 @@ server: security: oauth2: - # OAuth2 Client 配置 + # OAuth2 Client 配置，对应 OAuth2ClientProperties 类 client: client-id: clientapp client-secret: 112233 - # OAuth2 Resource 配置 + # OAuth2 Resource 配置，对应 ResourceServerProperties 类 resource: token-info-uri: http://127.0.0.1:8080/oauth/check_token # 获得 Token 信息的 URL + # 访问令牌获取 URL，自定义的 + access-token-uri: http://127.0.0.1:8080/oauth/token diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 2e63f9ba3..82ad013f5 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -12,7 +12,7 @@ lab-68 pom - + lab-68-demo01-resource-owner-password-credentials-server lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials From 61a6106707160fd012b0e51c0dcc62529e8d79df Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 25 Jun 2020 14:01:25 +0800 Subject: [PATCH 060/115] =?UTF-8?q?=E7=A0=94=E7=A9=B6=E4=B8=8B=20OAuth2=20?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 8 ++++---- .../config/OAuth2AuthorizationServerConfig.java | 5 +++-- .../src/main/resources/application.yml | 1 + pom.xml | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml index a48bbdba9..09db73099 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml @@ -39,10 +39,10 @@ - - org.springframework.boot - spring-boot-starter-security - + + + + diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index e41c4f1ae..d1d316f93 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -29,8 +29,9 @@ public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws E @Override public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { - oauthServer.tokenKeyAccess("isAuthenticated()") - .checkTokenAccess("isAuthenticated()"); + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); // oauthServer.tokenKeyAccess("permitAll()") // .checkTokenAccess("permitAll()"); } diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml index 724133552..4f4890d75 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml +++ b/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml @@ -12,3 +12,4 @@ security: token-info-uri: http://127.0.0.1:8080/oauth/check_token # 获得 Token 信息的 URL # 访问令牌获取 URL，自定义的 access-token-uri: http://127.0.0.1:8080/oauth/token + diff --git a/pom.xml b/pom.xml index 895a5fbcc..798e23736 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ - + From c39271019c2a3fee7abe04f0731ebd4c280f9e0b Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 25 Jun 2020 19:44:58 +0800 Subject: [PATCH 061/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 +++++++++++++++++++ .../AuthorizationServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 48 ++++++++++++++++ .../config/SecurityConfig.java | 49 +++++++++++++++++ .../config/OAuth2ResourceServerConfig.java | 2 + .../controller/CallbackController.java | 44 +++++++++++++++ lab-68/pom.xml | 1 + 7 files changed, 212 insertions(+) create mode 100644 lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml create mode 100644 lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml new file mode 100644 index 000000000..58b01fe62 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo02-authorization-server-with-authorization-code + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..04a292c7d --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,48 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()") +// .tokenKeyAccess("permitAll()") + ; + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("authorization_code") // 授权码模式 + .redirectUris("http://127.0.0.1:9090/callback") // 配置回调地址，选填。TODO 待修改 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..8f02677bc --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http +// .authorizeRequests() +// .antMatchers("/oauth/**").permitAll() // 允许无权限访问 +// .anyRequest().authenticated() +// .and() +// .formLogin().and() +// .httpBasic(); +// } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index af05b9888..515f32181 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -17,6 +17,8 @@ public void configure(HttpSecurity http) throws Exception { http.authorizeRequests() // 设置 /login 无需权限访问 .antMatchers("/login").permitAll() + /// 设置 /callback 无需权限访问 + .antMatchers("/callback").permitAll() // 设置其它请求，需要认证后访问 .anyRequest().authenticated() ; diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java new file mode 100644 index 000000000..2600d7f08 --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java @@ -0,0 +1,44 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.security.oauth2.OAuth2ClientProperties; +import org.springframework.security.oauth2.client.OAuth2RestTemplate; +import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeAccessTokenProvider; +import org.springframework.security.oauth2.client.token.grant.code.AuthorizationCodeResourceDetails; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/") +public class CallbackController { + + @Autowired + private OAuth2ClientProperties oauth2ClientProperties; + + @Value("${security.oauth2.access-token-uri}") + private String accessTokenUri; + + @GetMapping("/callback") + public OAuth2AccessToken login(@RequestParam("code") String code) { + // 创建 ResourceOwnerPasswordResourceDetails 对象 + AuthorizationCodeResourceDetails resourceDetails = new AuthorizationCodeResourceDetails(); + resourceDetails.setAccessTokenUri(accessTokenUri); + resourceDetails.setClientId(oauth2ClientProperties.getClientId()); + resourceDetails.setClientSecret(oauth2ClientProperties.getClientSecret()); +// resourceDetails.setPreEstablishedRedirectUri(); + // 创建 + // 创建 OAuth2RestTemplate 对象 + OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails); + restTemplate.getOAuth2ClientContext().getAccessTokenRequest().setAuthorizationCode(code); // 设置 code + restTemplate.getOAuth2ClientContext().getAccessTokenRequest().setPreservedState("http://127.0.0.1:9090/callback"); // 设置 state + restTemplate.setAccessTokenProvider(new AuthorizationCodeAccessTokenProvider()); + // 获取访问令牌 + return restTemplate.getAccessToken(); + } + + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 82ad013f5..b5803d606 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -15,6 +15,7 @@ lab-68-demo01-resource-owner-password-credentials-server lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials + lab-68-demo02-authorization-server-with-authorization-code From d5d74bd44921e58a47f182aa1f8446aac10a1e97 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 25 Jun 2020 23:03:00 +0800 Subject: [PATCH 062/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E7=A0=81=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-68-demo01-authorization-code/pom.xml | 55 ++++++++++++++++++ .../ResourceServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 38 +++++++++++++ .../config/OAuth2ResourceServerConfig.java | 26 +++++++++ .../config/SecurityConfig.java | 56 +++++++++++++++++++ .../controller/ExampleController.java | 18 ++++++ .../pom.xml | 8 +-- .../config/OAuth2ResourceServerConfig.java | 12 +++- .../config/SecurityConfig.java | 15 +++-- .../OAuth2AuthorizationServerConfig.java | 2 +- .../controller/CallbackController.java | 7 +-- lab-68/pom.xml | 2 + 12 files changed, 233 insertions(+), 19 deletions(-) create mode 100644 lab-68/lab-68-demo01-authorization-code/pom.xml create mode 100644 lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-authorization-code/pom.xml b/lab-68/lab-68-demo01-authorization-code/pom.xml new file mode 100644 index 000000000..0fe03ee1c --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo01-authorization-code + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..6950dbc98 --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + // 用户认证 + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("authorization_code") // 授权码模式 + .redirectUris("http://127.0.0.1:9090/callback") // 配置回调地址，选填。 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..d877589a9 --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { + + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest().authenticated() + // 设置 /api/ 开头的 URL 需要保护 + .and().requestMatchers().antMatchers("/api/**"); + } + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..1116d7c16 --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,56 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http.authorizeRequests() +// // 对所有 URL 都进行认证 +// .anyRequest() +// .authenticated(); +// } + +// @Override +// public void configure(HttpSecurity http) throws Exception { +// http.csrf() +// .disable() +// .authorizeRequests() +// .antMatchers("/oauth/**", "/login/**", "/logout/**").permitAll() +// .anyRequest().authenticated() +// .and().formLogin().permitAll(); +// } + +} diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml index 27f7b4c60..78d8c8479 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml @@ -39,10 +39,10 @@ - - org.springframework.boot - spring-boot-starter-security - + + + + diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index 349400c1d..d877589a9 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -1,14 +1,24 @@ package cn.iocoder.springboot.lab68.resourceserverdemo.config; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; /** * 资源服务器配置 */ @Configuration @EnableResourceServer -public class OAuth2ResourceServerConfig { +public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { + + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest().authenticated() + // 设置 /api/ 开头的 URL 需要保护 + .and().requestMatchers().antMatchers("/api/**"); + } } diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java index ec0459823..85781af9a 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -5,7 +5,6 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.password.NoOpPasswordEncoder; @@ -36,12 +35,12 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { .withUser("yunai").password("1024").roles("USER"); } - @Override - protected void configure(HttpSecurity http) throws Exception { - http.authorizeRequests() - // 对所有 URL 都进行认证 - .anyRequest() - .authenticated(); - } +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http.authorizeRequests() +// // 对所有 URL 都进行认证 +// .anyRequest() +// .authenticated(); +// } } diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 04a292c7d..0866c362e 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -39,7 +39,7 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception { clients.inMemory() .withClient("clientapp").secret("112233") // Client 账号、密码。 .authorizedGrantTypes("authorization_code") // 授权码模式 - .redirectUris("http://127.0.0.1:9090/callback") // 配置回调地址，选填。TODO 待修改 + .redirectUris("http://127.0.0.1:9090/callback") // 配置回调地址，选填。 .scopes("read_userinfo", "read_contacts") // 可授权的 Scope // .and().withClient() // 可以继续配置新的 Client ; diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java index 2600d7f08..3069d1c29 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java @@ -24,21 +24,18 @@ public class CallbackController { @GetMapping("/callback") public OAuth2AccessToken login(@RequestParam("code") String code) { - // 创建 ResourceOwnerPasswordResourceDetails 对象 + // 创建 AuthorizationCodeResourceDetails 对象 AuthorizationCodeResourceDetails resourceDetails = new AuthorizationCodeResourceDetails(); resourceDetails.setAccessTokenUri(accessTokenUri); resourceDetails.setClientId(oauth2ClientProperties.getClientId()); resourceDetails.setClientSecret(oauth2ClientProperties.getClientSecret()); -// resourceDetails.setPreEstablishedRedirectUri(); - // 创建 // 创建 OAuth2RestTemplate 对象 OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails); restTemplate.getOAuth2ClientContext().getAccessTokenRequest().setAuthorizationCode(code); // 设置 code - restTemplate.getOAuth2ClientContext().getAccessTokenRequest().setPreservedState("http://127.0.0.1:9090/callback"); // 设置 state + restTemplate.getOAuth2ClientContext().getAccessTokenRequest().setPreservedState("http://127.0.0.1:9090/callback"); // 通过这个方式，设置 redirect_uri 参数 restTemplate.setAccessTokenProvider(new AuthorizationCodeAccessTokenProvider()); // 获取访问令牌 return restTemplate.getAccessToken(); } - } diff --git a/lab-68/pom.xml b/lab-68/pom.xml index b5803d606..79546afa4 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -13,6 +13,8 @@ pom lab-68-demo01-resource-owner-password-credentials-server + lab-68-demo01-authorization-code + lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials lab-68-demo02-authorization-server-with-authorization-code From f16aeca7b7b177a57b589dedbe7d13d770f44bf8 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 00:04:28 +0800 Subject: [PATCH 063/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 +++++++++++++++++++ .../AuthorizationServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 48 ++++++++++++++++ .../config/SecurityConfig.java | 49 +++++++++++++++++ lab-68/pom.xml | 1 + 5 files changed, 166 insertions(+) create mode 100644 lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml create mode 100644 lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml b/lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml new file mode 100644 index 000000000..ae9652a2d --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo02-authorization-server-with-implicit + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..611a97334 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,48 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()") +// .tokenKeyAccess("permitAll()") + ; + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("implicit") // 简化模式 + .redirectUris("http://127.0.0.1:6666/callback") // 配置回调地址，选填。 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..8f02677bc --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http +// .authorizeRequests() +// .antMatchers("/oauth/**").permitAll() // 允许无权限访问 +// .anyRequest().authenticated() +// .and() +// .formLogin().and() +// .httpBasic(); +// } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 79546afa4..94ce436f6 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -18,6 +18,7 @@ lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials lab-68-demo02-authorization-server-with-authorization-code + lab-68-demo02-authorization-server-with-implicit From 605cde5c1477ef4a9d1d829798095e1f769bebbe Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 00:48:31 +0800 Subject: [PATCH 064/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/OAuth2AuthorizationServerConfig.java | 2 +- .../config/OAuth2ResourceServerConfig.java | 2 ++ .../controller/Callback02Controller.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 611a97334..b72a16ea9 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -39,7 +39,7 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception { clients.inMemory() .withClient("clientapp").secret("112233") // Client 账号、密码。 .authorizedGrantTypes("implicit") // 简化模式 - .redirectUris("http://127.0.0.1:6666/callback") // 配置回调地址，选填。 + .redirectUris("http://127.0.0.1:9090/callback02") // 配置回调地址，选填。 .scopes("read_userinfo", "read_contacts") // 可授权的 Scope // .and().withClient() // 可以继续配置新的 Client ; diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index 515f32181..f10fb5a9f 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -19,6 +19,8 @@ public void configure(HttpSecurity http) throws Exception { .antMatchers("/login").permitAll() /// 设置 /callback 无需权限访问 .antMatchers("/callback").permitAll() + // 设置 /callback02 无需权限访问 + .antMatchers("/callback02").permitAll() // 设置其它请求，需要认证后访问 .anyRequest().authenticated() ; diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java new file mode 100644 index 000000000..57bce6c06 --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java @@ -0,0 +1,16 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/") +public class Callback02Controller { + + @GetMapping("/callback02") + public String login() { + return "假装这里有一个页面"; + } + +} From a166f8246fd5e7930ebe00609bd2f826a85844fa Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 01:18:35 +0800 Subject: [PATCH 065/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-68/lab-68-demo01-implicit/pom.xml | 55 ++++++++++++++++++ .../ResourceServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 38 +++++++++++++ .../config/OAuth2ResourceServerConfig.java | 26 +++++++++ .../config/SecurityConfig.java | 56 +++++++++++++++++++ .../controller/ExampleController.java | 18 ++++++ lab-68/pom.xml | 1 + 7 files changed, 207 insertions(+) create mode 100644 lab-68/lab-68-demo01-implicit/pom.xml create mode 100644 lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-implicit/pom.xml b/lab-68/lab-68-demo01-implicit/pom.xml new file mode 100644 index 000000000..280621bb6 --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo01-implicit + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..553a8e757 --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + // 用户认证 + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("implicit") // 授权码模式 + .redirectUris("http://127.0.0.1:9090/callback02") // 配置回调地址，选填。 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..d877589a9 --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { + + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest().authenticated() + // 设置 /api/ 开头的 URL 需要保护 + .and().requestMatchers().antMatchers("/api/**"); + } + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..1116d7c16 --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,56 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http.authorizeRequests() +// // 对所有 URL 都进行认证 +// .anyRequest() +// .authenticated(); +// } + +// @Override +// public void configure(HttpSecurity http) throws Exception { +// http.csrf() +// .disable() +// .authorizeRequests() +// .antMatchers("/oauth/**", "/login/**", "/logout/**").permitAll() +// .anyRequest().authenticated() +// .and().formLogin().permitAll(); +// } + +} diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 94ce436f6..e8ca8d281 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -14,6 +14,7 @@ lab-68-demo01-resource-owner-password-credentials-server lab-68-demo01-authorization-code + lab-68-demo01-implicit lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials From a892944efd5e540d667fd21229a292d7e2b6485d Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 01:31:45 +0800 Subject: [PATCH 066/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 +++++++++++++++++++ .../AuthorizationServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 53 ++++++++++++++++++ .../config/SecurityConfig.java | 36 ++++++++++++ .../config/OAuth2ResourceServerConfig.java | 2 + .../controller/ClientLoginController.java | 38 +++++++++++++ lab-68/pom.xml | 1 + 7 files changed, 198 insertions(+) create mode 100644 lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml create mode 100644 lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml new file mode 100644 index 000000000..65d8f3f0f --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo02-authorization-server-with-client-credentials + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..7a0dcebd3 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,53 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + +// /** +// * 用户认证 Manager +// */ +// @Autowired +// private AuthenticationManager authenticationManager; +// +// @Override +// public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { +// endpoints.authenticationManager(authenticationManager); +// } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("client_credentials") // 客户端模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..da9dcccc6 --- /dev/null +++ b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,36 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +//@Configuration +//@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +} diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java index f10fb5a9f..32acfee23 100644 --- a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -17,6 +17,8 @@ public void configure(HttpSecurity http) throws Exception { http.authorizeRequests() // 设置 /login 无需权限访问 .antMatchers("/login").permitAll() + // 设置 /client-login 无需权限访问 + .antMatchers("/client-login").permitAll() /// 设置 /callback 无需权限访问 .antMatchers("/callback").permitAll() // 设置 /callback02 无需权限访问 diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java new file mode 100644 index 000000000..1b8e6f9c1 --- /dev/null +++ b/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.security.oauth2.OAuth2ClientProperties; +import org.springframework.security.oauth2.client.OAuth2RestTemplate; +import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider; +import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails; +import org.springframework.security.oauth2.common.OAuth2AccessToken; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/") +public class ClientLoginController { + + @Autowired + private OAuth2ClientProperties oauth2ClientProperties; + + @Value("${security.oauth2.access-token-uri}") + private String accessTokenUri; + + @PostMapping("/client-login") + public OAuth2AccessToken login() { + // 创建 ClientCredentialsResourceDetails 对象 + ClientCredentialsResourceDetails resourceDetails = new ClientCredentialsResourceDetails(); + resourceDetails.setAccessTokenUri(accessTokenUri); + resourceDetails.setClientId(oauth2ClientProperties.getClientId()); + resourceDetails.setClientSecret(oauth2ClientProperties.getClientSecret()); + // 创建 OAuth2RestTemplate 对象 + OAuth2RestTemplate restTemplate = new OAuth2RestTemplate(resourceDetails); + restTemplate.setAccessTokenProvider(new ClientCredentialsAccessTokenProvider()); + // 获取访问令牌 + return restTemplate.getAccessToken(); + } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index e8ca8d281..8733a1bf5 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -20,6 +20,7 @@ lab-68-demo02-authorization-server-with-resource-owner-password-credentials lab-68-demo02-authorization-server-with-authorization-code lab-68-demo02-authorization-server-with-implicit + lab-68-demo02-authorization-server-with-client-credentials From 7f10bb14c4ffeca3744afbf5f8b7592bdbeecb95 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 09:41:21 +0800 Subject: [PATCH 067/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 0 .../ResourceServerApplication.java | 0 .../OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../config/SecurityConfig.java | 0 .../controller/ExampleController.java | 0 .../pom.xml | 55 +++++++++++++++++++ .../ResourceServerApplication.java | 0 .../OAuth2AuthorizationServerConfig.java | 32 +++++++++++ .../config/OAuth2ResourceServerConfig.java | 0 .../controller/ExampleController.java | 0 .../pom.xml | 2 +- .../ResourceServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 26 +++++++++ .../config/SecurityConfig.java | 0 .../controller/ExampleController.java | 18 ++++++ .../OAuth2AuthorizationServerConfig.java | 14 +---- .../config/SecurityConfig.java | 36 ------------ lab-68/pom.xml | 5 +- 20 files changed, 151 insertions(+), 50 deletions(-) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/pom.xml (100%) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) rename lab-68/{lab-68-demo01-authorization-code => lab-68-demo01-authorization-code-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) create mode 100644 lab-68/lab-68-demo01-client-credentials-server/pom.xml rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-client-credentials-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) create mode 100644 lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-client-credentials-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-client-credentials-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-implicit-server}/pom.xml (97%) create mode 100644 lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-implicit-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) create mode 100644 lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename lab-68/{lab-68-demo01-implicit => lab-68-demo01-implicit-server}/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) create mode 100644 lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java delete mode 100644 lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code/pom.xml b/lab-68/lab-68-demo01-authorization-code-server/pom.xml similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/pom.xml rename to lab-68/lab-68-demo01-authorization-code-server/pom.xml diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/pom.xml b/lab-68/lab-68-demo01-client-credentials-server/pom.xml new file mode 100644 index 000000000..83e7f05a4 --- /dev/null +++ b/lab-68/lab-68-demo01-client-credentials-server/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo01-client-credentials-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..426bf7566 --- /dev/null +++ b/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("client_credentials") // 客户端模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-implicit/pom.xml b/lab-68/lab-68-demo01-implicit-server/pom.xml similarity index 97% rename from lab-68/lab-68-demo01-implicit/pom.xml rename to lab-68/lab-68-demo01-implicit-server/pom.xml index 280621bb6..ac455c9c3 100644 --- a/lab-68/lab-68-demo01-implicit/pom.xml +++ b/lab-68/lab-68-demo01-implicit-server/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-68-demo01-implicit + lab-68-demo01-implicit-server diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..d877589a9 --- /dev/null +++ b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableResourceServer +public class OAuth2ResourceServerConfig extends ResourceServerConfigurerAdapter { + + @Override + public void configure(HttpSecurity http) throws Exception { + http.authorizeRequests() + .anyRequest().authenticated() + // 设置 /api/ 开头的 URL 需要保护 + .and().requestMatchers().antMatchers("/api/**"); + } + +} + +// 实际，OAuth2ResourceServer 不是和 OAuth2AuthorizationServer 一起。 +// 主要考虑，简化 demo ，所以改成这样。 diff --git a/lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java new file mode 100644 index 000000000..2114a466f --- /dev/null +++ b/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例模块 Controller + */ +@RestController +@RequestMapping("/api/example") +public class ExampleController { + + @RequestMapping("/hello") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 7a0dcebd3..c09dcbca0 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -15,17 +15,9 @@ @EnableAuthorizationServer public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { -// /** -// * 用户认证 Manager -// */ -// @Autowired -// private AuthenticationManager authenticationManager; -// -// @Override -// public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { -// endpoints.authenticationManager(authenticationManager); -// } - + /** + * 创建 PasswordEncoder Bean + */ @Bean public static NoOpPasswordEncoder passwordEncoder() { return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java deleted file mode 100644 index da9dcccc6..000000000 --- a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.springboot.lab68.authorizationserverdemo.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.config.BeanIds; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.crypto.password.NoOpPasswordEncoder; - -//@Configuration -//@EnableWebSecurity -public class SecurityConfig extends WebSecurityConfigurerAdapter { - - @Override - @Bean(name = BeanIds.AUTHENTICATION_MANAGER) - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); - } - - @Bean - public static NoOpPasswordEncoder passwordEncoder() { - return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); - } - - @Override - protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth. - // 使用内存中的 InMemoryUserDetailsManager - inMemoryAuthentication() - // 不使用 PasswordEncoder 密码编码器 - .passwordEncoder(passwordEncoder()) - // 配置 yunai 用户 - .withUser("yunai").password("1024").roles("USER"); - } - -} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 8733a1bf5..cefd083f4 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -13,8 +13,9 @@ pom lab-68-demo01-resource-owner-password-credentials-server - lab-68-demo01-authorization-code - lab-68-demo01-implicit + lab-68-demo01-authorization-code-server + lab-68-demo01-implicit-server + lab-68-demo01-client-credentials-server lab-68-demo02-resource-server lab-68-demo02-authorization-server-with-resource-owner-password-credentials From d52054cd748c2a856a7c270e7a9e9e42799ce710 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 11:49:06 +0800 Subject: [PATCH 068/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 +++++++++++++++++++ .../AuthorizationServerApplication.java | 13 +++++ .../OAuth2AuthorizationServerConfig.java | 51 +++++++++++++++++ .../config/SecurityConfig.java | 38 +++++++++++++ lab-68/pom.xml | 2 + 5 files changed, 159 insertions(+) create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml new file mode 100644 index 000000000..c104d8378 --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo03-authorization-server-with-resource-owner-password-credentials + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..3247ef64e --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,51 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("password", "refresh_token") // 密码模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope + .accessTokenValiditySeconds(3600) // 访问令牌的有效期为 3600 秒 = 2 小时 + .refreshTokenValiditySeconds(864000) // 刷新令牌的有效期为 864000 秒 = 10 天 +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..9da10ba5a --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index cefd083f4..5faae9d39 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -22,6 +22,8 @@ lab-68-demo02-authorization-server-with-authorization-code lab-68-demo02-authorization-server-with-implicit lab-68-demo02-authorization-server-with-client-credentials + + lab-68-demo03-authorization-server-with-resource-owner-password-credentials From 0857da5a22a2f0cf941a34fc2fa2e46505765442 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 18:48:06 +0800 Subject: [PATCH 069/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BB=A4=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OAuth2AuthorizationServerConfig.java | 11 +++++++- .../config/SecurityConfig.java | 16 ++++++++++++ .../controller/TokenDemoController.java | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 3247ef64e..43bf324c4 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -3,6 +3,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; @@ -22,9 +23,17 @@ public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigur @Autowired private AuthenticationManager authenticationManager; + /** + * 用户详情 Service + */ + @Autowired + private UserDetailsService userDetailsService; + @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { - endpoints.authenticationManager(authenticationManager); + endpoints.authenticationManager(authenticationManager) + .userDetailsService(userDetailsService) + ; } @Override diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java index 9da10ba5a..1af00d68c 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -5,8 +5,10 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.NoOpPasswordEncoder; @Configuration @@ -19,6 +21,12 @@ public AuthenticationManager authenticationManagerBean() throws Exception { return super.authenticationManagerBean(); } + @Override + @Bean(name = BeanIds.USER_DETAILS_SERVICE) + public UserDetailsService userDetailsServiceBean() throws Exception { + return super.userDetailsServiceBean(); + } + @Bean public static NoOpPasswordEncoder passwordEncoder() { return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); @@ -35,4 +43,12 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { .withUser("yunai").password("1024").roles("USER"); } + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + .authorizeRequests() + .mvcMatchers("/token/demo/revoke").permitAll() + .anyRequest().authenticated(); + } + } diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java new file mode 100644 index 000000000..8bf981dbb --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.oauth2.provider.token.ConsumerTokenServices; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * Token 示例 Controller + */ +@RestController +@RequestMapping("/token/demo") +public class TokenDemoController { + + @Autowired + private ConsumerTokenServices tokenServices; + + @PostMapping(value = "/revoke") + public boolean revokeToken(@RequestParam("token") String token) { + return tokenServices.revokeToken(token); + } + +} From ed1dda30af1ca870c8b90dc362d73a2a887831f1 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 20:03:38 +0800 Subject: [PATCH 070/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BB=A4=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" | 3 +++ ...227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" | 1 + .../lab68/authorizationserverdemo/config/SecurityConfig.java | 2 ++ ...ng Security OAuth2 \345\205\245\351\227\250\343\200\213.md" | 0 4 files changed, 6 insertions(+) create mode 100644 "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" create mode 100644 "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" rename "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" => "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" (100%) diff --git "a/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" "b/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" new file mode 100644 index 000000000..52f9dc06c --- /dev/null +++ "b/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" @@ -0,0 +1,3 @@ + + +对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) 示例。 diff --git "a/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" "b/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" new file mode 100644 index 000000000..a0798be1d --- /dev/null +++ "b/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java index 1af00d68c..48ab9d8ad 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -47,7 +47,9 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { protected void configure(HttpSecurity http) throws Exception { http.csrf().disable() .authorizeRequests() + // 设置 /token/demo/revoke 无需授权 .mvcMatchers("/token/demo/revoke").permitAll() + // 设置其它接口需要授权 .anyRequest().authenticated(); } diff --git "a/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" "b/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" rename to "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" From 78ef3070903c7c9af5571a3276fdecdf15cf9b80 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 22:27:57 +0800 Subject: [PATCH 071/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...37\345\205\245\351\227\250\343\200\213.md" | 2 +- .../pom.xml | 68 +++++++++++++++++++ .../AuthorizationServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 68 +++++++++++++++++++ .../config/SecurityConfig.java | 38 +++++++++++ .../src/main/resources/application.yaml | 7 ++ .../src/main/resources/db/data.sql | 7 ++ .../src/main/resources/db/schema.sql | 52 ++++++++++++++ lab-68/pom.xml | 1 + 9 files changed, 255 insertions(+), 1 deletion(-) create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql diff --git "a/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" index a0b594c79..b79d611b7 100644 --- "a/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" +++ "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Admin \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" @@ -1 +1 @@ - + diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml new file mode 100644 index 000000000..692176d7f --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml @@ -0,0 +1,68 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo11-authorization-server-by-jdbc-store + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 5.1.48 + + + + + + diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..2d74d8f56 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,68 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.ClientDetailsService; +import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore; + +import javax.sql.DataSource; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + /** + * 数据源 DataSource + */ + @Autowired + private DataSource dataSource; + + @Bean + public TokenStore jdbcTokenStore() { + return new JdbcTokenStore(dataSource); + } + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager) + .tokenStore(jdbcTokenStore()); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Bean + public ClientDetailsService jdbcClientDetailsService() { + return new JdbcClientDetailsService(dataSource); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.withClientDetails(jdbcClientDetailsService()); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..9da10ba5a --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml new file mode 100644 index 000000000..41f8439a2 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml @@ -0,0 +1,7 @@ +spring: + # datasource 数据源配置内容，对应 DataSourceProperties 配置属性类 + datasource: + url: jdbc:mysql://127.0.0.1:43063/demo-68-authorization-server?useSSL=false&useUnicode=true&characterEncoding=UTF-8 + driver-class-name: com.mysql.jdbc.Driver + username: root # 数据库账号 + password: 123456 # 数据库密码 diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql new file mode 100644 index 000000000..8e61435e9 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql @@ -0,0 +1,7 @@ +INSERT INTO oauth_client_details + (client_id, client_secret, scope, authorized_grant_types, + web_server_redirect_uri, authorities, access_token_validity, + refresh_token_validity, additional_information, autoapprove) +VALUES + ('clientapp', '112233', 'read_userinfo,read_contacts', + 'password,refresh_token', null, null, 3600, 864000, null, true); diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql new file mode 100644 index 000000000..43d55efa7 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql @@ -0,0 +1,52 @@ +--------------- MySQL --------------- +drop table if exists oauth_client_details; +create table oauth_client_details ( + client_id VARCHAR(255) PRIMARY KEY, + resource_ids VARCHAR(255), + client_secret VARCHAR(255), + scope VARCHAR(255), + authorized_grant_types VARCHAR(255), + web_server_redirect_uri VARCHAR(255), + authorities VARCHAR(255), + access_token_validity INTEGER, + refresh_token_validity INTEGER, + additional_information VARCHAR(4096), + autoapprove VARCHAR(255) +); + +create table if not exists oauth_client_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication_id VARCHAR(255) PRIMARY KEY, + user_name VARCHAR(255), + client_id VARCHAR(255) +); + +create table if not exists oauth_access_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication_id VARCHAR(255) PRIMARY KEY, + user_name VARCHAR(255), + client_id VARCHAR(255), + authentication LONG VARBINARY, + refresh_token VARCHAR(255) +); + +create table if not exists oauth_refresh_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication LONG VARBINARY +); + +create table if not exists oauth_code ( + code VARCHAR(255), authentication LONG VARBINARY +); + +create table if not exists oauth_approvals ( + userId VARCHAR(255), + clientId VARCHAR(255), + scope VARCHAR(255), + status VARCHAR(10), + expiresAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + lastModifiedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 5faae9d39..65143891b 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -24,6 +24,7 @@ lab-68-demo02-authorization-server-with-client-credentials lab-68-demo03-authorization-server-with-resource-owner-password-credentials + lab-68-demo11-authorization-server-by-jdbc-store From 6de7c2535753e2db7a4b731c1cc66aae06ce29ee Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 00:18:48 +0800 Subject: [PATCH 072/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 61 +++++++++++++++++ .../AuthorizationServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 65 +++++++++++++++++++ .../config/SecurityConfig.java | 38 +++++++++++ .../src/main/resources/application.yml | 5 ++ lab-68/pom.xml | 2 + 6 files changed, 184 insertions(+) create mode 100644 lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml create mode 100644 lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml b/lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml new file mode 100644 index 000000000..0c3d9d3a9 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml @@ -0,0 +1,61 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo11-authorization-server-by-redis-store + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..e007f80f3 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,65 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.redis.RedisTokenStore; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + /** + * Redis 连接的工厂 + */ + @Autowired + private RedisConnectionFactory redisConnectionFactory; + + @Bean + public TokenStore redisTokenStore() { + return new RedisTokenStore(redisConnectionFactory); + } + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager) + .tokenStore(redisTokenStore()); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("password", "refresh_token") // 密码模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..9da10ba5a --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml new file mode 100644 index 000000000..6c562a047 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml @@ -0,0 +1,5 @@ +spring: + # 对应 RedisProperties 类 + redis: + host: 127.0.0.1 + port: 6379 diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 65143891b..1f74fa13d 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -24,7 +24,9 @@ lab-68-demo02-authorization-server-with-client-credentials lab-68-demo03-authorization-server-with-resource-owner-password-credentials + lab-68-demo11-authorization-server-by-jdbc-store + lab-68-demo11-authorization-server-by-redis-store From 427792b21ca3f46f50ad79a536d18b2a3e09a8da Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 00:50:48 +0800 Subject: [PATCH 073/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 ++++++++++++++++ .../AuthorizationServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 66 +++++++++++++++++++ .../config/SecurityConfig.java | 38 +++++++++++ lab-68/pom.xml | 1 + 5 files changed, 173 insertions(+) create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml new file mode 100644 index 000000000..a3425178e --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo11-authorization-server-by-jwt-store + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..50ea24c14 --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,66 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter; +import org.springframework.security.oauth2.provider.token.store.JwtTokenStore; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + @Bean + public JwtAccessTokenConverter jwtAccessTokenConverter() { + JwtAccessTokenConverter converter = new JwtAccessTokenConverter(); + converter.setSigningKey("nainai_zui_shuai"); // JWT 秘钥 + return converter; + } + + @Bean + public JwtTokenStore jwtTokenStore() { + return new JwtTokenStore(jwtAccessTokenConverter()); + } + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager) + .tokenStore(jwtTokenStore()) + .accessTokenConverter(jwtAccessTokenConverter()); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("password", "refresh_token") // 密码模式 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..9da10ba5a --- /dev/null +++ b/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,38 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +} diff --git a/lab-68/pom.xml b/lab-68/pom.xml index 1f74fa13d..fea612954 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -27,6 +27,7 @@ lab-68-demo11-authorization-server-by-jdbc-store lab-68-demo11-authorization-server-by-redis-store + lab-68-demo11-authorization-server-by-jwt-store From 0eff76186e2549a621a9d733730eaf360b43dbf3 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 01:53:24 +0800 Subject: [PATCH 074/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SSO=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 55 ++++++++++++++++ .../AuthorizationServerApplication.java | 13 ++++ .../OAuth2AuthorizationServerConfig.java | 48 ++++++++++++++ .../config/SecurityConfig.java | 49 +++++++++++++++ .../pom.xml | 62 +++++++++++++++++++ .../ResourceServerApplication.java | 13 ++++ .../config/OAuth2ResourceServerConfig.java | 13 ++++ .../controller/UserController.java | 18 ++++++ .../src/main/resources/application.yml | 18 ++++++ lab-68/pom.xml | 3 + ...30\345\202\250\345\231\250\343\200\213.md" | 1 + 11 files changed, 293 insertions(+) create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/pom.xml create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml create mode 100644 "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml b/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml new file mode 100644 index 000000000..bea822c26 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml @@ -0,0 +1,55 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo21-authorization-server-on-sso + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java new file mode 100644 index 000000000..d08ae7c82 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class AuthorizationServerApplication { + + public static void main(String[] args) { + SpringApplication.run(AuthorizationServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java new file mode 100644 index 000000000..16c1af22d --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -0,0 +1,48 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; +import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; + +/** + * 授权服务器配置 + */ +@Configuration +@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { + + /** + * 用户认证 Manager + */ + @Autowired + private AuthenticationManager authenticationManager; + + @Override + public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.authenticationManager(authenticationManager); + } + + @Override + public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.checkTokenAccess("isAuthenticated()") +// .tokenKeyAccess("permitAll()") + ; + } + + @Override + public void configure(ClientDetailsServiceConfigurer clients) throws Exception { + clients.inMemory() + .withClient("clientapp").secret("112233") // Client 账号、密码。 + .authorizedGrantTypes("authorization_code") // 授权码模式 + .redirectUris("http://127.0.0.1:9090/login") // 配置回调地址，选填。 + .scopes("read_userinfo", "read_contacts") // 可授权的 Scope +// .and().withClient() // 可以继续配置新的 Client + ; + } + +} diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..8f02677bc --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -0,0 +1,49 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.BeanIds; +import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.crypto.password.NoOpPasswordEncoder; + +@Configuration +@EnableWebSecurity +public class SecurityConfig extends WebSecurityConfigurerAdapter { + + @Override + @Bean(name = BeanIds.AUTHENTICATION_MANAGER) + public AuthenticationManager authenticationManagerBean() throws Exception { + return super.authenticationManagerBean(); + } + + @Bean + public static NoOpPasswordEncoder passwordEncoder() { + return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); + } + + @Override + protected void configure(AuthenticationManagerBuilder auth) throws Exception { + auth. + // 使用内存中的 InMemoryUserDetailsManager + inMemoryAuthentication() + // 不使用 PasswordEncoder 密码编码器 + .passwordEncoder(passwordEncoder()) + // 配置 yunai 用户 + .withUser("yunai").password("1024").roles("USER"); + } + +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http +// .authorizeRequests() +// .antMatchers("/oauth/**").permitAll() // 允许无权限访问 +// .anyRequest().authenticated() +// .and() +// .formLogin().and() +// .httpBasic(); +// } + +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/pom.xml b/lab-68/lab-68-demo21-resource-server-on-sso/pom.xml new file mode 100644 index 000000000..603da2cfa --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/pom.xml @@ -0,0 +1,62 @@ + + + + lab-68 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-68-demo21-resource-server + + + + 2.2.4.RELEASE + + 1.8 + 1.8 + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + + + + + + + + org.springframework.security.oauth.boot + spring-security-oauth2-autoconfigure + ${spring.boot.version} + + + + diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java new file mode 100644 index 000000000..630affa7b --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ResourceServerApplication { + + public static void main(String[] args) { + SpringApplication.run(ResourceServerApplication.class, args); + } + +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java new file mode 100644 index 000000000..3a5b2d6e5 --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso; +import org.springframework.context.annotation.Configuration; + +/** + * 资源服务器配置 + */ +@Configuration +@EnableOAuth2Sso +public class OAuth2ResourceServerConfig { + +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java new file mode 100644 index 000000000..6ad27b044 --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java @@ -0,0 +1,18 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 用户 Controller + */ +@RestController +@RequestMapping("/user") +public class UserController { + + @RequestMapping("/info") + public String hello() { + return "world"; + } + +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml new file mode 100644 index 000000000..ffd7dfbc0 --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml @@ -0,0 +1,18 @@ +server: + port: 9090 + servlet: + session: + cookie: + name: OAUTH2-CLIENT-SESSIONID + +security: + oauth2: + # OAuth2 Client 配置，对应 OAuth2ClientProperties 类 + client: + client-id: clientapp + client-secret: 112233 + user-authorization-uri: http://127.0.0.1:8080/oauth/authorize # + access-token-uri: http://127.0.0.1:8080/oauth/token + # OAuth2 Resource 配置，对应 ResourceServerProperties 类 + resource: + token-info-uri: http://127.0.0.1:8080/oauth/check_token # 获得 Token 信息的 URL diff --git a/lab-68/pom.xml b/lab-68/pom.xml index fea612954..5fabcbd1a 100644 --- a/lab-68/pom.xml +++ b/lab-68/pom.xml @@ -28,6 +28,9 @@ lab-68-demo11-authorization-server-by-jdbc-store lab-68-demo11-authorization-server-by-redis-store lab-68-demo11-authorization-server-by-jwt-store + + lab-68-demo21-authorization-server-on-sso + lab-68-demo21-resource-server-on-sso diff --git "a/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" "b/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" new file mode 100644 index 000000000..738b41eb7 --- /dev/null +++ "b/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" @@ -0,0 +1 @@ + From ac113de0f3e734a1d46729911f571ff7d08e9c1b Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 09:46:19 +0800 Subject: [PATCH 075/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SSO=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pom.xml | 12 +++++ .../OAuth2AuthorizationServerConfig.java | 42 +++++++++++---- .../config/SecurityConfig.java | 18 ++++--- .../src/main/resources/application.yaml | 7 +++ .../src/main/resources/db/oauth_data.sql | 7 +++ .../src/main/resources/db/oauth_schema.sql | 51 +++++++++++++++++++ .../src/main/resources/db/user_data.sql | 3 ++ .../src/main/resources/db/user_schema.sql | 14 +++++ .../config/SecurityConfig.java | 12 +++++ .../controller/DemoController.java | 27 ++++++++++ .../controller/UserController.java | 5 +- .../src/main/resources/application.yml | 8 +-- 12 files changed, 182 insertions(+), 24 deletions(-) create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql create mode 100644 lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java create mode 100644 lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml b/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml index bea822c26..24cbb7fc0 100644 --- a/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml @@ -50,6 +50,18 @@ spring-security-oauth2-autoconfigure ${spring.boot.version} + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 5.1.48 + + diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 16c1af22d..5daa50ce6 100644 --- a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab68.authorizationserverdemo.config; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; @@ -8,6 +9,12 @@ import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerEndpointsConfigurer; import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.ClientDetailsService; +import org.springframework.security.oauth2.provider.client.JdbcClientDetailsService; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.JdbcTokenStore; + +import javax.sql.DataSource; /** * 授权服务器配置 @@ -22,27 +29,40 @@ public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigur @Autowired private AuthenticationManager authenticationManager; + /** + * 数据源 DataSource + */ + @Autowired + private DataSource dataSource; + + @Bean + public TokenStore jdbcTokenStore() { + return new JdbcTokenStore(dataSource); + } + @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { - endpoints.authenticationManager(authenticationManager); + endpoints.authenticationManager(authenticationManager) + .tokenStore(jdbcTokenStore()); } @Override public void configure(AuthorizationServerSecurityConfigurer oauthServer) throws Exception { - oauthServer.checkTokenAccess("isAuthenticated()") -// .tokenKeyAccess("permitAll()") - ; + oauthServer.checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("isAuthenticated()") +// .checkTokenAccess("isAuthenticated()"); +// oauthServer.tokenKeyAccess("permitAll()") +// .checkTokenAccess("permitAll()"); + } + + @Bean + public ClientDetailsService jdbcClientDetailsService() { + return new JdbcClientDetailsService(dataSource); } @Override public void configure(ClientDetailsServiceConfigurer clients) throws Exception { - clients.inMemory() - .withClient("clientapp").secret("112233") // Client 账号、密码。 - .authorizedGrantTypes("authorization_code") // 授权码模式 - .redirectUris("http://127.0.0.1:9090/login") // 配置回调地址，选填。 - .scopes("read_userinfo", "read_contacts") // 可授权的 Scope -// .and().withClient() // 可以继续配置新的 Client - ; + clients.withClientDetails(jdbcClientDetailsService()); } } diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java index 8f02677bc..5da724d56 100644 --- a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -1,5 +1,6 @@ package cn.iocoder.springboot.lab68.authorizationserverdemo.config; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; @@ -9,10 +10,18 @@ import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.crypto.password.NoOpPasswordEncoder; +import javax.sql.DataSource; + @Configuration @EnableWebSecurity public class SecurityConfig extends WebSecurityConfigurerAdapter { + /** + * 数据源 DataSource + */ + @Autowired + private DataSource dataSource; + @Override @Bean(name = BeanIds.AUTHENTICATION_MANAGER) public AuthenticationManager authenticationManagerBean() throws Exception { @@ -26,13 +35,8 @@ public static NoOpPasswordEncoder passwordEncoder() { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { - auth. - // 使用内存中的 InMemoryUserDetailsManager - inMemoryAuthentication() - // 不使用 PasswordEncoder 密码编码器 - .passwordEncoder(passwordEncoder()) - // 配置 yunai 用户 - .withUser("yunai").password("1024").roles("USER"); + auth.jdbcAuthentication() + .dataSource(dataSource); } // @Override diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml new file mode 100644 index 000000000..77c513b31 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml @@ -0,0 +1,7 @@ +spring: + # datasource 数据源配置内容，对应 DataSourceProperties 配置属性类 + datasource: + url: jdbc:mysql://127.0.0.1:43063/demo-68-authorization-server-sso?useSSL=false&useUnicode=true&characterEncoding=UTF-8 + driver-class-name: com.mysql.jdbc.Driver + username: root # 数据库账号 + password: 123456 # 数据库密码 diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql new file mode 100644 index 000000000..8e61435e9 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql @@ -0,0 +1,7 @@ +INSERT INTO oauth_client_details + (client_id, client_secret, scope, authorized_grant_types, + web_server_redirect_uri, authorities, access_token_validity, + refresh_token_validity, additional_information, autoapprove) +VALUES + ('clientapp', '112233', 'read_userinfo,read_contacts', + 'password,refresh_token', null, null, 3600, 864000, null, true); diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql new file mode 100644 index 000000000..b883e0841 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql @@ -0,0 +1,51 @@ +drop table if exists oauth_client_details; +create table oauth_client_details ( + client_id VARCHAR(255) PRIMARY KEY, + resource_ids VARCHAR(255), + client_secret VARCHAR(255), + scope VARCHAR(255), + authorized_grant_types VARCHAR(255), + web_server_redirect_uri VARCHAR(255), + authorities VARCHAR(255), + access_token_validity INTEGER, + refresh_token_validity INTEGER, + additional_information VARCHAR(4096), + autoapprove VARCHAR(255) +); + +create table if not exists oauth_client_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication_id VARCHAR(255) PRIMARY KEY, + user_name VARCHAR(255), + client_id VARCHAR(255) +); + +create table if not exists oauth_access_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication_id VARCHAR(255) PRIMARY KEY, + user_name VARCHAR(255), + client_id VARCHAR(255), + authentication LONG VARBINARY, + refresh_token VARCHAR(255) +); + +create table if not exists oauth_refresh_token ( + token_id VARCHAR(255), + token LONG VARBINARY, + authentication LONG VARBINARY +); + +create table if not exists oauth_code ( + code VARCHAR(255), authentication LONG VARBINARY +); + +create table if not exists oauth_approvals ( + userId VARCHAR(255), + clientId VARCHAR(255), + scope VARCHAR(255), + status VARCHAR(10), + expiresAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + lastModifiedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql new file mode 100644 index 000000000..d28fa3c8e --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql @@ -0,0 +1,3 @@ +INSERT INTO `authorities` VALUES ('yunai', 'ROLE_USER'); + +INSERT INTO `users` VALUES ('yunai', '112233', '1'); diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql new file mode 100644 index 000000000..0befc8034 --- /dev/null +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql @@ -0,0 +1,14 @@ +DROP TABLE IF EXISTS `authorities`; +CREATE TABLE `authorities` ( + `username` varchar(50) NOT NULL, + `authority` varchar(50) NOT NULL, + UNIQUE KEY `ix_auth_username` (`username`,`authority`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` ( + `username` varchar(50) NOT NULL, + `password` varchar(500) NOT NULL, + `enabled` tinyint(1) NOT NULL, + PRIMARY KEY (`username`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java new file mode 100644 index 000000000..838539d89 --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -0,0 +1,12 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; + +@Configuration +@EnableGlobalMethodSecurity(prePostEnabled = true) +@Order(101) +public class SecurityConfig extends WebSecurityConfigurerAdapter { +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java new file mode 100644 index 000000000..fd2deb0e3 --- /dev/null +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java @@ -0,0 +1,27 @@ +package cn.iocoder.springboot.lab68.resourceserverdemo.controller; + +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 示例 Controller + */ +@RestController +@RequestMapping("/demo") +public class DemoController { + + @GetMapping("/admin-list") + @PreAuthorize("hasAuthority('admin')") + public String adminList() { + return "管理员列表"; + } + + @GetMapping("/user-list") + @PreAuthorize("hasAuthority('user')") + public String userList() { + return "用户列表"; + } + +} diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java index 6ad27b044..a41c517c7 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java @@ -1,5 +1,6 @@ package cn.iocoder.springboot.lab68.resourceserverdemo.controller; +import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -11,8 +12,8 @@ public class UserController { @RequestMapping("/info") - public String hello() { - return "world"; + public Authentication info(Authentication authentication) { + return authentication; } } diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml index ffd7dfbc0..5e02db70b 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml @@ -3,7 +3,7 @@ server: servlet: session: cookie: - name: OAUTH2-CLIENT-SESSIONID + name: SSO-SESSIONID # 自定义 Session 的 Cookie 名字，防止冲突。冲突后，会导致 SSO 登陆失败。 security: oauth2: @@ -11,8 +11,8 @@ security: client: client-id: clientapp client-secret: 112233 - user-authorization-uri: http://127.0.0.1:8080/oauth/authorize # - access-token-uri: http://127.0.0.1:8080/oauth/token + user-authorization-uri: http://127.0.0.1:8080/oauth/authorize # 获取用户的授权码地址 + access-token-uri: http://127.0.0.1:8080/oauth/token # 获取访问令牌的地址 # OAuth2 Resource 配置，对应 ResourceServerProperties 类 resource: - token-info-uri: http://127.0.0.1:8080/oauth/check_token # 获得 Token 信息的 URL + token-info-uri: http://127.0.0.1:8080/oauth/check_token # 校验访问令牌是否有效的地址 From 8b483b5c11db470d3c8ef9f03f2f11518f842583 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 09:53:40 +0800 Subject: [PATCH 076/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SSO=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=EF=BC=88=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{OAuth2ResourceServerConfig.java => OAuthSsoConfig.java} | 6 +++--- .../lab68/resourceserverdemo/config/SecurityConfig.java | 4 ++-- .../lab68/resourceserverdemo/controller/DemoController.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/{OAuth2ResourceServerConfig.java => OAuthSsoConfig.java} (73%) diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java similarity index 73% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java index 3a5b2d6e5..0224020da 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java @@ -4,10 +4,10 @@ import org.springframework.context.annotation.Configuration; /** - * 资源服务器配置 + * SSO 配置 */ @Configuration -@EnableOAuth2Sso -public class OAuth2ResourceServerConfig { +@EnableOAuth2Sso // 开启 Sso 功能 +public class OAuthSsoConfig { } diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java index 838539d89..eb187cf7f 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java @@ -6,7 +6,7 @@ import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true) -@Order(101) +@EnableGlobalMethodSecurity(prePostEnabled = true) // 开启对 Spring Security 注解的方法，进行权限验证。 +@Order(101) // OAuth2SsoDefaultConfiguration 使用了 Order(100)，所以这里设置为 Order(101)，防止相同顺序导致报错 public class SecurityConfig extends WebSecurityConfigurerAdapter { } diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java index fd2deb0e3..40ef1d488 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java @@ -13,13 +13,13 @@ public class DemoController { @GetMapping("/admin-list") - @PreAuthorize("hasAuthority('admin')") + @PreAuthorize("hasRole('ADMIN')") public String adminList() { return "管理员列表"; } @GetMapping("/user-list") - @PreAuthorize("hasAuthority('user')") + @PreAuthorize("hasRole('USER')") public String userList() { return "用户列表"; } From cbca34891267940957e303cbe7cadebd580b06d8 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 16:39:40 +0800 Subject: [PATCH 077/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20SSO=20=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=EF=BC=88=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/oauth_data.sql | 2 +- .../lab68/resourceserverdemo/controller/DemoController.java | 4 ++-- ...15\225\347\202\271\347\231\273\351\231\206\343\200\213.md" | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql index 8e61435e9..86070ad5a 100644 --- a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql +++ b/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql @@ -4,4 +4,4 @@ INSERT INTO oauth_client_details refresh_token_validity, additional_information, autoapprove) VALUES ('clientapp', '112233', 'read_userinfo,read_contacts', - 'password,refresh_token', null, null, 3600, 864000, null, true); + 'password,authorization_code,refresh_token', 'http://127.0.0.1:9090/login', null, 3600, 864000, null, true); diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java index 40ef1d488..c48efcab5 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java @@ -13,13 +13,13 @@ public class DemoController { @GetMapping("/admin-list") - @PreAuthorize("hasRole('ADMIN')") + @PreAuthorize("hasRole('ADMIN')") // 要求管理员 ROLE_ADMIN 角色 public String adminList() { return "管理员列表"; } @GetMapping("/user-list") - @PreAuthorize("hasRole('USER')") + @PreAuthorize("hasRole('USER')") // 要求普通用户 ROLE_USER 角色 public String userList() { return "用户列表"; } diff --git "a/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" "b/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" new file mode 100644 index 000000000..66c8d3b8c --- /dev/null +++ "b/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" @@ -0,0 +1 @@ + From 358ca2521e1d29db05fc988db002bacf8719ab48 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 20:05:00 +0800 Subject: [PATCH 078/115] =?UTF-8?q?=E5=AE=8C=E5=96=84=20OAuth2.0=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++++- .../lab68/resourceserverdemo/config/OAuthSsoConfig.java | 2 ++ pom.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 75e8c6353..d37c28f2c 100644 --- a/README.md +++ b/README.md @@ -91,9 +91,13 @@ ## 安全控制 * [《芋道 Spring Boot 安全框架 Spring Security 入门》](http://www.iocoder.cn/Spring-Boot/Spring-Security/?github) 对应 [lab-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-01) -* [《芋道 Spring Boot 授权框架 Spring Security OAuth2 入门》](http://www.iocoder.cn/Spring-Security/OAuth2-learning/?github) 对应 [lab-02](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-02) * [《芋道 Spring Boot 安全框架 Shiro 入门》](http://www.iocoder.cn/Spring-Boot/Shiro/?github) 对应 [lab-33](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-33) +**OAuth 2.0** +* [《芋道 Spring Security OAuth2 入门》](http://www.iocoder.cn/Spring-Security/OAuth2-learning/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) +* [《芋道 Spring Security OAuth2 存储器》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-store/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) +* [《芋道 Spring Security OAuth2 单点登陆》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-sso/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) + ## 定时任务与异步任务 * [《芋道 Spring Boot 定时任务入门》](http://www.iocoder.cn/Spring-Boot/Job/?github) 对应 [lab-28](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-28) diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java index 0224020da..28ffaacb2 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java +++ b/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java @@ -5,6 +5,8 @@ /** * SSO 配置 + * + * 推荐看 SsoSecurityConfigurer 类 */ @Configuration @EnableOAuth2Sso // 开启 Sso 功能 diff --git a/pom.xml b/pom.xml index 798e23736..3538d475b 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ - lab-68 + From 927c34fdb313b9326464f03816ae209b9c9d33ac Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 21:46:29 +0800 Subject: [PATCH 079/115] =?UTF-8?q?Spring=20Security=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../lab-01-springsecurity-demo-role/pom.xml | 0 .../cn/iocoder/springboot/lab01/springsecurity/Application.java | 0 .../springboot/lab01/springsecurity/config/SecurityConfig.java | 0 .../lab01/springsecurity/controller/DemoController.java | 0 .../lab01/springsecurity/controller/TestController.java | 0 .../lab-01-springsecurity-demo/pom.xml | 0 .../cn/iocoder/springboot/lab01/springsecurity/Application.java | 0 .../lab01/springsecurity/controller/AdminController.java | 0 .../src/main/resources/application.yaml | 0 {lab-01 => lab-01-spring-security}/pom.xml | 0 ...266 Spring Security \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 2 +- 13 files changed, 2 insertions(+), 2 deletions(-) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo-role/pom.xml (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/config/SecurityConfig.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/DemoController.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/TestController.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo/pom.xml (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/AdminController.java (100%) rename {lab-01 => lab-01-spring-security}/lab-01-springsecurity-demo/src/main/resources/application.yaml (100%) rename {lab-01 => lab-01-spring-security}/pom.xml (100%) rename "lab-01/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" => "lab-01-spring-security/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index d37c28f2c..1f2df3825 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ ## 安全控制 -* [《芋道 Spring Boot 安全框架 Spring Security 入门》](http://www.iocoder.cn/Spring-Boot/Spring-Security/?github) 对应 [lab-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-01) +* [《芋道 Spring Boot 安全框架 Spring Security 入门》](http://www.iocoder.cn/Spring-Boot/Spring-Security/?github) 对应 [lab-01-spring-security](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-01-spring-security) * [《芋道 Spring Boot 安全框架 Shiro 入门》](http://www.iocoder.cn/Spring-Boot/Shiro/?github) 对应 [lab-33](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-33) **OAuth 2.0** diff --git a/lab-01/lab-01-springsecurity-demo-role/pom.xml b/lab-01-spring-security/lab-01-springsecurity-demo-role/pom.xml similarity index 100% rename from lab-01/lab-01-springsecurity-demo-role/pom.xml rename to lab-01-spring-security/lab-01-springsecurity-demo-role/pom.xml diff --git a/lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java b/lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java rename to lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java diff --git a/lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/config/SecurityConfig.java b/lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/config/SecurityConfig.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/config/SecurityConfig.java rename to lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/config/SecurityConfig.java diff --git a/lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/DemoController.java b/lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/DemoController.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/DemoController.java rename to lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/DemoController.java diff --git a/lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/TestController.java b/lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/TestController.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/TestController.java rename to lab-01-spring-security/lab-01-springsecurity-demo-role/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/TestController.java diff --git a/lab-01/lab-01-springsecurity-demo/pom.xml b/lab-01-spring-security/lab-01-springsecurity-demo/pom.xml similarity index 100% rename from lab-01/lab-01-springsecurity-demo/pom.xml rename to lab-01-spring-security/lab-01-springsecurity-demo/pom.xml diff --git a/lab-01/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java b/lab-01-spring-security/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java rename to lab-01-spring-security/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/Application.java diff --git a/lab-01/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/AdminController.java b/lab-01-spring-security/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/AdminController.java similarity index 100% rename from lab-01/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/AdminController.java rename to lab-01-spring-security/lab-01-springsecurity-demo/src/main/java/cn/iocoder/springboot/lab01/springsecurity/controller/AdminController.java diff --git a/lab-01/lab-01-springsecurity-demo/src/main/resources/application.yaml b/lab-01-spring-security/lab-01-springsecurity-demo/src/main/resources/application.yaml similarity index 100% rename from lab-01/lab-01-springsecurity-demo/src/main/resources/application.yaml rename to lab-01-spring-security/lab-01-springsecurity-demo/src/main/resources/application.yaml diff --git a/lab-01/pom.xml b/lab-01-spring-security/pom.xml similarity index 100% rename from lab-01/pom.xml rename to lab-01-spring-security/pom.xml diff --git "a/lab-01/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" "b/lab-01-spring-security/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-01/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" rename to "lab-01-spring-security/\343\200\212\350\212\213\351\201\223 Spring Boot \345\256\211\345\205\250\346\241\206\346\236\266 Spring Security \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 3538d475b..46b8b4b14 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ - + lab-01-spring-security From 556093fc9346208621e47f7d1ea360caf0d3c7f9 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 22:01:16 +0800 Subject: [PATCH 080/115] =?UTF-8?q?Spring=20Security=20OAuth=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authorization-code-server/pom.xml | 0 .../java/cn/iocoder/springboot/labs/lab01/Application.java | 0 .../labs/lab01/authorization/OAuth2AuthorizationServer.java | 0 .../springboot/labs/lab01/resource/OAuth2ResourceServer.java | 0 .../springboot/labs/lab01/resource/api/ExampleController.java | 0 .../src/main/resources/application.properties | 0 .../client-credentials-server/pom.xml | 0 .../src/main/java/lab01/Application.java | 0 .../java/lab01/authorization/OAuth2AuthorizationServer.java | 0 .../src/main/java/lab01/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab01/resource/api/ExampleController.java | 0 .../implicit-server/pom.xml | 0 .../implicit-server/src/main/java/lab01/Application.java | 0 .../java/lab01/authorization/OAuth2AuthorizationServer.java | 0 .../src/main/java/lab01/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab01/resource/api/ExampleController.java | 0 .../implicit-server/src/main/resources/application.properties | 0 {lab-02 => lab-02-spring-security-oauth}/pom.xml | 0 .../pom.xml | 0 .../src/main/java/lab02/Application.java | 0 .../java/lab02/authorization/OAuth2AuthorizationServer.java | 0 .../src/main/java/lab02/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab02/resource/api/ExampleController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/data.sql | 0 .../src/main/resources/schema.sql | 0 .../pom.xml | 0 .../src/main/java/lab01/Application.java | 0 .../java/lab01/authorization/OAuth2AuthorizationServer.java | 0 .../src/main/java/lab01/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab01/resource/api/ExampleController.java | 0 .../src/main/resources/application.properties | 0 .../pom.xml | 0 .../src/main/java/lab2/Application.java | 0 .../java/lab2/authorization/OAuth2AuthorizationServer.java | 0 .../main/java/lab2/authorization/token/TokenController.java | 0 .../src/main/java/lab2/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab2/resource/api/ExampleController.java | 0 .../src/main/resources/application.properties | 0 .../resource-owner-password-credentials-server/pom.xml | 0 .../src/main/java/lab01/Application.java | 0 .../java/lab01/authorization/OAuth2AuthorizationServer.java | 0 .../src/main/java/lab01/resource/OAuth2ResourceServer.java | 0 .../src/main/java/lab01/resource/api/ExampleController.java | 0 .../src/main/resources/application.properties | 0 ...27\250\357\274\210\346\226\260\357\274\211\343\200\213.md" | 0 ...27\250\357\274\210\350\200\201\357\274\211\343\200\213.md" | 0 pom.xml | 4 ++-- 48 files changed, 2 insertions(+), 2 deletions(-) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/authorization-code-server/src/main/resources/application.properties (100%) rename {lab-02 => lab-02-spring-security-oauth}/client-credentials-server/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/client-credentials-server/src/main/java/lab01/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/client-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/client-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/client-credentials-server/src/main/java/lab01/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/src/main/java/lab01/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/src/main/java/lab01/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/src/main/java/lab01/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/implicit-server/src/main/resources/application.properties (100%) rename {lab-02 => lab-02-spring-security-oauth}/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/application.properties (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/data.sql (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/schema.sql (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-refresh-token/src/main/resources/application.properties (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/token/TokenController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server-with-revoke-token/src/main/resources/application.properties (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/pom.xml (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/src/main/java/lab01/Application.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/src/main/java/lab01/resource/api/ExampleController.java (100%) rename {lab-02 => lab-02-spring-security-oauth}/resource-owner-password-credentials-server/src/main/resources/application.properties (100%) rename "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" => "lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" (100%) rename "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" => "lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" (100%) diff --git a/lab-02/authorization-code-server/pom.xml b/lab-02-spring-security-oauth/authorization-code-server/pom.xml similarity index 100% rename from lab-02/authorization-code-server/pom.xml rename to lab-02-spring-security-oauth/authorization-code-server/pom.xml diff --git a/lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/Application.java b/lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/Application.java similarity index 100% rename from lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/Application.java rename to lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/Application.java diff --git a/lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/OAuth2ResourceServer.java diff --git a/lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/api/ExampleController.java b/lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/api/ExampleController.java similarity index 100% rename from lab-02/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/authorization-code-server/src/main/java/cn/iocoder/springboot/labs/lab01/resource/api/ExampleController.java diff --git a/lab-02/authorization-code-server/src/main/resources/application.properties b/lab-02-spring-security-oauth/authorization-code-server/src/main/resources/application.properties similarity index 100% rename from lab-02/authorization-code-server/src/main/resources/application.properties rename to lab-02-spring-security-oauth/authorization-code-server/src/main/resources/application.properties diff --git a/lab-02/client-credentials-server/pom.xml b/lab-02-spring-security-oauth/client-credentials-server/pom.xml similarity index 100% rename from lab-02/client-credentials-server/pom.xml rename to lab-02-spring-security-oauth/client-credentials-server/pom.xml diff --git a/lab-02/client-credentials-server/src/main/java/lab01/Application.java b/lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/Application.java similarity index 100% rename from lab-02/client-credentials-server/src/main/java/lab01/Application.java rename to lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/Application.java diff --git a/lab-02/client-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/client-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/client-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/client-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java diff --git a/lab-02/client-credentials-server/src/main/java/lab01/resource/api/ExampleController.java b/lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/resource/api/ExampleController.java similarity index 100% rename from lab-02/client-credentials-server/src/main/java/lab01/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/client-credentials-server/src/main/java/lab01/resource/api/ExampleController.java diff --git a/lab-02/implicit-server/pom.xml b/lab-02-spring-security-oauth/implicit-server/pom.xml similarity index 100% rename from lab-02/implicit-server/pom.xml rename to lab-02-spring-security-oauth/implicit-server/pom.xml diff --git a/lab-02/implicit-server/src/main/java/lab01/Application.java b/lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/Application.java similarity index 100% rename from lab-02/implicit-server/src/main/java/lab01/Application.java rename to lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/Application.java diff --git a/lab-02/implicit-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/implicit-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/implicit-server/src/main/java/lab01/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/implicit-server/src/main/java/lab01/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/resource/OAuth2ResourceServer.java diff --git a/lab-02/implicit-server/src/main/java/lab01/resource/api/ExampleController.java b/lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/resource/api/ExampleController.java similarity index 100% rename from lab-02/implicit-server/src/main/java/lab01/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/implicit-server/src/main/java/lab01/resource/api/ExampleController.java diff --git a/lab-02/implicit-server/src/main/resources/application.properties b/lab-02-spring-security-oauth/implicit-server/src/main/resources/application.properties similarity index 100% rename from lab-02/implicit-server/src/main/resources/application.properties rename to lab-02-spring-security-oauth/implicit-server/src/main/resources/application.properties diff --git a/lab-02/pom.xml b/lab-02-spring-security-oauth/pom.xml similarity index 100% rename from lab-02/pom.xml rename to lab-02-spring-security-oauth/pom.xml diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/pom.xml b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/pom.xml similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/pom.xml rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/pom.xml diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/Application.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/Application.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/Application.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/Application.java diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/OAuth2ResourceServer.java diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/api/ExampleController.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/api/ExampleController.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/java/lab02/resource/api/ExampleController.java diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/application.properties b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/application.properties similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/application.properties rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/application.properties diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/data.sql b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/data.sql similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/data.sql rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/data.sql diff --git a/lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/schema.sql b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/schema.sql similarity index 100% rename from lab-02/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/schema.sql rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-by-jdbc-token-store/src/main/resources/schema.sql diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/pom.xml b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/pom.xml similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/pom.xml rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/pom.xml diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/Application.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/Application.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/Application.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/Application.java diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/OAuth2ResourceServer.java diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/api/ExampleController.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/api/ExampleController.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/java/lab01/resource/api/ExampleController.java diff --git a/lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/resources/application.properties b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/resources/application.properties similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-refresh-token/src/main/resources/application.properties rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-refresh-token/src/main/resources/application.properties diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/pom.xml b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/pom.xml similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/pom.xml rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/pom.xml diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/Application.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/Application.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/Application.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/Application.java diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/token/TokenController.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/token/TokenController.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/token/TokenController.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/authorization/token/TokenController.java diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/OAuth2ResourceServer.java diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/api/ExampleController.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/api/ExampleController.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/java/lab2/resource/api/ExampleController.java diff --git a/lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/resources/application.properties b/lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/resources/application.properties similarity index 100% rename from lab-02/resource-owner-password-credentials-server-with-revoke-token/src/main/resources/application.properties rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server-with-revoke-token/src/main/resources/application.properties diff --git a/lab-02/resource-owner-password-credentials-server/pom.xml b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/pom.xml similarity index 100% rename from lab-02/resource-owner-password-credentials-server/pom.xml rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/pom.xml diff --git a/lab-02/resource-owner-password-credentials-server/src/main/java/lab01/Application.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/Application.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server/src/main/java/lab01/Application.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/Application.java diff --git a/lab-02/resource-owner-password-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/authorization/OAuth2AuthorizationServer.java diff --git a/lab-02/resource-owner-password-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/resource/OAuth2ResourceServer.java diff --git a/lab-02/resource-owner-password-credentials-server/src/main/java/lab01/resource/api/ExampleController.java b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/resource/api/ExampleController.java similarity index 100% rename from lab-02/resource-owner-password-credentials-server/src/main/java/lab01/resource/api/ExampleController.java rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/java/lab01/resource/api/ExampleController.java diff --git a/lab-02/resource-owner-password-credentials-server/src/main/resources/application.properties b/lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/resources/application.properties similarity index 100% rename from lab-02/resource-owner-password-credentials-server/src/main/resources/application.properties rename to lab-02-spring-security-oauth/resource-owner-password-credentials-server/src/main/resources/application.properties diff --git "a/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" "b/lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" similarity index 100% rename from "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" rename to "lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\346\226\260\357\274\211\343\200\213.md" diff --git "a/lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" "b/lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" similarity index 100% rename from "lab-02/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" rename to "lab-02-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\357\274\210\350\200\201\357\274\211\343\200\213.md" diff --git a/pom.xml b/pom.xml index 46b8b4b14..3d783b24f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,8 +11,8 @@ - lab-01-spring-security - + + lab-02-spring-security-oauth From 8defb0a34337fee575b05ef451aa82007019ab8d Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 22:09:08 +0800 Subject: [PATCH 081/115] =?UTF-8?q?Kafka=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo08Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo08Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo08Producer.java | 0 .../lab-03-kafka-demo-ack/src/main/resources/application.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo08ProducerTest.java | 0 .../lab-03-kafka-demo-batch-consume/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo02Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo02Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo02Producer.java | 0 .../src/main/resources/application.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo02ProducerTest.java | 0 {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo02Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo02Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo02Producer.java | 0 .../src/main/resources/application.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo02ProducerTest.java | 0 {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo05Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo05Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo05Producer.java | 0 .../src/main/resources/application.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo05ProducerTest.java | 0 .../lab-03-kafka-demo-concurrency/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo06Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo06Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo06Producer.java | 0 .../src/main/resources/application.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo06ProducerTest.java | 0 .../lab-03-kafka-demo-transaction/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/consumer/Demo07Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo07Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo07Producer.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/application_bak.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo07ProducerTest.java | 0 {lab-03 => lab-03-kafka}/lab-03-kafka-demo/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/Application.java | 0 .../springboot/lab03/kafkademo/config/KafkaConfiguration.java | 0 .../springboot/lab03/kafkademo/consumer/Demo01AConsumer.java | 0 .../springboot/lab03/kafkademo/consumer/Demo01Consumer.java | 0 .../springboot/lab03/kafkademo/consumer/Demo04Consumer.java | 0 .../springboot/lab03/kafkademo/message/Demo01Message.java | 0 .../springboot/lab03/kafkademo/message/Demo04Message.java | 0 .../springboot/lab03/kafkademo/producer/Demo01Producer.java | 0 .../springboot/lab03/kafkademo/producer/Demo04Producer.java | 0 .../lab-03-kafka-demo/src/main/resources/application.yaml | 0 .../lab-03-kafka-demo/src/main/resources/application_bak.yaml | 0 .../cn/iocoder/springboot/lab03/kafkademo/package-info.java | 0 .../lab03/kafkademo/producer/Demo01ProducerTest.java | 0 .../lab03/kafkademo/producer/Demo04ProducerTest.java | 0 {lab-03 => lab-03-kafka}/lab-03-kafka-native/pom.xml | 0 .../cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java | 0 .../cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java | 0 {lab-03 => lab-03-kafka}/pom.xml | 0 ...345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 71 files changed, 3 insertions(+), 3 deletions(-) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo08Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo08Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo05Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo05Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo06Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo06Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo07Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo07Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/main/resources/application_bak.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/config/KafkaConfiguration.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01AConsumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo04Consumer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo01Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo04Message.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04Producer.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/resources/application.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/main/resources/application_bak.yaml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04ProducerTest.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-native/pom.xml (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java (100%) rename {lab-03 => lab-03-kafka}/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java (100%) rename {lab-03 => lab-03-kafka}/pom.xml (100%) rename "lab-03/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" => "lab-03-kafka/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 1f2df3825..09bb6ef01 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ ## 消息队列 * [《芋道 Spring Boot 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Boot/RocketMQ/?github) 对应 [lab-31](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-31) -* [《芋道 Spring Boot 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Boot/Kafka/?github) 对应 [lab-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-03) +* [《芋道 Spring Boot 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Boot/Kafka/?github) 对应 [lab-03-kafka](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-03-kafka) * [《芋道 Spring Boot 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Boot/RabbitMQ/?github) 对应 [lab-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-04) * [《芋道 Spring Boot 消息队列 ActiveMQ 入门》](http://www.iocoder.cn/Spring-Boot/ActiveMQ/?github) 对应 [lab-32](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-32) * [《芋道 Spring Boot 事件机制 Event 入门》](http://www.iocoder.cn/Spring-Boot/Event/?github) 对应 对应 [lab-54](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-54) diff --git a/lab-03/lab-03-kafka-demo-ack/pom.xml b/lab-03-kafka/lab-03-kafka-demo-ack/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-ack/pom.xml diff --git a/lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo08Consumer.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo08Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo08Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo08Consumer.java diff --git a/lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo08Message.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo08Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo08Message.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo08Message.java diff --git a/lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08Producer.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08Producer.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08Producer.java diff --git a/lab-03/lab-03-kafka-demo-ack/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-ack/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-ack/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-ack/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo08ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/pom.xml b/lab-03-kafka/lab-03-kafka-demo-batch-consume/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/pom.xml diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo-batch/pom.xml b/lab-03-kafka/lab-03-kafka-demo-batch/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-batch/pom.xml diff --git a/lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo02Consumer.java diff --git a/lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo02Message.java diff --git a/lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02Producer.java diff --git a/lab-03/lab-03-kafka-demo-batch/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-batch/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-batch/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-batch/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo02ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/pom.xml b/lab-03-kafka/lab-03-kafka-demo-broadcast/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-broadcast/pom.xml diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo05Consumer.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo05Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo05Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo05Consumer.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo05Message.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo05Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo05Message.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo05Message.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05Producer.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05Producer.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05Producer.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-broadcast/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo05ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/pom.xml b/lab-03-kafka/lab-03-kafka-demo-concurrency/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-concurrency/pom.xml diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo06Consumer.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo06Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo06Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo06Consumer.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo06Message.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo06Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo06Message.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo06Message.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06Producer.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06Producer.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06Producer.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-concurrency/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo06ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo-transaction/pom.xml b/lab-03-kafka/lab-03-kafka-demo-transaction/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/pom.xml rename to lab-03-kafka/lab-03-kafka-demo-transaction/pom.xml diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo07Consumer.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo07Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo07Consumer.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo07Consumer.java diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo07Message.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo07Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo07Message.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo07Message.java diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07Producer.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07Producer.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07Producer.java diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo-transaction/src/main/resources/application_bak.yaml b/lab-03-kafka/lab-03-kafka-demo-transaction/src/main/resources/application_bak.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/main/resources/application_bak.yaml rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/main/resources/application_bak.yaml diff --git a/lab-03/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo-transaction/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo07ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo/pom.xml b/lab-03-kafka/lab-03-kafka-demo/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-demo/pom.xml rename to lab-03-kafka/lab-03-kafka-demo/pom.xml diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/Application.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/config/KafkaConfiguration.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/config/KafkaConfiguration.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/config/KafkaConfiguration.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/config/KafkaConfiguration.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01AConsumer.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01AConsumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01AConsumer.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01AConsumer.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01Consumer.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01Consumer.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo01Consumer.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo04Consumer.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo04Consumer.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo04Consumer.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/consumer/Demo04Consumer.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo01Message.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo01Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo01Message.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo01Message.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo04Message.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo04Message.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo04Message.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/message/Demo04Message.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01Producer.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01Producer.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01Producer.java diff --git a/lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04Producer.java b/lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04Producer.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04Producer.java rename to lab-03-kafka/lab-03-kafka-demo/src/main/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04Producer.java diff --git a/lab-03/lab-03-kafka-demo/src/main/resources/application.yaml b/lab-03-kafka/lab-03-kafka-demo/src/main/resources/application.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/resources/application.yaml rename to lab-03-kafka/lab-03-kafka-demo/src/main/resources/application.yaml diff --git a/lab-03/lab-03-kafka-demo/src/main/resources/application_bak.yaml b/lab-03-kafka/lab-03-kafka-demo/src/main/resources/application_bak.yaml similarity index 100% rename from lab-03/lab-03-kafka-demo/src/main/resources/application_bak.yaml rename to lab-03-kafka/lab-03-kafka-demo/src/main/resources/application_bak.yaml diff --git a/lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java b/lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java rename to lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/package-info.java diff --git a/lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo01ProducerTest.java diff --git a/lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04ProducerTest.java b/lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04ProducerTest.java similarity index 100% rename from lab-03/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04ProducerTest.java rename to lab-03-kafka/lab-03-kafka-demo/src/test/java/cn/iocoder/springboot/lab03/kafkademo/producer/Demo04ProducerTest.java diff --git a/lab-03/lab-03-kafka-native/pom.xml b/lab-03-kafka/lab-03-kafka-native/pom.xml similarity index 100% rename from lab-03/lab-03-kafka-native/pom.xml rename to lab-03-kafka/lab-03-kafka-native/pom.xml diff --git a/lab-03/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java b/lab-03-kafka/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java similarity index 100% rename from lab-03/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java rename to lab-03-kafka/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ConsumerMain.java diff --git a/lab-03/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java b/lab-03-kafka/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java similarity index 100% rename from lab-03/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java rename to lab-03-kafka/lab-03-kafka-native/src/main/java/cn/iocoder/springboot/lab03/kafkademo/ProducerMain.java diff --git a/lab-03/pom.xml b/lab-03-kafka/pom.xml similarity index 100% rename from lab-03/pom.xml rename to lab-03-kafka/pom.xml diff --git "a/lab-03/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" "b/lab-03-kafka/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-03/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" rename to "lab-03-kafka/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 3d783b24f..c9bd27dc3 100644 --- a/pom.xml +++ b/pom.xml @@ -12,8 +12,8 @@ - lab-02-spring-security-oauth - + + lab-03-kafka From 1af1979a854f7bcbe2f4e05c19d6d3debf749ba5 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 22:19:09 +0800 Subject: [PATCH 082/115] =?UTF-8?q?RabbitMQ=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../lab-04-rabbitmq-consume-retry/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo07Consumer.java | 0 .../lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo07Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo07Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo07ProducerTest.java | 0 {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo12Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo12Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo12Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo12ProducerTest.java | 0 .../lab-04-rabbitmq-demo-batch-consume-02/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo06Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo06Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo06Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo06ProducerTest.java | 0 .../lab-04-rabbitmq-demo-batch-consume/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo05Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo05Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo06Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo05ProducerTest.java | 0 .../lab-04-rabbitmq-demo-batch/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo05Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo05Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo05Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo05ProducerTest.java | 0 .../lab-04-rabbitmq-demo-concurrency/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo09Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo09Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo09Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo09ProducerTest.java | 0 .../lab-04-rabbitmq-demo-confirm-async/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo13Consumer.java | 0 .../rabbitmqdemo/core/RabbitProducerConfirmCallback.java | 0 .../lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo13Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo13Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo13ProducerTest.java | 0 .../lab-04-rabbitmq-demo-confirm/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo13Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo13Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo13Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo13ProducerTest.java | 0 .../lab-04-rabbitmq-demo-delay/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo08Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo08Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo08Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo08ProducerTest.java | 0 .../lab-04-rabbitmq-demo-error-handler/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo16Consumer.java | 0 .../rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java | 0 .../lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo16Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo16Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo16ProducerTest.java | 0 {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo15Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo15Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo15Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo15ProducerTest.java | 0 .../lab-04-rabbitmq-demo-message-model/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/BroadcastConsumer.java | 0 .../lab04/rabbitmqdemo/consumer/ClusteringConsumer.java | 0 .../lab04/rabbitmqdemo/message/BroadcastMessage.java | 0 .../lab04/rabbitmqdemo/message/ClusteringMessage.java | 0 .../lab04/rabbitmqdemo/producer/BroadcastProducer.java | 0 .../lab04/rabbitmqdemo/producer/ClusteringProducer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/BroadcastProducerTest.java | 0 .../lab04/rabbitmqdemo/producer/ClusteringProducerTest.java | 0 .../lab-04-rabbitmq-demo-orderly/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo10Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo10Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo10Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo10ProducerTest.java | 0 {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo14Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo14Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo14Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo14ProducerTest.java | 0 .../lab-04-rabbitmq-demo-transaction/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo11Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo11Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo11Producer.java | 0 .../src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo11ProducerTest.java | 0 {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/pom.xml | 0 .../cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java | 0 .../springboot/lab04/rabbitmqdemo/config/RabbitConfig.java | 0 .../lab04/rabbitmqdemo/consumer/Demo01Consumer.java | 0 .../lab04/rabbitmqdemo/consumer/Demo02Consumer.java | 0 .../lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java | 0 .../lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java | 0 .../lab04/rabbitmqdemo/consumer/Demo04Consumer.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo01Message.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo02Message.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo03Message.java | 0 .../springboot/lab04/rabbitmqdemo/message/Demo04Message.java | 0 .../lab04/rabbitmqdemo/producer/Demo01Producer.java | 0 .../lab04/rabbitmqdemo/producer/Demo02Producer.java | 0 .../lab04/rabbitmqdemo/producer/Demo03Producer.java | 0 .../lab04/rabbitmqdemo/producer/Demo04Producer.java | 0 .../lab-04-rabbitmq-demo/src/main/resources/application.yaml | 0 .../iocoder/springboot/lab04/rabbitmqdemo/package-info.java | 0 .../lab04/rabbitmqdemo/producer/Demo01ProducerTest.java | 0 .../lab04/rabbitmqdemo/producer/Demo02ProducerTest.java | 0 .../lab04/rabbitmqdemo/producer/Demo03ProducerTest.java | 0 .../lab04/rabbitmqdemo/producer/Demo04ProducerTest.java | 0 {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-native/pom.xml | 0 .../springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java | 0 .../springboot/lab04/rabbitmqdemo/RabbitMQProducer.java | 0 {lab-04 => lab-04-rabbitmq}/pom.xml | 0 ...\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 173 files changed, 3 insertions(+), 3 deletions(-) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo07Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo12Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo12Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo06Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo06Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo09Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo09Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerConfirmCallback.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo08Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo08Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo16Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo16Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo15Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo15Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/BroadcastConsumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/ClusteringConsumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/BroadcastMessage.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/ClusteringMessage.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo10Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo10Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo14Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo14Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo11Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo11Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo01Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo02Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo04Consumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo01Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo02Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo03Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo04Message.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04Producer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/main/resources/application.yaml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04ProducerTest.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-native/pom.xml (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java (100%) rename {lab-04 => lab-04-rabbitmq}/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQProducer.java (100%) rename {lab-04 => lab-04-rabbitmq}/pom.xml (100%) rename "lab-04/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" => "lab-04-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 09bb6ef01..8112aac6c 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ * [《芋道 Spring Boot 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Boot/RocketMQ/?github) 对应 [lab-31](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-31) * [《芋道 Spring Boot 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Boot/Kafka/?github) 对应 [lab-03-kafka](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-03-kafka) -* [《芋道 Spring Boot 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Boot/RabbitMQ/?github) 对应 [lab-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-04) +* [《芋道 Spring Boot 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Boot/RabbitMQ/?github) 对应 [lab-04-rabbitmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-04-rabbitmq) * [《芋道 Spring Boot 消息队列 ActiveMQ 入门》](http://www.iocoder.cn/Spring-Boot/ActiveMQ/?github) 对应 [lab-32](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-32) * [《芋道 Spring Boot 事件机制 Event 入门》](http://www.iocoder.cn/Spring-Boot/Event/?github) 对应 对应 [lab-54](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-54) diff --git a/lab-04/lab-04-rabbitmq-consume-retry/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/pom.xml diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07Consumer.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo07DeadConsumer.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo07Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo07Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo07Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo07Message.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07Producer.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-consume-retry/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo07ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo12Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo12Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo12Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo12Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo12Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo12Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo12Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo12Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-ack/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo12ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo06Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo06Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo06Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo06Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo06Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo06Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo06Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo06Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume-02/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo06Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch-consume/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo05Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo05Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-batch/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo05ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo09Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo09Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo09Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo09Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo09Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo09Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo09Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo09Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-concurrency/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo09ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerConfirmCallback.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerConfirmCallback.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerConfirmCallback.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerConfirmCallback.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitProducerReturnCallback.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm-async/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo13Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo13Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-confirm/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo13ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo08Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo08Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo08Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo08Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo08Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo08Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo08Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo08Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo08ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo16Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo16Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo16Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo16Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitListenerErrorHandlerImpl.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/core/RabbitLoggingErrorHandler.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo16Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo16Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo16Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo16Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-error-handler/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo16ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo15Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo15Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo15Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo15Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo15Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo15Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo15Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo15Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-json/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo15ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/BroadcastConsumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/BroadcastConsumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/BroadcastConsumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/BroadcastConsumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/ClusteringConsumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/ClusteringConsumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/ClusteringConsumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/ClusteringConsumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/BroadcastMessage.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/BroadcastMessage.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/BroadcastMessage.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/BroadcastMessage.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/ClusteringMessage.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/ClusteringMessage.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/ClusteringMessage.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/ClusteringMessage.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducer.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducer.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/BroadcastProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/ClusteringProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo10Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo10Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo10Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo10Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo10Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo10Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo10Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo10Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-orderly/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo10ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo14Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo14Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo14Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo14Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo14Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo14Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo14Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo14Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-rpc/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo14ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo11Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo11Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo11Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo11Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo11Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo11Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo11Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo11Message.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo-transaction/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo11ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/pom.xml diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/Application.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/config/RabbitConfig.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo01Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo01Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo01Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo01Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo02Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo02Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo02Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo02Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerA.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo03ConsumerB.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo04Consumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo04Consumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo04Consumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/consumer/Demo04Consumer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo01Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo01Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo01Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo01Message.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo02Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo02Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo02Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo02Message.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo03Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo03Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo03Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo03Message.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo04Message.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo04Message.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo04Message.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/message/Demo04Message.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04Producer.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04Producer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04Producer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04Producer.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/main/resources/application.yaml b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/resources/application.yaml similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/main/resources/application.yaml rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/main/resources/application.yaml diff --git a/lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/package-info.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo01ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo02ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo03ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04ProducerTest.java b/lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04ProducerTest.java similarity index 100% rename from lab-04/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04ProducerTest.java rename to lab-04-rabbitmq/lab-04-rabbitmq-demo/src/test/java/cn/iocoder/springboot/lab04/rabbitmqdemo/producer/Demo04ProducerTest.java diff --git a/lab-04/lab-04-rabbitmq-native/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-native/pom.xml similarity index 100% rename from lab-04/lab-04-rabbitmq-native/pom.xml rename to lab-04-rabbitmq/lab-04-rabbitmq-native/pom.xml diff --git a/lab-04/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java b/lab-04-rabbitmq/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQConsumer.java diff --git a/lab-04/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQProducer.java b/lab-04-rabbitmq/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQProducer.java similarity index 100% rename from lab-04/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQProducer.java rename to lab-04-rabbitmq/lab-04-rabbitmq-native/src/main/java/cn/iocoder/springboot/lab04/rabbitmqdemo/RabbitMQProducer.java diff --git a/lab-04/pom.xml b/lab-04-rabbitmq/pom.xml similarity index 100% rename from lab-04/pom.xml rename to lab-04-rabbitmq/pom.xml diff --git "a/lab-04/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" "b/lab-04-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-04/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" rename to "lab-04-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Boot \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index c9bd27dc3..bcb734bfc 100644 --- a/pom.xml +++ b/pom.xml @@ -13,8 +13,8 @@ - lab-03-kafka - + + lab-04-rabbitmq From a698bfd8383baf4c43a2d7079d7c7b9d5f8d769c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 27 Jun 2020 22:30:05 +0800 Subject: [PATCH 083/115] =?UTF-8?q?Spring=20Data=20Redis=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml | 2 +- lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml | 2 +- .../lab-07-spring-data-redis-with-jedis/pom.xml | 0 .../labs/lab10/springdatarediswithjedis/Application.java | 0 .../cacheobject/ProductCacheObject.java | 0 .../springdatarediswithjedis/cacheobject/UserCacheObject.java | 0 .../springdatarediswithjedis/config/RedisConfiguration.java | 0 .../labs/lab10/springdatarediswithjedis/dao/package-info.java | 0 .../springdatarediswithjedis/dao/redis/UserCacheDao.java | 0 .../listener/TestChannelTopicMessageListener.java | 0 .../listener/TestPatternTopicMessageListener.java | 0 .../lab10/springdatarediswithjedis/service/UserService01.java | 0 .../lab10/springdatarediswithjedis/service/UserService02.java | 0 .../labs/lab10/springdatarediswithjedis/util/JSONUtil.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/lua/compareAndSet.lua | 0 .../src/main/resources/lua/compareAndSet2.lua | 0 .../src/main/resources/lua/test.lua | 0 .../labs/lab10/springdatarediswithjedis/PipelineTest.java | 0 .../labs/lab10/springdatarediswithjedis/PubSubTest.java | 0 .../labs/lab10/springdatarediswithjedis/ScriptTest.java | 0 .../labs/lab10/springdatarediswithjedis/SessionTest.java | 0 .../labs/lab10/springdatarediswithjedis/Test01.java | 0 .../labs/lab10/springdatarediswithjedis/TransactionTest.java | 0 .../lab10/springdatarediswithjedis/UserService02Test.java | 0 .../labs/lab10/springdatarediswithjedis/package-info.java | 0 .../lab-07-spring-data-redis-with-redisson/pom.xml | 0 .../labs/lab10/springdatarediswithjedis/Application.java | 0 .../cacheobject/ProductCacheObject.java | 0 .../springdatarediswithjedis/cacheobject/UserCacheObject.java | 0 .../springdatarediswithjedis/config/RedisConfiguration.java | 0 .../labs/lab10/springdatarediswithjedis/dao/package-info.java | 0 .../springdatarediswithjedis/dao/redis/UserCacheDao.java | 0 .../listener/TestChannelTopicMessageListener.java | 0 .../listener/TestPatternTopicMessageListener.java | 0 .../lab10/springdatarediswithjedis/service/UserService01.java | 0 .../lab10/springdatarediswithjedis/service/UserService02.java | 0 .../labs/lab10/springdatarediswithjedis/util/JSONUtil.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/lua/compareAndSet.lua | 0 .../src/main/resources/lua/compareAndSet2.lua | 0 .../src/main/resources/lua/test.lua | 0 .../src/main/resources/redisson.yml | 0 .../labs/lab10/springdatarediswithjedis/LockTest.java | 0 .../labs/lab10/springdatarediswithjedis/PipelineTest.java | 0 .../labs/lab10/springdatarediswithjedis/PubSubTest.java | 0 .../labs/lab10/springdatarediswithjedis/RateLimiterTest.java | 0 .../labs/lab10/springdatarediswithjedis/ScriptTest.java | 0 .../labs/lab10/springdatarediswithjedis/SessionTest.java | 0 .../labs/lab10/springdatarediswithjedis/Test01.java | 0 .../labs/lab10/springdatarediswithjedis/TransactionTest.java | 0 .../lab10/springdatarediswithjedis/UserService02Test.java | 0 .../labs/lab10/springdatarediswithjedis/package-info.java | 0 {lab-11 => lab-11-spring-data-redis}/pom.xml | 0 ...Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 57 files changed, 5 insertions(+), 5 deletions(-) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/pom.xml (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/resources/application.yml (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet2.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/test.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/pom.xml (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/resources/application.yml (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet2.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/test.lua (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/main/resources/redisson.yml (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/LockTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/RateLimiterTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java (100%) rename {lab-11 => lab-11-spring-data-redis}/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java (100%) rename {lab-11 => lab-11-spring-data-redis}/pom.xml (100%) rename "lab-11/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" => "lab-11-spring-data-redis/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 8112aac6c..b700086f9 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ **非关系数据库** -* [《芋道 Spring Boot Redis 入门》](http://www.iocoder.cn/Spring-Boot/Redis/?github) 对应 [lab-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-11) +* [《芋道 Spring Boot Redis 入门》](http://www.iocoder.cn/Spring-Boot/Redis/?github) 对应 [lab-11-spring-data-redis](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-11-spring-data-redis) * [《芋道 Spring Boot 缓存 Cache 入门》](http://www.iocoder.cn/Spring-Boot/Cache/?github) 对应 [lab-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-21) * [《芋道 Spring Boot MongoDB 入门》](http://www.iocoder.cn/Spring-Boot/MongoDB/?github) 对应 [lab-16](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-16) * [《芋道 Spring Boot Elasticsearch 入门》](http://www.iocoder.cn/Spring-Boot/Elasticsearch/?github) 对应 [lab-15](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-15) diff --git a/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml index 714601d56..6c21215a9 100644 --- a/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml +++ b/lab-04-rabbitmq/lab-04-rabbitmq-demo-delay/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - lab-04-rabbitmq-demo-dely + lab-04-rabbitmq-demo-delay diff --git a/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml index 2a5370a28..945fa9462 100644 --- a/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml +++ b/lab-04-rabbitmq/lab-04-rabbitmq-demo-message-model/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - lab-04-rabbitmq-demo-message-consume + lab-04-rabbitmq-demo-message-model diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/pom.xml b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/pom.xml similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/pom.xml rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/pom.xml diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/application.yml b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/application.yml similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/application.yml rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/application.yml diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet.lua diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet2.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet2.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet2.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/compareAndSet2.lua diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/test.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/test.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/test.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/main/resources/lua/test.lua diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java diff --git a/lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-jedis/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/pom.xml b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/pom.xml similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/pom.xml rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/pom.xml diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/ProductCacheObject.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/cacheobject/UserCacheObject.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/package-info.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/dao/redis/UserCacheDao.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestChannelTopicMessageListener.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/listener/TestPatternTopicMessageListener.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService01.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/service/UserService02.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/application.yml b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/application.yml similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/application.yml rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/application.yml diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet.lua diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet2.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet2.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet2.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/compareAndSet2.lua diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/test.lua b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/test.lua similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/test.lua rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/lua/test.lua diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/redisson.yml b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/redisson.yml similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/main/resources/redisson.yml rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/main/resources/redisson.yml diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/LockTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/LockTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/LockTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/LockTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PipelineTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/PubSubTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/RateLimiterTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/RateLimiterTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/RateLimiterTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/RateLimiterTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/ScriptTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/SessionTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/TransactionTest.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/UserService02Test.java diff --git a/lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java similarity index 100% rename from lab-11/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java rename to lab-11-spring-data-redis/lab-07-spring-data-redis-with-redisson/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/package-info.java diff --git a/lab-11/pom.xml b/lab-11-spring-data-redis/pom.xml similarity index 100% rename from lab-11/pom.xml rename to lab-11-spring-data-redis/pom.xml diff --git "a/lab-11/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" "b/lab-11-spring-data-redis/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-11/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" rename to "lab-11-spring-data-redis/\343\200\212\350\212\213\351\201\223 Spring Boot Redis \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index bcb734bfc..39ea5dcfb 100644 --- a/pom.xml +++ b/pom.xml @@ -14,14 +14,14 @@ - lab-04-rabbitmq + - + lab-11-spring-data-redis From a446d2a0f54c432122359cbf609adf99a1673b0c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 06:41:54 +0800 Subject: [PATCH 084/115] =?UTF-8?q?MyBatis=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/pom.xml | 0 .../java/cn/iocoder/springboot/lab12/mybatis/Application.java | 0 .../iocoder/springboot/lab12/mybatis/dataobject/UserDO.java | 0 .../iocoder/springboot/lab12/mybatis/mapper/UserMapper.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/mapper/UserMapper.xml | 0 .../src/main/resources/mybatis-config.xml | 0 .../src/main/resources/sql/users.sql | 0 .../springboot/lab12/mybatis/mapper/UserMapperTest.java | 0 {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/pom.xml | 0 .../java/cn/iocoder/springboot/lab12/mybatis/Application.java | 0 .../iocoder/springboot/lab12/mybatis/dataobject/UserDO.java | 0 .../iocoder/springboot/lab12/mybatis/mapper/UserMapper.java | 0 .../lab-12-mybatis-plus/src/main/resources/application.yaml | 0 .../src/main/resources/mapper/UserMapper.xml | 0 .../lab-12-mybatis-plus/src/main/resources/sql/users.sql | 0 .../springboot/lab12/mybatis/mapper/UserMapperTest.java | 0 {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/pom.xml | 0 .../java/cn/iocoder/springboot/lab12/mybatis/Application.java | 0 .../iocoder/springboot/lab12/mybatis/dataobject/UserDO.java | 0 .../iocoder/springboot/lab12/mybatis/mapper/UserMapper.java | 0 .../cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java | 0 .../lab-12-mybatis-tk/src/main/resources/application.yaml | 0 .../src/main/resources/mapper/UserMapper.xml | 0 .../lab-12-mybatis-tk/src/main/resources/mybatis-config.xml | 0 .../lab-12-mybatis-tk/src/main/resources/sql/users.sql | 0 .../springboot/lab12/mybatis/mapper/UserMapperTest.java | 0 {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/pom.xml | 0 .../java/cn/iocoder/springboot/lab12/mybatis/Application.java | 0 .../iocoder/springboot/lab12/mybatis/dataobject/UserDO.java | 0 .../iocoder/springboot/lab12/mybatis/mapper/UserMapper.java | 0 .../lab-12-mybatis-xml/src/main/resources/application.yaml | 0 .../src/main/resources/mapper/UserMapper.xml | 0 .../lab-12-mybatis-xml/src/main/resources/mybatis-config.xml | 0 .../lab-12-mybatis-xml/src/main/resources/sql/users.sql | 0 .../springboot/lab12/mybatis/mapper/UserMapperTest.java | 0 {lab-12 => lab-12-mybatis}/pom.xml | 2 +- ...ring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 39 files changed, 3 insertions(+), 3 deletions(-) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/pom.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/resources/application.yaml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/main/resources/sql/users.sql (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/pom.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/resources/application.yaml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/main/resources/sql/users.sql (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/pom.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/resources/application.yaml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/main/resources/sql/users.sql (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/pom.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/resources/application.yaml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/main/resources/sql/users.sql (100%) rename {lab-12 => lab-12-mybatis}/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java (100%) rename {lab-12 => lab-12-mybatis}/pom.xml (94%) rename "lab-12/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" => "lab-12-mybatis/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/lab-12/lab-12-mybatis-annotation/pom.xml b/lab-12-mybatis/lab-12-mybatis-annotation/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/pom.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/pom.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-annotation/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-annotation/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-annotation/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-plus/pom.xml b/lab-12-mybatis/lab-12-mybatis-plus/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-plus/pom.xml rename to lab-12-mybatis/lab-12-mybatis-plus/pom.xml diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-plus/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-plus/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-plus/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-tk/pom.xml b/lab-12-mybatis/lab-12-mybatis-tk/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/pom.xml rename to lab-12-mybatis/lab-12-mybatis-tk/pom.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java b/lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/java/cn/iocoder/springboot/lab12/mybatis/util/BaseMapper.java diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-tk/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-tk/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-tk/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/lab-12-mybatis-xml/pom.xml b/lab-12-mybatis/lab-12-mybatis-xml/pom.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/pom.xml rename to lab-12-mybatis/lab-12-mybatis-xml/pom.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/Application.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/dataobject/UserDO.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java b/lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapper.java diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/application.yaml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/application.yaml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/application.yaml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/application.yaml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mapper/UserMapper.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/mybatis-config.xml diff --git a/lab-12/lab-12-mybatis-xml/src/main/resources/sql/users.sql b/lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/sql/users.sql similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/main/resources/sql/users.sql rename to lab-12-mybatis/lab-12-mybatis-xml/src/main/resources/sql/users.sql diff --git a/lab-12/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java b/lab-12-mybatis/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java similarity index 100% rename from lab-12/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java rename to lab-12-mybatis/lab-12-mybatis-xml/src/test/java/cn/iocoder/springboot/lab12/mybatis/mapper/UserMapperTest.java diff --git a/lab-12/pom.xml b/lab-12-mybatis/pom.xml similarity index 94% rename from lab-12/pom.xml rename to lab-12-mybatis/pom.xml index 382fb2ff7..abc9330d2 100644 --- a/lab-12/pom.xml +++ b/lab-12-mybatis/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-12 + lab-12-mybatis pom lab-12-mybatis-xml diff --git "a/lab-12/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" "b/lab-12-mybatis/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-12/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" rename to "lab-12-mybatis/\343\200\212\350\212\213\351\201\223 Spring Boot MyBatis \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 39ea5dcfb..306d6a4f2 100644 --- a/pom.xml +++ b/pom.xml @@ -21,8 +21,8 @@ - lab-11-spring-data-redis - + + lab-12-mybatis From 1f46d8ed2a7385373d9db686263df9fc28d5b20c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 06:48:28 +0800 Subject: [PATCH 085/115] =?UTF-8?q?Spring=20Data=20JPA=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/pom.xml | 0 .../java/cn/iocoder/springboot/lab13/jpa/Application.java | 0 .../cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java | 0 .../springboot/lab13/jpa/repository/UserRepository01.java | 0 .../springboot/lab13/jpa/repository/UserRepository02.java | 0 .../springboot/lab13/jpa/repository/UserRepository03.java | 0 .../springboot/lab13/jpa/repository/UserRepository04.java | 0 .../lab-13-jpa/src/main/resources/application.yaml | 0 .../springboot/lab13/jpa/repository/UserRepository01Test.java | 0 .../springboot/lab13/jpa/repository/UserRepository02Test.java | 0 .../springboot/lab13/jpa/repository/UserRepository03Test.java | 0 .../springboot/lab13/jpa/repository/UserRepository04Test.java | 0 {lab-13 => lab-13-spring-data-jpa}/pom.xml | 0 ...3 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 16 files changed, 3 insertions(+), 3 deletions(-) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/pom.xml (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/Application.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/main/resources/application.yaml (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01Test.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02Test.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03Test.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04Test.java (100%) rename {lab-13 => lab-13-spring-data-jpa}/pom.xml (100%) rename "lab-13/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" => "lab-13-spring-data-jpa/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index b700086f9..89dcba49a 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ **关系数据库** * [《芋道 Spring Boot 数据库连接池入门》](http://www.iocoder.cn/Spring-Boot/datasource-pool/?github) 对应 [lab-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-19) -* [《芋道 Spring Boot MyBatis 入门》](http://www.iocoder.cn/Spring-Boot/MyBatis/?github) 对应 [lab-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-12) +* [《芋道 Spring Boot MyBatis 入门》](http://www.iocoder.cn/Spring-Boot/MyBatis/?github) 对应 [lab-12-mybatis](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-12-mybatis) * [《芋道 Spring Boot JPA 入门》](http://www.iocoder.cn/Spring-Boot/JPA/?github) 对应 [lab-13](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-13) * [《芋道 Spring Boot JdbcTemplate 入门》](http://www.iocoder.cn/Spring-Boot/JdbcTemplate/?github) 对应 [lab-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-14) * [《芋道 Spring Boot 多数据源（读写分离）入门》](http://www.iocoder.cn/Spring-Boot/dynamic-datasource/?github) 对应 [lab-17](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-17) diff --git a/lab-13/lab-13-jpa/pom.xml b/lab-13-spring-data-jpa/lab-13-jpa/pom.xml similarity index 100% rename from lab-13/lab-13-jpa/pom.xml rename to lab-13-spring-data-jpa/lab-13-jpa/pom.xml diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/Application.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/Application.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/Application.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/Application.java diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/dataobject/UserDO.java diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01.java diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02.java diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03.java diff --git a/lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04.java b/lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04.java similarity index 100% rename from lab-13/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04.java diff --git a/lab-13/lab-13-jpa/src/main/resources/application.yaml b/lab-13-spring-data-jpa/lab-13-jpa/src/main/resources/application.yaml similarity index 100% rename from lab-13/lab-13-jpa/src/main/resources/application.yaml rename to lab-13-spring-data-jpa/lab-13-jpa/src/main/resources/application.yaml diff --git a/lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01Test.java b/lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01Test.java similarity index 100% rename from lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01Test.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository01Test.java diff --git a/lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02Test.java b/lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02Test.java similarity index 100% rename from lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02Test.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository02Test.java diff --git a/lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03Test.java b/lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03Test.java similarity index 100% rename from lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03Test.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository03Test.java diff --git a/lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04Test.java b/lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04Test.java similarity index 100% rename from lab-13/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04Test.java rename to lab-13-spring-data-jpa/lab-13-jpa/src/test/java/cn/iocoder/springboot/lab13/jpa/repository/UserRepository04Test.java diff --git a/lab-13/pom.xml b/lab-13-spring-data-jpa/pom.xml similarity index 100% rename from lab-13/pom.xml rename to lab-13-spring-data-jpa/pom.xml diff --git "a/lab-13/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" "b/lab-13-spring-data-jpa/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-13/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" rename to "lab-13-spring-data-jpa/\343\200\212\350\212\213\351\201\223 Spring Boot JPA \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 306d6a4f2..988ade9be 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ - lab-12-mybatis - + + lab-13-spring-data-jpa From abc43e5508e6777796d3f48cd07191de06cc94d4 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 06:58:52 +0800 Subject: [PATCH 086/115] =?UTF-8?q?Spring=20JdbcTemplate=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- lab-01-spring-security/pom.xml | 2 +- lab-02-spring-security-oauth/pom.xml | 4 ++-- lab-03-kafka/pom.xml | 2 +- lab-04-rabbitmq/pom.xml | 2 +- lab-11-spring-data-redis/pom.xml | 2 +- lab-13-spring-data-jpa/pom.xml | 2 +- .../lab-14-jdbctemplate/pom.xml | 0 .../cn/iocoder/springboot/lab14/jdbctemplate/Application.java | 0 .../cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java | 0 .../springboot/lab14/jdbctemplate/dataobject/UserDO.java | 0 .../lab-14-jdbctemplate/src/main/resources/application.yaml | 0 .../springboot/lab14/jdbctemplate/dao/UserDaoTest.java | 0 {lab-14 => lab-14-spring-jdbc-template}/pom.xml | 2 +- ...Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 16 files changed, 11 insertions(+), 11 deletions(-) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/pom.xml (100%) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/Application.java (100%) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java (100%) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dataobject/UserDO.java (100%) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/src/main/resources/application.yaml (100%) rename {lab-14 => lab-14-spring-jdbc-template}/lab-14-jdbctemplate/src/test/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDaoTest.java (100%) rename {lab-14 => lab-14-spring-jdbc-template}/pom.xml (91%) rename "lab-14/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" => "lab-14-spring-jdbc-template/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 89dcba49a..7ed931b7e 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ * [《芋道 Spring Boot 数据库连接池入门》](http://www.iocoder.cn/Spring-Boot/datasource-pool/?github) 对应 [lab-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-19) * [《芋道 Spring Boot MyBatis 入门》](http://www.iocoder.cn/Spring-Boot/MyBatis/?github) 对应 [lab-12-mybatis](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-12-mybatis) -* [《芋道 Spring Boot JPA 入门》](http://www.iocoder.cn/Spring-Boot/JPA/?github) 对应 [lab-13](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-13) +* [《芋道 Spring Boot JPA 入门》](http://www.iocoder.cn/Spring-Boot/JPA/?github) 对应 [lab-13-spring-data-jpa](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-13-spring-data-jpa) * [《芋道 Spring Boot JdbcTemplate 入门》](http://www.iocoder.cn/Spring-Boot/JdbcTemplate/?github) 对应 [lab-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-14) * [《芋道 Spring Boot 多数据源（读写分离）入门》](http://www.iocoder.cn/Spring-Boot/dynamic-datasource/?github) 对应 [lab-17](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-17) * [《芋道 Spring Boot 分库分表入门》](http://www.iocoder.cn/Spring-Boot/sharding-datasource/?github) 对应 [lab-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-18) diff --git a/lab-01-spring-security/pom.xml b/lab-01-spring-security/pom.xml index a0ff71ac5..caa7e54d0 100644 --- a/lab-01-spring-security/pom.xml +++ b/lab-01-spring-security/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-01 + lab-02-spring-security pom lab-01-springsecurity-demo diff --git a/lab-02-spring-security-oauth/pom.xml b/lab-02-spring-security-oauth/pom.xml index 9912c2c9c..2f2dacd58 100644 --- a/lab-02-spring-security-oauth/pom.xml +++ b/lab-02-spring-security-oauth/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-02 + lab-02-spring-security-oauth pom authorization-code-server @@ -22,4 +22,4 @@ - \ No newline at end of file + diff --git a/lab-03-kafka/pom.xml b/lab-03-kafka/pom.xml index d32bb1f43..92f5e4e2a 100644 --- a/lab-03-kafka/pom.xml +++ b/lab-03-kafka/pom.xml @@ -10,7 +10,7 @@ 4.0.0 - lab-03 + lab-03-kafka pom lab-03-kafka-native diff --git a/lab-04-rabbitmq/pom.xml b/lab-04-rabbitmq/pom.xml index a5547e765..ed9cf40a3 100644 --- a/lab-04-rabbitmq/pom.xml +++ b/lab-04-rabbitmq/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-04 + lab-04-rabbitmq pom lab-04-rabbitmq-native diff --git a/lab-11-spring-data-redis/pom.xml b/lab-11-spring-data-redis/pom.xml index 987223ac9..7c6441236 100644 --- a/lab-11-spring-data-redis/pom.xml +++ b/lab-11-spring-data-redis/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-11 + lab-11-spring-data-redis pom lab-07-spring-data-redis-with-jedis diff --git a/lab-13-spring-data-jpa/pom.xml b/lab-13-spring-data-jpa/pom.xml index 71c684257..736ef33c8 100644 --- a/lab-13-spring-data-jpa/pom.xml +++ b/lab-13-spring-data-jpa/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-13 + lab-13-spring-data-jpa pom lab-13-jpa diff --git a/lab-14/lab-14-jdbctemplate/pom.xml b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/pom.xml similarity index 100% rename from lab-14/lab-14-jdbctemplate/pom.xml rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/pom.xml diff --git a/lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/Application.java b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/Application.java similarity index 100% rename from lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/Application.java rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/Application.java diff --git a/lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java similarity index 100% rename from lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDao.java diff --git a/lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dataobject/UserDO.java b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dataobject/UserDO.java similarity index 100% rename from lab-14/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dataobject/UserDO.java rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/java/cn/iocoder/springboot/lab14/jdbctemplate/dataobject/UserDO.java diff --git a/lab-14/lab-14-jdbctemplate/src/main/resources/application.yaml b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/resources/application.yaml similarity index 100% rename from lab-14/lab-14-jdbctemplate/src/main/resources/application.yaml rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/main/resources/application.yaml diff --git a/lab-14/lab-14-jdbctemplate/src/test/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDaoTest.java b/lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/test/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDaoTest.java similarity index 100% rename from lab-14/lab-14-jdbctemplate/src/test/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDaoTest.java rename to lab-14-spring-jdbc-template/lab-14-jdbctemplate/src/test/java/cn/iocoder/springboot/lab14/jdbctemplate/dao/UserDaoTest.java diff --git a/lab-14/pom.xml b/lab-14-spring-jdbc-template/pom.xml similarity index 91% rename from lab-14/pom.xml rename to lab-14-spring-jdbc-template/pom.xml index 7c40a7318..77034062c 100644 --- a/lab-14/pom.xml +++ b/lab-14-spring-jdbc-template/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-14 + lab-14-spring-jdbc-template pom lab-14-jdbctemplate diff --git "a/lab-14/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" "b/lab-14-spring-jdbc-template/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-14/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" rename to "lab-14-spring-jdbc-template/\343\200\212\350\212\213\351\201\223 Spring Boot JdbcTemplate \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 988ade9be..3ec495919 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ - lab-13-spring-data-jpa - + + lab-14-spring-jdbc-template From 5b320bb24d12361d2156a5e0a79d1abdc41accb0 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:06:17 +0800 Subject: [PATCH 087/115] =?UTF-8?q?Spring=20Data=20Elasticsearch=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../lab-15-spring-data-elasticsearch/pom.xml | 0 .../springboot/lab15/springdataelasticsearch/Application.java | 0 .../lab15/springdataelasticsearch/bo/ProductConditionBO.java | 0 .../lab15/springdataelasticsearch/constant/FieldAnalyzer.java | 0 .../lab15/springdataelasticsearch/dataobject/ESProductDO.java | 0 .../springdataelasticsearch/repository/ProductRepository.java | 0 .../src/main/resources/application.yaml | 0 .../repository/ProductRepository04Test.java | 0 .../repository/ProductRepositoryTest.java | 0 .../lab-15-spring-data-jest/pom.xml | 0 .../iocoder/springboot/lab15/springdatajest/Application.java | 0 .../lab15/springdatajest/constant/FieldAnalyzer.java | 0 .../lab15/springdatajest/dataobject/ESProductDO.java | 0 .../lab15/springdatajest/repository/ProductRepository.java | 0 .../lab15/springdatajest/repository/ProductRepository02.java | 0 .../lab15/springdatajest/repository/ProductRepository03.java | 0 .../src/main/resources/application.yaml | 0 .../springdatajest/repository/ProductRepository02Test.java | 0 .../springdatajest/repository/ProductRepository03Test.java | 0 .../springdatajest/repository/ProductRepositoryTest.java | 0 {lab-15 => lab-15-spring-data-es}/pom.xml | 2 +- ...oot Elasticsearch \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 24 files changed, 4 insertions(+), 4 deletions(-) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/pom.xml (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/Application.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/bo/ProductConditionBO.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/constant/FieldAnalyzer.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/dataobject/ESProductDO.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/main/resources/application.yaml (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository04Test.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepositoryTest.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/pom.xml (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/Application.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/constant/FieldAnalyzer.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/dataobject/ESProductDO.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/main/resources/application.yaml (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02Test.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03Test.java (100%) rename {lab-15 => lab-15-spring-data-es}/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepositoryTest.java (100%) rename {lab-15 => lab-15-spring-data-es}/pom.xml (92%) rename "lab-15/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" => "lab-15-spring-data-es/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 7ed931b7e..09e91ec77 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ * [《芋道 Spring Boot 数据库连接池入门》](http://www.iocoder.cn/Spring-Boot/datasource-pool/?github) 对应 [lab-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-19) * [《芋道 Spring Boot MyBatis 入门》](http://www.iocoder.cn/Spring-Boot/MyBatis/?github) 对应 [lab-12-mybatis](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-12-mybatis) * [《芋道 Spring Boot JPA 入门》](http://www.iocoder.cn/Spring-Boot/JPA/?github) 对应 [lab-13-spring-data-jpa](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-13-spring-data-jpa) -* [《芋道 Spring Boot JdbcTemplate 入门》](http://www.iocoder.cn/Spring-Boot/JdbcTemplate/?github) 对应 [lab-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-14) +* [《芋道 Spring Boot JdbcTemplate 入门》](http://www.iocoder.cn/Spring-Boot/JdbcTemplate/?github) 对应 [lab-14-spring-jdbc-template](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-14-spring-jdbc-template) * [《芋道 Spring Boot 多数据源（读写分离）入门》](http://www.iocoder.cn/Spring-Boot/dynamic-datasource/?github) 对应 [lab-17](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-17) * [《芋道 Spring Boot 分库分表入门》](http://www.iocoder.cn/Spring-Boot/sharding-datasource/?github) 对应 [lab-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-18) * [《芋道 Spring Boot 数据库版本管理入门》](http://www.iocoder.cn/Spring-Boot/database-version-control/?github) 对应 [lab-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-20) diff --git a/lab-15/lab-15-spring-data-elasticsearch/pom.xml b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/pom.xml similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/pom.xml rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/pom.xml diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/Application.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/Application.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/Application.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/Application.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/bo/ProductConditionBO.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/bo/ProductConditionBO.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/bo/ProductConditionBO.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/bo/ProductConditionBO.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/constant/FieldAnalyzer.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/constant/FieldAnalyzer.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/constant/FieldAnalyzer.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/constant/FieldAnalyzer.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/dataobject/ESProductDO.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/dataobject/ESProductDO.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/dataobject/ESProductDO.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/dataobject/ESProductDO.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/main/resources/application.yaml b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/resources/application.yaml similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/main/resources/application.yaml rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/main/resources/application.yaml diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository04Test.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository04Test.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository04Test.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepository04Test.java diff --git a/lab-15/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepositoryTest.java b/lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepositoryTest.java similarity index 100% rename from lab-15/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepositoryTest.java rename to lab-15-spring-data-es/lab-15-spring-data-elasticsearch/src/test/java/cn/iocoder/springboot/lab15/springdataelasticsearch/repository/ProductRepositoryTest.java diff --git a/lab-15/lab-15-spring-data-jest/pom.xml b/lab-15-spring-data-es/lab-15-spring-data-jest/pom.xml similarity index 100% rename from lab-15/lab-15-spring-data-jest/pom.xml rename to lab-15-spring-data-es/lab-15-spring-data-jest/pom.xml diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/Application.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/Application.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/Application.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/Application.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/constant/FieldAnalyzer.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/constant/FieldAnalyzer.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/constant/FieldAnalyzer.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/constant/FieldAnalyzer.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/dataobject/ESProductDO.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/dataobject/ESProductDO.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/dataobject/ESProductDO.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/dataobject/ESProductDO.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03.java diff --git a/lab-15/lab-15-spring-data-jest/src/main/resources/application.yaml b/lab-15-spring-data-es/lab-15-spring-data-jest/src/main/resources/application.yaml similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/main/resources/application.yaml rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/main/resources/application.yaml diff --git a/lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02Test.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02Test.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02Test.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository02Test.java diff --git a/lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03Test.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03Test.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03Test.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepository03Test.java diff --git a/lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepositoryTest.java b/lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepositoryTest.java similarity index 100% rename from lab-15/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepositoryTest.java rename to lab-15-spring-data-es/lab-15-spring-data-jest/src/test/java/cn/iocoder/springboot/lab15/springdatajest/repository/ProductRepositoryTest.java diff --git a/lab-15/pom.xml b/lab-15-spring-data-es/pom.xml similarity index 92% rename from lab-15/pom.xml rename to lab-15-spring-data-es/pom.xml index 948c48e68..9fc642f9c 100644 --- a/lab-15/pom.xml +++ b/lab-15-spring-data-es/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-15 + lab-15-spring-data-es pom lab-15-spring-data-jest diff --git "a/lab-15/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" "b/lab-15-spring-data-es/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-15/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" rename to "lab-15-spring-data-es/\343\200\212\350\212\213\351\201\223 Spring Boot Elasticsearch \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 3ec495919..e72b30c64 100644 --- a/pom.xml +++ b/pom.xml @@ -24,8 +24,8 @@ - lab-14-spring-jdbc-template - + + lab-15-spring-data-es From 7cfd68bdb2809509c62bcb775dba753218f007d8 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:12:22 +0800 Subject: [PATCH 088/115] =?UTF-8?q?Spring=20Data=20MongoDB=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../lab-16-spring-data-mongodb/pom.xml | 0 .../springboot/lab16/springdatamongodb/Application.java | 0 .../lab16/springdatamongodb/config/MongoDBConfig.java | 0 .../springboot/lab16/springdatamongodb/dao/UserDao.java | 0 .../lab16/springdatamongodb/dataobject/ProductDO.java | 0 .../springboot/lab16/springdatamongodb/dataobject/UserDO.java | 0 .../springboot/lab16/springdatamongodb/mongo/IncIdEntity.java | 0 .../springdatamongodb/mongo/MongoInsertEventListener.java | 0 .../lab16/springdatamongodb/repository/ProductRepository.java | 0 .../lab16/springdatamongodb/repository/UserRepository.java | 0 .../lab16/springdatamongodb/repository/UserRepository02.java | 0 .../lab16/springdatamongodb/repository/UserRepository03.java | 0 .../src/main/resources/application.yaml | 0 .../springboot/lab16/springdatamongodb/dao/UserDaoTest.java | 0 .../springdatamongodb/repository/ProductRepositoryTest.java | 0 .../springdatamongodb/repository/UserRepository02Test.java | 0 .../springdatamongodb/repository/UserRepository03Test.java | 0 .../springdatamongodb/repository/UserRepositoryTest.java | 0 {lab-16 => lab-16-spring-data-mongo}/pom.xml | 2 +- ...ring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 22 files changed, 5 insertions(+), 5 deletions(-) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/pom.xml (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/Application.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/config/MongoDBConfig.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDao.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/ProductDO.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/UserDO.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/IncIdEntity.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/MongoInsertEventListener.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepository.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/main/resources/application.yaml (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDaoTest.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepositoryTest.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02Test.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03Test.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepositoryTest.java (100%) rename {lab-16 => lab-16-spring-data-mongo}/pom.xml (91%) rename "lab-16/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" => "lab-16-spring-data-mongo/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 09e91ec77..2153ce41b 100644 --- a/README.md +++ b/README.md @@ -80,8 +80,8 @@ * [《芋道 Spring Boot Redis 入门》](http://www.iocoder.cn/Spring-Boot/Redis/?github) 对应 [lab-11-spring-data-redis](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-11-spring-data-redis) * [《芋道 Spring Boot 缓存 Cache 入门》](http://www.iocoder.cn/Spring-Boot/Cache/?github) 对应 [lab-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-21) -* [《芋道 Spring Boot MongoDB 入门》](http://www.iocoder.cn/Spring-Boot/MongoDB/?github) 对应 [lab-16](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-16) -* [《芋道 Spring Boot Elasticsearch 入门》](http://www.iocoder.cn/Spring-Boot/Elasticsearch/?github) 对应 [lab-15](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-15) +* [《芋道 Spring Boot MongoDB 入门》](http://www.iocoder.cn/Spring-Boot/MongoDB/?github) 对应 [lab-16-spring-data-mongo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-16-spring-data-mongo) +* [《芋道 Spring Boot Elasticsearch 入门》](http://www.iocoder.cn/Spring-Boot/Elasticsearch/?github) 对应 [lab-15-spring-data-es](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-15-spring-data-es) * [《芋道 Spring Boot Solr 入门》](http://www.iocoder.cn/Spring-Boot/Solr/?github) 对应 [lab-66](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-66) ## 事务管理 diff --git a/lab-16/lab-16-spring-data-mongodb/pom.xml b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/pom.xml similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/pom.xml rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/pom.xml diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/Application.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/Application.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/Application.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/Application.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/config/MongoDBConfig.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/config/MongoDBConfig.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/config/MongoDBConfig.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/config/MongoDBConfig.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDao.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDao.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDao.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDao.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/ProductDO.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/ProductDO.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/ProductDO.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/ProductDO.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/UserDO.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/UserDO.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/UserDO.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/dataobject/UserDO.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/IncIdEntity.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/IncIdEntity.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/IncIdEntity.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/IncIdEntity.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/MongoInsertEventListener.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/MongoInsertEventListener.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/MongoInsertEventListener.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/mongo/MongoInsertEventListener.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepository.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepository.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepository.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepository.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/main/resources/application.yaml b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/resources/application.yaml similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/main/resources/application.yaml rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/main/resources/application.yaml diff --git a/lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDaoTest.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDaoTest.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDaoTest.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/dao/UserDaoTest.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepositoryTest.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepositoryTest.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepositoryTest.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/ProductRepositoryTest.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02Test.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02Test.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02Test.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository02Test.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03Test.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03Test.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03Test.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepository03Test.java diff --git a/lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepositoryTest.java b/lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepositoryTest.java similarity index 100% rename from lab-16/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepositoryTest.java rename to lab-16-spring-data-mongo/lab-16-spring-data-mongodb/src/test/java/cn/iocoder/springboot/lab16/springdatamongodb/repository/UserRepositoryTest.java diff --git a/lab-16/pom.xml b/lab-16-spring-data-mongo/pom.xml similarity index 91% rename from lab-16/pom.xml rename to lab-16-spring-data-mongo/pom.xml index e71c765f9..e9fda16e8 100644 --- a/lab-16/pom.xml +++ b/lab-16-spring-data-mongo/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-16 + lab-16-spring-data-mongo pom lab-16-spring-data-mongodb diff --git "a/lab-16/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" "b/lab-16-spring-data-mongo/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-16/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" rename to "lab-16-spring-data-mongo/\343\200\212\350\212\213\351\201\223 Spring Boot MongoDB \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index e72b30c64..7193a9427 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,8 @@ - lab-15-spring-data-es - + + lab-16-spring-data-mongo From 4df966fec9858903ff1e3a3a4d77ec483a797fe5 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:24:38 +0800 Subject: [PATCH 089/115] =?UTF-8?q?Spring=20Cloud=20gRPC=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml | 0 .../cn/iocoder/springcloud/labx30/demo/DemoApplication.java | 0 .../springcloud/labx30/demo/controller/DemoController.java | 0 .../src/main/resources/application.yml | 0 .../labx-30-grpc-cloud-user-service-api/pom.xml | 0 .../src/main/proto/UserService.proto | 0 .../labx-30-grpc-cloud-user-service/pom.xml | 0 .../labx30/userservice/UserServiceApplication.java | 0 .../labx30/userservice/rpc/UserServiceGrpcImpl.java | 0 .../src/main/resources/application.yml | 0 .../labx-30-grpc-cloud/pom.xml | 2 +- {labx-30 => labx-30-spring-cloud-grpc}/pom.xml | 2 +- ...Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 15 files changed, 5 insertions(+), 5 deletions(-) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml (100%) rename {labx-30 => labx-30-spring-cloud-grpc}/labx-30-grpc-cloud/pom.xml (92%) rename {labx-30 => labx-30-spring-cloud-grpc}/pom.xml (91%) rename "labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" => "labx-30-spring-cloud-grpc/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 2153ce41b..a727c88cb 100644 --- a/README.md +++ b/README.md @@ -189,7 +189,7 @@ * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) -* [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30) +* [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30-spring-cloud-grpc](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30-spring-cloud-grpc) ## 服务容错 diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/pom.xml diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/DemoApplication.java diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/java/cn/iocoder/springcloud/labx30/demo/controller/DemoController.java diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-application/src/main/resources/application.yml diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/pom.xml diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service-api/src/main/proto/UserService.proto diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/pom.xml diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/UserServiceApplication.java diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/java/cn/iocoder/springcloud/labx30/userservice/rpc/UserServiceGrpcImpl.java diff --git a/labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml similarity index 100% rename from labx-30/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/labx-30-grpc-cloud-user-service/src/main/resources/application.yml diff --git a/labx-30/labx-30-grpc-cloud/pom.xml b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/pom.xml similarity index 92% rename from labx-30/labx-30-grpc-cloud/pom.xml rename to labx-30-spring-cloud-grpc/labx-30-grpc-cloud/pom.xml index f0cf089b7..1f1dae854 100644 --- a/labx-30/labx-30-grpc-cloud/pom.xml +++ b/labx-30-spring-cloud-grpc/labx-30-grpc-cloud/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-30 + labx-30-spring-cloud-grpc cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-30/pom.xml b/labx-30-spring-cloud-grpc/pom.xml similarity index 91% rename from labx-30/pom.xml rename to labx-30-spring-cloud-grpc/pom.xml index 1d0c73f1b..838495ac2 100644 --- a/labx-30/pom.xml +++ b/labx-30-spring-cloud-grpc/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-30 + labx-30-spring-cloud-grpc pom diff --git "a/labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" "b/labx-30-spring-cloud-grpc/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-30/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" rename to "labx-30-spring-cloud-grpc/\343\200\212\350\212\213\351\201\223 Spring Cloud gRPC \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 7193a9427..8f5d3dd54 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - lab-16-spring-data-mongo + @@ -111,7 +111,7 @@ - + From fd66610c79e09e175d111b2435b0eaf6a4443912 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:31:22 +0800 Subject: [PATCH 090/115] =?UTF-8?q?Spring=20Cloud=20Consul=20Bus=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../labx-29-sc-bus-consul-demo-listener-actuator/pom.xml | 2 +- .../labx29/listenerdemo/ListenerDemoApplication.java | 0 .../labx29/listenerdemo/event/UserRegisterEvent.java | 0 .../labx29/listenerdemo/listener/UserRegisterListener.java | 0 .../cloud/consul/binder/ConsulSendingHandler.java | 0 .../src/main/resources/application.yml | 0 .../labx-29-sc-bus-consul-demo-listener/pom.xml | 2 +- .../labx29/listenerdemo/ListenerDemoApplication.java | 0 .../labx29/listenerdemo/event/UserRegisterEvent.java | 0 .../labx29/listenerdemo/listener/UserRegisterListener.java | 0 .../src/main/resources/application.yml | 0 .../labx-29-sc-bus-consul-demo-publisher/pom.xml | 2 +- .../labx29/publisherdemo/PublisherDemoApplication.java | 0 .../labx29/publisherdemo/controller/DemoController.java | 0 .../labx29/publisherdemo/event/UserRegisterEvent.java | 0 .../cloud/consul/binder/ConsulSendingHandler.java | 0 .../src/main/resources/application.yml | 0 .../labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml | 2 +- .../labx29/configserverdemo/ConfigServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../springcloud/labx29/userapplication/UserApplication.java | 0 .../labx29/userapplication/config/OrderProperties.java | 0 .../labx29/userapplication/controller/DemoController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 {labx-29 => labx-29-spring-cloud-consul-bus}/pom.xml | 2 +- ...\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 2 +- 30 files changed, 8 insertions(+), 8 deletions(-) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml (97%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener/pom.xml (97%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/pom.xml (97%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml (97%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml (97%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml (100%) rename {labx-29 => labx-29-spring-cloud-consul-bus}/pom.xml (93%) rename "labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" => "labx-29-spring-cloud-consul-bus/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index a727c88cb..5572abf9d 100644 --- a/README.md +++ b/README.md @@ -231,7 +231,7 @@ * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) * [《芋道 Spring Cloud 事件总线 Bus RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-RabbitMQ/?github) 对应 [labx-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-19) * [《芋道 Spring Cloud 事件总线 Bus Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Kafka/?github) 对应 [labx-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-18) -* [《芋道 Spring Cloud 事件总线 Bus Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Consul/?github) 对应 [labx-29](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-29) +* [《芋道 Spring Cloud 事件总线 Bus Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Consul/?github) 对应 [labx-29-spring-cloud-consul-bus](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-29-spring-cloud-consul-bus) ## 分布式事务 diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml similarity index 97% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml index 88bbd31c7..bdffcb46c 100644 --- a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml +++ b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-29 + labx-29-spring-cloud-consul-bus cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener-actuator/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/pom.xml similarity index 97% rename from labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/pom.xml index 813346829..9044cdc59 100644 --- a/labx-29/labx-29-sc-bus-consul-demo-listener/pom.xml +++ b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-29 + labx-29-spring-cloud-consul-bus cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/ListenerDemoApplication.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/event/UserRegisterEvent.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/java/cn/iocoder/springcloud/labx29/listenerdemo/listener/UserRegisterListener.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-listener/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/pom.xml similarity index 97% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/pom.xml index c582e50de..9c27bb38a 100644 --- a/labx-29/labx-29-sc-bus-consul-demo-publisher/pom.xml +++ b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-29 + labx-29-spring-cloud-consul-bus cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/PublisherDemoApplication.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/controller/DemoController.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/cn/iocoder/springcloud/labx29/publisherdemo/event/UserRegisterEvent.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/java/org/springframework/cloud/consul/binder/ConsulSendingHandler.java diff --git a/labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml similarity index 100% rename from labx-29/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-bus-consul-demo-publisher/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml similarity index 97% rename from labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml index eb3266588..0bb88ff8c 100644 --- a/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml +++ b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-29 + labx-29-spring-cloud-consul-bus cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java similarity index 100% rename from labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/configserverdemo/ConfigServerApplication.java diff --git a/labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml similarity index 100% rename from labx-29/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml similarity index 97% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml index c7b67ab27..5d070e8ee 100644 --- a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml +++ b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-29 + labx-29-spring-cloud-consul-bus cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java similarity index 100% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/UserApplication.java diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java similarity index 100% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/config/OrderProperties.java diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java similarity index 100% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx29/userapplication/controller/DemoController.java diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml similarity index 100% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml diff --git a/labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml b/labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml similarity index 100% rename from labx-29/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml rename to labx-29-spring-cloud-consul-bus/labx-29-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml diff --git a/labx-29/pom.xml b/labx-29-spring-cloud-consul-bus/pom.xml similarity index 93% rename from labx-29/pom.xml rename to labx-29-spring-cloud-consul-bus/pom.xml index 0522e4e0f..ad35f4b96 100644 --- a/labx-29/pom.xml +++ b/labx-29-spring-cloud-consul-bus/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-29 + labx-29-spring-cloud-consul-bus pom labx-29-sc-bus-consul-demo-publisher diff --git "a/labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" "b/labx-29-spring-cloud-consul-bus/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-29/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" rename to "labx-29-spring-cloud-consul-bus/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\346\200\273\347\272\277 Bus Consul \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 8f5d3dd54..b76de9a1f 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ - + labx-29-spring-cloud-consul-bus From f3a1b93b880b02b0a2936dbe05cc95ae3c13172f Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:38:59 +0800 Subject: [PATCH 091/115] =?UTF-8?q?Spring=20Cloud=20Alibaba=20Nacos=20Disc?= =?UTF-8?q?overy=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../labx-01-sca-nacos-discovery-demo01-consumer/pom.xml | 2 +- .../labx01/nacosdemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-01-sca-nacos-discovery-demo01-provider/pom.xml | 2 +- .../labx01/nacosdemo/provider/DemoProviderApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-01-sca-nacos-discovery-demo02-consumer/pom.xml | 2 +- .../labx01/nacosdemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-uat.yaml | 0 .../src/main/resources/application.yaml | 0 .../labx-01-sca-nacos-discovery-demo02-provider/pom.xml | 2 +- .../labx01/nacosdemo/provider/DemoProviderApplication.java | 0 .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-uat.yaml | 0 .../src/main/resources/application.yaml | 0 .../labx-01-sca-nacos-discovery-demo03-consumer/pom.xml | 2 +- .../labx01/nacosdemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- ...345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 23 files changed, 10 insertions(+), 10 deletions(-) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml (97%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-provider/pom.xml (97%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml (97%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-dev.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-uat.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-provider/pom.xml (97%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-dev.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-uat.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml (97%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/labx-01-sca-nacos-discovery-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-01 => labx-01-spring-cloud-alibaba-nacos-discovery}/pom.xml (92%) rename "labx-01/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" => "labx-01-spring-cloud-alibaba-nacos-discovery/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 5572abf9d..eab3ca5ea 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ ## Spring Cloud Alibaba 全家桶 * [《芋道 Spring Cloud Alibaba 介绍》](http://www.iocoder.cn/Spring-Cloud-Alibaba/intro/?github) -* [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01) +* [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01-spring-cloud-alibaba-nacos-discovery](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01-spring-cloud-alibaba-nacos-discovery) * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) * [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04) * [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06) @@ -178,7 +178,7 @@ ## 注册中心 -* [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01) +* [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01-spring-cloud-alibaba-nacos-discovery](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01-spring-cloud-alibaba-nacos-discovery) * [《芋道 Spring Cloud Netflix 注册中心 Eureka 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Eureka?github) 对应 [labx-22](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-22) * [《芋道 Spring Cloud 注册中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Discovery/?github) 对应 [labx-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-25) * [《芋道 Spring Cloud 注册中心 Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Consul-Discovery/?github) 对应 [labx-27](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-27) diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml similarity index 97% rename from labx-01/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml index 8a82fdcd9..67de77ca8 100644 --- a/labx-01/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-consumer/src/main/resources/application.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo01-consumer/src/main/resources/application.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-provider/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/pom.xml similarity index 97% rename from labx-01/labx-01-sca-nacos-discovery-demo01-provider/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/pom.xml index 18f38c02e..bb63b33de 100644 --- a/labx-01/labx-01-sca-nacos-discovery-demo01-provider/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java diff --git a/labx-01/labx-01-sca-nacos-discovery-demo01-provider/src/main/resources/application.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo01-provider/src/main/resources/application.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo01-provider/src/main/resources/application.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml similarity index 97% rename from labx-01/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml index a971b6091..defbe4473 100644 --- a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-dev.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-dev.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-dev.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-dev.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-uat.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-uat.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-uat.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application-uat.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-consumer/src/main/resources/application.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/pom.xml similarity index 97% rename from labx-01/labx-01-sca-nacos-discovery-demo02-provider/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/pom.xml index e51cff9bc..1d822150c 100644 --- a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/provider/DemoProviderApplication.java diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-dev.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-dev.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-dev.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-dev.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-uat.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-uat.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-uat.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application-uat.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo02-provider/src/main/resources/application.yaml diff --git a/labx-01/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml similarity index 97% rename from labx-01/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml index 01f6cd709..bfd99dd47 100644 --- a/labx-01/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-01/labx-01-sca-nacos-discovery-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx01/nacosdemo/consumer/DemoConsumerApplication.java diff --git a/labx-01/labx-01-sca-nacos-discovery-demo03-consumer/src/main/resources/application.yaml b/labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-01/labx-01-sca-nacos-discovery-demo03-consumer/src/main/resources/application.yaml rename to labx-01-spring-cloud-alibaba-nacos-discovery/labx-01-sca-nacos-discovery-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-01/pom.xml b/labx-01-spring-cloud-alibaba-nacos-discovery/pom.xml similarity index 92% rename from labx-01/pom.xml rename to labx-01-spring-cloud-alibaba-nacos-discovery/pom.xml index 628179f03..2ad9ab9f3 100644 --- a/labx-01/pom.xml +++ b/labx-01-spring-cloud-alibaba-nacos-discovery/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-01 + labx-01-spring-cloud-alibaba-nacos-discovery pom diff --git "a/labx-01/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" "b/labx-01-spring-cloud-alibaba-nacos-discovery/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-01/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" rename to "labx-01-spring-cloud-alibaba-nacos-discovery/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\263\250\345\206\214\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index b76de9a1f..610490409 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ - + labx-01-spring-cloud-alibaba-nacos-discovery @@ -110,7 +110,7 @@ - labx-29-spring-cloud-consul-bus + From 289494ea15c987028d41bcefab4458ecb3bccd36 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 07:54:41 +0800 Subject: [PATCH 092/115] =?UTF-8?q?Spring=20Cloud=20Netflix=20Ribbon=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../labx-02-scn-ribbon-demo01-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo01-provider/pom.xml | 2 +- .../labx02/ribbondemo/provider/DemoProviderApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo02A-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo02B-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../ribbondemo/consumer/config/RibbonConfiguration.java | 0 .../main/java/ribbon/DefaultRibbonClientConfiguration.java | 0 .../java/ribbon/UserProviderRibbonClientConfiguration.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo03-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo04-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo05-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-02-scn-ribbon-demo06-consumer/pom.xml | 2 +- .../labx02/ribbondemo/consumer/DemoConsumerApplication.java | 0 .../src/main/resources/application.yaml | 0 {labx-02 => labx-02-spring-cloud-netflix-ribbon}/pom.xml | 2 +- ...50\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 31 files changed, 12 insertions(+), 12 deletions(-) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-provider/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-provider/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/provider/DemoProviderApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02A-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02A-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02A-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/config/RibbonConfiguration.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/DefaultRibbonClientConfiguration.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/UserProviderRibbonClientConfiguration.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo02B-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo03-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo03-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo04-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo04-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo04-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo05-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo05-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo05-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo06-consumer/pom.xml (97%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo06-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/labx-02-scn-ribbon-demo06-consumer/src/main/resources/application.yaml (100%) rename {labx-02 => labx-02-spring-cloud-netflix-ribbon}/pom.xml (94%) rename "labx-02/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" => "labx-02-spring-cloud-netflix-ribbon/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index eab3ca5ea..1ab7f5f40 100644 --- a/README.md +++ b/README.md @@ -187,7 +187,7 @@ ## 服务调用 * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) -* [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02) +* [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) * [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30-spring-cloud-grpc](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30-spring-cloud-grpc) diff --git a/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/pom.xml index 89cbbab05..015e6d0aa 100644 --- a/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo01-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo01-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo01-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo01-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/pom.xml index e20609af2..64a982716 100644 --- a/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo01-provider/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/provider/DemoProviderApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo01-provider/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/provider/DemoProviderApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/provider/DemoProviderApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo01-provider/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo01-provider/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo01-provider/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/pom.xml index f8e7d87b3..4806707ac 100644 --- a/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo02A-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02A-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo02A-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02A-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02A-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/pom.xml index e44fe281d..77b93877a 100644 --- a/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/config/RibbonConfiguration.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/config/RibbonConfiguration.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/config/RibbonConfiguration.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/config/RibbonConfiguration.java diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/DefaultRibbonClientConfiguration.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/DefaultRibbonClientConfiguration.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/DefaultRibbonClientConfiguration.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/DefaultRibbonClientConfiguration.java diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/UserProviderRibbonClientConfiguration.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/UserProviderRibbonClientConfiguration.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/UserProviderRibbonClientConfiguration.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/java/ribbon/UserProviderRibbonClientConfiguration.java diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo02B-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo02B-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/pom.xml index 01297a022..4909a3111 100644 --- a/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo03-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo03-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo03-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo03-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/pom.xml index 5d4800ff1..4ed5a93a9 100644 --- a/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo04-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo04-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo04-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo04-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo04-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/pom.xml index 008b881c7..6dfadb43d 100644 --- a/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo05-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo05-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo05-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo05-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo05-consumer/src/main/resources/application.yaml diff --git a/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/pom.xml similarity index 97% rename from labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/pom.xml index 9256f304b..9ee675585 100644 --- a/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-02 + labx-02-spring-cloud-netflix-ribbon cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo06-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo06-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/src/main/java/cn/iocoder/springcloudnetflix/labx02/ribbondemo/consumer/DemoConsumerApplication.java diff --git a/labx-02/labx-02-scn-ribbon-demo06-consumer/src/main/resources/application.yaml b/labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-02/labx-02-scn-ribbon-demo06-consumer/src/main/resources/application.yaml rename to labx-02-spring-cloud-netflix-ribbon/labx-02-scn-ribbon-demo06-consumer/src/main/resources/application.yaml diff --git a/labx-02/pom.xml b/labx-02-spring-cloud-netflix-ribbon/pom.xml similarity index 94% rename from labx-02/pom.xml rename to labx-02-spring-cloud-netflix-ribbon/pom.xml index 138886233..4d3158b90 100644 --- a/labx-02/pom.xml +++ b/labx-02-spring-cloud-netflix-ribbon/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-02 + labx-02-spring-cloud-netflix-ribbon pom diff --git "a/labx-02/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" "b/labx-02-spring-cloud-netflix-ribbon/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-02/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" rename to "labx-02-spring-cloud-netflix-ribbon/\343\200\212\350\212\213\351\201\223 Spring Cloud Netflix \350\264\237\350\275\275\345\235\207\350\241\241 Ribbon \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 610490409..522c4d993 100644 --- a/pom.xml +++ b/pom.xml @@ -81,8 +81,8 @@ - labx-01-spring-cloud-alibaba-nacos-discovery - + + labx-02-spring-cloud-netflix-ribbon From 46f1aedc42ff2210c0715ed6527bec35f29de10e Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 08:02:40 +0800 Subject: [PATCH 093/115] =?UTF-8?q?Spring=20Cloud=20Feign=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- .../labx-03-sc-feign-demo01-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../springcloud/labx03/feigndemo/consumer/FeignDemo.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo01-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../consumer/config/DefaultFeignClientConfiguration.java | 0 .../config/DemoProviderFeignClientConfiguration.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-provider-api/pom.xml | 2 +- .../labx03/feigndemo/provider/api/ProviderService.java | 0 .../labx-03-sc-feign-demo03-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../springcloud/labx03/feigndemo/provider/dto/DemoDTO.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo05-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo07-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 {labx-03 => labx-03-spring-cloud-feign}/pom.xml | 2 +- ...7\224\250 Feign \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 68 files changed, 19 insertions(+), 19 deletions(-) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider-api/pom.xml (93%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/pom.xml (95%) rename "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" => "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 1ab7f5f40..208b3c031 100644 --- a/README.md +++ b/README.md @@ -168,8 +168,8 @@ ## 推荐搭配食用 -* [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02) -* [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) +* [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) +* [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) * [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) * [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) @@ -188,7 +188,7 @@ * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) -* [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03) +* [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) * [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30-spring-cloud-grpc](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30-spring-cloud-grpc) ## 服务容错 diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo01-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml index 0be682a82..4fcc9f46a 100644 --- a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo01-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml index 20331f36d..33e56cc6e 100644 --- a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml index b8ebcdb55..777e5d7f7 100644 --- a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml index d943e9a2e..496232b8c 100644 --- a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo03-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml index 6c49e27d4..f6004feb3 100644 --- a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml similarity index 93% rename from labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml index 2be91b189..bf8800b73 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo03-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml index 31d2200db..262974e03 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo04-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml index d6296809e..76028d7fb 100644 --- a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo04-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml index 53d60913c..22f08a771 100644 --- a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo05-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml index 2eb1ed849..c7c2d5aa1 100644 --- a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml index ae7f52e40..e2c928c80 100644 --- a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml index f7265736a..34fbf5cb0 100644 --- a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo07-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml index a1574416a..70297d655 100644 --- a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml diff --git a/labx-03/pom.xml b/labx-03-spring-cloud-feign/pom.xml similarity index 95% rename from labx-03/pom.xml rename to labx-03-spring-cloud-feign/pom.xml index 33edef2c5..9cab9e864 100644 --- a/labx-03/pom.xml +++ b/labx-03-spring-cloud-feign/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-03 + labx-03-spring-cloud-feign pom diff --git "a/labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" "b/labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" rename to "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 522c4d993..361b61113 100644 --- a/pom.xml +++ b/pom.xml @@ -82,8 +82,8 @@ - labx-02-spring-cloud-netflix-ribbon - + + labx-03-spring-cloud-feign From a11539e3345515dfd5b342582a3a64cb5b4e8734 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 08:22:31 +0800 Subject: [PATCH 094/115] =?UTF-8?q?Spring=20Cloud=20Alibaba=20Sentinel=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../labx-03-sc-feign-demo01-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../springcloud/labx03/feigndemo/consumer/FeignDemo.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo01-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../consumer/config/DefaultFeignClientConfiguration.java | 0 .../consumer/config/DemoProviderFeignClientConfiguration.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-provider-api/pom.xml | 2 +- .../labx03/feigndemo/provider/api/ProviderService.java | 0 .../labx-03-sc-feign-demo03-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../springcloud/labx03/feigndemo/provider/dto/DemoDTO.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo05-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo07-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 {labx-03-spring-cloud-feign => labx-03}/pom.xml | 2 +- ...347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" | 0 .../labx-04-sca-sentinel-actuator-provider/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoProviderApplication.java | 0 .../sentineldemo/provider/controller/DemoController.java | 0 .../provider/web/CustomBlockExceptionHandler.java | 0 .../sentineldemo/provider/web/CustomRequestOriginParser.java | 0 .../sentineldemo/provider/web/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-apollo-provider/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoProviderApplication.java | 0 .../sentineldemo/provider/controller/DemoController.java | 0 .../provider/web/CustomBlockExceptionHandler.java | 0 .../sentineldemo/provider/web/CustomRequestOriginParser.java | 0 .../sentineldemo/provider/web/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-demo01-provider/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoProviderApplication.java | 0 .../sentineldemo/provider/controller/DemoController.java | 0 .../provider/web/CustomBlockExceptionHandler.java | 0 .../sentineldemo/provider/web/CustomRequestOriginParser.java | 0 .../sentineldemo/provider/web/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-feign-consumer/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoConsumerApplication.java | 0 .../sentineldemo/provider/controller/ConsumerController.java | 0 .../provider/fallback/DemoProviderFeignClientFallback.java | 0 .../fallback/DemoProviderFeignClientFallbackFactory.java | 0 .../sentineldemo/provider/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-file-provider/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoProviderApplication.java | 0 .../sentineldemo/provider/controller/DemoController.java | 0 .../provider/web/CustomBlockExceptionHandler.java | 0 .../sentineldemo/provider/web/CustomRequestOriginParser.java | 0 .../sentineldemo/provider/web/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-nacos-provider/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoProviderApplication.java | 0 .../sentineldemo/provider/controller/DemoController.java | 0 .../provider/web/CustomBlockExceptionHandler.java | 0 .../sentineldemo/provider/web/CustomRequestOriginParser.java | 0 .../sentineldemo/provider/web/GlobalExceptionHandler.java | 0 .../src/main/resources/application.yaml | 0 .../labx-04-sca-sentinel-resttemplate-consumer/pom.xml | 2 +- .../labx04/sentineldemo/provider/DemoConsumerApplication.java | 0 .../provider/config/RestTemplateConfiguration.java | 0 .../sentineldemo/provider/controller/ConsumerController.java | 0 .../src/main/resources/application.yaml | 0 {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/pom.xml | 2 +- ...\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 117 files changed, 26 insertions(+), 26 deletions(-) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-provider/pom.xml (97%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02A-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider-api/pom.xml (93%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider/pom.xml (97%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-provider/pom.xml (97%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo05-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06A-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06B-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo07-consumer/pom.xml (98%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03-spring-cloud-feign => labx-03}/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml (100%) rename {labx-03-spring-cloud-feign => labx-03}/pom.xml (95%) rename "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" => "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-actuator-provider/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-apollo-provider/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallback.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallbackFactory.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/feign/DemoProviderFeignClient.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-feign-consumer/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-file-provider/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-nacos-provider/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-resttemplate-consumer/pom.xml (97%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/config/RestTemplateConfiguration.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/labx-04-sca-sentinel-resttemplate-consumer/src/main/resources/application.yaml (100%) rename {labx-04 => labx-04-spring-cloud-alibaba-sentinel}/pom.xml (93%) rename "labx-04/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" => "labx-04-spring-cloud-alibaba-sentinel/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 208b3c031..73e2f43e2 100644 --- a/README.md +++ b/README.md @@ -160,7 +160,7 @@ * [《芋道 Spring Cloud Alibaba 介绍》](http://www.iocoder.cn/Spring-Cloud-Alibaba/intro/?github) * [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01-spring-cloud-alibaba-nacos-discovery](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01-spring-cloud-alibaba-nacos-discovery) * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) -* [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04) +* [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04-spring-cloud-alibaba-sentinel](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04-spring-cloud-alibaba-sentinel) * [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06) * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) * [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05) @@ -193,7 +193,7 @@ ## 服务容错 -* [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04) +* [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04-spring-cloud-alibaba-sentinel](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04-spring-cloud-alibaba-sentinel) * [《芋道 Spring Cloud Netflix 服务容错 Hystrix 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Hystrix/?github) 对应 [labx-23](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-23) * [《芋道 Spring Cloud 服务容错 Resilience4j 入门》](http://www.iocoder.cn/Spring-Cloud/Resilience4j/?github) 对应 [lab-59](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-59) * 《芋道 Spring Cloud 服务容错 Spring Cloud CircuitBreaker》计划中... diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo01-consumer/pom.xml index 4fcc9f46a..0be682a82 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java b/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java rename to labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml b/labx-03/labx-03-sc-feign-demo01-provider/pom.xml similarity index 97% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml rename to labx-03/labx-03-sc-feign-demo01-provider/pom.xml index 33e56cc6e..20331f36d 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml index 777e5d7f7..b8ebcdb55 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml index 496232b8c..d943e9a2e 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo03-consumer/pom.xml index f6004feb3..6c49e27d4 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml b/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml similarity index 93% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml rename to labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml index bf8800b73..2be91b189 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java b/labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java rename to labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml b/labx-03/labx-03-sc-feign-demo03-provider/pom.xml similarity index 97% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml rename to labx-03/labx-03-sc-feign-demo03-provider/pom.xml index 262974e03..31d2200db 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo04-consumer/pom.xml index 76028d7fb..d6296809e 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java b/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java rename to labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml b/labx-03/labx-03-sc-feign-demo04-provider/pom.xml similarity index 97% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml rename to labx-03/labx-03-sc-feign-demo04-provider/pom.xml index 22f08a771..53d60913c 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo04-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java b/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java rename to labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo05-consumer/pom.xml index c7c2d5aa1..2eb1ed849 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml index e2c928c80..ae7f52e40 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml index 34fbf5cb0..f7265736a 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml similarity index 98% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml rename to labx-03/labx-03-sc-feign-demo07-consumer/pom.xml index 70297d655..a1574416a 100644 --- a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03-spring-cloud-feign + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml b/labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml rename to labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml diff --git a/labx-03-spring-cloud-feign/pom.xml b/labx-03/pom.xml similarity index 95% rename from labx-03-spring-cloud-feign/pom.xml rename to labx-03/pom.xml index 9cab9e864..33edef2c5 100644 --- a/labx-03-spring-cloud-feign/pom.xml +++ b/labx-03/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-03-spring-cloud-feign + labx-03 pom diff --git "a/labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" "b/labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" rename to "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-actuator-provider/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/pom.xml index c22238e11..683ed77c4 100644 --- a/labx-04/labx-04-sca-sentinel-actuator-provider/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-actuator-provider/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-actuator-provider/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-actuator-provider/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-apollo-provider/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/pom.xml index d4d5ceb6d..0e832db93 100644 --- a/labx-04/labx-04-sca-sentinel-apollo-provider/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-apollo-provider/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-apollo-provider/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-apollo-provider/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-demo01-provider/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/pom.xml index 839961257..e5c6b6565 100644 --- a/labx-04/labx-04-sca-sentinel-demo01-provider/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-demo01-provider/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-demo01-provider/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-demo01-provider/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-feign-consumer/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/pom.xml index fe6d7efe6..2bb75f850 100644 --- a/labx-04/labx-04-sca-sentinel-feign-consumer/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallback.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallback.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallback.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallback.java diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallbackFactory.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallbackFactory.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallbackFactory.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/fallback/DemoProviderFeignClientFallbackFactory.java diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/feign/DemoProviderFeignClient.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/feign/DemoProviderFeignClient.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/feign/DemoProviderFeignClient.java diff --git a/labx-04/labx-04-sca-sentinel-feign-consumer/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-feign-consumer/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-feign-consumer/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-file-provider/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-file-provider/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/pom.xml index a46eaaca9..9369c9fee 100644 --- a/labx-04/labx-04-sca-sentinel-file-provider/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-file-provider/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-file-provider/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-file-provider/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-nacos-provider/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/pom.xml index fb6cdb06b..599406e9f 100644 --- a/labx-04/labx-04-sca-sentinel-nacos-provider/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoProviderApplication.java diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/DemoController.java diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomBlockExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/CustomRequestOriginParser.java diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/web/GlobalExceptionHandler.java diff --git a/labx-04/labx-04-sca-sentinel-nacos-provider/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-nacos-provider/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-nacos-provider/src/main/resources/application.yaml diff --git a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/pom.xml similarity index 97% rename from labx-04/labx-04-sca-sentinel-resttemplate-consumer/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/pom.xml index 06c99c752..dbd849d8a 100644 --- a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-04 + labx-04-spring-cloud-alibaba-sentinel cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/DemoConsumerApplication.java diff --git a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/config/RestTemplateConfiguration.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/config/RestTemplateConfiguration.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/config/RestTemplateConfiguration.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/config/RestTemplateConfiguration.java diff --git a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java similarity index 100% rename from labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx04/sentineldemo/provider/controller/ConsumerController.java diff --git a/labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/resources/application.yaml b/labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-04/labx-04-sca-sentinel-resttemplate-consumer/src/main/resources/application.yaml rename to labx-04-spring-cloud-alibaba-sentinel/labx-04-sca-sentinel-resttemplate-consumer/src/main/resources/application.yaml diff --git a/labx-04/pom.xml b/labx-04-spring-cloud-alibaba-sentinel/pom.xml similarity index 93% rename from labx-04/pom.xml rename to labx-04-spring-cloud-alibaba-sentinel/pom.xml index 7b2f4f61a..9bfb8d30f 100644 --- a/labx-04/pom.xml +++ b/labx-04-spring-cloud-alibaba-sentinel/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-04 + labx-04-spring-cloud-alibaba-sentinel pom labx-04-sca-sentinel-demo01-provider diff --git "a/labx-04/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" "b/labx-04-spring-cloud-alibaba-sentinel/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-04/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" rename to "labx-04-spring-cloud-alibaba-sentinel/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\345\256\271\351\224\231 Sentinel \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 361b61113..fc2070039 100644 --- a/pom.xml +++ b/pom.xml @@ -83,8 +83,8 @@ - labx-03-spring-cloud-feign - + + labx-04-spring-cloud-alibaba-sentinel From ce1d5b75132394d350375823ddccd80703ae10ee Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 08:28:46 +0800 Subject: [PATCH 095/115] =?UTF-8?q?Spring=20Cloud=20Alibaba=20Nacos=20Conf?= =?UTF-8?q?ig=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labx-03-sc-feign-demo01-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../springcloud/labx03/feigndemo/consumer/FeignDemo.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo01-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo02B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../consumer/config/DefaultFeignClientConfiguration.java | 0 .../consumer/config/DemoProviderFeignClientConfiguration.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo03-provider-api/pom.xml | 2 +- .../labx03/feigndemo/provider/api/ProviderService.java | 0 .../labx-03-sc-feign-demo03-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo04-provider/pom.xml | 2 +- .../labx03/feigndemo/provider/DemoProviderApplication.java | 0 .../feigndemo/provider/controller/ProviderController.java | 0 .../springcloud/labx03/feigndemo/provider/dto/DemoDTO.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo05-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06A-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo06B-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 .../labx-03-sc-feign-demo07-consumer/pom.xml | 2 +- .../labx03/feigndemo/consumer/DemoConsumerApplication.java | 0 .../feigndemo/consumer/controller/ConsumerController.java | 0 .../feigndemo/consumer/feign/DemoProviderFeignClient.java | 0 .../src/main/resources/application.yaml | 0 {labx-03 => labx-03-spring-cloud-feign}/pom.xml | 2 +- ...347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" | 0 .../labx-05-sca-nacos-config-auto-refresh/pom.xml | 2 +- .../springcloudalibaba/labx5/nacosdemo/DemoApplication.java | 0 .../labx5/nacosdemo/config/OrderProperties.java | 0 .../labx5/nacosdemo/controller/DemoController.java | 0 .../nacosdemo/listener/DemoEnvironmentChangeListener.java | 0 .../src/main/resources/bootstrap.yaml | 0 .../labx-05-sca-nacos-config-demo-actuator/pom.xml | 2 +- .../springcloudalibaba/labx5/nacosdemo/DemoApplication.java | 0 .../labx5/nacosdemo/config/OrderProperties.java | 0 .../labx5/nacosdemo/controller/DemoController.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/bootstrap.yaml | 0 .../labx-05-sca-nacos-config-demo-jasypt/pom.xml | 2 +- .../springcloudalibaba/labx5/nacosdemo/DemoApplication.java | 0 .../labx5/nacosdemo/controller/DemoController.java | 0 .../nacosdemo/listener/JasyptEnvironmentChangeListener.java | 0 .../src/main/resources/bootstrap.yaml | 0 .../springcloudalibaba/labx5/nacosdemo/JasyptTest.java | 0 .../labx-05-sca-nacos-config-demo-multi/pom.xml | 2 +- .../springcloudalibaba/labx5/nacosdemo/DemoApplication.java | 0 .../src/main/resources/bootstrap.yaml | 0 .../labx-05-sca-nacos-config-demo-profiles/pom.xml | 2 +- .../labx5/nacosdemo/ProfilesApplication.java | 0 .../src/main/resources/bootstrap-dev.yaml | 0 .../src/main/resources/bootstrap-prod.yaml | 0 .../src/main/resources/bootstrap.yaml | 0 .../labx-05-sca-nacos-config-demo/pom.xml | 2 +- .../springcloudalibaba/labx5/nacosdemo/DemoApplication.java | 0 .../labx5/nacosdemo/config/OrderProperties.java | 0 .../labx5/nacosdemo/controller/DemoController.java | 0 .../src/main/resources/bootstrap.yaml | 0 .../pom.xml | 2 +- ...345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 100 files changed, 23 insertions(+), 23 deletions(-) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider-api/pom.xml (93%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/pom.xml (97%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/pom.xml (98%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java (100%) rename {labx-03 => labx-03-spring-cloud-feign}/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml (100%) rename {labx-03 => labx-03-spring-cloud-feign}/pom.xml (95%) rename "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" => "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/DemoEnvironmentChangeListener.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-auto-refresh/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/src/main/resources/application.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-actuator/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/JasyptEnvironmentChangeListener.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-jasypt/src/test/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/JasyptTest.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-multi/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-multi/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-multi/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-profiles/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-profiles/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/ProfilesApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-dev.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-prod.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo/pom.xml (97%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/labx-05-sca-nacos-config-demo/src/main/resources/bootstrap.yaml (100%) rename {labx-05 => labx-05-spring-cloud-alibaba-nacos-config}/pom.xml (92%) rename "labx-05/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" => "labx-05-spring-cloud-alibaba-nacos-config/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo01-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml index 0be682a82..4fcc9f46a 100644 --- a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/FeignDemo.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo01-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml index 20331f36d..33e56cc6e 100644 --- a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo01-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml index b8ebcdb55..777e5d7f7 100644 --- a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02A-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml index d943e9a2e..496232b8c 100644 --- a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DefaultFeignClientConfiguration.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/config/DemoProviderFeignClientConfiguration.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo02B-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo03-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml index 6c49e27d4..f6004feb3 100644 --- a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml similarity index 93% rename from labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml index 2be91b189..bf8800b73 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider-api/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/api/ProviderService.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo03-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml index 31d2200db..262974e03 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo03-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo04-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml index d6296809e..76028d7fb 100644 --- a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/dto/DemoDTO.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml similarity index 97% rename from labx-03/labx-03-sc-feign-demo04-provider/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml index 53d60913c..22f08a771 100644 --- a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/DemoProviderApplication.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/controller/ProviderController.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/provider/dto/DemoDTO.java diff --git a/labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo04-provider/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo05-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml index 2eb1ed849..c7c2d5aa1 100644 --- a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo05-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml index ae7f52e40..e2c928c80 100644 --- a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06A-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml index f7265736a..34fbf5cb0 100644 --- a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo06B-consumer/src/main/resources/application.yaml diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml similarity index 98% rename from labx-03/labx-03-sc-feign-demo07-consumer/pom.xml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml index a1574416a..70297d655 100644 --- a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml +++ b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-03 + labx-03-spring-cloud-feign cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/DemoConsumerApplication.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/controller/ConsumerController.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/java/cn/iocoder/springcloud/labx03/feigndemo/consumer/feign/DemoProviderFeignClient.java diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml b/labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-03/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml rename to labx-03-spring-cloud-feign/labx-03-sc-feign-demo07-consumer/src/main/resources/application.yaml diff --git a/labx-03/pom.xml b/labx-03-spring-cloud-feign/pom.xml similarity index 95% rename from labx-03/pom.xml rename to labx-03-spring-cloud-feign/pom.xml index 33edef2c5..9cab9e864 100644 --- a/labx-03/pom.xml +++ b/labx-03-spring-cloud-feign/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-03 + labx-03-spring-cloud-feign pom diff --git "a/labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" "b/labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-03/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" rename to "labx-03-spring-cloud-feign/\343\200\212\350\212\213\351\201\223 Spring Cloud \345\243\260\346\230\216\345\274\217\350\260\203\347\224\250 Feign \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/pom.xml index 07cb3dbdf..c4a692acc 100644 --- a/labx-05/labx-05-sca-nacos-config-auto-refresh/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/DemoEnvironmentChangeListener.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/DemoEnvironmentChangeListener.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/DemoEnvironmentChangeListener.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/DemoEnvironmentChangeListener.java diff --git a/labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-auto-refresh/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-auto-refresh/src/main/resources/bootstrap.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/pom.xml index f70fe8765..1a87836b0 100644 --- a/labx-05/labx-05-sca-nacos-config-demo-actuator/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/resources/application.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/resources/application.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/resources/application.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/resources/application.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-actuator/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-actuator/src/main/resources/bootstrap.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/pom.xml index 4ad20d4f1..818a3ecb0 100644 --- a/labx-05/labx-05-sca-nacos-config-demo-jasypt/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/JasyptEnvironmentChangeListener.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/JasyptEnvironmentChangeListener.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/JasyptEnvironmentChangeListener.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/listener/JasyptEnvironmentChangeListener.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/main/resources/bootstrap.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-jasypt/src/test/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/JasyptTest.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/test/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/JasyptTest.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-jasypt/src/test/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/JasyptTest.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-jasypt/src/test/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/JasyptTest.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-multi/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-demo-multi/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/pom.xml index 74e7ca67c..fac0fdb90 100644 --- a/labx-05/labx-05-sca-nacos-config-demo-multi/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-demo-multi/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-multi/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-multi/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-multi/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-multi/src/main/resources/bootstrap.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-profiles/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-demo-profiles/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/pom.xml index e8827fb29..283806f3e 100644 --- a/labx-05/labx-05-sca-nacos-config-demo-profiles/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/ProfilesApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/ProfilesApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/ProfilesApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/ProfilesApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-dev.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-dev.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-dev.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-dev.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-prod.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-prod.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-prod.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap-prod.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo-profiles/src/main/resources/bootstrap.yaml diff --git a/labx-05/labx-05-sca-nacos-config-demo/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/pom.xml similarity index 97% rename from labx-05/labx-05-sca-nacos-config-demo/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/pom.xml index aa9515763..520568353 100644 --- a/labx-05/labx-05-sca-nacos-config-demo/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-05 + labx-05-spring-cloud-alibaba-nacos-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/DemoApplication.java diff --git a/labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/config/OrderProperties.java diff --git a/labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/java/cn/iocoder/springcloudalibaba/labx5/nacosdemo/controller/DemoController.java diff --git a/labx-05/labx-05-sca-nacos-config-demo/src/main/resources/bootstrap.yaml b/labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-05/labx-05-sca-nacos-config-demo/src/main/resources/bootstrap.yaml rename to labx-05-spring-cloud-alibaba-nacos-config/labx-05-sca-nacos-config-demo/src/main/resources/bootstrap.yaml diff --git a/labx-05/pom.xml b/labx-05-spring-cloud-alibaba-nacos-config/pom.xml similarity index 92% rename from labx-05/pom.xml rename to labx-05-spring-cloud-alibaba-nacos-config/pom.xml index aa337fce1..ccce0d0a7 100644 --- a/labx-05/pom.xml +++ b/labx-05-spring-cloud-alibaba-nacos-config/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-05 + labx-05-spring-cloud-alibaba-nacos-config pom labx-05-sca-nacos-config-demo diff --git "a/labx-05/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" "b/labx-05-spring-cloud-alibaba-nacos-config/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-05/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" rename to "labx-05-spring-cloud-alibaba-nacos-config/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \351\205\215\347\275\256\344\270\255\345\277\203 Nacos \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index fc2070039..67096a302 100644 --- a/pom.xml +++ b/pom.xml @@ -84,8 +84,8 @@ - labx-04-spring-cloud-alibaba-sentinel - + + labx-05-spring-cloud-alibaba-nacos-config From 1b1488eb3ae58f01c8311256b54d6e287f8da28c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 08:42:44 +0800 Subject: [PATCH 096/115] =?UTF-8?q?Spring=20Cloud=20Stream=20RocketMQ=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-06-sca-stream-rocketmq-consumer-demo/pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-06-sca-stream-rocketmq-consumer-retry/pom.xml | 2 +- .../rocketmqdemo/consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../rocketmqdemo/consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/producerdemo/ProducerApplication.java | 0 .../producerdemo/controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../rocketmqdemo/producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/producerdemo/ProducerApplication.java | 0 .../producerdemo/controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../rocketmqdemo/producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../labx-06-sca-stream-rocketmq-producer-demo/pom.xml | 2 +- .../rocketmqdemo/producerdemo/ProducerApplication.java | 0 .../producerdemo/controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../rocketmqdemo/producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/producerdemo/ProducerApplication.java | 0 .../producerdemo/controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../rocketmqdemo/producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../rocketmqdemo/producerdemo/ProducerApplication.java | 0 .../producerdemo/controller/Demo01Controller.java | 0 .../producerdemo/listener/TransactionListenerImpl.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../rocketmqdemo/producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- ...7 RocketMQ \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 83 files changed, 21 insertions(+), 21 deletions(-) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-demo/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-filter/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-consumer-retry/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-actuator/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-demo/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-orderly/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml (97%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/listener/TransactionListenerImpl.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/labx-06-sca-stream-rocketmq-producer-transaction/src/main/resources/application.yml (100%) rename {labx-06 => labx-06-spring-cloud-stream-rocketmq}/pom.xml (95%) rename "labx-06/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" => "labx-06-spring-cloud-stream-rocketmq/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 73e2f43e2..3c26930ec 100644 --- a/README.md +++ b/README.md @@ -161,9 +161,9 @@ * [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01-spring-cloud-alibaba-nacos-discovery](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01-spring-cloud-alibaba-nacos-discovery) * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) * [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04-spring-cloud-alibaba-sentinel](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04-spring-cloud-alibaba-sentinel) -* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06) +* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) -* [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05) +* [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05-spring-cloud-alibaba-nacos-config](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05-spring-cloud-alibaba-nacos-config) * [《芋道 Spring Cloud Alibaba 分布式事务 Seata 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Seata/?github) 对应 [labx-17](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-17) ## 推荐搭配食用 @@ -212,7 +212,7 @@ ## 配置中心 -* [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05) +* [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05-spring-cloud-alibaba-nacos-config](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05-spring-cloud-alibaba-nacos-config) * [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09) * [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12) * [《芋道 Spring Cloud 配置中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Config/?github) 对应 [labx-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-26) @@ -222,7 +222,7 @@ ## 消息队列 **Spring Cloud Stream** -* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06) +* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) * [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10) * [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11) * [《芋道 Spring Cloud 消息队列 ActiveMQ 入门》](http://www.iocoder.cn/Spring-Cloud/ActiveMQ/?github) @@ -322,7 +322,7 @@ * [《RocketMQ 极简入门》](http://www.iocoder.cn/RocketMQ/install/?github) * [《芋道 Spring Boot 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Boot/RocketMQ/?github) 对应 [lab-31](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-31) -* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06) +* [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) * [《芋道 RocketMQ 源码解析系列》](http://www.iocoder.cn/categories/RocketMQ/?github) * [《性能测试 —— RocketMQ 基准测试》](http://www.iocoder.cn/Performance-Testing/RocketMQ-benchmark/?github) diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml index c104de4af..ef675e992 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-actuator/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml index b2ec61352..e48affaf8 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-aliyun/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml index 7bd4d7468..df0385542 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-broadcasting/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml index 183567629..6f0c7d9fd 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-demo/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-demo/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml index 935bf4c83..89ae859c6 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-error-handler/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml index fe13bfed2..061efd27f 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-filter/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-filter/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml index 989f8d565..b285d4211 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-orderly/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml index c526ec2ea..f7d52fcc1 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-consumer-retry/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-consumer-retry/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml index 2644b3f17..1cfb9a9e9 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-actuator/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-actuator/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml index 18f3563dd..9abebd96d 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-aliyun/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/pom.xml index 8e06d684b..5393fbb23 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-demo/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-demo/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml index 4736fdde9..e645eb82f 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-orderly/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-orderly/src/main/resources/application.yml diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml similarity index 97% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml index acb68595e..cd1f17599 100644 --- a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-06 + labx-06-spring-cloud-stream-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/listener/TransactionListenerImpl.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/listener/TransactionListenerImpl.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/listener/TransactionListenerImpl.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/listener/TransactionListenerImpl.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/java/cn/iocoder/springcloudalibaba/labx6/rocketmqdemo/producerdemo/message/MySource.java diff --git a/labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/resources/application.yml b/labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/resources/application.yml similarity index 100% rename from labx-06/labx-06-sca-stream-rocketmq-producer-transaction/src/main/resources/application.yml rename to labx-06-spring-cloud-stream-rocketmq/labx-06-sca-stream-rocketmq-producer-transaction/src/main/resources/application.yml diff --git a/labx-06/pom.xml b/labx-06-spring-cloud-stream-rocketmq/pom.xml similarity index 95% rename from labx-06/pom.xml rename to labx-06-spring-cloud-stream-rocketmq/pom.xml index 72ece8e1d..3c8336606 100644 --- a/labx-06/pom.xml +++ b/labx-06-spring-cloud-stream-rocketmq/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-06 + labx-06-spring-cloud-stream-rocketmq pom labx-06-sca-stream-rocketmq-consumer-demo diff --git "a/labx-06/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" "b/labx-06-spring-cloud-stream-rocketmq/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-06/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" rename to "labx-06-spring-cloud-stream-rocketmq/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\266\210\346\201\257\351\230\237\345\210\227 RocketMQ \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 67096a302..0d45782fa 100644 --- a/pom.xml +++ b/pom.xml @@ -85,8 +85,8 @@ - labx-05-spring-cloud-alibaba-nacos-config - + + labx-06-spring-cloud-stream-rocketmq From 4e93867b9c9f4ac8615a81f543f4bff4f74c8e35 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 09:23:08 +0800 Subject: [PATCH 097/115] =?UTF-8?q?Spring=20Cloud=20Stream=20Alibaba=20Dub?= =?UTF-8?q?bo=20=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- .../labx-07-sca-dubbo-demo01-api/pom.xml | 0 .../iocoder/springcloudalibaba/labx7/api/UserService.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java | 0 .../labx-07-sca-dubbo-demo01-consumer/pom.xml | 0 .../labx7/consumerdemo/ConsumerApplication.java | 0 .../labx7/consumerdemo/controller/UserController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo01-provider/pom.xml | 0 .../labx7/providerdemo/ProviderApplication.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo01/pom.xml | 2 +- .../labx-07-sca-dubbo-demo02-api/pom.xml | 0 .../iocoder/springcloudalibaba/labx7/api/UserService.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java | 0 .../labx-07-sca-dubbo-demo02-consumer/pom.xml | 0 .../labx7/consumerdemo/FeignConsumerApplication.java | 0 .../labx7/consumerdemo/config/RestTemplateConfig.java | 0 .../labx7/consumerdemo/controller/User01Controller.java | 0 .../labx7/consumerdemo/controller/User02Controller.java | 0 .../labx7/consumerdemo/controller/User03Controller.java | 0 .../labx7/consumerdemo/controller/User04Controller.java | 0 .../labx7/consumerdemo/dto/UserAddDTO.java | 0 .../springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java | 0 .../labx7/consumerdemo/feign/UserFeignClient.java | 0 .../labx7/consumerdemo/feign/UserFeignClient02.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo02-provider-rest/pom.xml | 0 .../labx7/providerdemo/RestProviderApplication.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml | 0 .../labx7/providerdemo/SpringMVCProviderApplication.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo02/pom.xml | 2 +- .../labx-07-sca-dubbo-demo03-api/pom.xml | 0 .../iocoder/springcloudalibaba/labx7/api/UserService.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java | 0 .../labx-07-sca-dubbo-demo03-consumer/pom.xml | 0 .../labx7/consumerdemo/ConsumerApplication.java | 0 .../labx7/consumerdemo/controller/UserController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo03-provider/pom.xml | 0 .../labx7/providerdemo/ProviderApplication.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo03-validation/pom.xml | 2 +- .../labx-07-sca-dubbo-demo04-api/pom.xml | 0 .../iocoder/springcloudalibaba/labx7/api/UserService.java | 0 .../springcloudalibaba/labx7/core/ServiceException.java | 0 .../springcloudalibaba/labx7/core/ServiceExceptionEnum.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java | 0 .../labx-07-sca-dubbo-demo04-consumer/pom.xml | 0 .../labx7/consumerdemo/ConsumerApplication.java | 0 .../labx7/consumerdemo/controller/UserController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo04-provider/pom.xml | 0 .../labx7/providerdemo/ProviderApplication.java | 0 .../labx7/providerdemo/filter/DubboExceptionFilter.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo04-filter/pom.xml | 2 +- .../labx-07-sca-dubbo-demo05-api/pom.xml | 0 .../iocoder/springcloudalibaba/labx7/api/UserService.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java | 0 .../cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java | 0 .../labx-07-sca-dubbo-demo05-consumer/pom.xml | 0 .../labx7/consumerdemo/ConsumerApplication.java | 0 .../labx7/consumerdemo/controller/UserController.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo05-provider/pom.xml | 0 .../labx7/providerdemo/ProviderApplication.java | 0 .../labx7/providerdemo/service/UserServiceImpl.java | 0 .../src/main/resources/application.yaml | 0 .../labx-07-sca-dubbo-demo05-sentinel/pom.xml | 2 +- {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/pom.xml | 2 +- ...7\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 85 files changed, 11 insertions(+), 11 deletions(-) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo01/pom.xml (91%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/FeignConsumerApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/config/RestTemplateConfig.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User01Controller.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User02Controller.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User03Controller.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User04Controller.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient02.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/RestProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/SpringMVCProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo02/pom.xml (92%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo03-validation/pom.xml (91%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceException.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceExceptionEnum.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/filter/DubboExceptionFilter.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo04-filter/pom.xml (91%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/pom.xml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/resources/application.yaml (100%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/labx-07-sca-dubbo-demo05-sentinel/pom.xml (91%) rename {labx-07 => labx-07-spring-cloud-alibaba-dubbo}/pom.xml (92%) rename "labx-07/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" => "labx-07-spring-cloud-alibaba-dubbo/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 3c26930ec..5667fb346 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ * [《芋道 Spring Cloud Alibaba 介绍》](http://www.iocoder.cn/Spring-Cloud-Alibaba/intro/?github) * [《芋道 Spring Cloud Alibaba 注册中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Discovery/?github) 对应 [labx-01-spring-cloud-alibaba-nacos-discovery](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-01-spring-cloud-alibaba-nacos-discovery) -* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) +* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07-spring-cloud-alibaba-dubbo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07-spring-cloud-alibaba-dubbo) * [《芋道 Spring Cloud Alibaba 服务容错 Sentinel 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Sentinel/?github) 对应 [labx-04-spring-cloud-alibaba-sentinel](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-04-spring-cloud-alibaba-sentinel) * [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) * [《芋道 Spring Cloud Alibaba 事件总线 Bus RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Bus-RocketMQ/?github) 对应 [labx-20](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-20) @@ -186,7 +186,7 @@ ## 服务调用 -* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) +* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07-spring-cloud-alibaba-dubbo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07-spring-cloud-alibaba-dubbo) * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) * [《芋道 Spring Cloud 服务调用 gRPC 入门》](http://www.iocoder.cn/Spring-Cloud/gRPC/?github) 对应 [labx-30-spring-cloud-grpc](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-30-spring-cloud-grpc) @@ -260,7 +260,7 @@ ## 基础入门 * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) -* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07) +* [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07-spring-cloud-alibaba-dubbo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07-spring-cloud-alibaba-dubbo) * [《性能测试 —— Dubbo 基准测试》](http://www.iocoder.cn/Performance-Testing/Dubbo-benchmark/?github) ## 注册中心 diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-consumer/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/labx-07-sca-dubbo-demo01-provider/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo01/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/pom.xml similarity index 91% rename from labx-07/labx-07-sca-dubbo-demo01/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/pom.xml index 39b962a57..b2a7eb8f4 100644 --- a/labx-07/labx-07-sca-dubbo-demo01/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo01/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-07 + labx-07-spring-cloud-alibaba-dubbo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/FeignConsumerApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/FeignConsumerApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/FeignConsumerApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/FeignConsumerApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/config/RestTemplateConfig.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/config/RestTemplateConfig.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/config/RestTemplateConfig.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/config/RestTemplateConfig.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User01Controller.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User01Controller.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User01Controller.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User01Controller.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User02Controller.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User02Controller.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User02Controller.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User02Controller.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User03Controller.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User03Controller.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User03Controller.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User03Controller.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User04Controller.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User04Controller.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User04Controller.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/User04Controller.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient02.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient02.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient02.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/feign/UserFeignClient02.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-consumer/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/RestProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/RestProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/RestProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/RestProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-rest/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/SpringMVCProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/SpringMVCProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/SpringMVCProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/SpringMVCProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/labx-07-sca-dubbo-demo02-provider-springmvc/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo02/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/pom.xml similarity index 92% rename from labx-07/labx-07-sca-dubbo-demo02/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/pom.xml index 0bc935906..0de32078d 100644 --- a/labx-07/labx-07-sca-dubbo-demo02/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo02/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-07 + labx-07-spring-cloud-alibaba-dubbo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-consumer/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/labx-07-sca-dubbo-demo03-provider/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo03-validation/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/pom.xml similarity index 91% rename from labx-07/labx-07-sca-dubbo-demo03-validation/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/pom.xml index 65ac25d9a..74cd4efa2 100644 --- a/labx-07/labx-07-sca-dubbo-demo03-validation/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo03-validation/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-07 + labx-07-spring-cloud-alibaba-dubbo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceException.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceException.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceException.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceException.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceExceptionEnum.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceExceptionEnum.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceExceptionEnum.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/core/ServiceExceptionEnum.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-consumer/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/filter/DubboExceptionFilter.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/filter/DubboExceptionFilter.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/filter/DubboExceptionFilter.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/filter/DubboExceptionFilter.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/pom.xml similarity index 91% rename from labx-07/labx-07-sca-dubbo-demo04-filter/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/pom.xml index a9c52af81..eac6739b0 100644 --- a/labx-07/labx-07-sca-dubbo-demo04-filter/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo04-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-07 + labx-07-spring-cloud-alibaba-dubbo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/api/UserService.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserAddDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-api/src/main/java/cn/iocoder/springcloudalibaba/labx7/dto/UserDTO.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/ConsumerApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/java/cn/iocoder/springcloudalibaba/labx7/consumerdemo/controller/UserController.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-consumer/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/pom.xml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/pom.xml diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/ProviderApplication.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/java/cn/iocoder/springcloudalibaba/labx7/providerdemo/service/UserServiceImpl.java diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/resources/application.yaml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/resources/application.yaml similarity index 100% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/resources/application.yaml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/labx-07-sca-dubbo-demo05-provider/src/main/resources/application.yaml diff --git a/labx-07/labx-07-sca-dubbo-demo05-sentinel/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/pom.xml similarity index 91% rename from labx-07/labx-07-sca-dubbo-demo05-sentinel/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/pom.xml index 02e6efb29..309074c9d 100644 --- a/labx-07/labx-07-sca-dubbo-demo05-sentinel/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/labx-07-sca-dubbo-demo05-sentinel/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-07 + labx-07-spring-cloud-alibaba-dubbo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/pom.xml b/labx-07-spring-cloud-alibaba-dubbo/pom.xml similarity index 92% rename from labx-07/pom.xml rename to labx-07-spring-cloud-alibaba-dubbo/pom.xml index ed4b3bc0a..2e235a20b 100644 --- a/labx-07/pom.xml +++ b/labx-07-spring-cloud-alibaba-dubbo/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-07 + labx-07-spring-cloud-alibaba-dubbo pom labx-07-sca-dubbo-demo01 diff --git "a/labx-07/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" "b/labx-07-spring-cloud-alibaba-dubbo/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-07/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" rename to "labx-07-spring-cloud-alibaba-dubbo/\343\200\212\350\212\213\351\201\223 Spring Cloud Alibaba \346\234\215\345\212\241\350\260\203\347\224\250 Dubbo \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 0d45782fa..444266820 100644 --- a/pom.xml +++ b/pom.xml @@ -86,8 +86,8 @@ - labx-06-spring-cloud-stream-rocketmq - + + labx-07-spring-cloud-alibaba-dubbo From da07783a2700cf041fc85cee69e256b981a4cb4a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 09:28:12 +0800 Subject: [PATCH 098/115] =?UTF-8?q?Spring=20Cloud=20Gateway=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +-- .../labx-08-sc-gateway-demo01-test/pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../gatewaydemo/config/GatewayConfig.java | 0 .../src/main/resources/application.yaml | 0 .../labx-08-sc-gateway-demo01/pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../GatewayPropertiesRefresher.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/bootstrap.yaml | 0 .../labx-08-sc-gateway-demo04/pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../filter/AuthGatewayFilterFactory.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../gatewaydemo/config/GatewayConfig.java | 0 .../src/main/resources/application.yaml | 0 .../labx-08-sc-gateway-demo07-hystrix/pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../controller/FallbackController.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../CustomBlockRequestHandler.java | 0 .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../main/resources/sentinel-gw-api-group.json | 0 .../src/main/resources/sentinel-gw-flow.json | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../labx08/gatewaydemo/User03Controller.java | 0 .../config/RestTemplateConfig.java | 0 .../gatewaydemo/filter/DubboFilter.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- .../gatewaydemo/GatewayApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-08-sc-user-service/pom.xml | 2 +- .../userservice/UserServiceApplication.java | 0 .../controller/UserController.java | 0 .../labx08/userservice/dto/UserAddDTO.java | 0 .../labx08/userservice/dto/UserDTO.java | 0 .../src/main/resources/application.yaml | 0 .../pom.xml | 2 +- ...y \345\205\245\351\227\250\343\200\213.md" | 0 .../target/classes/application.yaml | 29 ------------------- pom.xml | 4 +-- 62 files changed, 19 insertions(+), 48 deletions(-) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01-test/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo01/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo02-registry/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-apollo/pom.xml (98%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-nacos/pom.xml (98%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo04/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo04/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo06-rate-limiter/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-hystrix/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml (98%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo09-actuator/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo10-troubleshooting/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/pom.xml (97%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/labx-08-sc-user-service/src/main/resources/application.yaml (100%) rename {labx-08 => labx-08-spring-cloud-gateway}/pom.xml (96%) rename "labx-08/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" => "labx-08-spring-cloud-gateway/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" (100%) delete mode 100644 labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml diff --git a/README.md b/README.md index 5667fb346..d76d16a5d 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) -* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) +* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应[labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) * [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) @@ -200,7 +200,7 @@ ## API 网关 -* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08) +* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud Netflix 服务网关 Zuul 入门》](http://www.iocoder.cn/Spring-Cloud/Netflix-Zuul/?github) 对应 对应 [labx-21](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-21) * [《性能测试 —— Spring Cloud Gateway、Zuul 基准测试》](http://www.iocoder.cn/Performance-Testing/SpringCloudGateway-Zuul-benchmark/?github) 对应 [lab-07](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-07) diff --git a/labx-08/labx-08-sc-gateway-demo01-test/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo01-test/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml index 7f948e8af..dcf49c185 100644 --- a/labx-08/labx-08-sc-gateway-demo01-test/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01-test/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo01/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo01/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml index c1d97988c..ed268059d 100644 --- a/labx-08/labx-08-sc-gateway-demo01/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo01/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo01/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo01/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo02-registry/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml index 7ae7c8130..0fa38bde2 100644 --- a/labx-08/labx-08-sc-gateway-demo02-registry/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo02-registry/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml index c261dea5c..e5ee9b639 100644 --- a/labx-08/labx-08-sc-gateway-demo03-config-apollo/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayPropertiesRefresher.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-apollo/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml index dbb8dd34a..e8a25e6c0 100644 --- a/labx-08/labx-08-sc-gateway-demo03-config-nacos/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo03-config-nacos/src/main/resources/bootstrap.yaml diff --git a/labx-08/labx-08-sc-gateway-demo04/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo04/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml index a197b6ebe..1c003ea2b 100644 --- a/labx-08/labx-08-sc-gateway-demo04/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo04/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo04/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo04/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml index 860c0774e..d45491317 100644 --- a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/AuthGatewayFilterFactory.java diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo05-custom-gateway-filter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml index 0534a3460..23b82b898 100644 --- a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/GatewayConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo06-rate-limiter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml index 2d6ee395e..3f31c1390 100644 --- a/labx-08/labx-08-sc-gateway-demo07-hystrix/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/controller/FallbackController.java diff --git a/labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-hystrix/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml index e2d82ac3d..9d5d2bf3a 100644 --- a/labx-08/labx-08-sc-gateway-demo07-sentinel/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/CustomBlockRequestHandler.java diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-api-group.json diff --git a/labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json similarity index 100% rename from labx-08/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo07-sentinel/src/main/resources/sentinel-gw-flow.json diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml similarity index 98% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml index 1b5b7b270..746889b9b 100644 --- a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/User03Controller.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/config/RestTemplateConfig.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/filter/DubboFilter.java diff --git a/labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo08-custom-global-filter/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml index d3303ca6b..7f7c7a517 100644 --- a/labx-08/labx-08-sc-gateway-demo09-actuator/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo09-actuator/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml similarity index 97% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml index 5342efed2..0b62af2ec 100644 --- a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java similarity index 100% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/java/cn/iocoder/springcloud/labx08/gatewaydemo/GatewayApplication.java diff --git a/labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-gateway-demo10-troubleshooting/src/main/resources/application.yaml diff --git a/labx-08/labx-08-sc-user-service/pom.xml b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml similarity index 97% rename from labx-08/labx-08-sc-user-service/pom.xml rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml index 3ed72ccec..593cf5e2e 100644 --- a/labx-08/labx-08-sc-user-service/pom.xml +++ b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-08 + labx-08-spring-cloud-gateway cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/UserServiceApplication.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/controller/UserController.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserAddDTO.java diff --git a/labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/java/cn/iocoder/springcloud/labx08/userservice/dto/UserDTO.java diff --git a/labx-08/labx-08-sc-user-service/src/main/resources/application.yaml b/labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/resources/application.yaml similarity index 100% rename from labx-08/labx-08-sc-user-service/src/main/resources/application.yaml rename to labx-08-spring-cloud-gateway/labx-08-sc-user-service/src/main/resources/application.yaml diff --git a/labx-08/pom.xml b/labx-08-spring-cloud-gateway/pom.xml similarity index 96% rename from labx-08/pom.xml rename to labx-08-spring-cloud-gateway/pom.xml index fd190eed8..04bdd794e 100644 --- a/labx-08/pom.xml +++ b/labx-08-spring-cloud-gateway/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-08 + labx-08-spring-cloud-gateway pom labx-08-sc-gateway-demo01 diff --git "a/labx-08/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" "b/labx-08-spring-cloud-gateway/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-08/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" rename to "labx-08-spring-cloud-gateway/\343\200\212\350\212\213\351\201\223 Spring Cloud \347\275\221\345\205\263 Spring Cloud Gateway \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml b/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml deleted file mode 100644 index f9d50ef00..000000000 --- a/labx-08/labx-08-sc-gateway-demo05-custom-gateway-filter/target/classes/application.yaml +++ /dev/null @@ -1,29 +0,0 @@ -server: - port: 8888 - -spring: - application: - name: gateway-application - - cloud: - # Spring Cloud Gateway 配置项，对应 GatewayProperties 类 - gateway: - # 路由配置项，对应 RouteDefinition 数组 - routes: - - id: yudaoyuanma # 路由的编号 - uri: http://www.iocoder.cn # 路由到的目标地址 - predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - - Path=/blog - filters: - - StripPrefix=1 - - id: oschina # 路由的编号 - uri: https://www.oschina.net # 路由的目标地址 - predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组 - - Path=/oschina - filters: # 过滤器，对请求进行拦截，实现自定义的功能，对应 FilterDefinition 数组 - - StripPrefix=1 - # 默认过滤器，对应 FilterDefinition 数组 - default-filters: - - name: Auth - args: - token-header-name: access-token diff --git a/pom.xml b/pom.xml index 444266820..6f00dbd06 100644 --- a/pom.xml +++ b/pom.xml @@ -87,8 +87,8 @@ - labx-07-spring-cloud-alibaba-dubbo - + + From a7a8f88d3b495d195f78b9536524435d4770c098 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 19:08:44 +0800 Subject: [PATCH 099/115] =?UTF-8?q?Spring=20Cloud=20Apollo=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../labx-09-sc-apollo-demo-auto-refresh/pom.xml | 2 +- .../iocoder/springcloud/labx09/apollodemo/DemoApplication.java | 0 .../springcloud/labx09/apollodemo/config/OrderProperties.java | 0 .../labx09/apollodemo/controller/DemoController.java | 0 .../labx09/apollodemo/listener/ApolloPropertiesRefresher.java | 0 .../src/main/resources/application.yaml | 0 .../labx-09-sc-apollo-demo-jasypt/pom.xml | 2 +- .../iocoder/springcloud/labx09/apollodemo/DemoApplication.java | 0 .../labx09/apollodemo/controller/DemoController.java | 0 .../src/main/resources/application.yaml | 0 .../cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java | 0 .../labx-09-sc-apollo-demo-multi/pom.xml | 2 +- .../iocoder/springcloud/labx09/apollodemo/DemoApplication.java | 0 .../src/main/resources/application.yaml | 0 .../labx-09-sc-apollo-demo-profiles/pom.xml | 2 +- .../iocoder/springcloud/labx09/apollodemo/DemoApplication.java | 0 .../src/main/resources/application-dev.yaml | 0 .../src/main/resources/application-prod.yaml | 0 .../src/main/resources/application.yaml | 0 .../labx-09-sc-apollo-demo/pom.xml | 2 +- .../iocoder/springcloud/labx09/apollodemo/DemoApplication.java | 0 .../springcloud/labx09/apollodemo/config/OrderProperties.java | 0 .../labx09/apollodemo/controller/DemoController.java | 0 .../labx-09-sc-apollo-demo/src/main/resources/application.yaml | 0 {labx-09 => labx-09-spring-cloud-apollo}/pom.xml | 2 +- ...\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 2 +- 28 files changed, 8 insertions(+), 8 deletions(-) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/pom.xml (97%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/listener/ApolloPropertiesRefresher.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-auto-refresh/src/main/resources/application.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-jasypt/pom.xml (98%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-jasypt/src/main/resources/application.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-jasypt/src/test/java/cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-multi/pom.xml (97%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-multi/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-multi/src/main/resources/application.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-profiles/pom.xml (97%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-profiles/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-profiles/src/main/resources/application-dev.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-profiles/src/main/resources/application-prod.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo-profiles/src/main/resources/application.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo/pom.xml (97%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/labx-09-sc-apollo-demo/src/main/resources/application.yaml (100%) rename {labx-09 => labx-09-spring-cloud-apollo}/pom.xml (93%) rename "labx-09/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" => "labx-09-spring-cloud-apollo/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index d76d16a5d..a8f4365c5 100644 --- a/README.md +++ b/README.md @@ -170,7 +170,7 @@ * [《芋道 Spring Cloud Netflix 负载均衡 Ribbon 入门》](http://www.iocoder.cn/Spring-Cloud-Netflix/Ribbon/?github) 对应 [labx-02-spring-cloud-netflix-ribbon](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-02-spring-cloud-netflix-ribbon) * [《芋道 Spring Cloud 声明式调用 Feign 入门》](http://www.iocoder.cn/Spring-Cloud/Feign/?github) 对应 [labx-03-spring-cloud-feign](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-03-spring-cloud-feign) -* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应[labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) +* [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) * [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/pom.xml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/pom.xml similarity index 97% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/pom.xml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/pom.xml index 1efbed715..933941c49 100644 --- a/labx-09/labx-09-sc-apollo-demo-auto-refresh/pom.xml +++ b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-09 + labx-09-spring-cloud-apollo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/listener/ApolloPropertiesRefresher.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/listener/ApolloPropertiesRefresher.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/listener/ApolloPropertiesRefresher.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/listener/ApolloPropertiesRefresher.java diff --git a/labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/resources/application.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/resources/application.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-auto-refresh/src/main/resources/application.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-auto-refresh/src/main/resources/application.yaml diff --git a/labx-09/labx-09-sc-apollo-demo-jasypt/pom.xml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/pom.xml similarity index 98% rename from labx-09/labx-09-sc-apollo-demo-jasypt/pom.xml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/pom.xml index ff9e09516..3b40053c3 100644 --- a/labx-09/labx-09-sc-apollo-demo-jasypt/pom.xml +++ b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-09 + labx-09-spring-cloud-apollo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-09/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java diff --git a/labx-09/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java diff --git a/labx-09/labx-09-sc-apollo-demo-jasypt/src/main/resources/application.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/resources/application.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-jasypt/src/main/resources/application.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/main/resources/application.yaml diff --git a/labx-09/labx-09-sc-apollo-demo-jasypt/src/test/java/cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/test/java/cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-jasypt/src/test/java/cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-jasypt/src/test/java/cn/iocoder/springcloud/labx09/apollodemo/JasyptTest.java diff --git a/labx-09/labx-09-sc-apollo-demo-multi/pom.xml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/pom.xml similarity index 97% rename from labx-09/labx-09-sc-apollo-demo-multi/pom.xml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/pom.xml index 4b9b56395..13f507ddd 100644 --- a/labx-09/labx-09-sc-apollo-demo-multi/pom.xml +++ b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-09 + labx-09-spring-cloud-apollo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-09/labx-09-sc-apollo-demo-multi/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-multi/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java diff --git a/labx-09/labx-09-sc-apollo-demo-multi/src/main/resources/application.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/src/main/resources/application.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-multi/src/main/resources/application.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-multi/src/main/resources/application.yaml diff --git a/labx-09/labx-09-sc-apollo-demo-profiles/pom.xml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/pom.xml similarity index 97% rename from labx-09/labx-09-sc-apollo-demo-profiles/pom.xml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/pom.xml index 76d3e9ac7..a82d5b750 100644 --- a/labx-09/labx-09-sc-apollo-demo-profiles/pom.xml +++ b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-09 + labx-09-spring-cloud-apollo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-09/labx-09-sc-apollo-demo-profiles/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-profiles/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java diff --git a/labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application-dev.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application-dev.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application-dev.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application-dev.yaml diff --git a/labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application-prod.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application-prod.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application-prod.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application-prod.yaml diff --git a/labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo-profiles/src/main/resources/application.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo-profiles/src/main/resources/application.yaml diff --git a/labx-09/labx-09-sc-apollo-demo/pom.xml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/pom.xml similarity index 97% rename from labx-09/labx-09-sc-apollo-demo/pom.xml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/pom.xml index e4c382ca2..d128a0d83 100644 --- a/labx-09/labx-09-sc-apollo-demo/pom.xml +++ b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-09 + labx-09-spring-cloud-apollo cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/DemoApplication.java diff --git a/labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/config/OrderProperties.java diff --git a/labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java similarity index 100% rename from labx-09/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/java/cn/iocoder/springcloud/labx09/apollodemo/controller/DemoController.java diff --git a/labx-09/labx-09-sc-apollo-demo/src/main/resources/application.yaml b/labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/resources/application.yaml similarity index 100% rename from labx-09/labx-09-sc-apollo-demo/src/main/resources/application.yaml rename to labx-09-spring-cloud-apollo/labx-09-sc-apollo-demo/src/main/resources/application.yaml diff --git a/labx-09/pom.xml b/labx-09-spring-cloud-apollo/pom.xml similarity index 93% rename from labx-09/pom.xml rename to labx-09-spring-cloud-apollo/pom.xml index 9989469ee..b0c742951 100644 --- a/labx-09/pom.xml +++ b/labx-09-spring-cloud-apollo/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-09 + labx-09-spring-cloud-apollo pom labx-09-sc-apollo-demo diff --git "a/labx-09/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" "b/labx-09-spring-cloud-apollo/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-09/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" rename to "labx-09-spring-cloud-apollo/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Apollo \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 6f00dbd06..f1dd29c85 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ - + From dcd1f661d44fdaf594f8a8721232b0fa0d5abd04 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 19:14:51 +0800 Subject: [PATCH 100/115] =?UTF-8?q?Spring=20Cloud=20Stream=20RabbitMQ=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++--- .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../consumerdemo/ConsumerApplication.java | 0 .../consumerdemo/listener/Demo01Consumer.java | 0 .../consumerdemo/listener/MySink.java | 0 .../consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../Demo01ProducerConfirmCallback.java | 0 .../message/Demo01ProducerReturnCallback.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../producerdemo/ProducerApplication.java | 0 .../config/TransactionConfig.java | 0 .../controller/Demo01Controller.java | 0 .../producerdemo/message/Demo01Message.java | 0 .../producerdemo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- ...Q \345\205\245\351\227\250\343\200\213.md" | 0 .../target/classes/application.yml | 35 ------------------- pom.xml | 2 +- 116 files changed, 24 insertions(+), 59 deletions(-) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-batch/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerConfirmCallback.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerReturnCallback.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-delay/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-demo/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml (97%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/config/TransactionConfig.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/resources/application.yml (100%) rename {labx-10 => labx-10-spring-cloud-stream-rabbitmq}/pom.xml (97%) rename "labx-10/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" => "labx-10-spring-cloud-stream-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" (100%) delete mode 100644 labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/target/classes/application.yml diff --git a/README.md b/README.md index a8f4365c5..8f1b02a39 100644 --- a/README.md +++ b/README.md @@ -213,7 +213,7 @@ ## 配置中心 * [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05-spring-cloud-alibaba-nacos-config](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05-spring-cloud-alibaba-nacos-config) -* [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09) +* [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09-spring-cloud-apollo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09-spring-cloud-apollo) * [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12) * [《芋道 Spring Cloud 配置中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Config/?github) 对应 [labx-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-26) * [《芋道 Spring Cloud 配置中心 Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Consul-Config/?github) 对应 [labx-28](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-28) @@ -223,7 +223,7 @@ **Spring Cloud Stream** * [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) -* [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10) +* [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10-spring-cloud-stream-rabbitmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10-spring-cloud-stream-rabbitmq) * [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11) * [《芋道 Spring Cloud 消息队列 ActiveMQ 入门》](http://www.iocoder.cn/Spring-Cloud/ActiveMQ/?github) @@ -331,8 +331,8 @@ ## RabbitMQ * [《RabbitMQ 极简入门》](http://www.iocoder.cn/RabbitMQ/install/?github) -* [《芋道 Spring Boot 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Boot/RabbitMQ/?github) 对应 [lab-04](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-04) -* [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10) +* [《芋道 Spring Boot 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Boot/RabbitMQ/?github) 对应 [lab-04-rabbitmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-04-rabbitmq) +* [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10-spring-cloud-stream-rabbitmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10-spring-cloud-stream-rabbitmq) * [《芋道 Spring Cloud 事件总线 Bus RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-RabbitMQ/?github) 对应 [labx-19](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-19) * [《RabbitMQ 书单整理》](http://www.iocoder.cn/Books/RabbitMQ-books-recommended/?github) diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml index 2e3c1fe70..221fd01d3 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-ack/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml index 19c44ad13..01d97df72 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-actuator/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml index ad603bd12..f1b97f7d7 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-batch/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml index 61a9d8bfa..e4e80a8b4 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-broadcasting/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml index 16832ae38..a759e6970 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-concurrency/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml index 7be4226e0..8acecd348 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-delay/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml index 31ab48b95..b436c8dc4 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-demo/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml index b0875e484..0a32cf5ec 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-error-handler/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml index 6739705d9..d7f03c7fe 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-filter/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml index 08ae197b5..0bda8d762 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-partitioning/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml index b97e1a5cc..71b61471b 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/ConsumerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/listener/MySink.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/consumerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-consumer-retry/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml index e1472d0d3..125f31962 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-actuator/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml index 81e8d8bef..96d7435b8 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-batch/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-batch/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml index c68b3e40c..7b9e7c02d 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerConfirmCallback.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerConfirmCallback.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerConfirmCallback.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerConfirmCallback.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerReturnCallback.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerReturnCallback.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerReturnCallback.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01ProducerReturnCallback.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-confirm/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml index 6695ee1d5..abf4aa46f 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-delay/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-delay/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml index 105a076b1..a6cd4b693 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-demo/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-demo/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml index 98234315e..a5787c937 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-partitioning/src/main/resources/application.yml diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml similarity index 97% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml index 289cd5078..f9a581bee 100644 --- a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-10 + labx-10-spring-cloud-stream-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/ProducerApplication.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/config/TransactionConfig.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/config/TransactionConfig.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/config/TransactionConfig.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/config/TransactionConfig.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/controller/Demo01Controller.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/Demo01Message.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/java/cn/iocoder/springcloud/labx10/rabbitmqdemo/producerdemo/message/MySource.java diff --git a/labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/resources/application.yml b/labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/resources/application.yml similarity index 100% rename from labx-10/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/resources/application.yml rename to labx-10-spring-cloud-stream-rabbitmq/labx-10-sc-stream-rabbitmq-producer-transaction/src/main/resources/application.yml diff --git a/labx-10/pom.xml b/labx-10-spring-cloud-stream-rabbitmq/pom.xml similarity index 97% rename from labx-10/pom.xml rename to labx-10-spring-cloud-stream-rabbitmq/pom.xml index fdcdbaf64..898feacf7 100644 --- a/labx-10/pom.xml +++ b/labx-10-spring-cloud-stream-rabbitmq/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-10 + labx-10-spring-cloud-stream-rabbitmq pom labx-10-sc-stream-rabbitmq-producer-demo diff --git "a/labx-10/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" "b/labx-10-spring-cloud-stream-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-10/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" rename to "labx-10-spring-cloud-stream-rabbitmq/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 RabbitMQ \345\205\245\351\227\250\343\200\213.md" diff --git a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/target/classes/application.yml b/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/target/classes/application.yml deleted file mode 100644 index 9bff11e17..000000000 --- a/labx-10/labx-10-sc-stream-rabbitmq-consumer-delay/target/classes/application.yml +++ /dev/null @@ -1,35 +0,0 @@ -spring: - application: - name: demo-consumer-application - cloud: - # Spring Cloud Stream 配置项，对应 BindingServiceProperties 类 - stream: - # Binder 配置项，对应 BinderProperties Map - binders: - rabbit001: - type: rabbit # 设置 Binder 的类型 - environment: # 设置 Binder 的环境配置 - # 如果是 RabbitMQ 类型的时候，则对应的是 RabbitProperties 类 - spring: - rabbitmq: - host: 127.0.0.1 # RabbitMQ 服务的地址 - port: 5672 # RabbitMQ 服务的端口 - username: guest # RabbitMQ 服务的账号 - password: guest # RabbitMQ 服务的密码 - # Binding 配置项，对应 BindingProperties Map - bindings: - demo01-input: - destination: DEMO-TOPIC-02 # 目的地。这里使用 RabbitMQ Exchange - content-type: application/json # 内容格式。这里使用 JSON - group: demo01-consumer-group-DEMO-TOPIC-01 # 消费者分组 - binder: rabbit001 # 设置使用的 Binder 名字 - # RabbitMQ 自定义 Binding 配置项，对应 RabbitBindingProperties Map - rabbit: - bindings: - demo01-input: - # RabbitMQ Consumer 配置项，对应 RabbitConsumerProperties 类 - consumer: - delayed-exchange: true # 是否使用 x-delayed-message 类型的 Exchange，即延迟消息，默认为 false - -server: - port: ${random.int[10000,19999]} # 随机端口，方便启动多个消费者 diff --git a/pom.xml b/pom.xml index f1dd29c85..49715f9b0 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - + labx-10-spring-cloud-stream-rabbitmq From 7aed640e930ac80a4925a03785553b11040846ff Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 19:23:38 +0800 Subject: [PATCH 101/115] =?UTF-8?q?Spring=20Cloud=20Stream=20Kafka=20?= =?UTF-8?q?=E5=85=A5=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- .../labx-11-sc-stream-kafka-consumer-ack/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-actuator/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-batch/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-concurrency/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-demo/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-error-handler/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-filter/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-partitioning/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-retry/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-consumer-transaction/pom.xml | 2 +- .../labx11/kafkademo/consumerdemo/ConsumerApplication.java | 0 .../kafkademo/consumerdemo/listener/Demo01Consumer.java | 0 .../labx11/kafkademo/consumerdemo/listener/MySink.java | 0 .../labx11/kafkademo/consumerdemo/message/Demo01Message.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-producer-actuator/pom.xml | 2 +- .../labx11/kafkademo/kafkademo/ProducerApplication.java | 0 .../kafkademo/kafkademo/controller/Demo01Controller.java | 0 .../labx11/kafkademo/kafkademo/message/Demo01Message.java | 0 .../labx11/kafkademo/kafkademo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-producer-batch/pom.xml | 2 +- .../labx11/kafkademo/kafkademo/ProducerApplication.java | 0 .../kafkademo/kafkademo/controller/Demo01Controller.java | 0 .../labx11/kafkademo/kafkademo/message/Demo01Message.java | 0 .../labx11/kafkademo/kafkademo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-producer-demo/pom.xml | 2 +- .../labx11/kafkademo/kafkademo/ProducerApplication.java | 0 .../kafkademo/kafkademo/controller/Demo01Controller.java | 0 .../labx11/kafkademo/kafkademo/message/Demo01Message.java | 0 .../labx11/kafkademo/kafkademo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-producer-partitioning/pom.xml | 2 +- .../labx11/kafkademo/kafkademo/ProducerApplication.java | 0 .../kafkademo/kafkademo/controller/Demo01Controller.java | 0 .../labx11/kafkademo/kafkademo/message/Demo01Message.java | 0 .../labx11/kafkademo/kafkademo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 .../labx-11-sc-stream-kafka-producer-transaction/pom.xml | 2 +- .../labx11/kafkademo/kafkademo/ProducerApplication.java | 0 .../labx11/kafkademo/kafkademo/config/TransactionConfig.java | 0 .../kafkademo/kafkademo/controller/Demo01Controller.java | 0 .../labx11/kafkademo/kafkademo/message/Demo01Message.java | 0 .../labx11/kafkademo/kafkademo/message/MySource.java | 0 .../src/main/resources/application.yml | 0 {labx-11 => labx-11-spring-cloud-stream-kafka}/pom.xml | 2 +- ...345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 4 ++-- 101 files changed, 21 insertions(+), 21 deletions(-) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-ack/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-actuator/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-batch/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-concurrency/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-demo/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-error-handler/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-filter/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-partitioning/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-retry/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-consumer-transaction/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-actuator/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-batch/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-demo/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-partitioning/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/pom.xml (97%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/config/TransactionConfig.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/labx-11-sc-stream-kafka-producer-transaction/src/main/resources/application.yml (100%) rename {labx-11 => labx-11-spring-cloud-stream-kafka}/pom.xml (97%) rename "labx-11/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" => "labx-11-spring-cloud-stream-kafka/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 8f1b02a39..aea573d81 100644 --- a/README.md +++ b/README.md @@ -224,7 +224,7 @@ **Spring Cloud Stream** * [《芋道 Spring Cloud Alibaba 消息队列 RocketMQ 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/RocketMQ/?github) 对应 [labx-06-spring-cloud-stream-rocketmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-06-spring-cloud-stream-rocketmq) * [《芋道 Spring Cloud 消息队列 RabbitMQ 入门》](http://www.iocoder.cn/Spring-Cloud/RabbitMQ/?github) 对应 [labx-10-spring-cloud-stream-rabbitmq](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-10-spring-cloud-stream-rabbitmq) -* [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11) +* [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11-spring-cloud-stream-kafka](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11-spring-cloud-stream-kafka) * [《芋道 Spring Cloud 消息队列 ActiveMQ 入门》](http://www.iocoder.cn/Spring-Cloud/ActiveMQ/?github) **Spring Cloud Bus** @@ -340,7 +340,7 @@ * [《Kafka 极简入门》](http://www.iocoder.cn/Kafka/install/?github) * [《芋道 Spring Boot 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Boot/Kafka/?github) 对应 [lab-03](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-03) -* [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11) +* [《芋道 Spring Cloud 消息队列 Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Kafka/?github) 对应 [labx-11-spring-cloud-stream-kafka](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-11-spring-cloud-stream-kafka) * [《芋道 Spring Cloud 事件总线 Bus Kafka 入门》](http://www.iocoder.cn/Spring-Cloud/Bus-Kafka/?github) 对应 [labx-18](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-18) * [《Kafka 书单整理》](http://www.iocoder.cn/Books/Kafka-books-recommended/?github) diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/pom.xml index d29b1fd8a..4e534fdc6 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-ack/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-ack/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-ack/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/pom.xml index 9b2b4202d..8ec8a3c73 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-actuator/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-actuator/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/pom.xml index 1dc128fdb..e271914a9 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-batch/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-batch/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-batch/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml index 5a3cbaaa0..877963492 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-broadcasting/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml index 3eea5acd7..d18d64256 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-concurrency/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-concurrency/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/pom.xml index 021d5a0de..bcfbe5fde 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-demo/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-demo/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-demo/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml index f977b8d4b..f48969780 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-error-handler/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-error-handler/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/pom.xml index 1533110a4..c9e91d88f 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-filter/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-filter/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-filter/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml index 438af7903..bc46ac2bc 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-partitioning/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-partitioning/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/pom.xml index d9cd9498e..dbbe88292 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-retry/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-retry/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-retry/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/pom.xml index 7f165c648..1171410cd 100644 --- a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/ConsumerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/Demo01Consumer.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/listener/MySink.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/consumerdemo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-consumer-transaction/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-consumer-transaction/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/pom.xml index 179381ad0..e0631da41 100644 --- a/labx-11/labx-11-sc-stream-kafka-producer-actuator/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-actuator/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-actuator/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/pom.xml index 579473ee6..013fc309a 100644 --- a/labx-11/labx-11-sc-stream-kafka-producer-batch/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-batch/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-batch/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/pom.xml index 451b14ca0..41620906c 100644 --- a/labx-11/labx-11-sc-stream-kafka-producer-demo/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-demo/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-demo/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/pom.xml index 877a2cb78..74cce3f3c 100644 --- a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-partitioning/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-partitioning/src/main/resources/application.yml diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/pom.xml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/pom.xml similarity index 97% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/pom.xml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/pom.xml index cdebac524..adf0827b9 100644 --- a/labx-11/labx-11-sc-stream-kafka-producer-transaction/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-11 + labx-11-spring-cloud-stream-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/ProducerApplication.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/config/TransactionConfig.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/config/TransactionConfig.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/config/TransactionConfig.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/config/TransactionConfig.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/controller/Demo01Controller.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/Demo01Message.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/java/cn/iocoder/springcloud/labx11/kafkademo/kafkademo/message/MySource.java diff --git a/labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/resources/application.yml b/labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/resources/application.yml similarity index 100% rename from labx-11/labx-11-sc-stream-kafka-producer-transaction/src/main/resources/application.yml rename to labx-11-spring-cloud-stream-kafka/labx-11-sc-stream-kafka-producer-transaction/src/main/resources/application.yml diff --git a/labx-11/pom.xml b/labx-11-spring-cloud-stream-kafka/pom.xml similarity index 97% rename from labx-11/pom.xml rename to labx-11-spring-cloud-stream-kafka/pom.xml index 1d92ae6a9..53d41ca6a 100644 --- a/labx-11/pom.xml +++ b/labx-11-spring-cloud-stream-kafka/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-11 + labx-11-spring-cloud-stream-kafka pom diff --git "a/labx-11/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" "b/labx-11-spring-cloud-stream-kafka/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-11/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" rename to "labx-11-spring-cloud-stream-kafka/\343\200\212\350\212\213\351\201\223 Spring Cloud \346\266\210\346\201\257\351\230\237\345\210\227 Kafka \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 49715f9b0..82b7c59df 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,8 @@ - labx-10-spring-cloud-stream-rabbitmq - + + From e8f7dab32085d65cc0a7733b1f4bf51cb82c3dad Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 19:31:27 +0800 Subject: [PATCH 102/115] =?UTF-8?q?Spring=20Cloud=20Config=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../labx-12-sc-config-server-demo/pom.xml | 2 +- .../configserverdemo/ConfigServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/shared/user-application.yml | 0 .../pom.xml | 2 +- .../configserverdemo/ConfigServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../labx-12-sc-config-server-git-nacos/pom.xml | 2 +- .../configserverdemo/ConfigServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../labx-12-sc-config-server-git/pom.xml | 2 +- .../configserverdemo/ConfigServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/configserver.jks | Bin .../pom.xml | 2 +- .../labx12/userapplication/UserApplication.java | 0 .../userapplication/config/OrderProperties.java | 0 .../userapplication/controller/DemoController.java | 0 .../listener/DemoEnvironmentChangeListener.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 .../pom.xml | 2 +- .../labx12/userapplication/UserApplication.java | 0 .../userapplication/config/OrderProperties.java | 0 .../userapplication/controller/DemoController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 .../pom.xml | 2 +- .../labx12/userapplication/UserApplication.java | 0 .../userapplication/config/OrderProperties.java | 0 .../userapplication/controller/DemoController.java | 0 .../src/main/resources/bootstrap.yml | 0 .../labx-12-sc-config-user-application/pom.xml | 2 +- .../labx12/userapplication/UserApplication.java | 0 .../userapplication/config/OrderProperties.java | 0 .../userapplication/controller/DemoController.java | 0 .../src/main/resources/bootstrap.yml | 0 {labx-12 => labx-12-spring-cloud-config}/pom.xml | 2 +- ... Config \345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 2 +- 42 files changed, 11 insertions(+), 11 deletions(-) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-demo/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-demo/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-demo/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-demo/src/main/resources/shared/user-application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-nacos/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-nacos/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git-nacos/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git/pom.xml (98%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git/src/main/resources/bootstrap.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-server-git/src/main/resources/configserver.jks (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/listener/DemoEnvironmentChangeListener.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/bootstrap.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-nacos/pom.xml (98%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application-nacos/src/main/resources/bootstrap.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application/pom.xml (97%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java (100%) rename {labx-12 => labx-12-spring-cloud-config}/labx-12-sc-config-user-application/src/main/resources/bootstrap.yml (100%) rename {labx-12 => labx-12-spring-cloud-config}/pom.xml (95%) rename "labx-12/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" => "labx-12-spring-cloud-config/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index aea573d81..69bd69ac6 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,7 @@ * [《芋道 Spring Cloud Alibaba 配置中心 Nacos 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Nacos-Config/?github) 对应 [labx-05-spring-cloud-alibaba-nacos-config](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-05-spring-cloud-alibaba-nacos-config) * [《芋道 Spring Cloud 配置中心 Apollo 入门》](http://www.iocoder.cn/Spring-Cloud/Apollo/?github) 对应 [labx-09-spring-cloud-apollo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-09-spring-cloud-apollo) -* [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12) +* [《芋道 Spring Cloud 配置中心 Spring Cloud Config 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Config/?github) 对应 [labx-12-spring-cloud-config](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-12-spring-cloud-config) * [《芋道 Spring Cloud 配置中心 Zookeeper 入门》](http://www.iocoder.cn/Spring-Cloud/ZooKeeper-Config/?github) 对应 [labx-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-26) * [《芋道 Spring Cloud 配置中心 Consul 入门》](http://www.iocoder.cn/Spring-Cloud/Consul-Config/?github) 对应 [labx-28](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-28) * [《芋道 Spring Cloud 配置中心 Etcd 入门》](http://www.iocoder.cn/Spring-Cloud/Etcd/?github) diff --git a/labx-12/labx-12-sc-config-server-demo/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-server-demo/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-server-demo/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-demo/pom.xml index f47ec6862..ed9767454 100644 --- a/labx-12/labx-12-sc-config-server-demo/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-server-demo/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-server-demo/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-server-demo/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java diff --git a/labx-12/labx-12-sc-config-server-demo/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-demo/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-server-demo/src/main/resources/shared/user-application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/resources/shared/user-application.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-demo/src/main/resources/shared/user-application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-demo/src/main/resources/shared/user-application.yml diff --git a/labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml index e2f9b9212..1865f105d 100644 --- a/labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java diff --git a/labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-auto-refresh-by-bus/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-server-git-nacos/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-server-git-nacos/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/pom.xml index 17564feea..bbdd31751 100644 --- a/labx-12/labx-12-sc-config-server-git-nacos/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-server-git-nacos/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-server-git-nacos/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java diff --git a/labx-12/labx-12-sc-config-server-git-nacos/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-git-nacos/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git-nacos/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-server-git/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/pom.xml similarity index 98% rename from labx-12/labx-12-sc-config-server-git/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git/pom.xml index dff320d70..eab8a83ec 100644 --- a/labx-12/labx-12-sc-config-server-git/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-server-git/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-server-git/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/java/cn/iocoder/springcloud/labx12/configserverdemo/ConfigServerApplication.java diff --git a/labx-12/labx-12-sc-config-server-git/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-git/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-server-git/src/main/resources/bootstrap.yml b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/bootstrap.yml similarity index 100% rename from labx-12/labx-12-sc-config-server-git/src/main/resources/bootstrap.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/bootstrap.yml diff --git a/labx-12/labx-12-sc-config-server-git/src/main/resources/configserver.jks b/labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/configserver.jks similarity index 100% rename from labx-12/labx-12-sc-config-server-git/src/main/resources/configserver.jks rename to labx-12-spring-cloud-config/labx-12-sc-config-server-git/src/main/resources/configserver.jks diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml index 66cc7efa3..b1d40dccf 100644 --- a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/listener/DemoEnvironmentChangeListener.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/listener/DemoEnvironmentChangeListener.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/listener/DemoEnvironmentChangeListener.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/java/cn/iocoder/springcloud/labx12/userapplication/listener/DemoEnvironmentChangeListener.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/bootstrap.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/bootstrap.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/bootstrap.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-actuator/src/main/resources/bootstrap.yml diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml index 34bda74a7..e6b42c74e 100644 --- a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/application.yml diff --git a/labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-auto-refresh-by-bus/src/main/resources/bootstrap.yml diff --git a/labx-12/labx-12-sc-config-user-application-nacos/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/pom.xml similarity index 98% rename from labx-12/labx-12-sc-config-user-application-nacos/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/pom.xml index 6fbfeed8d..60ae0c0cf 100644 --- a/labx-12/labx-12-sc-config-user-application-nacos/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java diff --git a/labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java diff --git a/labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java diff --git a/labx-12/labx-12-sc-config-user-application-nacos/src/main/resources/bootstrap.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/resources/bootstrap.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application-nacos/src/main/resources/bootstrap.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application-nacos/src/main/resources/bootstrap.yml diff --git a/labx-12/labx-12-sc-config-user-application/pom.xml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/pom.xml similarity index 97% rename from labx-12/labx-12-sc-config-user-application/pom.xml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application/pom.xml index 690d346b5..409a82bc7 100644 --- a/labx-12/labx-12-sc-config-user-application/pom.xml +++ b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/pom.xml @@ -3,7 +3,7 @@ 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"> - labx-12 + labx-12-spring-cloud-config cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/UserApplication.java diff --git a/labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/config/OrderProperties.java diff --git a/labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java similarity index 100% rename from labx-12/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/java/cn/iocoder/springcloud/labx12/userapplication/controller/DemoController.java diff --git a/labx-12/labx-12-sc-config-user-application/src/main/resources/bootstrap.yml b/labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/resources/bootstrap.yml similarity index 100% rename from labx-12/labx-12-sc-config-user-application/src/main/resources/bootstrap.yml rename to labx-12-spring-cloud-config/labx-12-sc-config-user-application/src/main/resources/bootstrap.yml diff --git a/labx-12/pom.xml b/labx-12-spring-cloud-config/pom.xml similarity index 95% rename from labx-12/pom.xml rename to labx-12-spring-cloud-config/pom.xml index 72c36965c..e726f93c0 100644 --- a/labx-12/pom.xml +++ b/labx-12-spring-cloud-config/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - labx-12 + labx-12-spring-cloud-config pom diff --git "a/labx-12/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" "b/labx-12-spring-cloud-config/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "labx-12/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" rename to "labx-12-spring-cloud-config/\343\200\212\350\212\213\351\201\223 Spring Cloud \351\205\215\347\275\256\344\270\255\345\277\203 Spring Cloud Config \345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 82b7c59df..c48ba33ff 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ - + labx-12-spring-cloud-config From 7711aced26b594b6dfecd934dfe36b1fb5505767 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sun, 28 Jun 2020 19:37:31 +0800 Subject: [PATCH 103/115] =?UTF-8?q?=E5=9F=BA=E5=87=86=E6=B5=8B=E8=AF=95=20?= =?UTF-8?q?Tomcat=E3=80=81Jetty=E3=80=81Undertow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lab-05-jetty/pom.xml | 2 +- .../cn/iocoder/springboot/labs/lab05/tomcat/Controller.java | 0 .../springboot/labs/lab05/tomcat/JettyApplication.java | 0 .../lab-05-tomcat-apr/pom.xml | 2 +- .../cn/iocoder/springboot/labs/lab05/tomcat/Controller.java | 0 .../springboot/labs/lab05/tomcat/TomcatAprApplication.java | 0 .../lab-05-tomcat/pom.xml | 2 +- .../cn/iocoder/springboot/labs/lab05/tomcat/Controller.java | 0 .../springboot/labs/lab05/tomcat/TomcatApplication.java | 0 .../lab-05-undertow/pom.xml | 2 +- .../cn/iocoder/springboot/labs/lab05/undertow/Controller.java | 0 .../springboot/labs/lab05/undertow/UndertowApplication.java | 0 {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/pom.xml | 2 +- ...37\272\345\207\206\346\265\213\350\257\225\343\200\213.md" | 0 pom.xml | 4 ++-- 15 files changed, 7 insertions(+), 7 deletions(-) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-jetty/pom.xml (95%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/JettyApplication.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat-apr/pom.xml (96%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatAprApplication.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat/pom.xml (93%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatApplication.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-undertow/pom.xml (95%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/Controller.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/UndertowApplication.java (100%) rename {lab-05 => lab-05-benchmark-tomcat-jetty-undertow}/pom.xml (92%) rename "lab-05/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" => "lab-05-benchmark-tomcat-jetty-undertow/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" (100%) diff --git a/lab-05/lab-05-jetty/pom.xml b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/pom.xml similarity index 95% rename from lab-05/lab-05-jetty/pom.xml rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/pom.xml index 85441b3ab..64dc5b6cf 100644 --- a/lab-05/lab-05-jetty/pom.xml +++ b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-05 + lab-05-benchmark-tomcat-jetty-undertow cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-05/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java similarity index 100% rename from lab-05/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java diff --git a/lab-05/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/JettyApplication.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/JettyApplication.java similarity index 100% rename from lab-05/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/JettyApplication.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-jetty/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/JettyApplication.java diff --git a/lab-05/lab-05-tomcat-apr/pom.xml b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/pom.xml similarity index 96% rename from lab-05/lab-05-tomcat-apr/pom.xml rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/pom.xml index bad157449..3c191b0a4 100644 --- a/lab-05/lab-05-tomcat-apr/pom.xml +++ b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-05 + lab-05-benchmark-tomcat-jetty-undertow cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-05/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java similarity index 100% rename from lab-05/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java diff --git a/lab-05/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatAprApplication.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatAprApplication.java similarity index 100% rename from lab-05/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatAprApplication.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat-apr/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatAprApplication.java diff --git a/lab-05/lab-05-tomcat/pom.xml b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/pom.xml similarity index 93% rename from lab-05/lab-05-tomcat/pom.xml rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/pom.xml index 9c7d0da08..ee8ab7de8 100644 --- a/lab-05/lab-05-tomcat/pom.xml +++ b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-05 + lab-05-benchmark-tomcat-jetty-undertow cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-05/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java similarity index 100% rename from lab-05/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/Controller.java diff --git a/lab-05/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatApplication.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatApplication.java similarity index 100% rename from lab-05/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatApplication.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-tomcat/src/main/java/cn/iocoder/springboot/labs/lab05/tomcat/TomcatApplication.java diff --git a/lab-05/lab-05-undertow/pom.xml b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/pom.xml similarity index 95% rename from lab-05/lab-05-undertow/pom.xml rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/pom.xml index f0b001c73..4e590241c 100644 --- a/lab-05/lab-05-undertow/pom.xml +++ b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-05 + lab-05-benchmark-tomcat-jetty-undertow cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-05/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/Controller.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/Controller.java similarity index 100% rename from lab-05/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/Controller.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/Controller.java diff --git a/lab-05/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/UndertowApplication.java b/lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/UndertowApplication.java similarity index 100% rename from lab-05/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/UndertowApplication.java rename to lab-05-benchmark-tomcat-jetty-undertow/lab-05-undertow/src/main/java/cn/iocoder/springboot/labs/lab05/undertow/UndertowApplication.java diff --git a/lab-05/pom.xml b/lab-05-benchmark-tomcat-jetty-undertow/pom.xml similarity index 92% rename from lab-05/pom.xml rename to lab-05-benchmark-tomcat-jetty-undertow/pom.xml index bf1a42f82..286ab6012 100644 --- a/lab-05/pom.xml +++ b/lab-05-benchmark-tomcat-jetty-undertow/pom.xml @@ -12,7 +12,7 @@ 4.0.0 cn.iocoder.springboot.labs - lab-05 + lab-05-benchmark-tomcat-jetty-undertow 1.0-SNAPSHOT pom diff --git "a/lab-05/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" "b/lab-05-benchmark-tomcat-jetty-undertow/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" similarity index 100% rename from "lab-05/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" rename to "lab-05-benchmark-tomcat-jetty-undertow/\343\200\212\346\200\247\350\203\275\346\265\213\350\257\225 \342\200\224\342\200\224 Tomcat\343\200\201Jetty\343\200\201Undertow \345\237\272\345\207\206\346\265\213\350\257\225\343\200\213.md" diff --git a/pom.xml b/pom.xml index c48ba33ff..ce85a2656 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - + lab-05-benchmark-tomcat-jetty-undertow @@ -92,7 +92,7 @@ - labx-12-spring-cloud-config + From 4861e990f73aa34afb8b3c242a120ce23e8b4ce7 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 29 Jun 2020 07:57:12 +0800 Subject: [PATCH 104/115] =?UTF-8?q?Spring=20Security=20OAuth=20=E5=85=A5?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- .../lab-68-demo01-authorization-code-server/pom.xml | 4 ++-- .../resourceserverdemo/ResourceServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../lab68/resourceserverdemo/config/SecurityConfig.java | 0 .../resourceserverdemo/controller/ExampleController.java | 0 .../lab-68-demo01-client-credentials-server/pom.xml | 2 +- .../resourceserverdemo/ResourceServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../resourceserverdemo/controller/ExampleController.java | 0 .../lab-68-demo01-implicit-server/pom.xml | 2 +- .../resourceserverdemo/ResourceServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../lab68/resourceserverdemo/config/SecurityConfig.java | 0 .../resourceserverdemo/controller/ExampleController.java | 0 .../pom.xml | 2 +- .../resourceserverdemo/ResourceServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../lab68/resourceserverdemo/config/SecurityConfig.java | 0 .../resourceserverdemo/controller/ExampleController.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../lab-68-demo02-resource-server/pom.xml | 2 +- .../resourceserverdemo/ResourceServerApplication.java | 0 .../config/OAuth2ResourceServerConfig.java | 0 .../controller/Callback02Controller.java | 0 .../resourceserverdemo/controller/CallbackController.java | 0 .../controller/ClientLoginController.java | 0 .../resourceserverdemo/controller/ExampleController.java | 0 .../resourceserverdemo/controller/LoginController.java | 0 .../src/main/resources/application.yml | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../controller/TokenDemoController.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/db/data.sql | 0 .../src/main/resources/db/schema.sql | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../src/main/resources/application.yml | 0 .../lab-68-demo21-authorization-server-on-sso/pom.xml | 2 +- .../AuthorizationServerApplication.java | 0 .../config/OAuth2AuthorizationServerConfig.java | 0 .../authorizationserverdemo/config/SecurityConfig.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/db/oauth_data.sql | 0 .../src/main/resources/db/oauth_schema.sql | 0 .../src/main/resources/db/user_data.sql | 0 .../src/main/resources/db/user_schema.sql | 0 .../lab-68-demo21-resource-server-on-sso/pom.xml | 2 +- .../resourceserverdemo/ResourceServerApplication.java | 0 .../lab68/resourceserverdemo/config/OAuthSsoConfig.java | 0 .../lab68/resourceserverdemo/config/SecurityConfig.java | 0 .../resourceserverdemo/controller/DemoController.java | 0 .../resourceserverdemo/controller/UserController.java | 0 .../src/main/resources/application.yml | 0 {lab-68 => lab-68-spring-security-oauth}/pom.xml | 2 +- ...curity OAuth2 \345\205\245\351\227\250\343\200\213.md" | 0 ...25\347\202\271\347\231\273\351\231\206\343\200\213.md" | 0 ...2 \345\255\230\345\202\250\345\231\250\343\200\213.md" | 0 pom.xml | 4 ++-- 90 files changed, 23 insertions(+), 23 deletions(-) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/pom.xml (93%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-client-credentials-server/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-authorization-code/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-client-credentials/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-implicit/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo02-resource-server/src/main/resources/application.yml (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jwt-store/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-redis-store/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/pom.xml (97%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java (100%) rename {lab-68 => lab-68-spring-security-oauth}/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml (100%) rename {lab-68 => lab-68-spring-security-oauth}/pom.xml (96%) rename "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" => "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" (100%) rename "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" => "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" (100%) rename "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" => "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 69bd69ac6..59f014880 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ * [《芋道 Spring Boot API 接口文档 Swagger 入门》](http://www.iocoder.cn/Spring-Boot/Swagger/?github) 对应 [lab-24](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-24) * [《芋道 Spring Boot 参数校验 Validation 入门》](http://www.iocoder.cn/Spring-Boot/Validation/?github) 对应 [lab-22](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-22) * [《芋道 Spring Boot WebSocket 入门》](http://www.iocoder.cn/Spring-Boot/WebSocket/?github) 对应 [lab-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-25) -* [《性能测试 —— Tomcat、Jetty、Undertow 基准测试》](http://www.iocoder.cn/Performance-Testing/Tomcat-Jetty-Undertow-benchmark/?github) 对应 [lab-05](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-05) +* [《性能测试 —— Tomcat、Jetty、Undertow 基准测试》](http://www.iocoder.cn/Performance-Testing/Tomcat-Jetty-Undertow-benchmark/?github) 对应 [lab-05-benchmark-tomcat-jetty-undertow](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-05-benchmark-tomcat-jetty-undertow) * [《性能测试 —— SpringMVC、Webflux 基准测试》](http://www.iocoder.cn/Performance-Testing/SpringMVC-Webflux-benchmark/?github) 对应 [lab-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-06) ## RPC 开发 @@ -94,9 +94,9 @@ * [《芋道 Spring Boot 安全框架 Shiro 入门》](http://www.iocoder.cn/Spring-Boot/Shiro/?github) 对应 [lab-33](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-33) **OAuth 2.0** -* [《芋道 Spring Security OAuth2 入门》](http://www.iocoder.cn/Spring-Security/OAuth2-learning/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) -* [《芋道 Spring Security OAuth2 存储器》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-store/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) -* [《芋道 Spring Security OAuth2 单点登陆》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-sso/?github) 对应 [lab-68](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68) +* [《芋道 Spring Security OAuth2 入门》](http://www.iocoder.cn/Spring-Security/OAuth2-learning/?github) 对应 [lab-68-spring-security-oauth](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68-spring-security-oauth) +* [《芋道 Spring Security OAuth2 存储器》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-store/?github) 对应 [lab-68-spring-security-oauth](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68-spring-security-oauth) +* [《芋道 Spring Security OAuth2 单点登陆》](http://www.iocoder.cn/Spring-Security/OAuth2-learning-sso/?github) 对应 [lab-68-spring-security-oauth](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-68-spring-security-oauth) ## 定时任务与异步任务 diff --git a/lab-68/lab-68-demo01-authorization-code-server/pom.xml b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/pom.xml similarity index 93% rename from lab-68/lab-68-demo01-authorization-code-server/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/pom.xml index 0fe03ee1c..1e82e8a56 100644 --- a/lab-68/lab-68-demo01-authorization-code-server/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/pom.xml @@ -3,13 +3,13 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 - lab-68-demo01-authorization-code + lab-68-demo01-authorization-code-server diff --git a/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68-spring-security-oauth/lab-68-demo01-authorization-code-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/pom.xml b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/pom.xml similarity index 97% rename from lab-68/lab-68-demo01-client-credentials-server/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/pom.xml index 83e7f05a4..3cbf2db45 100644 --- a/lab-68/lab-68-demo01-client-credentials-server/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68-spring-security-oauth/lab-68-demo01-client-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-implicit-server/pom.xml b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/pom.xml similarity index 97% rename from lab-68/lab-68-demo01-implicit-server/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/pom.xml index ac455c9c3..5a303f3cb 100644 --- a/lab-68/lab-68-demo01-implicit-server/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68-spring-security-oauth/lab-68-demo01-implicit-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/pom.xml similarity index 97% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/pom.xml index 78d8c8479..dbf2a8a76 100644 --- a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68-spring-security-oauth/lab-68-demo01-resource-owner-password-credentials-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/pom.xml similarity index 97% rename from lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/pom.xml index 58b01fe62..cf55bce81 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-authorization-code/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/pom.xml similarity index 97% rename from lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/pom.xml index 65d8f3f0f..3eaefea3a 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-client-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/pom.xml similarity index 97% rename from lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/pom.xml index ae9652a2d..ebbda2d6e 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-implicit/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-implicit/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml similarity index 97% rename from lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml index 09db73099..f262bfba7 100644 --- a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo02-resource-server/pom.xml b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/pom.xml similarity index 97% rename from lab-68/lab-68-demo02-resource-server/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/pom.xml index c0ca916bf..a6a839b37 100644 --- a/lab-68/lab-68-demo02-resource-server/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuth2ResourceServerConfig.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/Callback02Controller.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/CallbackController.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ClientLoginController.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/ExampleController.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/LoginController.java diff --git a/lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml b/lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/resources/application.yml similarity index 100% rename from lab-68/lab-68-demo02-resource-server/src/main/resources/application.yml rename to lab-68-spring-security-oauth/lab-68-demo02-resource-server/src/main/resources/application.yml diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml similarity index 97% rename from lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml index c104d8378..3938e2563 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java b/lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java similarity index 100% rename from lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java rename to lab-68-spring-security-oauth/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml similarity index 97% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml index 692176d7f..f42a78f5c 100644 --- a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/application.yaml diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/data.sql diff --git a/lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jdbc-store/src/main/resources/db/schema.sql diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/pom.xml similarity index 97% rename from lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/pom.xml index a3425178e..4ef541fa4 100644 --- a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-jwt-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/pom.xml similarity index 97% rename from lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/pom.xml index 0c3d9d3a9..c332a0bc7 100644 --- a/lab-68/lab-68-demo11-authorization-server-by-redis-store/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml b/lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml similarity index 100% rename from lab-68/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml rename to lab-68-spring-security-oauth/lab-68-demo11-authorization-server-by-redis-store/src/main/resources/application.yml diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/pom.xml similarity index 97% rename from lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/pom.xml index 24cbb7fc0..dcbead44e 100644 --- a/lab-68/lab-68-demo21-authorization-server-on-sso/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/AuthorizationServerApplication.java diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/application.yaml diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_data.sql diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/oauth_schema.sql diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_data.sql diff --git a/lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql b/lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql similarity index 100% rename from lab-68/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql rename to lab-68-spring-security-oauth/lab-68-demo21-authorization-server-on-sso/src/main/resources/db/user_schema.sql diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/pom.xml b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml similarity index 97% rename from lab-68/lab-68-demo21-resource-server-on-sso/pom.xml rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml index 603da2cfa..313426637 100644 --- a/lab-68/lab-68-demo21-resource-server-on-sso/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml @@ -3,7 +3,7 @@ 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"> - lab-68 + lab-68-spring-security-oauth cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/ResourceServerApplication.java diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/OAuthSsoConfig.java diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/config/SecurityConfig.java diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/DemoController.java diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/java/cn/iocoder/springboot/lab68/resourceserverdemo/controller/UserController.java diff --git a/lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml similarity index 100% rename from lab-68/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml rename to lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/src/main/resources/application.yml diff --git a/lab-68/pom.xml b/lab-68-spring-security-oauth/pom.xml similarity index 96% rename from lab-68/pom.xml rename to lab-68-spring-security-oauth/pom.xml index 5fabcbd1a..a7528520f 100644 --- a/lab-68/pom.xml +++ b/lab-68-spring-security-oauth/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-68 + lab-68-spring-security-oauth pom lab-68-demo01-resource-owner-password-credentials-server diff --git "a/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" "b/lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" rename to "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\205\245\351\227\250\343\200\213.md" diff --git "a/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" "b/lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" similarity index 100% rename from "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" rename to "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\215\225\347\202\271\347\231\273\351\231\206\343\200\213.md" diff --git "a/lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" "b/lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" similarity index 100% rename from "lab-68/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" rename to "lab-68-spring-security-oauth/\343\200\212\350\212\213\351\201\223 Spring Security OAuth2 \345\255\230\345\202\250\345\231\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index ce85a2656..34dec6d87 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - lab-05-benchmark-tomcat-jetty-undertow + @@ -78,7 +78,7 @@ - + From 31866ac9c205e7a6d47eccebeda860f619eb486a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 29 Jun 2020 19:24:34 +0800 Subject: [PATCH 105/115] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=92=8C=20Spring=20?= =?UTF-8?q?Boot=20Labs=20=E6=97=A0=E5=85=B3=E7=9A=84=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 - lab-08/pom.xml | 47 ------ .../labs/lab08/UserApplication.java | 13 -- .../springboot/labs/lab08/UserController.java | 27 --- lab-08/src/main/resources/application.yaml | 22 --- ...7\206\345\244\207\345\210\240\351\231\244" | 0 lab-09/pom.xml | 19 --- .../labs/lab09/graph/DijkstraTest.java | 71 -------- .../springboot/labs/lab09/graph/Graph.java | 146 ---------------- .../labs/lab09/leetcode/no0035/Main.java | 10 -- .../lab09/leetcode/no0035/Solution01.java | 76 --------- .../lab09/leetcode/no0035/Solution02.java | 84 ---------- .../lab09/leetcode/no0036/Solution01.java | 76 --------- .../lab09/leetcode/no0036/Solution02.java | 64 ------- .../labs/lab09/leetcode/no0072/Solution.java | 47 ------ .../lab09/leetcode/no0120/Solution01.java | 69 -------- .../lab09/leetcode/no0120/Solution02.java | 43 ----- .../labs/lab09/leetcode/no0123/Solution.java | 68 -------- .../labs/lab09/leetcode/no0146/LRUCache.java | 30 ---- .../lab09/leetcode/no0146/LRUCache02.java | 147 ----------------- .../lab09/leetcode/no0152/Solution01.java | 68 -------- .../lab09/leetcode/no0152/Solution02.java | 57 ------- .../lab09/leetcode/no0152/Solution03.java | 44 ----- .../labs/lab09/leetcode/no0208/Trie.java | 105 ------------ .../lab09/leetcode/no0231/Solution01.java | 39 ----- .../lab09/leetcode/no0235/Solution01.java | 50 ------ .../lab09/leetcode/no0235/Solution02.java | 21 --- .../lab09/leetcode/no0235/Solution03.java | 22 --- .../labs/lab09/leetcode/no0235/TreeNode.java | 11 -- .../lab09/leetcode/no0300/Solution01.java | 36 ---- .../lab09/leetcode/no0300/Solution02.java | 81 --------- .../lab09/leetcode/no0703/KthLargest.java | 136 --------------- .../lab09/leetcode/no0703/KthLargest2.java | 57 ------- .../labs/lab09/leetcode/package-info.java | 4 - .../linkedlist/HuiWenLinkedListTest.java | 110 ------------ .../labs/lab09/match/RabinKarp.java | 57 ------- .../labs/lab09/search/SkipList.java | 114 ------------- .../labs/lab09/search/SkipList2.java | 156 ------------------ .../labs/lab09/search/SkipListTest.java | 42 ----- .../labs/lab09/search/SquareTest.java | 38 ----- .../labs/lab09/sort/BucketSorterTest.java | 53 ------ .../labs/lab09/sort/HeapSorterTest.java | 134 --------------- .../labs/lab09/sort/MergeSorterTest.java | 64 ------- .../labs/lab09/sort/QuickSorterTest.java | 94 ----------- .../labs/lab09/sort/RadixSorterTest.java | 77 --------- .../labs/lab09/sort/TheFirstBigKTest.java | 79 --------- .../labs/lab09/tree/MySQLBTreePlusTest.java | 67 -------- ...7\206\345\244\207\345\210\240\351\231\244" | 0 lab-10/pom.xml | 27 --- .../springboot/labs/lab10/Controller.java | 22 --- .../labs/lab10/SpringMVCApplication.java | 13 -- .../springboot/labs/lab10/TestListener.java | 15 -- .../labs/lab10/UserHealthIndicator.java | 20 --- .../ServerLifeCycleConfiguration.java | 19 --- ...erverLifeCycleConfigurationProperties.java | 8 - .../ServerLifeCycleHealthIndicator.java | 46 ------ .../lifecycle/ServerLifeCycleListener.java | 57 ------- .../lab10/lifecycle/StatusController.java | 28 ---- .../src/main/resources/application.properties | 2 - ...7\206\345\244\207\345\210\240\351\231\244" | 0 pom.xml | 3 - 61 files changed, 3143 deletions(-) delete mode 100644 lab-08/pom.xml delete mode 100644 lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserApplication.java delete mode 100644 lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserController.java delete mode 100644 lab-08/src/main/resources/application.yaml delete mode 100644 "lab-08/\345\207\206\345\244\207\345\210\240\351\231\244" delete mode 100644 lab-09/pom.xml delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/DijkstraTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/Graph.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Main.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0072/Solution.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0123/Solution.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution03.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0208/Trie.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0231/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution03.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/TreeNode.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution01.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution02.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest2.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/package-info.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/linkedlist/HuiWenLinkedListTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/match/RabinKarp.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList2.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipListTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SquareTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/BucketSorterTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/HeapSorterTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/MergeSorterTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/QuickSorterTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/RadixSorterTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/TheFirstBigKTest.java delete mode 100644 lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/tree/MySQLBTreePlusTest.java delete mode 100644 "lab-09/\345\207\206\345\244\207\345\210\240\351\231\244" delete mode 100644 lab-10/pom.xml delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/Controller.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/SpringMVCApplication.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/TestListener.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/UserHealthIndicator.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfiguration.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfigurationProperties.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleHealthIndicator.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleListener.java delete mode 100644 lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/StatusController.java delete mode 100644 lab-10/src/main/resources/application.properties delete mode 100644 "lab-10/\345\207\206\345\244\207\345\210\240\351\231\244" diff --git a/README.md b/README.md index 59f014880..79e614ce7 100644 --- a/README.md +++ b/README.md @@ -385,18 +385,10 @@ 如下是草稿目录，未来需要整理下 -# lab-08 - -简单测试，Tomcat + Redis 提供最小接口，看看 QPS - # lab-9 记录阅读极客时间《数据结构与算法之美》的题目。 -# lab-10 - -Spring Boot 优雅关闭示例。 - # lab-50 Email 示例 diff --git a/lab-08/pom.xml b/lab-08/pom.xml deleted file mode 100644 index bc3bdcfb9..000000000 --- a/lab-08/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.4.RELEASE - - - 4.0.0 - - lab-08 - - - - org.springframework.boot - spring-boot-starter-web - - - - - - - - org.springframework.boot - spring-boot-starter-redis - 1.4.7.RELEASE - - - - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserApplication.java b/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserApplication.java deleted file mode 100644 index e8a285f94..000000000 --- a/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.iocoder.springboot.labs.lab08; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class UserApplication { - - public static void main(String[] args) { - SpringApplication.run(UserApplication.class, args); - } - -} diff --git a/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserController.java b/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserController.java deleted file mode 100644 index e0e326a0c..000000000 --- a/lab-08/src/main/java/cn/iocoder/springboot/labs/lab08/UserController.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.springboot.labs.lab08; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/user") -public class UserController { - - @Autowired - private StringRedisTemplate stringRedisTemplate; - - @GetMapping("/get_user_id") - public String getUserId(@RequestParam("token") String token) { - String userIdStr = stringRedisTemplate.opsForValue().get(token); - if (userIdStr != null) { -// return Integer.valueOf(userIdStr); - return userIdStr; - } - return null; - } - -} diff --git a/lab-08/src/main/resources/application.yaml b/lab-08/src/main/resources/application.yaml deleted file mode 100644 index d1491f05d..000000000 --- a/lab-08/src/main/resources/application.yaml +++ /dev/null @@ -1,22 +0,0 @@ -spring: - application: - name: user-application - # jpa - redis: - password: - database: 0 - port: 6379 - host: 127.0.0.1 - timeout: 0 - jedis: - pool: - max-wait: - max-idle: 8 - min-idle: 0 - - -# server -server: - port: 16003 - servlet: - context-path: /user-api/ diff --git "a/lab-08/\345\207\206\345\244\207\345\210\240\351\231\244" "b/lab-08/\345\207\206\345\244\207\345\210\240\351\231\244" deleted file mode 100644 index e69de29bb..000000000 diff --git a/lab-09/pom.xml b/lab-09/pom.xml deleted file mode 100644 index d941cab76..000000000 --- a/lab-09/pom.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - labs-parent - cn.iocoder.springboot.labs - 1.0-SNAPSHOT - - 4.0.0 - - lab-09 - - - 1.8 - 1.8 - - - diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/DijkstraTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/DijkstraTest.java deleted file mode 100644 index 030a57326..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/DijkstraTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.graph; - -import java.util.LinkedList; -import java.util.List; - -public class DijkstraTest { - - public static class Graph { - - /** - * 顶点的个数 - */ - private int v; - /** - * 邻接表 - */ - private List[] adj; - - public Graph(int v) { - this.v = v; - adj = new LinkedList[v]; - for (int i = 0; i < v; i++) { - adj[i] = new LinkedList<>(); - } - } - - public void addEdge(int s, int t, int w) { - adj[s].add(new Edge(s, t, w)); - } - - } - - public static class Edge { - - /** - * 来源顶点 - */ - private int s; - /** - * 目标顶点 - */ - private int t; - /** - * 权重（距离） - */ - private int w; - - public Edge(int s, int t, int w) { - this.s = s; - this.t = t; - this.w = w; - } - - } - - public static class Vertex { - - /** - * 顶点编号 id - */ - private int id; - - /** - * 从起始顶点，到达此处的最短距离。 - */ - private int dist; - - } - - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/Graph.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/Graph.java deleted file mode 100644 index 57bfbf8c8..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/graph/Graph.java +++ /dev/null @@ -1,146 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.graph; - -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Queue; -import java.util.concurrent.atomic.AtomicBoolean; - -public class Graph { - - /** - * 顶点的个数 - */ - private int v; - /** - * 邻接表 - */ - private List[] adj; - - public Graph(int v) { - this.v = v; - adj = new LinkedList[v]; - for (int i = 0; i < v; i++) { - adj[i] = new LinkedList<>(); - } - } - - public void addEdge(int s, int t) { - adj[s].add(t); - adj[t].add(s); - } - - public void print() { - for (int i = 0; i < v; i++) { - System.out.print(i + " ："); - System.out.println(adj[i]); - } - } - - public void bfs(int s, int t) { - if (s == t) { - throw new IllegalStateException("参数不合理"); - } - // 初始化已访问 - boolean[] visited = new boolean[v]; - visited[s] = true; - - // 当前走到的路径 - Queue queue = new LinkedList<>(); - queue.add(s); - - // 记录哪个节点走到这里。通过它，实现路径的记录 - int[] prev = new int[v]; - Arrays.fill(prev, -1); - - while (queue.size() != 0) { - int w = queue.poll(); - for (int i = 0; i < adj[w].size(); i++) { - int q = adj[w].get(i); - if (!visited[q]) { - // 记录是从 w 走到 q - prev[q] = w; - // 判断是否到达目的地 - if (q == t) { - print(prev, s, t); - return; - } - visited[q] = true; - queue.add(q); - } - } - } - } - - public void dfs(int s, int t) { - if (s == t) { - throw new IllegalStateException("参数不合理"); - } - // 创建，标记是否找到 - AtomicBoolean found = new AtomicBoolean(false); - - // 初始化已访问 - boolean[] visited = new boolean[v]; - - // 记录哪个节点走到这里。通过它，实现路径的记录 - int[] prev = new int[v]; - Arrays.fill(prev, -1); - - // dfs 遍历 - dfs(s, t, found, visited, prev); - - if (found.get()) { - print(prev, s, t); - } else { - System.out.println("未找到路径..."); - } - } - - private void dfs(int w, int t, AtomicBoolean found, boolean[] visited, int[] prev) { - // 判断是否已经找到 - if (found.get()) { - return; - } - - // 标记已完成 - visited[w] = true; - - // 判断是否到达目的地 - if (w == t) { - found.set(true); - return; - } - - // 遍历 - for (int i = 0; i < adj[w].size(); i++) { - int q = adj[w].get(i); - if (!visited[q]) { - // 记录是从 w 走到 q - prev[q] = w; - // 继续递归 - dfs(q, t, found, visited, prev); - } - } - } - - // 递归打印从 s 到 t 的点 - public void print(int[] prev, int s, int t) { - if (prev[t] != -1 && t != s) { - print(prev, s, prev[t]); - } - System.out.print(t + " "); - } - - public static void main(String[] args) { - Graph graph = new Graph(10); - graph.addEdge(1, 3); - graph.addEdge(3, 5); - graph.addEdge(5, 7); -// graph.addEdge(9, 6); -// graph.print(); -// graph.bfs(1, 7); - graph.dfs(1, 7); - - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Main.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Main.java deleted file mode 100644 index 6f552e852..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Main.java +++ /dev/null @@ -1,10 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0035; - -public class Main { - - public static void main(String[] args) { -// new Solution01().solveNQueens(4); - new Solution02().solveNQueens(4); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution01.java deleted file mode 100644 index 2c801fb0e..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution01.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0035; - -import java.util.ArrayList; -import java.util.List; - -class Solution01 { - - public List> solveNQueens(int n) { - if (n == 0) { - return new ArrayList<>(); - } - - // 初始化变量 - List> results = new ArrayList<>(); - int[] used = new int[n]; // 标记，指定层，使用的位置 - for (int i = 0; i < n; i++) { - used[i] = -1; - } - - // 递归 - gen(results, used, 0, n); - - // 返回结果 - return results; - } - - private void gen(List> results, int[] used, int index, int max) { - // 到达最大值，结束递归 - if (index == max) { - List result = new ArrayList<>(); - for (int i = 0; i < max; i++) { - StringBuilder str = new StringBuilder(); - for (int j = 0; j < max; j++) { - if (used[i] == j) { - str.append("Q"); - } else { - str.append("."); - } - } - result.add(str.toString()); - } - results.add(result); - return; - } - - // 递归 - for (int i = 0; i < max; i++) { // i 表示第几个位置 - boolean isOK = true; - // 判断该位置，是否可用 - for (int j = 0; j < index; j++) { - // 纵方法，判断 - if (used[j] == i) { - isOK = false; - break; - } - // 斜方法，判断 - int diff = index - j; // 判断差的层级 - if (used[j] + diff == i || used[j] - diff == i) { - isOK = false; - break; - } - } - // 如果不合法，continue - if (!isOK) { - continue; - } - // 标记已使用 - used[index] = i; - // 递归 - gen(results, used, index + 1, max); - // 标记未使用，继续循环 - used[index] = -1; - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution02.java deleted file mode 100644 index 9262c45c5..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0035/Solution02.java +++ /dev/null @@ -1,84 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0035; - -import java.util.ArrayList; -import java.util.List; - -/** - * 在 {@link Solution01} 的基础上，做一个优化 - */ -public class Solution02 { - - public List> solveNQueens(int n) { - if (n == 0) { - return new ArrayList<>(); - } - - // 初始化变量 - List> results = new ArrayList<>(); - int[] used = new int[n]; // 标记，指定层，使用的位置 - for (int i = 0; i < n; i++) { - used[i] = -1; - } - boolean[] usedCol = new boolean[n]; // 使用的列的标记 - boolean[] usedSum = new boolean[2 * n]; // x + y = c ，即“撇” 。 - boolean[] usedMinus = new boolean[2 * n]; // x - y = c ，即“捺” 。 - - - // 递归 - gen(results, used, usedCol, usedSum, usedMinus, 0, n); - - // 返回结果 - return results; - } - - private void gen(List> results, int[] used, boolean[] usedCol, boolean[] usedSum, boolean[] usedMinus, int index, int max) { - // 到达最大值，结束递归 - if (index == max) { - List result = new ArrayList<>(); - for (int i = 0; i < max; i++) { - StringBuilder str = new StringBuilder(); - for (int j = 0; j < max; j++) { - if (used[i] == j) { - str.append("Q"); - } else { - str.append("."); - } - } - result.add(str.toString()); - } - results.add(result); - return; - } - - // 递归 - for (int i = 0; i < max; i++) { // i 表示第几个位置 - boolean isOK = true; - // 判断该位置，是否可用 - if (usedCol[i]) { // 列已经使用 - continue; - } - int usedSumIndex = index + i; // “撇”已经使用 - if (usedSum[usedSumIndex]) { - continue; - } - int usedMinusIndex = max + index - i; // “捺”已经使用 - if (usedMinus[usedMinusIndex]) { - continue; - } - // 标记已使用 - used[index] = i; - usedCol[i] = true; - usedSum[usedSumIndex] = true; - usedMinus[usedMinusIndex] = true; - // 递归 - gen(results, used, usedCol, usedSum, usedMinus, index + 1, max); - // 标记未使用，继续循环 - used[index] = -1; - usedCol[i] = false; - usedSum[usedSumIndex] = false; - usedMinus[usedMinusIndex] = false; - - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution01.java deleted file mode 100644 index ee9e30344..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution01.java +++ /dev/null @@ -1,76 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0036; - -public class Solution01 { - - private void reset(boolean[] flags) { - for (int i = 0; i < flags.length; i++) { - flags[i] = false; - } - } - - public boolean isValidSudoku(char[][] board) { - int n = 9; - int m = 3; - boolean[] flags = new boolean[n]; - - // 横线 - for (int i = 0; i < n; i++) { - for (int j = 0; j < n; j++) { - if (board[i][j] == '.') { - continue; - } - if (flags[board[i][j ] - '1']) { - return false; - } - flags[board[i][j ] - '1'] = true; - } - reset(flags); - } - - // 竖线 - for (int i = 0; i < n; i++) { - for (int j = 0; j < n; j++) { - if (board[j][i] == '.') { - continue; - } - if (flags[board[j][i ] - '1']) { - return false; - } - flags[board[j][i ] - '1'] = true; - } - reset(flags); - } - - // 每个方块 - for (int i = 0; i < n; i = i + m) { - for (int j = 0; j < n; j = j + m) { - for (int p = i; p < i + m; p++) { - for (int q = j; q < j + m; q++) { - if (board[p][q] == '.') { - continue; - } - if (flags[board[p][q] - '1']) { - return false; - } - flags[board[p][q] - '1'] = true; - } - } - reset(flags); - } - } - - return true; - } - - public static void main(String[] args) { - char[][] board = {{'.','.','.','.','5','.','.','1','.'},{'.','4','.','3','.','.','.','.','.'},{'.','.','.','.','.','3','.','.','1'},{'8','.','.','.','.','.','.','2','.'},{'.','.','2','.','7','.','.','.','.'},{'.','1','5','.','.','.','.','.','.'},{'.','.','.','.','.','2','.','.','.'},{'.','2','.','9','.','.','.','.','.'},{'.','.','4','.','.','.','.','.','.'}}; -// for (int i = 0; i < board.length; i++) { -// for (int j = 0; j < board[i].length; j++) { -// System.out.print(board[i][j] + "\t"); -// } -// System.out.println(); -// } - System.out.println(new Solution01().isValidSudoku(board)); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution02.java deleted file mode 100644 index 6d7fad1c9..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0036/Solution02.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0036; - -public class Solution02 { - - private void reset(boolean[] flags) { - for (int i = 0; i < flags.length; i++) { - flags[i] = false; - } - } - - public boolean isValidSudoku(char[][] board) { - int n = 9; - int m = 3; -// boolean[] flags = new boolean[n]; - boolean[][] rows = new boolean[n][n]; - boolean[][] cols = new boolean[n][n]; - boolean[][] boxes = new boolean[n][n]; - - for (int i = 0; i < n; i++) { - for (int j = 0; j < n; j++) { - if (board[i][j] == '.') { - continue; - } - int number = board[i][j] - '1'; // 减 1 而不是 0 ，因为数组从 0 开始。 - // 行 - if (rows[i][number]) { - return false; - } - rows[i][number] = true; - // 列 - if (cols[j][number]) { - return false; - } - cols[j][number] = true; - // 小方格 - int boxIndex = i / m * m + j / m; - if (boxes[boxIndex][number]) { - return false; - } - boxes[boxIndex][number] = true; - } - } - - return true; - } - - public static void main(String[] args) { - if (false) { - char[][] board = {{'.', '.', '.', '.', '5', '.', '.', '1', '.'}, {'.', '4', '.', '3', '.', '.', '.', '.', '.'}, {'.', '.', '.', '.', '.', '3', '.', '.', '1'}, {'8', '.', '.', '.', '.', '.', '.', '2', '.'}, {'.', '.', '2', '.', '7', '.', '.', '.', '.'}, {'.', '1', '5', '.', '.', '.', '.', '.', '.'}, {'.', '.', '.', '.', '.', '2', '.', '.', '.'}, {'.', '2', '.', '9', '.', '.', '.', '.', '.'}, {'.', '.', '4', '.', '.', '.', '.', '.', '.'}}; -// for (int i = 0; i < board.length; i++) { -// for (int j = 0; j < board[i].length; j++) { -// System.out.print(board[i][j] + "\t"); -// } -// System.out.println(); -// } - System.out.println(new Solution02().isValidSudoku(board)); - } - if (true) { - char[][] board = {{'5','3','.','.','7','.','.','.','.'},{'6','.','.','1','9','5','.','.','.'},{'.','9','8','.','.','.','.','6','.'},{'8','.','.','.','6','.','.','.','3'},{'4','.','.','8','.','3','.','.','1'},{'7','.','.','.','2','.','.','.','6'},{'.','6','.','.','.','.','2','8','.'},{'.','.','.','4','1','9','.','.','5'},{'.','.','.','.','8','.','.','7','9'}}; - System.out.println(new Solution02().isValidSudoku(board)); - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0072/Solution.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0072/Solution.java deleted file mode 100644 index 4939ad34d..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0072/Solution.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0072; - -public class Solution { - - public int minDistance(String word1, String word2) { - // + 1 的原始是， - // 1. 字符串的长度可以是 0 。例如说，word1 为 abc ，word2 为空串。 - // 2. 而数组的下标，代表的是第几个字符串。 - // 所以需要 + 1 。 - int[][] dp = new int[word1.length() + 1][word2.length() + 1]; - - // 初始化 - for (int i = 0; i <= word1.length(); i++) { // i 变成 words2 0 的位置，就是意味着 words2 是空串，则需要不断删除 - dp[i][0] = i; - } - for (int j = 0; j <= word2.length(); j++) { // words[0] 变成 words2 j 的位置，就是意味着，需要不断添加。 - dp[0][j] = j; - } - - // dp - for (int i = 1; i <= word1.length(); i++) { - for (int j = 1; j <= word2.length(); j++) { - if (word1.charAt(i - 1) == word2.charAt(j - 1)) { // -1 的原因，正如上面所说 + 1 的原因，dp 的下标，对应 word 的下标 - 1 。 - dp[i][j] = dp[i - 1][j - 1]; - } else { - dp[i][j] = this.min( - dp[i - 1][j] + 1, // 删除 a[i] - dp[i][j - 1] + 1, // 插入 b[j] - dp[i - 1][j - 1] + 1 // 替换 a[i] 到 b[j] - ); - } - } - } - - return dp[word1.length()][word2.length()]; - } - - private int min(int a, int b, int c) { - return Math.min(Math.min(a, b), c); - } - - public static void main(String[] args) { - Solution solution = new Solution(); - System.out.println(solution.minDistance("horse", "ros")); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution01.java deleted file mode 100644 index 5f283097f..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution01.java +++ /dev/null @@ -1,69 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0120; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 自上而下，进行 DP - */ -public class Solution01 { - - public int minimumTotal(List> triangle) { - if (triangle == null || triangle.isEmpty()) { - return 0; - } - // 只有一层，就不要求解了 - if (triangle.size() == 1) { - return triangle.get(0).get(0); - } - - // 通过 ways ，记录最大路径 - int size = triangle.size(); - int[] ways = new int[triangle.get(size - 1).size()]; - Arrays.fill(ways, Integer.MAX_VALUE); - // 计算下一层的时候，临时使用 - int[] tmps = new int[ways.length]; - // 用于在最后一层，计算 ways 中的最小值。 - int min = Integer.MAX_VALUE; - - // 开始动态规划 - ways[0] = triangle.get(0).get(0); - tmps[0] = triangle.get(0).get(0); - for (int i = 1; i < size; i++) { - int levelSize = triangle.get(i).size(); - for (int j = 0; j < levelSize; j++) { - // 选取能到达当前节点的较小值 - int result; - if (j == 0) { - result = ways[j]; - } else if (j == levelSize - 1) { - result = ways[j - 1]; - } else { - result = Math.min(ways[j], ways[j - 1]); - } - // 记录当前节点需要的最小路径，到 tmps 中。 - tmps[j] = result + triangle.get(i).get(j); - // 如果是最后一层，开始计算最小值。 - if (i == size - 1) { - if (tmps[j] < min) { - min = tmps[j]; - } - } - } - System.arraycopy(tmps, 0, ways, 0, levelSize); - } - - return min; - } - - public static void main(String[] args) { - List> triangle = new ArrayList<>(); - triangle.add(Arrays.asList(2)); - triangle.add(Arrays.asList(3, 4)); - triangle.add(Arrays.asList(6, 5, 7)); - triangle.add(Arrays.asList(4, 1, 8, 3)); - System.out.println(new Solution01().minimumTotal(triangle)); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution02.java deleted file mode 100644 index c24a80092..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0120/Solution02.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0120; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * 自下而上，进行 DP - */ -public class Solution02 { - - public int minimumTotal(List> triangle) { - if (triangle == null || triangle.isEmpty()) { - return 0; - } - - // 通过 ways ，记录最大路径 - int size = triangle.size(); - int[] ways = new int[triangle.get(size - 1).size()]; - for (int j = 0; j < triangle.get(size - 1).size(); j++) { - ways[j] = triangle.get(size - 1).get(j); - } - - // 自下而上 DP - for (int i = size - 2; i >= 0; i--) { - for (int j = 0; j < triangle.get(i).size(); j++) { - ways[j] = Math.min(ways[j], ways[j + 1]) + triangle.get(i).get(j); - } - } - - return ways[0]; - } - - public static void main(String[] args) { - List> triangle = new ArrayList<>(); - triangle.add(Arrays.asList(2)); - triangle.add(Arrays.asList(3, 4)); - triangle.add(Arrays.asList(6, 5, 7)); - triangle.add(Arrays.asList(4, 1, 8, 3)); - System.out.println(new Solution02().minimumTotal(triangle)); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0123/Solution.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0123/Solution.java deleted file mode 100644 index d29768687..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0123/Solution.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0123; - -public class Solution { - - public int maxProfit(int[] prices) { - if (prices == null || prices.length == 0) { - return 0; - } - int k = 2; // 最大交易次数，只能两次 - // 第一维度 k ，表示当前【买入股票】的次数； - // 第二维度 2 ，表示 0 - 未持有，1 - 持有 1 股 - // 值为最大利润 - int[][] dp = new int[k + 1][2]; - // 初始化第一个股票的处理 - dp[1][1] = -prices[0]; // 买入 - dp[2][1] = -prices[0]; // 买入 + 卖出 + 买入 - dp[0][1] = Integer.MIN_VALUE; // 相当于赋值为空，避免直接认为持有一股时，利润为 0 。 - - // 遍历，进行买卖 - for (int i = 1; i < prices.length; i++) { - for (int j = 0; j <= k; j++) { - // 尝试卖出 - dp[j][0] = Math.max(dp[j][0], dp[j][1] + prices[i]); - // 尝试买入 - if (j > 0) { - dp[j][1] = Math.max(dp[j][1], dp[j - 1][0] - prices[i]); - } - } - } - - return Math.max(dp[1][0], dp[2][0]); - } - -// public int maxProfit(int[] prices) { -// if (prices == null || prices.length == 0) { -// return 0; -// } -// int k = 2; // 最大交易次数，只能两次 -// // 第一维度 k ，表示当前【买入股票】的次数； -// // 第二维度 2 ，表示 0 - 未持有，1 - 持有 1 股 -// int[][][] dp = new int[prices.length][k + 1][2]; -// // 初始化第一个股票的处理 -// dp[0][1][1] = -prices[0]; // 买入 -//// dp[2][1] = -prices[0]; // 买入 + 卖出 + 买入 -// -// // 遍历，进行买卖 -// for (int i = 1; i < prices.length; i++) { -// for (int j = 0; j <= k; j++) { -// // 尝试卖出 -// dp[i][j][0] = Math.max(dp[i][j][0], dp[i][j][1] + prices[i]); -// // 尝试买入 -// if (j > 0) { -// dp[i][j][1] = Math.max(dp[i][j][1], dp[i][j - 1][0] - prices[i]); -// } -// } -// } -// -// return Math.max(dp[prices.length -1][1][0], dp[prices.length - 1][2][0]); -// } - - public static void main(String[] args) { - Solution solution = new Solution(); - System.out.println(solution.maxProfit(new int[]{3,3,5,0,0,3,1,4})); - System.out.println(solution.maxProfit(new int[]{1,2,3,4,5})); - System.out.println(solution.maxProfit(new int[]{7, 6, 4, 3, 1})); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache.java deleted file mode 100644 index cb8f54d4e..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0146; - -import java.util.LinkedHashMap; -import java.util.Map; - -public class LRUCache { - - private Map cache; - - public LRUCache(int capacity) { - this.cache = new LinkedHashMap((int) Math.ceil(capacity / 0.75f) + 1, 0.75f, true) { - - @Override - protected boolean removeEldestEntry(Map.Entry eldest) { - return size() > capacity; - } - - }; - } - - public int get(int key) { - Integer val = cache.get(key); - return val != null ? val : -1; - } - - public void put(int key, int value) { - cache.put(key, value); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache02.java deleted file mode 100644 index 6bf72313b..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0146/LRUCache02.java +++ /dev/null @@ -1,147 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0146; - -import java.util.HashMap; -import java.util.Map; - -public class LRUCache02 { - - private class Node { - - private int key; - private int value; - private Node prev; - private Node next; - - public Node(int key, int value, Node prev, Node next) { - this.key = key; - this.value = value; - this.prev = prev; - this.next = next; - } - - } - - /** - * 容量 - */ - private int capacity; - /** - * 缓存 - */ - private Map cache; - /** - * 指向头 - */ - private Node head; - /** - * 指向尾. - * - * 最新的元素，放在尾部 - */ - private Node tail; - - public LRUCache02(int capacity) { - this.capacity = capacity; - this.cache = new HashMap<>(capacity, 1F); - } - - public int get(int key) { - Node node = this.getNode(key); - return node != null ? node.value : -1; - } - - public void put(int key, int value) { - Node node = getNode(key); - - // 获得到值，设置其值 - if (node != null) { - node.value = value; - return; - } - - // 移除最老访问的 - removeIfFull(); - - // 容量足够 - node = new Node(key, value, tail, null); - cache.put(key, node); - // 设置新的尾节点 - if (head == null) { - head = tail = node; - } else { - tail.next = node; - tail = node; - } - } - - private Node getNode(int key) { - // head 为空，说明无元素 - if (head == null) { - return null; - } - - // 获得元素 - Node node = cache.get(key); - if (node == null) { // 如果获得不到，返回空 - return null; - } - - // 如果尾部并未指向 node ，则重新指向 - if (node != tail) { - if (node == head) { - head = head.next; - head.prev = null; - } else { - node.next.prev = node.prev; - node.prev.next = node.next; - } - - // 添加到尾部 - node.prev = tail; - tail.next = node; - node.next = null; - tail = node; - } - - return node; - } - - private void removeIfFull() { - if (cache.size() < capacity) { - return; - } - - // 移除 cache - cache.remove(head.key); - // 更新新的 head - head = head.next; - if (head != null) { // 主要为了处理 capacity 为 1 的情况 - head.prev = null; - } - } - - public static void main(String[] args) { - if (false) { - LRUCache02 cache = new LRUCache02(2 /* 缓存容量 */); - - cache.put(1, 1); - cache.put(2, 2); - System.out.println(cache.get(1)); // 返回 1 - cache.put(3, 3); // 该操作会使得密钥 2 作废 - System.out.println(cache.get(2)); // 返回 -1 (未找到) - cache.put(4, 4); // 该操作会使得密钥 1 作废 - System.out.println(cache.get(1)); // 返回 -1 (未找到) - System.out.println(cache.get(3)); // 返回 3 - System.out.println(cache.get(4)); // 返回 4 - } - if (true) { - LRUCache02 cache = new LRUCache02(1 /* 缓存容量 */); - cache.put(2, 1); - System.out.println(cache.get(2)); // 返回 1 - cache.put(3, 2); - System.out.println(cache.get(2)); // 返回 - System.out.println(cache.get(3)); // 返回 - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution01.java deleted file mode 100644 index b957bdd68..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution01.java +++ /dev/null @@ -1,68 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0152; - -@Deprecated // 解法不对 -public class Solution01 { - - public int maxProduct(int[] nums) { - Integer max = Integer.MIN_VALUE; // 最大值 - Integer x = null; // 正数 - Integer y = null; // 负数 - - // 遍历 - for (int num : nums) { - if (num >= 0) { // 正数 - if (x == null) { - x = num; - } else { - if (num * x > x) { - x = num * x; - } else { - x = num; - } - } - if (y != null) { - if (num == 0) { - y = null; - } else { - y = y * num; - } - } - } else { // 负数 - if (y == null) { - if (x == null) { - y = num; - } else { - y = num * x; - x = null; - } - } else { - y = num * y; - if (y > 0) { - x = y; - y = num; - } - } - } - // 判断是否超过 - if (x != null && x > max) { - max = x; - } - if (y != null && y > max) { // 处理，整个数组只有一个负数的情况。 - max = y; - } - } - - return max; - } - - public static void main(String[] args) { - Solution01 solution = new Solution01(); -// System.out.println(solution.maxProduct(new int[]{2, 3, -2, -4})); -// System.out.println(solution.maxProduct(new int[]{2, 3, -2, 4})); -// System.out.println(solution.maxProduct(new int[]{-2, 0, 1})); -// System.out.println(solution.maxProduct(new int[]{0, 2})); -// System.out.println(solution.maxProduct(new int[]{2, -5, -2, -4, 3})); - System.out.println(solution.maxProduct(new int[]{-1, -2, -9, -6})); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution02.java deleted file mode 100644 index 08366ca49..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution02.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0152; - -/** - * dp 方程 - * - * dp1[i] = max(dp[i - 1] * nums[i], dp2[i -1] * nums[i], nums[i]) - * dp2[i] = min(dp[i - 1] * nums[i], dp2[i -1] * nums[i], nums[i]) - * - * 通过不断求，使用上当前数值时，能产生的最大值。 - * - * 注意，结果不是 dp1[n - 1] ，而是在这个过程中，产生的最大值。因为 nums 有负数的可能性，导致不一定使用上当前值，就一定是最大值。 - */ -public class Solution02 { - - public int maxProduct(int[] nums) { - // 最大值 - int max = nums[0]; - // 使用上当前位置的数，最大值。max 和 dp1 并不等价，因为使用上当前数字后，可能不一定大于 max - int[] dp1 = new int[nums.length]; - dp1[0] = nums[0]; - // 使用上当前位置的数，最小值。使用最小值的原因是，可以有机会负负得正 - int[] dp2 = new int[nums.length]; - dp2[0] = nums[0]; - - // 开始 dp - for (int i = 1; i < nums.length; i++) { - int num = nums[i]; - dp1[i] = max(dp1[i - 1] * num, // 如果 num 是正数的情况下，乘以 dp1，会变大 - dp2[i - 1] * num, // 如果 num 是负数的情况，乘以 dp2 ，可能反倒比 dp1 大。 - num); // 可能上面两个，乘了半天，还不如 - dp2[i] = min(dp1[i - 1] * num, dp2[i - 1] * num, num); // 同上面的想法 - // 求最大值 - max = Math.max(dp1[i], max); - } - - return max; - } - - private int min(int a, int b, int c) { - return Math.min(Math.min(a, b), c); - } - - private int max(int a, int b, int c) { - return Math.max(Math.max(a, b), c); - } - - public static void main(String[] args) { - Solution02 solution = new Solution02(); - System.out.println(solution.maxProduct(new int[]{2, 3, -2, -4})); - System.out.println(solution.maxProduct(new int[]{2, 3, -2, 4})); - System.out.println(solution.maxProduct(new int[]{-2, 0, 1})); - System.out.println(solution.maxProduct(new int[]{0, 2})); - System.out.println(solution.maxProduct(new int[]{2, -5, -2, -4, 3})); - System.out.println(solution.maxProduct(new int[]{-1, -2, -9, -6})); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution03.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution03.java deleted file mode 100644 index 8d898c7a3..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0152/Solution03.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0152; - -/** - * {@link Solution02} 的改进，不使用两个一维数组，而是直接使用两个变量。 - */ -public class Solution03 { - - public int maxProduct(int[] nums) { - // 最大值 - int max = nums[0]; - // 使用上当前位置的数，最大值。max 和 dp1 并不等价，因为使用上当前数字后，可能不一定大于 max - int dp1 = nums[0]; - // 使用上当前位置的数，最小值。使用最小值的原因是，可以有机会负负得正 - int dp2 = nums[0]; - - // 开始 dp - for (int i = 1; i < nums.length; i++) { - int num = nums[i]; - int[] results = minAndMax(dp1 * num, dp2* num, num); - dp1 = results[1]; - dp2 = results[0]; - // 求最大值 - max = Math.max(dp1, max); - } - - return max; - } - - private int[] minAndMax(int a, int b, int c) { - return new int[]{Math.min(Math.min(a, b), c), - Math.max(Math.max(a, b), c)}; - } - - public static void main(String[] args) { - Solution03 solution = new Solution03(); - System.out.println(solution.maxProduct(new int[]{2, 3, -2, -4})); - System.out.println(solution.maxProduct(new int[]{2, 3, -2, 4})); - System.out.println(solution.maxProduct(new int[]{-2, 0, 1})); - System.out.println(solution.maxProduct(new int[]{0, 2})); - System.out.println(solution.maxProduct(new int[]{2, -5, -2, -4, 3})); - System.out.println(solution.maxProduct(new int[]{-1, -2, -9, -6})); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0208/Trie.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0208/Trie.java deleted file mode 100644 index e30aa7e1e..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0208/Trie.java +++ /dev/null @@ -1,105 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0208; - -public class Trie { - - public class Node { - - private Node[] children; - private boolean end; - - public Node() { - children = new Node['z' - 'a' + 1]; - } - - } - - private Node node; - - /** Initialize your data structure here. */ - public Trie() { - node = new Node(); - } - - /** Inserts a word into the trie. */ - public void insert(String word) { - if (word == null || word.length() == 0) { - return; - } - - // 遍历，创建节点 - Node current = node; - for (int i = 0; i < word.length(); i++) { - int index = getIndex(word.charAt(i)); - Node next = current.children[index]; - if (next == null) { - next = new Node(); - current.children[index] = next; - } - current = next; - } - - // 标记结束 - current.end = true; - } - - /** Returns if the word is in the trie. */ - public boolean search(String word) { - if (word == null || word.length() == 0) { - return false; - } - - // 遍历，寻找节点 - Node current = node; - for (int i = 0; i < word.length(); i++) { - int index = getIndex(word.charAt(i)); - Node next = current.children[index]; - if (next == null) { - return false; - } - current = next; - } - - // 判断找到的节点，是否为根节点 - return current.end; - } - - /** Returns if there is any word in the trie that starts with the given prefix. */ - public boolean startsWith(String prefix) { - if (prefix == null || prefix.length() == 0) { - return false; - } - - // 遍历，寻找节点 - Node current = node; - for (int i = 0; i < prefix.length(); i++) { - int index = getIndex(prefix.charAt(i)); - Node next = current.children[index]; - if (next == null) { - return false; - } - current = next; - } - - // 结果找到 - return true; - } - - private int getIndex(char ch) { - return ch - 'a'; - } - - public static void main(String[] args) { - Trie trie = new Trie(); - - trie.insert("apple"); - System.out.println(trie.search("apple")); // 返回 true - System.out.println(trie.search("app")); // 返回 false - System.out.println(trie.startsWith("app")); // 返回 true - - trie.insert("app"); - System.out.println(trie.search("app")); // 返回 true - - System.out.println(trie.search("appled")); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0231/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0231/Solution01.java deleted file mode 100644 index 781f9d67a..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0231/Solution01.java +++ /dev/null @@ -1,39 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0231; - -public class Solution01 { - - public boolean isPowerOfTwo(int n) { - // 非正整数，非正整数 - if (n <= 0) { - return false; - } - - int mask = 1; - for (int i = 0; i < 32; i++) { - // 或运算，如果就是自己，说明是 2 的 n 次方 - if ((n | mask) == mask) { - return true; - } - - // mask 超过范围，说明就是不符合 - if (mask > n) { - return false; - } - - mask = mask << 1; - } - - return false; - } - - public static void main(String[] args) { - Solution01 solution = new Solution01(); - System.out.println(solution.isPowerOfTwo(1)); - System.out.println(solution.isPowerOfTwo(2)); - System.out.println(solution.isPowerOfTwo(3)); - System.out.println(solution.isPowerOfTwo(4)); - System.out.println(solution.isPowerOfTwo(5)); - System.out.println(solution.isPowerOfTwo(6)); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution01.java deleted file mode 100644 index aeb039427..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution01.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0235; - -import java.util.ArrayList; -import java.util.List; - -/** - * 寻找路径，然后匹配 - */ -public class Solution01 { - - public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) { - // p 节点的路径 - List pNodes = new ArrayList<>(); - binarySearch(root, p, pNodes); - // q 节点的路径 - List qNodes = new ArrayList<>(); - binarySearch(root, q, qNodes); - - // 倒序，对比 - for (int i = pNodes.size() - 1; i >= 0; i--) { - TreeNode node = pNodes.get(i); - for (int j = qNodes.size() - 1; j >= 0; j--) { - TreeNode node2 = qNodes.get(j); - if (node.val == node2.val) { - return node; - } - } - } - return null; - } - - private void binarySearch(TreeNode root, TreeNode target, List nodes) { - if (root == null) { // 理论不存在，防御性 - return; - } - - // 添加到路径 - nodes.add(root); - - if (root.val == target.val) { - return; - } - if (root.val > target.val) { - binarySearch(root.left, target, nodes); - } else { - binarySearch(root.right, target, nodes); - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution02.java deleted file mode 100644 index 6db99c502..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution02.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0235; - -/** - * 递归求解父节点 - */ -public class Solution02 { - - public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) { - if (p.val < root.val - && root.val > q.val) { // 因为 root.val 大于 q.val ，说明 root 的值过大，需要往左走 - return lowestCommonAncestor(root.left, p, q); - } else if (p.val > root.val // 因为 root.val 小于 p.val ，说明 root 的值过小，需要往右走 - && root.val < q.val) { - return lowestCommonAncestor(root.right, p, q); - } else { // 其他情况，root 都是符合条件的，例如说 root 的泛微在 p and q 之间（或者 q and p 之间)。 - // 为什么直接返回 root 就可以，因为如果不是最接近的父节点，p 和 q 要么在其左边，要么在其右边。 - return root; - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution03.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution03.java deleted file mode 100644 index 38326d63c..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/Solution03.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0235; - -/** - * {@link Solution02} 的改进，非递归方式。 - */ -public class Solution03 { - - public TreeNode lowestCommonAncestor(TreeNode root, TreeNode p, TreeNode q) { - while (true) { - if (p.val < root.val - && root.val > q.val) { // 因为 root.val 大于 q.val ，说明 root 的值过大，需要往左走 - root = root.left; - } else if (p.val > root.val // 因为 root.val 小于 p.val ，说明 root 的值过小，需要往右走 - && root.val < q.val) { - root = root.right; - } else { // 其他情况，root 都是符合条件的，例如说 root 的泛微在 p and q 之间（或者 q and p 之间)。 - return root; - } - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/TreeNode.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/TreeNode.java deleted file mode 100644 index 2f5137911..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0235/TreeNode.java +++ /dev/null @@ -1,11 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0235; - -public class TreeNode { - - int val; - TreeNode left; - TreeNode right; - - TreeNode(int x) { val = x; } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution01.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution01.java deleted file mode 100644 index c2d6d3136..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution01.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0300; - -import java.util.Arrays; - -/** - * DP 实现，时间复杂度为 O(N^2) 。 - * - * DP 转换方程是： - * dp[i] = MAX(dp[i], dp[j] + 1) - * 其中，dp[i] 表示，截止目前，最大的上升的子序列 - */ -public class Solution01 { - - public int lengthOfLIS(int[] nums) { - if (nums.length == 0) { - return 0; - } - - int[] dps = new int[nums.length]; - Arrays.fill(dps, 1); // 都赋值为 1 先，因为自己是自己的递增。 - int result = 1; - - // dp - for (int i = 1; i < nums.length; i++) { - for (int j = 0; j < i; j++) { - if (nums[i] > nums[j]) { - dps[i] = Math.max(dps[i], dps[j] + 1); - } - } - result = Math.max(result, dps[i]); - } - - return result; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution02.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution02.java deleted file mode 100644 index f89d3d2bb..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0300/Solution02.java +++ /dev/null @@ -1,81 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0300; - -import java.util.ArrayList; -import java.util.List; - -/** - * 二分 + 贪心 - */ -public class Solution02 { - - public int lengthOfLIS(int[] nums) { - if (nums.length == 0) { - return 0; - } - - List lis = new ArrayList<>(); // 上升序列 - for (int num : nums) { - int position = binarySearch(lis, num); - if (position >= lis.size()) { - lis.add(num); - } else { - lis.set(position, num); - } - } - - - return lis.size(); - } - - /** - * 获得比 num 第一大的值的位置 - * 如果有和 num 相等的，也返回 - * - * TODO 芋艿，后续，可以使用 Arrays.binarySearch() 简化。 - * - * @param lis - * @param num - * @return - */ - private int binarySearch(List lis, int num) { - int high = lis.size() - 1; - - // 判断，是否超过 - if (high < 0 || lis.get(high) < num) { - return lis.size(); - } - if (num < lis.get(0)) { - return 0; - } - - // 二分查找 - int low = 0; - while (low <= high) { - int mid = low + ((high - low) >> 1); - if (lis.get(mid) == num) { - return mid; - } else if (num < lis.get(mid)) { - if (lis.get(mid - 1) > num) { - return mid; - } else { - high = mid - 1; - } - } else { - if (lis.get(mid + 1) > num) { - return mid + 1; - } else { - low = mid + 1; - } - } - } - - throw new IllegalArgumentException("不可能出现"); - } - - public static void main(String[] args) { - Solution02 solution = new Solution02(); -// System.out.println(solution.lengthOfLIS(new int[]{10,9,2,5,3,7,101,18})); - System.out.println(solution.lengthOfLIS(new int[]{7,8,9,10,1,2,3,4,5,5})); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest.java deleted file mode 100644 index 15e1e93e6..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest.java +++ /dev/null @@ -1,136 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0703; - -class KthLargest { - - /** - * 小顶堆 - */ - private int[] heap; - /** - * 堆的位置 - */ - private int heapIndex; - private int k; - - public KthLargest(int k, int[] nums) { - this.heap = new int[k + 1]; - this.heapIndex = 1; - this.k = k; - // 初始化 - for (int num : nums) { - add(num); - } - } - - public int add(int val) { - if (heapIndex <= k) { - // 赋值 - heap[heapIndex] = val; - heapIndex++; - - // 向上堆化 - heapifyUp(heapIndex - 1); - } else { - if (val > heap[1]) { // 大于最小值，才有资格加入其中。因为我们构建的 heap 是小顶堆，最上面存储的是第 k 大。 - // 赋值 - heap[1] = val; - - heapifyDown(1); - } - } - - return heap[1]; - } - -// private int remove0() { -// // 取头元素 -// int val = heap[1]; -// -// // 将尾巴设置到头 -// heap[1] = heap[heapIndex - 1]; -// heapIndex--; -// -// // 向下堆化 -// heapifyDown(1); -// -// return val; -// } - - public void heapifyUp(int index) { - while (index > 1) { // 注意，此处要大于 1 - int parent = index / 2; - if (heap[index] < heap[parent]) { - swap(index, parent); - index = parent; - } else { - break; - } - } - } - - private void heapifyDown(int index) { - while (true) { - int pos = index; - // 求子节点中，哪个 - if (index * 2 < heapIndex && heap[index * 2] < heap[index]) { - pos = index * 2; - } - if (index * 2 + 1 < heapIndex && heap[index * 2 + 1] < heap[pos]) { - pos = index * 2 + 1; - } - // 如果毫无变化，说明已经不需要继续向下 - if (pos == index) { - return; - } - // 交换 - swap(index, pos); - index = pos; - } - } - - private void swap(int i, int j) { - int tmp = heap[i]; - heap[i] = heap[j]; - heap[j] = tmp; - } - -// private int findMaxValueIndex() { -// int max = Integer.MIN_VALUE; -// int maxIndex = -1; -// for (int i = log2(heapIndex) * 2; i < heapIndex; i++) { // 从 log2(heapIndex) * 2 的原因是，从叶子节点开始。因为我们构建的是小顶堆，那么最大值必定在叶子节点上。 -// if (heap[i] > max) { -// max = heap[i]; -// maxIndex = i; -// } -// } -// return maxIndex; -// } -// -// private static int log2(int x) { -// return (int) (Math.log(x) / Math.log(2)); -// } - - public static void main(String[] args) { - if (false) { - int k = 3; - int[] nums = {4, 5, 8, 2}; - KthLargest kthLargest = new KthLargest(k, nums); - System.out.println(kthLargest.add(3)); - System.out.println(kthLargest.add(5)); - System.out.println(kthLargest.add(10)); - System.out.println(kthLargest.add(9)); - System.out.println(kthLargest.add(4)); - } - if (true) { - int k = 1; - int[] nums = {}; - KthLargest kthLargest = new KthLargest(k, nums); - System.out.println(kthLargest.add(-3)); - System.out.println(kthLargest.add(-2)); - System.out.println(kthLargest.add(-4)); - System.out.println(kthLargest.add(0)); - System.out.println(kthLargest.add(4)); - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest2.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest2.java deleted file mode 100644 index e49da2a0c..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/no0703/KthLargest2.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.leetcode.no0703; - -import java.util.PriorityQueue; -import java.util.Queue; - -class KthLargest2 { - - private Queue queue; - private int k; - - public KthLargest2(int k, int[] nums) { - queue = new PriorityQueue<>(k); - this.k = k; - // 初始化 - for (int num : nums) { - add(num); - } - } - - public int add(int val) { - if (queue.size() < k) { - // 赋值 - queue.add(val); - } else { - if (val > queue.peek()) { // 大于最小值，才有资格加入其中。因为我们构建的 heap 是小顶堆，最上面存储的是第 k 大。 - queue.poll(); - queue.add(val); - } - } - - return queue.peek(); - } - - public static void main(String[] args) { - if (true) { - int k = 3; - int[] nums = {4, 5, 8, 2}; - KthLargest2 kthLargest = new KthLargest2(k, nums); - System.out.println(kthLargest.add(3)); - System.out.println(kthLargest.add(5)); - System.out.println(kthLargest.add(10)); - System.out.println(kthLargest.add(9)); - System.out.println(kthLargest.add(4)); - } - if (false) { - int k = 1; - int[] nums = {}; - KthLargest2 kthLargest = new KthLargest2(k, nums); - System.out.println(kthLargest.add(-3)); - System.out.println(kthLargest.add(-2)); - System.out.println(kthLargest.add(-4)); - System.out.println(kthLargest.add(0)); - System.out.println(kthLargest.add(4)); - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/package-info.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/package-info.java deleted file mode 100644 index 5247f0a3f..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/leetcode/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * leetcode 题目解答 - */ -package cn.iocoder.springboot.labs.lab09.leetcode; diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/linkedlist/HuiWenLinkedListTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/linkedlist/HuiWenLinkedListTest.java deleted file mode 100644 index 4d412ac6c..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/linkedlist/HuiWenLinkedListTest.java +++ /dev/null @@ -1,110 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.linkedlist; - -import java.util.Objects; - -/** - * 判断单链表，是否为回文结构 - * - * 核心的逻辑是，顺序遍历，同时反向前半段。 - * - * 对应极客时间《06 | 链表（上）：如何实现LRU缓存淘汰算法?》的思考题 - */ -public class HuiWenLinkedListTest { - - public static class Node { - - private Object data; - private Node next; - - public Object getData() { - return data; - } - - public Node setData(Object data) { - this.data = data; - return this; - } - - public Node getNext() { - return next; - } - - public Node setNext(Node next) { - this.next = next; - return this; - } - } - - public static void main(String[] args) { - huiwen01(); - huiwen02(); - } - - private static void huiwen01() { - Node node01 = new Node().setData("1"); - Node node02 = new Node().setData("2"); - Node node03 = new Node().setData("3"); - Node node04 = new Node().setData("4"); - Node node05 = new Node().setData("5"); - node01.next = node02; - node02.next = node03; - node03.next = node04; - node04.next = node05; - - assert !isHuiWen(node01); - } - - private static void huiwen02() { - Node node01 = new Node().setData("1"); - Node node02 = new Node().setData("2"); - Node node03 = new Node().setData("3"); - Node node04 = new Node().setData("2"); - Node node05 = new Node().setData("1"); - node01.next = node02; - node02.next = node03; - node03.next = node04; - node04.next = node05; - - assert isHuiWen(node01); - } - - private static boolean isHuiWen(Node head) { - // 如果不存在节点，或者是单节点，不然是回文 - if (head == null || head.next == null) { - return true; - } - - // 通过下面的逻辑，将链表的前半段，反转。 - Node slow = head; - Node fast = head; // fast 的用途，是能够保证只反向前半段 - Node prev = null; // 前半段的反向 - while (fast != null && fast.next != null) { - // fast 节点，按照自己的节奏，每次走 2 步。 - fast = fast.next.next; - // 创建 next 节点，记录 slow 真正下一个节点 - Node next = slow.next; - // 开始反转 - slow.next = prev; - prev = slow; - // 设置 slow 为真正的下一个节点 - slow = next; - } - - // 如果 fast 非空，说明 head 是基数个节点。此时，slow 需要跳过最中间的节点 - if (fast != null) { - slow = slow.next; - } - - // 开始对比 slow 和 prev - while (slow != null && prev != null) { - if (!Objects.equals(slow.data, prev.data)) { - return false; - } - slow = slow.next; - prev = prev.next; - } - - return true; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/match/RabinKarp.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/match/RabinKarp.java deleted file mode 100644 index 80b2a53c3..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/match/RabinKarp.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.match; - -/** - * 参考 https://blog.csdn.net/jianke0503/article/details/79735928 文章 - * - * 实现 Rabin Karp 字符串查找 - */ -public class RabinKarp { - - // power 指数 - // base 计算超过范围，则返回 base - public static int find(String src, String target, int power, int base) { - // 计算长度 - int n = src.length(); - int m = target.length(); - - // target 的 hashcode - int targetCode = 0; - int mPower = 1; - for (int i = 0; i < m; i++) { - targetCode = (targetCode * power + target.charAt(i)) % base; - mPower = (mPower * power) % base; - } - - int srcCode = 0; - for (int i = 0; i < n; i++) { - srcCode = (srcCode * power + src.charAt(i)) % base; - if (i < m - 1) { // 不等于的原因是，i 是从 0 开始的。 - continue; - } - - if (i >= m) { // 此时，需要减掉头的 - srcCode = srcCode - ((src.charAt(i - m) * mPower) % base); - - // 避免减成负数 - if (srcCode < 0) { - srcCode = srcCode + base; - } - } - - if (srcCode == targetCode) { - if (src.substring(i - m + 1, i + 1).equals(target)) { - return i - m + 1; // + 1 的原因是，i 是从 0 开始，而 m 是从 1 开始。 - } - } - } - - return -1; - } - - public static void main(String[] args) { - String src = "2359023141526739921"; - String target = "5902"; - System.out.println(find(src, target, 31, 100)); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList.java deleted file mode 100644 index 55cc79395..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList.java +++ /dev/null @@ -1,114 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.search; - -import java.util.Random; - -/** - * 跳表的一种实现方法。 - * 跳表中存储的是正整数，并且存储的是不重复的。 - * - * From https://github.com/wangzheng0822/algo/blob/master/java/17_skiplist/SkipList.java - * - * Author：ZHENG - */ -@SuppressWarnings("Duplicates") -public class SkipList { - - private static final int MAX_LEVEL = 16; - - private int levelCount = 1; - - private Node head = new Node(); // 带头链表 - - private Random r = new Random(); - - public Node find(int value) { - Node p = head; - for (int i = levelCount - 1; i >= 0; --i) { - while (p.forwards[i] != null && p.forwards[i].data < value) { - p = p.forwards[i]; - } - } - - if (p.forwards[0] != null && p.forwards[0].data == value) { - return p.forwards[0]; - } else { - return null; - } - } - - public void insert(int value) { - int level = randomLevel(); - Node newNode = new Node(); - newNode.data = value; - newNode.maxLevel = level; - Node[] update = new Node[level]; - for (int i = 0; i < level; ++i) { - update[i] = head; - } - - // record every level largest value which smaller than insert value in update[] - Node p = head; - for (int i = level - 1; i >= 0; --i) { - while (p.forwards[i] != null && p.forwards[i].data < value) { - p = p.forwards[i]; - } - update[i] = p;// use update save node in search path - } - - // in search path node next node become new node forwords(next) - for (int i = 0; i < level; ++i) { - newNode.forwards[i] = update[i].forwards[i]; - update[i].forwards[i] = newNode; - } - - // update node hight - if (levelCount < level) levelCount = level; - } - - public void delete(int value) { - Node[] update = new Node[levelCount]; - Node p = head; - for (int i = levelCount - 1; i >= 0; --i) { - while (p.forwards[i] != null && p.forwards[i].data < value) { - p = p.forwards[i]; - } - update[i] = p; - } - - if (p.forwards[0] != null && p.forwards[0].data == value) { - for (int i = levelCount - 1; i >= 0; --i) { - if (update[i].forwards[i] != null && update[i].forwards[i].data == value) { - update[i].forwards[i] = update[i].forwards[i].forwards[i]; - } - } - } - } - - // 随机 level 次，如果是奇数层数 +1，防止伪随机 - private int randomLevel() { - int level = 1; - for (int i = 1; i < MAX_LEVEL; ++i) { - if (r.nextInt() % 2 == 1) { - level++; - } - } - - return level; - } - - public void printAll() { - Node p = head; - while (p.forwards[0] != null) { - System.out.print(p.forwards[0] + " "); - p = p.forwards[0]; - } - System.out.println(); - } - - public class Node { - private int data = -1; - private Node forwards[] = new Node[MAX_LEVEL]; - private int maxLevel = 0; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList2.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList2.java deleted file mode 100644 index 66bb1f7fe..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipList2.java +++ /dev/null @@ -1,156 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.search; - -import java.util.Random; - -/** - * 参考 {@link SkipList} ，自己实现一遍跳表。 - * - * 通过 {@link Node} 的 forwards 数组实现，确实挺巧妙，代码量也非常精简。 - * - * 目前，网络上找到的 Java 跳表实现，主要是 https://sylvanassun.github.io/2017/12/31/2017-12-31-skip_list/ 这种。实现方式略有差别。 - * - * @author yunai - */ -@SuppressWarnings("Duplicates") -public class SkipList2 { - - private static final int MAX_LEVEL = 16; - - private Random random = new Random(); - - /** - * 总层级数 - */ - private int levelCount = 1; - - private Node head = new Node(null, MAX_LEVEL); - - public Node find(int value) { - // 自最上层索引，开始往下查询 - Node p = head; - for (int i = levelCount - 1; i >= 0; i--) { - while (p.forwards[i] != null && p.forwards[i].data < value) { // 这里看的会有点绕，第一次 for ，跳转到对应 i 层，后续的，就是第 i 层的不断向下指向 - p = p.forwards[i]; - } - } - - // 判断是否相等 - if (p.forwards[0] != null && p.forwards[0].data == value) { - return p.forwards[0]; - } - return null; - } - - public void insert(int value) { - // 创建 Node - int maxLevel = randomLevel(); - Node node = new Node(value, maxLevel); - - // 寻找每一层的指向 - Node[] update = new Node[maxLevel]; -// for (int i = 0; i < maxLevel; i++) { // 初始化 node 在一层的指向 。不需要，因为下面的 for 循环，一定会给 update 数组赋值。 -// update[i] = head; -// } - Node p = head; - for (int i = maxLevel - 1; i >= 0; i--) { - while (p.forwards[i] != null && p.forwards[i].data < value) { // 这里看的会有点绕，第一次 for ，跳转到对应 i 层，后续的，就是第 i 层的不断向下指向 - p = p.forwards[i]; - } - update[i] = p; - } - - // 设置指向 - for (int i = 0; i < maxLevel; i++) { - // 设置 node 在第 i 层，指向 update[i].forwards[i] - node.forwards[i] = update[i].forwards[i]; - // 将 update[i].forwards[i] 赋值成 node 。 - // 这样，就形成了 update[i].forwards[i] = node ，并且 node..forwards[i] = 原 update[i].forwards[i] 。可能有点绕，可以调试下 - update[i].forwards[i] = node; - } - - // 设置新的最高高度 - if (maxLevel > levelCount) { - levelCount = maxLevel; - } - } - - public void delete(int value) { - // 寻找一层对 value 应该 Node 的指向 - Node[] update = new Node[levelCount]; - Node p = head; - for (int i = levelCount - 1; i >= 0; i--) { - while (p.forwards[i] != null && p.forwards[i].data < value) { // 这里看的会有点绕，第一次 for ，跳转到对应 i 层，后续的，就是第 i 层的不断向下指向 - p = p.forwards[i]; - } - update[i] = p; - } - - // 如果找到指定节点 - if (p.forwards[0] != null && p.forwards[0].data == value) { - for (int i = levelCount - 1; i >= 0; i--) { - // 指定层，有符合 value 应该 Node 的指向，进行删除 - if (update[i].forwards[i] != null && update[i].forwards[i].data == value) { - update[i].forwards[i] = update[i].forwards[i].forwards[i]; - } - } - } - } - - private int randomLevel() { - return random.nextInt(MAX_LEVEL - 1) + 1; // 一定建立索引，避免直接添加到第 0 层。不然可能会丢失。 -// return random.nextInt(MAX_LEVEL); // 因为我们是从 1 层开始计数，可以看 levelCount 参数 - } - -// // 随机 level 次，如果是奇数层数 +1，防止伪随机 -// private int randomLevel() { -// int level = 1; -// for (int i = 1; i < MAX_LEVEL; ++i) { -// if (random.nextInt() % 2 == 1) { -// level++; -// } -// } -// -// return level; -// } - - /** - * 节点 - * - * 通过 {@link #forwards} 属性，记录在每一层的指向。 - * - * 注意，相同 {@link #data} ，在多层，通过 {@link #forwards} 属性来实现，而不是指向。 - */ - public class Node { - - // TODO 芋艿，如果想实现类似 HashMap 的功能，可以把 data 改成 key + value 。 - /** - * 数值 - */ - private Integer data; - - /** - * 最高层级 - */ - private int maxLevel; - /** - * 对指定层级的指向 - */ - private Node[] forwards; - - public Node(Integer data, int maxLevel) { - this.data = data; - this.maxLevel = maxLevel; - this.forwards = new Node[maxLevel]; -// this.forwards = new Node[MAX_LEVEL]; - } - - @Override - public String toString() { - return "Node{" + - "data=" + data + - ", maxLevel=" + maxLevel + - '}'; - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipListTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipListTest.java deleted file mode 100644 index 7c873fdac..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SkipListTest.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.search; - -public class SkipListTest { - - public static void main2(String[] args) { - SkipList skipList = new SkipList(); - skipList.insert(1); - skipList.insert(2); - skipList.insert(3); - skipList.insert(1); - skipList.insert(1); - skipList.insert(1); - skipList.delete(1); - skipList.printAll(); - } - - public static void main(String[] args) { - for (int i = 0; i < 10000; i++) { - SkipList2 skipList = new SkipList2(); -// SkipList skipList = new SkipList(); - // 测试添加 - skipList.insert(2); - skipList.insert(1); - - // 测试查询 - System.out.println(skipList.find(1) != null); - assert skipList.find(1) != null; - System.out.println(skipList.find(2) != null); - assert skipList.find(2) != null; - System.out.println(skipList.find(3) == null); // null - assert skipList.find(3) == null; - - // 测试删除 - skipList.delete(1); - System.out.println(skipList.find(1) == null); // null - assert skipList.find(1) == null; - System.out.println(skipList.find(2) != null); - assert skipList.find(2) != null; - } - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SquareTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SquareTest.java deleted file mode 100644 index 107c3f061..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/search/SquareTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.search; - -/** - * 使用二分查找，计算平方根。 - */ -public class SquareTest { - - public static void main(String[] args) { - double result = sqrt(5, 0.00001D); - System.out.println(result); - } - - // precision 表示精度 - private static double sqrt(int number, double precision) { - int rounds = 0; // 用于记录轮次，调试用途 - double low = 0; - double high = number; - while (low <= high) { - double middle = low + ((high - low) / 2); - double result = middle * middle; - System.out.println(String.format("第 %d 轮，结果：%f", ++rounds, middle)); - - double diff = number - result; - if (0 <= diff && diff <= precision) { - return middle; - } - if (result < number) { - low = middle; - } else if (result > number) { - high = middle; - } else { - throw new IllegalStateException("不可能出现"); - } - } - throw new IllegalStateException("必然有结果，还能求不出平方根"); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/BucketSorterTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/BucketSorterTest.java deleted file mode 100644 index 69cdc62b6..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/BucketSorterTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Random; - -public class BucketSorterTest { - - public static void main(String[] args) { - Random random = new Random(); - int[] array = new int[1000]; - for (int i = 0; i < 1000; i++) { - array[i] = random.nextInt(10000); - } - bucketSort(array, 100); - } - - // bucketSize - 指的是每个 bucket 的大小 - public static void bucketSort(int[] array, int bucketSize) { - // 求最大最小值 - int max = Integer.MIN_VALUE; - int min = Integer.MAX_VALUE; - for (int value : array) { - if (value > max) { - max = value; - } - if (value < min) { - min = value; - } - } - - // 创建桶 - int bucketCounts = (max - min) / bucketSize + 1; // 这里后面要优化下，向上取整。例如说 101 / 10 ，理论来说，应该是 11 个木桶 - ArrayList> buckets = new ArrayList<>(bucketCounts); // 使用 ArrayList ，方便实现，减少扩容等等麻烦 - for (int i = 0; i < bucketCounts; i++) { - buckets.add(new ArrayList()); - } - - // 添加到桶中 - for (int value : array) { - buckets.get((value - min) / bucketSize).add(value); // -min ，因为它是起点 - } - - // 排序每个桶 - for (ArrayList bucket : buckets) { - Collections.sort(bucket); // 方便 - } - System.out.println(buckets); - - // 打印结果 - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/HeapSorterTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/HeapSorterTest.java deleted file mode 100644 index 979e24815..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/HeapSorterTest.java +++ /dev/null @@ -1,134 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.Arrays; - -/** - * 堆排序 - */ -public class HeapSorterTest { - - public static void main(String[] args) { - if (false) { - HeapSorter heapSorter = new HeapSorter(10); - heapSorter.insert(10); - heapSorter.insert(3); - heapSorter.insert(5); - heapSorter.insert(1); - heapSorter.insert(2); - heapSorter.insert(20); - System.out.println(Arrays.toString(heapSorter.heap)); - - heapSorter.remove(2); - System.out.println(Arrays.toString(heapSorter.heap)); - } - - if (true) { - int[] array = {0, 10, 3, 5, 1, 2, 20}; - HeapSorter heapSorter = HeapSorter.create(array, array.length - 1); -// System.out.println(Arrays.toString(heapSorter.heap)); - heapSorter.sort(); - } - } - - public static class HeapSorter { - - /** - * 堆 - */ - private int[] heap; - /** - * 容量 - */ - private int capacity; - /** - * 元素数量 - */ - private int count; - - public HeapSorter(int[] heap, int count) { - this.capacity = heap.length; - this.heap = heap; - this.count = count; - } - - public HeapSorter(int capacity) { - this.capacity = capacity; - this.heap = new int[capacity + 1]; // 因为 0 被占用了 - count = 0; - } - - public void insert(int value) { - if (count >= capacity) { - throw new IllegalStateException("容量已满"); - } - ++count; - heap[count] = value; - - // 自下向上堆化，如果大于父节点 - int index = count; - while (index >> 1 > 0 && heap[index] > heap[index >> 1]) { - swap(index, index >> 1); - index = index >> 1; - } - } - - public int remove(int pos) { - if (count == 0) { - throw new IllegalStateException("不存在最大值"); - } - int tmp = heap[pos]; - heap[pos] = heap[count]; - heap[count] = 0; // 置空，其实非必要。就是为了好看 - count--; - - heapify(heap, count, pos); - return tmp; - } - - /** - * 排序 - */ - public void sort() { - while (count > 1) { - System.out.println(remove(1)); - } - } - - private void swap(int i, int j) { - swap(heap, i, j); - } - - public static HeapSorter create(int[] heap, int count) { - for (int i = count / 2; i >= 1; i--) { - heapify(heap, count, i); - } - return new HeapSorter(heap, count); - } - - private static void heapify(int[] heap, int count, int pos) { - // 自伤向下， - while (true) { - int maxPos = pos; - if (pos * 2 <= count && heap[pos] < heap[pos * 2]) { - maxPos = pos * 2; - } - if (pos * 2 + 1 <= count && heap[maxPos] < heap[pos * 2 + 1]) { - maxPos = pos * 2 + 1; - } - // 判断相等，说明没变化 - if (maxPos == pos) { - return; - } - swap(heap, pos, maxPos); - } - } - - private static void swap(int[] heap, int i, int j) { - int tmp = heap[i]; - heap[i] = heap[j]; - heap[j] = tmp; - } - - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/MergeSorterTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/MergeSorterTest.java deleted file mode 100644 index e3f35ae0b..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/MergeSorterTest.java +++ /dev/null @@ -1,64 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.Arrays; - -/** - * 合并排序 - */ -public class MergeSorterTest { - - public static void main(String[] args) { - { - int[] array = new int[]{5, 4, 2, 3, 1, 2, 5, 2, 6}; - mergeSort(array); - } - } - - private static void mergeSort(int[] array) { - int[] tmpArray = new int[array.length]; - mergeSort(array, tmpArray, 0, array.length - 1); - - System.out.println(Arrays.toString(array)); - } - - private static void mergeSort(int[] array, int[] tmpArray, int low, int high) { - // 递归结束，如果 low 和 high 是相同的 - if (low >= high) { - return; - } - - // 折半，进行分解 - int middle = low + (high - low >> 1); // >> 1 等价于 / 2 - mergeSort(array, tmpArray, low, middle); - mergeSort(array, tmpArray, middle + 1, high); - - // 合并 - merge(array, tmpArray, low, middle, high); - } - - private static void merge(int[] array, int[] tmpArray, int low, int middle, int high) { - // 比较排序 - int highStart = middle + 1; - int lowStart = low; // 需要赋值出来，是为了避免 low 被修改 - int tmpArrayIndex = low; // tmpArray 的 index - while (lowStart <= middle && highStart <= high) { // 能够这么操作的原因是，每次递归，最终的结果都是有序的。所以就一直可以有序了。 - if (array[lowStart] > array[highStart]) { - tmpArray[tmpArrayIndex++] = array[highStart++]; - } else { - tmpArray[tmpArrayIndex++] = array[lowStart++]; - } - } - - // 将上述未赋值到 tmpArray 的，继续赋值进去 - while (lowStart <= middle) { - tmpArray[tmpArrayIndex++] = array[lowStart++]; - } - while (highStart <= high) { - tmpArray[tmpArrayIndex++] = array[highStart++]; - } - - // 将排序后的 tmpArrayIndex 赋值到 array 中，从 low 开始到 high 部分。 - System.arraycopy(tmpArray, low, array, low, high - low + 1); - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/QuickSorterTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/QuickSorterTest.java deleted file mode 100644 index 1aa68b6f3..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/QuickSorterTest.java +++ /dev/null @@ -1,94 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.Arrays; - -/** - * 快速排序 - */ -public class QuickSorterTest { - - public static void main(String[] args) { - { - int[] array = new int[]{5, 4, 2, 3, 1, 2, 5, 2, 6}; -// int[] array = new int[]{6, 11, 8}; - quickSort(array); - } - } - - private static void quickSort(int[] array) { - quickSort(array, 0, array.length - 1); - - System.out.println(Arrays.toString(array)); - } - - private static void quickSort(int[] array, int low, int high) { - if (low >= high) { - return; - } - - // 寻找 partition 位置 -// int partitionIndex = partition(array, low, high); - int partitionIndex = partition02(array, low, high); - - // 递归排序 - quickSort(array, low, partitionIndex - 1); - quickSort(array, partitionIndex + 1, high); - } - - @SuppressWarnings("Duplicates") - public static int partition(int[] array, int low, int high) { - int partitionValue = array[high]; // 首先，选择 high 位置的值，作为 partitionValue 值 - int pos = low; - // 遍历 array 的 low 到 high 区间，将小于 partitionValue 值的部分，顺序放到 [0, pos) 范围内。最终，pos 我们会放 partitionValue 值。 - for (int i = low; i < high; i++) { - if (array[i] < partitionValue) { - // 进行交换 - swap(array, i, pos); - // pos + 1 ，用于下一个使用 - pos++; - } - } - - // 将 pos 我们会放 partitionValue 值。 - swap(array, pos, high); - - // 返回 partitionValue 所在位置 - return pos; - } - - - - private static void swap(int[] array, int pos1, int pos2) { - if (pos1 == pos2) { - return; - } - int tmp = array[pos1]; - array[pos1] = array[pos2]; - array[pos2] = tmp; - } - - // partition 的逻辑，基于 swap ，需要 3 次操作 - // partition02 的逻辑，基于赋值来做，只需要 1 次操作。相比来说，性能更好。 - // 当然，第一次看 partition02 的逻辑，可能会有点懵逼。大体的理解是，low 和 high 之间，被不断夹紧，把比 pivot 大的放到右侧，比 pivot 小的放到左侧。 - // 本质可以理解成: - // 1. pivot = arr[low]; =》 A -> B - // 2. arr[low] = arr[high]; =》 B -> C - // 3. arr[high] = arr[low]; =》 C -> D - // 4. 重复循环，我们最终找到真正的 D ，将 原 B ，也就是 A ，复制上去。 - private static int partition02(int[] arr, int low, int high) { - int pivot = arr[low]; //枢轴记录 - // 循环，达到 arr[low] 左边是比它小，右边是比它大。 - while (low < high) { // 实际上，最终 break 的条件是，low 和 high 相等。具体可以看里面的两个 while - while (low < high && arr[high] >= pivot) --high; // 因为 high 原来就在右侧，所以不需要移动 - arr[low] = arr[high]; // 交换比枢轴小的记录到左端 - - while (low < high && arr[low] <= pivot) ++low; // 因为 low 原来就在左侧，所以不需要移动 - arr[high] = arr[low]; // 交换比枢轴小的记录到右端 - } - //扫描完成，枢轴到位 - arr[low] = pivot; - //返回的是枢轴的位置 - return low; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/RadixSorterTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/RadixSorterTest.java deleted file mode 100644 index 8fcdad729..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/RadixSorterTest.java +++ /dev/null @@ -1,77 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.ArrayList; -import java.util.Arrays; - -/** - * 基数排序 - * - * 每个位的排序，通过桶排序实现，从而实现 k * O(n) 的复杂度 - */ -public class RadixSorterTest { - - public static void main(String[] args) { - int[] array = new int[]{ - 23, - 50, - 100, - 1, - 10, - 21, - 50, - }; - - radixSort(array); - } - - private static void radixSort(int[] array) { - int digits = getMaxDigits(array); - for (int digit = 0; digit < digits; digit++) { - radixSort(array, digit); - } - - System.out.println(Arrays.toString(array)); - } - - private static void radixSort(int[] array, int digit) { - // 用于后面，获得第 digit 位 - int base = (int) Math.pow(10, digit); - - // 创建桶 - int bucketCounts = 10; - ArrayList> buckets = new ArrayList<>(bucketCounts); - for (int i = 0; i < bucketCounts; i++) { - buckets.add(new ArrayList<>()); - } - - // 添加到桶中 - for (int value : array) { - int bucketIndex = value / base % bucketCounts; - buckets.get(bucketIndex).add(value); - } - - // 顺序输出，自然有序 - int index = 0; - for (ArrayList bucket : buckets) { - for (Integer value : bucket) { - array[index++] = value; - } - } - } - - private static int getMaxDigits(int[] array) { - int max = Integer.MIN_VALUE; - for (int value : array) { - if (value > max) { - max = value; - } - } - int digits = 0; - while (max > 0) { - digits++; - max = max / 10; - } - return digits; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/TheFirstBigKTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/TheFirstBigKTest.java deleted file mode 100644 index 698cb1584..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/sort/TheFirstBigKTest.java +++ /dev/null @@ -1,79 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.sort; - -import java.util.Arrays; - -/** - * 基于快速排序的方式，实现第 k 大的数 - */ -public class TheFirstBigKTest { - - public static void main(String[] args) { - { - int[] array = new int[]{5, 4, 2, 3, 1, 2, 5, 2, 6}; -// int[] array = new int[]{6, 11, 8}; -// quickSort(array, 1); -// quickSort(array, 2); -// quickSort(array, 3); -// quickSort(array, 4); - quickSort(array, 5); - } - } - - private static void quickSort(int[] array, int k) { - if (k > array.length) { - throw new IllegalStateException("k 不能大于最大数组"); - } - quickSort(array, k - 1, 0, array.length - 1); - - System.out.println(Arrays.toString(array)); - System.out.println("答案 k ：" + array[k - 1]); - } - - private static void quickSort(int[] array, int k, int low, int high) { - if (low >= high) { - return; - } - - int partition = partition(array, low, high); - if (partition == k) { - return; - } - - if (partition < k) { - quickSort(array, k, partition + 1, high); - } else { - quickSort(array, k, low, partition - 1); - } - } - - @SuppressWarnings("Duplicates") - private static int partition(int[] array, int low, int high) { - int partitionValue = array[high]; // 首先，选择 high 位置的值，作为 partitionValue 值 - int pos = low; - // 遍历 array 的 low 到 high 区间，将小于 partitionValue 值的部分，顺序放到 [0, pos) 范围内。最终，pos 我们会放 partitionValue 值。 - for (int i = low; i < high; i++) { - if (array[i] < partitionValue) { - // 进行交换 - swap(array, i, pos); - // pos + 1 ，用于下一个使用 - pos++; - } - } - - // 将 pos 我们会放 partitionValue 值。 - swap(array, pos, high); - - // 返回 partitionValue 所在位置 - return pos; - } - - private static void swap(int[] array, int pos1, int pos2) { - if (pos1 == pos2) { - return; - } - int tmp = array[pos1]; - array[pos1] = array[pos2]; - array[pos2] = tmp; - } - -} diff --git a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/tree/MySQLBTreePlusTest.java b/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/tree/MySQLBTreePlusTest.java deleted file mode 100644 index 5e440f0c6..000000000 --- a/lab-09/src/main/java/cn/iocoder/springboot/labs/lab09/tree/MySQLBTreePlusTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package cn.iocoder.springboot.labs.lab09.tree; - -/** - * MySQL B+Tree - */ -public class MySQLBTreePlusTest { - - /** - * 非叶子节点 - */ - public static class Node { - - /** - * 5 叉树 - */ - public static int m = 5; - - /** - * 键值的数组 - * - * m - 1 的原因是，keywords 代表的是区间。 - * - * children[0] 的范围是 [ -无穷, keywords[0] ] - * children[1] 的泛微是 - */ - private int[] keywords = new int[m - 1]; - - /** - * 保存子节点的指针 - */ - private Node[] children = new Node[m]; - - } - - /** - * 叶子节点 - */ - public static class LeafNode { - - /** - * 假设每个叶子节点存储三个数据行的键值和数据地址信息 - */ - public static int k = 3; - - /** - * 数据行的键值 - * - * 不同于 {@link Node#keywords} ，这里表示的是具体值 - */ - private int[] keywords = new int[k]; - /** - * 数据航的地址值 - */ - private int[] dataAddresses = new int[k]; - - /** - * 前置的叶子节点，用于区间检索 - */ - private LeafNode prev; - /** - * 后置的叶子节点，用于区间检索 - */ - private LeafNode next; - - } - -} diff --git "a/lab-09/\345\207\206\345\244\207\345\210\240\351\231\244" "b/lab-09/\345\207\206\345\244\207\345\210\240\351\231\244" deleted file mode 100644 index e69de29bb..000000000 diff --git a/lab-10/pom.xml b/lab-10/pom.xml deleted file mode 100644 index 11aa51736..000000000 --- a/lab-10/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.1.4.RELEASE - - - 4.0.0 - - lab-10 - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-actuator - - - - diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/Controller.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/Controller.java deleted file mode 100644 index 30fafc3f2..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/Controller.java +++ /dev/null @@ -1,22 +0,0 @@ -package cn.iocoder.springboot.labs.lab10; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class Controller { - - @GetMapping("/hello") - public String hello() { -// System.out.println(Thread.currentThread().getName()); - return "world"; - } - - @GetMapping("/sleep") - public String sleep() throws InterruptedException { - Thread.sleep(100L); -// System.out.println(Thread.currentThread().getName()); - return "world"; - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/SpringMVCApplication.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/SpringMVCApplication.java deleted file mode 100644 index 51b8a3558..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/SpringMVCApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.iocoder.springboot.labs.lab10; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class SpringMVCApplication { - - public static void main(String[] args) { - SpringApplication.run(SpringMVCApplication.class); - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/TestListener.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/TestListener.java deleted file mode 100644 index 6b1a96483..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/TestListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package cn.iocoder.springboot.labs.lab10; - -import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -@Component -public class TestListener implements ApplicationListener { - - @Override - public void onApplicationEvent(ApplicationEvent event) { - System.out.println("事件：" + event); - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/UserHealthIndicator.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/UserHealthIndicator.java deleted file mode 100644 index 21fd1cada..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/UserHealthIndicator.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.iocoder.springboot.labs.lab10; - -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.HealthIndicator; - -//@Component -public class UserHealthIndicator implements HealthIndicator { - - /** - * user监控 访问: http://localhost:8088/health - * - * @return 自定义Health监控 - */ - @Override - public Health health() { - return new Health.Builder().withDetail("usercount", 10) //自定义监控内容 - .withDetail("userstatus", "up").down().build(); - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfiguration.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfiguration.java deleted file mode 100644 index bf0162693..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfiguration.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.iocoder.springboot.labs.lab10.lifecycle; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class ServerLifeCycleConfiguration { - - @Bean - public ServerLifeCycleHealthIndicator serverLifeCycleHealthIndicator() { - return new ServerLifeCycleHealthIndicator(); - } - - @Bean - public ServerLifeCycleListener serverLifeCycleListener() { - return new ServerLifeCycleListener(this.serverLifeCycleHealthIndicator()); - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfigurationProperties.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfigurationProperties.java deleted file mode 100644 index 56f23e947..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleConfigurationProperties.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.iocoder.springboot.labs.lab10.lifecycle; - -// TODO sleep 时长的配置 -public class ServerLifeCycleConfigurationProperties { - - - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleHealthIndicator.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleHealthIndicator.java deleted file mode 100644 index 4176daaa4..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleHealthIndicator.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.iocoder.springboot.labs.lab10.lifecycle; - -import org.springframework.boot.actuate.health.AbstractHealthIndicator; -import org.springframework.boot.actuate.health.Health; -import org.springframework.boot.actuate.health.Status; - -public class ServerLifeCycleHealthIndicator extends AbstractHealthIndicator { - - /** - * 服务状态 - * - * 启动阶段： - * 1. 项目初始启动时，状态为 OUT_OF_SERVICE 不提供服务。 - * 2. 服务启动完成（ApplicationReadyEvent）时，状态为 UP 启动。 - * 3. 服务启动失败（ApplicationFailedEvent）时，状态 DOWN 关闭。 - * - * 关闭阶段： - * 1. 服务开始关闭（ContextClosedEvent）时，状态为 OUT_OF_SERVICE 不提供服务。 - * 2. 因为服务关闭完成，不存在事件，所以暂时不处理。 - * - * 具体的状态变更，通过 - */ - private volatile Status status = Status.OUT_OF_SERVICE; - - @Override - protected void doHealthCheck(Health.Builder builder) { - builder.status(status); - } - - public void up() { - this.status = Status.UP; - } - - public void down() { - this.status = Status.DOWN; - } - - public void outOfService() { - this.status = Status.OUT_OF_SERVICE; - } - - public Status status() { - return this.status; - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleListener.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleListener.java deleted file mode 100644 index f8228e227..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/ServerLifeCycleListener.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.iocoder.springboot.labs.lab10.lifecycle; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.event.ApplicationFailedEvent; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.ApplicationEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.context.event.ContextClosedEvent; - -public class ServerLifeCycleListener implements ApplicationListener { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - private ServerLifeCycleHealthIndicator healthIndicator; - - public ServerLifeCycleListener(ServerLifeCycleHealthIndicator healthIndicator) { - this.healthIndicator = healthIndicator; - } - - @Override - public void onApplicationEvent(ApplicationEvent event) { - if (event instanceof ApplicationReadyEvent) { - this.handleApplicationReadyEvent((ApplicationReadyEvent) event); - } else if (event instanceof ApplicationFailedEvent) { - this.handleApplicationFailedEvent((ApplicationFailedEvent) event); - } else if (event instanceof ContextClosedEvent) { - this.handleContextClosedEvent((ContextClosedEvent) event); - } - } - - @SuppressWarnings("unused") - private void handleApplicationReadyEvent(ApplicationReadyEvent event) { - healthIndicator.up(); - } - - @SuppressWarnings("unused") - private void handleApplicationFailedEvent(ApplicationFailedEvent event) { - healthIndicator.down(); - } - - @SuppressWarnings("unused") - private void handleContextClosedEvent(ContextClosedEvent event) { - // 标记不提供服务 - healthIndicator.outOfService(); - - // sleep 等待负载均衡完成健康检查 - for (int i = 0; i < 20; i++) { // TODO 20 需要配置 - logger.info("[handleContextClosedEvent][优雅关闭，第 {} sleep 等待负载均衡完成健康检查]", i); - try { - Thread.sleep(1000L); - } catch (InterruptedException ignore) { - } - } - } - -} diff --git a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/StatusController.java b/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/StatusController.java deleted file mode 100644 index d2d16b7c2..000000000 --- a/lab-10/src/main/java/cn/iocoder/springboot/labs/lab10/lifecycle/StatusController.java +++ /dev/null @@ -1,28 +0,0 @@ -package cn.iocoder.springboot.labs.lab10.lifecycle; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.actuate.health.Status; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController // TODO rest 没生效，得排查下。 -@RequestMapping("/") // TODO 可配置 -public class StatusController { - - @Autowired - private ServerLifeCycleHealthIndicator serverLifeCycleHealthIndicator; - - @RequestMapping("/status") - public ResponseEntity status() { - Status status = serverLifeCycleHealthIndicator.status(); - // 成功 - if (Status.UP == status) { - return new ResponseEntity<>(status.getDescription(), HttpStatus.OK); - } - // 失败 - return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body(status.getDescription()); - } - -} diff --git a/lab-10/src/main/resources/application.properties b/lab-10/src/main/resources/application.properties deleted file mode 100644 index 0eb258cba..000000000 --- a/lab-10/src/main/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -management.endpoint.health.show-details=always -server.port=9080 diff --git "a/lab-10/\345\207\206\345\244\207\345\210\240\351\231\244" "b/lab-10/\345\207\206\345\244\207\345\210\240\351\231\244" deleted file mode 100644 index e69de29bb..000000000 diff --git a/pom.xml b/pom.xml index 34dec6d87..241c217c6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,9 +18,6 @@ - - - From f98d6ac3e63fd7d974ce7b5f6b1969f61df1aa7a Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 29 Jun 2020 19:27:21 +0800 Subject: [PATCH 106/115] =?UTF-8?q?IDEA=20=E7=83=AD=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=96=B9=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- {lab-48 => lab-48-hot-swap}/lab-48-demo/pom.xml | 0 .../java/cn/iocoder/springboot/lab48/demo/DemoApplication.java | 0 .../springboot/lab48/demo/controller/DemoController.java | 0 {lab-48 => lab-48-hot-swap}/pom.xml | 2 +- ...\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" | 0 pom.xml | 2 +- 7 files changed, 3 insertions(+), 3 deletions(-) rename {lab-48 => lab-48-hot-swap}/lab-48-demo/pom.xml (100%) rename {lab-48 => lab-48-hot-swap}/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/DemoApplication.java (100%) rename {lab-48 => lab-48-hot-swap}/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/controller/DemoController.java (100%) rename {lab-48 => lab-48-hot-swap}/pom.xml (92%) rename "lab-48/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" => "lab-48-hot-swap/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" (100%) diff --git a/README.md b/README.md index 79e614ce7..fa9665440 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ ## 开发工具 -* [《芋道 Spring Boot 热部署入门》](http://www.iocoder.cn/Spring-Boot/hot-swap/?github) 对应 [lab-48](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-48) +* [《芋道 Spring Boot 热部署入门》](http://www.iocoder.cn/Spring-Boot/hot-swap/?github) 对应 [lab-48-hot-swap](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-48-hot-swap) * [《芋道 Spring Boot 消除冗余代码 Lombok 入门》](http://www.iocoder.cn/Spring-Boot/Lombok/?github) 对应 [lab-49](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-49) * [《芋道 Spring Boot 对象转换 MapStruct 入门》](http://www.iocoder.cn/Spring-Boot/MapStruct/?github) 对应 [lab-55](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-55) diff --git a/lab-48/lab-48-demo/pom.xml b/lab-48-hot-swap/lab-48-demo/pom.xml similarity index 100% rename from lab-48/lab-48-demo/pom.xml rename to lab-48-hot-swap/lab-48-demo/pom.xml diff --git a/lab-48/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/DemoApplication.java b/lab-48-hot-swap/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/DemoApplication.java similarity index 100% rename from lab-48/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/DemoApplication.java rename to lab-48-hot-swap/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/DemoApplication.java diff --git a/lab-48/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/controller/DemoController.java b/lab-48-hot-swap/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/controller/DemoController.java similarity index 100% rename from lab-48/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/controller/DemoController.java rename to lab-48-hot-swap/lab-48-demo/src/main/java/cn/iocoder/springboot/lab48/demo/controller/DemoController.java diff --git a/lab-48/pom.xml b/lab-48-hot-swap/pom.xml similarity index 92% rename from lab-48/pom.xml rename to lab-48-hot-swap/pom.xml index d4dc38d7a..3ecc26058 100644 --- a/lab-48/pom.xml +++ b/lab-48-hot-swap/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-48 + lab-48-hot-swap pom diff --git "a/lab-48/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" "b/lab-48-hot-swap/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" similarity index 100% rename from "lab-48/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" rename to "lab-48-hot-swap/\343\200\212\350\212\213\351\201\223 Spring Boot \347\203\255\351\203\250\347\275\262\345\205\245\351\227\250\343\200\213.md" diff --git a/pom.xml b/pom.xml index 241c217c6..1127eda64 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ - + From 38fe54657c589c0729a91a18a4686cf36d65225c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 2 Jul 2020 19:25:24 +0800 Subject: [PATCH 107/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A4=E6=B5=81?= =?UTF-8?q?=E7=BE=A4=EF=BC=8C=E5=A4=AA=E5=A4=9A=E8=83=96=E5=8F=8B=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=B8=85=E6=B0=94=E7=9A=84=E6=88=91=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fa9665440..003525b31 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,17 @@ ![一间三连](http://static.iocoder.cn/github-star.jpg) -> ~~交流~~**装逼群**，请点击[传送门](http://www.iocoder.cn/mall-user-group/?vip&gitee)，进行引导加入。**亲，一键三连啊** +> **亲，一键三连啊** + +# 交流群 + +扫码如下**二维码**，回复「艿艿」关键字。 + +可以添加 18 岁的我为好友，并拉你进一个~~交流~~**装逼群**。 + +![骚气的二维码](http://www.iooder.cn/images/common/erweima.jpg) + +😈 等后面，艿艿**头发**重新长一点出来，给旁友们录制点视频哈！ # Spring Boot 专栏 From 67026716cf98db2368decc139c34901a0e60358c Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Thu, 2 Jul 2020 19:26:31 +0800 Subject: [PATCH 108/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=A4=E6=B5=81?= =?UTF-8?q?=E7=BE=A4=EF=BC=8C=E5=A4=AA=E5=A4=9A=E8=83=96=E5=8F=8B=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=B8=85=E6=B0=94=E7=9A=84=E6=88=91=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 003525b31..428f7de24 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ 可以添加 18 岁的我为好友，并拉你进一个~~交流~~**装逼群**。 -![骚气的二维码](http://www.iooder.cn/images/common/erweima.jpg) +![骚气的二维码](http://www.iocoder.cn/images/common/erweima.jpg) 😈 等后面，艿艿**头发**重新长一点出来，给旁友们录制点视频哈！ From c85002f18bae09911dfa8676a9e0fcf46207edaa Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Tue, 4 Aug 2020 19:32:40 +0800 Subject: [PATCH 109/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20tars=20=E7=9A=84?= =?UTF-8?q?=E8=AE=A1=E5=88=92~=20=E6=9C=80=E8=BF=91=E5=9C=A8=E8=8A=B1?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=86=99=20onemall=20=E7=BE=8E=E6=BB=8B?= =?UTF-8?q?=E6=BB=8B=E3=80=82=20=E5=9D=90=E7=AD=89=20spring=20boot=202.4.X?= =?UTF-8?q?=20=E7=89=88=E6=9C=AC=EF=BC=8C=E8=BF=9B=E8=A1=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=A4=A7=E7=89=88=E6=9C=AC=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ .../lab-68-demo21-resource-server-on-sso/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 428f7de24..0181341f4 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,7 @@ * [《芋道 Spring Boot SOFARPC 入门》](http://www.iocoder.cn/Spring-Boot/SOFARPC/?github) 对应 [lab-62](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-62) * [《芋道 Spring Boot Motan 入门》](http://www.iocoder.cn/Spring-Boot/Motan/?github) 对应 [lab-63](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-63) * 《芋道 Spring Boot RSocket 入门》计划中... +* 《芋道 Spring Boot Tars 入门》计划中... ## 数据访问 @@ -155,6 +156,7 @@ * [《芋道 Spring Boot 日志集成 Logging 入门》](http://www.iocoder.cn/Spring-Boot/Logging/?github) 对应 [lab-37](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-37) * [《芋道 Spring Boot 日志平台 ELK + Filebeat 入门》](http://www.iocoder.cn/Spring-Boot/ELK/?github) 对应 [lab-38](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-38) +* 《芋道 Spring Boot 日志平台 Loki 入门》计划中... ## 链路追踪 diff --git a/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml index 313426637..7d99f7f54 100644 --- a/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml +++ b/lab-68-spring-security-oauth/lab-68-demo21-resource-server-on-sso/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - lab-68-demo21-resource-server + lab-68-demo21-resource-server-on-sso From 69a9807e817baa88b24ebd952b3e7a99dbffe75e Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Wed, 9 Sep 2020 22:08:09 +0800 Subject: [PATCH 110/115] =?UTF-8?q?java=20=E5=90=84=E7=A7=8D=20proxy=20?= =?UTF-8?q?=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 +++--- lab-69-proxy/lab-69-proxy-cglib/pom.xml | 22 ++++++++++++++++ .../springboot/labs/lab69/TestProxyMain.java | 19 ++++++++++++++ .../UserServiceMethodInterceptor.java | 17 ++++++++++++ .../labs/lab69/service/UserServiceImpl.java | 9 +++++++ lab-69-proxy/lab-69-proxy-jdk/pom.xml | 22 ++++++++++++++++ .../labs/lab69/GenerateProxyMain.java | 25 ++++++++++++++++++ .../springboot/labs/lab69/TestProxyMain.java | 26 +++++++++++++++++++ .../lab69/handler/UserServiceHandler.java | 24 +++++++++++++++++ .../labs/lab69/service/UserService.java | 7 +++++ .../labs/lab69/service/UserServiceImpl.java | 9 +++++++ lab-69-proxy/pom.xml | 20 ++++++++++++++ pom.xml | 2 ++ 13 files changed, 206 insertions(+), 4 deletions(-) create mode 100644 lab-69-proxy/lab-69-proxy-cglib/pom.xml create mode 100644 lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java create mode 100644 lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/intercept/UserServiceMethodInterceptor.java create mode 100644 lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java create mode 100644 lab-69-proxy/lab-69-proxy-jdk/pom.xml create mode 100644 lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/GenerateProxyMain.java create mode 100644 lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java create mode 100644 lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/handler/UserServiceHandler.java create mode 100644 lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserService.java create mode 100644 lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java create mode 100644 lab-69-proxy/pom.xml diff --git a/README.md b/README.md index 0181341f4..9ee72fd2c 100644 --- a/README.md +++ b/README.md @@ -397,10 +397,10 @@ 如下是草稿目录，未来需要整理下 -# lab-9 - -记录阅读极客时间《数据结构与算法之美》的题目。 - # lab-50 Email 示例 + +# lab-69-proxy + +动态代理 diff --git a/lab-69-proxy/lab-69-proxy-cglib/pom.xml b/lab-69-proxy/lab-69-proxy-cglib/pom.xml new file mode 100644 index 000000000..c9d1e933d --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-cglib/pom.xml @@ -0,0 +1,22 @@ + + + + lab-69 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-69-proxy-cglib + + + + cglib + cglib + 3.3.0 + + + + diff --git a/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java new file mode 100644 index 000000000..9885e9df6 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java @@ -0,0 +1,19 @@ +package cn.iocoder.springboot.labs.lab69; + +import cn.iocoder.springboot.labs.lab69.intercept.UserServiceMethodInterceptor; +import cn.iocoder.springboot.labs.lab69.service.UserServiceImpl; +import net.sf.cglib.proxy.Enhancer; + +public class TestProxyMain { + + public static void main(String[] args) { + // 创建 cglib 增强对象 + Enhancer enhancer = new Enhancer(); + enhancer.setSuperclass(UserServiceImpl.class); // 设置父类 + enhancer.setCallback(new UserServiceMethodInterceptor()); + // 创建代理 + UserServiceImpl userService = (UserServiceImpl) enhancer.create(); + userService.create("yunai", "buzhidao"); + } + +} diff --git a/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/intercept/UserServiceMethodInterceptor.java b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/intercept/UserServiceMethodInterceptor.java new file mode 100644 index 000000000..c607ee000 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/intercept/UserServiceMethodInterceptor.java @@ -0,0 +1,17 @@ +package cn.iocoder.springboot.labs.lab69.intercept; + +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import java.lang.reflect.Method; + +public class UserServiceMethodInterceptor implements MethodInterceptor { + + public Object intercept(Object object, Method method, Object[] args, MethodProxy methodProxy) throws Throwable { + System.out.println("before invoke"); + Object ret = methodProxy.invokeSuper(object, args); + System.out.println("after invoke"); + return ret; + } + +} diff --git a/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java new file mode 100644 index 000000000..61a1f79f4 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-cglib/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java @@ -0,0 +1,9 @@ +package cn.iocoder.springboot.labs.lab69.service; + +public class UserServiceImpl { + + public void create(String username, String password) { + System.out.println(String.format("登陆的用户名(%s) 密码(%s)", username, password)); + } + +} diff --git a/lab-69-proxy/lab-69-proxy-jdk/pom.xml b/lab-69-proxy/lab-69-proxy-jdk/pom.xml new file mode 100644 index 000000000..239401ba0 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/pom.xml @@ -0,0 +1,22 @@ + + + + lab-69 + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-69-proxy-jdk + + + + commons-io + commons-io + 2.7 + + + + diff --git a/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/GenerateProxyMain.java b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/GenerateProxyMain.java new file mode 100644 index 000000000..1c57a1964 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/GenerateProxyMain.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.labs.lab69; + +import cn.iocoder.springboot.labs.lab69.service.UserServiceImpl; +import org.apache.commons.io.IOUtils; +import sun.misc.ProxyGenerator; + +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.Proxy; + +/** + * 生成 JDK {@link Proxy} 的示例代码 + * + * 生成后，我们可以反编译查看具体的类 + */ +public class GenerateProxyMain { + + public static void main(String[] args) throws IOException { + // 生成字节码 + byte[] classFile = ProxyGenerator.generateProxyClass("$Proxy11", UserServiceImpl.class.getInterfaces()); + // 写入到磁盘 + IOUtils.write(classFile, new FileOutputStream("/Users/yunai/ls/$Proxy11.class")); + } + +} diff --git a/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java new file mode 100644 index 000000000..b67f63793 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/TestProxyMain.java @@ -0,0 +1,26 @@ +package cn.iocoder.springboot.labs.lab69; + +import cn.iocoder.springboot.labs.lab69.handler.UserServiceHandler; +import cn.iocoder.springboot.labs.lab69.service.UserService; +import cn.iocoder.springboot.labs.lab69.service.UserServiceImpl; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; + +/** + * 使用 JDK {@link Proxy} 实现一个动态代理的示例 + */ +public class TestProxyMain { + + public static void main(String[] args) { + // 创建 UserService 对象 + UserService userService = new UserServiceImpl(); + // JDK 处理器 + InvocationHandler handler = new UserServiceHandler(userService); + // 创建代理 + UserService userServiceProxy = (UserService) Proxy.newProxyInstance(TestProxyMain.class.getClassLoader(), userService.getClass().getInterfaces(), handler); + // 执行 + userServiceProxy.create("yunai", "buzhidao"); + } + +} diff --git a/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/handler/UserServiceHandler.java b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/handler/UserServiceHandler.java new file mode 100644 index 000000000..06d62cb19 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/handler/UserServiceHandler.java @@ -0,0 +1,24 @@ +package cn.iocoder.springboot.labs.lab69.handler; + +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; + +public class UserServiceHandler implements InvocationHandler { + + /** + * 被代理的对象 + */ + private final Object object; + + public UserServiceHandler(Object object) { + this.object = object; + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { + System.out.println("before invoke"); + Object ret = method.invoke(object, args); + System.out.println("after invoke"); + return ret; + } + +} diff --git a/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserService.java b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserService.java new file mode 100644 index 000000000..234b5dc48 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserService.java @@ -0,0 +1,7 @@ +package cn.iocoder.springboot.labs.lab69.service; + +public interface UserService { + + void create(String username, String password); + +} diff --git a/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java new file mode 100644 index 000000000..7bab724d2 --- /dev/null +++ b/lab-69-proxy/lab-69-proxy-jdk/src/main/java/cn/iocoder/springboot/labs/lab69/service/UserServiceImpl.java @@ -0,0 +1,9 @@ +package cn.iocoder.springboot.labs.lab69.service; + +public class UserServiceImpl implements UserService { + + public void create(String username, String password) { + System.out.println(String.format("登陆的用户名(%s) 密码(%s)", username, password)); + } + +} diff --git a/lab-69-proxy/pom.xml b/lab-69-proxy/pom.xml new file mode 100644 index 000000000..45f9b82d9 --- /dev/null +++ b/lab-69-proxy/pom.xml @@ -0,0 +1,20 @@ + + + + labs-parent + cn.iocoder.springboot.labs + 1.0-SNAPSHOT + + 4.0.0 + + lab-69 + pom + + lab-69-proxy-jdk + lab-69-proxy-cglib + + + + diff --git a/pom.xml b/pom.xml index 1127eda64..e9c2abdde 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,8 @@ + lab-69-proxy + From 7770689bea7fb70a575a439f64f27d506ba5fcc2 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 21 Nov 2020 12:48:08 +0800 Subject: [PATCH 111/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Swagger=20Dubbo=20?= =?UTF-8?q?=E5=88=B0=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 + .../pom.xml | 60 +++++++++++++++++++ .../springdatarediswithjedis/Application.java | 8 +++ .../config/RedisConfiguration.java | 39 ++++++++++++ .../util/JSONUtil.java | 22 +++++++ .../src/main/resources/application.yml | 11 ++++ .../src/main/resources/redisson.yml | 0 .../springdatarediswithjedis/Test01.java | 47 +++++++++++++++ .../config/TestRedisConfiguration.java | 34 +++++++++++ lab-11-spring-data-redis/pom.xml | 1 + ...37\345\205\245\351\227\250\343\200\213.md" | 1 + pom.xml | 3 +- 12 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/pom.xml create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/application.yml create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/redisson.yml create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java create mode 100644 lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/TestRedisConfiguration.java create mode 100644 "lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Swagger \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 9ee72fd2c..4211ecb18 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ * [《芋道 Spring Cloud 服务网关 Spring Cloud Gateway 入门》](http://www.iocoder.cn/Spring-Cloud/Spring-Cloud-Gateway/?github) 对应 [labx-08-spring-cloud-gateway](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-08-spring-cloud-gateway) * [《芋道 Spring Cloud 链路追踪 SkyWalking 入门》](http://www.iocoder.cn/Spring-Cloud/SkyWalking/?github) 对应 [labx-14](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-14) * [《芋道 Dubbo Admin 快速入门》](http://www.iocoder.cn/Dubbo/Admin/?github) +* [《芋道 Dubbo Swagger 快速入门》](http://www.iocoder.cn/Dubbo/Swagger/?github) 对应 [swagger-dubbo](https://github.com/YunaiV/swagger-dubbo) # Spring Cloud 专栏 @@ -274,6 +275,7 @@ * [《芋道 Spring Boot Dubbo 入门》](http://www.iocoder.cn/Spring-Boot/Dubbo/?github) 对应 [lab-30](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-30) * [《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》](http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?github) 对应 [labx-07-spring-cloud-alibaba-dubbo](https://github.com/YunaiV/SpringBoot-Labs/tree/master/labx-07-spring-cloud-alibaba-dubbo) * [《性能测试 —— Dubbo 基准测试》](http://www.iocoder.cn/Performance-Testing/Dubbo-benchmark/?github) +* [《芋道 Dubbo Swagger 快速入门》](http://www.iocoder.cn/Dubbo/Swagger/?github) 对应 [swagger-dubbo](https://github.com/YunaiV/swagger-dubbo) ## 注册中心 diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/pom.xml b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/pom.xml new file mode 100644 index 000000000..2d50408c4 --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/pom.xml @@ -0,0 +1,60 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + 4.0.0 + + lab-07-spring-data-redis-unit-test + + + + + + org.redisson + redisson-spring-boot-starter + 3.11.3 + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + com.alibaba + fastjson + 1.2.61 + + + + + com.fasterxml.jackson.core + jackson-databind + + + + commons-io + commons-io + 2.6 + + + + + it.ozimov + embedded-redis + 0.7.2 + test + + + + + diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java new file mode 100644 index 000000000..ac6c60ce3 --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Application.java @@ -0,0 +1,8 @@ +package cn.iocoder.springboot.labs.lab10.springdatarediswithjedis; + +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +//@EnableTransactionManagement +public class Application { +} diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java new file mode 100644 index 000000000..a78920725 --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/RedisConfiguration.java @@ -0,0 +1,39 @@ +package cn.iocoder.springboot.labs.lab10.springdatarediswithjedis.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.RedisSerializer; + +@Configuration +public class RedisConfiguration { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + // 创建 RedisTemplate 对象 + RedisTemplate template = new RedisTemplate<>(); + + // 设置开启事务支持 + template.setEnableTransactionSupport(true); + + // 设置 RedisConnection 工厂。😈 它就是实现多种 Java Redis 客户端接入的秘密工厂。感兴趣的胖友，可以自己去撸下。 + template.setConnectionFactory(factory); + + // 使用 String 序列化方式，序列化 KEY 。 + template.setKeySerializer(RedisSerializer.string()); + + // 使用 JSON 序列化方式（库是 Jackson ），序列化 VALUE 。 + template.setValueSerializer(RedisSerializer.json()); + return template; + } + + // Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class); +// ObjectMapper objectMapper = new ObjectMapper();// <1> +//// objectMapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); +//// objectMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); +// +// jackson2JsonRedisSerializer.setObjectMapper(objectMapper); +// template.setValueSerializer(jackson2JsonRedisSerializer); + +} diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java new file mode 100644 index 000000000..cea22f21a --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/util/JSONUtil.java @@ -0,0 +1,22 @@ +package cn.iocoder.springboot.labs.lab10.springdatarediswithjedis.util; + +import com.alibaba.fastjson.JSON; + +/** + * JSON 工具类 + */ +public class JSONUtil { + + public static T parseObject(String text, Class clazz) { + return JSON.parseObject(text, clazz); + } + + public static String toJSONString(Object javaObject) { + return JSON.toJSONString(javaObject); + } + + public static byte[] toJSONBytes(Object javaObject) { + return JSON.toJSONBytes(javaObject); + } + +} diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/application.yml b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/application.yml new file mode 100644 index 000000000..742b2ad31 --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/application.yml @@ -0,0 +1,11 @@ +spring: + # 对应 RedisProperties 类 + redis: + host: 127.0.0.1 + port: 6379 +# password: # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！ + database: 0 # Redis 数据库号，默认为 0 。 + timeout: 0 # Redis 连接超时时间，单位：毫秒。 + # 对应 RedissonProperties 类 +# redisson: +# config: classpath:redisson.yml # 具体的每个配置项，见 org.redisson.config.Config 类。 diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/redisson.yml b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/main/resources/redisson.yml new file mode 100644 index 000000000..e69de29bb diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java new file mode 100644 index 000000000..98f573d2f --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/Test01.java @@ -0,0 +1,47 @@ +package cn.iocoder.springboot.labs.lab10.springdatarediswithjedis; + +import cn.iocoder.springboot.labs.lab10.springdatarediswithjedis.config.TestRedisConfiguration; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.dao.DataAccessException; +import org.springframework.data.redis.connection.RedisConnection; +import org.springframework.data.redis.core.RedisCallback; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest(classes = TestRedisConfiguration.class) +public class Test01 { + + @Autowired + private StringRedisTemplate stringRedisTemplate; + + @Autowired + private RedisTemplate redisTemplate; + +// @Autowired +// private RedisServer server; + + @Test + public void test01() { + // 写入 + stringRedisTemplate.opsForValue().set("yunai", "shuai"); + // 读取 + String value = stringRedisTemplate.opsForValue().get("yunai"); + Assert.assertEquals("值不匹配", "shuai", value); + + // 测试重启后读取 + redisTemplate.execute(new RedisCallback() { + @Override + public Object doInRedis(RedisConnection connection) throws DataAccessException { + connection.flushDb(); + return ""; + } + }); + } + +} diff --git a/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/TestRedisConfiguration.java b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/TestRedisConfiguration.java new file mode 100644 index 000000000..32086eef1 --- /dev/null +++ b/lab-11-spring-data-redis/lab-07-spring-data-redis-unit-test/src/test/java/cn/iocoder/springboot/labs/lab10/springdatarediswithjedis/config/TestRedisConfiguration.java @@ -0,0 +1,34 @@ +package cn.iocoder.springboot.labs.lab10.springdatarediswithjedis.config; + +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; +import org.springframework.boot.test.context.TestConfiguration; +import redis.embedded.RedisServer; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +@TestConfiguration +public class TestRedisConfiguration { + + private RedisServer redisServer; + + public TestRedisConfiguration(RedisProperties redisProperties) { + this.redisServer = new RedisServer(redisProperties.getPort()); + } + +// @Bean +// public RedisServer redisServer() { +// return redisServer; +// } + + @PostConstruct + public void postConstruct() { + redisServer.start(); + } + + @PreDestroy + public void preDestroy() { + redisServer.stop(); + } + +} diff --git a/lab-11-spring-data-redis/pom.xml b/lab-11-spring-data-redis/pom.xml index 7c6441236..4eb256c83 100644 --- a/lab-11-spring-data-redis/pom.xml +++ b/lab-11-spring-data-redis/pom.xml @@ -14,6 +14,7 @@ lab-07-spring-data-redis-with-jedis lab-07-spring-data-redis-with-redisson + lab-07-spring-data-redis-unit-test diff --git "a/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Swagger \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Swagger \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..4be20bd8b --- /dev/null +++ "b/lab-30/\343\200\212\350\212\213\351\201\223 Dubbo Swagger \345\277\253\351\200\237\345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + diff --git a/pom.xml b/pom.xml index e9c2abdde..941039a93 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,7 @@ - lab-69-proxy - + From 17a49ddae2b1ca0b8a3533d04b1bd1ba89db4cde Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 21 Nov 2020 16:37:47 +0800 Subject: [PATCH 112/115] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20JApiDocs=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-24/lab-24-apidoc-japidocs/pom.xml | 31 +++++++++++ .../iocoder/springboot/lab24/Application.java | 13 +++++ .../springboot/lab24/TestJApiDocs.java | 22 ++++++++ .../lab24/controller/UserController.java | 52 +++++++++++++++++++ .../springboot/lab24/vo/UserCreateReqVO.java | 17 ++++++ .../springboot/lab24/vo/UserListReqVO.java | 13 +++++ .../springboot/lab24/vo/UserRespVO.java | 21 ++++++++ lab-24/pom.xml | 1 + pom.xml | 2 +- 9 files changed, 171 insertions(+), 1 deletion(-) create mode 100644 lab-24/lab-24-apidoc-japidocs/pom.xml create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/Application.java create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/TestJApiDocs.java create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserCreateReqVO.java create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserListReqVO.java create mode 100644 lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserRespVO.java diff --git a/lab-24/lab-24-apidoc-japidocs/pom.xml b/lab-24/lab-24-apidoc-japidocs/pom.xml new file mode 100644 index 000000000..f1a946f4f --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/pom.xml @@ -0,0 +1,31 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.1.3.RELEASE + + + 4.0.0 + + lab-24-apidoc-japidocs + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.github.yedaxia + japidocs + 1.4.4 + + + + + diff --git a/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/Application.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/Application.java new file mode 100644 index 000000000..cc795da46 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/Application.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab24; + +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-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/TestJApiDocs.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/TestJApiDocs.java new file mode 100644 index 000000000..fdeab6e54 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/TestJApiDocs.java @@ -0,0 +1,22 @@ +package cn.iocoder.springboot.lab24; + +import io.github.yedaxia.apidocs.Docs; +import io.github.yedaxia.apidocs.DocsConfig; +import io.github.yedaxia.apidocs.plugin.markdown.MarkdownDocPlugin; + +public class TestJApiDocs { + + public static void main(String[] args) { + // 1. 创建生成文档的配置 + DocsConfig config = new DocsConfig(); + config.setProjectPath("/Users/yunai/Java/SpringBoot-Labs/lab-24/lab-24-apidoc-japidocs"); // 项目所在目录 + config.setDocsPath("/Users/yunai/Downloads/"); // 生成 HTML 接口文档的目标目录 + config.setAutoGenerate(true); // 是否给所有 Controller 生成接口文档 + config.setProjectName("示例项目"); // 项目名 + config.setApiVersion("V1.0"); // API 版本号 + config.addPlugin(new MarkdownDocPlugin()); // 使用 MD 插件，额外生成 MD 格式的接口文档 + // 2. 执行生成 HTML 接口文档 + Docs.buildHtmlDocs(config); + } + +} diff --git a/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java new file mode 100644 index 000000000..da67b9808 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java @@ -0,0 +1,52 @@ +package cn.iocoder.springboot.lab24.controller; + +import cn.iocoder.springboot.lab24.vo.UserCreateReqVO; +import cn.iocoder.springboot.lab24.vo.UserListReqVO; +import cn.iocoder.springboot.lab24.vo.UserRespVO; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 用户 API + */ +@RestController +@RequestMapping("/api/user/") +public class UserController { + + + /** + * 获得用户列表 + * + * @param listReqVO 列表筛选条件 + * @return 用户列表 + */ + @GetMapping("list") + public List list(UserListReqVO listReqVO){ + return null; + } + + /** + * 保存用户 + * + * @param createReqVO 创建用户信息 + * @return 用户编号 + */ + @PostMapping("save") + public Integer saveUser(@RequestBody UserCreateReqVO createReqVO){ + return 1; + } + + /** + * 删除指定编号的用户 + * + * @param id 用户编号 + * @return 是否成功 + */ + @DeleteMapping("delete") + public Boolean deleteUser(@RequestParam Long id){ + return true; + } + + +} diff --git a/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserCreateReqVO.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserCreateReqVO.java new file mode 100644 index 000000000..c5e82c8f8 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserCreateReqVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.springboot.lab24.vo; + +/** + * 用户创建请求 VO + */ +public class UserCreateReqVO { + + /** + * 昵称 + */ + private String nickname; + /** + * 年龄 + */ + private Integer age; + +} diff --git a/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserListReqVO.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserListReqVO.java new file mode 100644 index 000000000..cb0f28624 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserListReqVO.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab24.vo; + +/** + * 用户列表请求 VO + */ +public class UserListReqVO { + + /** + * 昵称，模糊匹配 + */ + private String nickname; + +} diff --git a/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserRespVO.java b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserRespVO.java new file mode 100644 index 000000000..2dda156c4 --- /dev/null +++ b/lab-24/lab-24-apidoc-japidocs/src/main/java/cn/iocoder/springboot/lab24/vo/UserRespVO.java @@ -0,0 +1,21 @@ +package cn.iocoder.springboot.lab24.vo; + +/** + * 用户响应 VO + */ +public class UserRespVO { + + /** + * 用户编号 + */ + private Integer id; + /** + * 昵称 + */ + private String nickname; + /** + * 年龄 + */ + private Integer age; + +} diff --git a/lab-24/pom.xml b/lab-24/pom.xml index e312a1268..1c5c69a04 100644 --- a/lab-24/pom.xml +++ b/lab-24/pom.xml @@ -14,6 +14,7 @@ lab-24-apidoc-swagger lab-24-apidoc-swagger-knife4j + lab-24-apidoc-japidocs diff --git a/pom.xml b/pom.xml index 941039a93..e37f78976 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ - + lab-24 From ce180d38f8fa80446f609c4e1567df092fc4f77b Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 21 Nov 2020 21:29:26 +0800 Subject: [PATCH 113/115] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20JApiDocs=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + ...346\241\243 JApiDocs \345\205\245\351\227\250\343\200\213.md" | 1 + 2 files changed, 2 insertions(+) create mode 100644 "lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 JApiDocs \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index 4211ecb18..e5be0dddf 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ * [《芋道 Spring Boot WebSocket 入门》](http://www.iocoder.cn/Spring-Boot/WebSocket/?github) 对应 [lab-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-25) * [《性能测试 —— Tomcat、Jetty、Undertow 基准测试》](http://www.iocoder.cn/Performance-Testing/Tomcat-Jetty-Undertow-benchmark/?github) 对应 [lab-05-benchmark-tomcat-jetty-undertow](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-05-benchmark-tomcat-jetty-undertow) * [《性能测试 —— SpringMVC、Webflux 基准测试》](http://www.iocoder.cn/Performance-Testing/SpringMVC-Webflux-benchmark/?github) 对应 [lab-06](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-06) +* [《芋道 Spring Boot API 接口文档 JApiDocs 入门》](http://www.iocoder.cn/Spring-Boot/JApiDocs/?github) 对应 [lab-24](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-24) ## RPC 开发 diff --git "a/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 JApiDocs \345\205\245\351\227\250\343\200\213.md" "b/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 JApiDocs \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..c502e16b4 --- /dev/null +++ "b/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 JApiDocs \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ + From c39d559f528182b12ef16521d9ea74c19b922943 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 28 Nov 2020 10:47:28 +0800 Subject: [PATCH 114/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Swagger=20Starter?= =?UTF-8?q?=20=E7=9A=84=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-24/lab-24-apidoc-swagger-starter/pom.xml | 30 ++++++++ .../iocoder/springboot/lab24/Application.java | 13 ++++ .../lab24/config/SwaggerConfiguration.java | 41 +++++++++++ .../lab24/controller/UserController.java | 68 +++++++++++++++++++ .../springboot/lab24/dto/UserAddDTO.java | 32 +++++++++ .../springboot/lab24/dto/UserUpdateDTO.java | 43 ++++++++++++ .../iocoder/springboot/lab24/vo/UserVO.java | 32 +++++++++ .../src/main/resources/application.yaml | 5 ++ lab-24/pom.xml | 1 + 9 files changed, 265 insertions(+) create mode 100644 lab-24/lab-24-apidoc-swagger-starter/pom.xml create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/Application.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserAddDTO.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserUpdateDTO.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/vo/UserVO.java create mode 100644 lab-24/lab-24-apidoc-swagger-starter/src/main/resources/application.yaml diff --git a/lab-24/lab-24-apidoc-swagger-starter/pom.xml b/lab-24/lab-24-apidoc-swagger-starter/pom.xml new file mode 100644 index 000000000..91dbbee69 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/pom.xml @@ -0,0 +1,30 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.11.RELEASE + + + 4.0.0 + + lab-24-apidoc-swagger-starter + + + + + org.springframework.boot + spring-boot-starter-web + + + + + io.springfox + springfox-boot-starter + 3.0.0 + + + + diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/Application.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/Application.java new file mode 100644 index 000000000..cc795da46 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/Application.java @@ -0,0 +1,13 @@ +package cn.iocoder.springboot.lab24; + +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-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java new file mode 100644 index 000000000..1cc1fddd4 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java @@ -0,0 +1,41 @@ +package cn.iocoder.springboot.lab24.config; + +import org.springframework.context.annotation.Bean; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; + +//@Configuration +// @EnableSwagger2 无需使用该注解 +public class SwaggerConfiguration { + + @Bean + public Docket createRestApi() { + // 创建 Docket 对象 + return new Docket(DocumentationType.SWAGGER_2) // 文档类型，使用 Swagger2 + .apiInfo(this.apiInfo()) // 设置 API 信息 + // 扫描 Controller 包路径，获得 API 接口 + .select() + .apis(RequestHandlerSelectors.basePackage("cn.iocoder.springboot.lab24.controller")) + .paths(PathSelectors.any()) + // 构建出 Docket 对象 + .build(); + } + + /** + * 创建 API 信息 + */ + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("测试接口文档示例") + .description("我是一段描述") + .version("1.0.0") // 版本号 + .contact(new Contact("芋艿", "http://www.iocoder.cn", "zhijiantianya@gmail.com")) // 联系人 + .build(); + } + +} diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java new file mode 100644 index 000000000..6ed0a76f4 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/controller/UserController.java @@ -0,0 +1,68 @@ +package cn.iocoder.springboot.lab24.controller; + +import cn.iocoder.springboot.lab24.dto.UserAddDTO; +import cn.iocoder.springboot.lab24.dto.UserUpdateDTO; +import cn.iocoder.springboot.lab24.vo.UserVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +@RestController +@RequestMapping("/users") +@Api(tags = "用户 API 接口") +public class UserController { + + @GetMapping("/list") + @ApiOperation(value = "查询用户列表", notes = "目前仅仅是作为测试，所以返回用户全列表") + public List list() { + // 查询列表 + List result = new ArrayList<>(); + result.add(new UserVO().setId(1).setUsername("yudaoyuanma")); + result.add(new UserVO().setId(2).setUsername("woshiyutou")); + result.add(new UserVO().setId(3).setUsername("chifanshuijiao")); + // 返回列表 + return result; + } + + @GetMapping("/get") + @ApiOperation("获得指定用户编号的用户") + @ApiImplicitParam(name = "id", value = "用户编号", paramType = "query", dataTypeClass = Integer.class, required = true, example = "1024") + public UserVO get(@RequestParam("id") Integer id) { + // 查询并返回用户 + return new UserVO().setId(id).setUsername(UUID.randomUUID().toString()); + } + + @PostMapping("add") + @ApiOperation("添加用户") + public Integer add(UserAddDTO addDTO) { + // 插入用户记录，返回编号 + Integer returnId = UUID.randomUUID().hashCode(); + // 返回用户编号 + return returnId; + } + + @PostMapping("/update") + @ApiOperation("更新指定用户编号的用户") + public Boolean update(UserUpdateDTO updateDTO) { + // 更新用户记录 + Boolean success = true; + // 返回更新是否成功 + return success; + } + + @PostMapping("/delete") + @ApiOperation(value = "删除指定用户编号的用户") + @ApiImplicitParam(name = "id", value = "用户编号", paramType = "query", dataTypeClass = Integer.class, required = true, example = "1024") + public Boolean delete(@RequestParam("id") Integer id) { + // 删除用户记录 + Boolean success = false; + // 返回是否更新成功 + return success; + } + +} diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserAddDTO.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserAddDTO.java new file mode 100644 index 000000000..af181e690 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserAddDTO.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab24.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("用户添加 DTO") +public class UserAddDTO { + + @ApiModelProperty(value = "账号", required = true, example = "yudaoyuanma") + private String username; + @ApiModelProperty(value = "密码", required = true, example = "nicai") + private String password; + + public String getUsername() { + return username; + } + + public UserAddDTO setUsername(String username) { + this.username = username; + return this; + } + + public String getPassword() { + return password; + } + + public UserAddDTO setPassword(String password) { + this.password = password; + return this; + } + +} diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserUpdateDTO.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserUpdateDTO.java new file mode 100644 index 000000000..3c92aeb8b --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/dto/UserUpdateDTO.java @@ -0,0 +1,43 @@ +package cn.iocoder.springboot.lab24.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("用户更新 DTO") +public class UserUpdateDTO { + + @ApiModelProperty(value = "用户编号", required = true, example = "1024") + private Integer id; + @ApiModelProperty(value = "账号", required = true, example = "yudaoyuanma") + private String username; + @ApiModelProperty(value = "密码", required = true, example = "nicai") + private String password; + + public Integer getId() { + return id; + } + + public UserUpdateDTO setId(Integer id) { + this.id = id; + return this; + } + + public String getUsername() { + return username; + } + + public UserUpdateDTO setUsername(String username) { + this.username = username; + return this; + } + + public String getPassword() { + return password; + } + + public UserUpdateDTO setPassword(String password) { + this.password = password; + return this; + } + +} diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/vo/UserVO.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/vo/UserVO.java new file mode 100644 index 000000000..4917916d9 --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/vo/UserVO.java @@ -0,0 +1,32 @@ +package cn.iocoder.springboot.lab24.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +@ApiModel("用户 VO") +public class UserVO { + + @ApiModelProperty(value = "用户编号", required = true, example = "1024") + private Integer id; + @ApiModelProperty(value = "账号", required = true, example = "yudaoyuanma") + private String username; + + public Integer getId() { + return id; + } + + public UserVO setId(Integer id) { + this.id = id; + return this; + } + + public String getUsername() { + return username; + } + + public UserVO setUsername(String username) { + this.username = username; + return this; + } + +} diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/resources/application.yaml b/lab-24/lab-24-apidoc-swagger-starter/src/main/resources/application.yaml new file mode 100644 index 000000000..c4573845e --- /dev/null +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/resources/application.yaml @@ -0,0 +1,5 @@ +# 对应 SpringfoxConfigurationProperties 配置类 +springfox: + documentation: + swagger-ui: + enabled: true # 是否开启 Swagger UI 功能。默认为 true diff --git a/lab-24/pom.xml b/lab-24/pom.xml index 1c5c69a04..7d0bf03c5 100644 --- a/lab-24/pom.xml +++ b/lab-24/pom.xml @@ -15,6 +15,7 @@ lab-24-apidoc-swagger lab-24-apidoc-swagger-knife4j lab-24-apidoc-japidocs + lab-24-apidoc-swagger-starter From b8e503e4a319d6033524f82910b7f6493c994659 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Sat, 28 Nov 2020 19:02:58 +0800 Subject: [PATCH 115/115] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20Swagger=20Starter?= =?UTF-8?q?=20=E7=9A=84=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + .../iocoder/springboot/lab24/config/SwaggerConfiguration.java | 3 ++- ...43 Swagger Starter \345\205\245\351\227\250\343\200\213.md" | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 "lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 Swagger Starter \345\205\245\351\227\250\343\200\213.md" diff --git a/README.md b/README.md index e5be0dddf..d04471af9 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,7 @@ * [《芋道 Spring Boot WebFlux 入门》](http://www.iocoder.cn/Spring-Boot/WebFlux/?github) 对应 [lab-27](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-27) * [《芋道 Spring Boot 分布式 Session 入门》](http://www.iocoder.cn/Spring-Boot/Distributed-Session/?github) 对应 [lab-26](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-26) * [《芋道 Spring Boot API 接口文档 Swagger 入门》](http://www.iocoder.cn/Spring-Boot/Swagger/?github) 对应 [lab-24](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-24) +* [《芋道 Spring Boot API 接口文档 Swagger Starter 入门》](http://www.iocoder.cn/Spring-Boot/Swagger-Starter/?github) 对应 [lab-24](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-24) * [《芋道 Spring Boot 参数校验 Validation 入门》](http://www.iocoder.cn/Spring-Boot/Validation/?github) 对应 [lab-22](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-22) * [《芋道 Spring Boot WebSocket 入门》](http://www.iocoder.cn/Spring-Boot/WebSocket/?github) 对应 [lab-25](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-25) * [《性能测试 —— Tomcat、Jetty、Undertow 基准测试》](http://www.iocoder.cn/Performance-Testing/Tomcat-Jetty-Undertow-benchmark/?github) 对应 [lab-05-benchmark-tomcat-jetty-undertow](https://github.com/YunaiV/SpringBoot-Labs/tree/master/lab-05-benchmark-tomcat-jetty-undertow) diff --git a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java index 1cc1fddd4..5ddcef502 100644 --- a/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java +++ b/lab-24/lab-24-apidoc-swagger-starter/src/main/java/cn/iocoder/springboot/lab24/config/SwaggerConfiguration.java @@ -1,6 +1,7 @@ package cn.iocoder.springboot.lab24.config; import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; @@ -9,7 +10,7 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; -//@Configuration +@Configuration // @EnableSwagger2 无需使用该注解 public class SwaggerConfiguration { diff --git "a/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 Swagger Starter \345\205\245\351\227\250\343\200\213.md" "b/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 Swagger Starter \345\205\245\351\227\250\343\200\213.md" new file mode 100644 index 000000000..e080075c0 --- /dev/null +++ "b/lab-24/\343\200\212\350\212\213\351\201\223 Spring Boot API \346\216\245\345\217\243\346\226\207\346\241\243 Swagger Starter \345\205\245\351\227\250\343\200\213.md" @@ -0,0 +1 @@ +