From b7153ec599bbc63f55289f09be81bd0d194ae34f Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Sun, 6 Jul 2025 01:31:43 +0800 Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE;=E6=9B=B4=E6=96=B0=E5=8C=85=E4=BE=9D?= =?UTF-8?q?=E8=B5=96;=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 5 +- .../src/main/resources/logback.xml | 72 +++++++++++++++++++ mall-common/pom.xml | 44 ++++++++++-- mall-gateway/pom.xml | 13 ++++ mall-gateway/src/main/java/com/mall/App.java | 13 ---- .../mall/gateway/MallGatewayApplication.java | 12 ++++ .../config/GatewayCorsConfiguration.java | 8 +++ .../main/resources/application-routes.yaml | 16 +++++ .../src/main/resources/application.yaml | 25 +++++++ mall-gateway/src/main/resources/banner.txt | 13 ++++ mall-gateway/src/main/resources/logback.xml | 72 +++++++++++++++++++ mall-member/pom.xml | 23 ++++++ .../src/main/resources/application-dev.yml | 10 +++ .../src/main/resources/application.yaml | 6 +- mall-member/src/main/resources/logback.xml | 72 +++++++++++++++++++ mall-order/pom.xml | 23 ++++++ .../src/main/resources/application-dev.yml | 10 +++ .../src/main/resources/application.yaml | 13 ++-- mall-order/src/main/resources/logback.xml | 72 +++++++++++++++++++ mall-product/pom.xml | 25 +++++++ .../mall/product/MallProductApplication.java | 4 ++ .../src/main/resources/application-dev.yml | 10 +++ .../src/main/resources/application.yaml | 11 ++- mall-product/src/main/resources/logback.xml | 72 +++++++++++++++++++ mall-seckill/pom.xml | 13 ++++ pom.xml | 26 ++++++- 26 files changed, 646 insertions(+), 37 deletions(-) create mode 100644 generator-code-server/src/main/resources/logback.xml delete mode 100644 mall-gateway/src/main/java/com/mall/App.java create mode 100644 mall-gateway/src/main/java/com/mall/gateway/MallGatewayApplication.java create mode 100644 mall-gateway/src/main/java/com/mall/gateway/config/GatewayCorsConfiguration.java create mode 100644 mall-gateway/src/main/resources/application-routes.yaml create mode 100644 mall-gateway/src/main/resources/application.yaml create mode 100644 mall-gateway/src/main/resources/banner.txt create mode 100644 mall-gateway/src/main/resources/logback.xml create mode 100644 mall-member/src/main/resources/logback.xml create mode 100644 mall-order/src/main/resources/logback.xml create mode 100644 mall-product/src/main/resources/logback.xml diff --git a/generator-code-server/src/main/resources/application.yml b/generator-code-server/src/main/resources/application.yml index 0275386..37f20e4 100644 --- a/generator-code-server/src/main/resources/application.yml +++ b/generator-code-server/src/main/resources/application.yml @@ -21,4 +21,7 @@ spring: logging: file: - path: "logs/${spring.application.name}" \ No newline at end of file + path: "logs/${spring.application.name}" + level: + com.mall.product: debug + root: info \ No newline at end of file diff --git a/generator-code-server/src/main/resources/logback.xml b/generator-code-server/src/main/resources/logback.xml new file mode 100644 index 0000000..02b7abe --- /dev/null +++ b/generator-code-server/src/main/resources/logback.xml @@ -0,0 +1,72 @@ + + + logback + + + + + + + + + + + + + + DEBUG + + + + %cyan([%thread %d{yyyy-MM-dd HH:mm:ss}]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)-%blue(%msg%n) + + ${ENCODING} + + + + + + logs/${APP_NAME}/${datetime}.log + true + + %date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n + ${ENCODING} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-common/pom.xml b/mall-common/pom.xml index bb49606..18f6c5e 100644 --- a/mall-common/pom.xml +++ b/mall-common/pom.xml @@ -18,14 +18,12 @@ + org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-thymeleaf + spring-boot-devtools + runtime + true @@ -34,6 +32,40 @@ lombok + + + org.springframework.boot + spring-boot-starter-test + test + + + junit + junit + test + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + + + + + + + + + + + + + + com.baomidou diff --git a/mall-gateway/pom.xml b/mall-gateway/pom.xml index 9576353..42ff0bb 100644 --- a/mall-gateway/pom.xml +++ b/mall-gateway/pom.xml @@ -18,6 +18,19 @@ + + com.mall + mall-common + 1.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + diff --git a/mall-gateway/src/main/java/com/mall/App.java b/mall-gateway/src/main/java/com/mall/App.java deleted file mode 100644 index 38d1876..0000000 --- a/mall-gateway/src/main/java/com/mall/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.mall; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/mall-gateway/src/main/java/com/mall/gateway/MallGatewayApplication.java b/mall-gateway/src/main/java/com/mall/gateway/MallGatewayApplication.java new file mode 100644 index 0000000..7220dfe --- /dev/null +++ b/mall-gateway/src/main/java/com/mall/gateway/MallGatewayApplication.java @@ -0,0 +1,12 @@ +package com.mall.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; + +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +public class MallGatewayApplication { + public static void main(String[] args) { + SpringApplication.run(MallGatewayApplication.class, args); + } +} diff --git a/mall-gateway/src/main/java/com/mall/gateway/config/GatewayCorsConfiguration.java b/mall-gateway/src/main/java/com/mall/gateway/config/GatewayCorsConfiguration.java new file mode 100644 index 0000000..5081850 --- /dev/null +++ b/mall-gateway/src/main/java/com/mall/gateway/config/GatewayCorsConfiguration.java @@ -0,0 +1,8 @@ +package com.mall.gateway.config; + +import org.springframework.context.annotation.Configuration; + +@Configuration +public class GatewayCorsConfiguration { + +} diff --git a/mall-gateway/src/main/resources/application-routes.yaml b/mall-gateway/src/main/resources/application-routes.yaml new file mode 100644 index 0000000..2d46a47 --- /dev/null +++ b/mall-gateway/src/main/resources/application-routes.yaml @@ -0,0 +1,16 @@ +spring: + cloud: + gateway: + # 全局跨域 + globalcors: + cors-configurations: + '[/**]': + allowed-headers: + - "*" + allowed-origin-patterns: + - "*" + allowed-methods: + - "*" + allowed-origins: + - "*" + allow-credentials: true diff --git a/mall-gateway/src/main/resources/application.yaml b/mall-gateway/src/main/resources/application.yaml new file mode 100644 index 0000000..b950296 --- /dev/null +++ b/mall-gateway/src/main/resources/application.yaml @@ -0,0 +1,25 @@ +server: + port: 8000 + +spring: + profiles: + include: + - routes + application: + name: service-gateway + + cloud: + nacos: + server-addr: bunny-web.site:8848 + username: admin + password: admin123 + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + +logging: + file: + path: "logs/${spring.application.name}" + level: + com.mall.product: debug + root: info diff --git a/mall-gateway/src/main/resources/banner.txt b/mall-gateway/src/main/resources/banner.txt new file mode 100644 index 0000000..89b2c00 --- /dev/null +++ b/mall-gateway/src/main/resources/banner.txt @@ -0,0 +1,13 @@ + + +,-----. ,--. ,--. ,--.,--. +| |) /_ ,--.,--.,--,--, ,--,--, ,--. ,--. | `.' | ,--,--.| || | +| .-. \| || || \| \ \ ' / | |'.'| |' ,-. || || | +| '--' /' '' '| || || || | \ ' | | | |\ '-' || || | +`------' `----' `--''--'`--''--'.-' / `--' `--' `--`--'`--'`--' + `---' + + +Service Name${spring.application.name} +SpringBoot Version: ${spring-boot.version}${spring-boot.formatted-version} +Spring Active：${spring.profiles.active} diff --git a/mall-gateway/src/main/resources/logback.xml b/mall-gateway/src/main/resources/logback.xml new file mode 100644 index 0000000..02b7abe --- /dev/null +++ b/mall-gateway/src/main/resources/logback.xml @@ -0,0 +1,72 @@ + + + logback + + + + + + + + + + + + + + DEBUG + + + + %cyan([%thread %d{yyyy-MM-dd HH:mm:ss}]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)-%blue(%msg%n) + + ${ENCODING} + + + + + + logs/${APP_NAME}/${datetime}.log + true + + %date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n + ${ENCODING} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-member/pom.xml b/mall-member/pom.xml index 7d39532..1f84b6d 100644 --- a/mall-member/pom.xml +++ b/mall-member/pom.xml @@ -23,5 +23,28 @@ mall-common 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + + + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + diff --git a/mall-member/src/main/resources/application-dev.yml b/mall-member/src/main/resources/application-dev.yml index a8b3510..bc2f540 100644 --- a/mall-member/src/main/resources/application-dev.yml +++ b/mall-member/src/main/resources/application-dev.yml @@ -5,3 +5,13 @@ datasource: database: gulimall_ums username: gulimall password: "0212Gulimall" + +nacos: + server-addr: bunny-web.site:8848 + +logging: + file: + path: "logs/${spring.application.name}" + level: + com.mall.product: debug + root: info \ No newline at end of file diff --git a/mall-member/src/main/resources/application.yaml b/mall-member/src/main/resources/application.yaml index 87a16ac..6b5dd09 100644 --- a/mall-member/src/main/resources/application.yaml +++ b/mall-member/src/main/resources/application.yaml @@ -5,7 +5,7 @@ spring: profiles: active: dev application: - name: service-product + name: service-member datasource: type: com.zaxxer.hikari.HikariDataSource @@ -17,6 +17,10 @@ spring: maximum-pool-size: 20 connection-timeout: 30000 + cloud: + nacos: + server-addr: ${nacos.server-addr} + jackson: date-format: yyyy-MM-dd HH:mm:ss diff --git a/mall-member/src/main/resources/logback.xml b/mall-member/src/main/resources/logback.xml new file mode 100644 index 0000000..02b7abe --- /dev/null +++ b/mall-member/src/main/resources/logback.xml @@ -0,0 +1,72 @@ + + + logback + + + + + + + + + + + + + + DEBUG + + + + %cyan([%thread %d{yyyy-MM-dd HH:mm:ss}]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)-%blue(%msg%n) + + ${ENCODING} + + + + + + logs/${APP_NAME}/${datetime}.log + true + + %date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n + ${ENCODING} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-order/pom.xml b/mall-order/pom.xml index 6fabe7e..1100c5d 100644 --- a/mall-order/pom.xml +++ b/mall-order/pom.xml @@ -23,5 +23,28 @@ mall-common 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + + + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + diff --git a/mall-order/src/main/resources/application-dev.yml b/mall-order/src/main/resources/application-dev.yml index 368a4cf..d41e1a3 100644 --- a/mall-order/src/main/resources/application-dev.yml +++ b/mall-order/src/main/resources/application-dev.yml @@ -5,3 +5,13 @@ datasource: database: gulimall_oms username: gulimall password: "0212Gulimall" + +nacos: + server-addr: bunny-web.site:8848 + +logging: + file: + path: "logs/${spring.application.name}" + level: + com.mall.product: debug + root: info \ No newline at end of file diff --git a/mall-order/src/main/resources/application.yaml b/mall-order/src/main/resources/application.yaml index 8c0cd82..ddad781 100644 --- a/mall-order/src/main/resources/application.yaml +++ b/mall-order/src/main/resources/application.yaml @@ -17,6 +17,10 @@ spring: maximum-pool-size: 20 connection-timeout: 30000 + cloud: + nacos: + server-addr: ${nacos.server-addr} + jackson: date-format: yyyy-MM-dd HH:mm:ss @@ -26,11 +30,4 @@ mybatis-plus: db-config: id-type: auto logic-delete-value: 1 - logic-not-delete-value: 0 - -logging: - file: - path: "logs/${spring.application.name}" - level: - com.mall.product: debug - root: info + logic-not-delete-value: 0 \ No newline at end of file diff --git a/mall-order/src/main/resources/logback.xml b/mall-order/src/main/resources/logback.xml new file mode 100644 index 0000000..02b7abe --- /dev/null +++ b/mall-order/src/main/resources/logback.xml @@ -0,0 +1,72 @@ + + + logback + + + + + + + + + + + + + + DEBUG + + + + %cyan([%thread %d{yyyy-MM-dd HH:mm:ss}]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)-%blue(%msg%n) + + ${ENCODING} + + + + + + logs/${APP_NAME}/${datetime}.log + true + + %date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n + ${ENCODING} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-product/pom.xml b/mall-product/pom.xml index 7a4b082..607d926 100644 --- a/mall-product/pom.xml +++ b/mall-product/pom.xml @@ -23,6 +23,31 @@ mall-common 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + + + + + + + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + com.fasterxml.jackson.core jackson-databind diff --git a/mall-product/src/main/java/com/mall/product/MallProductApplication.java b/mall-product/src/main/java/com/mall/product/MallProductApplication.java index 1aa4a35..61d6f1c 100644 --- a/mall-product/src/main/java/com/mall/product/MallProductApplication.java +++ b/mall-product/src/main/java/com/mall/product/MallProductApplication.java @@ -2,10 +2,14 @@ package com.mall.product; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; @SpringBootApplication @ComponentScan(basePackages = {"com.mall.product", "com.mall.common",}) +@EnableDiscoveryClient +// @RefreshScope +// @EnableFeignClients public class MallProductApplication { public static void main(String[] args) { SpringApplication.run(MallProductApplication.class, args); diff --git a/mall-product/src/main/resources/application-dev.yml b/mall-product/src/main/resources/application-dev.yml index 33fd13c..adb72ec 100644 --- a/mall-product/src/main/resources/application-dev.yml +++ b/mall-product/src/main/resources/application-dev.yml @@ -5,3 +5,13 @@ datasource: database: gulimall_pms username: gulimall password: "0212Gulimall" + +nacos: + server-addr: bunny-web.site:8848 + +logging: + file: + path: "logs/${spring.application.name}" + level: + com.mall.product: debug + root: info diff --git a/mall-product/src/main/resources/application.yaml b/mall-product/src/main/resources/application.yaml index 9759cb7..303063a 100644 --- a/mall-product/src/main/resources/application.yaml +++ b/mall-product/src/main/resources/application.yaml @@ -17,6 +17,10 @@ spring: maximum-pool-size: 20 connection-timeout: 30000 + cloud: + nacos: + server-addr: ${nacos.server-addr} + jackson: date-format: yyyy-MM-dd HH:mm:ss @@ -27,10 +31,3 @@ mybatis-plus: id-type: auto logic-delete-value: 1 logic-not-delete-value: 0 - -logging: - file: - path: "logs/${spring.application.name}" - level: - com.mall.product: debug - root: info diff --git a/mall-product/src/main/resources/logback.xml b/mall-product/src/main/resources/logback.xml new file mode 100644 index 0000000..02b7abe --- /dev/null +++ b/mall-product/src/main/resources/logback.xml @@ -0,0 +1,72 @@ + + + logback + + + + + + + + + + + + + + DEBUG + + + + %cyan([%thread %d{yyyy-MM-dd HH:mm:ss}]) %yellow(%-5level) %green(%logger{100}).%boldRed(%method)-%boldMagenta(%line)-%blue(%msg%n) + + ${ENCODING} + + + + + + logs/${APP_NAME}/${datetime}.log + true + + %date{yyyy-MM-dd HH:mm:ss} [%-5level] %thread %file:%line %logger %msg%n + ${ENCODING} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mall-seckill/pom.xml b/mall-seckill/pom.xml index 04143c3..fb391bf 100644 --- a/mall-seckill/pom.xml +++ b/mall-seckill/pom.xml @@ -18,6 +18,19 @@ + + com.mall + mall-common + 1.0-SNAPSHOT + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-thymeleaf + diff --git a/pom.xml b/pom.xml index f7897ff..7c3dd75 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,7 @@ 9.2.0 6.2.1 3.5.6 + 2.0.47 4.5.0 @@ -55,6 +56,29 @@ ${lombok.version} + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + 2023.0.3.3 + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + 2023.0.3 + pom + import + + + + + com.alibaba.fastjson2 + fastjson2 + ${fastjson2.version} + + com.baomidou @@ -137,5 +161,5 @@ - +