From d6c0538b01a3a8492417f1d67ef59f2bdd878679 Mon Sep 17 00:00:00 2001 From: Saisai Liu <1374434128@qq.com> Date: Tue, 27 Feb 2024 08:28:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E9=97=B4=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=88=9B=E5=BB=BAproduct=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-gateway/src/main/resources/bootstrap.yml | 2 +- muyu-modules/muyu-gen/pom.xml | 4 + .../muyu-product/muyu-product-common/pom.xml | 27 +++++ .../src/main/java/com/muyu/Main.java | 7 ++ .../muyu-product/muyu-product-remote/pom.xml | 26 +++++ .../src/main/java/com/muyu/Main.java | 7 ++ .../muyu-product/muyu-product-server/pom.xml | 98 +++++++++++++++++++ .../java/com/muyu/MuYuProductApplication.java | 22 +++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 28 ++++++ .../src/main/resources/logback.xml | 74 ++++++++++++++ muyu-modules/muyu-product/pom.xml | 30 ++++++ .../system/controller/BookInfoController.java | 28 ++---- .../com/muyu/system/domain/ProductInfo.java | 63 ------------ muyu-modules/pom.xml | 1 + pom.xml | 13 +++ 16 files changed, 349 insertions(+), 83 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-common/pom.xml create mode 100644 muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/Main.java create mode 100644 muyu-modules/muyu-product/muyu-product-remote/pom.xml create mode 100644 muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/Main.java create mode 100644 muyu-modules/muyu-product/muyu-product-server/pom.xml create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/MuYuProductApplication.java create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/resources/banner.txt create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml create mode 100644 muyu-modules/muyu-product/muyu-product-server/src/main/resources/logback.xml create mode 100644 muyu-modules/muyu-product/pom.xml delete mode 100644 muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/ProductInfo.java diff --git a/muyu-gateway/src/main/resources/bootstrap.yml b/muyu-gateway/src/main/resources/bootstrap.yml index da96197..fc381fc 100644 --- a/muyu-gateway/src/main/resources/bootstrap.yml +++ b/muyu-gateway/src/main/resources/bootstrap.yml @@ -28,7 +28,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: 43.142.100.73:8719 + dashboard: 127.0.0.1:8900 # nacos配置持久化 datasource: ds1: diff --git a/muyu-modules/muyu-gen/pom.xml b/muyu-modules/muyu-gen/pom.xml index bd2a910..c84c95f 100644 --- a/muyu-modules/muyu-gen/pom.xml +++ b/muyu-modules/muyu-gen/pom.xml @@ -72,6 +72,10 @@ muyu-common-swagger + + org.springframework.boot + spring-boot-configuration-processor + diff --git a/muyu-modules/muyu-product/muyu-product-common/pom.xml b/muyu-modules/muyu-product/muyu-product-common/pom.xml new file mode 100644 index 0000000..6530884 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.muyu + muyu-product + 3.6.3 + + + muyu-product-common + + + 17 + 17 + UTF-8 + + + + + + com.muyu + muyu-common-core + + + diff --git a/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..75fcd65 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-common/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-remote/pom.xml b/muyu-modules/muyu-product/muyu-product-remote/pom.xml new file mode 100644 index 0000000..f18c94e --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-remote/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + muyu-product + 3.6.3 + + + muyu-product-remote + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-product-common + + + diff --git a/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/Main.java b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..75fcd65 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-remote/src/main/java/com/muyu/Main.java @@ -0,0 +1,7 @@ +package com.muyu; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/pom.xml b/muyu-modules/muyu-product/muyu-product-server/pom.xml new file mode 100644 index 0000000..1417ce2 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/pom.xml @@ -0,0 +1,98 @@ + + + 4.0.0 + + com.muyu + muyu-product + 3.6.3 + + + muyu-product-server + + + 17 + 17 + UTF-8 + + + + + com.muyu + muyu-product-common + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + com.alibaba.csp + sentinel-core + 1.8.6 + + + com.alibaba.csp + sentinel-annotation-aspectj + + + diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/MuYuProductApplication.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/MuYuProductApplication.java new file mode 100644 index 0000000..6ca70c1 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/MuYuProductApplication.java @@ -0,0 +1,22 @@ +package com.muyu; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author muyu + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class MuYuProductApplication { + public static void main (String[] args) { + SpringApplication.run(MuYuProductApplication.class, args); + } +} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/banner.txt b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..7813117 --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9202 + +# Spring +spring: + application: + # 应用名称 + name: muyu-product + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 43.142.100.73:8848 + config: + # 配置中心地址 + server-addr: 43.142.100.73:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/logback.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/logback.xml new file mode 100644 index 0000000..aa340cd --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-product/pom.xml b/muyu-modules/muyu-product/pom.xml new file mode 100644 index 0000000..d96f535 --- /dev/null +++ b/muyu-modules/muyu-product/pom.xml @@ -0,0 +1,30 @@ + + + 4.0.0 + + com.muyu + muyu-modules + 3.6.3 + + + muyu-product + pom + + muyu-product-common + muyu-product-remote + muyu-product-server + + + + 17 + 17 + UTF-8 + + + + muyu-product商品模块 + + + diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java index a27cbfe..7ef84bb 100644 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java +++ b/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/BookInfoController.java @@ -1,29 +1,19 @@ package com.muyu.system.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; - -import com.alibaba.csp.sentinel.Entry; -import com.alibaba.csp.sentinel.SphU; -import com.alibaba.csp.sentinel.slots.block.BlockException; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.system.domain.BookInfo; import com.muyu.system.service.IBookInfoService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 书籍Controller diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/ProductInfo.java b/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/ProductInfo.java deleted file mode 100644 index c7015d7..0000000 --- a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/ProductInfo.java +++ /dev/null @@ -1,63 +0,0 @@ -//package com.muyu.product.entity; -// -//import io.swagger.annotations.ApiModel; -//import io.swagger.annotations.ApiModelProperty; -//import javax.persistence.*; -//import java.io.Serializable; -//import java.util.Date; -//import lombok.AllArgsConstructor; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.NoArgsConstructor; -//import lombok.experimental.SuperBuilder; -//import com.baomidou.mybatisplus.annotation.IdType; -//import com.baomidou.mybatisplus.annotation.TableId; -//import com.baomidou.mybatisplus.annotation.TableName; -// -///** -// * 品类信息; -// * @author : http://www.chiner.pro -// * @date : 2024-2-24 -// */ -//@Data -//@SuperBuilder -//@NoArgsConstructor -//@AllArgsConstructor -//@EqualsAndHashCode(callSuper = true) -//@ApiModel(value = "品类信息") -//@TableName("category_info") -//public class CategoryInfo implements Serializable,Cloneable{ -// /** 主键 */ -// @TableId( type = IdType.AUTO) -// @GeneratedValue -// @ApiModelProperty(name = "主键") -// private id ; -// /** 品类名称 */ -// @ApiModelProperty(name = "品类名称") -// private String name ; -// /** 图片 */ -// @ApiModelProperty(name = "图片") -// private String image ; -// /** 父级品类 */ -// @ApiModelProperty(name = "父级品类") -// private parentId ; -// /** 是否启用 */ -// @ApiModelProperty(name = "是否启用") -// private String status ; -// /** 备注 */ -// @ApiModelProperty(name = "备注") -// private String remark ; -// /** 创建人 */ -// @ApiModelProperty(name = "创建人") -// private String createBy ; -// /** 创建时间 */ -// @ApiModelProperty(name = "创建时间") -// private Date createTime ; -// /** 更新人 */ -// @ApiModelProperty(name = "更新人") -// private String updateBy ; -// /** 更新时间 */ -// @ApiModelProperty(name = "更新时间") -// private Date updateTime ; -// -//} diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 846198c..760c5c2 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -13,6 +13,7 @@ muyu-gen muyu-job muyu-file + muyu-product muyu-modules diff --git a/pom.xml b/pom.xml index 1ac26d4..aea0b18 100644 --- a/pom.xml +++ b/pom.xml @@ -206,6 +206,19 @@ ${muyu.version} + + com.muyu + muyu-product-common + ${muyu.version} + + + + com.muyu + muyu-product-remote + ${muyu.version} + + +