diff --git a/spzx-common/common-service/pom.xml b/spzx-common/common-service/pom.xml index 26539f1..0ffc18c 100644 --- a/spzx-common/common-service/pom.xml +++ b/spzx-common/common-service/pom.xml @@ -19,11 +19,6 @@ - - com.atguigu - spzx-model - 1.0-SNAPSHOT - com.atguigu common-util diff --git a/spzx-common/common-util/pom.xml b/spzx-common/common-util/pom.xml index a379e71..0af8385 100644 --- a/spzx-common/common-util/pom.xml +++ b/spzx-common/common-util/pom.xml @@ -24,11 +24,7 @@ spzx-model 1.0-SNAPSHOT - - - org.springframework.boot - spring-boot-starter-web - + com.alibaba diff --git a/spzx-server-gateway/pom.xml b/spzx-server-gateway/pom.xml index 67acbe2..30adc19 100644 --- a/spzx-server-gateway/pom.xml +++ b/spzx-server-gateway/pom.xml @@ -18,6 +18,39 @@ + + com.atguigu + common-util + 1.0-SNAPSHOT + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + + + org.springframework.cloud + spring-cloud-loadbalancer + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + diff --git a/spzx-server-gateway/src/main/java/com/atguigu/App.java b/spzx-server-gateway/src/main/java/com/atguigu/App.java deleted file mode 100644 index 74498e7..0000000 --- a/spzx-server-gateway/src/main/java/com/atguigu/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.atguigu; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/spzx-server-gateway/src/main/java/com/atguigu/gateway/GatewayApplication.java b/spzx-server-gateway/src/main/java/com/atguigu/gateway/GatewayApplication.java new file mode 100644 index 0000000..f999f80 --- /dev/null +++ b/spzx-server-gateway/src/main/java/com/atguigu/gateway/GatewayApplication.java @@ -0,0 +1,11 @@ +package com.atguigu.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GatewayApplication { + public static void main(String[] args) { + SpringApplication.run(GatewayApplication.class, args); + } +} \ No newline at end of file diff --git a/spzx-server-gateway/src/main/resources/application-dev.yml b/spzx-server-gateway/src/main/resources/application-dev.yml new file mode 100644 index 0000000..c00244b --- /dev/null +++ b/spzx-server-gateway/src/main/resources/application-dev.yml @@ -0,0 +1,6 @@ +bunny: + nacos: + server-addr: z-bunny.cn:8848 + discovery: + namespace: spzx + diff --git a/spzx-server-gateway/src/main/resources/application.yml b/spzx-server-gateway/src/main/resources/application.yml new file mode 100644 index 0000000..fb67024 --- /dev/null +++ b/spzx-server-gateway/src/main/resources/application.yml @@ -0,0 +1,44 @@ +server: + port: 8500 +spring: + profiles: + active: dev + application: + name: server-gateway + + cloud: + nacos: + discovery: + namespace: ${bunny.nacos.discovery.namespace} + server-addr: ${bunny.nacos.server-addr} + gateway: + discovery: + locator: + enabled: true + # 解决跨域 + globalcors: + cors-configurations: + '[/**]': + allowedOriginPatterns: "*" + # 允许请求中携带的头信息 + allowedHeaders: "*" + # 运行跨域的请求方式 + allowedMethods: "*" + # 跨域检测的有效期,单位s + maxAge: 36000 + # 路由 + routes: + - id: service-product + uri: lb://service-product + predicates: + - Path=/*/product/** + +logging: + level: + com.atguigu.product.mapper: debug + com.atguigu.product.controller: info + com.atguigu.product.service: info + pattern: + dateformat: HH:mm:ss:SSS + file: + path: "logs/${spring.application.name}" diff --git a/spzx-server-gateway/src/main/resources/banner.txt b/spzx-server-gateway/src/main/resources/banner.txt new file mode 100644 index 0000000..cc77fc2 --- /dev/null +++ b/spzx-server-gateway/src/main/resources/banner.txt @@ -0,0 +1,16 @@ +-----------------▄██-█▄--------- +-----------------███▄██▄-------- +-----------------███████-------- +-----------------▀███████------- +-------------------██████▄▄----- +-------------------█████████▄--- +-------------------██████▄████-- +-------▄███████████████████████- +-----▄███████████████████████▀-- +---▄██████████████████████------ +---███████████████████████------ +---███████████████████████------ +-▄▄██████████████████████▀------ +-█████████████████▀█████-------- +-▀██████████████▀▀-▀█████▄------ +-------▀▀▀▀▀▀▀▀▀------▀▀▀▀------ \ No newline at end of file diff --git a/spzx-server-gateway/src/main/resources/favicon.ico b/spzx-server-gateway/src/main/resources/favicon.ico new file mode 100644 index 0000000..1ba397c Binary files /dev/null and b/spzx-server-gateway/src/main/resources/favicon.ico differ diff --git a/spzx-server-gateway/src/main/resources/logback-spring.xml b/spzx-server-gateway/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..0e33e44 --- /dev/null +++ b/spzx-server-gateway/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + logback + + + + + + + + + + + + + + + + + + + + + + + INFO + + + ${CONSOLE_LOG_PATTERN} + ${ENCODING} + + + + + + ${log.path}//log.log + true + + %date{yyyy-MM-dd HH:mm:ss} %msg%n + ${ENCODING} + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spzx-service/pom.xml b/spzx-service/pom.xml index 7dbdd64..6fd9bf9 100644 --- a/spzx-service/pom.xml +++ b/spzx-service/pom.xml @@ -22,11 +22,6 @@ - - org.springframework.boot - spring-boot-starter-web - - com.atguigu common-service diff --git a/spzx-service/service-product/src/main/java/com/atguigu/product/controller/CategoryController.java b/spzx-service/service-product/src/main/java/com/atguigu/product/controller/CategoryController.java index 4cc031f..2749e65 100644 --- a/spzx-service/service-product/src/main/java/com/atguigu/product/controller/CategoryController.java +++ b/spzx-service/service-product/src/main/java/com/atguigu/product/controller/CategoryController.java @@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,7 +17,7 @@ import java.util.List; @RestController @RequestMapping("/api/product/category/") @Slf4j -@CrossOrigin +// @CrossOrigin public class CategoryController { @Autowired private CategoryService categoryService; diff --git a/spzx-service/service-product/src/main/java/com/atguigu/product/controller/IndexController.java b/spzx-service/service-product/src/main/java/com/atguigu/product/controller/IndexController.java index 6b1b135..8aa8dc7 100644 --- a/spzx-service/service-product/src/main/java/com/atguigu/product/controller/IndexController.java +++ b/spzx-service/service-product/src/main/java/com/atguigu/product/controller/IndexController.java @@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,7 +20,7 @@ import java.util.List; @RestController @RequestMapping(value = "/api/product/index") @Slf4j -@CrossOrigin +// @CrossOrigin public class IndexController { @Autowired private CategoryService categoryService; diff --git a/spzx-service/service-product/src/main/resources/application.yml b/spzx-service/service-product/src/main/resources/application.yml index a1833cf..ba015d3 100644 --- a/spzx-service/service-product/src/main/resources/application.yml +++ b/spzx-service/service-product/src/main/resources/application.yml @@ -30,6 +30,7 @@ logging: com.atguigu.product.mapper: debug com.atguigu.product.controller: info com.atguigu.product.service: info + com.alibaba.nacos: info pattern: dateformat: HH:mm:ss:SSS file: diff --git a/spzx-service/service-product/src/main/resources/mybatis-config.xml b/spzx-service/service-product/src/main/resources/mybatis-config.xml deleted file mode 100644 index 89898c2..0000000 --- a/spzx-service/service-product/src/main/resources/mybatis-config.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - -