diff --git a/tacit-admin/src/main/resources/bootstrap.yml b/tacit-admin/src/main/resources/bootstrap.yml index 99fea7f..48f6291 100644 --- a/tacit-admin/src/main/resources/bootstrap.yml +++ b/tacit-admin/src/main/resources/bootstrap.yml @@ -1,19 +1,18 @@ spring: application: name: tacit-admin - config: - import: - - nacos: # 添加此行 + main: + web-application-type: reactive cloud: nacos: discovery: + enabled: true server-addr: localhost:8848 - namespace: public + username: nacos + password: nacos config: + enabled: true server-addr: localhost:8848 - namespace: public - file-extension: yml - group: DEFAULT_GROUP - refresh-enabled: true - profiles: - active: dev + file-extension: yaml + username: nacos + password: nacos \ No newline at end of file diff --git a/tacit-admin/src/main/resources/application-dev.yml b/tacit-admin/src/main/resources/tacit-admin.yaml similarity index 98% rename from tacit-admin/src/main/resources/application-dev.yml rename to tacit-admin/src/main/resources/tacit-admin.yaml index e03d6e4..8437fe6 100644 --- a/tacit-admin/src/main/resources/application-dev.yml +++ b/tacit-admin/src/main/resources/tacit-admin.yaml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8082 spring: datasource: diff --git a/tacit-app-api/src/main/resources/application-dev.yml b/tacit-app-api/src/main/resources/application-dev.yml index 543bc32..2dc2afe 100644 --- a/tacit-app-api/src/main/resources/application-dev.yml +++ b/tacit-app-api/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8082 + port: 8083 spring: datasource: diff --git a/tacit-app-api/src/main/resources/bootstrap.yml b/tacit-app-api/src/main/resources/bootstrap.yml index aa5741e..f9d610c 100644 --- a/tacit-app-api/src/main/resources/bootstrap.yml +++ b/tacit-app-api/src/main/resources/bootstrap.yml @@ -1,19 +1,18 @@ spring: application: name: tacit-app-api - config: - import: - - nacos: # 添加此行 + main: + web-application-type: reactive cloud: nacos: discovery: + enabled: true server-addr: localhost:8848 - namespace: public + username: nacos + password: nacos config: + enabled: true server-addr: localhost:8848 - namespace: public - file-extension: yml - group: DEFAULT_GROUP - refresh-enabled: true - profiles: - active: dev + file-extension: yaml + username: nacos + password: nacos diff --git a/tacit-gateway/src/main/resources/tacit-gateway.yaml b/tacit-gateway/src/main/resources/tacit-gateway.yaml new file mode 100644 index 0000000..556206d --- /dev/null +++ b/tacit-gateway/src/main/resources/tacit-gateway.yaml @@ -0,0 +1,50 @@ +server: + port: 8081 + +spring: + cloud: + gateway: + discovery: + locator: + enabled: true + lower-case-service-id: true + routes: + # Admin Service Route + - id: tacit-admin + uri: lb://tacit-admin + predicates: + - Path=/admin/** + filters: + - StripPrefix=1 + + # App API Service Route + - id: tacit-app-api + uri: lb://tacit-app-api + predicates: + - Path=/api/** + filters: + - StripPrefix=1 + - JwtAuthenticationFilter + + # Swagger UI Routes + - id: swagger-admin + uri: lb://tacit-admin + predicates: + - Path=/swagger-admin/** + filters: + - StripPrefix=1 + + - id: swagger-app-api + uri: lb://tacit-app-api + predicates: + - Path=/swagger-app-api/** + filters: + - StripPrefix=1 + +# Logging Configuration +logging: + level: + org.springframework.cloud.gateway: debug + org.springframework.http.server.reactive: debug + org.springframework.web.reactive: debug + reactor.netty: debug