From 70cb3c960e9bafbd1b7660cfe87c2183318abde2 Mon Sep 17 00:00:00 2001 From: Richie <280645618@qq.com> Date: Sun, 4 Aug 2024 15:38:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5eureka=E6=9B=BF=E4=BB=A3nacos?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/pom.xml | 11 +++ api/src/main/resources/application.yaml | 6 +- eureka-server/pom.xml | 85 +++++++++++++++++++ .../java/com/qihang/eureka/EurekaServer.java | 15 ++++ .../src/main/resources/application.yml | 14 +++ gateway/pom.xml | 66 ++++++++++++++ .../main/java/com/qihang/gateway/Gateway.java | 18 ++++ gateway/src/main/resources/application.yaml | 21 +++++ offline-api/pom.xml | 73 ++++++++++++++++ .../java/com/qihang/offline/OfflineApi.java | 21 +++++ .../offline/controller/HomeController.java | 20 +++++ .../src/main/resources/application.yaml | 21 +++++ offline-api/src/main/resources/logback.xml | 36 ++++++++ .../service/impl/ErpSaleOrderServiceImpl.java | 3 + .../com/qihang/kwai/domain/SysPlatform.java | 1 - pom.xml | 5 ++ 16 files changed, 414 insertions(+), 2 deletions(-) create mode 100644 eureka-server/pom.xml create mode 100644 eureka-server/src/main/java/com/qihang/eureka/EurekaServer.java create mode 100644 eureka-server/src/main/resources/application.yml create mode 100644 gateway/pom.xml create mode 100644 gateway/src/main/java/com/qihang/gateway/Gateway.java create mode 100644 gateway/src/main/resources/application.yaml create mode 100644 offline-api/pom.xml create mode 100644 offline-api/src/main/java/com/qihang/offline/OfflineApi.java create mode 100644 offline-api/src/main/java/com/qihang/offline/controller/HomeController.java create mode 100644 offline-api/src/main/resources/application.yaml create mode 100644 offline-api/src/main/resources/logback.xml diff --git a/api/pom.xml b/api/pom.xml index 70d0d897..d1b56edc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -47,6 +47,10 @@ spring-cloud-starter-gateway 4.0.0 + + + + com.alibaba.cloud @@ -97,6 +101,13 @@ pom import + + org.springframework.cloud + spring-cloud-dependencies + 2022.0.0 + pom + import + com.alibaba.cloud spring-cloud-alibaba-dependencies diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index 0929e1ce..59a107a1 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -81,4 +81,8 @@ spring: ## 授权规则 #security: # rules: -# - pattern: /api/tao-service/** # 定义需要授权的URL模式 \ No newline at end of file +# - pattern: /api/tao-service/** # 定义需要授权的URL模式 +eureka: + client: + serviceUrl: + defaultZone: http://127.0.0.1:8761/eureka/ \ No newline at end of file diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml new file mode 100644 index 00000000..10e5d118 --- /dev/null +++ b/eureka-server/pom.xml @@ -0,0 +1,85 @@ + + 4.0.0 + + com.qihang + qihangerp-oms + 2.0.6 + + + com.qihang.eureka + eureka-server + jar + + eureka-server + http://maven.apache.org + + + UTF-8 + + + + + org.springframework.boot + spring-boot-starter + + + org.slf4j + slf4j-log4j12 + + + + + org.springframework.boot + spring-boot-starter-web + + + + + + + + + + + + + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-server + + + com.google.code.gson + gson + 2.11.0 + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/eureka-server/src/main/java/com/qihang/eureka/EurekaServer.java b/eureka-server/src/main/java/com/qihang/eureka/EurekaServer.java new file mode 100644 index 00000000..fe7d16b5 --- /dev/null +++ b/eureka-server/src/main/java/com/qihang/eureka/EurekaServer.java @@ -0,0 +1,15 @@ +package com.qihang.eureka; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer; + +@SpringBootApplication +@EnableEurekaServer +public class EurekaServer { + public static void main( String[] args ) + { + System.out.println( "Hello World!" ); + SpringApplication.run(EurekaServer.class, args); + } +} diff --git a/eureka-server/src/main/resources/application.yml b/eureka-server/src/main/resources/application.yml new file mode 100644 index 00000000..820120c6 --- /dev/null +++ b/eureka-server/src/main/resources/application.yml @@ -0,0 +1,14 @@ +spring: + application: + name: eureka-server +server: + port: 8761 + +eureka: + instance: + hostname: localhost + client: + registerWithEureka: false + fetchRegistry: false + serviceUrl: + defaultZone: http://${eureka.instance.hostname}:${server.port}/ \ No newline at end of file diff --git a/gateway/pom.xml b/gateway/pom.xml new file mode 100644 index 00000000..5b41ce46 --- /dev/null +++ b/gateway/pom.xml @@ -0,0 +1,66 @@ + + 4.0.0 + + com.qihang + qihangerp-oms + 2.0.6 + + + com.qihang.gateway + gateway + jar + + gateway + http://maven.apache.org + + + UTF-8 + + + + + + + + + org.springframework.cloud + spring-cloud-starter-gateway + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + org.springframework.boot + spring-boot-starter-webflux + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + diff --git a/gateway/src/main/java/com/qihang/gateway/Gateway.java b/gateway/src/main/java/com/qihang/gateway/Gateway.java new file mode 100644 index 00000000..d9448695 --- /dev/null +++ b/gateway/src/main/java/com/qihang/gateway/Gateway.java @@ -0,0 +1,18 @@ +package com.qihang.gateway; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * Hello world! + * + */ +@SpringBootApplication +public class Gateway +{ + public static void main( String[] args ) + { + System.out.println( "Hello gateway! " ); + SpringApplication.run(Gateway.class, args); + } +} diff --git a/gateway/src/main/resources/application.yaml b/gateway/src/main/resources/application.yaml new file mode 100644 index 00000000..eecd6879 --- /dev/null +++ b/gateway/src/main/resources/application.yaml @@ -0,0 +1,21 @@ +server: + port: 8080 +spring: + application: + name: gateway + cloud: + gateway: + discovery: + locator: + enabled: true + routes: + - id: offline_api_route + uri: lb://offline-api + predicates: + - Path=/offline-api/** + filters: + - StripPrefix=1 +eureka: + client: + serviceUrl: + defaultZone: http://127.0.0.1:8761/eureka/ \ No newline at end of file diff --git a/offline-api/pom.xml b/offline-api/pom.xml new file mode 100644 index 00000000..66f44a06 --- /dev/null +++ b/offline-api/pom.xml @@ -0,0 +1,73 @@ + + 4.0.0 + + com.qihang + qihangerp-oms + 2.0.6 + + + com.qihang.offline + offline-api + jar + + offline-api + http://maven.apache.org + + + UTF-8 + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + diff --git a/offline-api/src/main/java/com/qihang/offline/OfflineApi.java b/offline-api/src/main/java/com/qihang/offline/OfflineApi.java new file mode 100644 index 00000000..690b31b2 --- /dev/null +++ b/offline-api/src/main/java/com/qihang/offline/OfflineApi.java @@ -0,0 +1,21 @@ +package com.qihang.offline; + +//import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; + + + +//@EnableDiscoveryClient +//@MapperScan("com.qihang.oms.mapper") +@ComponentScan(basePackages={"com.qihang"}) +@SpringBootApplication +public class OfflineApi { + public static void main( String[] args ) + { + System.out.println( "Hello oms-api!" ); + SpringApplication.run(OfflineApi.class, args); + } + +} diff --git a/offline-api/src/main/java/com/qihang/offline/controller/HomeController.java b/offline-api/src/main/java/com/qihang/offline/controller/HomeController.java new file mode 100644 index 00000000..44c8d61e --- /dev/null +++ b/offline-api/src/main/java/com/qihang/offline/controller/HomeController.java @@ -0,0 +1,20 @@ +package com.qihang.offline.controller; + +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@AllArgsConstructor +@RestController +public class HomeController { + + + @GetMapping("/") + public String home(){ + return "{'code':0,'msg':'offline-api请通过api访问'}"; + } + @GetMapping("/test") + public String test(){ + return "{'code':0,'msg':'offline-api/test请通过api访问'}"; + } +} \ No newline at end of file diff --git a/offline-api/src/main/resources/application.yaml b/offline-api/src/main/resources/application.yaml new file mode 100644 index 00000000..7d650bb3 --- /dev/null +++ b/offline-api/src/main/resources/application.yaml @@ -0,0 +1,21 @@ +mybatis-plus: + mapper-locations: classpath*:mapper/**/*Mapper.xml + type-aliases-package: com.qihang.sys.api.domain;com.qihang.security.entity; + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 +#mybatis: +# mapper-locations: classpath*:mappers/user/*.xml + +spring: + application: + name: offline-api + +server: + port: 8089 + +eureka: + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka/ + + diff --git a/offline-api/src/main/resources/logback.xml b/offline-api/src/main/resources/logback.xml new file mode 100644 index 00000000..3ef88b72 --- /dev/null +++ b/offline-api/src/main/resources/logback.xml @@ -0,0 +1,36 @@ + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss:SS} %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{50}) - %cyan(%msg%n) + + + + + + + ${LOG_HOME}/%d{yyyy-MM-dd}.log + + 3 + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + + + + 10MB + + + + + + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java index b8d7fd58..b93ba61a 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/ErpSaleOrderServiceImpl.java @@ -859,6 +859,9 @@ public class ErpSaleOrderServiceImpl extends ServiceImpl orderSendConfirm(Long shopId, String orderId,String logisticsCompanyCode,String waybillCode) { diff --git a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java index c90d684c..098642ca 100644 --- a/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java +++ b/open-api/kwai-api/src/main/java/com/qihang/kwai/domain/SysPlatform.java @@ -12,7 +12,6 @@ public class SysPlatform implements Serializable { /** * */ - @TableId(value = "id", type = IdType.AUTO) private Integer id; /** diff --git a/pom.xml b/pom.xml index 32b4006d..194fd185 100644 --- a/pom.xml +++ b/pom.xml @@ -15,11 +15,16 @@ core oms-api open-api + eureka-server + offline-api + gateway UTF-8 3.0.2 + 2022.0.0 + 2022.0.0.0 0.11.5