houweiyu 4 лет назад
Родитель
Сommit
3aa25e2d7f

+ 1 - 0
src/main/java/com/fcb/gateway/filter/AuthAndLogFilter.java

@@ -49,6 +49,7 @@ public class AuthAndLogFilter implements GlobalFilter, Ordered {
                 || requestUrl.startsWith("/api/manage/user/getVerify")
                 || requestUrl.startsWith("/api/manage/user/checkVerify")
                 || requestUrl.startsWith("/fcb/project/api/query")
+                || requestUrl.startsWith("/fcb/project/house/houseDetailWithoutAuth")
         ) {
             log.info("白名单路径,无需校验token");
         } else {

+ 0 - 4
src/main/resources/application-dev.properties

@@ -8,7 +8,3 @@ spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=0
 spring.redis.database=0
 spring.redis.password=
-
-
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848

+ 2 - 5
src/main/resources/application-prod.properties

@@ -1,14 +1,11 @@
 
 spring.redis.cluster.max-redirects=3
-spring.redis.cluster.nodes=10.71.188.181:7000,10.71.188.108:7000,10.71.188.113:7000,10.71.188.206:7000,10.71.188.238:7000,10.71.188.148:7000
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000
 spring.redis.timeout=5000ms
 spring.redis.jedis.pool.max-active=8
 spring.redis.jedis.pool.max-idle=8
 spring.redis.jedis.pool.max-wait=-1
 spring.redis.jedis.pool.min-idle=0
 spring.redis.database=0
-spring.redis.password=m8P6JugfYevMBi8bUnlu
-
-spring.cloud.nacos.config.server-addr=10.71.9.205:80
-spring.cloud.nacos.discovery.server-addr=10.71.9.205:80
+spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
 

+ 0 - 2
src/main/resources/application-sit.properties

@@ -10,5 +10,3 @@ spring.redis.database=0
 spring.redis.password=
 
 
-spring.cloud.nacos.config.server-addr=127.0.0.1:8848
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848

+ 0 - 3
src/main/resources/application-uat.properties

@@ -9,6 +9,3 @@ spring.redis.jedis.pool.min-idle=0
 spring.redis.database=0
 spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
 
-spring.cloud.nacos.config.server-addr=10.71.5.163:80
-spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
-

+ 0 - 18
src/main/resources/application.properties

@@ -1,18 +0,0 @@
-
-server.port=8084
-spring.application.name=gateway
-spring.profiles.active=prod
-#spring.profiles.active=uat
-#spring.profiles.active=sit
-#spring.profiles.active=dev
-
-logging.config=classpath:log4j2.xml
-
-spring.cloud.gateway.httpclient.pool.max-idle-time=10000
-spring.cloud.gateway.discovery.locator.enabled=false
-spring.cloud.gateway.default-filters.name=Hystrix
-spring.cloud.gateway.default-filters.args.name=default
-spring.cloud.gateway.default-filters.args.fallbackUri='forward:/defaultFallback'
-
-
-hystrix.command.default.execution.isolation.strategy.SEMAPHORE.thread.timeoutInMilliseconds=20000

+ 39 - 0
src/main/resources/bootstrap.yml

@@ -0,0 +1,39 @@
+server:
+  port: 8084
+spring:
+  application:
+    name: gateway
+  cloud:
+    nacos:
+      config:
+        #server-addr: 127.0.0.1:8848
+        server-addr: 10.71.5.163:80
+      discovery:
+        #server-addr: 127.0.0.1:8848
+        server-addr: 10.71.5.163:80
+    gateway:
+      httpclient:
+        pool:
+          max-idle-time: 10000
+      discovery:
+        locator:
+          enabled: true
+      default-filters:
+        - name: Hystrix
+          args:
+            name : default
+            fallbackUri: 'forward:/defaultFallback'
+
+  profiles:
+    active: uat
+logging:
+  config: classpath:log4j2.xml
+
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 20000