From 99c44913357d46a4d11868014a08b92a98dd0735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Mon, 22 Jan 2024 18:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A1=B9=E7=9B=AE=E6=9E=B6?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/main/resources/application.yaml | 6 +++--- pom.xml | 5 ++--- {tao-oms => tao-api}/.gitignore | 0 {tao-oms => tao-api}/pom.xml | 4 ++-- .../src/main/java/com/qihang/tao/TaoApi.java | 4 ++-- .../main/java/com/qihang/tao/controller/HomeController.java | 0 {tao-oms => tao-api}/src/main/resources/application.yaml | 2 +- {tao-oms => tao-api}/src/test/java/com/qihang/AppTest.java | 0 8 files changed, 10 insertions(+), 11 deletions(-) rename {tao-oms => tao-api}/.gitignore (100%) rename {tao-oms => tao-api}/pom.xml (98%) rename tao-oms/src/main/java/com/qihang/tao/TaoOmsApplication.java => tao-api/src/main/java/com/qihang/tao/TaoApi.java (87%) rename {tao-oms => tao-api}/src/main/java/com/qihang/tao/controller/HomeController.java (100%) rename {tao-oms => tao-api}/src/main/resources/application.yaml (92%) rename {tao-oms => tao-api}/src/test/java/com/qihang/AppTest.java (100%) diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index 174bca79..cd878be5 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -20,10 +20,10 @@ spring: locator: enabled: true routes: - - id: tao_oms_route - uri: lb://tao-oms + - id: tao_api_route + uri: lb://tao-api predicates: - - Path=/api/tao-service/** + - Path=/api/tao-api/** filters: - StripPrefix=2 - id: oms_api_route diff --git a/pom.xml b/pom.xml index 5a467729..98973573 100644 --- a/pom.xml +++ b/pom.xml @@ -10,9 +10,8 @@ qihang-oms http://maven.apache.org - tao-oms - oms-api - oms-core + tao-api + oms-api api diff --git a/tao-oms/.gitignore b/tao-api/.gitignore similarity index 100% rename from tao-oms/.gitignore rename to tao-api/.gitignore diff --git a/tao-oms/pom.xml b/tao-api/pom.xml similarity index 98% rename from tao-oms/pom.xml rename to tao-api/pom.xml index cdbb9e91..818d0f65 100644 --- a/tao-oms/pom.xml +++ b/tao-api/pom.xml @@ -9,10 +9,10 @@ - tao-oms + tao-api jar - tao-oms + tao-api http://maven.apache.org diff --git a/tao-oms/src/main/java/com/qihang/tao/TaoOmsApplication.java b/tao-api/src/main/java/com/qihang/tao/TaoApi.java similarity index 87% rename from tao-oms/src/main/java/com/qihang/tao/TaoOmsApplication.java rename to tao-api/src/main/java/com/qihang/tao/TaoApi.java index f406dedd..8e0ddf68 100644 --- a/tao-oms/src/main/java/com/qihang/tao/TaoOmsApplication.java +++ b/tao-api/src/main/java/com/qihang/tao/TaoApi.java @@ -13,11 +13,11 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; //@EnableWebSecurity @EnableDiscoveryClient @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class TaoOmsApplication +public class TaoApi { public static void main( String[] args ) { System.out.println( "Hello World!" ); - SpringApplication.run(TaoOmsApplication.class, args); + SpringApplication.run(TaoApi.class, args); } } diff --git a/tao-oms/src/main/java/com/qihang/tao/controller/HomeController.java b/tao-api/src/main/java/com/qihang/tao/controller/HomeController.java similarity index 100% rename from tao-oms/src/main/java/com/qihang/tao/controller/HomeController.java rename to tao-api/src/main/java/com/qihang/tao/controller/HomeController.java diff --git a/tao-oms/src/main/resources/application.yaml b/tao-api/src/main/resources/application.yaml similarity index 92% rename from tao-oms/src/main/resources/application.yaml rename to tao-api/src/main/resources/application.yaml index e9841eba..7e3884c6 100644 --- a/tao-oms/src/main/resources/application.yaml +++ b/tao-api/src/main/resources/application.yaml @@ -8,7 +8,7 @@ spring: import: - nacos:qihang-oms.yaml?refresh=true application: - name: tao-oms + name: tao-api security: user: name: admin diff --git a/tao-oms/src/test/java/com/qihang/AppTest.java b/tao-api/src/test/java/com/qihang/AppTest.java similarity index 100% rename from tao-oms/src/test/java/com/qihang/AppTest.java rename to tao-api/src/test/java/com/qihang/AppTest.java