From d5d320a906f6d492757acd79ed778fbc47d88709 Mon Sep 17 00:00:00 2001 From: cunyu1943 <747731461@qq.com> Date: Mon, 10 Jan 2022 21:25:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=20spring?= =?UTF-8?q?boot-freemarker-demo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 23 -- log4j-demo/src/main/resources/log4j2.xml | 251 ------------------ springboot-freemarker-demo/pom.xml | 52 ++++ .../controller/UserController.java | 33 +++ .../springbootfreemarkerdemo/entity/User.java | 31 +++ .../src/main/resources/templates/index.ftl | 21 ++ .../common/pom.xml | 0 .../src/main/java/com/cunyu/ConsumerVO.java | 0 .../src/main/java/com/cunyu/ProducerVO.java | 0 .../eureka/pom.xml | 0 .../com/cunyu/EurekaServerApplication.java | 0 .../eureka/src/main/resources/application.yml | 0 .../gateway/pom.xml | 0 .../java/com/cunyu/GatewayApplication.java | 0 .../src/main/resources/application.yml | 0 .../micro-consumer/consumer-api/pom.xml | 0 .../java/com/cunyu/ConsumerFeignClient.java | 0 .../micro-consumer/consumer-core/pom.xml | 0 .../java/com/cunyu/ConsumerApplication.java | 0 .../cunyu/controller/ConsumerController.java | 0 .../com/cunyu/service/ConsumerService.java | 0 .../src/main/resources/application.yml | 0 .../microservice/micro-consumer/pom.xml | 0 .../microservice/micro-producer/pom.xml | 0 .../micro-producer/producer-api/pom.xml | 0 .../java/com/cunyu/ProducerFeignClient.java | 0 .../micro-producer/producer-core/pom.xml | 0 .../java/com/cunyu/ProducerApplication.java | 0 .../cunyu/controller/ProducerController.java | 0 .../com/cunyu/service/ProducerService.java | 0 .../src/main/resources/application.yml | 0 .../microservice/pom.xml | 0 .../pom.xml | 0 .../eureka/target/classes/application.yml | 16 -- .../gateway/target/classes/application.yml | 26 -- .../target/classes/application.yml | 11 - .../target/classes/application.yml | 11 - 37 files changed, 137 insertions(+), 338 deletions(-) delete mode 100644 .gitignore delete mode 100644 log4j-demo/src/main/resources/log4j2.xml create mode 100644 springboot-freemarker-demo/pom.xml create mode 100644 springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/controller/UserController.java create mode 100644 springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/entity/User.java create mode 100644 springboot-freemarker-demo/src/main/resources/templates/index.ftl rename {springcloude-demo => springcloud-demo}/common/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/common/src/main/java/com/cunyu/ConsumerVO.java (100%) rename {springcloude-demo => springcloud-demo}/common/src/main/java/com/cunyu/ProducerVO.java (100%) rename {springcloude-demo => springcloud-demo}/eureka/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/eureka/src/main/java/com/cunyu/EurekaServerApplication.java (100%) rename {springcloude-demo => springcloud-demo}/eureka/src/main/resources/application.yml (100%) rename {springcloude-demo => springcloud-demo}/gateway/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/gateway/src/main/java/com/cunyu/GatewayApplication.java (100%) rename {springcloude-demo => springcloud-demo}/gateway/src/main/resources/application.yml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-api/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-api/src/main/java/com/cunyu/ConsumerFeignClient.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-core/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/ConsumerApplication.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/controller/ConsumerController.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/service/ConsumerService.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/consumer-core/src/main/resources/application.yml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-consumer/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-api/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-api/src/main/java/com/cunyu/ProducerFeignClient.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-core/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-core/src/main/java/com/cunyu/ProducerApplication.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-core/src/main/java/com/cunyu/controller/ProducerController.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-core/src/main/java/com/cunyu/service/ProducerService.java (100%) rename {springcloude-demo => springcloud-demo}/microservice/micro-producer/producer-core/src/main/resources/application.yml (100%) rename {springcloude-demo => springcloud-demo}/microservice/pom.xml (100%) rename {springcloude-demo => springcloud-demo}/pom.xml (100%) delete mode 100644 springcloude-demo/eureka/target/classes/application.yml delete mode 100644 springcloude-demo/gateway/target/classes/application.yml delete mode 100644 springcloude-demo/microservice/micro-consumer/consumer-core/target/classes/application.yml delete mode 100644 springcloude-demo/microservice/micro-producer/producer-core/target/classes/application.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a1c2a23..0000000 --- a/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# Compiled class file -*.class - -# Log file -*.log - -# BlueJ files -*.ctxt - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.nar -*.ear -*.zip -*.tar.gz -*.rar - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* diff --git a/log4j-demo/src/main/resources/log4j2.xml b/log4j-demo/src/main/resources/log4j2.xml deleted file mode 100644 index 0a7b91e..0000000 --- a/log4j-demo/src/main/resources/log4j2.xml +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - ./logs/ - - [%d{yyyy-MM-dd HH:mm:ss.SSS}][%-5p][%T][%c.%M:%L] %msg%xEx%n - - 1MB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/springboot-freemarker-demo/pom.xml b/springboot-freemarker-demo/pom.xml new file mode 100644 index 0000000..dad3e69 --- /dev/null +++ b/springboot-freemarker-demo/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.6.1 + + + com.cunyu + springboot-freemarker-demo + 0.0.1-SNAPSHOT + springboot-freemarker-demo + springboot-freemarker-demo + + 1.8 + + + + org.springframework.boot + spring-boot-starter-freemarker + + + org.projectlombok + lombok + 1.18.20 + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-web + 2.6.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/controller/UserController.java b/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/controller/UserController.java new file mode 100644 index 0000000..caf888b --- /dev/null +++ b/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/controller/UserController.java @@ -0,0 +1,33 @@ +package com.cunyu.springbootfreemarkerdemo.controller; + +import com.cunyu.springbootfreemarkerdemo.entity.User; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; + +/** + * Created with IntelliJ IDEA. + * + * @author : zhangliang + * @version : 1.0 + * @project : java-learning + * @package : com.cunyu.springbootfreemarkerdemo.controller + * @className : UserController + * @createTime : 2021/11/30 22:04 + * @email : 747731461@qq.com + * @公众号 : 村雨遥 + * @website : https://cunyu1943.github.io + * @description : + */ +@Controller +public class UserController { + @GetMapping("/index") + public String index(Model model) { + User user = new User(); + user.setAge(30); + user.setEmail("747731461@qq.com"); + user.setName("村雨遥"); + model.addAttribute("user", user); + return "index"; + } +} diff --git a/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/entity/User.java b/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/entity/User.java new file mode 100644 index 0000000..32f9a8b --- /dev/null +++ b/springboot-freemarker-demo/src/main/java/com/cunyu/springbootfreemarkerdemo/entity/User.java @@ -0,0 +1,31 @@ +package com.cunyu.springbootfreemarkerdemo.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.stereotype.Component; + +/** + * Created with IntelliJ IDEA. + * + * @author : zhangliang + * @version : 1.0 + * @project : java-learning + * @package : com.cunyu.springbootfreemarkerdemo.entity + * @className : User + * @createTime : 2021/11/30 21:55 + * @email : 747731461@qq.com + * @公众号 : 村雨遥 + * @website : https://cunyu1943.github.io + * @description : + */ + +@Component +@Data +@AllArgsConstructor +@NoArgsConstructor +public class User { + private int age; + private String name; + private String email; +} diff --git a/springboot-freemarker-demo/src/main/resources/templates/index.ftl b/springboot-freemarker-demo/src/main/resources/templates/index.ftl new file mode 100644 index 0000000..6e76862 --- /dev/null +++ b/springboot-freemarker-demo/src/main/resources/templates/index.ftl @@ -0,0 +1,21 @@ + + + + + FreeMarker 实验 + + + + + + + + + + + + + +
姓名年龄Email
${user.name}${user.age}${user.email}
+ + diff --git a/springcloude-demo/common/pom.xml b/springcloud-demo/common/pom.xml similarity index 100% rename from springcloude-demo/common/pom.xml rename to springcloud-demo/common/pom.xml diff --git a/springcloude-demo/common/src/main/java/com/cunyu/ConsumerVO.java b/springcloud-demo/common/src/main/java/com/cunyu/ConsumerVO.java similarity index 100% rename from springcloude-demo/common/src/main/java/com/cunyu/ConsumerVO.java rename to springcloud-demo/common/src/main/java/com/cunyu/ConsumerVO.java diff --git a/springcloude-demo/common/src/main/java/com/cunyu/ProducerVO.java b/springcloud-demo/common/src/main/java/com/cunyu/ProducerVO.java similarity index 100% rename from springcloude-demo/common/src/main/java/com/cunyu/ProducerVO.java rename to springcloud-demo/common/src/main/java/com/cunyu/ProducerVO.java diff --git a/springcloude-demo/eureka/pom.xml b/springcloud-demo/eureka/pom.xml similarity index 100% rename from springcloude-demo/eureka/pom.xml rename to springcloud-demo/eureka/pom.xml diff --git a/springcloude-demo/eureka/src/main/java/com/cunyu/EurekaServerApplication.java b/springcloud-demo/eureka/src/main/java/com/cunyu/EurekaServerApplication.java similarity index 100% rename from springcloude-demo/eureka/src/main/java/com/cunyu/EurekaServerApplication.java rename to springcloud-demo/eureka/src/main/java/com/cunyu/EurekaServerApplication.java diff --git a/springcloude-demo/eureka/src/main/resources/application.yml b/springcloud-demo/eureka/src/main/resources/application.yml similarity index 100% rename from springcloude-demo/eureka/src/main/resources/application.yml rename to springcloud-demo/eureka/src/main/resources/application.yml diff --git a/springcloude-demo/gateway/pom.xml b/springcloud-demo/gateway/pom.xml similarity index 100% rename from springcloude-demo/gateway/pom.xml rename to springcloud-demo/gateway/pom.xml diff --git a/springcloude-demo/gateway/src/main/java/com/cunyu/GatewayApplication.java b/springcloud-demo/gateway/src/main/java/com/cunyu/GatewayApplication.java similarity index 100% rename from springcloude-demo/gateway/src/main/java/com/cunyu/GatewayApplication.java rename to springcloud-demo/gateway/src/main/java/com/cunyu/GatewayApplication.java diff --git a/springcloude-demo/gateway/src/main/resources/application.yml b/springcloud-demo/gateway/src/main/resources/application.yml similarity index 100% rename from springcloude-demo/gateway/src/main/resources/application.yml rename to springcloud-demo/gateway/src/main/resources/application.yml diff --git a/springcloude-demo/microservice/micro-consumer/consumer-api/pom.xml b/springcloud-demo/microservice/micro-consumer/consumer-api/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-api/pom.xml rename to springcloud-demo/microservice/micro-consumer/consumer-api/pom.xml diff --git a/springcloude-demo/microservice/micro-consumer/consumer-api/src/main/java/com/cunyu/ConsumerFeignClient.java b/springcloud-demo/microservice/micro-consumer/consumer-api/src/main/java/com/cunyu/ConsumerFeignClient.java similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-api/src/main/java/com/cunyu/ConsumerFeignClient.java rename to springcloud-demo/microservice/micro-consumer/consumer-api/src/main/java/com/cunyu/ConsumerFeignClient.java diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/pom.xml b/springcloud-demo/microservice/micro-consumer/consumer-core/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-core/pom.xml rename to springcloud-demo/microservice/micro-consumer/consumer-core/pom.xml diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/ConsumerApplication.java b/springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/ConsumerApplication.java similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/ConsumerApplication.java rename to springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/ConsumerApplication.java diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/controller/ConsumerController.java b/springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/controller/ConsumerController.java similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/controller/ConsumerController.java rename to springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/controller/ConsumerController.java diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/service/ConsumerService.java b/springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/service/ConsumerService.java similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/service/ConsumerService.java rename to springcloud-demo/microservice/micro-consumer/consumer-core/src/main/java/com/cunyu/service/ConsumerService.java diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/src/main/resources/application.yml b/springcloud-demo/microservice/micro-consumer/consumer-core/src/main/resources/application.yml similarity index 100% rename from springcloude-demo/microservice/micro-consumer/consumer-core/src/main/resources/application.yml rename to springcloud-demo/microservice/micro-consumer/consumer-core/src/main/resources/application.yml diff --git a/springcloude-demo/microservice/micro-consumer/pom.xml b/springcloud-demo/microservice/micro-consumer/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-consumer/pom.xml rename to springcloud-demo/microservice/micro-consumer/pom.xml diff --git a/springcloude-demo/microservice/micro-producer/pom.xml b/springcloud-demo/microservice/micro-producer/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-producer/pom.xml rename to springcloud-demo/microservice/micro-producer/pom.xml diff --git a/springcloude-demo/microservice/micro-producer/producer-api/pom.xml b/springcloud-demo/microservice/micro-producer/producer-api/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-api/pom.xml rename to springcloud-demo/microservice/micro-producer/producer-api/pom.xml diff --git a/springcloude-demo/microservice/micro-producer/producer-api/src/main/java/com/cunyu/ProducerFeignClient.java b/springcloud-demo/microservice/micro-producer/producer-api/src/main/java/com/cunyu/ProducerFeignClient.java similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-api/src/main/java/com/cunyu/ProducerFeignClient.java rename to springcloud-demo/microservice/micro-producer/producer-api/src/main/java/com/cunyu/ProducerFeignClient.java diff --git a/springcloude-demo/microservice/micro-producer/producer-core/pom.xml b/springcloud-demo/microservice/micro-producer/producer-core/pom.xml similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-core/pom.xml rename to springcloud-demo/microservice/micro-producer/producer-core/pom.xml diff --git a/springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/ProducerApplication.java b/springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/ProducerApplication.java similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/ProducerApplication.java rename to springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/ProducerApplication.java diff --git a/springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/controller/ProducerController.java b/springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/controller/ProducerController.java similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/controller/ProducerController.java rename to springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/controller/ProducerController.java diff --git a/springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/service/ProducerService.java b/springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/service/ProducerService.java similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/service/ProducerService.java rename to springcloud-demo/microservice/micro-producer/producer-core/src/main/java/com/cunyu/service/ProducerService.java diff --git a/springcloude-demo/microservice/micro-producer/producer-core/src/main/resources/application.yml b/springcloud-demo/microservice/micro-producer/producer-core/src/main/resources/application.yml similarity index 100% rename from springcloude-demo/microservice/micro-producer/producer-core/src/main/resources/application.yml rename to springcloud-demo/microservice/micro-producer/producer-core/src/main/resources/application.yml diff --git a/springcloude-demo/microservice/pom.xml b/springcloud-demo/microservice/pom.xml similarity index 100% rename from springcloude-demo/microservice/pom.xml rename to springcloud-demo/microservice/pom.xml diff --git a/springcloude-demo/pom.xml b/springcloud-demo/pom.xml similarity index 100% rename from springcloude-demo/pom.xml rename to springcloud-demo/pom.xml diff --git a/springcloude-demo/eureka/target/classes/application.yml b/springcloude-demo/eureka/target/classes/application.yml deleted file mode 100644 index 7e095fa..0000000 --- a/springcloude-demo/eureka/target/classes/application.yml +++ /dev/null @@ -1,16 +0,0 @@ -server: - port: 10086 - -spring: - application: - name: eurekaServer - -eureka: - instance: - hostname: localhost - - client: - service-url: - defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ - register-with-eureka: false - fetch-registry: false diff --git a/springcloude-demo/gateway/target/classes/application.yml b/springcloude-demo/gateway/target/classes/application.yml deleted file mode 100644 index 6cc80af..0000000 --- a/springcloude-demo/gateway/target/classes/application.yml +++ /dev/null @@ -1,26 +0,0 @@ -server: - port: 9000 - -spring: - application: - name: gateway - cloud: - gateway: - routes: - - id: producer_route - uri: lb://producerService - predicates: - - Path=/api/producer/** - filters: - - StripPrefix=1 - - - id: consumer_route - uri: lb://consumerService - predicates: - - Path=/api/consumer/** - filters: - - StripPrefix=1 -eureka: - client: - service-url: - defaultZone: http://localhost:10086/eureka/ diff --git a/springcloude-demo/microservice/micro-consumer/consumer-core/target/classes/application.yml b/springcloude-demo/microservice/micro-consumer/consumer-core/target/classes/application.yml deleted file mode 100644 index 8b787e3..0000000 --- a/springcloude-demo/microservice/micro-consumer/consumer-core/target/classes/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 8000 - -spring: - application: - name: consumerService - -eureka: - client: - service-url: - defaultZone: http://localhost:10086/eureka/ diff --git a/springcloude-demo/microservice/micro-producer/producer-core/target/classes/application.yml b/springcloude-demo/microservice/micro-producer/producer-core/target/classes/application.yml deleted file mode 100644 index 47a52a4..0000000 --- a/springcloude-demo/microservice/micro-producer/producer-core/target/classes/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 7000 - -spring: - application: - name: producerService - -eureka: - client: - service-url: - defaultZone: http://localhost:10086/eureka -- GitLab