Просмотр исходного кода

Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-op-server-gateway

# Conflicts:
#	src/main/resources/prod/bootstrap.yml
zhoux 1 год назад
Родитель
Сommit
c24d98ed88

+ 2 - 2
src/main/resources/dev/bootstrap.yml

@@ -33,7 +33,7 @@ spring:
 
         #基础数据服务
         - id: mdm-server
-          uri: lb://mdm-server
+          uri: lb://mdm-server-chn
           predicates:
             - Path=/mdm-server/**
           filters:
@@ -51,7 +51,7 @@ spring:
   redis:
     host: s.dev01.dkiboss.com
     port: 14000
-    password: dk
+    password: Tf%JL!vd7R%j3x&e
 
   zipkin:
     base-url: http://s.dev01.dkiboss.com:9411/

+ 45 - 12
src/main/resources/prod/bootstrap.yml

@@ -1,24 +1,57 @@
 server:
-  port: 6001
+  port: 7101
 spring:
   application:
     name: gateway-server
+  profiles:
+    active: @environment@
   cloud:
+    gateway:
+      globalcors: #全局跨域设置,不需要再在controller上增加CrossOrigin注解
+        add-to-simple-url-handler-mapping: true
+        cors-configurations:
+          '[/**]':
+            allowedOrigins: "*"
+            allowedMethods: "*"
+            allowedHeaders: "*"
+            allowCredentials: true
+            maxAge: 360000
+      default-filters: #去除响应头中的多个 Access-Control-Allow-Origin,保留第一个
+        - DedupeResponseHeader=Vary Access-Control-Allow-Origin Access-Control-Allow-Credentials, RETAIN_FIRST
+      discovery:
+        locator:
+          enabled: true #开启gateway从nacos上获取服务列表,id就是服务名。注意,此方式的优先级比自定义routes的方式高。开发时不要开启
     nacos:
       config:
-        file-extension: yaml
-        server-addr: ${NACOS_HOST:mse-ab4cb036-nacos-ans.mse.aliyuncs.com:8848}
-        namespace: ${NACOS_SPACE:hgscrm-prod}
-        shared-configs:
-          - data-id: common.yaml
-            group: DEFAULT_GROUP
-        group: ${group-id:DEFAULT_GROUP}
+        server-addr: localhost:8848
       discovery:
-        server-addr: ${NACOS_HOST:mse-ab4cb036-nacos-ans.mse.aliyuncs.com:8848}
-        namespace: ${NACOS_SPACE:hgscrm-prod}
+        server-addr: 124.71.44.215:8848
+        namespace: dkic_op
+  redis:
+    host: localhost
+    port: 6379
+    password:
+
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 10MB
+
+logback:
+  file: /data/java_project/dkic_op/logs
+
+ribbon:
+  ServerListRefreshInterval: 3000
+
+feign:
+  sentinel:
+    enabled: true
+  client:
+    config:
+      default:
+        connectTimeout: 60000
+        readTimeout: 60000
 
-aes-key: b6f64c1001b04b9f
-client-app-id: 48849faf-8bbb-4a29-9548-0ba1c3df963f
 
 # token校验跳过的url,多个url用";"号隔开
 filterPath: /mdm-server/mst/user/token

+ 1 - 1
src/main/resources/st/bootstrap.yml

@@ -32,7 +32,7 @@ spring:
   redis:
     host: s.dev01.dkiboss.com
     port: 14000
-    password: dk
+    password: Tf%JL!vd7R%j3x&e
 
   zipkin:
     base-url: http://s.dev01.dkiboss.com:9411/

+ 1 - 1
src/main/resources/test/bootstrap.yml

@@ -32,7 +32,7 @@ spring:
   redis:
     host: s.dev01.dkiboss.com
     port: 14000
-    password: dk
+    password: Tf%JL!vd7R%j3x&e
 
   zipkin:
     base-url: http://s.dev01.dkiboss.com:9411/